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 01/11] =?UTF-8?q?=E8=A7=A3=E5=86=B3fast/Date::unixtime()bu?= =?UTF-8?q?g=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 cecf1ad1cdc3959d30cbec86d4af460ef4779bae Mon Sep 17 00:00:00 2001 From: Jon <363516862@qq.com> Date: Tue, 28 Mar 2023 09:01:05 +0000 Subject: [PATCH 02/11] =?UTF-8?q?crud=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E9=BB=98=E8=AE=A4=E5=80=BC=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jon <363516862@qq.com> --- application/admin/command/Crud.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php index 390cb953..d66f3229 100755 --- a/application/admin/command/Crud.php +++ b/application/admin/command/Crud.php @@ -957,6 +957,11 @@ class Crud extends Command $attrArr['size'] = 50; } + //字段默认值判断 + if ('NULL' == $defaultValue || "''" == $defaultValue) { + $defaultValue = ''; + } + $formAddElement = Form::input($inputType, $fieldName, $defaultValue, $attrArr); $formEditElement = Form::input($inputType, $fieldName, $editValue, $attrArr); if ($search && $replace) { From 52c83348bc5c2c3ac45ee2c926f3acc7aaa24cff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=AD=90=E6=B6=B5?= <3125976329@qq.com> Date: Wed, 12 Apr 2023 03:47:46 +0000 Subject: [PATCH 03/11] =?UTF-8?q?update=20application/common/controller/Ba?= =?UTF-8?q?ckend.php.=20=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E8=AE=BE=E7=BD=AE=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 王子涵 <3125976329@qq.com> --- application/common/controller/Backend.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/common/controller/Backend.php b/application/common/controller/Backend.php index b70eede8..3bfaaf41 100644 --- a/application/common/controller/Backend.php +++ b/application/common/controller/Backend.php @@ -284,7 +284,7 @@ class Backend extends Controller $bind = []; $name = ''; $aliasName = ''; - if (!empty($this->model) && $this->relationSearch) { + if (!empty($this->model) && $relationSearch) { $name = $this->model->getTable(); $alias[$name] = Loader::parseName(basename(str_replace('\\', '/', get_class($this->model)))); $aliasName = $alias[$name] . '.'; From c69ba1aea329ddc7db298e737f64b7390cc9d2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=92=8C?= <496631085@qq.com> Date: Thu, 20 Apr 2023 01:59:42 +0000 Subject: [PATCH 04/11] =?UTF-8?q?!435=20=E4=BF=AE=E6=94=B9=E5=AF=86?= =?UTF-8?q?=E7=A0=81=E7=B1=BB=E5=9E=8B=E9=BB=98=E8=AE=A4=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=20*=20=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E9=BB=98=E8=AE=A4=E6=89=8B=E6=9C=BA=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/User.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/api/controller/User.php b/application/api/controller/User.php index b13c9002..32f9f6bc 100644 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -298,7 +298,7 @@ class User extends Api */ public function resetpwd() { - $type = $this->request->post("type"); + $type = $this->request->post("type", "mobile"); $mobile = $this->request->post("mobile"); $email = $this->request->post("email"); $newpassword = $this->request->post("newpassword"); From 731f27e0d5aa37ac3fa4d5150e5d5c3c267276d5 Mon Sep 17 00:00:00 2001 From: F4nniu Date: Sun, 30 Apr 2023 14:18:05 +0000 Subject: [PATCH 05/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20ISSUES=20=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: F4nniu --- .gitee/ISSUE_TEMPLATE.zh-CN.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .gitee/ISSUE_TEMPLATE.zh-CN.md diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md new file mode 100644 index 00000000..7673e2fc --- /dev/null +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -0,0 +1,21 @@ +### 类型 +（问题/建议/其他） + + +### 现象 +（请详细描述一下复现过程） + + +### 期望结果 +（请详细描述一下你说期望的结果） + + +### 环境 +（请相信说明一下你的运行环境） +操作系统：？ +Web Server：NGINX/Apache +PHP 版本：？ +MySQL 版本：？ +服务器面板：（BT/phpStudy/XAMPP/其他/无） +FastAdmin 版本：？ +浏览器：（Chrome/IE/Edge/其他） From c4e726ff3a94d2944c718367bd066c177d89c0aa Mon Sep 17 00:00:00 2001 From: F4nniu Date: Sun, 30 Apr 2023 14:19:56 +0000 Subject: [PATCH 06/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20ISSUES=20=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitee/ISSUE_TEMPLATE.zh-CN.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md index 7673e2fc..54d6bc5b 100644 --- a/.gitee/ISSUE_TEMPLATE.zh-CN.md +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -11,7 +11,7 @@ ### 环境 -（请相信说明一下你的运行环境） +（请详细说明一下你的运行环境） 操作系统：？ Web Server：NGINX/Apache PHP 版本：？ From d596d4b4a7d46fbd00b18d3b2b958f996404acaf Mon Sep 17 00:00:00 2001 From: F4nniu Date: Mon, 1 May 2023 01:33:12 +0000 Subject: [PATCH 07/11] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitee/ISSUE_TEMPLATE.zh-CN.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md index 54d6bc5b..0dddbe35 100644 --- a/.gitee/ISSUE_TEMPLATE.zh-CN.md +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -19,3 +19,4 @@ MySQL 版本：？ 服务器面板：（BT/phpStudy/XAMPP/其他/无） FastAdmin 版本：？ 浏览器：（Chrome/IE/Edge/其他） +报错信息： From db487a52df9a10c246e65dcbf264e58da7d16034 Mon Sep 17 00:00:00 2001 From: F4nniu Date: Tue, 2 May 2023 12:21:05 +0000 Subject: [PATCH 08/11] =?UTF-8?q?nelexa=20zip=20=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=BB=A5=20fastadmin-addons=20=E7=BB=84=E4=BB=B6=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96=E4=B8=BA=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 1 - 1 file changed, 1 deletion(-) diff --git a/composer.json b/composer.json index 5dbdbc3d..28d79dc5 100755 --- a/composer.json +++ b/composer.json @@ -25,7 +25,6 @@ "overtrue/pinyin": "^3.0", "phpoffice/phpspreadsheet": "1.19", "overtrue/wechat": "^4.6", - "nelexa/zip": "^3.3", "ext-json": "*", "ext-curl": "*", "ext-pdo": "*", From 1dfd1cc66b3a1be286205127fb5cd4780ae11aca Mon Sep 17 00:00:00 2001 From: F4nniu Date: Wed, 3 May 2023 02:11:30 +0000 Subject: [PATCH 09/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20ISSUE=20=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitee/ISSUE_TEMPLATE.zh-CN.md | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md index 0dddbe35..cadb9c7a 100644 --- a/.gitee/ISSUE_TEMPLATE.zh-CN.md +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -1,22 +1,27 @@ ### 类型 -（问题/建议/其他） + +类型（问题/建议/其他）：？ ### 现象 -（请详细描述一下复现过程） + +现象（请详细描述一下复现过程）：？ ### 期望结果 -（请详细描述一下你说期望的结果） + +期望结果（请详细描述一下你说期望的结果）：？ ### 环境 + （请详细说明一下你的运行环境） -操作系统：？ -Web Server：NGINX/Apache -PHP 版本：？ -MySQL 版本：？ -服务器面板：（BT/phpStudy/XAMPP/其他/无） + +操作系统（Linux/Windows/Other）：？ +Web Server（NGINX/Apache/Other）：？ +PHP 版本（7.2/7.3/7.4/8.0/8.1/8.2/Other）：？ +MySQL 版本(5.6/5.7/8.0/Other)：？ +服务器面板（BT/phpStudy/XAMPP/其他/无）：？ FastAdmin 版本：？ -浏览器：（Chrome/IE/Edge/其他） -报错信息： +浏览器（Chrome/IE/Edge/其他）：？ +报错信息：？ From f49c0ae11b099f48d8c5762ba21524edee96a3a9 Mon Sep 17 00:00:00 2001 From: F4nniu Date: Wed, 3 May 2023 02:12:45 +0000 Subject: [PATCH 10/11] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Issue=20=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitee/ISSUE_TEMPLATE.zh-CN.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md index cadb9c7a..83e51663 100644 --- a/.gitee/ISSUE_TEMPLATE.zh-CN.md +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -17,11 +17,11 @@ （请详细说明一下你的运行环境） -操作系统（Linux/Windows/Other）：？ -Web Server（NGINX/Apache/Other）：？ -PHP 版本（7.2/7.3/7.4/8.0/8.1/8.2/Other）：？ -MySQL 版本(5.6/5.7/8.0/Other)：？ -服务器面板（BT/phpStudy/XAMPP/其他/无）：？ -FastAdmin 版本：？ -浏览器（Chrome/IE/Edge/其他）：？ -报错信息：？ +- 操作系统（Linux/Windows/Other）：？ +- Web Server（NGINX/Apache/Other）：？ +- PHP 版本（7.2/7.3/7.4/8.0/8.1/8.2/Other）：？ +- MySQL 版本(5.6/5.7/8.0/Other)：？ +- 服务器面板（BT/phpStudy/XAMPP/其他/无）：？ +- FastAdmin 版本：？ +- 浏览器（Chrome/IE/Edge/其他）：？ +- 报错信息：？ From 1afdacbcd94018516a4c5cd14065507147c11af1 Mon Sep 17 00:00:00 2001 From: F4nniu Date: Wed, 10 May 2023 08:32:10 +0000 Subject: [PATCH 11/11] update .gitee/ISSUE_TEMPLATE.zh-CN.md. --- .gitee/ISSUE_TEMPLATE.zh-CN.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitee/ISSUE_TEMPLATE.zh-CN.md b/.gitee/ISSUE_TEMPLATE.zh-CN.md index 83e51663..c56a39e6 100644 --- a/.gitee/ISSUE_TEMPLATE.zh-CN.md +++ b/.gitee/ISSUE_TEMPLATE.zh-CN.md @@ -1,22 +1,17 @@ ### 类型 - 类型（问题/建议/其他）：？ ### 现象 - 现象（请详细描述一下复现过程）：？ ### 期望结果 - 期望结果（请详细描述一下你说期望的结果）：？ ### 环境 - （请详细说明一下你的运行环境） - - 操作系统（Linux/Windows/Other）：？ - Web Server（NGINX/Apache/Other）：？ - PHP 版本（7.2/7.3/7.4/8.0/8.1/8.2/Other）：？