chore: 🔨 合并冲突解决

src/components/CURD/PageForm.vue

@@ -1,11 +1,5 @@
 <template>
-  <el-form
-    ref="formRef"
-    label-width="auto"
-    v-bind="form"
-    :model="formData"
-    :rules="formRules"
-  >
+  <el-form ref="formRef" label-width="auto" v-bind="form" :model="formData" :rules="formRules">
     <el-row :gutter="20">
       <template v-for="item in formItems" :key="item.prop">
         <el-col v-show="!item.hidden" v-bind="item.col">
@@ -48,10 +42,7 @@
             </template>
             <!-- Checkbox 多选框 -->
             <template v-else-if="item.type === 'checkbox'">
-              <el-checkbox-group
-                v-model="formData[item.prop]"
-                v-bind="item.attrs"
-              >
+              <el-checkbox-group v-model="formData[item.prop]" v-bind="item.attrs">
                 <template v-for="option in item.options" :key="option.value">
                   <el-checkbox v-bind="option" />
                 </template>
@@ -59,24 +50,15 @@
             </template>
             <!-- Input Number 数字输入框 -->
             <template v-else-if="item.type === 'input-number'">
-              <el-input-number
-                v-model="formData[item.prop]"
-                v-bind="item.attrs"
-              />
+              <el-input-number v-model="formData[item.prop]" v-bind="item.attrs" />
             </template>
             <!-- TreeSelect 树形选择 -->
             <template v-else-if="item.type === 'tree-select'">
-              <el-tree-select
-                v-model="formData[item.prop]"
-                v-bind="item.attrs"
-              />
+              <el-tree-select v-model="formData[item.prop]" v-bind="item.attrs" />
             </template>
             <!-- DatePicker 日期选择器 -->
             <template v-else-if="item.type === 'date-picker'">
-              <el-date-picker
-                v-model="formData[item.prop]"
-                v-bind="item.attrs"
-              />
+              <el-date-picker v-model="formData[item.prop]" v-bind="item.attrs" />
             </template>
             <!-- Text 文本 -->
             <template v-else-if="item.type === 'text'">