From 25bade764411f3748e641020bd7828ce7a7a743f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BD=99=E8=8F=B2?= <1622041228@qq.com>
Date: Fri, 27 May 2022 15:05:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/menu/index.js                  |   4 +-
 .../DataTable/tools/useDataSource.js          |   5 +-
 src/views/system/dept/index.vue               |  61 +++---
 src/views/system/dept/info.js                 |  30 +++
 .../system/menu/components/MenuModal.vue      | 152 ++++++-------
 src/views/system/menu/index.vue               | 200 +++++++++++++-----
 src/views/system/menu/info.js                 |  12 ++
 src/views/system/role/info.js                 |  18 --
 .../system/user/components/UserModal.vue      |   2 +
 src/views/system/user/index.vue               |   1 -
 10 files changed, 316 insertions(+), 169 deletions(-)
 create mode 100644 src/views/system/dept/info.js
 create mode 100644 src/views/system/menu/info.js

diff --git a/src/api/system/menu/index.js b/src/api/system/menu/index.js
index e11607b..350e803 100644
--- a/src/api/system/menu/index.js
+++ b/src/api/system/menu/index.js
@@ -1,7 +1,7 @@
 import { defAxios as request } from '@/utils/http'
 /**
- * 获取菜单分页数据接口
- * @returns 菜单分页数据
+ * 获取菜单管理数据接口
+ * @returns 菜单数据
  */
 export function getMenuList(params) {
   return request({
diff --git a/src/components/DataTable/tools/useDataSource.js b/src/components/DataTable/tools/useDataSource.js
index c0ed56a..1e792a8 100644
--- a/src/components/DataTable/tools/useDataSource.js
+++ b/src/components/DataTable/tools/useDataSource.js
@@ -44,7 +44,7 @@ export function useDataSource(propsRef, { getPaginationInfo, setPagination, setL
         }
       }
       // 处理数据结构
-      const resultInfo = res[listField] ? res[listField] : []
+      const resultInfo = res[listField] ? res[listField] : res
       dataSourceRef.value = dataType === 'tree' ? dealTree(resultInfo) : resultInfo
       setPagination({
         [pageField]: currentPage,
@@ -74,7 +74,7 @@ export function useDataSource(propsRef, { getPaginationInfo, setPagination, setL
    * @returns 返回树形结构数据
    */
   function dealTree(info) {
-    const tree = toTreeData(info.data, 'id', 'pid', 'children')
+    const tree = toTreeData(info, 'id', 'pid', 'children')
     return tree
   }
 
@@ -106,7 +106,6 @@ export function useDataSource(propsRef, { getPaginationInfo, setPagination, setL
   }
 
   async function reFetch(opt) {
-    console.log('opt', opt)
     const { paginationSetting } = unref(propsRef)
     const pageField = paginationSetting.pageField
     const sizeField = paginationSetting.sizeField
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 4a7968d..6be2d4a 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,10 +1,10 @@
 <template>
   <div>
     <n-card>
+      <headSearch :info="info" @search="handleSearch" />
       <data-table
-        :columns="data.columns"
-        :data="data.data"
-        :pagination="data.pagination"
+        :columns="columns"
+        :data="data"
         :request="loadDataTable"
         :row-key="(row) => row.id"
         data-type="tree"
@@ -17,17 +17,26 @@
       </data-table>
     </n-card>
   </div>
+  <!-- 新增、编辑弹窗 -->
+  <dept-modal
+    v-if="modalShow"
+    v-model:visible="modalShow"
+    :row="rowData"
+    @done="handleSearch"
+  />
 </template>
 
 <script>
+import headSearch from '@/components/Search/index.vue'
 import dataTable from '@/components/DataTable/index.vue'
 import TableAction from '@/components/DataTable/tools/Action.vue'
-import { getDeptList } from '@/api/system/dept/index.js'
-import { h, onMounted, unref } from 'vue'
-import { reactive } from 'vue'
+import { getDeptList, deleteDept } from '@/api/system/dept/index.js'
+import { h, unref, toRefs, ref, reactive } from 'vue'
+import DeptModal from './components/DeptModal.vue'
+import info from './info.js'
 export default {
   name: 'MenuPage',
-  components: { dataTable },
+  components: { dataTable, DeptModal, headSearch},
   setup() {
     const data = reactive({
       columns: [
@@ -108,30 +117,36 @@ export default {
         }
       ],
       data: [],
-      pagination: {
-        pageSize: 10
-      }
+      info: ref(info),
+      modalShow: false,
+      rowData: {}
     })
 
+    // 新增
+    function handleModal() {
+      data.modalShow = true
+    }
+
+    // 编辑
     function play(row) {
-      console.log(row)
+      data.rowData = row
+      data.modalShow = true
     }
 
     /**
      * @description: 获取部门数据并做树形结构处理
      * @return {*}
      */
-    async function fetchList() {
-      const params = {
-        page: 1,
-        limit: 10
+    const params = ref({})
+
+    const tableRef = ref()
+
+    function handleSearch(data) {
+      params.value = {
+        ...data
       }
-      const res = await getDeptList(params)
-      data.data = res.data
+      tableRef.value.reFetch({ ...unref(params) })
     }
-    const params = reactive({
-      name: 'xiaoMa'
-    })
 
     const loadDataTable = async(res) => {
       const _params = {
@@ -141,11 +156,7 @@ export default {
       return await getDeptList(_params)
     }
 
-    onMounted(() => {
-      fetchList()
-    })
-
-    return { data, loadDataTable }
+    return { ...toRefs(data), loadDataTable, handleSearch, handleModal }
   }
 }
 </script>
diff --git a/src/views/system/dept/info.js b/src/views/system/dept/info.js
new file mode 100644
index 0000000..42342d3
--- /dev/null
+++ b/src/views/system/dept/info.js
@@ -0,0 +1,30 @@
+const data = [
+  {
+    label: '部门名称',
+    key: 'name',
+    props: {
+      placeholder: '请输入部门名称'
+    }
+  }
+  // {
+  //   label: '角色类型',
+  //   type: 'select',
+  //   key: 'op',
+  //   props: {
+  //     options: [{
+  //       label: 11, value: 1
+  //     }]
+  //   }
+  // },
+  // {
+  //   label: '角色类型',
+  //   type: 'date',
+  //   key: 'date',
+  //   props: {
+  //     type: 'date'
+  //   }
+  // }
+]
+
+export default data
+
diff --git a/src/views/system/menu/components/MenuModal.vue b/src/views/system/menu/components/MenuModal.vue
index bf4296e..554a607 100644
--- a/src/views/system/menu/components/MenuModal.vue
+++ b/src/views/system/menu/components/MenuModal.vue
@@ -6,12 +6,12 @@
     :on-negative-click="handleClose"
   >
     <template #Context>
-      <n-form ref="formRef" :model="menuForm" :rules="menuRules" require-mark-placement="left" :label-width="80" label-placement="left">
+      <n-form ref="formRef" :model="form" :rules="rules" require-mark-placement="left" :label-width="80" label-placement="left">
         <n-grid x-gap="12" :cols="2">
           <n-gi>
             <n-form-item label="上级菜单" path="pid">
               <n-select
-                v-model:value="menuForm.pid"
+                v-model:value="form.pid"
                 placeholder="请选择上级菜单"
                 :options="getMenuList"
               />
@@ -19,8 +19,8 @@
           </n-gi>
           <n-gi>
             <n-form-item label="菜单类型" path="type">
-              <n-radio-group v-model:value="menuForm.type" name="type">
-                <n-radio v-for="item in typeOptions" :key="`type_${item.key}`" :value="item.key">
+              <n-radio-group v-model:value="form.type" name="type">
+                <n-radio v-for="item in typeOptions" :key="item.key" :value="item.key">
                   {{ item.label }}
                 </n-radio>
               </n-radio-group>
@@ -28,13 +28,13 @@
           </n-gi>
           <n-gi>
             <n-form-item label="菜单名称" path="title">
-              <n-input v-model:value="menuForm.title" placeholder="请输入菜单名称" />
+              <n-input v-model:value="form.title" placeholder="请输入菜单名称" />
             </n-form-item>
           </n-gi>
           <n-gi>
             <n-form-item label="打开方式" path="target">
-              <n-radio-group v-model:value="menuForm.target" name="target">
-                <n-radio v-for="item in openOptions" :key="`target_${item.key}`" :value="item.key">
+              <n-radio-group v-model:value="form.target" name="target">
+                <n-radio v-for="item in openOptions" :key="item.key" :value="item.key">
                   {{ item.label }}
                 </n-radio>
               </n-radio-group>
@@ -42,33 +42,33 @@
           </n-gi>
           <n-gi>
             <n-form-item label="菜单图标" path="icon">
-              <n-input v-model:value="menuForm.icon" placeholder="请选择菜单图标" />
+              <n-input v-model:value="form.icon" :disabled="form.type === 1" placeholder="请选择菜单图标" />
             </n-form-item>
           </n-gi>
           <n-gi>
             <n-form-item label="权限标识" path="permission">
-              <n-input v-model:value="menuForm.permission" placeholder="请输入权限标识" />
+              <n-input v-model:value="form.permission" :disabled="form.type === 0" placeholder="请输入权限标识" />
             </n-form-item>
           </n-gi>
           <n-gi>
             <n-form-item label="路由地址" path="path">
-              <n-input v-model:value="menuForm.path" placeholder="请输入路由地址" />
+              <n-input v-model:value="form.path" :disabled="form.type === 1" placeholder="请输入路由地址" />
             </n-form-item>
           </n-gi>
           <n-gi>
             <n-form-item label="排序号" path="sort">
-              <n-input v-model:value="menuForm.sort" placeholder="请输入排序号" />
+              <n-input-number v-model:value="form.sort" placeholder="请输入排序号" />
             </n-form-item>
           </n-gi>
           <n-gi>
             <n-form-item label="组件路径" path="component">
-              <n-input v-model:value="menuForm.component" placeholder="请输入组件路径" />
+              <n-input v-model:value="form.component" :disabled="form.type === 1" placeholder="请输入组件路径" />
             </n-form-item>
           </n-gi>
           <n-gi>
             <n-form-item label="是否可见" path="hide">
-              <n-radio-group v-model:value="menuForm.hide" name="hide">
-                <n-radio v-for="item in visibleOptions" :key="`hide_${item.key}`" :value="item.key">
+              <n-radio-group v-model:value="form.hide" name="hide">
+                <n-radio v-for="item in visibleOptions" :key="item.key" :value="item.key">
                   {{ item.label }}
                 </n-radio>
               </n-radio-group>
@@ -76,8 +76,8 @@
           </n-gi>
           <n-gi>
             <n-form-item label="菜单状态" path="status">
-              <n-radio-group v-model:value="menuForm.status" name="status">
-                <n-radio v-for="item in statusOptions" :key="`status_${item.key}`" :value="item.key">
+              <n-radio-group v-model:value="form.status" name="status">
+                <n-radio v-for="item in statusOptions" :key="item.key" :value="item.key">
                   {{ item.label }}
                 </n-radio>
               </n-radio-group>
@@ -91,9 +91,9 @@
 </template>
 
 <script>
-import { defineComponent, computed, reactive, toRefs, ref } from 'vue'
+import { defineComponent, computed, reactive, toRefs } from 'vue'
 import Modal from '@/components/Modal/index.vue'
-import { addMenu } from '@/api/system/menu/index.js'
+import { addMenu, editMenu } from '@/api/system/menu/index.js'
 export default defineComponent({
   name: 'MenuModal',
   components: { Modal },
@@ -114,59 +114,48 @@ export default defineComponent({
     }
   },
   emits: {
-    'update:visible': null
+    'update:visible': null,
+    'done': null
   },
   setup(props, { emit }) {
     const data = reactive({
-      menuForm: {
-        pid: null,
-        type: '0',
-        title: '',
-        target: '0',
-        icon: '',
-        permission: '',
-        path: '',
-        sort: '',
-        component: '',
-        hide: '0',
-        status: '1'
-      },
-      menuRules: {
-        title: {
+      form: {},
+      rules: {
+        title: [{
           required: true,
           message: '请输入菜单名称',
-          trigger: ['blur']
-        },
-        sort: {
+          trigger: 'blur'
+        }],
+        sort: [{
           required: true,
           message: '请输入排序号',
-          trigger: ['blur']
-        }
+          trigger: 'blur'
+        }]
       },
       typeOptions: [
-        { key: '0', label: '菜单' },
-        { key: '1', label: '按钮' }
+        { key: 0, label: '菜单' },
+        { key: 1, label: '按钮' }
       ],
       openOptions: [
-        { key: '0', label: '组件' },
-        { key: '1', label: '内链' },
-        { key: '2', label: '外链' }
+        { key: '1', label: '内部' },
+        { key: '2', label: '外部' }
       ],
       visibleOptions: [
-        { key: '0', label: '可见' },
-        { key: '1', label: '不可见' }
+        { key: 0, label: '可见' },
+        { key: 1, label: '不可见' }
       ],
       statusOptions: [
-        { key: '1', label: '在用' },
-        { key: '2', label: '停用' }
-      ]
+        { key: 1, label: '在用' },
+        { key: 2, label: '停用' }
+      ],
+      menuList: []
     })
 
     const getMenuList = computed(() => {
       const list = props.menuList.map((item) => {
         const menu = {
           label: item.title,
-          value: item.pid
+          value: item.id
         }
         return menu
       })
@@ -174,9 +163,14 @@ export default defineComponent({
     })
 
     const getModalOptions = computed(() => {
+      const row = props.data
+      if (props.data.pid === 0) {
+        row.pid = null
+      }
       return {
         show: props.visible,
-        title: props.data ? '修改菜单' : '新建菜单',
+        title: props.data.title ? '修改菜单' : '添加菜单',
+        form: Object.assign(data.form, row),
         width: 700,
         negativeText: '取消',
         positiveText: '确认'
@@ -187,31 +181,47 @@ export default defineComponent({
     const handleClose = () => {
       emit('update:visible', false)
     }
-    const formRef = ref()
-    const handleConfirm = () => {
-      formRef.value?.validate((errors) => {
-        if (!errors) {
-          const params = {
-            ...data.menuForm
-          }
-          addMenu(params)
-            .then(res => {
-              handleClose()
-            })
-        } else {
-          $message.error('清先完成校验')
-        }
-      })
-      return false
-    }
 
     return {
       ...toRefs(data),
-      formRef,
       getMenuList,
       getModalOptions,
-      handleClose,
-      handleConfirm
+      handleClose
+    }
+  },
+  methods: {
+    // 表单提交
+    handleConfirm() {
+      const type = this.data.title ? 'add' : 'edit'
+      this.$refs.formRef.validate((errors) => {
+        if (!errors) {
+          if (type === 'add') {
+            addMenu(this.form).then(res => {
+              if (res.code === 0) {
+                this.handleClose()
+                this.$emit('done')
+                $message.success(res.msg)
+              } else {
+                $message.error(res.msg)
+              }
+            }).catch(e => {
+              console.log(e)
+            })
+          } else if (type === 'edit') {
+            editMenu(this.form).then(res => {
+              if (res.code === 0) {
+                this.handleClose()
+                this.$emit('done')
+                $message.success(res.msg)
+              } else {
+                $message.error(res.msg)
+              }
+            })
+          }
+        } else {
+          $message.error('请完善必填信息')
+        }
+      })
     }
   }
 })
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index fdab71f..7a4ce6b 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -1,29 +1,41 @@
 <template>
   <div>
     <n-card>
-      <data-table :columns="data.columns" :pagination="false" :data="data.data" size="large" @fetch-success="getFechData">
+      <headSearch :info="info" @search="handleSearch" />
+      <data-table
+        ref="tableRef"
+        :columns="columns"
+        :pagination="false"
+        data-type="tree"
+        :request="loadDataTable"
+      >
         <template #tableTitle>
-          <n-button type="primary" @click="handlleRoleAdd">
-            添加菜单
-          </n-button>
+          <n-button type="primary" @click="handlleRoleAdd"> 添加菜单 </n-button>
         </template>
       </data-table>
     </n-card>
   </div>
 
-  <RoleModal v-model:visible="data.modalShow" :data="data.selectRow" :menu-list="data.data" />
+  <MenuModal
+    v-model:visible="modalShow"
+    :data="rowData"
+    :menu-list="menuList"
+    @done="handleSearch"
+  />
 </template>
 
 <script>
+import headSearch from '@/components/Search/index.vue'
 import dataTable from '@/components/DataTable/index.vue'
-import RoleModal from './components/MenuModal.vue'
+import MenuModal from './components/MenuModal.vue'
+import TableTags from '@/components/DataTable/tools/Tags.vue'
 import Action from '@/components/DataTable/tools/Action.vue'
-import { getMenuList } from '@/api/system/index.js'
-import { h, onMounted } from 'vue'
-import { reactive } from 'vue'
+import { getMenu, getMenuList, deleteMenu } from '@/api/system/menu/index.js'
+import { h, ref, unref, reactive, toRefs, onMounted } from 'vue'
+import info from './info.js'
 export default {
   name: 'MenuPage',
-  components: { dataTable, RoleModal },
+  components: { dataTable, MenuModal, headSearch },
   setup() {
     const data = reactive({
       columns: [
@@ -37,13 +49,22 @@ export default {
           title: '菜单类型',
           key: 'type',
           align: 'center',
-          width: 100
-        },
-        {
-          title: '请求方式',
-          key: 'method',
-          align: 'center',
-          width: 100
+          width: 100,
+          render(row) {
+            return h(TableTags, {
+              data: row.type,
+              filters: [
+                {
+                  key: 0,
+                  label: '菜单'
+                },
+                {
+                  key: 1,
+                  label: '节点'
+                }
+              ]
+            })
+          }
         },
         {
           title: '路由地址',
@@ -57,17 +78,26 @@ export default {
           align: 'center',
           width: 200
         },
-        {
-          title: '权限标识',
-          key: 'permission',
-          align: 'center',
-          width: 200
-        },
         {
           title: '状态',
           key: 'status',
           align: 'center',
-          width: 100
+          width: 100,
+          render(row) {
+            return h(TableTags, {
+              data: row.status,
+              filters: [
+                {
+                  key: 1,
+                  label: '在用'
+                },
+                {
+                  key: 2,
+                  label: '停用'
+                }
+              ]
+            })
+          }
         },
         {
           title: '排序',
@@ -76,10 +106,25 @@ export default {
           width: 100
         },
         {
-          title: '可见',
+          title: '是否可见',
           key: 'hide',
           align: 'center',
-          width: 100
+          width: 100,
+          render(row) {
+            return h(TableTags, {
+              data: row.hide,
+              filters: [
+                {
+                  key: 1,
+                  label: '可见'
+                },
+                {
+                  key: 2,
+                  label: '不可见'
+                }
+              ]
+            })
+          }
         },
         {
           title: '创建时间',
@@ -100,18 +145,29 @@ export default {
                   type: 'button',
                   props: {
                     type: 'primary',
-                    onClick: play.bind(null, row)
+                    onClick: add.bind(null, row)
                   },
                   auth: 'basic_list'
                 },
                 {
                   label: '修改',
+                  type: 'button',
+                  props: {
+                    type: 'primary',
+                    onClick: play.bind(null, row)
+                  },
                   auth: 'basic_list'
                 },
                 {
                   label: '删除',
                   type: 'popconfirm',
-                  auth: 'basic_list'
+                  auth: 'basic_list',
+                  tip: '确定删除这条数据吗?',
+                  props: {
+                    negativeText: '取消',
+                    positiveText: '确认',
+                    onPositiveClick: deleteSingle.bind(null, row.id)
+                  }
                 }
               ],
               align: 'center'
@@ -119,48 +175,94 @@ export default {
           }
         }
       ],
-      data: [],
+      info: ref(info),
       modalShow: false,
-      selectRow: null
+      menuList: [],
+      rowData: {
+        status: 1,
+        type: 0,
+        hide: 0
+      }
     })
 
-    function play(row) {
-      console.log(row)
+    // 获取全部菜单信息
+    async function getMenuAll() {
+      const list = await getMenu()
+      data.menuList = list.data
     }
+    onMounted(() => {
+      getMenuAll()
+    })
 
     /**
      * @description: 获取菜单数据
      * @return {*}
      */
-    async function fetchList() {
-      const res = await getMenuList()
-      data.data = res.data
+    const params = ref({})
+    const tableRef = ref()
+
+    function handleSearch(data) {
+      params.value = {
+        ...data
+      }
+      tableRef.value.reFetch({ ...unref(params) })
     }
+
+    const loadDataTable = async(res) => {
+      const _params = {
+        ...unref(params),
+        ...res
+      }
+      return await getMenuList(_params)
+    }
+
+    // 打开新增弹框
     function handlleRoleAdd() {
       data.modalShow = true
+      data.rowData = {}
+    }
+    // 行内新增
+    function add(row) {
+      data.modalShow = true
+      data.rowData = {}
+      data.rowData.pid = row.id
+    }
+    // 编辑
+    function play(row) {
+      data.rowData = row
+      data.modalShow = true
+    }
+    // 单个删除数据
+    function deleteSingle(id) {
+      deleteData(id)
     }
 
-    /**
-     * @description: 获取表单数据
-     * @param {*} data
-     * @return {*}
-     */
-    function getFechData(data) {
-
+    // 删除方法
+    function deleteData(id) {
+      deleteMenu(id)
+        .then((res) => {
+          if (res.code === 0) {
+            handleSearch({})
+            $message.success(res.msg)
+          } else {
+            $message.error(res.msg)
+          }
+        })
+        .catch((e) => {
+          console.log(e)
+        })
     }
 
-    onMounted(() => {
-      fetchList()
-    })
-
     return {
-      data,
+      ...toRefs(data),
+      tableRef,
+      loadDataTable,
+      handleSearch,
       handlleRoleAdd,
-      getFechData
+      deleteSingle
     }
   }
 }
-
 </script>
 <style scoped lang='scss'>
 </style>
diff --git a/src/views/system/menu/info.js b/src/views/system/menu/info.js
new file mode 100644
index 0000000..94939bf
--- /dev/null
+++ b/src/views/system/menu/info.js
@@ -0,0 +1,12 @@
+const data = [
+  {
+    label: '菜单名称',
+    key: 'title',
+    props: {
+      placeholder: '请输入菜单名称'
+    }
+  }
+]
+
+export default data
+
diff --git a/src/views/system/role/info.js b/src/views/system/role/info.js
index 211910b..d80fb79 100644
--- a/src/views/system/role/info.js
+++ b/src/views/system/role/info.js
@@ -6,24 +6,6 @@ const data = [
       placeholder: '请输入角色名称'
     }
   }
-  // {
-  //   label: '角色类型',
-  //   type: 'select',
-  //   key: 'op',
-  //   props: {
-  //     options: [{
-  //       label: 11, value: 1
-  //     }]
-  //   }
-  // },
-  // {
-  //   label: '角色类型',
-  //   type: 'date',
-  //   key: 'date',
-  //   props: {
-  //     type: 'date'
-  //   }
-  // }
 ]
 
 export default data
diff --git a/src/views/system/user/components/UserModal.vue b/src/views/system/user/components/UserModal.vue
index d610d81..2278a5b 100644
--- a/src/views/system/user/components/UserModal.vue
+++ b/src/views/system/user/components/UserModal.vue
@@ -239,6 +239,8 @@ export default defineComponent({
               }
             })
           }
+        } else {
+          $message.error('请完善必填信息')
         }
       })
     }
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 0af4106..ee1330d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -268,7 +268,6 @@ export default {
     }
 
     return {
-      data,
       loadDataTable,
       handleModal,
       ...toRefs(data),