同步更新代码

app/admin/controller/Login.php

@@ -59,8 +59,8 @@ class Login extends Controller
                     $this->app->session->set($this->captchaType, $this->captchaToken);
                 }
                 // 更新后台域名
-                if ($this->request->domain(true) !== sysconf('base.site_host|raw')) {
-                    sysconf('base.site_host', $this->request->domain(true));
+                if ($this->request->domain() !== sysconf('base.site_host|raw')) {
+                    sysconf('base.site_host', $this->request->domain());
                 }
                 // 加载登录模板
                 $this->title = '系统登录';

app/admin/controller/api/Queue.php

@@ -17,6 +17,7 @@
 namespace app\admin\controller\api;
 
 use think\admin\Controller;
+use think\admin\model\SystemQueue;
 use think\admin\service\AdminService;
 use think\admin\service\QueueService;
 use think\exception\HttpResponseException;
@@ -108,7 +109,12 @@ class Queue extends Controller
     public function progress()
     {
         $input = $this->_vali(['code.require' => '任务编号不能为空！']);
+        $message = SystemQueue::mk()->where($input)->value('message', '');
+        if (!empty($message)) {
+            $this->success('获取任务进度成功！', json_decode($message, true));
+        } else {
             $queue = QueueService::instance()->initialize($input['code']);
             $this->success('获取任务进度成功！', $queue->progress());
         }
     }
+}

app/admin/view/api/upload.js

@@ -85,8 +85,13 @@ define(['md5', 'notify'], function (SparkMD5, Notify, allowMime) {
             // 图片限宽限高压缩
             if (/^image\//.test(file.type) && (file.maxWidth + file.maxHeight + file.cutWidth + file.cutHeight > 0 || file.quality !== 1)) {
                 require(['compressor'], function (Compressor) {
-                    new Compressor(file, {
-                        quality: file.quality, resize: 'cover', width: file.cutWidth || 0, height: file.cutHeight || 0, maxWidth: file.maxWidth, maxHeight: file.maxHeight, success(blob) {
+                    let options = {quality: file.quality, resize: 'cover'};
+                    if (file.cutWidth) options.width = file.cutWidth;
+                    if (file.cutHeight) options.height = file.cutHeight;
+                    if (file.maxWidth) options.maxWidth = file.maxWidth;
+                    if (file.maxHeight) options.maxHeight = file.maxHeight;
+                    new Compressor(file, Object.assign(options, {
+                        success(blob) {
                             blob.index = file.index, blob.notify = file.notify, blob.path = file.path, files[index] = blob;
                             that.hash(files[index]).then(function (file) {
                                 that.event('upload.hash', file).request(file, done);
@@ -94,7 +99,7 @@ define(['md5', 'notify'], function (SparkMD5, Notify, allowMime) {
                         }, error: function () {
                             that.event('upload.error', {file: file}, file, '压缩失败');
                         }
-                    });
+                    }));
                 });
             } else {
                 that.hash(file).then(function (file) {

database/migrations/20221013031928_install_admin20230621.php

@@ -0,0 +1,36 @@
+<?php
+
+// +----------------------------------------------------------------------
+// | Admin Plugin for ThinkAdmin
+// +----------------------------------------------------------------------
+// | 版权所有 2014~2023 ThinkAdmin [ thinkadmin.top ]
+// +----------------------------------------------------------------------
+// | 官方网站: https://thinkadmin.top
+// +----------------------------------------------------------------------
+// | 开源协议 ( https://mit-license.org )
+// | 免责声明 ( https://thinkadmin.top/disclaimer )
+// +----------------------------------------------------------------------
+// | gitee 代码仓库：https://gitee.com/zoujingli/think-plugs-admin
+// | github 代码仓库：https://github.com/zoujingli/think-plugs-admin
+// +----------------------------------------------------------------------
+
+use think\migration\Migrator;
+
+@set_time_limit(0);
+@ini_set('memory_limit', -1);
+
+/**
+ * 系统模块数据
+ */
+class InstallAdmin20230621 extends Migrator
+{
+    public function change()
+    {
+        // 当前数据表
+        $table = 'system_queue';
+        // 检查与更新数据表
+        $this->table($table)->hasColumn('message') || $this->table($table)
+            ->addColumn('message', 'text', ['default' => NULL, 'null' => true, 'after' => 'attempts', 'comment' => '最新消息'])
+            ->update();
+    }
+}

public/static/admin.js

@@ -856,11 +856,12 @@ $(function () {
 
     /*! 表单元素失去焦点时数字 */
     $.base.onEvent('blur', '[data-blur-number]', function () {
-        let dset = this.dataset, min = dset.valueMin, max = dset.valueMax;
-        let value = parseFloat(this.value) || 0, fiexd = parseInt(dset.blurNumber || 0);
-        if (typeof min !== 'undefined' && value < min) value = min;
-        if (typeof max !== 'undefined' && value > max) value = max;
-        this.value = parseFloat(value).toFixed(fiexd);
+        let set = this.dataset, value = parseFloat(this.value) || 0;
+        let min = $.isNumeric(set.valueMin) ? set.valueMin : this.min;
+        let max = $.isNumeric(set.valueMax) ? set.valueMax : this.max;
+        if ($.isNumeric(min) && value < min) value = parseFloat(min) || 0;
+        if ($.isNumeric(max) && value > max) value = parseFloat(max) || 0;
+        this.value = value.toFixed(parseInt(set.blurNumber) || 0);
     });
 
     /*! 表单元素失焦时提交 */