vxe-pc-ui 4.9.31 → 4.9.33

package/packages/table-select/src/table-select.ts

@@ -41,6 +41,7 @@ export default defineVxeComponent({
     columns: Array as PropType<VxeTableSelectPropTypes.Columns>,
     options: Array as PropType<VxeTableSelectPropTypes.Options>,
     optionProps: Object as PropType<VxeTableSelectPropTypes.OptionProps>,
+    lazyOptions: Array as PropType<VxeTableSelectPropTypes.LazyOptions>,
     zIndex: Number as PropType<VxeTableSelectPropTypes.ZIndex>,
     size: {
       type: String as PropType<VxeTableSelectPropTypes.Size>,
@@ -178,8 +179,7 @@ export default defineVxeComponent({
 
     const computeGridOpts = computed(() => {
       return Object.assign({}, getConfig().tableSelect.gridConfig, props.gridConfig, {
-        data: undefined,
-        columns: undefined
+        data: undefined
       })
     })
 
@@ -211,12 +211,22 @@ export default defineVxeComponent({
     })
 
     const computeSelectLabel = computed(() => {
-      const { modelValue } = props
+      const { modelValue, lazyOptions } = props
       const { fullRowMaps } = reactData
+      const valueField = computeValueField.value
       const labelField = computeLabelField.value
       return (XEUtils.isArray(modelValue) ? modelValue : [modelValue]).map(val => {
         const cacheItem = fullRowMaps[val]
-        return cacheItem ? cacheItem.item[labelField] : val
+        if (cacheItem) {
+          return cacheItem.item[labelField]
+        }
+        if (lazyOptions) {
+          const lazyItem = lazyOptions.find(item => item[valueField] === val)
+          if (lazyItem) {
+            return lazyItem[labelField]
+          }
+        }
+        return val
       }).join(', ')
     })
 
@@ -310,7 +320,10 @@ export default defineVxeComponent({
       })
     }
 
-    const loadTableColumn = (columns: VxeTableSelectPropTypes.Columns) => {
+    const loadTableColumn = (columns?: VxeTableSelectPropTypes.Columns) => {
+      if (!columns || !columns.length) {
+        return
+      }
       const { multiple } = props
       const tableCols: VxeTableSelectPropTypes.Columns = []
       let hasRadioCol = false
@@ -364,12 +377,12 @@ export default defineVxeComponent({
             rowid = getRowUniqueId()
           }
           if (keyMaps[rowid]) {
-            errLog('vxe.error.repeatKey', [rowKeyField, rowid])
+            errLog('vxe.error.repeatKey', [`[table-select] ${rowKeyField}`, rowid])
           }
           keyMaps[rowid] = true
           const value = item[valueField]
           if (rowMaps[value]) {
-            errLog('vxe.error.repeatKey', [valueField, value])
+            errLog('vxe.error.repeatKey', [`[table-select] ${valueField}`, value])
           }
           rowMaps[value] = { item, index, items, parent: null, nodes: [] }
         })
@@ -681,7 +694,7 @@ export default defineVxeComponent({
                           ref: refGrid,
                           rowConfig: rowOpts,
                           data: options,
-                          columns: tableColumns,
+                          columns: tableColumns.length ? tableColumns : selectGridOpts.columns,
                           height: '100%',
                           autoResize: true,
                           onRadioChange: radioChangeEvent,
@@ -712,14 +725,14 @@ export default defineVxeComponent({
     })
 
     watch(() => props.columns, (val) => {
-      loadTableColumn(val || [])
+      loadTableColumn(val)
     })
 
     watch(() => props.modelValue, (val) => {
       updateModel(val)
     })
 
-    loadTableColumn(props.columns || [])
+    loadTableColumn(props.columns)
     cacheDataMap()
 
     onMounted(() => {
@@ -744,7 +757,7 @@ export default defineVxeComponent({
 
     nextTick(() => {
       if (!VxeTableGridComponent) {
-        errLog('vxe.error.reqComp', ['vxe-grid'])
+        errLog('vxe.error.reqComp', ['[table-select] vxe-grid'])
       }
     })
 

package/packages/tabs/src/tabs.ts

@@ -580,11 +580,11 @@ export default defineVxeComponent({
         return handlePrevNext(true)
       },
       prevTab () {
-        warnLog('vxe.error.delFunc', ['prevTab', 'prev'])
+        warnLog('vxe.error.delFunc', ['[tabs] prevTab', 'prev'])
         return tabsMethods.prev()
       },
       nextTab () {
-        warnLog('vxe.error.delFunc', ['nextTab', 'next'])
+        warnLog('vxe.error.delFunc', ['[tabs] nextTab', 'next'])
         return tabsMethods.next()
       }
     }

package/packages/tree/src/tree.ts

@@ -102,6 +102,7 @@ export default defineVxeComponent({
     // 已废弃
     isHover: Boolean as PropType<VxeTreePropTypes.IsHover>,
     expandAll: Boolean as PropType<VxeTreePropTypes.ExpandAll>,
+    expandNodeKeys: Array as PropType<VxeTreePropTypes.ExpandNodeKeys>,
     showLine: {
       type: Boolean as PropType<VxeTreePropTypes.ShowLine>,
       default: () => getConfig().tree.showLine
@@ -666,7 +667,7 @@ export default defineVxeComponent({
     const triggerSearchEvent = XEUtils.debounce(() => handleData(true), 350, { trailing: true })
 
     const loadData = (list: any[]) => {
-      const { expandAll, transform } = props
+      const { expandAll, expandNodeKeys, transform } = props
       const { initialized, scrollYStore } = internalData
       const keyField = computeKeyField.value
       const parentField = computeParentField.value
@@ -683,7 +684,7 @@ export default defineVxeComponent({
       handleData(true)
       if (sYLoad) {
         if (!(props.height || props.maxHeight)) {
-          errLog('vxe.error.reqProp', ['height | max-height | virtual-y-config.enabled=false'])
+          errLog('vxe.error.reqProp', ['[tree] height | max-height | virtual-y-config.enabled=false'])
         }
       }
       return computeScrollLoad().then(() => {
@@ -692,6 +693,8 @@ export default defineVxeComponent({
             internalData.initialized = true
             if (expandAll) {
               $xeTree.setAllExpandNode(true)
+            } else if (expandNodeKeys && expandNodeKeys.length) {
+              $xeTree.setExpandByNodeId(expandNodeKeys, true)
             }
             handleSetCheckboxByNodeId(props.checkNodeKeys || [], true)
           }
@@ -1558,7 +1561,7 @@ export default defineVxeComponent({
           XEUtils.eachTree(nodeList, (childRow, index, items, path, parent, nodes) => {
             const itemNodeId = getNodeId(childRow)
             nodeMaps[itemNodeId] = {
-              item: node,
+              item: childRow,
               index: -1,
               items,
               parent: parent || parentNodeItem.item,

package/packages/tree-select/src/tree-select.ts

@@ -50,6 +50,7 @@ export default defineVxeComponent({
     popupClassName: [String, Function] as PropType<VxeTreeSelectPropTypes.PopupClassName>,
     prefixIcon: String as PropType<VxeTreeSelectPropTypes.PrefixIcon>,
     placement: String as PropType<VxeTreeSelectPropTypes.Placement>,
+    lazyOptions: Array as PropType<VxeTreeSelectPropTypes.LazyOptions>,
     options: Array as PropType<VxeTreeSelectPropTypes.Options>,
     optionProps: Object as PropType<VxeTreeSelectPropTypes.OptionProps>,
     zIndex: Number as PropType<VxeTreeSelectPropTypes.ZIndex>,
@@ -257,13 +258,23 @@ export default defineVxeComponent({
     })
 
     const computeSelectLabel = computed(() => {
-      const { modelValue } = props
+      const { modelValue, lazyOptions } = props
       const { fullNodeMaps } = internalData
+      const valueField = computeValueField.value
       const labelField = computeLabelField.value
       const selectVals = XEUtils.eqNull(modelValue) ? [] : (XEUtils.isArray(modelValue) ? modelValue : [modelValue])
       return selectVals.map(val => {
         const cacheItem = fullNodeMaps[val]
-        return cacheItem ? cacheItem.item[labelField] : val
+        if (cacheItem) {
+          return cacheItem.item[labelField]
+        }
+        if (lazyOptions) {
+          const lazyItem = lazyOptions.find(item => item[valueField] === val)
+          if (lazyItem) {
+            return lazyItem[labelField]
+          }
+        }
+        return val
       }).join(', ')
     })
 
@@ -334,12 +345,12 @@ export default defineVxeComponent({
           nodeid = getOptUniqueId()
         }
         if (keyMaps[nodeid]) {
-          errLog('vxe.error.repeatKey', [nodeKeyField, nodeid])
+          errLog('vxe.error.repeatKey', [`[tree-select] ${nodeKeyField}`, nodeid])
         }
         keyMaps[nodeid] = true
         const value = item[valueField]
         if (nodeMaps[value]) {
-          errLog('vxe.error.repeatKey', [valueField, value])
+          errLog('vxe.error.repeatKey', [`[tree-select] ${valueField}`, value])
         }
         nodeMaps[value] = { item, index, items, parent, nodes }
       }
@@ -820,6 +831,7 @@ export default defineVxeComponent({
                         hasChildField: treeOpts.hasChildField || hasChildField,
                         accordion: treeOpts.accordion,
                         expandAll: treeOpts.expandAll,
+                        expandNodeKeys: treeOpts.expandNodeKeys,
                         nodeConfig: treeNodeOpts,
                         lazy: treeOpts.lazy,
                         loadMethod: treeOpts.loadMethod,

package/packages/upload/index.ts

@@ -12,6 +12,7 @@ export const VxeUpload = Object.assign({}, VxeUploadComponent, {
 
 dynamicApp.use(VxeUpload)
 VxeUI.component(VxeUploadComponent)
+
 VxeUI.saveFile = saveLocalFile
 VxeUI.readFile = readLocalFile
 

package/packages/upload/src/upload.ts

@@ -1772,10 +1772,10 @@ export default defineVxeComponent({
 
     onMounted(() => {
       if (props.multiple && props.singleMode) {
-        errLog('vxe.error.errConflicts', ['multiple', 'single-mode'])
+        errLog('vxe.error.errConflicts', ['[upload] multiple', 'single-mode'])
       }
       if (props.imageStyle) {
-        warnLog('vxe.error.delProp', ['image-style', 'image-config'])
+        warnLog('vxe.error.delProp', ['[upload] image-style', 'image-config'])
       }
 
       if (props.dragSort) {

package/styles/components/tree.scss

@@ -119,7 +119,6 @@
   z-index: 7;
   & > i {
     display: inline-flex;
-    background-color: var(--vxe-ui-layout-background-color);
     @include baseMixin.createAnimationTransition(all, 0.2s);
   }
 }

package/types/components/select.d.ts

@@ -49,6 +49,7 @@ export namespace VxeSelectPropTypes {
   export type PrefixIcon = string
   export type AllowCreate = boolean
   export type Placement = 'top' | 'bottom' | ''
+  export type LazyOptions = VxeSelectDefines.SelectOptions[]
   export type Options = VxeSelectDefines.SelectOptions[]
   export type OptionProps = {
     value?: string
@@ -150,6 +151,7 @@ export interface VxeSelectProps {
   prefixIcon?: VxeSelectPropTypes.PrefixIcon
   allowCreate?: VxeSelectPropTypes.AllowCreate
   placement?: VxeSelectPropTypes.Placement
+  lazyOptions?: VxeSelectPropTypes.LazyOptions
   options?: VxeSelectPropTypes.Options
   optionProps?: VxeSelectPropTypes.OptionProps
   optionGroups?: VxeSelectPropTypes.OptionGroups

package/types/components/table-select.d.ts

@@ -38,6 +38,7 @@ export namespace VxeTableSelectPropTypes {
   export type Placement = 'top' | 'bottom'
   export type Columns<D = any> = VxeGridPropTypes.Columns<D>
   export type Options<D = any> = D[]
+  export type LazyOptions<D = any> = D[]
   export interface OptionProps {
     value?: string
     label?: string
@@ -50,7 +51,7 @@ export namespace VxeTableSelectPropTypes {
     height?: number | string
     className?: string | ((params: { $tableSelect: VxeTableSelectConstructor }) => string)
   }
-  export type GridConfig<D = any> = Omit<VxeGridProps<D>, 'data' | 'columns' | 'height' | 'maxHeight' | 'minHeight' | 'size'>
+  export type GridConfig<D = any> = Omit<VxeGridProps<D>, 'data' | 'height' | 'maxHeight' | 'minHeight' | 'size'>
 }
 
 export interface VxeTableSelectProps<D = any> {
@@ -68,6 +69,7 @@ export interface VxeTableSelectProps<D = any> {
   placement?: VxeTableSelectPropTypes.Placement
   columns?: VxeTableSelectPropTypes.Columns
   options?: VxeTableSelectPropTypes.Options
+  lazyOptions?: VxeTableSelectPropTypes.LazyOptions
   optionProps?: VxeTableSelectPropTypes.OptionProps
   transfer?: VxeTableSelectPropTypes.Transfer
   popupConfig?: VxeTableSelectPropTypes.PopupConfig

package/types/components/tree-select.d.ts

@@ -55,6 +55,7 @@ export namespace VxeTreeSelectPropTypes {
 
     [key: string]: any
   }
+  export type LazyOptions<D = Option> = D[]
   export type Options<D = Option> = D[]
   export interface OptionProps {
     value?: string
@@ -140,6 +141,7 @@ export interface VxeTreeSelectProps<D = any> {
   placement?: VxeTreeSelectPropTypes.Placement
   filterable?: VxeTreeSelectPropTypes.Filterable
   filterConfig?: VxeTreeSelectPropTypes.FilterConfig
+  lazyOptions?: VxeTreeSelectPropTypes.LazyOptions<D>
   options?: VxeTreeSelectPropTypes.Options<D>
   optionProps?: VxeTreeSelectPropTypes.OptionProps
   remote?: VxeTreeSelectPropTypes.Remote

package/types/components/tree.d.ts

@@ -63,6 +63,7 @@ export namespace VxeTreePropTypes {
   export type ShowLine = boolean
   export type Indent = number
   export type ExpandAll = boolean
+  export type ExpandNodeKeys = string[] | number[]
   export type ShowRadio = boolean
   export type CheckNodeKey = string | number | null
   export interface RadioConfig<D = any> {
@@ -183,7 +184,14 @@ export interface VxeTreeProps<D = any> {
   childrenField?: VxeTreePropTypes.ChildrenField
   hasChildField?: VxeTreePropTypes.HasChildField
   mapChildrenField?: VxeTreePropTypes.MapChildrenField
+  /**
+   * 默认展开所有节点（只会在初始化时被触发一次）
+   */
   expandAll?: VxeTreePropTypes.ExpandAll
+  /**
+   * 默认展开指定节点（只会在初始化时被触发一次）
+   */
+  expandNodeKeys?: VxeTreePropTypes.ExpandNodeKeys
   transform?: VxeTreePropTypes.Transform
   trigger?: VxeTreePropTypes.Trigger
   /**