更新菜单管理样式

a75f14e2 · fengshuonan · ddf7ecaf · a75f14e2 · a75f14e2 · a75f14e2
Commit a75f14e2 authored Jul 29, 2019 by fengshuonan
5 changed files
--- a/guns-base-support/guns-sys/src/main/webapp/assets/modular/system/menu/menu.js
+++ b/guns-base-support/guns-sys/src/main/webapp/assets/modular/system/menu/menu.js
-layui.use(['layer', 'form', 'ztree', 'laydate', 'admin', 'ax', 'table', 'treetable'], function () {
+layui.use(['layer', 'form', 'ztree', 'laydate', 'admin', 'ax', 'table', 'treetable', 'func'], function () {
    var layer = layui.layer;
    var form = layui.form;
    var $ZTree = layui.ztree;
@@ -7,6 +7,7 @@ layui.use(['layer', 'form', 'ztree', 'laydate', 'admin', 'ax', 'table', 'treetab
    var admin = layui.admin;
    var table = layui.table;
    var treetable = layui.treetable;
+    var func = layui.func;
    /**
     * 系统管理--菜单管理
@@ -61,14 +62,11 @@ layui.use(['layer', 'form', 'ztree', 'laydate', 'admin', 'ax', 'table', 'treetab
     * 弹出添加菜单对话框
     */
    Menu.openAddMenu = function () {
-        admin.putTempData('formOk', false);
+        func.open({
-        top.layui.admin.open({
+            height: 720,
-            type: 2,
            title: '添加菜单',
            content: Feng.ctxPath + '/menu/menu_add',
-            end: function () {
+            tableId: Menu.tableId
-                admin.getTempData('formOk') && Menu.initTable(Menu.tableId);
-            }
        });
    };
@@ -90,7 +88,12 @@ layui.use(['layer', 'form', 'ztree', 'laydate', 'admin', 'ax', 'table', 'treetab
     * @param data 点击按钮时候的行数据
     */
    Menu.onEditMenu = function (data) {
-        window.location.href = Feng.ctxPath + "/menu/menu_edit?menuId="+ data.menuId;
+        func.open({
+            height: 720,
+            title: '修改菜单',
+            content: Feng.ctxPath + "/menu/menu_edit?menuId="+ data.menuId,
+            tableId: Menu.tableId
+        });
    };
    /**
@@ -160,7 +163,7 @@ layui.use(['layer', 'form', 'ztree', 'laydate', 'admin', 'ax', 'table', 'treetab
    // 添加按钮点击事件
    $('#btnAdd').click(function () {
-        window.location.href = Feng.ctxPath + "/menu/menu_add";
+        Menu.openAddMenu();
    });
    // 工具条点击事件

--- a/guns-base-support/guns-sys/src/main/webapp/assets/modular/system/menu/menu_add.js
+++ b/guns-base-support/guns-sys/src/main/webapp/assets/modular/system/menu/menu_add.js
@@ -40,8 +40,11 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax', 'iconPicker'], function ()
        var ajax = new $ax(Feng.ctxPath + "/menu/add", function (data) {
            Feng.success("添加成功！");
-            //跳转列表页面并刷新
+            //传给上个页面，刷新table用
-            window.location.href = Feng.ctxPath + "/menu";
+            admin.putTempData('formOk', true);
+            //关掉对话框
+            admin.closeThisDialog();
        }, function (data) {
            Feng.error("添加失败！" + data.responseJSON.message)
@@ -53,11 +56,6 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax', 'iconPicker'], function ()
        return false;
    });
-    //返回按钮
-    $("#backupPage").click(function () {
-        window.location.href = Feng.ctxPath + "/menu";
-    });
    //初始化图标选择
    iconPicker.render({
        elem: '#icon',

--- a/guns-base-support/guns-sys/src/main/webapp/assets/modular/system/menu/menu_edit.js
+++ b/guns-base-support/guns-sys/src/main/webapp/assets/modular/system/menu/menu_edit.js
@@ -58,8 +58,11 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax', 'iconPicker'], function ()
        var ajax = new $ax(Feng.ctxPath + "/menu/edit", function (data) {
            Feng.success("修改成功！");
-            //跳转列表页面并刷新
+            //传给上个页面，刷新table用
-            window.location.href = Feng.ctxPath + "/menu";
+            admin.putTempData('formOk', true);
+            //关掉对话框
+            admin.closeThisDialog();
        }, function (data) {
            Feng.error("修改失败！" + data.responseJSON.message)
@@ -71,11 +74,6 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'ax', 'iconPicker'], function ()
        return false;
    });
-    //返回按钮
-    $("#backupPage").click(function () {
-        window.location.href = Feng.ctxPath + "/menu";
-    });
    //初始化图标选择
    iconPicker.render({
        elem: '#icon',

--- a/guns-base-support/guns-sys/src/main/webapp/pages/modular/system/menu/menu_add.html
+++ b/guns-base-support/guns-sys/src/main/webapp/pages/modular/system/menu/menu_add.html
-@layout("/common/_container.html",{js:["/assets/modular/system/menu/menu_add.js"]}){
+@layout("/common/_form.html",{js:["/assets/modular/system/menu/menu_add.js"]}){
-<div class="layui-body-header">
-	<span class="layui-body-header-title">菜单管理-添加</span>
-</div>
-<div class="layui-fluid " style="">
+<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">
-			<form id="menuForm" lay-filter="menuForm" class="layui-form model-form" style="max-width: 700px;margin: 40px auto;">
+                <div class="layui-form-item layui-row">
                    <input name="menuId" type="hidden"/>
-				<div class="layui-form-item">
+                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">名称<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
                            <input name="name" placeholder="请输入名称" type="text" class="layui-input" lay-verify="required" required/>
                        </div>
                    </div>
-				<div class="layui-form-item">
+                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">菜单编号<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
                            <input name="code" placeholder="请输入菜单编号" type="text" class="layui-input" lay-verify="required" required/>
                        </div>
                    </div>
-				<div class="layui-form-item">
+                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">父级编号<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
                            <input id="pid" name="pid" type="hidden">
                            <input id="pcodeName" name="pcodeName" placeholder="请输入父级编号" type="text" class="layui-input" autocomplete="off" lay-verify="required" required/>
                        </div>
                    </div>
-				<div class="layui-form-item">
+                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">是否是菜单<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
                            <input type="radio" name="menuFlag" value="Y" title="是" checked/>
                            <input type="radio" name="menuFlag" value="N" title="不是"/>
                        </div>
                    </div>
-				<div class="layui-form-item">
+                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">请求地址<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
                            <input id="url" name="url" placeholder="请输入请求地址" type="text" class="layui-input" autocomplete="off"/>
                        </div>
                    </div>
-				<div class="layui-form-item">
+                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">系统分类<span style="color: red;">*</span></label>
                        <div class="layui-input-block" id="dictDetails">
                            <input type="radio" name="systemType" value="" title="无" disabled="disabled">
                        </div>
                    </div>
-				<div class="layui-form-item">
+                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">排序</label>
                        <div class="layui-input-block">
                            <input name="sort" placeholder="请输入排序" type="text" class="layui-input"/>
                        </div>
                    </div>
-				<div class="layui-form-item">
+                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">图标</label>
                        <div class="layui-input-block">
                            <input name="icon" id="icon" placeholder="请输入图标" lay-filter="iconPicker" type="text" class="layui-input"/>
                        </div>
                    </div>
-				<div class="layui-form-item">
-					<div class="layui-input-block">
-						<button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
-						<button class="layui-btn layui-btn-primary" type="button" id="backupPage">&emsp;返回&emsp;</button>
                </div>
            </div>
-			</form>
        </div>
    </div>
-</div>
+    <div class="form-group-bottom text-center">
+        <button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
+        <button type="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;取消&emsp;</button>
+    </div>
+</form>
 @}
--- a/guns-base-support/guns-sys/src/main/webapp/pages/modular/system/menu/menu_edit.html
+++ b/guns-base-support/guns-sys/src/main/webapp/pages/modular/system/menu/menu_edit.html
-@layout("/common/_container.html",{js:["/assets/modular/system/menu/menu_edit.js"]}){
+@layout("/common/_form.html",{js:["/assets/modular/system/menu/menu_edit.js"]}){
-<div class="layui-body-header">
-    <span class="layui-body-header-title">菜单管理-修改</span>
-</div>
-<div class="layui-fluid " style="">
+<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">
-            <form id="menuForm" lay-filter="menuForm" class="layui-form model-form" style="max-width: 700px;margin: 40px auto;">
+                <div class="layui-form-item layui-row">
                    <input name="menuId" type="hidden"/>
-                <div class="layui-form-item">
+                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">名称<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
                            <input name="name" placeholder="请输入名称" type="text" class="layui-input" lay-verify="required" required/>
                        </div>
                    </div>
-                <div class="layui-form-item">
+                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">菜单编号<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
                            <input name="code" placeholder="请输入菜单编号" type="text" class="layui-input" lay-verify="required" required/>
                        </div>
                    </div>
-                <div class="layui-form-item">
+                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">父级编号<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
                            <input id="pid" name="pid" type="hidden">
                            <input id="pcodeName" name="pcodeName" placeholder="请输入父级编号" type="text" class="layui-input" autocomplete="off" lay-verify="required" required/>
                        </div>
                    </div>
-                <div class="layui-form-item">
+                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">是否是菜单<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
                            <input type="radio" name="menuFlag" value="Y" title="是" checked/>
                            <input type="radio" name="menuFlag" value="N" title="不是"/>
                        </div>
                    </div>
-                <div class="layui-form-item">
+                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">请求地址<span style="color: red;">*</span></label>
                        <div class="layui-input-block">
                            <input id="url" name="url" placeholder="请输入请求地址" type="text" class="layui-input" autocomplete="off"/>
                        </div>
                    </div>
-                <div class="layui-form-item">
+                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">系统分类<span style="color: red;">*</span></label>
                        <div class="layui-input-block" id="dictDetails">
                            <input type="radio" name="systemType" value="" title="无" disabled="disabled">
                        </div>
                    </div>
-                <div class="layui-form-item">
+                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">排序</label>
                        <div class="layui-input-block">
                            <input name="sort" placeholder="请输入排序" type="text" class="layui-input"/>
                        </div>
                    </div>
-                <div class="layui-form-item">
+                    <div class="layui-inline layui-col-md12">
                        <label class="layui-form-label">图标</label>
                        <div class="layui-input-block">
                            <input name="icon" id="icon" placeholder="请输入图标" lay-filter="iconPicker" type="text" class="layui-input"/>
                        </div>
                    </div>
-                <div class="layui-form-item">
-                    <div class="layui-input-block">
-                        <button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
-                        <button class="layui-btn layui-btn-primary" type="button" id="backupPage">&emsp;返回&emsp;</button>
                </div>
            </div>
-            </form>
        </div>
    </div>
-</div>
+    <div class="form-group-bottom text-center">
+        <button class="layui-btn" lay-filter="btnSubmit" lay-submit>&emsp;提交&emsp;</button>
+        <button type="reset" class="layui-btn layui-btn-primary" ew-event="closeDialog">&emsp;取消&emsp;</button>
+    </div>
+</form>
 @}