From 567c0d4df5b7362b3a217ce9cced38a948be92d9 Mon Sep 17 00:00:00 2001
From: hbzgyjh <yjh19930815>
Date: Mon, 20 Dec 2021 17:23:59 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=A1=B5=E9=9D=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=96=B0=E5=A2=9E=E4=B8=8B=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/security/menu/MenuForm.vue | 505 ++++++++++++---------------
 src/views/security/menu/MenuList.vue |  11 +-
 2 files changed, 230 insertions(+), 286 deletions(-)

diff --git a/src/views/security/menu/MenuForm.vue b/src/views/security/menu/MenuForm.vue
index 1c81733..7cbf0c5 100644
--- a/src/views/security/menu/MenuForm.vue
+++ b/src/views/security/menu/MenuForm.vue
@@ -1,39 +1,20 @@
 <template>
-  <a-modal
-    :title="modalTitle"
-    :width="1000"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleSubmit"
-    @cancel="handleCancel"
-    :destroyOnClose="true"
-  >
+  <a-modal :title="modalTitle" :width="1000" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit" @cancel="handleCancel" :destroyOnClose="true">
     <a-spin :spinning="formLoading">
-      <a-form :form="form" >
-        
-        <a-form-item v-show="false" >
+      <a-form :form="form">
+
+        <a-form-item v-show="false">
           <a-input v-decorator="['id']" />
         </a-form-item>
-        
+
         <a-row :gutter="24">
           <a-col :md="12" :sm="24">
-            <a-form-item
-              label="菜单名称"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              hasFeedback
-            >
+            <a-form-item label="菜单名称" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
               <a-input placeholder="请输入菜单名称" v-decorator="['name',{rules: [{required: true, min: 1, message: '请输入菜单名称！'}]}]" />
             </a-form-item>
           </a-col>
           <a-col :md="12" :sm="24">
-            <a-form-item
-              style="width: 100%"
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="菜单编号"
-              hasFeedback
-            >
+            <a-form-item style="width: 100%" :labelCol="labelCol" :wrapperCol="wrapperCol" label="菜单编号" hasFeedback>
               <a-input placeholder="请输入菜单编号" v-decorator="['code', {rules: [{required: true, min: 1, message: '请输入菜单编号！'}]}]" />
             </a-form-item>
           </a-col>
@@ -41,12 +22,8 @@
 
         <a-row :gutter="24">
           <a-col :md="12" :sm="24">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="菜单层级"
-            >
-              <a-radio-group v-decorator="['type',{rules: [{ required: true, message: '请选择菜单层级！' }]}]" >
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="菜单层级">
+              <a-radio-group v-decorator="['type',{rules: [{ required: true, message: '请选择菜单层级！' }]}]">
                 <a-radio value="0" @click="meneTypeFunc(0)">目录</a-radio>
                 <a-radio value="1" @click="meneTypeFunc(1)">菜单</a-radio>
                 <a-radio value="2" @click="meneTypeFunc(2)">按钮</a-radio>
@@ -55,25 +32,13 @@
           </a-col>
           <a-col :md="12" :sm="24">
             <div v-show="pidShow">
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="父级菜单"
-                has-feedback
-              >
-                <a-tree-select
-                  v-decorator="['pid', {rules: [{ required: true, message: '请选择父级菜单！' }]}]"
-                  style="width: 100%"
-                  :dropdownStyle="{ maxHeight: '300px', overflow: 'auto' }"
-                  :treeData="menuTreeData"
-                  placeholder="请选择父级菜单"
-                  :replaceFields="{
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="父级菜单" has-feedback>
+                <a-tree-select v-decorator="['pid', {initialValue: treeSelDefaultValue},{rules: [{ required: true, message: '请选择父级菜单！' }]}]" style="width: 100%" :dropdownStyle="{ maxHeight: '300px', overflow: 'auto' }" :treeData="menuTreeData" placeholder="请选择父级菜单" :replaceFields="{
                     children:'children',
                     title:'name',
                     key:'id',
                     value:'id'
-                  }"
-                >
+                  }">
                   <span slot="title" slot-scope="{ id }">{{ id }}
                   </span>
                 </a-tree-select>
@@ -82,31 +47,23 @@
           </a-col>
         </a-row>
 
