vxe-pc-ui 4.8.7 → 4.8.9

package/packages/list/src/list.ts

@@ -7,6 +7,22 @@ import VxeLoadingComponent from '../../loading/src/loading'
 
 import type { VxeListConstructor, VxeListPropTypes, VxeListEmits, ListReactData, ListInternalData, ValueOf, ListMethods, ListPrivateRef, VxeListMethods } from '../../../types'
 
+function createInternalData (): ListInternalData {
+  return {
+    resizeObserver: undefined,
+    fullData: [],
+    lastScrollLeft: 0,
+    lastScrollTop: 0,
+    scrollYStore: {
+      startIndex: 0,
+      endIndex: 0,
+      visibleSize: 0,
+      offsetSize: 0,
+      rowHeight: 0
+    }
+  }
+}
+
 export default defineVxeComponent({
   name: 'VxeList',
   props: {
@@ -49,19 +65,7 @@ export default defineVxeComponent({
       items: []
     })
 
-    const internalData: ListInternalData = {
-      resizeObserver: undefined,
-      fullData: [],
-      lastScrollLeft: 0,
-      lastScrollTop: 0,
-      scrollYStore: {
-        startIndex: 0,
-        endIndex: 0,
-        visibleSize: 0,
-        offsetSize: 0,
-        rowHeight: 0
-      }
-    }
+    const internalData = createInternalData()
 
     const refElem = ref() as Ref<HTMLDivElement>
     const refVirtualWrapper = ref() as Ref<HTMLDivElement>
@@ -322,6 +326,49 @@ export default defineVxeComponent({
 
     Object.assign($xeList, listMethods)
 
+    const renderVN = () => {
+      const { className, loading } = props
+      const { bodyHeight, topSpaceHeight, items } = reactData
+      const defaultSlot = slots.default
+      const vSize = computeSize.value
+      const styles = computeStyles.value
+      return h('div', {
+        ref: refElem,
+        class: ['vxe-list', className ? (XEUtils.isFunction(className) ? className({ $list: $xeList }) : className) : '', {
+          [`size--${vSize}`]: vSize,
+          'is--loading': loading
+        }]
+      }, [
+        h('div', {
+          ref: refVirtualWrapper,
+          class: 'vxe-list--virtual-wrapper',
+          style: styles,
+          onScroll: scrollEvent
+        }, [
+          h('div', {
+            class: 'vxe-list--y-space',
+            style: {
+              height: bodyHeight ? `${bodyHeight}px` : ''
+            }
+          }),
+          h('div', {
+            ref: refVirtualBody,
+            class: 'vxe-list--body',
+            style: {
+              marginTop: topSpaceHeight ? `${topSpaceHeight}px` : ''
+            }
+          }, defaultSlot ? defaultSlot({ items, $list: $xeList }) : [])
+        ]),
+        /**
+         * 加载中
+         */
+        h(VxeLoadingComponent, {
+          class: 'vxe-list--loading',
+          modelValue: loading
+        })
+      ])
+    }
+
     const dataFlag = ref(0)
     watch(() => props.data ? props.data.length : -1, () => {
       dataFlag.value++
@@ -377,51 +424,9 @@ export default defineVxeComponent({
         resizeObserver.disconnect()
       }
       globalEvents.off($xeList, 'resize')
+      XEUtils.assign(internalData, createInternalData())
     })
 
-    const renderVN = () => {
-      const { className, loading } = props
-      const { bodyHeight, topSpaceHeight, items } = reactData
-      const defaultSlot = slots.default
-      const vSize = computeSize.value
-      const styles = computeStyles.value
-      return h('div', {
-        ref: refElem,
-        class: ['vxe-list', className ? (XEUtils.isFunction(className) ? className({ $list: $xeList }) : className) : '', {
-          [`size--${vSize}`]: vSize,
-          'is--loading': loading
-        }]
-      }, [
-        h('div', {
-          ref: refVirtualWrapper,
-          class: 'vxe-list--virtual-wrapper',
-          style: styles,
-          onScroll: scrollEvent
-        }, [
-          h('div', {
-            class: 'vxe-list--y-space',
-            style: {
-              height: bodyHeight ? `${bodyHeight}px` : ''
-            }
-          }),
-          h('div', {
-            ref: refVirtualBody,
-            class: 'vxe-list--body',
-            style: {
-              marginTop: topSpaceHeight ? `${topSpaceHeight}px` : ''
-            }
-          }, defaultSlot ? defaultSlot({ items, $list: $xeList }) : [])
-        ]),
-        /**
-         * 加载中
-         */
-        h(VxeLoadingComponent, {
-          class: 'vxe-list--loading',
-          modelValue: loading
-        })
-      ])
-    }
-
     $xeList.renderVN = renderVN
 
     return $xeList

package/packages/select/src/select.ts

@@ -19,6 +19,31 @@ function getOptUniqueId () {
   return XEUtils.uniqueId('opt_')
 }
 
+function createInternalData (): SelectInternalData {
+  return {
+    synchData: [],
+    fullData: [],
+    afterVisibleList: [],
+    optAddMaps: {},
+    optGroupKeyMaps: {},
+    optFullValMaps: {},
+    remoteValMaps: {},
+
+    lastScrollLeft: 0,
+    lastScrollTop: 0,
+    scrollYStore: {
+      startIndex: 0,
+      endIndex: 0,
+      visibleSize: 0,
+      offsetSize: 0,
+      rowHeight: 0
+    },
+
+    lastScrollTime: 0,
+    hpTimeout: undefined
+  }
+}
+
 export default defineVxeComponent({
   name: 'VxeSelect',
   props: {
@@ -157,28 +182,7 @@ export default defineVxeComponent({
       isActivated: false
     })
 
-    const internalData: SelectInternalData = {
-      synchData: [],
-      fullData: [],
-      afterVisibleList: [],
-      optAddMaps: {},
-      optGroupKeyMaps: {},
-      optFullValMaps: {},
-      remoteValMaps: {},
-
-      lastScrollLeft: 0,
-      lastScrollTop: 0,
-      scrollYStore: {
-        startIndex: 0,
-        endIndex: 0,
-        visibleSize: 0,
-        offsetSize: 0,
-        rowHeight: 0
-      },
-
-      lastScrollTime: 0,
-      hpTimeout: undefined
-    }
+    const internalData = createInternalData()
 
     const refMaps: SelectPrivateRef = {
       refElem
@@ -1498,6 +1502,7 @@ export default defineVxeComponent({
       globalEvents.off($xeSelect, 'keydown')
       globalEvents.off($xeSelect, 'blur')
       globalEvents.off($xeSelect, 'resize')
+      XEUtils.assign(internalData, createInternalData())
     })
 
     provide('$xeSelect', $xeSelect)

package/packages/tree/src/tree.ts

@@ -17,6 +17,34 @@ function getNodeUniqueId () {
   return XEUtils.uniqueId('node_')
 }
 
+function createInternalData (): TreeInternalData {
+  return {
+    // initialized: false,
+    // lastFilterValue: '',
+    treeFullData: [],
+    afterTreeList: [],
+    afterVisibleList: [],
+    nodeMaps: {},
+    selectCheckboxMaps: {},
+    indeterminateRowMaps: {},
+    treeExpandedMaps: {},
+    treeExpandLazyLoadedMaps: {},
+
+    lastScrollLeft: 0,
+    lastScrollTop: 0,
+    scrollYStore: {
+      startIndex: 0,
+      endIndex: 0,
+      visibleSize: 0,
+      offsetSize: 0,
+      rowHeight: 0
+    },
+
+    lastScrollTime: 0
+    // hpTimeout: undefined
+  }
+}
+
 export default defineVxeComponent({
   name: 'VxeTree',
   props: {
@@ -170,31 +198,7 @@ export default defineVxeComponent({
       updateCheckboxFlag: 1
     })
 
-    const internalData: TreeInternalData = {
-      // initialized: false,
-      // lastFilterValue: '',
-      treeFullData: [],
-      afterTreeList: [],
-      afterVisibleList: [],
-      nodeMaps: {},
-      selectCheckboxMaps: {},
-      indeterminateRowMaps: {},
-      treeExpandedMaps: {},
-      treeExpandLazyLoadedMaps: {},
-
-      lastScrollLeft: 0,
-      lastScrollTop: 0,
-      scrollYStore: {
-        startIndex: 0,
-        endIndex: 0,
-        visibleSize: 0,
-        offsetSize: 0,
-        rowHeight: 0
-      },
-
-      lastScrollTime: 0
-      // hpTimeout: undefined
-    }
+    const internalData = createInternalData()
 
     const refMaps: TreePrivateRef = {
       refElem
@@ -823,10 +827,13 @@ export default defineVxeComponent({
       return nextTick()
     }
 
-    const loadYData = (evnt: Event) => {
+    const loadYData = () => {
       const { scrollYStore } = internalData
       const { startIndex, endIndex, visibleSize, offsetSize, rowHeight } = scrollYStore
-      const scrollBodyElem = evnt.target as HTMLDivElement
+      const scrollBodyElem = refVirtualWrapper.value
+      if (!scrollBodyElem) {
+        return
+      }
       const scrollTop = scrollBodyElem.scrollTop
       const toVisibleIndex = Math.floor(scrollTop / rowHeight)
       const offsetStartIndex = Math.max(0, toVisibleIndex - 1 - offsetSize)
@@ -849,7 +856,7 @@ export default defineVxeComponent({
       internalData.lastScrollTop = scrollTop
       internalData.lastScrollLeft = scrollLeft
       if (reactData.scrollYLoad) {
-        loadYData(evnt)
+        loadYData()
       }
       internalData.lastScrollTime = Date.now()
       dispatchEvent('scroll', { scrollLeft, scrollTop, isX, isY }, evnt)
@@ -1483,7 +1490,8 @@ export default defineVxeComponent({
       },
       setAllExpandNode (expanded) {
         const { transform } = props
-        const { treeExpandedMaps } = internalData
+        const { scrollYLoad } = reactData
+        const { scrollYStore, treeExpandedMaps } = internalData
         const childrenField = computeChildrenField.value
         const mapChildrenField = computeMapChildrenField.value
         if (expanded) {
@@ -1499,9 +1507,17 @@ export default defineVxeComponent({
           internalData.treeExpandedMaps = {}
         }
         reactData.updateExpandedFlag++
+        reactData.topSpaceHeight = 0
+        scrollYStore.startIndex = 0
+        scrollYStore.endIndex = 1
         handleTreeToList()
         handleData()
-        return recalculate()
+        return recalculate().then(() => {
+          if (scrollYLoad) {
+            loadYData()
+          }
+          return recalculate()
+        })
       },
       reloadExpandNode (node) {
         const { lazy } = props
@@ -1955,12 +1971,8 @@ export default defineVxeComponent({
       if (resizeObserver) {
         resizeObserver.disconnect()
       }
-
-      internalData.treeExpandedMaps = {}
-      internalData.indeterminateRowMaps = {}
-      internalData.nodeMaps = {}
-
       globalEvents.off($xeTree, 'resize')
+      XEUtils.assign(internalData, createInternalData())
     })
 
     loadData(props.data || [])

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

@@ -17,6 +17,14 @@ function getOptUniqueId () {
   return XEUtils.uniqueId('node_')
 }
 
+function createInternalData (): TreeSelectInternalData {
+  return {
+    // hpTimeout: undefined,
+    fullOptionList: [],
+    fullNodeMaps: {}
+  }
+}
+
 export default defineVxeComponent({
   name: 'VxeTreeSelect',
   props: {
@@ -127,11 +135,7 @@ export default defineVxeComponent({
       isActivated: false
     })
 
-    const internalData: TreeSelectInternalData = {
-      // hpTimeout: undefined,
-      fullOptionList: [],
-      fullNodeMaps: {}
-    }
+    const internalData = createInternalData()
 
     const refMaps: TreeSelectPrivateRef = {
       refElem
@@ -865,6 +869,7 @@ export default defineVxeComponent({
       globalEvents.off($xeTreeSelect, 'mousedown')
       globalEvents.off($xeTreeSelect, 'blur')
       globalEvents.off($xeTreeSelect, 'resize')
+      XEUtils.assign(internalData, createInternalData())
     })
 
     provide('$xeTreeSelect', $xeTreeSelect)

package/types/components/grid.d.ts

@@ -18,6 +18,7 @@ export interface VxeGridConstructor<D = any> extends VxeComponentBaseOptions, Vx
   props: VxeGridProps
   context: SetupContext<VxeGridEmits>
   reactData: GridReactData
+  internalData: GridInternalData
   getRefMaps(): GridPrivateRef
   getComputeMaps(): GridPrivateComputed
   renderVN: RenderFunction
@@ -292,6 +293,8 @@ export interface GridReactData<D = any> {
   }
 }
 
+export interface GridInternalData {}
+
 export interface GridMethods<D = any> {
   dispatchEvent(type: ValueOf<VxeGridEmits>, params: Record<string, any>, evnt: Event | null): void
   /**

package/types/components/table.d.ts

@@ -4428,7 +4428,7 @@ export interface TableMethods<DT = any> {
   /**
    * 用于 row-config.isCurrent，获取当前行的行数据
    */
-  getCurrentRecord(): DT | null
+  getCurrentRecord(isFull?: boolean): DT | null
   /**
    * 用于 type=radio，获取当已选中的行数据
    */