From 59963da0e45a9c2ec98f3c0bb226ae41e241642b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Thu, 19 Aug 2021 10:29:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=90=8E=E5=8F=B0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/view/auth/index.html        |  12 +--
 app/admin/view/base/index.html        |  12 +--
 app/admin/view/oplog/index.html       |  12 +--
 app/admin/view/queue/index.html       |   4 +-
 app/admin/view/user/index.html        |  16 ++--
 app/admin/view/user/index_search.html |   4 +-
 public/static/admin.js                | 125 +++++++++++++-------------
 7 files changed, 92 insertions(+), 93 deletions(-)

diff --git a/app/admin/view/auth/index.html b/app/admin/view/auth/index.html
index 7263d0fc3..132100362 100644
--- a/app/admin/view/auth/index.html
+++ b/app/admin/view/auth/index.html
@@ -26,12 +26,12 @@
             sort: {field: 'sort desc,id', type: 'desc'},
             cols: [[
                 {checkbox: true, fixed: true},
-                {field: 'sort', title: '排序权重', width: 100, align: 'center', sort: true, templet: '#SortInputTpl'},
-                {field: 'title', title: '权限名称', minWidth: 140, align: 'center', sort: false},
-                {field: 'desc', title: '权限描述', sort: false, align: 'center', templet: '<div>{{d.desc||"-"}}</div>'},
-                {field: 'create_at', title: '创建时间', align: 'center', sort: true},
-                {field: 'status', title: '权限状态', align: 'center', minWidth: 110, fixed: 'right', templet: '#StatusSwitchTpl'},
-                {toolbar: '#toolbar', title: '操作面板', align: 'center', minWidth: 200, fixed: 'right'},
+                {field: 'sort', title: '排序权重', align: 'center', width: 100, sort: true, templet: '#SortInputTpl'},
+                {field: 'title', title: '权限名称', align: 'center', minWidth: 140},
+                {field: 'desc', title: '权限描述', align: 'center', minWidth: 110, templet: '<div>{{d.desc||"-"}}</div>'},
+                {field: 'status', title: '权限状态', align: 'center', minWidth: 110, templet: '#StatusSwitchTpl'},
+                {field: 'create_at', title: '创建时间', align: 'center', minWidth: 170, sort: true},
+                {toolbar: '#toolbar', title: '操作面板', align: 'center', minWidth: 210, fixed: 'right'},
             ]]
         });
 
diff --git a/app/admin/view/base/index.html b/app/admin/view/base/index.html
index c08c4fbf6..2be231d6f 100644
--- a/app/admin/view/base/index.html
+++ b/app/admin/view/base/index.html
@@ -37,12 +37,12 @@
             cols: [[
                 {checkbox: true, fixed: true},
                 {field: 'sort', title: '排序权重', width: 100, align: 'center', sort: true, templet: '#SortInputTpl'},
-                // {field: 'type', title: '数据类型', minWidth: 140, align: 'center', sort: false},
-                {field: 'code', title: '数据编码', minWidth: 140, align: 'center', sort: false},
-                {field: 'name', title: '数据名称', minWidth: 140, align: 'center', sort: false},
-                {field: 'create_at', title: '创建时间', align: 'center', sort: true},
-                {field: 'status', title: '数据状态', align: 'center', minWidth: 110, fixed: 'right', templet: '#StatusSwitchTpl'},
-                {toolbar: '#toolbar', align: 'center', minWidth: 140, title: '数据操作', fixed: 'right'},
+                // {field: 'type', title: '数据类型', minWidth: 140, align: 'center'},
+                {field: 'code', title: '数据编码', minWidth: 140, align: 'center'},
+                {field: 'name', title: '数据名称', minWidth: 140, align: 'center'},
+                {field: 'status', title: '数据状态', minWidth: 110, align: 'center', templet: '#StatusSwitchTpl'},
+                {field: 'create_at', title: '创建时间', minWidth: 170, align: 'center', sort: true},
+                {toolbar: '#toolbar', align: 'center', width: 150, title: '数据操作', fixed: 'right'},
             ]]
         });
 
