chore: bump 0.7.10(与 shrimp-server 版本归一)

每行加 CircleClose 清空按钮(有值才出现),只摘掉该 key、其余条件不动。
比依赖各字段组件自身 clearable 更通用(range/relation/必填字段筛选时也能清)。

package.json

@@ -1,6 +1,6 @@
 {
     "name": "shrimp-admin",
-    "version": "0.3.6",
+    "version": "0.7.10",
     "private": true,
     "description": "Shrimp 框架前端 — 消费 ShrimpServer + ShrimpTable 契约的经典 Vue3 + Element Plus 实现",
     "main": "src/index.ts",

src/components/ShrimpFilterDrawer.vue

@@ -4,11 +4,18 @@
         <el-form :model="localFilterData">
             <template v-for="field in filterableFields" :key="field.key">
                 <el-form-item :label="vueAdmin.t(field.label)">
+                    <div class="filter-field-row">
+                        <div class="filter-field-control">
                             <slot :name="`filter-${field.key}`" :field="field" :data="localFilterData">
-                        <component :is="vueAdmin.getFieldComponent(moduleKey, field.type, field.key)" :field="field"
-                            :model-value="localFilterData[field.key]"
+                                <component :is="vueAdmin.getFieldComponent(moduleKey, field.type, field.key)"
+                                    :field="field" :model-value="localFilterData[field.key]"
                                     @update:model-value="onFieldChange(field.key, $event)" mode="filter" />
                             </slot>
+                        </div>
+                        <!-- 单独清空该字段:常驻、无值时禁用(不 v-if,避免按钮显隐导致布局闪动) -->
+                        <el-button link :icon="CircleClose" class="filter-clear"
+                            :disabled="!hasValue(field.key)" @click="clearField(field.key)" />
+                    </div>
                 </el-form-item>
             </template>
         </el-form>
@@ -21,6 +28,7 @@
 
 <script lang="ts" setup>
 import { ref, watch } from 'vue'
+import { CircleClose } from '@element-plus/icons-vue'
 import { IFieldConfig } from '../IShrimpType'
 import { vueAdmin } from '../VueAdmin'
 
@@ -68,6 +76,21 @@ function onFieldChange(key: string, value: any) {
     localFilterData.value = { ...localFilterData.value, [key]: value }
 }
 
+// 该字段当前是否有筛选值(决定单独清空按钮是否出现);范围 {gte,lte}/数组按内容判空
+function hasValue(key: string): boolean {
+    const v = localFilterData.value[key]
+    if (v == null || v === '') return false
+    if (Array.isArray(v)) return v.length > 0
+    if (typeof v === 'object') return Object.keys(v).length > 0
+    return true
+}
+
+// 单独清空某个字段:只摘掉这一个 key,其余筛选条件不动
+function clearField(key: string) {
+    const { [key]: _, ...rest } = localFilterData.value
+    localFilterData.value = rest
+}
+
 function handleReset() {
     closedByReset.value = true
     localFilterData.value = {}
@@ -101,4 +124,23 @@ function handleConfirm() {
 .shrimp-drawer .el-drawer__body .el-form-item {
     margin-bottom: 20px;
 }
+
+.filter-field-row {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    width: 100%;
+}
+
+.filter-field-control {
+    flex: 1;
+    min-width: 0;
+}
+
+.filter-clear {
+    flex: none;
+    padding: 0;
+    font-size: 16px;
+    color: var(--el-text-color-secondary);
+}
 </style>

src/components/ShrimpTable.vue

@@ -29,7 +29,7 @@
                             <slot :name="`column-${field.key}`" :row="row" :field="field">
                                 <component :is="vueAdmin.getFieldComponent(moduleKey, field.type, field.key)" :field="field"
                                     :model-value="row[field.key]" mode="display"
-                                    v-bind="field.type === 'textarea' || field.type === 'tab' ? { displayLabel: row[field.key + '_label'] } : {}" />
+                                    v-bind="field.type === 'textarea' ? { displayLabel: row[field.key + '_label'] } : {}" />
                             </slot>
                         </template>
                     </el-table-column>
@@ -212,9 +212,24 @@ const formFields = computed(() => {
     return list.filter(f => f.editable !== 'readonly')
 })
 const searchableFields = computed(() => fields.value.filter(f => f.searchable))
+// 递归收集 filterable 字段(含 object/tab 嵌套叶子)，生成 key=点路径的"合成字段"。
+// 这样筛选抽屉/buildFilter/URL 同步全按 field.key 走即可——key 就是 condition.level 这种路径。
+function collectFilterablePaths(list: IFieldConfig[], base: string[], out: any[]) {
+    for (const f of list) {
+        const path = [...base, f.key]
+        if (f.filterable) out.push({ ...f, key: path.join('.') })
+        if (f.type === 'tab' && Array.isArray((f as any).tabs)) {
+            for (const t of (f as any).tabs) collectFilterablePaths(t.fields, path, out)
+        } else if (f.type === 'object' && Array.isArray((f as any).fields)) {
+            collectFilterablePaths((f as any).fields, path, out)
+        }
+    }
+}
 const filterableFields = computed(() => {
     const lockedKeys = new Set(Object.keys(props.baseFilter || {}))
-    return fields.value.filter(f => f.filterable && !lockedKeys.has(f.key))
+    const out: any[] = []
+    collectFilterablePaths(fields.value, [], out)
+    return out.filter(f => !lockedKeys.has(f.key))
 })
 
 const formSlotNames = computed(() => Object.keys(slots).filter(name => name.startsWith('form-')))
@@ -307,8 +322,10 @@ async function handleAdd() {
             formData.value[field.key] = false
         } else if (field.type === 'number') {
             formData.value[field.key] = 0
-        } else if (field.multiple) {
+        } else if (field.type === 'array' || field.multiple) {
             formData.value[field.key] = []
+        } else if (field.type === 'object') {
+            formData.value[field.key] = {}
         } else {
             formData.value[field.key] = ''
         }
@@ -334,8 +351,10 @@ async function handleSave() {
             formFields.value.forEach(field => {
                 if (field.editable === 'readonly') return
                 if (field.editable === 'addOnly') return
-                const newValue = formData.value[field.key]
-                const oldValue = originalData.value[field.key]
+                // 清空字段值为 undefined 时，JSON.stringify 会丢键 → 后端收不到、看似"提交无效"。
+                // 归一成 null：既保证清空能提交(后端置空)，又让"两边都空"不误判为有改动。
+                const newValue = formData.value[field.key] ?? null
+                const oldValue = originalData.value[field.key] ?? null
                 if (newValue === oldValue) return
                 submitData[field.key] = newValue
             })
@@ -440,7 +459,16 @@ async function handleExport() {
         }
         if (ownerId.value) query.ownerId = ownerId.value
         const list = await api.export(query)
-        const ws = XLSX.utils.json_to_sheet(list)
+        // 后端只发原始对象；xlsx 单元格放不下对象/数组(会变 [object Object])，这里通用地 JSON 序列化
+        // (覆盖 tab 等结构化字段)。import 时这些字符串由后端各类型 reqFilter 还原。
+        const rows = list.map((row: Record<string, any>) => {
+            const out: Record<string, any> = {}
+            for (const [k, v] of Object.entries(row)) {
+                out[k] = (v !== null && typeof v === 'object') ? JSON.stringify(v) : v
+            }
+            return out
+        })
+        const ws = XLSX.utils.json_to_sheet(rows)
         const wb = XLSX.utils.book_new()
         XLSX.utils.book_append_sheet(wb, ws, props.moduleKey)
         XLSX.writeFile(wb, `${props.moduleKey}_export_${Date.now()}.xlsx`)

src/components/fields/FieldArray.vue

@@ -0,0 +1,107 @@
+<template>
+    <!-- 显示：逐元素递归渲染 item 的 display 组件 -->
+    <template v-if="mode === 'display'">
+        <span v-if="!items.length">-</span>
+        <span v-else class="arr-display">
+            <span v-for="(el, i) in items" :key="i" class="arr-chip">
+                <component :is="vueAdmin.getFieldComponent(moduleKey, field.item.type, '')"
+                    :field="field.item" :model-value="el" mode="display" />
+            </span>
+        </span>
+    </template>
+    <!-- 编辑：每项一行(标题 + item 编辑组件 + 删除),底部添加。第一版从简:无排序拖拽 -->
+    <div v-else class="field-array">
+        <div v-for="(el, i) in items" :key="i" class="arr-row">
+            <div class="arr-head">
+                <span class="arr-idx">{{ itemTitle }} #{{ i + 1 }}</span>
+                <el-button type="danger" text size="small" @click="removeAt(i)">删除</el-button>
+            </div>
+            <component :is="vueAdmin.getFieldComponent(moduleKey, field.item.type, '')"
+                :field="field.item" :model-value="el"
+                @update:model-value="setAt(i, $event)" mode="edit" :disabled="disabled" />
+        </div>
+        <el-button type="primary" text @click="addOne" :disabled="disabled">+ 添加{{ itemTitle }}</el-button>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { computed, inject } from 'vue'
+import { vueAdmin } from '../../VueAdmin'
+
+const props = defineProps<{
+    field: any
+    modelValue: any
+    mode: 'display' | 'edit' | 'filter'
+    disabled?: boolean
+}>()
+
+const emit = defineEmits<{ 'update:modelValue': [value: any] }>()
+
+const moduleKey = inject('shrimpModuleKey', '')
+
+const items = computed<any[]>(() => Array.isArray(props.modelValue) ? props.modelValue : [])
+const itemTitle = computed(() => vueAdmin.t(props.field.item?.label) || '项')
+
+function setAt(i: number, value: any) {
+    const arr = items.value.slice()
+    arr[i] = value
+    emit('update:modelValue', arr)
+}
+function removeAt(i: number) {
+    const arr = items.value.slice()
+    arr.splice(i, 1)
+    emit('update:modelValue', arr)
+}
+function addOne() {
+    emit('update:modelValue', [...items.value, defaultOf(props.field.item)])
+}
+
+/** 按 item schema 递归生成一个默认元素 */
+function defaultOf(schema: any): any {
+    if (!schema) return null
+    if (schema.defaultValue !== undefined) return schema.defaultValue
+    if (schema.type === 'object') {
+        const obj: any = {}
+        for (const f of schema.fields || []) obj[f.key] = defaultOf(f)
+        return obj
+    }
+    if (schema.type === 'array') return []
+    if (schema.type === 'number') return 0
+    if (schema.type === 'boolean') return false
+    return null
+}
+</script>
+
+<style scoped>
+.arr-display {
+    display: inline-flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 4px 12px;
+}
+
+.field-array {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+}
+
+.arr-row {
+    padding: 8px 10px;
+    border: 1px solid var(--el-border-color-lighter);
+    border-radius: 6px;
+}
+
+.arr-head {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    margin-bottom: 6px;
+}
+
+.arr-idx {
+    color: var(--el-text-color-secondary);
+    font-size: 12px;
+    font-weight: 600;
+}
+</style>

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>

src/components/fields/FieldJson.vue

@@ -1,48 +0,0 @@
-<template>
-    <template v-if="mode === 'display'">
-        <el-tooltip v-if="modelValue != null" :content="displayValue" placement="top">
-            <span class="json-display">{{ displayValue }}</span>
-        </el-tooltip>
-        <span v-else>-</span>
-    </template>
-    <el-input
-        v-else
-        :model-value="modelValue"
-        @update:model-value="$emit('update:modelValue', $event)"
-        type="textarea"
-        :rows="4"
-        :disabled="disabled"
-        placeholder="请输入 JSON"
-    />
-</template>
-
-<script lang="ts" setup>
-import { computed } from 'vue'
-
-const props = defineProps<{
-    field: any
-    modelValue: any
-    mode: 'display' | 'edit' | 'filter'
-    disabled?: boolean
-}>()
-
-defineEmits<{
-    'update:modelValue': [value: any]
-}>()
-
-const displayValue = computed(() => {
-    if (props.modelValue == null) return ''
-    if (typeof props.modelValue === 'string') return props.modelValue
-    return JSON.stringify(props.modelValue, null, 2)
-})
-</script>
-
-<style scoped>
-.json-display {
-    display: inline-block;
-    max-width: 200px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-}
-</style>

src/components/fields/FieldObject.vue

@@ -0,0 +1,69 @@
+<template>
+    <!-- 显示：递归渲染各子字段的 display 组件(relation 子查 refs) -->
+    <template v-if="mode === 'display'">
+        <span v-if="!modelValue || typeof modelValue !== 'object'">-</span>
+        <span v-else class="obj-display">
+            <span v-for="f in field.fields || []" :key="f.key" class="obj-child">
+                <span class="obj-label">{{ vueAdmin.t(f.label) }}:</span>
+                <component :is="vueAdmin.getFieldComponent(moduleKey, f.type, f.key)"
+                    :field="f" :model-value="(modelValue || {})[f.key]" mode="display" />
+            </span>
+        </span>
+    </template>
+    <!-- 编辑：每个子字段一行,递归渲染 edit 组件 -->
+    <div v-else class="field-object">
+        <el-form-item v-for="f in field.fields || []" :key="f.key" :label="vueAdmin.t(f.label)" :required="f.required">
+            <component :is="vueAdmin.getFieldComponent(moduleKey, f.type, f.key)"
+                :field="f" :model-value="(modelValue || {})[f.key]"
+                @update:model-value="onChild(f.key, $event)" mode="edit" :disabled="disabled" />
+        </el-form-item>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { inject } from 'vue'
+import { vueAdmin } from '../../VueAdmin'
+
+const props = defineProps<{
+    field: any
+    modelValue: any
+    mode: 'display' | 'edit' | 'filter'
+    disabled?: boolean
+}>()
+
+const emit = defineEmits<{ 'update:modelValue': [value: any] }>()
+
+const moduleKey = inject('shrimpModuleKey', '')
+
+function onChild(key: string, value: any) {
+    emit('update:modelValue', { ...(props.modelValue || {}), [key]: value })
+}
+</script>
+
+<style scoped>
+.obj-display {
+    display: inline-flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 4px 10px;
+}
+
+.obj-child {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+}
+
+.obj-label {
+    color: var(--el-text-color-secondary);
+    font-size: 12px;
+}
+
+.field-object {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    padding-left: 12px;
+    border-left: 2px solid var(--el-border-color-lighter);
+}
+</style>

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,16 @@ const props = defineProps<{
     disabled?: boolean
 }>()
 
-defineEmits<{
+const emit = defineEmits<{
     'update:modelValue': [value: any]
 }>()
 
+// 编辑态清空：el-select 单选清空发 '' 或 undefined，relation 是 ObjectId、且 undefined 会被
+// JSON.stringify 丢键 → 都归一成 null(取消关联)。多选清空是 []，原样。
+function onEdit(v: any) {
+    emit('update:modelValue', v === '' || v == null ? (props.field.multiple ? [] : null) : v)
+}
+
 const options = ref<{ label: string; value: string }[]>([])
 const loading = ref(false)
 

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" />

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>

src/components/fields/FieldTab.vue

@@ -1,17 +1,21 @@
 <template>
     <template v-if="mode === 'display'">
-        <!-- 表格列展示后端算好的 stringify 文本(displayLabel=${key}_label);本体仍是对象,供编辑/逻辑用 -->
-        <el-tooltip v-if="displayLabel" :content="String(displayLabel)" placement="top">
-            <span class="tab-display">{{ displayLabel }}</span>
-        </el-tooltip>
-        <span v-else-if="!modelValue || typeof modelValue !== 'object'">-</span>
-        <el-tooltip v-else :content="JSON.stringify(modelValue, null, 2)" placement="top">
-            <span class="tab-display">{{ displayText }}</span>
-        </el-tooltip>
+        <!-- 显示=前端递归渲染:分支标签 + 选中分支子字段。没选 type(清空) → 显示 - -->
+        <span v-if="!modelValue || typeof modelValue !== 'object' || modelValue.type == null">-</span>
+        <span v-else class="tab-display">
+            <span class="tab-branch">{{ branchLabel }}</span>
+            <span v-for="childField in selectedTab?.fields || []" :key="childField.key" class="tab-child">
+                <span class="tab-child-label">{{ vueAdmin.t(childField.label) }}:</span>
+                <component :is="vueAdmin.getFieldComponent(moduleKey, childField.type, childField.key)"
+                    :field="childField" :model-value="(modelValue || {})[childField.key]" mode="display" />
+            </span>
+        </span>
     </template>
     <div v-else class="field-tab">
         <el-form-item :label="vueAdmin.t(field.label) + ' - 类型'" :required="field.required">
-            <el-select :model-value="innerValue.type" @update:model-value="onTypeChange" :disabled="disabled">
+            <!-- 非必填可清空 → 清空后 type=null、整个 tab 置空、下面分支消失 -->
+            <el-select :model-value="modelValue?.type ?? undefined" @update:model-value="onTypeChange"
+                :clearable="!field.required" :disabled="disabled">
                 <el-option v-for="tab in field.tabs" :key="tab.key" :label="vueAdmin.t(tab.label)" :value="tab.key" />
             </el-select>
         </el-form-item>
@@ -20,7 +24,7 @@
                 <el-form-item :label="vueAdmin.t(childField.label)" :required="childField.required">
                     <component :is="vueAdmin.getFieldComponent(moduleKey, childField.type, childField.key)"
                         :field="childField"
-                        :model-value="innerValue[childField.key]"
+                        :model-value="(modelValue || {})[childField.key]"
                         @update:model-value="onChildChange(childField.key, $event)"
                         mode="edit"
                         :disabled="disabled" />
@@ -31,7 +35,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, inject, onMounted } from 'vue'
+import { computed, inject } from 'vue'
 import { vueAdmin } from '../../VueAdmin'
 
 const props = defineProps<{
@@ -39,7 +43,6 @@ const props = defineProps<{
     modelValue: any
     mode: 'display' | 'edit' | 'filter'
     disabled?: boolean
-    displayLabel?: string
 }>()
 
 const emit = defineEmits<{
@@ -48,39 +51,18 @@ const emit = defineEmits<{
 
 const moduleKey = inject('shrimpModuleKey', '')
 
-const displayText = computed(() => {
-    if (!props.modelValue || typeof props.modelValue !== 'object') return '-'
-    const type = props.modelValue.type
-    const tab = props.field.tabs?.find((t: any) => t.key === type)
-    return tab ? vueAdmin.t(tab.label) : String(type)
-})
+const selectedTab = computed(() =>
+    props.field.tabs?.find((t: any) => t.key === props.modelValue?.type)
+)
 
-const selectedTab = computed(() => {
-    const type = props.modelValue?.type
-    return props.field.tabs?.find((t: any) => t.key === type)
-})
-
-const innerValue = computed(() => {
-    const val = props.modelValue
-    if (val != null && typeof val === 'object' && Object.keys(val).length > 0) {
-        return val
-    }
-    return initValue()
-})
-
-function initValue() {
-    const firstTab = props.field.tabs?.[0]
-    if (!firstTab) return {}
-    const obj: any = { type: firstTab.key }
-    firstTab.fields?.forEach((f: any) => {
-        if (f.defaultValue !== undefined) {
-            obj[f.key] = typeof f.defaultValue === 'function' ? f.defaultValue() : f.defaultValue
-        }
-    })
-    return obj
-}
+const branchLabel = computed(() => selectedTab.value ? vueAdmin.t(selectedTab.value.label) : '')
 
 function onTypeChange(type: any) {
+    // 清空(非必填) → 整个 tab 置空：type=null、空状态、分支消失
+    if (type == null || type === '') {
+        emit('update:modelValue', null)
+        return
+    }
     const tab = props.field.tabs?.find((t: any) => t.key === type)
     const obj: any = { type }
     tab?.fields?.forEach((f: any) => {
@@ -92,24 +74,32 @@ function onTypeChange(type: any) {
 }
 
 function onChildChange(key: string, value: any) {
-    emit('update:modelValue', { ...innerValue.value, [key]: value })
+    emit('update:modelValue', { ...(props.modelValue || {}), [key]: value })
 }
-
-onMounted(() => {
-    const val = props.modelValue
-    if (val == null || val === '' || (typeof val === 'object' && Object.keys(val).length === 0)) {
-        emit('update:modelValue', initValue())
-    }
-})
 </script>
 
 <style scoped>
 .tab-display {
-    display: inline-block;
-    max-width: 200px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+    display: inline-flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 4px 10px;
+}
+
+.tab-branch {
+    font-weight: 600;
+    color: var(--el-color-primary);
+}
+
+.tab-child {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+}
+
+.tab-child-label {
+    color: var(--el-text-color-secondary);
+    font-size: 12px;
 }
 
 .field-tab {

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>