From 75c3892b9e90d6eafc124e3b84f9a0f953a499ae Mon Sep 17 00:00:00 2001
From: wangxiang <1827945911@qq.com>
Date: Fri, 19 Aug 2022 17:37:50 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/common/project/ProjectModal.vue | 135 +++++++++++-----------
 src/views/common/project/index.vue        | 125 ++++++++++----------
 src/views/common/project/project.data.ts  |   6 +-
 3 files changed, 132 insertions(+), 134 deletions(-)

diff --git a/src/views/common/project/ProjectModal.vue b/src/views/common/project/ProjectModal.vue
index b6a0565..b82dbde 100644
--- a/src/views/common/project/ProjectModal.vue
+++ b/src/views/common/project/ProjectModal.vue
@@ -8,82 +8,81 @@
   </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';
+  /**
+   * 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
+   * 采用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';
 
-/** 通用变量统一声明区域 */
-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: '' }) => {
-  // 处理清除脏数据
-  await resetFields();
-  await clearValidate();
-  // 处理设置数据
-  tag.value = data._tag;
-  const topProject = { projectId: '0', name: '顶级项目', children: [] };
-  topProject.children = listToTree(await listProject());
-  await updateSchema({
-    field: 'parentId',
-    componentProps: {
-      treeData: [topProject]
-    }
+  /** 通用变量统一声明区域 */
+  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 projectId = data.record?.projectId;
-  const props: Partial<ModalProps> = { confirmLoading: false };
-  // 采用tag标签区分操作
-  switch (unref(tag)) {
-    case 'add':
-      props.title = '新增项目';
-      projectId && await setFieldsValue({ parentId: projectId });
-      break;
-    case 'edit':
-      props.title = '编辑项目';
-      await setFieldsValue(await getProject(projectId));
-      break;
-  }
-  // 尾部:设置处理后的最终配置数据
-  setModalProps(props);
-});
-
-/** 处理弹出框提交 */
-async function handleSubmit() {
-  try {
-    // 提取验证数据
-    const formData = await validate();
-    // 处理提交之前逻辑
-    setModalProps({ confirmLoading: true });
+  const [registerModal, { setModalProps, closeModal }] = useModalInner(async (data: WindowInnerData = { _tag: '' }) => {
+    // 处理清除脏数据
+    await resetFields();
+    await clearValidate();
+    // 处理设置数据
+    tag.value = data._tag;
+    const topProject = { id: '0', name: '顶级项目', children: [] };
+    topProject.children = listToTree(await listProject());
+    await updateSchema({
+      field: 'parentId',
+      componentProps: {
+        treeData: [topProject]
+      }
+    });
+    const id = data.record?.id;
+    const props: Partial<ModalProps> = { confirmLoading: false };
     // 采用tag标签区分操作
     switch (unref(tag)) {
       case 'add':
-        await addProject(formData);
+        props.title = '新增项目';
+        id && await setFieldsValue({ parentId: id });
         break;
       case 'edit':
-        await editProject(formData);
+        props.title = '编辑项目';
+        await setFieldsValue(await getProject(id));
         break;
     }
-    // 处理提交完成之后逻辑
-    closeModal();
-    emit('success');
-  } finally {
-    setModalProps({ confirmLoading: false });
-  }
-}
+    // 尾部:设置处理后的最终配置数据
+    setModalProps(props);
+  });
 
+  /** 处理弹出框提交 */
+  async function handleSubmit() {
+    try {
+      // 提取验证数据
+      const formData = await validate();
+      // 处理提交之前逻辑
+      setModalProps({ confirmLoading: true });
+      // 采用tag标签区分操作
+      switch (unref(tag)) {
+        case 'add':
+          await addProject(formData);
+          break;
+        case 'edit':
+          await editProject(formData);
+          break;
+      }
+      // 处理提交完成之后逻辑
+      closeModal();
+      emit('success');
+    } finally {
+      setModalProps({ confirmLoading: false });
+    }
+  }
 </script>
diff --git a/src/views/common/project/index.vue b/src/views/common/project/index.vue
index fa3a7a6..26c3a05 100644
--- a/src/views/common/project/index.vue
+++ b/src/views/common/project/index.vue
@@ -1,4 +1,3 @@
-
 <template>
   <div>
     <BasicTable @register="registerTable">
@@ -45,72 +44,72 @@
   </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';
+  /**
+   * 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
+   * 采用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';
 
-/** 通用变量统一声明区域 */
-const { createMessage } = useMessage();
-const [registerModal, { openModal }] = useModal();
-const [registerTable, { reload, expandAll, collapseAll }] = useTable({
-  title: '项目列表',
-  api: listProject,
-  rowKey: 'projectId',
-  columns,
-  formConfig: {
-    labelWidth: 120,
-    schemas: searchFormSchema,
-    autoSubmitOnEnter: true,
-    fieldMapToTime: [['dateRange', ['beginTime', 'endTime'], 'YYYY-MM-DD']]
-  },
-  isTreeTable: true,
-  pagination: false,
-  striped: false,
-  useSearchForm: true,
-  showTableSetting: true,
-  bordered: true,
-  showIndexColumn: false,
-  canResize: false,
-  actionColumn: {
-    width: 250,
-    title: '操作',
-    dataIndex: 'action',
-    slots: { customRender: 'action' },
-    fixed: false
-  },
-  afterFetch: (result) => listToTree(result, { id: 'projectId' })
-});
+  /** 通用变量统一声明区域 */
+  const { createMessage } = useMessage();
+  const [registerModal, { openModal }] = useModal();
+  const [registerTable, { reload, expandAll, collapseAll }] = useTable({
+    title: '项目列表',
+    api: listProject,
+    rowKey: 'id',
+    columns,
+    formConfig: {
+      labelWidth: 120,
+      schemas: searchFormSchema,
+      autoSubmitOnEnter: true,
+      fieldMapToTime: [['dateRange', ['beginTime', 'endTime'], 'YYYY-MM-DD']]
+    },
+    isTreeTable: true,
+    pagination: false,
+    striped: false,
+    useSearchForm: true,
+    showTableSetting: true,
+    bordered: true,
+    showIndexColumn: false,
+    canResize: false,
+    actionColumn: {
+      width: 250,
+      title: '操作',
+      dataIndex: 'action',
+      slots: { customRender: 'action' },
+      fixed: false
+    },
+    afterFetch: (result) => listToTree(result)
+  });
 
-/** 新增按钮操作,行内新增与工具栏局域新增通用 */
-function handleAdd(record?: Recordable) {
-  openModal(true,{ _tag: 'add', record });
-}
+  /** 新增按钮操作,行内新增与工具栏局域新增通用 */
+  function handleAdd(record?: Recordable) {
+    openModal(true,{ _tag: 'add', record });
+  }
 
-/** 编辑按钮操作,行内编辑 */
-function handleEdit(record: Recordable) {
-  openModal(true, { _tag: 'edit', record });
-}
+  /** 编辑按钮操作,行内编辑 */
+  function handleEdit(record: Recordable) {
+    openModal(true, { _tag: 'edit', record });
+  }
 
-/** 删除按钮操作,行内删除 */
-async function handleDel(record: Recordable) {
-  await delProject(record.projectId);
-  createMessage.success('删除成功!');
-  handleRefreshTable();
-}
+  /** 删除按钮操作,行内删除 */
+  async function handleDel(record: Recordable) {
+    await delProject(record.id);
+    createMessage.success('删除成功!');
+    handleRefreshTable();
+  }
 
-/** 处理表格刷新 */
-function handleRefreshTable() {
-  reload();
-}
+  /** 处理表格刷新 */
+  function handleRefreshTable() {
+    reload();
+  }
 
 </script>
diff --git a/src/views/common/project/project.data.ts b/src/views/common/project/project.data.ts
index bb4d9fa..c06fcec 100644
--- a/src/views/common/project/project.data.ts
+++ b/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,
     }