From bba08dadcc89ee892091814853f375fc1e407b75 Mon Sep 17 00:00:00 2001
From: wc24 <wc24@qq.com>
Date: Mon, 29 Jun 2026 21:11:58 +0800
Subject: [PATCH] =?UTF-8?q?feat(fields):=20=E5=8F=AF=E9=80=89=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5(=E9=9D=9E=20required)=E7=BC=96=E8=BE=91=E6=80=81?=
 =?UTF-8?q?=E5=8F=AF=E6=B8=85=E7=A9=BA,=E7=BB=9F=E4=B8=80=20:clearable=3D!?=
 =?UTF-8?q?required?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

之前 Select/Relation 编辑态根本没 clearable(可选也删不掉),String/Textarea/Date 又恒清。
现统一 String/Textarea/Select/Relation/Date 的 edit 控件 clearable=!required:可选给清空、必填不给。
Relation 清空归一成 null(el-select 单选清空发 '',ObjectId 存 '' 会 cast 报错)。
已知例外:Number 用 el-input-number 无 clearable 属性,只能手动清空输入框、无按钮。
---
 package.json                            | 2 +-
 src/components/fields/FieldDate.vue     | 2 +-
 src/components/fields/FieldRelation.vue | 9 +++++++--
 src/components/fields/FieldSelect.vue   | 1 +
 src/components/fields/FieldString.vue   | 2 +-
 src/components/fields/FieldTextarea.vue | 2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 5d8cd79..1ed6313 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "shrimp-admin",
-    "version": "0.3.6",
+    "version": "0.3.7",
     "private": true,
     "description": "Shrimp 框架前端 — 消费 ShrimpServer + ShrimpTable 契约的经典 Vue3 + Element Plus 实现",
     "main": "src/index.ts",
diff --git a/src/components/fields/FieldDate.vue b/src/components/fields/FieldDate.vue
index bc01fff..2b92438 100644
--- a/src/components/fields/FieldDate.vue
+++ b/src/components/fields/FieldDate.vue
@@ -42,7 +42,7 @@
         style="width: 100%"
     />
     <el-date-picker v-else :model-value="modelValue" @update:model-value="$emit('update:modelValue', $event)" :disabled="disabled"
-        type="datetime" style="width: 100%" />
+        type="datetime" :clearable="!field.required" style="width: 100%" />
 </template>
 
 <script lang="ts" setup>
diff --git a/src/components/fields/FieldRelation.vue b/src/components/fields/FieldRelation.vue
index f31b2a7..b86613e 100644
--- a/src/components/fields/FieldRelation.vue
+++ b/src/components/fields/FieldRelation.vue
@@ -18,7 +18,7 @@
     >
         <el-option v-for="opt in options" :key="opt.value" :label="opt.label" :value="opt.value" />
     </el-select>
-    <el-select v-else :model-value="stringValue" @update:model-value="$emit('update:modelValue', $event)" :disabled="disabled" :multiple="field.multiple" filterable remote :remote-method="onSearch" :loading="loading" style="width: 100%">
+    <el-select v-else :model-value="stringValue" @update:model-value="onEdit" :disabled="disabled" :multiple="field.multiple" :clearable="!field.required" filterable remote :remote-method="onSearch" :loading="loading" style="width: 100%">
         <el-option v-for="opt in options" :key="opt.value" :label="opt.label" :value="opt.value" />
     </el-select>
 </template>
@@ -35,10 +35,15 @@ const props = defineProps<{
     disabled?: boolean
 }>()
 
-defineEmits<{
+const emit = defineEmits<{
     'update:modelValue': [value: any]
 }>()
 
+// 编辑态清空：el-select 单选清空发 ''，但 relation 是 ObjectId，存 '' 会 cast 报错 → 归一成 null(取消关联)
+function onEdit(v: any) {
+    emit('update:modelValue', v === '' ? null : v)
+}
+
 const options = ref<{ label: string; value: string }[]>([])
 const loading = ref(false)
 
diff --git a/src/components/fields/FieldSelect.vue b/src/components/fields/FieldSelect.vue
index 796c679..05dfbfb 100644
--- a/src/components/fields/FieldSelect.vue
+++ b/src/components/fields/FieldSelect.vue
@@ -21,6 +21,7 @@
         @update:model-value="$emit('update:modelValue', $event)"
         :disabled="disabled"
         :multiple="field.multiple"
+        :clearable="!field.required"
         style="width: 100%"
     >
         <el-option v-for="opt in resolvedOptions" :key="opt.value" :label="vueAdmin.t(opt.label)" :value="opt.value" />
diff --git a/src/components/fields/FieldString.vue b/src/components/fields/FieldString.vue
index 0f56c78..50fa3ec 100644
--- a/src/components/fields/FieldString.vue
+++ b/src/components/fields/FieldString.vue
@@ -9,7 +9,7 @@
         </el-tag>
         <el-input v-model="inputValue" @keyup.enter="addTag" @blur="addTag" :placeholder="$t('base.pressEnter')" />
     </div>
-    <el-input v-else :model-value="modelValue" @update:model-value="$emit('update:modelValue', $event)" :disabled="disabled" clearable />
+    <el-input v-else :model-value="modelValue" @update:model-value="$emit('update:modelValue', $event)" :disabled="disabled" :clearable="!field.required" />
 </template>
 
 <script lang="ts" setup>
diff --git a/src/components/fields/FieldTextarea.vue b/src/components/fields/FieldTextarea.vue
index 206e5a0..3d49177 100644
--- a/src/components/fields/FieldTextarea.vue
+++ b/src/components/fields/FieldTextarea.vue
@@ -19,7 +19,7 @@
         :model-value="modelValue"
         @update:model-value="$emit('update:modelValue', $event)"
         :disabled="disabled"
-        clearable
+        :clearable="!field.required"
     />
 </template>