-        <a-row :gutter="24" >
+        <a-row :gutter="24">
           <a-col :md="12" :sm="24">
             <div v-show="componentShow">
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                hasFeedback
-              >
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
                 <span slot="label">
                   <a-tooltip title="前端vue组件 views文件夹下路径，例：system/menu/index。注：目录级填写：RouteView(不带面包屑)，PageView(带面包屑)，菜单级内链打开http链接填写：Iframe">
                     <a-icon type="question-circle-o" />
                   </a-tooltip>&nbsp;
                   前端组件
                 </span>
-                <a-input placeholder="请输入前端组件" :disabled="componentDisabled" prop="component" v-decorator="['component',{rules: [{required: componentRequired, message: '请输入前端组件'}]}]"/><!-- ,{rules: [{required: componentRequired, min: 1, message: '请输入前端组件！'}]}  -->
+                <a-input placeholder="请输入前端组件" :disabled="componentDisabled" prop="component" v-decorator="['component',{rules: [{required: componentRequired, message: '请输入前端组件'}]}]" /><!-- ,{rules: [{required: componentRequired, min: 1, message: '请输入前端组件！'}]}  -->
               </a-form-item>
             </div>
           </a-col>
           <a-col :md="12" :sm="24">
             <div v-show="routerShow">
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                hasFeedback
-              >
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
                 <span slot="label">
                   <a-tooltip title="浏览器显示的URL，例：/menu，对应打开页面为菜单页面">
                     <a-icon type="question-circle-o" />
@@ -117,12 +74,7 @@
               </a-form-item>
             </div>
             <div v-show="permissionShow">
-              <a-form-item
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="权限标识"
-                hasFeedback
-              >
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="权限标识" hasFeedback>
                 <a-input placeholder="请输入权限标识" v-decorator="['permission', {rules: [{required: permissionRequired, message: '请输入权限标识！'}]}]" />
               </a-form-item>
             </div>
@@ -131,34 +83,21 @@
 
         <a-row :gutter="24">
           <a-col :md="12" :sm="24">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="是否可见"
-            >
-              <a-switch id="visible" checkedChildren="是" unCheckedChildren="否" v-decorator="['visible', { valuePropName: 'checked' }]"/><!-- defaultChecked -->
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否可见">
+              <a-switch id="visible" checkedChildren="是" unCheckedChildren="否" v-decorator="['visible', { valuePropName: 'checked' }]" /><!-- defaultChecked -->
             </a-form-item>
           </a-col>
           <a-col :md="12" :sm="24">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="排序"
-            >
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
               <a-input-number style="width: 100%" v-decorator="['intCode', { initialValue: 100 }]" :min="1" :max="1000" />
             </a-form-item>
           </a-col>
         </a-row>
 
         <a-row :gutter="24">
-          
+
           <a-col :md="12" :sm="24">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="备注"
-              hasFeedback
-            >
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注" hasFeedback>
               <a-input placeholder="请输入备注" v-decorator="['remark']"></a-input>
             </a-form-item>
           </a-col>
@@ -170,216 +109,218 @@
 </template>
 
 <script>
