@@ -31,7 +31,7 @@
@@ -52,7 +52,7 @@
diff --git a/public/assets/js/backend/auth/rule.js b/public/assets/js/backend/auth/rule.js
index bd1044e2..85c23e96 100755
--- a/public/assets/js/backend/auth/rule.js
+++ b/public/assets/js/backend/auth/rule.js
@@ -173,7 +173,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
var iconfunc = function () {
Layer.open({
type: 1,
- area: ['99%', '98%'], //宽高
+ area: ['80%', '80%'], //宽高
content: Template('chooseicontpl', {iconlist: iconlist})
});
};
@@ -185,8 +185,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form', 'template'], function
});
$(document).on('click', ".btn-search-icon", function () {
if (iconlist.length == 0) {
- $.get(Config.site.cdnurl + "/assets/libs/font-awesome/less/variables.less", function (ret) {
- var exp = /fa-var-(.*):/ig;
+ $.get(Config.site.cdnurl + "/assets/libs/font-awesome/css/font-awesome.css", function (ret) {
+ var exp = /fa-(.*):before/ig;
var result;
while ((result = exp.exec(ret)) != null) {
iconlist.push(result[1]);
diff --git a/public/assets/js/frontend.js b/public/assets/js/frontend.js
index 0bd60fd0..fbe23f31 100644
--- a/public/assets/js/frontend.js
+++ b/public/assets/js/frontend.js
@@ -1,34 +1,59 @@
define(['fast', 'template', 'moment'], function (Fast, Template, Moment) {
var Frontend = {
- api: Fast.api,
- init: function () {
- var si = {};
+ api: {
//发送验证码
+ sendcaptcha: function (btn, type, data, callback) {
+ $(btn).addClass("disabled", true).text("发送中...");
+ var si = {};
+ Frontend.api.ajax({url: $(btn).data("url"), data: data}, function (data, ret) {
+ clearInterval(si[type]);
+ var seconds = 60;
+ si[type] = setInterval(function () {
+ seconds--;
+ if (seconds <= 0) {
+ clearInterval(si);
+ $(btn).removeClass("disabled").text("发送验证码");
+ } else {
+ $(btn).addClass("disabled").text(seconds + "秒后可再次发送");
+ }
+ }, 1000);
+ if (typeof callback == 'function') {
+ callback.call(this, data, ret);
+ }
+ }, function () {
+ $(btn).removeClass("disabled").text('发送验证码');
+ });
+ },
+ //准备验证码
+ preparecaptcha: function (btn, type, data) {
+ require(['form'], function (Form) {
+ Layer.open({
+ title: '请完成验证',
+ type: 1,
+ content: Template("captchatpl", {}),
+ btnAlign: 'c',
+ success: function (layero, index) {
+ var form = $("form", layero);
+ form.data("validator-options", {
+ valid: function (ret) {
+ data.captcha = $("input[name=captcha]", form).val();
+ Frontend.api.sendcaptcha(btn, type, data, function (data, ret) {
+ Layer.close(index);
+ });
+ return true;
+ }
+ })
+ Form.api.bindevent(form);
+ }
+ });
+ });
+ }
+ },
+ init: function () {
+ //点击发送验证码
$(document).on("click", ".btn-captcha", function (e) {
var type = $(this).data("type") ? $(this).data("type") : 'mobile';
var btn = this;
- Frontend.api.sendcaptcha = function (btn, type, data, callback) {
- $(btn).addClass("disabled", true).text("发送中...");
-
- Frontend.api.ajax({url: $(btn).data("url"), data: data}, function (data, ret) {
- clearInterval(si[type]);
- var seconds = 60;
- si[type] = setInterval(function () {
- seconds--;
- if (seconds <= 0) {
- clearInterval(si);
- $(btn).removeClass("disabled").text("发送验证码");
- } else {
- $(btn).addClass("disabled").text(seconds + "秒后可再次发送");
- }
- }, 1000);
- if (typeof callback == 'function') {
- callback.call(this, data, ret);
- }
- }, function () {
- $(btn).removeClass("disabled").text('发送验证码');
- });
- };
if (['mobile', 'email'].indexOf(type) > -1) {
var element = $(this).data("input-id") ? $("#" + $(this).data("input-id")) : $("input[name='" + type + "']", $(this).closest("form"));
var text = type === 'email' ? '邮箱' : '手机号码';
@@ -47,9 +72,13 @@ define(['fast', 'template', 'moment'], function (Fast, Template, Moment) {
}
element.isValid(function (v) {
if (v) {
- var data = {event: $(btn).data("event")};
+ var data = {event: $(btn).data("event"), id: $(btn).data("id")};
data[type] = element.val();
- Frontend.api.sendcaptcha(btn, type, data);
+ if ($("#captchatpl").length === 0) {
+ Frontend.api.sendcaptcha(btn, type, data);
+ } else {
+ Frontend.api.preparecaptcha(btn, type, data);
+ }
} else {
Layer.msg("请确认已经输入了正确的" + text + "！");
}
@@ -57,7 +86,12 @@ define(['fast', 'template', 'moment'], function (Fast, Template, Moment) {
} else {
var data = {event: $(btn).data("event")};
Frontend.api.sendcaptcha(btn, type, data, function (data, ret) {
- Layer.open({title: false, area: ["400px", "430px"], content: "
![](" + data.image + ")
扫一扫关注公众号获取验证码
", type: 1});
+ Layer.open({
+ title: false,
+ area: [Math.min($(window).width(), 400) + "px", "430px"],
+ content: "
扫一扫关注公众号获取验证码
",
+ type: 1
+ });
});
}
return false;
diff --git a/public/assets/js/frontend/user.js b/public/assets/js/frontend/user.js
index 45b693a4..00cdd81f 100755
--- a/public/assets/js/frontend/user.js
+++ b/public/assets/js/frontend/user.js
@@ -4,7 +4,8 @@ define(['jquery', 'bootstrap', 'frontend', 'form', 'template'], function ($, und
$.each(errors, function (i, j) {
Layer.msg(j);
});
- }
+ },
+ ignore: ':hidden'
};
var Controller = {
login: function () {
@@ -26,7 +27,7 @@ define(['jquery', 'bootstrap', 'frontend', 'form', 'template'], function ($, und
Layer.open({
type: 1,
title: __('Reset password'),
- area: ["450px", "355px"],
+ area: [Math.min($(window).width(), 450) + "px", "355px"],
content: content,
success: function (layero) {
var rule = $("#resetpwd-form input[name='captcha']").data("rule");
@@ -45,6 +46,18 @@ define(['jquery', 'bootstrap', 'frontend', 'form', 'template'], function ($, und
}
});
});
+
+ //切换账号手机验证码登录
+ $(document).on("click", ".btn-switchlogin", function () {
+ var form = $(this).closest("form");
+ var current = $(this).data("type");
+ var type = current == 'mobile' ? 'account' : 'mobile';
+ var text = $(this).data(current + "-text");
+ $(this).text(text).data("type", type);
+ $("[data-login]").addClass("hidden");
+ $("[data-login='"+type+"']").removeClass("hidden");
+ form.attr("action", $(this).data(type + "-action"));
+ });
},
register: function () {
//本地验证未通过时提示
@@ -85,7 +98,7 @@ define(['jquery', 'bootstrap', 'frontend', 'form', 'template'], function ($, und
Layer.open({
type: 1,
title: "修改",
- area: ["400px", "250px"],
+ area: [Math.min($(window).width(), 400) + "px", "250px"],
content: content,
success: function (layero) {
var form = $("form", layero);
From 676536878151073f46d2322da7a9942102d97257 Mon Sep 17 00:00:00 2001
From: Karson
Date: Wed, 15 Mar 2023 16:39:10 +0800
Subject: [PATCH 010/103] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?=
=?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/config.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/config.php b/application/config.php
index a58823bb..85941a15 100755
--- a/application/config.php
+++ b/application/config.php
@@ -303,7 +303,7 @@ return [
//允许跨域的域名,多个以,分隔
'cors_request_domain' => 'localhost,127.0.0.1',
//版本号
- 'version' => '1.3.5.20221214',
+ 'version' => '1.4.0.20230315',
//API接口地址
'api_url' => 'https://api.fastadmin.net',
],
From 0433dc4b30e1722752d53123b10026d72cf3b48b Mon Sep 17 00:00:00 2001
From: Karson
Date: Wed, 15 Mar 2023 17:26:12 +0800
Subject: [PATCH 011/103] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=B3=A8=E5=86=8C?=
=?UTF-8?q?=E9=A1=B5=E9=BB=98=E8=AE=A4=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
application/index/view/user/register.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/application/index/view/user/register.html b/application/index/view/user/register.html
index 209feaff..874c9acd 100644
--- a/application/index/view/user/register.html
+++ b/application/index/view/user/register.html
@@ -31,7 +31,7 @@
From a6c3c779491cc29ff6c8e41c2db4a2b394cc064f Mon Sep 17 00:00:00 2001
From: lijian <1414900397@qq.com>
Date: Tue, 21 Mar 2023 20:27:43 +0800
Subject: [PATCH 012/103] =?UTF-8?q?=E8=A7=A3=E5=86=B3fast/Date::unixtime()?=
=?UTF-8?q?bug=20=E8=AF=A5bug=E4=BC=9A=E5=AF=BC=E8=87=B4position=E4=B8=BA?=
=?UTF-8?q?=E7=BB=93=E6=9D=9F=E6=97=B6=E4=B8=94type=E4=B8=BAquarter?=
=?UTF-8?q?=E6=97=B6=20=E5=A6=82=E6=9E=9C=E4=BB=A5=E5=BD=93=E5=89=8D?=
=?UTF-8?q?=E6=9C=88=E4=BB=BD=E5=81=8F=E7=A7=BBoffset=E5=8D=95=E4=BD=8D?=
=?UTF-8?q?=E7=9A=84=E5=AD=A3=E5=BA=A6=E6=97=B6=E5=87=BA=E7=8E=B0=E8=B7=A8?=
=?UTF-8?q?=E8=B6=8A=E5=B9=B4=E4=BB=BD=EF=BC=8C=E4=BC=9A=E5=AF=BC=E8=87=B4?=
=?UTF-8?q?cal=5Fdays=5Fin=5Fmonth=E6=8A=A5=E9=94=99=20=E9=9D=9E=E6=B3=95?=
=?UTF-8?q?=E6=97=A5=E6=9C=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
extend/fast/Date.php | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/extend/fast/Date.php b/extend/fast/Date.php
index 84919255..ce018f1b 100644
--- a/extend/fast/Date.php
+++ b/extend/fast/Date.php
@@ -194,10 +194,14 @@ class Date
$time = $position ? $_timestamp : mktime(23, 59, 59, $month + $offset, self::days_in_month(date("m", $_timestamp), date("Y", $_timestamp)), $year);
break;
case 'quarter':
- $_month = date("m", mktime(0, 0, 0, (ceil(date('n', mktime(0, 0, 0, $month, $day, $year)) / 3) + $offset) * 3, $day, $year));
+ $quarter = ceil(date('n', $baseTime) / 3) + $offset;
+ $month = $quarter * 3;
+ $offset_year = ceil($month/12) - 1;
+ $year = $year + $offset_year;
+ $month = $month - ($offset_year * 12);
$time = $position ?
- mktime(0, 0, 0, 1 + ((ceil(date('n', $baseTime) / 3) + $offset) - 1) * 3, 1, $year) :
- mktime(23, 59, 59, (ceil(date('n', $baseTime) / 3) + $offset) * 3, self::days_in_month((ceil(date('n', $baseTime) / 3) + $offset) * 3, $year), $year);
+ mktime(0, 0, 0, $month-2, 1, $year) :
+ mktime(23, 59, 59, $month, self::days_in_month($month, $year), $year);
break;
case 'year':
$time = $position ? mktime(0, 0, 0, 1, 1, $year + $offset) : mktime(23, 59, 59, 12, 31, $year + $offset);
From b685a32d63685f701ce44eb55cce8531ef0a4d41 Mon Sep 17 00:00:00 2001
From: Karson
Date: Thu, 23 Mar 2023 15:42:03 +0800
Subject: [PATCH 013/103] =?UTF-8?q?=E7=A7=BB=E9=99=A4=E9=BB=98=E8=AE=A4?=
=?UTF-8?q?=E7=9A=84api=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
优化api文档生成文本框
---
.../admin/command/Api/library/Builder.php | 6 +
.../admin/command/Api/template/index.html | 6 +-
public/api.html | 4860 -----------------
3 files changed, 9 insertions(+), 4863 deletions(-)
delete mode 100755 public/api.html
diff --git a/application/admin/command/Api/library/Builder.php b/application/admin/command/Api/library/Builder.php
index 64a2ebd3..7037378b 100755
--- a/application/admin/command/Api/library/Builder.php
+++ b/application/admin/command/Api/library/Builder.php
@@ -88,11 +88,17 @@ class Builder
return [];
}
+ $typeArr = [
+ 'integer' => 'number',
+ 'file' => 'file',
+ ];
$paramslist = array();
foreach ($docs['ApiParams'] as $params) {
+ $inputtype = $params['type'] && isset($typeArr[$params['type']]) ? $typeArr[$params['type']] : ($params['name'] == 'password' ? 'password' : 'text');
$tr = array(
'name' => $params['name'],
'type' => $params['type'] ?? 'string',
+ 'inputtype' => $inputtype,
'sample' => $params['sample'] ?? '',
'required' => $params['required'] ?? true,
'description' => $params['description'] ?? '',
diff --git a/application/admin/command/Api/template/index.html b/application/admin/command/Api/template/index.html
index 02ee4f4a..cfc23c97 100755
--- a/application/admin/command/Api/template/index.html
+++ b/application/admin/command/Api/template/index.html
@@ -137,7 +137,7 @@
Apiurl: