vxe-pc-ui 4.16.1 → 4.16.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-pc-ui",
-  "version": "4.16.1",
+  "version": "4.16.3",
   "description": "A vue based PC component library",
   "scripts": {
     "update": "npm install --legacy-peer-deps",

package/packages/cascader/src/cascader.ts

@@ -746,6 +746,7 @@ export default defineVxeComponent({
     }
 
     const handleCurrentItems = () => {
+      const { currentNode } = reactData
       const { afterTreeList } = internalData
       const selectVals = computeSelectVals.value
       const childrenField = computeChildrenField.value
@@ -754,8 +755,8 @@ export default defineVxeComponent({
       const { transform } = treeOpts
       const stItems: string[] = []
       const expandedMaps: Record<string, boolean> = {}
-      if (selectVals.length) {
-        const lastVal = enNodeValue(XEUtils.last(selectVals))
+      const lastVal = currentNode ? getNodeId(currentNode) : enNodeValue(XEUtils.last(selectVals))
+      if (lastVal) {
         const stRest = XEUtils.findTree(afterTreeList, (item) => lastVal === getNodeId(item), { children: transform ? mapChildrenField : childrenField })
         if (stRest) {
           const { nodes } = stRest
@@ -766,8 +767,8 @@ export default defineVxeComponent({
           })
         }
       }
-      internalData.treeExpandedMaps = expandedMaps
       reactData.currentItems = stItems
+      internalData.treeExpandedMaps = expandedMaps
     }
 
     const updateZindex = () => {
@@ -1811,11 +1812,9 @@ export default defineVxeComponent({
     }
 
     watch(() => props.modelValue, () => {
-      if (!reactData.visiblePanel) {
-        updateModelChecked()
-        handleCurrentItems()
-        updateCurrentChunk()
-      }
+      updateModelChecked()
+      handleCurrentItems()
+      updateCurrentChunk()
     })
 
     watch(() => props.options, () => {

package/packages/tree/src/tree.ts

@@ -1193,16 +1193,18 @@ export default defineVxeComponent({
       const { loadMethod } = props
       const { checkStrictly } = checkboxOpts
       return new Promise<void>(resolve => {
+        const { nodeMaps } = internalData
+        const nodeid = getNodeId(node)
+        const nodeItem = nodeMaps[nodeid]
         if (loadMethod) {
-          const { nodeMaps } = internalData
-          const nodeid = getNodeId(node)
-          const nodeItem = nodeMaps[nodeid]
           internalData.treeExpandLazyLoadedMaps[nodeid] = true
           Promise.resolve(
             loadMethod({ $tree: $xeTree, node })
           ).then((childRecords: any) => {
             const { treeExpandLazyLoadedMaps } = internalData
-            nodeItem.treeLoaded = true
+            if (nodeItem) {
+              nodeItem.treeLoaded = true
+            }
             if (treeExpandLazyLoadedMaps[nodeid]) {
               treeExpandLazyLoadedMaps[nodeid] = false
             }
@@ -1228,7 +1230,9 @@ export default defineVxeComponent({
             }
           }).catch((e) => {
             const { treeExpandLazyLoadedMaps } = internalData
-            nodeItem.treeLoaded = false
+            if (nodeItem) {
+              nodeItem.treeLoaded = false
+            }
             if (treeExpandLazyLoadedMaps[nodeid]) {
               treeExpandLazyLoadedMaps[nodeid] = false
             }
@@ -1239,6 +1243,9 @@ export default defineVxeComponent({
             return recalculate()
           })
         } else {
+          if (nodeItem) {
+            nodeItem.treeLoaded = true
+          }
           resolve()
         }
       })
@@ -3472,7 +3479,7 @@ export default defineVxeComponent({
     })
 
     onMounted(() => {
-      const { transform, drag, menuConfig, showOverflow } = props
+      const { transform, drag, menuConfig, showOverflow, lazy, loadMethod } = props
       const dragOpts = computeDragOpts.value
       if (!showOverflow) {
         errLog('vxe.error.errProp', ['show-overflow=false', 'show-overflow=true'])
@@ -3483,6 +3490,9 @@ export default defineVxeComponent({
       if (dragOpts.isCrossTreeDrag && !dragOpts.isCrossDrag) {
         errLog('vxe.error.reqSupportProp', ['drag-config.isCrossTreeDrag', 'drag-config.isCrossDrag'])
       }
+      if (lazy && !loadMethod) {
+        warnLog('vxe.error.reqSupportProp', ['lazy', 'load-method'])
+      }
       // if (valueField) {
       //   errLog('vxe.error.delProp', ['value-field', 'value-field'])
       // }

package/packages/upload/src/upload.ts

@@ -778,7 +778,8 @@ export default defineVxeComponent({
       dispatchEvent('upload-queue-start', { files: selectFiles }, evnt)
 
       const cacheMaps = Object.assign({}, reactData.fileCacheMaps)
-      const newFileList = multiple ? fileList : []
+      const uploadFileList = multiple ? fileList : []
+      const newFileList: VxeUploadDefines.FileObjItem[] = []
       const uploadPromiseRests: any[] = []
       selectFiles.forEach(file => {
         const { name } = file
@@ -807,11 +808,12 @@ export default defineVxeComponent({
             )
           }
           newFileList.push(item)
+          uploadFileList.push(item)
         }
       })
-      reactData.fileList = newFileList
+      reactData.fileList = uploadFileList
       reactData.fileCacheMaps = cacheMaps
-      newFileList.forEach(item => {
+      uploadFileList.forEach(item => {
         dispatchEvent('add', { option: item }, evnt)
       })
       Promise.all(uploadPromiseRests).then(() => {

package/types/components/gantt.d.ts

@@ -600,6 +600,7 @@ export interface GanttPrivateComputed<D = any> extends GridPrivateComputed<D> {
   computeDateFormat: ComputedRef<string>
   computeScaleUnit: ComputedRef<VxeGanttDefines.ColumnScaleType>
   computeMinScale: ComputedRef<VxeGanttDefines.ColumnScaleObj>
+  computeScaleStep: ComputedRef<number>
   computeWeekScale: ComputedRef<VxeGanttDefines.ColumnScaleObj | null | undefined>
   computeTitleField: ComputedRef<string>
   computeStartField: ComputedRef<string>