-  import { menuTree, menuAdd, menuEdit } from '@/api/security/menu'
-  export default {
+import { menuTree, menuAdd, menuEdit } from '@/api/security/menu'
+export default {
 
-    data () {
-      return {
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 6 }
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 }
-        },
-        modalTitle: "新增菜单",
-        visible: false,
-        confirmLoading: false,
-        menuTreeData: [],
-        componentShow: true,
-        componentDisabled: false,
-        componentRequired: true,
-        routerRequired: true,
-        routerShow: true,
-        pidShow: true,
-        permissionShow: true,
-        permissionRequired: true,
-        formLoading: true,
-        type: '',
-        form: this.$form.createForm(this)
-      }
+  data() {
+    return {
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 6 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      modalTitle: "新增菜单",
+      visible: false,
+      confirmLoading: false,
+      menuTreeData: [],
+      componentShow: true,
+      componentDisabled: false,
+      componentRequired: true,
+      routerRequired: true,
+      routerShow: true,
+      pidShow: true,
+      permissionShow: true,
+      permissionRequired: true,
+      formLoading: true,
+      type: '',
+      form: this.$form.createForm(this),
+      treeSelDefaultValue: 1,
+    }
+  },
+
+  methods: {
+    // 新增打开页面初始化
+    add(type) {
+      this.modalTitle = "新增菜单"
+      this.visible = true
+
+      // 默认选中菜单项，并初始化
+      this.form.getFieldDecorator('type', { valuePropName: 'checked', initialValue: '1' })
+      this.meneTypeFunc('1')
+
+      // 默认选中的单选框
+      this.form.getFieldDecorator('visible', { initialValue: true })
+      this.treeSelDefaultValue = type;
+
+      // 默认加载菜单树
+      this.getMenuTree()
+
+      this.formLoading = false
     },
+    // 编辑打开页面初始化
+    edit(record) {
+      this.modalTitle = "编辑菜单"
+      this.visible = true
 
-    methods: {
-      // 新增打开页面初始化
-      add (type) {
-        this.modalTitle = "新增菜单"
-        this.visible = true
+      // 默认选中菜单项，并初始化
+      this.form.getFieldDecorator('type', { valuePropName: 'checked', initialValue: record.type.toString() })
+      this.meneTypeFunc(record.type.toString())
 
-        // 默认选中菜单项，并初始化
-        this.form.getFieldDecorator('type', { valuePropName: 'checked', initialValue: '1' })
-        this.meneTypeFunc('1')
+      // 默认选中的单选框
+      const visibleDef = false
+      if (record.visible == 1) {
+        this.visibleDef = true
+      }
+      this.form.getFieldDecorator('visible', { valuePropName: 'checked', initialValue: this.visibleDef })
 
-        // 默认选中的单选框
-        this.form.getFieldDecorator('visible', { initialValue: true })
-        
+      setTimeout(() => {
+        this.setMenuItem(record)
         // 默认加载菜单树
         this.getMenuTree()
+      }, 100)
 
-        this.formLoading = false
-      },
-      // 编辑打开页面初始化
-      edit (record) {
-        this.modalTitle = "编辑菜单"
-        this.visible = true
-
-        // 默认选中菜单项，并初始化
-        this.form.getFieldDecorator('type', { valuePropName: 'checked', initialValue: record.type.toString() })
-        this.meneTypeFunc(record.type.toString())
-      
-        // 默认选中的单选框
-        const visibleDef = false
-        if (record.visible == 1) {
-          this.visibleDef = true
-        }
-        this.form.getFieldDecorator('visible', { valuePropName: 'checked', initialValue: this.visibleDef })
-        
-        setTimeout(() => {
-           this.setMenuItem(record)
-           // 默认加载菜单树
-           this.getMenuTree()
-        }, 100)
-        
-        this.formLoading = false
-      },
-      getMenuTree () {
-        menuTree().then((res) => {
-          if (res.code == 200) {
-            this.form.resetFields(`pid`, [])
-            this.menuTreeData = [{
-              'id': '-1',
-              'parentId': '0',
-              'name': '顶级',
-              'value': '0',
-              'pid': '0',
-              'children': res.data
-            }]
-            console.log(this.menuTreeData)
-          } else {
-            this.$message.warning(res.msg)
-          }
-        })
-      },
-      /**
-       * 选择菜单类型执行初始化表单变量
-       */
-      meneTypeFunc (type) {
-        this.type = type
-        // eslint-disable-next-line eqeqeq
-        if (type == '0' || type == '1') {
-          // 路由必填，设置空值，并显示
-          this.routerRequired = true
-          this.form.getFieldDecorator('router', { initialValue: '' })
-          this.routerShow = true
-          // 权限标识框隐藏，选填，给空值
-          this.permissionShow = false
-          this.permissionRequired = false
-          this.form.getFieldDecorator('permission', { initialValue: '' })
-        }
-        // eslint-disable-next-line eqeqeq
-        if (type == '0') {
-          // 组件默认为显示，设置可输入，给默认组件 PageView，验证必填
-          this.componentShow = true
-          this.componentDisabled = false
-          this.form.getFieldDecorator('component', { initialValue: 'PageView' })
-          this.componentRequired = true
-          // 父级初始化顶级，并将其隐藏
-          this.form.getFieldDecorator('pid', { initialValue: '0' })
-          this.pidShow = false
+      this.formLoading = false
+    },
+    getMenuTree() {
+      menuTree().then((res) => {
+        if (res.code == 200) {
+          this.form.resetFields(`pid`, [])
+          this.menuTreeData = [{
+            'id': '-1',
+            'parentId': '0',
+            'name': '顶级',
+            'value': '0',
+            'pid': '0',
+            'children': res.data
+          }]
+          console.log(this.menuTreeData)
         } else {
-          // eslint-disable-next-line eqeqeq
-          if (type == '1') {
-            // 组件可以手输，取消值
-            this.componentDisabled = false
-            this.form.getFieldDecorator('component', { initialValue: '' })
-          }
-          // 父级选择放开
-          this.pidShow = true
+          this.$message.warning(res.msg)
         }
-        // eslint-disable-next-line eqeqeq
-        if (type == '2') {
-          // 组件设置不填，不可输入，并给空（手输的跟设置的）
-          this.componentRequired = false
-          this.componentDisabled = true
-          this.form.resetFields(`component`, [])
-          this.form.getFieldDecorator('component', { initialValue: '' })
-          // 路由选填，设置空值，并隐藏
-          this.routerRequired = false
-          this.form.getFieldDecorator('router', { initialValue: '' })
-          this.routerShow = false
-          // 权限标识框显示，必填，给空值
-          this.permissionShow = true
-          this.permissionRequired = true
-          this.form.getFieldDecorator('permission', { initialValue: '' })
-        }
-      },
-      handleSubmit () {
-        const { form: { validateFields } } = this
-        this.confirmLoading = true
-        validateFields((errors, values) => {
-          if (!errors) {
-            if (values.visible) {
-              values.visible = 1
-            } else {
-              values.visible = 0
-            }
-            console.log(values)
-            if (values.id) {
-              menuEdit(values).then((res) => {
-                this.confirmLoading = false
-                if (res.code == 200) {
-                  this.$message.success('编辑成功')
-                  this.$emit('ok', values)
-                  this.handleCancel()
-                } else {
-                  this.$message.error('编辑失败：' + res.msg)
-                }
-              }).finally((res) => {
-                this.confirmLoading = false
-              })
-            } else {
-              menuAdd(values).then((res) => {
-                this.confirmLoading = false
-                if (res.code == 200) {
-                  this.$message.success('新增成功')
-                  this.$emit('ok', values)
-                  this.handleCancel()
-                } else {
-                  this.$message.error('新增失败：' + res.msg)
-                }
-              }).finally((res) => {
-                this.confirmLoading = false
-              })
-            }
-          } else {
-            this.confirmLoading = false
-          }
-        })
-      },
-      handleCancel () {
-        this.form.resetFields()
-        this.confirmLoading = false
-        this.visible = false
-      },
-      setMenuItem (record) {
-        console.log(record)
-        this.form.setFieldsValue(
-          {
-            id: record.id,
-            name: record.name,
-            code: record.code,
-            component: record.component,
-            permission: record.permission,
-            router: record.router,
-            intCode: record.intCode,
-            remark: record.remark
-          }
-        )
-        this.form.getFieldDecorator('pid', { initialValue: record.pid })
-        this.pid = record.pid
+      })
+    },
+    /**
+     * 选择菜单类型执行初始化表单变量
+     */
+    meneTypeFunc(type) {
+      this.type = type
+      // eslint-disable-next-line eqeqeq
+      if (type == '0' || type == '1') {
+        // 路由必填，设置空值，并显示
+        this.routerRequired = true
+        this.form.getFieldDecorator('router', { initialValue: '' })
+        this.routerShow = true
+        // 权限标识框隐藏，选填，给空值
+        this.permissionShow = false
+        this.permissionRequired = false
+        this.form.getFieldDecorator('permission', { initialValue: '' })
       }
+      // eslint-disable-next-line eqeqeq
+      if (type == '0') {
+        // 组件默认为显示，设置可输入，给默认组件 PageView，验证必填
+        this.componentShow = true
+        this.componentDisabled = false
+        this.form.getFieldDecorator('component', { initialValue: 'PageView' })
+        this.componentRequired = true
+        // 父级初始化顶级，并将其隐藏
+        this.form.getFieldDecorator('pid', { initialValue: '0' })
+        this.pidShow = false
+      } else {
+        // eslint-disable-next-line eqeqeq
+        if (type == '1') {
+          // 组件可以手输，取消值
+          this.componentDisabled = false
+          this.form.getFieldDecorator('component', { initialValue: '' })
+        }
+        // 父级选择放开
+        this.pidShow = true
+      }
+      // eslint-disable-next-line eqeqeq
+      if (type == '2') {
+        // 组件设置不填，不可输入，并给空（手输的跟设置的）
+        this.componentRequired = false
+        this.componentDisabled = true
+        this.form.resetFields(`component`, [])
+        this.form.getFieldDecorator('component', { initialValue: '' })
+        // 路由选填，设置空值，并隐藏
+        this.routerRequired = false
+        this.form.getFieldDecorator('router', { initialValue: '' })
+        this.routerShow = false
+        // 权限标识框显示，必填，给空值
+        this.permissionShow = true
+        this.permissionRequired = true
+        this.form.getFieldDecorator('permission', { initialValue: '' })
+      }
+    },
+    handleSubmit() {
+      const { form: { validateFields } } = this
+      this.confirmLoading = true
+      validateFields((errors, values) => {
+        if (!errors) {
+          if (values.visible) {
+            values.visible = 1
+          } else {
+            values.visible = 0
+          }
+          console.log(values)
+          if (values.id) {
+            menuEdit(values).then((res) => {
+              this.confirmLoading = false
+              if (res.code == 200) {
+                this.$message.success('编辑成功')
+                this.$emit('ok', values)
+                this.handleCancel()
+              } else {
+                this.$message.error('编辑失败：' + res.msg)
+              }
+            }).finally((res) => {
+              this.confirmLoading = false
+            })
+          } else {
+            menuAdd(values).then((res) => {
+              this.confirmLoading = false
+              if (res.code == 200) {
+                this.$message.success('新增成功')
+                this.$emit('ok', values)
+                this.handleCancel()
+              } else {
+                this.$message.error('新增失败：' + res.msg)
+              }
+            }).finally((res) => {
+              this.confirmLoading = false
+            })
+          }
+        } else {
+          this.confirmLoading = false
+        }
+      })
+    },
+    handleCancel() {
+      this.form.resetFields()
+      this.confirmLoading = false
+      this.visible = false
+    },
+    setMenuItem(record) {
+      console.log(record)
+      this.form.setFieldsValue(
+        {
+          id: record.id,
+          name: record.name,
+          code: record.code,
+          component: record.component,
+          permission: record.permission,
+          router: record.router,
+          intCode: record.intCode,
+          remark: record.remark
+        }
+      )
+      this.form.getFieldDecorator('pid', { initialValue: record.pid })
+      this.pid = record.pid
     }
-
   }
+
+}
 </script>
diff --git a/src/views/security/menu/MenuList.vue b/src/views/security/menu/MenuList.vue
index 44c7599..1bdf9b6 100644
--- a/src/views/security/menu/MenuList.vue
+++ b/src/views/security/menu/MenuList.vue
@@ -41,8 +41,10 @@
             {{ record.type | typeFilter }}
           </a-tag>
         </span>
-        <span slot="action" slot-scope="text, record">
+        <span slot="action" slot-scope="text, record" >
           <template>
+            <a v-if="hasPerm('sys:menu:add') && record.type !== 2" @click="$refs.menuForm.add(record.id)">新增下级</a>
+            <a-divider type="vertical" v-if="hasPerm('sys:menu:add')" />
             <a v-if="hasPerm('sys:menu:edit')" @click="$refs.menuForm.edit(record)">编辑</a>
             <a-divider type="vertical" v-if="hasPerm('sys:menu:edit')" />
             <a-popconfirm v-if="hasPerm('sys:menu:delete')" placement="topRight" title="删除本菜单与下级？" @confirm="() => handleDel(record)">
@@ -99,8 +101,9 @@ export default {
         },
         {
           title: '排序',
-          dataIndex: 'intCode'
-        }
+          dataIndex: 'intCode',
+          width: '5%',
+        },
       ],
       loadData: parameter => {
         return menuList(Object.assign(parameter, this.queryParam)).then((res) => {
@@ -116,7 +119,7 @@ export default {
       this.columns.push({
         title: '操作',
         dataIndex: 'action',
-        width: '150px',
+        width: '180px',
         scopedSlots: { customRender: 'action' }
       })
     }