refactor: ♻️ 升级 3.x 版本，布局重构和代码规范调整

src/components/CURD/PageContent.vue

@@ -6,11 +6,11 @@
     <div class="flex flex-col md:flex-row justify-between gap-y-2.5 mb-2.5">
       <!-- 左侧工具栏 -->
       <div class="toolbar-left flex gap-y-2.5 gap-x-2 md:gap-x-3 flex-wrap">
-        <template v-for="btn in toolbarLeftBtn">
+        <template v-for="(btn, index) in toolbarLeftBtn" :key="index">
           <el-button
             v-hasPerm="btn.perm ?? '*:*:*'"
-            :disabled="btn.name === 'delete' && removeIds.length === 0"
             v-bind="btn.attrs"
+            :disabled="btn.name === 'delete' && removeIds.length === 0"
             @click="handleToolbar(btn.name)"
           >
             {{ btn.text }}
@@ -19,13 +19,13 @@
       </div>
       <!-- 右侧工具栏 -->
       <div class="toolbar-right flex gap-y-2.5 gap-x-2 md:gap-x-3 flex-wrap">
-        <template v-for="btn in toolbarRightBtn">
+        <template v-for="(btn, index) in toolbarRightBtn" :key="index">
           <el-popover v-if="btn.name === 'filter'" placement="bottom" trigger="click">
             <template #reference>
               <el-button v-bind="btn.attrs"></el-button>
             </template>
             <el-scrollbar max-height="350px">
-              <template v-for="col in cols" :key="col">
+              <template v-for="col in cols" :key="col.prop">
                 <el-checkbox v-if="col.prop" v-model="col.show" :label="col.label" />
               </template>
             </el-scrollbar>
@@ -51,7 +51,7 @@
       @selection-change="handleSelectionChange"
       @filter-change="handleFilterChange"
     >
-      <template v-for="col in cols" :key="col">
+      <template v-for="col in cols" :key="col.prop">
         <el-table-column v-if="col.show" v-bind="col">
           <template #default="scope">
             <!-- 显示图片 -->
@@ -158,7 +158,7 @@
             </template>
             <!-- 列操作栏 -->
             <template v-else-if="col.templet === 'tool'">
-              <template v-for="btn in tableToolbarBtn">
+              <template v-for="(btn, index) in tableToolbarBtn" :key="index">
                 <el-button
                   v-if="btn.render === undefined || btn.render(scope.row)"
                   v-hasPerm="btn.perm ?? '*:*:*'"
@@ -237,7 +237,7 @@
           </el-form-item>
           <el-form-item label="字段" prop="fields">
             <el-checkbox-group v-model="exportsFormData.fields">
-              <template v-for="col in cols" :key="col">
+              <template v-for="col in cols" :key="col.prop">
                 <el-checkbox v-if="col.prop" :value="col.prop" :label="col.label" />
               </template>
             </el-checkbox-group>
