From f7c5f7e0fe7099d3ff3838dd92b89b0dde2d1570 Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Wed, 27 Jul 2022 18:20:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Eopert=E7=9A=84tab=E6=89=93?=
 =?UTF-8?q?=E5=BC=80=E6=96=B9=E5=BC=8F=EF=BC=9B=E4=BC=98=E5=8C=96=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E5=AE=BD=E5=BA=A6=E9=BB=98=E8=AE=A4=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/static/admin/js/index.js              |  7 ++-----
 public/static/plugs/easy-admin/easy-admin.js | 11 ++++++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/public/static/admin/js/index.js b/public/static/admin/js/index.js
index 4444667..e7997e1 100644
--- a/public/static/admin/js/index.js
+++ b/public/static/admin/js/index.js
@@ -1,4 +1,4 @@
-define(["jquery", "easy-admin", "echarts", "echarts-theme", "miniAdmin", "miniTab"], function ($, ea, echarts, undefined, miniAdmin, miniTab) {
+define(["jquery", "easy-admin", "echarts", "echarts-theme", "miniAdmin"], function ($, ea, echarts, undefined, miniAdmin) {
 
     var Controller = {
         index: function () {
@@ -28,9 +28,6 @@ define(["jquery", "easy-admin", "echarts", "echarts-theme", "miniAdmin", "miniTa
         },
         welcome: function () {
 
-            miniTab.listen();
-
-
             /**
              * 报表功能
              */
@@ -111,7 +108,7 @@ define(["jquery", "easy-admin", "echarts", "echarts-theme", "miniAdmin", "miniTa
                     clearInterval(checkChartVisibleTimer)
                 }
             }, 3000);
-
+            ea.listen();
         },
         editAdmin: function () {
             ea.listen();
diff --git a/public/static/plugs/easy-admin/easy-admin.js b/public/static/plugs/easy-admin/easy-admin.js
index ae929aa..beae0fb 100644
--- a/public/static/plugs/easy-admin/easy-admin.js
+++ b/public/static/plugs/easy-admin/easy-admin.js
@@ -1,4 +1,4 @@
-define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypicker', 'tagInput'], function ($, tableSelect, undefined, miniTheme, tableData, citypicker, tagInput) {
+define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypicker', 'tagInput', 'miniTab'], function ($, tableSelect, undefined, miniTheme, tableData, citypicker, tagInput, miniTab) {
 
     window.onInitElemStyle = function () {
         miniTheme.renderElemStyle()
@@ -756,6 +756,8 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypick
                     formatOperat.method = '';
                 } else if (operat.method === 'blank') {
                     formatOperat.method = ' href="' + formatOperat.url + '" target="_blank" ';
+                } else if (operat.method === 'tab') {
+                    formatOperat.method = ' layuimini-content-href="' + formatOperat.url + '" data-title="' + formatOperat.title + titleEndfix + '"';
                 } else {
                     formatOperat.method = formatOperat.method !== '' ? 'data-request="' + formatOperat.url + '" data-title="' + formatOperat.title + titleEndfix + '" ' : '';
                 }
@@ -779,14 +781,14 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypick
                     for (index in col) {
                         var val = col[index];
 
-                        if (val['width'] == undefined && val['minWidth'] == undefined) {
+                        if (val['minWidth'] == undefined) {
                             var width = null;
                             if (val.title) {
                                 width = val.title.length * 15 + 55
                             }
 
                             if (width != null) {
-                                cols[i][index]['width'] = width
+                                cols[i][index]['minWidth'] = width
                             }
                         }
 
@@ -1424,6 +1426,9 @@ define(["jquery", "tableSelect", "ckeditor", 'miniTheme', 'tableData', 'citypick
             // 监听标签输入控件生成
             admin.api.tagInput();
 
+            // 监听tab操作
+            miniTab.listen();
+
             // 初始化layui表单
             form.render();