From 2c0422af18978eb0e7118220b710bc4e41f5b806 Mon Sep 17 00:00:00 2001
From: chenjinlong <22208488@qq.com>
Date: Wed, 27 Jan 2021 17:00:12 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BF=AE=E6=94=B9form?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=A0=B7=E5=BC=8F=E4=BB=A5=E5=8F=8A=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=A4=8D=E6=9D=82=E8=A1=A8=E5=8D=95header,card-header?=
 =?UTF-8?q?=E4=BB=85=E4=BE=9B=E5=A4=8D=E6=9D=82=E8=A1=A8=E5=8D=95=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/assets/expand/module/func/func.js  | 25 ++++-------------
 .../webapp/assets/modular/system/app/app.js   |  2 --
 .../assets/modular/system/config/config.js    |  8 ++----
 .../assets/modular/system/config/sysConfig.js |  2 --
 .../modular/system/datasource/datasource.js   |  1 -
 .../webapp/assets/modular/system/dept/dept.js |  2 --
 .../assets/modular/system/dict/dictType.js    |  4 ---
 .../modular/system/fileInfo/file_info.js      |  1 -
 .../assets/modular/system/i18n/translation.js |  4 +--
 .../modular/system/i18n/translation_add.js    |  2 --
 .../assets/modular/system/index/message.js    |  1 -
 .../webapp/assets/modular/system/log/log.js   |  1 -
 .../assets/modular/system/menu/button.js      | 28 +++++++++++++++++--
 .../webapp/assets/modular/system/menu/menu.js |  3 --
 .../modular/system/message/message_list.js    |  1 -
 .../assets/modular/system/notice/notice.js    |  2 --
 .../system/organization/organization.js       |  2 --
 .../modular/system/position/position.js       |  2 --
 .../modular/system/resource/resource.js       |  1 -
 .../webapp/assets/modular/system/role/role.js |  7 -----
 .../assets/modular/system/timers/timers.js    |  2 --
 .../webapp/assets/modular/system/user/user.js |  5 ----
 .../pages/modular/system/dict/dict_edit.html  |  1 -
 .../modular/system/i18n/translation_add.html  |  1 -
 .../modular/system/i18n/translation_edit.html |  1 -
 .../pages/modular/system/menu/button.html     |  1 +
 .../pages/modular/system/menu/menu_add.html   |  1 -
 .../pages/modular/system/menu/menu_edit.html  |  1 -
 .../modular/system/notice/notice_add.html     |  1 -
 .../modular/system/notice/notice_edit.html    |  1 -
 .../pages/modular/system/role/role_add.html   |  1 -
 .../pages/modular/system/role/role_edit.html  |  1 -
 .../modular/system/timers/timers_add.html     |  1 -
 .../modular/system/timers/timers_edit.html    |  1 -
 34 files changed, 36 insertions(+), 82 deletions(-)