@@ -430,7 +430,9 @@ const tableToolbarBtn = createToolbar(tableToolbar, { link: true, size: "small"
 // 表格列
 const cols = ref(
   props.contentConfig.cols.map((col) => {
-    col.initFn && col.initFn(col);
+    if (col.initFn) {
+      col.initFn(col);
+    }
     if (col.show === undefined) {
       col.show = true;
     }
@@ -544,7 +546,7 @@ const exportsFormRef = ref<FormInstance>();
 const exportsFormData = reactive({
   filename: "",
   sheetname: "",
-  fields: fields,
+  fields,
   origin: ExportsOriginEnum.CURRENT,
 });
 const exportsFormRules: FormRules = {
@@ -805,8 +807,8 @@ function handleModify(field: string, value: boolean | string | number, row: Reco
   if (props.contentConfig.modifyAction) {
     props.contentConfig.modifyAction({
       [pk]: row[pk],
-      field: field,
-      value: value,
+      field,
+      value,
     });
   } else {
     ElMessage.error("未配置modifyAction");

src/components/CURD/PageModal.vue

@@ -42,6 +42,7 @@
                       <component
                         :is="childrenMap.get(item.type)"
                         v-for="opt in item.options"
+                        :key="opt.value"
                         :label="opt.label"
                         :value="opt.value"
                       ></component>
@@ -104,6 +105,7 @@
                         <component
                           :is="childrenMap.get(item.type)"
                           v-for="opt in item.options"
+                          :key="opt.value"
                           :label="opt.label"
                           :value="opt.value"
                         ></component>
@@ -224,7 +226,9 @@ const handleSubmit = useThrottleFn(() => {
 
 onMounted(() => {
   formItems.forEach((item) => {
-    item.initFn && item.initFn(item);
+    if (item.initFn) {
+      item.initFn(item);
+    }
     formRules[item.prop] = item?.rules ?? [];
     props.modalConfig.form = { labelWidth: "auto", ...props.modalConfig?.form };
 

src/components/CURD/PageSearch.vue

@@ -33,7 +33,7 @@
               v-on="item.events || {}"
             >
               <template v-if="item.type === 'select'">
-                <template v-for="opt in item.options">
+                <template v-for="opt in item.options" :key="opt.value">
                   <el-option :label="opt.label" :value="opt.value" />
                 </template>
               </template>
@@ -72,7 +72,6 @@ const emit = defineEmits<{
 }>();
 // 组件映射表
 const componentMap = new Map<ISearchComponent, any>([
-  /* eslint-disable */
   // @ts-ignore
   ["input", markRaw(ElInput)], // @ts-ignore
   ["select", markRaw(ElSelect)], // @ts-ignore
@@ -84,7 +83,6 @@ const componentMap = new Map<ISearchComponent, any>([
   ["tree-select", markRaw(ElTreeSelect)], // @ts-ignore
   ["input-tag", markRaw(ElInputTag)], // @ts-ignore
   ["custom-tag", markRaw(InputTag)],
-  /* eslint-enable */
 ]);
 
 // 存储表单实例
@@ -131,7 +129,9 @@ const handleReset = () => {
 
 onMounted(() => {
   formItems.forEach((item) => {
-    item?.initFn && item.initFn(item);
+    if (item?.initFn) {
+      item.initFn(item);
+    }
     if (["input-tag", "custom-tag", "cascader"].includes(item?.type ?? "")) {
       queryParams[item.prop] = Array.isArray(item.initialValue) ? item.initialValue : [];
     } else if (item.type === "input-number") {

src/components/CURD/types.ts

@@ -3,7 +3,7 @@ import type { FormProps, TableProps, ColProps, ButtonProps, CardProps } from "el
 import type PageContent from "./PageContent.vue";
 import type PageModal from "./PageModal.vue";
 import type PageSearch from "./PageSearch.vue";
-import { CSSProperties } from "vue";
+import type { CSSProperties } from "vue";
 
 export type PageSearchInstance = InstanceType<typeof PageSearch>;
 export type PageContentInstance = InstanceType<typeof PageContent>;

src/components/CURD/usePage.ts

@@ -36,12 +36,12 @@ function usePage() {
     if (RefImpl) {
       RefImpl.value?.setModalVisible();
       RefImpl.value?.handleDisabled(false);
-      let from = await (callback?.(row) ?? Promise.resolve(row));
+      const from = await (callback?.(row) ?? Promise.resolve(row));
       RefImpl.value?.setFormData(from ? from : row);
     } else {
       editModalRef.value?.setModalVisible();
       editModalRef.value?.handleDisabled(false);
-      let from = await (callback?.(row) ?? Promise.resolve(row));
+      const from = await (callback?.(row) ?? Promise.resolve(row));
       editModalRef.value?.setFormData(from ? from : row);
     }
   }
@@ -54,12 +54,12 @@ function usePage() {
     if (RefImpl) {
       RefImpl.value?.setModalVisible();
       RefImpl.value?.handleDisabled(true);
-      let from = await (callback?.(row) ?? Promise.resolve(row));
+      const from = await (callback?.(row) ?? Promise.resolve(row));
       RefImpl.value?.setFormData(from ? from : row);
     } else {
       editModalRef.value?.setModalVisible();
       editModalRef.value?.handleDisabled(true);
-      let from = await (callback?.(row) ?? Promise.resolve(row));
+      const from = await (callback?.(row) ?? Promise.resolve(row));
       editModalRef.value?.setFormData(from ? from : row);
     }
   }