diff --git a/app/admin/view/oplog/index.html b/app/admin/view/oplog/index.html
index 2e88c0b03..350704330 100644
--- a/app/admin/view/oplog/index.html
+++ b/app/admin/view/oplog/index.html
@@ -25,12 +25,12 @@
             cols: [[
                 {checkbox: true},
                 {field: 'id', title: 'ID', width: 80, sort: true, align: 'center'},
-                {field: 'username', title: '操作账号', sort: true, align: 'center'},
-                {field: 'node', title: '操作节点', sort: true},
-                {field: 'action', title: '操作行为', sort: true},
-                {field: 'content', title: '操作描述', sort: false},
-                {field: 'geoip', title: '访问地址', sort: true},
-                {field: 'geoisp', title: '网络服务商', sort: false},
+                {field: 'username', title: '操作账号', minWidth: 100, sort: true, align: 'center'},
+                {field: 'node', title: '操作节点', minWidth: 120, sort: true},
+                {field: 'action', title: '操作行为', minWidth: 120, sort: true},
+                {field: 'content', title: '操作描述', minWidth: 120, sort: false},
+                {field: 'geoip', title: '访问地址', minWidth: 100, sort: true},
+                {field: 'geoisp', title: '网络服务商', minWidth: 100, sort: false},
                 {field: 'create_at', title: '操作时间', minWidth: 170, align: 'center', sort: true},
                 {toolbar: '#toolbar', title: '操作面板', align: 'center', fixed: 'right'}
             ]]
diff --git a/app/admin/view/queue/index.html b/app/admin/view/queue/index.html
index 63d3ba991..8a0d64f49 100644
--- a/app/admin/view/queue/index.html
+++ b/app/admin/view/queue/index.html
@@ -94,7 +94,7 @@
                 {field: 'attempts', title: '执行次数', minWidth: 95, align: 'center', sort: true, templet: "<div>{{d.attempts||0}}</div>"},
                 {field: 'exec_desc', title: '执行结果', minWidth: 180},
                 {field: 'create_at', title: '创建时间', align: 'center', minWidth: 170},
-                {toolbar: '#toolbar', title: '操作面板', align: 'center', width: 251, fixed: 'right',}
+                {toolbar: '#toolbar', title: '操作面板', align: 'center', width: 260, fixed: 'right',}
             ]]
         });
     });
@@ -143,7 +143,7 @@
     </a>
     <!--{/if}-->
 
-    <a class='layui-badge layui-bg-orange margin-0' onclick="$.loadQueue('{{d.code}}',false)">
+    <a class='layui-badge layui-bg-orange margin-0' onclick="$.loadQueue('{{d.code}}',false,this)">
         <i class="layui-icon font-s12">&#xe705;</i>
     </a>
 </script>
diff --git a/app/admin/view/user/index.html b/app/admin/view/user/index.html
index 0a0ad6ab6..931c63d39 100644
--- a/app/admin/view/user/index.html
+++ b/app/admin/view/user/index.html
@@ -41,21 +41,21 @@
             cols: [[
                 {checkbox: true, fixed: true},
                 {field: 'sort', title: '排序权重', width: 100, align: 'center', sort: true, templet: '#SortInputTpl'},
-                {field: 'username', title: '登录账号', minWidth: 100, templet: '<div>{{d.username||"-"}}</div>'},
-                {field: 'nickname', title: '用户名称', minWidth: 100, templet: '<div>{{d.nickname||"-"}}</div>'},
+                {field: 'username', title: '登录账号', minWidth: 110, templet: '<div>{{d.username||"-"}}</div>'},
+                {field: 'nickname', title: '用户名称', minWidth: 110, templet: '<div>{{d.nickname||"-"}}</div>'},
                 {
                     field: 'usertype', title: '角色身份', minWidth: 140, sort: true, templet: function (d) {
                         d.userinfo = d.userinfo || {};
                         return d.userinfo.code ? (d.userinfo.name + ' ( ' + d.userinfo.code + ' ) ') : '';
                     }
                 },
-                {field: 'contact_mail', title: '联系邮箱', templet: '<div>{{d.contact_mail||"-"}}</div>'},
-                {field: 'contact_phone', title: '联系电话', templet: '<div>{{d.contact_phone||"-"}}</div>'},
-                {field: 'login_num', title: '登录次数', align: 'center', minWidth: 80, sort: false},
-                {field: 'login_at', title: '最后登录', sort: true, align: 'center', minWidth: 170},
+                // {field: 'contact_mail', title: '联系邮箱', minWidth: 80, templet: '<div>{{d.contact_mail||"-"}}</div>'},
+                // {field: 'contact_phone', title: '联系电话', minWidth: 80, templet: '<div>{{d.contact_phone||"-"}}</div>'},
+                {field: 'status', title: '账号状态', align: 'center', minWidth: 110, templet: '#StatusSwitchTpl'},
+                {field: 'login_num', title: '登录次数', align: 'center', minWidth: 80, sort: true},
+                {field: 'login_at', title: '最后登录', align: 'center', minWidth: 170, sort: true},
                 {field: 'create_at', title: '创建时间', align: 'center', minWidth: 170, sort: true},
-                {field: 'status', title: '权限状态', align: 'center', minWidth: 110, fixed: 'right', templet: '#StatusSwitchTpl'},
-                {toolbar: '#toolbar', title: '操作面板', align: 'center', minWidth: 160, fixed: 'right'}
+                {toolbar: '#toolbar', title: '操作面板', align: 'center', width: 160, fixed: 'right'}
             ]]
         });
 
