@veltra/desktop 1.8.3 → 1.8.4

package/src/components/select/select.vue

@@ -180,14 +180,16 @@ const { size, disabled, readonly } = useFormFallbackProps([formProps ?? {}, prop
 })
 
 const currentIndex = shallowRef(-1)
-/** 内部展示文案，仅由选项推导；通过 update:text 单向通知父级 */
+/** 内部展示文案，仅由选项推导（未命中时展示 text 兜底）；经 update:text 通知父级 */
 const label = shallowRef<string>()
 const selected = shallowRef<Record<string, any>>()
 
 const displayedValue = computed(() => {
   if (label.value) return label.value
 
-  return selected.value ? o(selected.value).get(labelKey.value) : String(props.modelValue ?? '')
+  if (selected.value) return o(selected.value).get(labelKey.value)
+  // 未命中选项：优先展示 text 兜底文案，避免露出不可读的编码
+  return props.text ?? String(props.modelValue ?? '')
 })
 
 const dropdownRef = shallowRef<DropdownExposed>()
@@ -260,11 +262,11 @@ function handleTriggerClickCapture(e: MouseEvent) {
 
 const { userAction, isUserActive } = useUserAction()
 
-/** 更新内部文案；值变化时单向 emit update:text */
+/** 更新内部文案；值变化时 emit update:text（readonly 纯展示，不通知父级） */
 function setLabel(next?: string) {
   if (label.value === next) return
   label.value = next
-  emit('update:text', next)
+  if (!readonly.value) emit('update:text', next)
 }
 
 /** 按 modelValue 与完整选项列表同步高亮索引、选中项与显示标签（外部回显用，O(n)） */
@@ -282,7 +284,15 @@ function syncSelected(modelValue: any, sourceOptions: Record<string, any>[] | un
       (option) => o(option).get(valueKey.value) === modelValue
     )
     selected.value = currentIndex.value >= 0 ? sourceOptions[currentIndex.value] : undefined
-    setLabel(selected.value ? o(selected.value).get(labelKey.value) : undefined)
+    if (selected.value) {
+      setLabel(o(selected.value).get(labelKey.value))
+    } else if (props.text) {
+      // 未命中但有 text 兜底：文案以父级为准，不回发
+      label.value = undefined
+    } else {
+      // 未命中且无兜底：如实通知父级当前没有可展示文案
+      setLabel(undefined)
+    }
   } else {
     currentIndex.value = -1
     selected.value = undefined

package/src/components/table/__test__/col-width.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from 'vitest'
+import { describe, expect, it } from 'vite-plus/test'
 
 import type { TableColumn } from '../../../types'
 import { allocateLeafColumnWidths } from '../allocate-column-widths'

package/src/components/table/__test__/column-style.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from 'vitest'
+import { describe, expect, it } from 'vite-plus/test'
 
 import { ColumnNode } from '../node/col'
 

package/src/components/table-editor/__test__/table-editor.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from 'vitest'
+import { describe, expect, it } from 'vite-plus/test'
 import { createApp, h, nextTick, shallowRef, ref, type Ref } from 'vue'
 
 import type { TableColumn, TableEditorColumn } from '../../../../types'

package/src/components/tree-select/__test__/tree-select.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, it } from 'vitest'
+import { describe, expect, it } from 'vite-plus/test'
 import { createApp, h, nextTick, ref, type Ref } from 'vue'
 
 import UTreeSelect from '../tree-select.vue'
@@ -122,6 +122,55 @@ describe('UTreeSelect', () => {
     }
   })
 