diff --git a/src/main/webapp/assets/expand/module/func/func.js b/src/main/webapp/assets/expand/module/func/func.js
index 88912c25..cb95b16e 100644
--- a/src/main/webapp/assets/expand/module/func/func.js
+++ b/src/main/webapp/assets/expand/module/func/func.js
@@ -36,27 +36,14 @@ layui.define(['jquery', 'layer', 'admin', 'table'], function (exports) {
          * 打开表单的弹框
          */
         open: function (param) {
+            //默认宽度
+            const width = param.width || '1000px';
+            //默认高度
+            const height = param.height || '700px';
 
-            //宽度计算
-            var width = '1000px';
-            if (param.width) {
-                width = param.width;
-            }
-
-            //计算高度
-            var clientHeight = func.getClientHeight();
-            if (param.height) {
-                if (clientHeight < param.height) {
-                    param.area = [width, clientHeight + "px"];
-                } else {
-                    param.area = [width, param.height + "px"];
-                }
-            } else {
-                param.area = [width, clientHeight + "px"];
-            }
-
+            param.area = [width, height];
             param.skin = 'layui-layer-admin';
-            param.offset = '35px';
+            param.offset = '70px';
             param.type = 2;
 
             admin.putTempData('formOk', false);
diff --git a/src/main/webapp/assets/modular/system/app/app.js b/src/main/webapp/assets/modular/system/app/app.js
index e91940a1..3a2fedb6 100644
--- a/src/main/webapp/assets/modular/system/app/app.js
+++ b/src/main/webapp/assets/modular/system/app/app.js
@@ -46,7 +46,6 @@ layui.use(['table', 'HttpRequest', 'func', 'form'], function () {
      */
     App.openAddDlg = function () {
         func.open({
-            height: 500,
             title: '添加应用',
             content: Feng.ctxPath + '/view/app/add',
             tableId: App.tableId
@@ -60,7 +59,6 @@ layui.use(['table', 'HttpRequest', 'func', 'form'], function () {
      */
     App.openEditDlg = function (data) {
         func.open({
-            height: 500,
             title: '修改应用',
             content: Feng.ctxPath + '/view/app/edit?appId=' + data.appId,
             tableId: App.tableId
diff --git a/src/main/webapp/assets/modular/system/config/config.js b/src/main/webapp/assets/modular/system/config/config.js
index ff31cf11..a5389b3f 100644
--- a/src/main/webapp/assets/modular/system/config/config.js
+++ b/src/main/webapp/assets/modular/system/config/config.js
@@ -21,7 +21,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu
     DictType.openAddDlg = function (data) {
         console.log(data);
         func.open({
-            height: 680,
             title: '添加系统配置',
             content: Feng.ctxPath + '/view/config/addView?groupCode=' + data.dictCode,
             tableId: Dict.tableId
@@ -31,7 +30,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu
     /* 字典类型-点击编辑对话框 */
     DictType.openEditDlg = function (data) {
         func.open({
-            height: 680,
             title: '修改系统配置',
             content: Feng.ctxPath + '/view/config/editView?configId=' + data.configId,
             tableId: Dict.tableId
@@ -105,8 +103,7 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu
     /* 字典-点击新增对话框 */
     Dict.openAddDlg = function (data) {
         func.open({
-            height: 680,
-            title: '添加字典',
+            title: '添加配置类型',
             content: Feng.ctxPath + '/view/dict/addConfigView',
             tableId: DictType.tableId
         });
@@ -115,8 +112,7 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu
     /* 字典-点击编辑对话框 */
     Dict.openEditDlg = function (data) {
         func.open({
-            height: 680,
-            title: '修改字典',
+            title: '修改配置类型',
             content: Feng.ctxPath + '/view/dict/editView?dictId=' + data.dictId,
             tableId: Dict.tableId
         });
diff --git a/src/main/webapp/assets/modular/system/config/sysConfig.js b/src/main/webapp/assets/modular/system/config/sysConfig.js
index 5a3086bd..ae3f8ef6 100644
--- a/src/main/webapp/assets/modular/system/config/sysConfig.js
+++ b/src/main/webapp/assets/modular/system/config/sysConfig.js
@@ -44,7 +44,6 @@ layui.use(['table', 'func', 'HttpRequest'], function () {
      */
     SysConfig.openAddDlg = function () {
         func.open({
-            height: 680,
             title: '添加系统配置',
             content: Feng.ctxPath + '/view/config/addView',
             tableId: SysConfig.tableId
@@ -70,7 +69,6 @@ layui.use(['table', 'func', 'HttpRequest'], function () {
      */
     SysConfig.openEditDlg = function (data) {
         func.open({
-            height: 680,
             title: '修改系统配置',
             content: Feng.ctxPath + '/view/config/editView?configId=' + data.configId,
             tableId: SysConfig.tableId
diff --git a/src/main/webapp/assets/modular/system/datasource/datasource.js b/src/main/webapp/assets/modular/system/datasource/datasource.js
index 155e9329..945156be 100644
--- a/src/main/webapp/assets/modular/system/datasource/datasource.js
+++ b/src/main/webapp/assets/modular/system/datasource/datasource.js
@@ -46,7 +46,6 @@ layui.use(['table', 'admin', 'HttpRequest', 'func'], function () {
    */
   DatabaseInfo.openAddDlg = function () {
     func.open({
-      height: 680,
       title: '添加数据源',
       content: Feng.ctxPath + '/view/datasource/add',
       tableId: DatabaseInfo.tableId
diff --git a/src/main/webapp/assets/modular/system/dept/dept.js b/src/main/webapp/assets/modular/system/dept/dept.js
index f71ce147..7b0ba8ad 100644
--- a/src/main/webapp/assets/modular/system/dept/dept.js
+++ b/src/main/webapp/assets/modular/system/dept/dept.js
@@ -57,7 +57,6 @@ layui.use(['table', 'admin', 'ax', 'ztree', 'func', 'tree'], function () {
      */
     Dept.openAddDept = function () {
         func.open({
-            height: 530,
             title: '添加部门',
             content: Feng.ctxPath + '/dept/dept_add',
             tableId: Dept.tableId,
@@ -74,7 +73,6 @@ layui.use(['table', 'admin', 'ax', 'ztree', 'func', 'tree'], function () {
      */
     Dept.onEditDept = function (data) {
         func.open({
-            height: 530,
             title: '编辑部门',
             content: Feng.ctxPath + "/dept/dept_update?deptId=" + data.deptId,
             tableId: Dept.tableId,
diff --git a/src/main/webapp/assets/modular/system/dict/dictType.js b/src/main/webapp/assets/modular/system/dict/dictType.js
index 9b148cc3..1de68d7e 100644
--- a/src/main/webapp/assets/modular/system/dict/dictType.js
+++ b/src/main/webapp/assets/modular/system/dict/dictType.js
@@ -20,7 +20,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu
     /* 字典类型-点击新增对话框 */
     DictType.openAddDlg = function () {
         func.open({
-            height: 700,
             title: '添加字典类型',
             content: Feng.ctxPath + '/view/dictType/addView',
             tableId: DictType.tableId
@@ -30,7 +29,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu
     /* 字典类型-点击编辑对话框 */
     DictType.openEditDlg = function (data) {
         func.open({
-            height: 700,
             title: '修改字典类型',
             content: Feng.ctxPath + '/view/dictType/editView?dictTypeId=' + data.dictTypeId,
             tableId: DictType.tableId
@@ -130,7 +128,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu
     /* 字典-点击新增对话框 */
     Dict.openAddDlg = function (data) {
         func.open({
-            height: 680,
             title: '添加字典',
             content: Feng.ctxPath + '/view/dict/addView?dictTypeId=' + data.dictTypeId,
             tableId: Dict.tableId
@@ -140,7 +137,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu
     /* 字典-点击编辑对话框 */
     Dict.openEditDlg = function (data) {
         func.open({
-            height: 680,
             title: '修改字典',
             content: Feng.ctxPath + '/view/dict/editView?dictId=' + data.dictId,
             tableId: Dict.tableId
diff --git a/src/main/webapp/assets/modular/system/fileInfo/file_info.js b/src/main/webapp/assets/modular/system/fileInfo/file_info.js
index 7d9f5ca2..7dacf560 100644
--- a/src/main/webapp/assets/modular/system/fileInfo/file_info.js
+++ b/src/main/webapp/assets/modular/system/fileInfo/file_info.js
@@ -82,7 +82,6 @@ layui.use(['table', 'form', 'func', 'HttpRequest', 'util', 'upload'], function (
     // 点击详情
     FileInfo.openDetails = function (data) {
         func.open({
-            height: 800,
             title: '详情',
             content: Feng.ctxPath + '/view/fileInfoDetails?fileId=' + data.fileId,
             tableId: FileInfo.tableId
diff --git a/src/main/webapp/assets/modular/system/i18n/translation.js b/src/main/webapp/assets/modular/system/i18n/translation.js
index c7b0d9aa..1cd3f426 100644
--- a/src/main/webapp/assets/modular/system/i18n/translation.js
+++ b/src/main/webapp/assets/modular/system/i18n/translation.js
@@ -67,8 +67,7 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu
     /* 字典-点击新增对话框 */
     Dict.openAddDlg = function (data) {
         func.open({
-            height: 680,
-            title: '添加字典',
+            title: '添加语种',
             content: Feng.ctxPath + '/view/i18n/addTranslationView',
             tableId: Dict.tableId
         });
@@ -145,7 +144,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'func', 'HttpRequest'], fu
     /* 字典类型-点击编辑对话框 */
     Translation.openEditDlg = function (data) {
         func.open({
-            height: 680,
             title: '修改系统配置',
             content: Feng.ctxPath + '/view/i18n/edit?tranId=' + data.tranId,
             tableId: Translation.tableId
diff --git a/src/main/webapp/assets/modular/system/i18n/translation_add.js b/src/main/webapp/assets/modular/system/i18n/translation_add.js
index 10110d35..510fb678 100644
--- a/src/main/webapp/assets/modular/system/i18n/translation_add.js
+++ b/src/main/webapp/assets/modular/system/i18n/translation_add.js
@@ -5,8 +5,6 @@ layui.use(['form', 'admin', 'HttpRequest'], function () {
     var admin = layui.admin;
 
     $("#tranLanguageCode").val(Feng.getUrlParam("tranLanguageCode"));
-    //让当前iframe弹层高度适应
-    admin.iframeAuto();
 
     //表单提交事件
     form.on('submit(btnSubmit)', function (data) {
diff --git a/src/main/webapp/assets/modular/system/index/message.js b/src/main/webapp/assets/modular/system/index/message.js
index 260cc3cb..6b9aadc7 100644
--- a/src/main/webapp/assets/modular/system/index/message.js
+++ b/src/main/webapp/assets/modular/system/index/message.js
@@ -42,7 +42,6 @@ layui.use(['element', 'admin', 'HttpRequest', 'func'], function () {
     Message.openViewDlg = function (messageId) {
         func.open({
             title: '查看消息',
-            height: 540,
             content: Feng.ctxPath + '/view/message_view?messageId=' + messageId,
             tableId: Message.tableId
         });
diff --git a/src/main/webapp/assets/modular/system/log/log.js b/src/main/webapp/assets/modular/system/log/log.js
index b776332e..3427f3cc 100644
--- a/src/main/webapp/assets/modular/system/log/log.js
+++ b/src/main/webapp/assets/modular/system/log/log.js
@@ -49,7 +49,6 @@ layui.use(['HttpRequest', 'treeTable', 'laydate', 'func', 'form'], function () {
     // 点击详情
     Log.openDetailDlg = function (data) {
         func.open({
-            height: 800,
             title: '日志详情',
             content: Feng.ctxPath + '/view/log/detailView?logId=' + data.logId,
             tableId: Log.tableId
diff --git a/src/main/webapp/assets/modular/system/menu/button.js b/src/main/webapp/assets/modular/system/menu/button.js
index 6931150b..f3dca583 100644
--- a/src/main/webapp/assets/modular/system/menu/button.js
+++ b/src/main/webapp/assets/modular/system/menu/button.js
@@ -42,7 +42,8 @@ layui.use(['table', 'HttpRequest', 'func'], function () {
      */
     MenuButton.openAddDlg = function () {
         func.open({
-            height: 500,
+            height: '350px',
+            width: '500px',
             title: '添加菜单按钮',
             content: Feng.ctxPath + '/view/menuButton/add?menuId=' + menuId,
             tableId: MenuButton.tableId
@@ -56,7 +57,8 @@ layui.use(['table', 'HttpRequest', 'func'], function () {
      */
     MenuButton.openEditDlg = function (data) {
         func.open({
-            height: 500,
+            height: '350px',
+            width: '500px',
             title: '修改菜单按钮',
             content: Feng.ctxPath + '/view/menuButton/edit?buttonId=' + data.buttonId,
             tableId: MenuButton.tableId
@@ -82,6 +84,23 @@ layui.use(['table', 'HttpRequest', 'func'], function () {
         Feng.confirm("是否删除?", operation);
     };
 
+    /**
+     * 点击意见添加系统默认按钮
+     */
+    MenuButton.onAddDefaultItem = function () {
+        var operation = function () {
+            var request = new HttpRequest(Feng.ctxPath + "/sysMenuButton/addSystemDefaultButton", 'post', function (data) {
+                Feng.success("添加成功!");
+                table.reload(MenuButton.tableId);
+            }, function (data) {
+                Feng.error("添加失败!" + data.message + "!");
+            });
+            request.set("menuId", menuId);
+            request.start(true);
+        };
+        Feng.confirm("是否一键添加系统默认CRUD操作按钮?", operation);
+    };
+
     // 渲染表格
     var tableResult = table.render({
         elem: '#' + MenuButton.tableId,
@@ -104,6 +123,11 @@ layui.use(['table', 'HttpRequest', 'func'], function () {
         MenuButton.openAddDlg();
     });
 
+    // 一键添加按钮点击事件
+    $('#defaultBtnAdd').click(function () {
+        MenuButton.onAddDefaultItem();
+    });
+
     // 批量删除按钮点击事件
     $('#btnBatchDelete').click(function () {
         let checkStatus = table.checkStatus(MenuButton.tableId);
diff --git a/src/main/webapp/assets/modular/system/menu/menu.js b/src/main/webapp/assets/modular/system/menu/menu.js
index cd865151..dd932b77 100644
--- a/src/main/webapp/assets/modular/system/menu/menu.js
+++ b/src/main/webapp/assets/modular/system/menu/menu.js
@@ -70,7 +70,6 @@ layui.use(['HttpRequest', 'treeTable', 'func'], function () {
      */
     Menu.openAddMenu = function () {
         func.open({
-            height: 660,
             title: '添加菜单',
             content: Feng.ctxPath + '/view/menu/add',
             tableId: Menu.tableId,
@@ -87,7 +86,6 @@ layui.use(['HttpRequest', 'treeTable', 'func'], function () {
      */
     Menu.onEditMenu = function (data) {
         func.open({
-            height: 720,
             title: '修改菜单',
             content: Feng.ctxPath + "/view/menu/edit?menuId=" + data.menuId,
             tableId: Menu.tableId,
@@ -124,7 +122,6 @@ layui.use(['HttpRequest', 'treeTable', 'func'], function () {
      */
     Menu.onButtonMenu = function (data) {
         func.open({
-            height: 720,
             title: '菜单按钮管理',
             content: Feng.ctxPath + "/view/menuButton?menuId=" + data.menuId,
             tableId: Menu.tableId,
diff --git a/src/main/webapp/assets/modular/system/message/message_list.js b/src/main/webapp/assets/modular/system/message/message_list.js
index 2ab417a8..a39cfb6d 100644
--- a/src/main/webapp/assets/modular/system/message/message_list.js
+++ b/src/main/webapp/assets/modular/system/message/message_list.js
@@ -52,7 +52,6 @@ layui.use(['table', 'form', 'func', 'HttpRequest', 'util'], function () {
     Message.openViewDlg = function (data) {
         func.open({
             title: '查看消息',
-            height: 540,
             content: Feng.ctxPath + '/view/message_view?messageId=' + data.messageId,
             tableId: Message.tableId
         });
diff --git a/src/main/webapp/assets/modular/system/notice/notice.js b/src/main/webapp/assets/modular/system/notice/notice.js
index a7df4b35..031ac081 100644
--- a/src/main/webapp/assets/modular/system/notice/notice.js
+++ b/src/main/webapp/assets/modular/system/notice/notice.js
@@ -45,7 +45,6 @@ layui.use(['layer', 'form', 'table', 'admin', 'HttpRequest', 'func'], function (
      */
     Notice.openAddNotice = function () {
         func.open({
-            height: 680,
             title: '添加通知',
             content: Feng.ctxPath + '/view/notice/add',
             tableId: Notice.tableId
@@ -59,7 +58,6 @@ layui.use(['layer', 'form', 'table', 'admin', 'HttpRequest', 'func'], function (
      */
     Notice.onEditNotice = function (data) {
         func.open({
-            height: 680,
             title: '修改通知',
             content: Feng.ctxPath + "/view/notice/edit?noticeId=" + data.noticeId,
             tableId: Notice.tableId
diff --git a/src/main/webapp/assets/modular/system/organization/organization.js b/src/main/webapp/assets/modular/system/organization/organization.js
index c5c12696..5e9347ff 100644
--- a/src/main/webapp/assets/modular/system/organization/organization.js
+++ b/src/main/webapp/assets/modular/system/organization/organization.js
@@ -20,7 +20,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'tree', 'dropdown', 'xmSel
     /* 点击新增对话框 */
     Organization.openAddDlg = function () {
         func.open({
-            height: 800,
             title: '添加机构',
             content: Feng.ctxPath + '/view/organization/addView',
             tableId: Organization.tableId,
@@ -33,7 +32,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'tree', 'dropdown', 'xmSel
     /* 点击编辑对话框 */
     Organization.openEditDlg = function (data) {
         func.open({
-            height: 800,
             title: '修改机构',
             content: Feng.ctxPath + '/view/organization/editView?orgId=' + data.id,
             tableId: Organization.tableId,
diff --git a/src/main/webapp/assets/modular/system/position/position.js b/src/main/webapp/assets/modular/system/position/position.js
index a73043dc..df0278d2 100644
--- a/src/main/webapp/assets/modular/system/position/position.js
+++ b/src/main/webapp/assets/modular/system/position/position.js
@@ -48,7 +48,6 @@ layui.use(['table', 'form', 'func', 'HttpRequest', 'util'], function () {
     // 弹出添加对话框
     Position.openAddDlg = function () {
         func.open({
-            height: 800,
             title: '添加职位',
             content: Feng.ctxPath + '/view/position/addView',
             tableId: Position.tableId
@@ -58,7 +57,6 @@ layui.use(['table', 'form', 'func', 'HttpRequest', 'util'], function () {
     // 点击编辑
     Position.openEditDlg = function (data) {
         func.open({
-            height: 800,
             title: '修改职位',
             content: Feng.ctxPath + '/view/position/editView?positionId=' + data.positionId,
             tableId: Position.tableId
diff --git a/src/main/webapp/assets/modular/system/resource/resource.js b/src/main/webapp/assets/modular/system/resource/resource.js
index 096a5ffa..56bff332 100644
--- a/src/main/webapp/assets/modular/system/resource/resource.js
+++ b/src/main/webapp/assets/modular/system/resource/resource.js
@@ -76,7 +76,6 @@ layui.use(['table', 'HttpRequest', 'func'], function () {
      */
     Resource.openDetailDlg = function (data) {
         func.open({
-            height: 600,
             title: '资源详情',
             content: Feng.ctxPath + '/view/resource/detail?resourceCode=' + data.resourceCode,
             tableId: Resource.tableId
diff --git a/src/main/webapp/assets/modular/system/role/role.js b/src/main/webapp/assets/modular/system/role/role.js
index 0668b8da..96af8ed6 100644
--- a/src/main/webapp/assets/modular/system/role/role.js
+++ b/src/main/webapp/assets/modular/system/role/role.js
@@ -99,7 +99,6 @@ layui.use(['layer', 'form', 'table', 'admin', 'HttpRequest', 'func', 'dropdown']
      */
     Role.openAddRole = function () {
         func.open({
-            height: 680,
             title: '添加角色',
             content: Feng.ctxPath + '/view/role/add',
             tableId: Role.tableId
@@ -113,7 +112,6 @@ layui.use(['layer', 'form', 'table', 'admin', 'HttpRequest', 'func', 'dropdown']
      */
     Role.onEditRole = function (data) {
         func.open({
-            height: 680,
             title: '修改角色',
             content: Feng.ctxPath + "/view/role/edit?roleId=" + data.roleId,
             tableId: Role.tableId
@@ -127,7 +125,6 @@ layui.use(['layer', 'form', 'table', 'admin', 'HttpRequest', 'func', 'dropdown']
      */
     Role.onEditDataScope = function (data) {
         func.open({
-            height: 470,
             title: '修改数据范围',
             content: Feng.ctxPath + "/view/role/editDataScope?roleId=" + data.roleId,
             tableId: Role.tableId
@@ -160,8 +157,6 @@ layui.use(['layer', 'form', 'table', 'admin', 'HttpRequest', 'func', 'dropdown']
      */
     Role.assignMenu = function (data) {
         func.open({
-            height: 650,
-            width: 750,
             title: '分配菜单',
             content: Feng.ctxPath + "/view/role/assignMenuAndButtons?roleId=" + data.roleId,
             tableId: Role.tableId
@@ -175,8 +170,6 @@ layui.use(['layer', 'form', 'table', 'admin', 'HttpRequest', 'func', 'dropdown']
      */
     Role.assignApi = function (data) {
         func.open({
-            height: 650,
-            width: 550,
             title: '分配接口',
             content: Feng.ctxPath + "/view/role/assignApi?roleId=" + data.roleId,
             tableId: Role.tableId
diff --git a/src/main/webapp/assets/modular/system/timers/timers.js b/src/main/webapp/assets/modular/system/timers/timers.js
index c7f01f8c..dfd7426f 100644
--- a/src/main/webapp/assets/modular/system/timers/timers.js
+++ b/src/main/webapp/assets/modular/system/timers/timers.js
@@ -43,7 +43,6 @@ layui.use(['table', 'admin', 'form', 'func', 'HttpRequest', 'dropdown'], functio
     // 弹出添加对话框
     Position.openAddDlg = function () {
         func.open({
-            height: 800,
             title: '添加定时任务',
             content: Feng.ctxPath + '/view/sysTimers/addView',
             tableId: Position.tableId
@@ -53,7 +52,6 @@ layui.use(['table', 'admin', 'form', 'func', 'HttpRequest', 'dropdown'], functio
     // 点击编辑
     Position.openEditDlg = function (data) {
         func.open({
-            height: 800,
             title: '修改定时任务',
             content: Feng.ctxPath + '/view/sysTimers/editView?timerId=' + data.timerId,
             tableId: Position.tableId
diff --git a/src/main/webapp/assets/modular/system/user/user.js b/src/main/webapp/assets/modular/system/user/user.js
index a1fec553..2e4c4b39 100644
--- a/src/main/webapp/assets/modular/system/user/user.js
+++ b/src/main/webapp/assets/modular/system/user/user.js
@@ -26,7 +26,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'tree', 'dropdown', 'xmSel
     /* 点击新增对话框 */
     Organization.openAddDlg = function () {
         func.open({
-            height: 800,
             title: '添加机构',
             content: Feng.ctxPath + '/view/organization/addView',
             tableId: OrganizationUser.tableId,
@@ -39,7 +38,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'tree', 'dropdown', 'xmSel
     /* 点击编辑对话框 */
     Organization.openEditDlg = function (data) {
         func.open({
-            height: 800,
             title: '修改机构',
             content: Feng.ctxPath + '/view/organization/editView?orgId=' + data.id,
             tableId: OrganizationUser.tableId,
@@ -69,7 +67,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'tree', 'dropdown', 'xmSel
     /* 点击新增对话框 */
     OrganizationUser.openAddDlg = function () {
         func.open({
-            height: 680,
             title: '添加用户',
             content: Feng.ctxPath + '/view/user/addView',
             tableId: OrganizationUser.tableId
@@ -79,7 +76,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'tree', 'dropdown', 'xmSel
     /* 点击编辑对话框 */
     OrganizationUser.openEditDlg = function (data) {
         func.open({
-            height: 680,
             title: '修改用户',
             content: Feng.ctxPath + '/view/user/editView?userId=' + data.userId,
             tableId: OrganizationUser.tableId
@@ -115,7 +111,6 @@ layui.use(['layer', 'form', 'table', 'util', 'admin', 'tree', 'dropdown', 'xmSel
     OrganizationUser.roleAssign = function (data) {
         func.open({
             title: '授权角色',
-            height: 470,
             content: Feng.ctxPath + '/view/user/roleView?userId=' + data.userId,
             tableId: OrganizationUser.tableId
         });
diff --git a/src/main/webapp/pages/modular/system/dict/dict_edit.html b/src/main/webapp/pages/modular/system/dict/dict_edit.html
index b9f1858e..91a25964 100644
--- a/src/main/webapp/pages/modular/system/dict/dict_edit.html
+++ b/src/main/webapp/pages/modular/system/dict/dict_edit.html
@@ -3,7 +3,6 @@
 <form class="layui-form" id="dictForm" lay-filter="dictForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">
         <div class="layui-card">
-            <div class="layui-card-header">基本信息</div>
             <div class="layui-card-body">
                 <div class="layui-form-item layui-row">
 
diff --git a/src/main/webapp/pages/modular/system/i18n/translation_add.html b/src/main/webapp/pages/modular/system/i18n/translation_add.html
index 964f1aad..12f65448 100644
--- a/src/main/webapp/pages/modular/system/i18n/translation_add.html
+++ b/src/main/webapp/pages/modular/system/i18n/translation_add.html
@@ -3,7 +3,6 @@
 <form class="layui-form" id="translationForm" lay-filter="translationForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">
         <div class="layui-card">
-            <div class="layui-card-header">基本信息</div>
             <div class="layui-card-body">
                 <div class="layui-form-item layui-row">
                     <input name="tranId" type="hidden"/>
diff --git a/src/main/webapp/pages/modular/system/i18n/translation_edit.html b/src/main/webapp/pages/modular/system/i18n/translation_edit.html
index fab4d948..f0479289 100644
--- a/src/main/webapp/pages/modular/system/i18n/translation_edit.html
+++ b/src/main/webapp/pages/modular/system/i18n/translation_edit.html
@@ -3,7 +3,6 @@
 <form class="layui-form" id="translationForm" lay-filter="translationForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">
         <div class="layui-card">
-            <div class="layui-card-header">基本信息</div>
             <div class="layui-card-body">
                 <div class="layui-form-item layui-row">
                     <input name="tranId" type="hidden"/>
diff --git a/src/main/webapp/pages/modular/system/menu/button.html b/src/main/webapp/pages/modular/system/menu/button.html
index 60149106..c344e92a 100644
--- a/src/main/webapp/pages/modular/system/menu/button.html
+++ b/src/main/webapp/pages/modular/system/menu/button.html
@@ -17,6 +17,7 @@
                             </div>
                             <div class="layui-inline">
                                 <button id="btnSearch" class="layui-btn icon-btn"><i class="layui-icon">&#xe615;</i>搜索</button>
+                                <button id="defaultBtnAdd" class="layui-btn icon-btn"><i class="layui-icon">&#xe608;</i>一键添加默认按钮</button>
                                 <button id="btnAdd" class="layui-btn icon-btn"><i class="layui-icon">&#xe654;</i>添加</button>
                                 <button id="btnBatchDelete" class="layui-btn layui-btn-danger icon-btn"><i class="layui-icon">&#xe640;</i>删除选中</button>
                             </div>
diff --git a/src/main/webapp/pages/modular/system/menu/menu_add.html b/src/main/webapp/pages/modular/system/menu/menu_add.html
index 51779dbe..8685af2b 100644
--- a/src/main/webapp/pages/modular/system/menu/menu_add.html
+++ b/src/main/webapp/pages/modular/system/menu/menu_add.html
@@ -3,7 +3,6 @@
 <form class="layui-form" id="menuForm" lay-filter="menuForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">
         <div class="layui-card">
-            <div class="layui-card-header">基本信息</div>
             <div class="layui-card-body">
                 <div class="layui-form-item layui-row">
                     <input name="menuId" type="hidden"/>
diff --git a/src/main/webapp/pages/modular/system/menu/menu_edit.html b/src/main/webapp/pages/modular/system/menu/menu_edit.html
index 8b5ee2fc..3ae0ede5 100644
--- a/src/main/webapp/pages/modular/system/menu/menu_edit.html
+++ b/src/main/webapp/pages/modular/system/menu/menu_edit.html
@@ -3,7 +3,6 @@
 <form class="layui-form" id="menuForm" lay-filter="menuForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">
         <div class="layui-card">
-            <div class="layui-card-header">基本信息</div>
             <div class="layui-card-body">
                 <div class="layui-form-item layui-row">
                     <input name="menuId" type="hidden"/>
diff --git a/src/main/webapp/pages/modular/system/notice/notice_add.html b/src/main/webapp/pages/modular/system/notice/notice_add.html
index 0fe214ee..66c367c7 100644
--- a/src/main/webapp/pages/modular/system/notice/notice_add.html
+++ b/src/main/webapp/pages/modular/system/notice/notice_add.html
@@ -3,7 +3,6 @@
 <form class="layui-form" id="noticeForm" lay-filter="noticeForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">
         <div class="layui-card">
-            <div class="layui-card-header">基本信息</div>
             <div class="layui-card-body">
                 <div class="layui-form-item layui-row">
                     <input name="noticeId" type="hidden"/>
diff --git a/src/main/webapp/pages/modular/system/notice/notice_edit.html b/src/main/webapp/pages/modular/system/notice/notice_edit.html
index 7e85beb8..ad615241 100644
--- a/src/main/webapp/pages/modular/system/notice/notice_edit.html
+++ b/src/main/webapp/pages/modular/system/notice/notice_edit.html
@@ -3,7 +3,6 @@
 <form class="layui-form" id="noticeForm" lay-filter="noticeForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">
         <div class="layui-card">
-            <div class="layui-card-header">基本信息</div>
             <div class="layui-card-body">
                 <div class="layui-form-item layui-row">
                     <input name="noticeId" type="hidden"/>
diff --git a/src/main/webapp/pages/modular/system/role/role_add.html b/src/main/webapp/pages/modular/system/role/role_add.html
index ee8c7901..a86a6bde 100644
--- a/src/main/webapp/pages/modular/system/role/role_add.html
+++ b/src/main/webapp/pages/modular/system/role/role_add.html
@@ -3,7 +3,6 @@
 <form class="layui-form" id="roleForm" lay-filter="roleForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">
         <div class="layui-card">
-            <div class="layui-card-header">基本信息</div>
             <div class="layui-card-body">
                 <div class="layui-form-item layui-row">
                     <input name="roleId" type="hidden"/>
diff --git a/src/main/webapp/pages/modular/system/role/role_edit.html b/src/main/webapp/pages/modular/system/role/role_edit.html
index 3bed335b..aadfd612 100644
--- a/src/main/webapp/pages/modular/system/role/role_edit.html
+++ b/src/main/webapp/pages/modular/system/role/role_edit.html
@@ -3,7 +3,6 @@
 <form class="layui-form" id="roleForm" lay-filter="roleForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">
         <div class="layui-card">
-            <div class="layui-card-header">基本信息</div>
             <div class="layui-card-body">
                 <div class="layui-form-item layui-row">
                     <input name="roleId" type="hidden"/>
diff --git a/src/main/webapp/pages/modular/system/timers/timers_add.html b/src/main/webapp/pages/modular/system/timers/timers_add.html
index 3ed5a5d2..090d5b05 100644
--- a/src/main/webapp/pages/modular/system/timers/timers_add.html
+++ b/src/main/webapp/pages/modular/system/timers/timers_add.html
@@ -3,7 +3,6 @@
 <form class="layui-form" id="timerForm" lay-filter="positionForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">
         <div class="layui-card">
-            <div class="layui-card-header">基本信息</div>
             <div class="layui-card-body">
                 <div class="layui-form-item layui-row">
                     <input name="timerId" type="hidden"/>
diff --git a/src/main/webapp/pages/modular/system/timers/timers_edit.html b/src/main/webapp/pages/modular/system/timers/timers_edit.html
index 54c51d5a..4964abca 100644
--- a/src/main/webapp/pages/modular/system/timers/timers_edit.html
+++ b/src/main/webapp/pages/modular/system/timers/timers_edit.html
@@ -3,7 +3,6 @@
 <form class="layui-form" id="positionForm" lay-filter="positionForm">
     <div class="layui-fluid" style="padding-bottom: 75px;">
         <div class="layui-card">
-            <div class="layui-card-header">基本信息</div>
             <div class="layui-card-body">
                 <div class="layui-form-item layui-row">
                     <input name="timerId" type="hidden"/>