🎨 修复菜单授权bug

src/views/common/project/ProjectModal.vue

@@ -8,36 +8,36 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-/**
+  /**
    * 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
    * 采用vben-动态表格表单封装组件编写,采用 setup 写法
    * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
    * author entfrm开发团队-王翔
    */
-import { ref, unref } from 'vue';
-import { BasicForm, useForm } from '/@/components/Form';
-import { formSchema } from './project.data';
-import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
-import {listProject, addProject, editProject, getProject} from '/@/api/platform/common/controller/project';
-import { listToTree } from '/@/utils/helper/treeHelper';
+  import { ref, unref } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form';
+  import { formSchema } from './project.data';
+  import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
+  import {listProject, addProject, editProject, getProject} from '/@/api/platform/common/controller/project';
+  import { listToTree } from '/@/utils/helper/treeHelper';
 
-/** 通用变量统一声明区域 */
-const tag = ref<Nullable<string>>('');
-/** https://v3.cn.vuejs.org/api/options-data.html#emits */
-const emit = defineEmits(['success', 'register']);
-const [registerForm, { resetFields, setFieldsValue, updateSchema, validate, clearValidate }] = useForm({
+  /** 通用变量统一声明区域 */
+  const tag = ref<Nullable<string>>('');
+  /** https://v3.cn.vuejs.org/api/options-data.html#emits */
+  const emit = defineEmits(['success', 'register']);
+  const [registerForm, { resetFields, setFieldsValue, updateSchema, validate, clearValidate }] = useForm({
     labelWidth: 100,
     schemas: formSchema,
     showActionButtonGroup: false,
     baseColProps: { span: 24 }
-});
-const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data: WindowInnerData = { _tag: '' }) => {
+  });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data: WindowInnerData = { _tag: '' }) => {
     // 处理清除脏数据
     await resetFields();
     await clearValidate();
     // 处理设置数据
     tag.value = data._tag;
-  const topProject = { projectId: '0', name: '顶级项目', children: [] };
+    const topProject = { id: '0', name: '顶级项目', children: [] };
     topProject.children = listToTree(await listProject());
     await updateSchema({
       field: 'parentId',
@@ -45,25 +45,25 @@ const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data
         treeData: [topProject]
       }
     });
-  const projectId = data.record?.projectId;
+    const id = data.record?.id;
     const props: Partial<ModalProps> = { confirmLoading: false };
     // 采用tag标签区分操作
     switch (unref(tag)) {
       case 'add':
         props.title = '新增项目';
-      projectId && await setFieldsValue({ parentId: projectId });
+        id && await setFieldsValue({ parentId: id });
         break;
       case 'edit':
         props.title = '编辑项目';
-      await setFieldsValue(await getProject(projectId));
+        await setFieldsValue(await getProject(id));
         break;
     }
     // 尾部:设置处理后的最终配置数据
     setModalProps(props);
-});
+  });
 
-/** 处理弹出框提交 */
-async function handleSubmit() {
+  /** 处理弹出框提交 */
+  async function handleSubmit() {
     try {
       // 提取验证数据
       const formData = await validate();
@@ -84,6 +84,5 @@ async function handleSubmit() {
     } finally {
       setModalProps({ confirmLoading: false });
     }
-}
-
+  }
 </script>

src/views/common/project/index.vue

@@ -1,4 +1,3 @@
-
 <template>
   <div>
     <BasicTable @register="registerTable">
@@ -45,27 +44,27 @@
   </div>
 </template>
 <script lang="ts" setup>
-/**
+  /**
    * 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
    * 采用vben-动态表格表单封装组件编写,采用 setup 写法
    * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
    * author entfrm开发团队-王翔
    */
-import { BasicTable, useTable, TableAction } from '/@/components/Table';
-import { useModal } from '/@/components/Modal';
-import DeptModal from './ProjectModal.vue';
-import { columns, searchFormSchema } from './project.data';
-import {delProject, getProject, listProject} from '/@/api/platform/common/controller/project';
-import { useMessage } from '/@/hooks/web/useMessage';
-import { listToTree } from '/@/utils/helper/treeHelper';
+  import { BasicTable, useTable, TableAction } from '/@/components/Table';
+  import { useModal } from '/@/components/Modal';
+  import DeptModal from './ProjectModal.vue';
+  import { columns, searchFormSchema } from './project.data';
+  import {delProject, getProject, listProject} from '/@/api/platform/common/controller/project';
+  import { useMessage } from '/@/hooks/web/useMessage';
+  import { listToTree } from '/@/utils/helper/treeHelper';
 
-/** 通用变量统一声明区域 */
-const { createMessage } = useMessage();
-const [registerModal, { openModal }] = useModal();
-const [registerTable, { reload, expandAll, collapseAll }] = useTable({
+  /** 通用变量统一声明区域 */
+  const { createMessage } = useMessage();
+  const [registerModal, { openModal }] = useModal();
+  const [registerTable, { reload, expandAll, collapseAll }] = useTable({
     title: '项目列表',
     api: listProject,
-  rowKey: 'projectId',
+    rowKey: 'id',
     columns,
     formConfig: {
       labelWidth: 120,
@@ -88,29 +87,29 @@ const [registerTable, { reload, expandAll, collapseAll }] = useTable({
       slots: { customRender: 'action' },
       fixed: false
     },
-  afterFetch: (result) => listToTree(result, { id: 'projectId' })
-});
+    afterFetch: (result) => listToTree(result)
+  });
 
-/** 新增按钮操作,行内新增与工具栏局域新增通用 */
-function handleAdd(record?: Recordable) {
+  /** 新增按钮操作,行内新增与工具栏局域新增通用 */
+  function handleAdd(record?: Recordable) {
     openModal(true,{ _tag: 'add', record });
-}
+  }
 
-/** 编辑按钮操作,行内编辑 */
-function handleEdit(record: Recordable) {
+  /** 编辑按钮操作,行内编辑 */
+  function handleEdit(record: Recordable) {
     openModal(true, { _tag: 'edit', record });
-}
+  }
 
-/** 删除按钮操作,行内删除 */
-async function handleDel(record: Recordable) {
-  await delProject(record.projectId);
+  /** 删除按钮操作,行内删除 */
+  async function handleDel(record: Recordable) {
+    await delProject(record.id);
     createMessage.success('删除成功!');
     handleRefreshTable();
-}
+  }
 
-/** 处理表格刷新 */
-function handleRefreshTable() {
+  /** 处理表格刷新 */
+  function handleRefreshTable() {
     reload();
-}
+  }
 
 </script>

src/views/common/project/project.data.ts

@@ -84,7 +84,7 @@ export const searchFormSchema: FormSchema[] = [
 /** 表单配置 */
 export const formSchema: FormSchema[] = [
   {
-    field: 'projectId',
+    field: 'id',
     label: 'ID',
     component: 'Input',
     show: false
@@ -97,8 +97,8 @@ export const formSchema: FormSchema[] = [
     componentProps: {
       replaceFields: {
         title: 'name',
-        key: 'projectId',
-        value: 'projectId',
+        key: 'id',
+        value: 'id',
       },
       getPopupContainer: () => document.body,
     }