From 014e850cc36d608d94580794774c35f7723fd869 Mon Sep 17 00:00:00 2001
From: Odboy <tianjun@odboy.cn>
Date: Wed, 4 Feb 2026 23:07:03 +0800
Subject: [PATCH] =?UTF-8?q?fix(components):=20=E4=BF=AE=E5=A4=8D=E9=AB=98?=
 =?UTF-8?q?=E7=BA=A7=E7=BB=84=E4=BB=B6=E4=B8=AD=E7=9A=84=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=80=BC=E5=92=8C=E5=93=8D=E5=BA=94=E5=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/advanced/CuteDragTable.vue     |  6 ++--
 .../components/advanced/CuteEditTable.vue     | 31 ++++++-------------
 .../components/advanced/CuteFormDialog.vue    |  6 ++--
 .../components/advanced/CuteFormDialogPro.vue |  6 ++--
 .../components/advanced/CuteFormDrawer.vue    |  5 ++-
 .../components/advanced/CuteFormDrawerPro.vue | 13 ++++++--
 .../components/advanced/CuteSearchForm.vue    |  2 +-
 .../components/advanced/CuteSearchFormPro.vue |  4 +--
 .../components/advanced/CuteSimpleTable.vue   |  6 ++--
 9 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/cutejava-front/src/views/components/advanced/CuteDragTable.vue b/cutejava-front/src/views/components/advanced/CuteDragTable.vue
index 2108cc4d..a93d7975 100644
--- a/cutejava-front/src/views/components/advanced/CuteDragTable.vue
+++ b/cutejava-front/src/views/components/advanced/CuteDragTable.vue
@@ -10,11 +10,11 @@
       <el-col v-if="showSelect" :span="2" class="selection-box">
         已选 <font class="selection-count">{{ crud.selection && crud.selection.length }}</font> 条
       </el-col>
-      <el-col :span="11" style="text-align: left">
+      <el-col :span="showSelect ? 11 : 12" style="text-align: left">
         <!-- 通过  <template v-slot:batchArea> 插槽，数据表格上方左侧 添加 批量操作入口 -->
         <slot name="batchArea" />
       </el-col>
-      <el-col :span="11" style="text-align: left">
+      <el-col :span="showSelect ? 11 : 12" style="text-align: left">
         <!-- 通过  <template v-slot:toolArea> 插槽，数据表格上方右侧 添加 工具入口，比如导出 -->
         <slot name="toolArea" />
       </el-col>
