@veltra/desktop 1.2.24 → 1.2.25

package/src/components/tree/use-select.ts

@@ -1,3 +1,4 @@
+import { fieldKey } from '@veltra/utils'
 import { nextTick, shallowRef, watch, type ComputedRef, type ShallowRef } from 'vue'
 
 import type { TreeEmit, TreeProps } from '../../types'
@@ -55,7 +56,8 @@ export function useSelect(options: Options): UseSelectReturned {
     if (node.disabled) return
     selectedData.value = node.data === selectedData.value ? undefined : node.data
 
-    emit('update:selected', selectedData.value?.[props.valueKey!], selectedData.value, node)
+    const valueKey = fieldKey(props.valueKey, 'value')
+    emit('update:selected', selectedData.value?.[valueKey], selectedData.value, node)
 
     nextTick(() => {
       selectByEvent = false

package/src/components/tree/use-tree-nodes.ts

@@ -1,4 +1,5 @@
 import { Forest } from '@cat-kit/core'
+import { fieldKey } from '@veltra/utils'
 import { computed, shallowRef, triggerRef, watch, type ShallowRef, type ComputedRef } from 'vue'
 
 import type { TreeProps } from '../../types'
@@ -36,8 +37,10 @@ export function useTreeNodes(options: Options): UseTreeNodesReturned {
   const nodes = shallowRef<TreeNode[]>([])
 
   function buildForest(): Forest<Record<string, unknown>, any> {
-    const { disabledNode, expandAll = false, valueKey, labelKey } = props
+    const { disabledNode, expandAll = false } = props
     const childrenKey = props.childrenKey ?? 'children'
+    const valueKey = fieldKey(props.valueKey, 'value')
+    const labelKey = fieldKey(props.labelKey, 'label')
 
     function createNode(
       data: Record<string, any>,
@@ -45,14 +48,7 @@ export function useTreeNodes(options: Options): UseTreeNodesReturned {
       depth: number,
       parent?: TreeNode
     ): TreeNode {
-      const node = new TreeNode({
-        data,
-        index,
-        depth,
-        parent,
-        valueKey: valueKey!,
-        labelKey: labelKey!
-      })
+      const node = new TreeNode({ data, index, depth, parent, valueKey, labelKey })
       node.expanded = expandAll
       return node
     }

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

@@ -63,7 +63,7 @@
 import { dfs, o } from '@cat-kit/core'
 import { useFormFallbackProps } from '@veltra/compositions'
 import { ArrowDown, Search } from '@veltra/icons/normal'
-import { bem, FORM_EMPTY_CONTENT } from '@veltra/utils'
+import { bem, fieldKey, FORM_EMPTY_CONTENT } from '@veltra/utils'
 import { injectFormContext } from '@veltra/utils'
 import { computed, nextTick, shallowRef, watch } from 'vue'
 
@@ -114,6 +114,9 @@ const treeProps = computed(() => {
 
 const cls = bem('tree-select')
 
+const labelKey = computed(() => fieldKey(props.labelKey, 'label'))
+const valueKey = computed(() => fieldKey(props.valueKey, 'value'))
+
 /**过滤 */
 const qs = shallowRef('')
 watch(qs, (qs) => {
@@ -158,8 +161,8 @@ watch(
       dfs(
         item,
         (v) => {
-          if (v[props.valueKey] === model) {
-            label.value = v[props.labelKey]
+          if (v[valueKey.value] === model) {
+            label.value = v[labelKey.value]
             founded = true
             return true
           }
@@ -182,7 +185,7 @@ const handleSelect = (selected?: string | number, selectedData?: Record<string,
   model.value = selected ?? ''
 
   if (selectedData) {
-    label.value = o(selectedData).get(props.labelKey)
+    label.value = o(selectedData).get(labelKey.value)
   } else {
     label.value = ''
   }

package/src/types/code-editor.ts

@@ -5,8 +5,16 @@ export type CodeEditorLang = 'js' | 'sql' | 'java' | 'json'
 /** 代码编辑器组件属性（不支持 `size`） */
 export interface CodeEditorProps extends Omit<FormComponentProps, 'size'> {
   modelValue?: string
-  /** 定义语言 */
-  language?: CodeEditorLang
+  /**
+   * 可选语言列表。长度大于 1 时在编辑器右上角显示内置语言选择器
+   */
+  langs?: CodeEditorLang[]
+  /** 当前语言，配合 `v-model:lang` 使用 */
+  lang?: CodeEditorLang
+  /** 不可编辑的前缀外壳（展示在编辑器内，不计入 v-model） */
+  prefix?: string
+  /** 不可编辑的后缀外壳（展示在编辑器内，不计入 v-model） */
+  suffix?: string
   /** 是否使用暗色主题 */
   dark?: boolean
   /**
@@ -19,6 +27,9 @@ export interface CodeEditorProps extends Omit<FormComponentProps, 'size'> {
 /** 代码编辑器组件定义的事件 */
 export interface CodeEditorEmits {
   (e: 'update:modelValue', value: string): void
+  (e: 'update:lang', value: CodeEditorLang | undefined): void
+  /** 在编辑器失焦且内容有变更时触发 */
+  (e: 'change', value: string): void
 }
 
 /** 代码编辑器组件暴露的属性和方法(组件内部使用) */