diff --git a/app/admin/view/user/index_search.html b/app/admin/view/user/index_search.html
index 807df6bdb..6acc3a82b 100644
--- a/app/admin/view/user/index_search.html
+++ b/app/admin/view/user/index_search.html
@@ -32,14 +32,14 @@
         </div>
         <!--{/notempty}-->
 
-        <div class="layui-form-item layui-inline">
+        <div class="layui-form-item layui-inline layui-hide">
             <label class="layui-form-label">联系手机</label>
             <label class="layui-input-inline">
                 <input name="phone" value="{:input('get.phone')}" placeholder="请输入联系手机" class="layui-input">
             </label>
         </div>
 
-        <div class="layui-form-item layui-inline">
+        <div class="layui-form-item layui-inline layui-hide">
             <label class="layui-form-label">联系邮箱</label>
             <label class="layui-input-inline">
                 <input name="mail" value="{:input('get.mail')}" placeholder="请输入联系邮箱" class="layui-input">
diff --git a/public/static/admin.js b/public/static/admin.js
index bd434671b..0407ba7c7 100644
--- a/public/static/admin.js
+++ b/public/static/admin.js
@@ -682,7 +682,7 @@ $(function () {
             // 动态计算最大页数
             opt.done = function () {
                 layui.sessionData('pages', {key: elem.id, value: this.page.curr || 1}), (this.loading = true);
-                this.elem.next().find('[data-load],[data-action]').not('[data-table-id]').attr('data-table-id', elem.id);
+                this.elem.next().find('[data-load],[data-queue],[data-action]').not('[data-table-id]').attr('data-table-id', elem.id);
             }, opt.parseData = function (res) {
                 var maxPage = Math.ceil(res.count / this.limit), curPage = layui.sessionData('pages')[opt.id] || 1;
                 if (curPage > maxPage) this.elem.trigger('reload', {page: {curr: maxPage}});
@@ -757,11 +757,7 @@ $(function () {
 
     /*! 注册 data-reload 事件行为 */
     onEvent('click', '[data-reload]', function () {
-        if (this.dataset.tableId) {
-            $('#' + this.dataset.tableId).trigger('reload');
-        } else {
-            $.form.reload();
-        }
+        this.dataset.tableId ? $('#' + this.dataset.tableId).trigger('reload') : $.form.reload();
     });
 
     /*! 注册 data-dbclick 事件行为 */
@@ -871,73 +867,76 @@ $(function () {
         })(e.currentTarget.dataset.confirm, function () {
             $.form.load(e.currentTarget.dataset.queue, {}, 'post', function (ret) {
                 if (typeof ret.data === 'string' && ret.data.indexOf('Q') === 0) {
-                    return $.loadQueue(ret.data, true), false;
+                    return $.loadQueue(ret.data, true, e.currentTarget), false;
                 }
             });
         });
     });
-    $.loadQueue = function (code, doScript, doAjax) {
-        layer.open({
+    $.loadQueue = function (code, doScript, element) {
+        var doAjax = true;
+        layui.layer.open({
             type: 1, title: false, area: ['560px', '315px'], anim: 2, shadeClose: false, end: function () {
                 doAjax = false;
+                if (element && element.dataset && element.dataset.tableId) {
+                    $('#' + element.dataset.tableId).trigger('reload');
+                } else {
+                    $.form.reload();
+                }
             }, content: '' +
-                '<div class="padding-30 padding-bottom-0" style="width:500px" data-queue-load="' + code + '">' +
-                '   <div class="layui-elip nowrap" data-message-title></div>' +
+                '<div class="padding-30 padding-bottom-0"  data-queue-load="' + code + '">' +
+                '   <div class="layui-elip notselect nowrap" data-message-title></div>' +
                 '   <div class="margin-top-15 layui-progress layui-progress-big" lay-showPercent="yes"><div class="layui-progress-bar transition" lay-percent="0.00%"></div></div>' +
                 '   <div class="margin-top-15"><code class="layui-textarea layui-bg-black border-0" disabled style="resize:none;overflow:hidden;height:190px"></code></div>' +
-                '</div>'
-        });
-        (function loadprocess(code, that) {
-            that = this, that.$box = $('[data-queue-load=' + code + ']');
-            if (doAjax === false || that.$box.length < 1) return false;
-            this.$code = that.$box.find('code'), this.$name = that.$box.find('[data-message-title]');
-            this.$percent = that.$box.find('.layui-progress div'), this.runCache = function (code, index, value) {
-                this.ckey = code + '_' + index, this.ctype = 'admin-queue-script';
-                return value !== undefined ? layui.data(this.ctype, {key: this.ckey, value: value}) : layui.data(this.ctype)[this.ckey] || 0;
-            };
-            this.setState = function (status, message) {
-                if (message.indexOf('javascript:') === -1) if (status === 1) {
-                    that.$name.html('<b class="color-text">' + message + '</b>').addClass('text-center');
-                    that.$percent.addClass('layui-bg-blue').removeClass('layui-bg-green layui-bg-red');
-                } else if (status === 2) {
-                    if (message.indexOf('>>>') > -1) {
-                        that.$name.html('<b class="color-blue">' + message + '</b>').addClass('text-center');
-                    } else {
-                        that.$name.html('<b class="color-blue">正在处理：</b>' + message).removeClass('text-center');
-                    }
-                    that.$percent.addClass('layui-bg-blue').removeClass('layui-bg-green layui-bg-red');
-                } else if (status === 3) {
-                    that.$name.html('<b class="color-green">' + message + '</b>').addClass('text-center');
-                    that.$percent.addClass('layui-bg-green').removeClass('layui-bg-blue layui-bg-red');
-                } else if (status === 4) {
-                    that.$name.html('<b class="color-red">' + message + '</b>').addClass('text-center');
-                    that.$percent.addClass('layui-bg-red').removeClass('layui-bg-blue layui-bg-green');
-                }
-            };
-            $.form.load(tapiRoot + '/api.queue/progress', {code: code}, 'post', function (ret) {
-                if (ret.code) {
-                    that.lines = [];
-                    for (this.lineIndex in ret.data.history) {
-                        this.line = ret.data.history[this.lineIndex], this.percent = '[ ' + this.line.progress + '% ] ';
-                        if (this.line.message.indexOf('javascript:') === -1) {
-                            that.lines.push(this.line.message.indexOf('>>>') > -1 ? this.line.message : this.percent + this.line.message);
-                        } else if (!that.runCache(code, this.lineIndex) && doScript !== false) {
-                            that.runCache(code, this.lineIndex, 1), location.href = this.line.message;
+                '</div>',
+            success: function ($elem) {
+                new function () {
+                    var that = this;
+                    this.$box = $elem.find('[data-queue-load=' + code + ']');
+                    if (doAjax === false || this.$box.length < 1) return false;
+                    this.$coder = this.$box.find('code'), this.$name = this.$box.find('[data-message-title]');
+                    this.$percent = this.$box.find('.layui-progress div'), this.SetCache = function (code, index, value) {
+                        var ckey = code + '_' + index, ctype = 'admin-queue-script';
+                        return value !== undefined ? layui.data(ctype, {key: ckey, value: value}) : layui.data(ctype)[ckey] || 0;
+                    }, this.SetState = function (status, message) {
+                        if (message.indexOf('javascript:') === -1) if (status === 1) {
+                            that.$name.html('<b class="color-text">' + message + '</b>').addClass('text-center');
+                            that.$percent.addClass('layui-bg-blue').removeClass('layui-bg-green layui-bg-red');
+                        } else if (status === 2) {
+                            if (message.indexOf('>>>') > -1) {
+                                that.$name.html('<b class="color-blue">' + message + '</b>').addClass('text-center');
+                            } else {
+                                that.$name.html('<b class="color-blue">正在处理：</b>' + message).removeClass('text-center');
+                            }
+                            that.$percent.addClass('layui-bg-blue').removeClass('layui-bg-green layui-bg-red');
+                        } else if (status === 3) {
+                            that.$name.html('<b class="color-green">' + message + '</b>').addClass('text-center');
+                            that.$percent.addClass('layui-bg-green').removeClass('layui-bg-blue layui-bg-red');
+                        } else if (status === 4) {
+                            that.$name.html('<b class="color-red">' + message + '</b>').addClass('text-center');
+                            that.$percent.addClass('layui-bg-red').removeClass('layui-bg-blue layui-bg-green');
                         }
-                    }
-                    if (ret.data.status > 0) {
-                        that.$code.html('<p class="layui-elip">' + that.lines.join('</p><p class="layui-elip">') + '</p>'), that.$code.animate({scrollTop: that.$code[0].scrollHeight + 'px'}, 200);
-                        that.$percent.attr('lay-percent', (parseFloat(ret.data.progress || '0.00').toFixed(2)) + '%'), layui.element.render();
-                        that.setState(parseInt(ret.data.status), ret.data.message);
-                    } else return setTimeout(function () {
-                        loadprocess(code);
-                    }, Math.floor(Math.random() * 500) + 200), false;
-                    if (parseInt(ret.data.status) === 3 || parseInt(ret.data.status) === 4) return false; else return setTimeout(function () {
-                        loadprocess(code);
-                    }, Math.floor(Math.random() * 200)), false;
-                }
-            }, false);
-        })(code)
+                    }, (this.LoadProgress = function () {
+                        if (doAjax === false || that.$box.length < 1) return false;
+                        $.form.load(tapiRoot + '/api.queue/progress', {code: code}, 'post', function (ret) {
+                            if (ret.code) {
+                                var lines = [];
+                                for (var idx in ret.data.history) {
+                                    var line = ret.data.history[idx], percent = '[ ' + line.progress + '% ] ';
+                                    if (line.message.indexOf('javascript:') === -1) lines.push(line.message.indexOf('>>>') > -1 ? line.message : percent + line.message);
+                                    else if (!that.SetCache(code, idx) && doScript !== false) that.SetCache(code, idx, 1), location.href = line.message;
+                                }
+                                if (ret.data.status > 0) {
+                                    that.SetState(parseInt(ret.data.status), ret.data.message);
+                                    that.$percent.attr('lay-percent', (parseFloat(ret.data.progress || '0.00').toFixed(2)) + '%'), layui.element.render();
+                                    that.$coder.html('<p class="layui-elip">' + lines.join('</p><p class="layui-elip">') + '</p>').animate({scrollTop: that.$coder[0].scrollHeight + 'px'}, 200);
+                                    return parseInt(ret.data.status) === 3 || parseInt(ret.data.status) === 4 || setTimeout(that.LoadProgress, Math.floor(Math.random() * 200)), false;
+                                } else return setTimeout(that.LoadProgress, Math.floor(Math.random() * 500) + 200), false;
+                            }
+                        }, false);
+                    })();
+                };
+            }
+        });
     };
 
     /*! 注册 data-tips-text 事件行为 */