+  it('falls back to text when modelValue matches no node', async () => {
+    const { host, texts, unmount } = mountTreeSelect({
+      modelValue: 'removed',
+      text: '已删除的节点'
+    })
+
+    try {
+      await nextTick()
+      expect(host.querySelector('input')!.value).toBe('已删除的节点')
+
+      // 未命中且传了 text 兜底：不发送 update:text，父级 text 即事实来源
+      expect(texts).toHaveLength(0)
+    } finally {
+      unmount()
+    }
+  })
+
+  it('emits update:text undefined when unmatched echo has no text fallback', async () => {
+    const { host, model, texts, unmount } = mountTreeSelect({ modelValue: 'beijing' })
+
+    try {
+      await nextTick()
+      expect(texts.at(-1)).toBe('北京')
+
+      // 值改为不在数据中的值且无 text 兜底：如实发出 undefined
+      model.value = 'removed'
+      await nextTick()
+      await nextTick()
+      expect(texts.at(-1)).toBeUndefined()
+      expect(host.querySelector('input')!.value).toBe('')
+    } finally {
+      unmount()
+    }
+  })
+
+  it('does not emit update:text in readonly', async () => {
+    const { host, texts, unmount } = mountTreeSelect({ modelValue: 'chaoyang', readonly: true })
+
+    try {
+      await nextTick()
+      await nextTick()
+      // readonly 纯展示：不触发 update:text，避免下游回写
+      expect(texts).toHaveLength(0)
+      expect(host.textContent).toContain('朝阳区（最新）')
+    } finally {
+      unmount()
+    }
+  })
+
   it('emits update:text after data arrives for an existing modelValue', async () => {
     const { host, data, texts, unmount } = mountTreeSelect({ modelValue: 'shanghai', data: [] })
 

package/src/components/tree-select/tree-select.vue

@@ -68,7 +68,7 @@
   </u-dropdown>
 
   <template v-else>
-    {{ label || FORM_EMPTY_CONTENT }}
+    {{ displayText || FORM_EMPTY_CONTENT }}
   </template>
 </template>
 
@@ -118,6 +118,7 @@ const treeProps = computed(() => {
     'placeholder',
     'disabled',
     'label',
+    'text',
     'readonly',
     'data',
     'contentClass',
@@ -185,9 +186,15 @@ watch(
 
 const model = defineModel<string | number>()
 
-/** 内部展示文案，仅由 data 推导；通过 update:text 单向通知父级 */
+/** 内部展示文案，仅由 data 推导（未命中时展示 text 兜底）；经 update:text 通知父级 */
 const label = shallowRef<string>()
 
+/** 展示文案：data 推导优先，未命中时回退 text 兜底 */
+const displayText = computed(() => {
+  if (!(model.value || model.value === 0)) return undefined
+  return label.value ?? props.text
+})
+
 const dropdownVisible = shallowRef(false)
 
 /**
@@ -199,24 +206,23 @@ const querying = shallowRef(false)
 
 const inputRef = useTemplateRef<InputExposed>('inputRef')
 
-/** 更新内部文案；值变化时单向 emit update:text */
+/** 更新内部文案；值变化时 emit update:text（readonly 纯展示，不通知父级） */
 function setLabel(next?: string) {
   if (label.value === next) return
   label.value = next
-  emit('update:text', next)
+  if (!readonly.value) emit('update:text', next)
 }
 
 /** 触发输入框的值：查询态下承载查询串，否则展示选中标签 */
 const inputValue = computed(() => {
   if (filterable.value && querying.value) return qs.value
-  return model.value || model.value === 0 ? label.value : undefined
+  return displayText.value
 })
 
 /** 查询态下已选标签降级为占位提示 */
 const inputPlaceholder = computed(() => {
-  const display = model.value || model.value === 0 ? label.value : undefined
-  if (filterable.value && querying.value && display) {
-    return display
+  if (filterable.value && querying.value && displayText.value) {
+    return displayText.value
   }
   return props.placeholder
 })
@@ -231,7 +237,7 @@ const hovered = shallowRef(false)
 /** 悬停且存在选中值时展示清除按钮（替代下拉箭头） */
 const showClear = computed(() => {
   if (!props.clearable || disabled.value || !hovered.value) return false
-  return !!(model.value || model.value === 0 ? label.value : undefined)
+  return !!displayText.value
 })
 
 /**
@@ -278,11 +284,14 @@ watch(
   [treeData, model],
   ([data, modelVal]) => {
     if (isUserActive()) return
-    if (!data?.length || modelVal === undefined || modelVal === null || modelVal === '') {
+    if (modelVal === undefined || modelVal === null || modelVal === '') {
       setLabel(undefined)
       return
     }
 
+    // 数据未就绪（远程加载等）：保留现有文案与父级 text 兜底，避免中途被清空
+    if (!data?.length) return
+
     let nextLabel: string | undefined
     const childrenKey = props.childrenKey ?? 'children'
     data.some((item) => {
@@ -301,7 +310,15 @@ watch(
 
       return founded
     })
-    setLabel(nextLabel)
+    if (nextLabel !== undefined) {
+      setLabel(nextLabel)
+    } else if (props.text) {
+      // 未命中但有 text 兜底：文案以父级为准，不回发
+      label.value = undefined
+    } else {
+      // 未命中且无兜底：如实通知父级当前没有可展示文案
+      setLabel(undefined)
+    }
   },
   { immediate: true }
 )

package/src/types/cascade.ts

@@ -20,6 +20,11 @@ export interface CascadeProps extends FormComponentProps {
   modelValue?: string[] | string
   /** 级联数据项的标签字段 */
   labelKey?: string
+  /**
+   * 兜底展示文案
+   * @description 单选 modelValue 未命中数据时展示 text（如回显路径已不在选项中），命中时展示节点 label 路径
+   */
+  text?: string
   /** 级联数据项的值字段 */
   valueKey?: string
   /** 占位符 */

package/src/types/select.ts

@@ -16,6 +16,11 @@ export interface SelectProps extends FormComponentProps {
   valueKey?: string
   /** 标签字段 */
   labelKey?: string
+  /**
+   * 兜底展示文案
+   * @description modelValue 未命中选项时展示 text（如回显数据已不在选项中），命中时展示选项 label
+   */
+  text?: string
   /** 是否可清除 */
   clearable?: boolean
   /** 占位符 */
@@ -54,8 +59,9 @@ export interface SelectProps extends FormComponentProps {
 
 export interface SelectEmits {
   /**
-   * 选中项文案变化（单向通知，用于同步父级冗余字段）
-   * @description 展示始终由 options 推导，请用 `@update:text` 而非 `v-model:text`
+   * 选中项文案变化（用于同步父级冗余字段）
+   * @description 命中选项时发出 label，清空时发出 undefined；未命中选项时，
+   * 传了 text 兜底则不发出（父级文案已是事实来源），未传 text 时发出 undefined；readonly 下不发出
    */
   (e: 'update:text', text?: string): void
   (e: 'update:modelValue', modelValue?: any): void

package/src/types/tree-select.ts

@@ -10,6 +10,12 @@ export interface TreeSelectProps
     Omit<TreeProps, 'selected' | 'checked' | 'selectable' | 'checkable' | 'data'> {
   modelValue?: string | number
 
+  /**
+   * 兜底展示文案
+   * @description modelValue 未命中树节点时展示 text（如回显数据已不在选项中），命中时展示节点 label
+   */
+  text?: string
+
   /**
    * 树数据
    * @description 如果传入一个函数，那么filterable会被强制启用；
@@ -53,8 +59,9 @@ export interface TreeSelectEmits {
   (e: 'update:modelValue', value?: string | number): void
   (e: 'change', selectedData?: Record<string, any>): void
   /**
-   * 选中项文案变化（单向通知，用于同步父级冗余字段）
-   * @description 展示始终由 data 推导，请用 `@update:text` 而非 `v-model:text`
+   * 选中项文案变化（用于同步父级冗余字段）
+   * @description 命中节点时发出 label，清空时发出 undefined；未命中节点时，
+   * 传了 text 兜底则不发出（父级文案已是事实来源），未传 text 时发出 undefined；readonly 下不发出
    */
   (e: 'update:text', text?: string): void
 }