👣 制定代码规范模板团队规则

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/DeptController.java

@@ -12,7 +12,6 @@ import com.cloud.kicc.system.api.entity.User;
 import com.cloud.kicc.system.service.DeptService;
 import com.cloud.kicc.system.service.UserService;
 import lombok.AllArgsConstructor;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -67,7 +66,7 @@ public class DeptController {
         deptService.updateById(dept);
         // 更新用户机构名称
         new Thread(() -> {
-            List<User> userList = userService.list(new QueryWrapper<User>().eq("dept_id", dept.getDeptId()));
+            List<User> userList = userService.list(new LambdaQueryWrapper<User>().eq(User::getDeptId, dept.getDeptId()));
             for (User user : userList) {
                 user.setDeptName(dept.getName());
                 userService.updateById(user);
@@ -101,7 +100,7 @@ public class DeptController {
     /** 加载机构列表树 */
     @GetMapping("/deptTree")
     public R deptTree() {
-        List<Dept> deptList = deptService.list(new QueryWrapper<Dept>().orderByAsc("sort"));
+        List<Dept> deptList = deptService.list(new LambdaQueryWrapper<Dept>().orderByAsc(Dept::getSort));
         return R.ok(deptService.buildTree(deptList, "0"));
     }
 

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/mapper/DeptMapper.java

@@ -14,21 +14,5 @@ import java.util.List;
  * @Date: 2022/2/24
  */
 public interface DeptMapper extends BaseMapper<Dept> {
-    /**
-     * 根据部门ID查询信息
-     *
-     * @param deptId 部门ID
-     * @return 部门信息
-     */
-    Dept selectDeptById(String deptId);
-
-    /**
-     * 根据角色ID查询部门
-     *
-     * @param roleId 角色ID
-     * @return 部门列表
-     */
-    List<String> selectRoleDeptTree(String roleId);
 
-    List<String> selectAreaDeptTree(String areaId);
 }

kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/DeptMapper.xml

@@ -7,8 +7,6 @@
         <result property="code" column="code"/>
         <result property="name" column="name"/>
         <result property="parentId" column="parent_id"/>
-        <result property="parentName" column="parent_name"/>
-        <result property="ancestors" column="ancestors"/>
         <result property="sort" column="sort"/>
         <result property="contacts" column="contacts"/>
         <result property="phone" column="phone"/>
@@ -23,26 +21,4 @@
         <result property="delFlag" column="del_flag"/>
     </resultMap>
 
-    <select id="selectDeptById" parameterType="String" resultMap="DeptResult">
-        select d.id, d.code, d.name, d.parent_id, d.ancestors, d.sort, d.contacts, d.phone, d.email, d.status,
-        (select name from sys_dept where id = d.parent_id) parent_name
-        from sys_dept d
-        where d.id = #{deptId}
-    </select>
-
-    <select id="selectRoleDeptTree" parameterType="String" resultType="String">
-        select concat(d.id, d.name) as name
-        from sys_dept d
-        left join sys_role_dept rd on d.id = rd.dept_id
-        where d.del_flag = '0' and rd.role_id = #{roleId}
-        order by d.parent_id, d.sort
-    </select>
-
-    <select id="selectAreaDeptTree" parameterType="String" resultType="String">
-        select concat(d.id, d.name) as name
-        from sys_dept d
-        left join sys_area_dept rd on d.id = rd.dept_id
-        where d.del_flag = '0' and rd.area_id = #{areaId}
-        order by d.parent_id, d.sort
-    </select>
 </mapper>

kicc-ui/src/api/controller/system/dept.ts

@@ -1,58 +1,31 @@
-import { DepartVO, DeptDto, Depart, DeptListItem, DeptListGetResultModel } from './model/deptModel';
+/**
-import { defHttp } from '/@/utils/http/axios';
+ * 提供api模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
-import {listToTree} from "/@/utils/helper/treeHelper";
+ * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
-import {isDef} from "/@/utils/is";
+ * author entfrm开发团队-王翔
+ */
 
-const prefix = '/system_proxy/system';
+import { DeptDto, Dept } from './model/deptModel';
+import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
-  List = '/dept/list',
+  list = '/system_proxy/system/dept/list',
-  Save = '/dept/save',
+  add = '/system_proxy/system/dept/save',
-  Update = '/dept/update',
+  get = '/system_proxy/system/dept',
-  Remove = '/dept/remove',
+  edit = '/system_proxy/system/dept/update',
-  DeptList = '/dept/deptTree',
+  del = '/system_proxy/system/dept/remove',
 }
 
-//获取部门根据id
+// 查询部门列表
-export const getDeptById = (params: {id: string}) =>
+export const listDept = (params?: Partial<DeptDto>) => defHttp.get({ url: Api.list, params });
-    defHttp.get({url: prefix + `/dept/${params.id}` })
 
-//部门列表
+// 新增部门
-export const deptList = (params?: Partial<DeptDto>) => defHttp.get({ url: prefix + Api.List, params });
+export const addDept = (params: Partial<Dept>) => defHttp.post({ url: Api.add, data: params });
-
-// 部门树
-export const departTreeList = (params?: DepartVO) => {
-  return defHttp.get({ url: prefix + Api.List, params }).then(data => {
-    return listToTree(data, {
-      id: 'deptId',
-      children: 'children',
-      parentId: 'parentId',
-    }) as any[];
-  });
-}
 
-export const departTreeHasTop = (params?: DepartVO) => {
+// 修改部门
-  return defHttp.get({ url: prefix + Api.List, params }).then(data => {
+export const editDept = (params: Partial<Dept>) => defHttp.put({ url: Api.edit, data: params });
-    data.unshift({ deptId: '0', sort: 0, name: '顶级部门', children: [] });
-    return listToTree(data, {
-      id: 'deptId',
-      children: 'children',
-      parentId: 'parentId',
-    }) as any[];
-  });
-}
-
-export const departSet = (params: Depart) => {
-  if (isDef(params.id)){
-    return defHttp.put({ url: prefix + Api.Update, params });
-  }else {
-    return defHttp.post({ url: prefix + Api.Save, params });
-  }
-}
 
-// 删除
+// 查询部门详细
-export const departRemove = (params: { id: String }) =>
+export const getDept = (id: string) => defHttp.get<Dept>({ url: `${Api.get}/${id}` });
-    defHttp.delete<boolean>({ url: prefix + Api.Remove + `/${params.id}` });
 
-export const getDeptList = (params?: DeptListItem) =>
+// 删除部门
-    defHttp.get<DeptListGetResultModel>({ url: prefix + Api.DeptList, params });
+export const delDept = (id: string) => defHttp.delete({ url: `${Api.del}/${id}` });

kicc-ui/src/api/controller/system/model/deptModel.ts

@@ -1,12 +1,6 @@
 // 引入基础包
 import { Page, R, CommonEntity } from '/@/api/model';
 
-// 定义查询参数
-export type DepartVO = Page & {
-  id?: string;
-  name?: string;
-};
-
 // 查询参数
 export type DeptDto = Page & Dept;
 
@@ -22,26 +16,8 @@ export interface Dept extends CommonEntity {
   address: string;
   email: string;
   status: string;
-  children: Dept[];
+  [key: string]: any;
-}
-
-
-// 定义部门对象
-export interface Depart {
-  id: string;
-  name: string;
-  sort: string;
-  parentId: string;
-}
-
-// 根据部门对象生成响应模型
-export type DepartDTO = R<Depart>;
-
-export interface DeptListItem {
-  id: string;
-  createTime: string;
-  remark: string;
-  status: number;
 }
 
-export type DeptListGetResultModel = R<DeptListItem>;
+// 响应模型
+export type DeptVo = R<Dept[]>;

kicc-ui/src/api/controller/system/model/userModel.ts

@@ -21,6 +21,7 @@ export interface User extends CommonEntity {
   status: string;
   roleIds: string[];
   permissions: string[];
+  [key: string]: any;
 }
 
 // 响应模型

kicc-ui/src/views/system/dept/DeptModal.vue

@@ -1,72 +1,84 @@
 <template>
-  <BasicModal
+  <BasicModal v-bind="$attrs"
-      v-bind="$attrs"
+              width="720px"
-      @register="registerModal"
               @ok="handleSubmit"
-      width="720px">
+              @register="registerModal"
-    <BasicForm @register="registerForm" />
+  >
+    <BasicForm @register="registerForm"/>
   </BasicModal>
 </template>
-<script lang="ts">
+<script lang="ts" setup>
-import { defineComponent, ref, computed, unref } from 'vue';
+  /**
-import {BasicModal, ModalProps, useModalInner} from '/@/components/Modal';
+   * 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
-import { BasicForm, useForm } from '/@/components/Form/index';
+   * 采用vben-动态表格表单封装组件编写,采用 setup 写法
-import { formSchema } from './dept.data';
+   * Copyright © 2020-2022 <a href="http://www.entfrm.com/">entfrm</a> All rights reserved.
-import { deptList, departSet } from '/@/api/controller/system/dept';
+   * author entfrm开发团队-王翔
-import {isDef} from "/@/utils/is";
+   */
-import {listToTree} from "/@/utils/helper/treeHelper";
+  import { ref, unref } from 'vue';
+  import { BasicForm, useForm } from '/@/components/Form/index';
+  import { formSchema } from './dept.data';
+  import { BasicModal, ModalProps, useModalInner } from '/@/components/Modal';
+  import { listDept, addDept, editDept, getDept } from '/@/api/controller/system/dept';
+  import { listToTree } from "/@/utils/helper/treeHelper";
 
-export default defineComponent({
+  /** 通用变量统一声明区域 */
-  name: 'DeptModal',
+  const tag = ref<string>('');
-  components: { BasicModal, BasicForm },
+  /** https://v3.cn.vuejs.org/api/options-data.html#emits */
-  emits: ['success', 'register'],
+  const emit = defineEmits(['success', 'register']);
-  setup(_, { emit }) {
+  const [registerForm, { resetFields, setFieldsValue, updateSchema, validate, clearValidate }] = useForm({
-    const isUpdate = ref(true);
-
-    const [registerForm, { resetFields, setFieldsValue, updateSchema, validate }] = 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) => {
+    // 处理清除脏数据
     await resetFields();
-      const props: Partial<ModalProps> = { confirmLoading: false };
+    await clearValidate();
-
+    // 处理设置数据
-      isUpdate.value = !!data?.isUpdate;
+    tag.value = data._tag;
-
+    const topDept = { id: '0', name: '顶级部门', children: [] };
-      if (unref(isUpdate)) {
+    topMenu.children = listToTree(await listDept());
-        await setFieldsValue({
+    await updateSchema(  {
-          ...data.record,
-        });
-        props.title = "编辑部门";
-      }else {
-        props.title = "新增部门";
-      }
-      let treeData = await deptList();
-      treeData.unshift({ deptId: '0', sort: 0, name: '顶级部门', children: [] });
-      treeData = listToTree(treeData,{
-        id: 'deptId',
-        children: 'children',
-        parentId: 'parentId',
-      });
-      await updateSchema({
       field: 'parentId',
-        componentProps: { treeData },
+      componentProps: {
+        treeData: [topDept]
+      }
     });
-      if (isDef(data.record?.deptId)){
+    const deptId = data.record?.id;
-        await setFieldsValue({parentId: data.record?.deptId})
+    const props: Partial<ModalProps> = { confirmLoading: false };
+    // 采用tag标签区分操作
+    switch (unref(tag)) {
+      case 'add':
+        props.title = '新增部门';
+        deptId && await setFieldsValue({ parentId: deptId });
+        break;
+      case 'edit':
+        props.title = '编辑部门';
+        await setFieldsValue(await getDept(deptId));
+        break;
     }
-
+    // 尾部:设置处理后的最终配置数据
     setModalProps(props);
   });
 
+  /** 处理弹出框提交 */
   async function handleSubmit() {
     try {
-        const values = await validate();
+      // 提取验证数据
+      const formData = await validate();
+      // 处理提交之前逻辑
       setModalProps({ confirmLoading: true });
-        await departSet(values);
+      // 采用tag标签区分操作
+      switch (unref(tag)) {
+        case 'add':
+          await addDept(formData);
+          break;
+        case 'edit':
+          await editDept(formData);
+          break;
+      }
+      // 处理提交完成之后逻辑
       closeModal();
       emit('success');
     } finally {
@@ -74,7 +86,4 @@ export default defineComponent({
     }
   }
 
-    return { registerModal, registerForm, handleSubmit };
-  },
-});
 </script>

kicc-ui/src/views/system/dept/dept.data.ts

@@ -1,24 +1,30 @@
-import {BasicColumn} from '/@/components/Table';
+/**
-import {FormSchema} from '/@/components/Table';
+ * @program: kicc-ui
-import {h} from 'vue';
+ * @description: 部门模块动态渲染配置
-import {Tag} from 'ant-design-vue';
+ * @author: entfrm开发团队-王翔
+ * @create: 2022/4/21
+ */
 
+import { BasicColumn } from '/@/components/Table';
+import { FormSchema } from '/@/components/Table';
+import { h } from 'vue';
+import { Tag } from 'ant-design-vue';
+
+/** 表格列配置 */
 export const columns: BasicColumn[] = [
   {
     title: '部门名称',
     dataIndex: 'name',
-        width: 160,
+    align: 'left'
-        align: 'left',
   },
   {
     title: '部门编码',
-        dataIndex: 'code',
+    dataIndex: 'code'
-        width: 160,
   },
   {
     title: '排序',
     dataIndex: 'sort',
-        width: 50,
+    width: 80
   },
   {
     title: '状态',
@@ -26,28 +32,42 @@ export const columns: BasicColumn[] = [
     width: 80,
     customRender: ({record}) => {
       const status = record.status;
+      // 采用二进制~~取反,只要为null或者0等等一些其他的空元素都会转为0
+      // 第一次取反会运算为-1,在后一次取反会运算为0
       const enable = ~~status === 0;
       const color = enable ? 'green' : 'red';
       const text = enable ? '启用' : '停用';
-            return h(Tag, {color: color}, () => text);
+      return h(Tag, { color: color }, () => text);
-        },
+    }
   },
   {
     title: '创建时间',
-        dataIndex: 'createTime',
+    dataIndex: 'createTime'
-        width: 180,
+  }
-    },
 ];
 
+/** 搜索表单配置 */
 export const searchFormSchema: FormSchema[] = [
   {
-        field: 'keyword',
+    field: 'name',
-        label: '关键字',
+    label: '部门名称',
     component: 'Input',
     componentProps: {
-            placeholder: '请输入名称/编码',
+      placeholder: '请输入部门名称'
+    },
+    colProps: {span: 8}
+  },
+  {
+    field: 'status',
+    label: '状态',
+    component: 'Select',
+    componentProps: {
+      options: [
+        { label: '正常', value: '0' },
+        { label: '停用', value: '1' }
+      ]
     },
-        colProps: {span: 8},
+    colProps: { span: 7 }
   },
   {
     field: 'dateRange',
@@ -62,6 +82,7 @@ export const searchFormSchema: FormSchema[] = [
   }
 ];
 
+/** 表单配置 */
 export const formSchema: FormSchema[] = [
   {
     field: 'deptId',
@@ -69,16 +90,11 @@ export const formSchema: FormSchema[] = [
     component: 'Input',
     show: false
   },
-    {
-        field: 'name',
-        label: '部门名称',
-        component: 'Input',
-        required: true
-    },
   {
     field: 'parentId',
     label: '上级部门',
     component: 'TreeSelect',
+    defaultValue: '0',
     componentProps: {
       replaceFields: {
         title: 'name',
@@ -86,15 +102,11 @@ export const formSchema: FormSchema[] = [
         value: 'deptId',
       },
       getPopupContainer: () => document.body,
-        },
-        required: true,
-        colProps: {
-            span: 12
     }
   },
   {
-        field: 'code',
+    field: 'name',
-        label: '部门编码',
+    label: '部门名称',
     component: 'Input',
     required: true,
     colProps: {
@@ -102,8 +114,8 @@ export const formSchema: FormSchema[] = [
     }
   },
   {
-        field: 'sort',
+    field: 'code',
-        label: '排序',
+    label: '部门代码',
     component: 'Input',
     required: true,
     colProps: {
@@ -114,7 +126,6 @@ export const formSchema: FormSchema[] = [
     field: 'contacts',
     label: '联系人',
     component: 'Input',
-        required: false,
     colProps: {
       span: 12
     }
@@ -123,16 +134,26 @@ export const formSchema: FormSchema[] = [
     field: 'phone',
     label: '联系人电话',
     component: 'Input',
-        required: false,
+    rules: [
+      {
+        pattern: new RegExp('^1[3|4|5|6|7|8|9][0-9]\\d{8}$'),
+        message: '请输入正确的手机号码!',
+        validateTrigger: 'change'
+      }
+    ],
     colProps: {
       span: 12
     }
   },
   {
-        field: 'address',
+    field: 'sort',
-        label: '联系地址',
+    label: '部门排序',
-        component: 'Input',
+    component: 'InputNumber',
-        required: false,
+    componentProps: {
+      style: { width:'100%' },
+      min: 0
+    },
+    required: true,
     colProps: {
       span: 12
     }
@@ -141,7 +162,13 @@ export const formSchema: FormSchema[] = [
     field: 'email',
     label: '邮箱',
     component: 'Input',
-        required: false,
+    rules: [
+      {
+        type: 'email',
+        message: '请输入正确的邮箱地址!',
+        validateTrigger: 'change'
+      }
+    ],
     colProps: {
       span: 12
     }
@@ -149,17 +176,17 @@ export const formSchema: FormSchema[] = [
   {
     field: 'status',
     label: '状态',
-        component: 'RadioButtonGroup',
+    component: 'RadioGroup',
     defaultValue: '0',
     componentProps: {
       options: [
-                {label: '启用', value: '0'},
+        { label: '正常', value: '0' },
-                {label: '停用', value: '1'},
+        { label: '停用', value: '1' }
-            ],
+      ]
     },
     required: true,
     colProps: {
       span: 12
     }
-    },
+  }
 ];

kicc-ui/src/views/system/dept/index.vue

@@ -2,27 +2,35 @@
   <div>
     <BasicTable @register="registerTable">
       <template #toolbar>
-        <a-button type="primary"
+        <a-button v-auth="['dept_add']"
+                  type="primary"
                   @click="handleAdd()"
         >新增部门</a-button>
-
+        <a-button type="default"
+                  @click="expandAll"
+        >展开全部</a-button>
+        <a-button type="default"
+                  @click="collapseAll"
+        >折叠全部</a-button>
       </template>
       <template #action="{ record }">
-        <TableAction
+        <TableAction :actions="[
-            :actions="[
           {
             label: '编辑',
             icon: 'fa6-regular:pen-to-square',
+            auth: ['dept_edit'],
             onClick: handleEdit.bind(null, record)
           },
           {
             label: '新增',
             icon: 'ant-design:plus-circle-outlined',
+            auth: ['dept_add'],
             onClick: handleAdd.bind(null, record),
           },
           {
             label: '删除',
             icon: 'ant-design:delete-outlined',
+            auth: ['dept_del'],
             color: 'error',
             popConfirm: {
               title: '是否确认删除',
@@ -32,34 +40,39 @@
         />
       </template>
     </BasicTable>
-    <DeptModal @register="registerModal" @success="handleSuccess" />
+    <DeptModal @register="registerModal" @success="handleRefreshTable"/>
   </div>
 </template>
-<script lang="ts">
+<script lang="ts" setup>
-  import { defineComponent } from 'vue';
+  /**
+   * 提供模板规范代码参考,请尽量保证编写代码风格跟模板规范代码一致
+   * 采用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 './DeptModal.vue';
   import { columns, searchFormSchema } from './dept.data';
-  import { departRemove, departTreeList } from '/@/api/controller/system/dept';
+  import { delDept, listDept } from '/@/api/controller/system/dept';
   import { useMessage } from '/@/hooks/web/useMessage';
-  import {convertDateRange} from "/@/utils/dateUtil";
+  import { listToTree } from "/@/utils/helper/treeHelper";
 
+  /** 通用变量统一声明区域 */
   const { createMessage } = useMessage();
-
-  export default defineComponent({
-    name: 'DeptManagement',
-    components: { BasicTable, DeptModal, TableAction },
-    setup() {
   const [registerModal, { openModal }] = useModal();
-      const [registerTable, { reload }] = useTable({
+  const [registerTable, { reload, expandAll, collapseAll }] = useTable({
     title: '部门列表',
-        api: departTreeList,
+    api: listDept,
+    rowKey: 'deptId',
     columns,
     formConfig: {
       labelWidth: 120,
       schemas: searchFormSchema,
+      autoSubmitOnEnter: true,
+      fieldMapToTime: [['dateRange', ['beginTime', 'endTime'], 'YYYY-MM-DD']]
     },
+    isTreeTable: true,
     pagination: false,
     striped: false,
     useSearchForm: true,
@@ -68,45 +81,35 @@
     showIndexColumn: false,
     canResize: false,
     actionColumn: {
-          width: 150,
+      width: 220,
       title: '操作',
       dataIndex: 'action',
       slots: { customRender: 'action' },
-          fixed: false,
+      fixed: false
     },
-        handleSearchInfoFn: (queryParams) => convertDateRange(queryParams, 'dateRange')
+    afterFetch: (result) => listToTree(result)
   });
 
   /** 新增按钮操作,行内新增与工具栏局域新增通用 */
   function handleAdd(record?: Recordable) {
-        openModal(true,{ isUpdate: false, record });
+    openModal(true,{ _tag: 'add', record });
   }
 
   /** 编辑按钮操作,行内编辑 */
   function handleEdit(record: Recordable) {
-        openModal(true, { isUpdate: true, record });
+    openModal(true, { _tag: 'edit', record });
   }
 
   /** 删除按钮操作,行内删除 */
   async function handleDel(record: Recordable) {
-        await departRemove(record.id);
+    await delDept(record.id);
     createMessage.success('删除成功!');
-        handleSuccess();
+    handleRefreshTable();
   }
 
-      /** 处理表单提交成功 */
+  /** 处理表格刷新 */
-      function handleSuccess() {
+  function handleRefreshTable() {
     reload();
   }
 
-      return {
-        registerTable,
-        registerModal,
-        handleAdd,
-        handleEdit,
-        handleDel,
-        handleSuccess,
-      };
-    },
-  });
 </script>

kicc-ui/src/views/system/menu/MenuModal.vue

@@ -22,7 +22,7 @@
   import { listToTree } from '/@/utils/helper/treeHelper';
 
   /** 通用变量统一声明区域 */
-  const tag = ref('');
+  const tag = ref<string>('');
   /** https://v3.cn.vuejs.org/api/options-data.html#emits */
   const emit = defineEmits(['success', 'register']);
   const [registerForm, { resetFields, setFieldsValue, updateSchema, validate, clearValidate }] = useForm({

kicc-ui/src/views/system/menu/index.vue

@@ -70,7 +70,7 @@
       labelWidth: 120,
       schemas: searchFormSchema,
       autoSubmitOnEnter: true,
-      fieldMapToTime: [['dateRange', ['beginTime', 'endTime'], 'YYYY-MM-DD']],
+      fieldMapToTime: [['dateRange', ['beginTime', 'endTime'], 'YYYY-MM-DD']]
     },
     isTreeTable: true,
     pagination: false,

kicc-ui/src/views/system/menu/menu.data.ts

@@ -73,7 +73,7 @@ export const columns: BasicColumn[] = [
 export const searchFormSchema: FormSchema[] = [
   {
     field: 'name',
-    label: '菜单名',
+    label: '菜单名称',
     component: 'Input',
     componentProps: {
       placeholder: '请输入菜单名称'
@@ -105,6 +105,7 @@ export const searchFormSchema: FormSchema[] = [
   }
 ];
 
+/** 表单配置 */
 export const formSchema: FormSchema[] = [
   {
     field: 'id',

kicc-ui/src/views/system/role/role.data.ts

@@ -101,7 +101,7 @@ export const searchFormSchema: FormSchema[] = [
   }
 ];
 
-/** 用户表单配置 */
+/** 表单配置 */
 export const formSchema: FormSchema[] = [
   {
     field: 'id',

kicc-ui/src/views/system/user/DeptTree.vue

@@ -19,7 +19,7 @@
    */
   import { defineComponent, onMounted, ref } from 'vue';
   import { BasicTree, TreeItem } from '/@/components/Tree';
-  import { deptList } from '/@/api/controller/system/dept';
+  import { listDept } from '/@/api/controller/system/dept';
   import { listToTree } from "/@/utils/helper/treeHelper";
 
   export default defineComponent({
@@ -36,7 +36,7 @@
 
       /** 处理获取树形数据 */
       async function handleFetch() {
-        treeData.value = listToTree(await deptList());
+        treeData.value = listToTree(await listDept());
       }
 
       /** 处理树形选择 */

kicc-ui/src/views/system/user/UserModal.vue

@@ -18,7 +18,7 @@
   import { BasicModal, useModalInner } from '/@/components/Modal';
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { userFormSchema } from './user.data';
-  import { deptList } from '/@/api/controller/system/dept';
+  import { listDept } from '/@/api/controller/system/dept';
   import { addUser, editUser, getUser } from '/@/api/controller/system/user';
   import { listToTree } from "/@/utils/helper/treeHelper";
   import { ModalProps } from "/@/components/Modal";
@@ -52,7 +52,7 @@
         await clearValidate();
         // 处理设置数据
         state.tag = data._tag;
-        state.deptTree = listToTree(await deptList());
+        state.deptTree = listToTree(await listDept());
         const userId = data.record?.id;
         const props: Partial<ModalProps> = { confirmLoading: false };
         await updateSchema([

kicc-ui/src/views/system/user/index.vue

@@ -109,7 +109,7 @@
           labelWidth: 120,
           schemas: searchFormSchema,
           autoSubmitOnEnter: true,
-          fieldMapToTime: [['dateRange', ['beginTime', 'endTime'], 'YYYY-MM-DD']],
+          fieldMapToTime: [['dateRange', ['beginTime', 'endTime'], 'YYYY-MM-DD']]
         },
         rowSelection: { type: 'checkbox' },
         useSearchForm: true,