@@ -59,7 +59,7 @@ export default {
     primaryKey: {
       type: String,
       required: true,
-      default: null
+      default: 'id'
     },
     fetch: {
       type: Function,
diff --git a/cutejava-front/src/views/components/advanced/CuteEditTable.vue b/cutejava-front/src/views/components/advanced/CuteEditTable.vue
index 73de947c..fab90e66 100644
--- a/cutejava-front/src/views/components/advanced/CuteEditTable.vue
+++ b/cutejava-front/src/views/components/advanced/CuteEditTable.vue
@@ -17,7 +17,7 @@
       style="width: 100%;"
       highlight-current-row
     >
-      <el-table-column v-for="item in schema" :key="item[primaryKey]" :prop="item.name" :label="item.title">
+      <el-table-column v-for="item in schema" :key="item.name" :prop="item.name" :label="item.title">
         <template v-slot="scope">
           <el-input
             v-if="item.type === 'input'"
@@ -86,7 +86,7 @@ export default {
      */
     schema: {
       type: Array,
-      require: true,
+      required: true,
       default: function() {
         return []
       }
@@ -97,7 +97,14 @@ export default {
       dataSource: []
     }
   },
-  mounted() {
+  watch: {
+    value(newVal) {
+      if (newVal && newVal.length > 0) {
+        this.dataSource = newVal
+      }
+    }
+  },
+  created() {
     if (this.value && this.value.length > 0) {
       this.dataSource = this.value
     }
@@ -205,21 +212,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss" scoped>
-@import "~@/assets/styles/variables";
-
-.selection-box {
-  text-align: left;
-  font-size: 12px;
-  padding-left: 10px;
-  min-height: 26.7px;
-  max-height: 26.7px;
-  padding-top: 7px;
-}
-
-.selection-count {
-  color: $menuActiveText;
-}
-</style>
-
diff --git a/cutejava-front/src/views/components/advanced/CuteFormDialog.vue b/cutejava-front/src/views/components/advanced/CuteFormDialog.vue
index 680f359f..ea839faf 100644
--- a/cutejava-front/src/views/components/advanced/CuteFormDialog.vue
+++ b/cutejava-front/src/views/components/advanced/CuteFormDialog.vue
@@ -51,7 +51,9 @@ export default {
     model: {
       type: Object,
       required: true,
-      default: null
+      default: function() {
+        return {}
+      }
     },
     rules: {
       type: Object,
@@ -132,7 +134,7 @@ export default {
 }
 
 ::v-deep(.el-dialog__body) {
-  padding: 20px 20px !important;
+  padding: 10px 10px !important;
   height: 90%;
   display: flex;
   flex-direction: column;
diff --git a/cutejava-front/src/views/components/advanced/CuteFormDialogPro.vue b/cutejava-front/src/views/components/advanced/CuteFormDialogPro.vue
index 2d26ad5d..92202e84 100644
--- a/cutejava-front/src/views/components/advanced/CuteFormDialogPro.vue
+++ b/cutejava-front/src/views/components/advanced/CuteFormDialogPro.vue
@@ -177,14 +177,16 @@ export default {
       const schema = this.schema
       const formRules = {}
       let trigger = 'blur'
+      let tip = '请输入'
       for (const element of schema) {
         if (element.type === 'input') {
           trigger = 'blur'
         } else {
           trigger = 'change'
+          tip = '请选择'
         }
         formRules[element.name] = [
-          { required: element.required === true, message: '请输入' + element.title, trigger: trigger }
+          { required: element.required === true, message: tip + element.title, trigger: trigger }
         ]
       }
       return formRules
@@ -260,7 +262,7 @@ export default {
 }
 
 ::v-deep(.el-dialog__body) {
-  padding: 20px 20px !important;
+  padding: 10px 10px !important;
   height: 90%;
   display: flex;
   flex-direction: column;
diff --git a/cutejava-front/src/views/components/advanced/CuteFormDrawer.vue b/cutejava-front/src/views/components/advanced/CuteFormDrawer.vue
index 2bf94459..6dbef926 100644
--- a/cutejava-front/src/views/components/advanced/CuteFormDrawer.vue
+++ b/cutejava-front/src/views/components/advanced/CuteFormDrawer.vue
@@ -26,6 +26,7 @@
     <el-divider />
     <div class="dialog-footer">
       <el-button type="danger" @click="hidden">取 消</el-button>
+      <el-button v-if="showReset" @click="resetForm('form')">重 置</el-button>
       <el-button v-prevent-re-click type="primary" @click="submitForm('form')">提 交</el-button>
     </div>
   </el-drawer>
@@ -49,7 +50,9 @@ export default {
     model: {
       type: Object,
       required: true,
-      default: null
+      default: function() {
+        return {}
+      }
     },
     rules: {
       type: Object,
diff --git a/cutejava-front/src/views/components/advanced/CuteFormDrawerPro.vue b/cutejava-front/src/views/components/advanced/CuteFormDrawerPro.vue
index 0a1f6570..709277f3 100644
--- a/cutejava-front/src/views/components/advanced/CuteFormDrawerPro.vue
+++ b/cutejava-front/src/views/components/advanced/CuteFormDrawerPro.vue
@@ -173,14 +173,16 @@ export default {
       const schema = this.schema
       const formRules = {}
       let trigger = 'blur'
+      let tip = '请输入'
       for (const element of schema) {
         if (element.type === 'input') {
           trigger = 'blur'
         } else {
           trigger = 'change'
+          tip = '请选择'
         }
         formRules[element.name] = [
-          { required: element.required === true, message: '请输入' + element.title, trigger: trigger }
+          { required: element.required === true, message: tip + element.title, trigger: trigger }
         ]
       }
       return formRules
@@ -255,8 +257,13 @@ export default {
   margin-top: auto;
 }
 
-::v-deep(.el-dialog__body) {
-  padding: 20px 20px !important;
+::v-deep(.el-drawer__header) {
+  padding: 10px;
+  border-bottom: 1px solid #DCDFE6;
+}
+
+::v-deep(.el-drawer__body) {
+  padding: 10px 10px !important;
   height: 90%;
   display: flex;
   flex-direction: column;
diff --git a/cutejava-front/src/views/components/advanced/CuteSearchForm.vue b/cutejava-front/src/views/components/advanced/CuteSearchForm.vue
index 4e508c13..daf2c8ee 100644
--- a/cutejava-front/src/views/components/advanced/CuteSearchForm.vue
+++ b/cutejava-front/src/views/components/advanced/CuteSearchForm.vue
@@ -8,7 +8,7 @@
   <el-form
     ref="searchForm"
     :inline="true"
-    :model.sync="model"
+    :model="model"
     label-position="right"
     label-width="90px"
     size="small"
diff --git a/cutejava-front/src/views/components/advanced/CuteSearchFormPro.vue b/cutejava-front/src/views/components/advanced/CuteSearchFormPro.vue
index 6158b81a..75926de5 100644
--- a/cutejava-front/src/views/components/advanced/CuteSearchFormPro.vue
+++ b/cutejava-front/src/views/components/advanced/CuteSearchFormPro.vue
@@ -8,7 +8,7 @@
   <el-form
     ref="searchForm"
     :inline="true"
-    :model.sync="model"
+    :model="model"
     label-position="right"
     label-width="90px"
     size="small"
@@ -79,7 +79,7 @@
 <script>
 
 export default {
-  name: 'CuteSearchProForm',
+  name: 'CuteSearchFormPro',
   components: {},
   props: {
     /**
diff --git a/cutejava-front/src/views/components/advanced/CuteSimpleTable.vue b/cutejava-front/src/views/components/advanced/CuteSimpleTable.vue
index dcca3055..97c767d1 100644
--- a/cutejava-front/src/views/components/advanced/CuteSimpleTable.vue
+++ b/cutejava-front/src/views/components/advanced/CuteSimpleTable.vue
@@ -10,11 +10,11 @@
       <el-col v-if="showSelect" :span="2" class="selection-box">
         已选 <font class="selection-count">{{ crud.selection && crud.selection.length }}</font> 条
       </el-col>
-      <el-col :span="11" style="text-align: left">
+      <el-col :span="showSelect ? 11 : 12" style="text-align: left">
         <!-- 通过  <template v-slot:batchArea> 插槽，数据表格上方左侧 添加 批量操作入口 -->
         <slot name="batchArea" />
       </el-col>
-      <el-col :span="11" style="text-align: right">
+      <el-col :span="showSelect ? 11 : 12" style="text-align: right">
         <!-- 通过  <template v-slot:toolArea> 插槽，数据表格上方右侧 添加 工具入口，比如导出 -->
         <slot name="toolArea" />
       </el-col>
@@ -59,7 +59,7 @@ export default {
     primaryKey: {
       type: String,
       required: true,
-      default: null
+      default: 'id'
     },
     fetch: {
       type: Function,