菜单页面添加新增下级

src/views/security/menu/MenuForm.vue

@@ -1,13 +1,5 @@
 <template>
-  <a-modal
+  <a-modal :title="modalTitle" :width="1000" :visible="visible" :confirmLoading="confirmLoading" @ok="handleSubmit" @cancel="handleCancel" :destroyOnClose="true">
-    :title="modalTitle"
-    :width="1000"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleSubmit"
-    @cancel="handleCancel"
-    :destroyOnClose="true"
-  >
     <a-spin :spinning="formLoading">
       <a-form :form="form">
 
@@ -17,23 +9,12 @@
 
         <a-row :gutter="24">
           <a-col :md="12" :sm="24">
-            <a-form-item
+            <a-form-item label="菜单名称" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
-              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
+            <a-form-item style="width: 100%" :labelCol="labelCol" :wrapperCol="wrapperCol" label="菜单编号" hasFeedback>
-              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,11 +22,7 @@
 
         <a-row :gutter="24">
           <a-col :md="12" :sm="24">
-            <a-form-item
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="菜单层级">
-              :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>
@@ -55,25 +32,13 @@
           </a-col>
           <a-col :md="12" :sm="24">
             <div v-show="pidShow">
-              <a-form-item
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="父级菜单" has-feedback>
-                :labelCol="labelCol"
+                <a-tree-select v-decorator="['pid', {initialValue: treeSelDefaultValue},{rules: [{ required: true, message: '请选择父级菜单！' }]}]" style="width: 100%" :dropdownStyle="{ maxHeight: '300px', overflow: 'auto' }" :treeData="menuTreeData" placeholder="请选择父级菜单" :replaceFields="{
-                :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="{
                     children:'children',
                     title:'name',
                     key:'id',
                     value:'id'
-                  }"
+                  }">
-                >
                   <span slot="title" slot-scope="{ id }">{{ id }}
                   </span>
                 </a-tree-select>
@@ -85,11 +50,7 @@
         <a-row :gutter="24">
           <a-col :md="12" :sm="24">
             <div v-show="componentShow">
-              <a-form-item
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
-                :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" />
@@ -102,11 +63,7 @@
           </a-col>
           <a-col :md="12" :sm="24">
             <div v-show="routerShow">
-              <a-form-item
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback>
-                :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
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="权限标识" hasFeedback>
-                :labelCol="labelCol"
-                :wrapperCol="wrapperCol"
-                label="权限标识"
-                hasFeedback
-              >
                 <a-input placeholder="请输入权限标识" v-decorator="['permission', {rules: [{required: permissionRequired, message: '请输入权限标识！'}]}]" />
               </a-form-item>
             </div>
@@ -131,20 +83,12 @@
 
         <a-row :gutter="24">
           <a-col :md="12" :sm="24">
-            <a-form-item
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="是否可见">
-              :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
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="排序">
-              :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>
@@ -153,12 +97,7 @@
         <a-row :gutter="24">
 
           <a-col :md="12" :sm="24">
-            <a-form-item
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="备注" hasFeedback>
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="备注"
-              hasFeedback
-            >
               <a-input placeholder="请输入备注" v-decorator="['remark']"></a-input>
             </a-form-item>
           </a-col>
@@ -197,7 +136,8 @@
       permissionRequired: true,
       formLoading: true,
       type: '',
-        form: this.$form.createForm(this)
+      form: this.$form.createForm(this),
+      treeSelDefaultValue: 1,
     }
   },
 
@@ -213,6 +153,7 @@
 
       // 默认选中的单选框
       this.form.getFieldDecorator('visible', { initialValue: true })
+      this.treeSelDefaultValue = type;
 
       // 默认加载菜单树
       this.getMenuTree()

src/views/security/menu/MenuList.vue

@@ -43,6 +43,8 @@
         </span>
         <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' }
       })
     }