vxe-pc-ui 3.15.2 → 3.15.4

package/packages/cascader/src/cascader.ts

@@ -4,7 +4,6 @@ import { getConfig, getI18n, getIcon, globalEvents, createEvent, renderEmptyElem
 import { getEventTargetNode, updatePanelPlacement, toCssUnit } from '../../ui/src/dom'
 import { getLastZIndex, nextZIndex } from '../../ui/src/utils'
 import { enNodeValue, deNodeValue } from './util'
-import { errLog } from '../../ui/src/log'
 import XEUtils from 'xe-utils'
 import VxeListComponent from '../../list/src/list'
 import VxeInputComponent from '../../input/src/input'
@@ -187,11 +186,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
   data () {
     const xID = XEUtils.uniqueId()
     const reactData = createReactData()
-    const internalData = createInternalData()
     return {
+      ...({} as {
+        internalData: CascaderInternalData
+      }),
       xID,
-      reactData,
-      internalData
+      reactData
     }
   },
   computed: {
@@ -721,7 +721,6 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const reactData = $xeCascader.reactData
       const internalData = $xeCascader.internalData
 
-      const { nodeMaps } = internalData
       let fullList: any[] = internalData.afterVisibleList
       if (force) {
         // 更新数据，处理筛选和排序
@@ -730,19 +729,59 @@ export default /* define-vxe-component start */ defineVxeComponent({
         fullList = $xeCascader.handleTreeToList()
       }
       const treeList = fullList.slice(0)
-      treeList.forEach((item, $index) => {
-        const nodeid = $xeCascader.getNodeId(item)
-        const itemRest = nodeMaps[nodeid]
-        if (itemRest) {
-          itemRest.$index = $index
-        }
-      })
       reactData.treeList = treeList
     },
+    /**
+     * 获取第一个拥有子节点的节点
+     */
+    handleHasChildNodeIds (treeList: any[], type: 'first' | 'last') {
+      const $xeCascader = this
+
+      const childrenField = $xeCascader.computeChildrenField
+      const mapChildrenField = $xeCascader.computeMapChildrenField
+      const treeOpts = $xeCascader.computeTreeOpts
+      const { transform } = treeOpts
+      const childField = transform ? mapChildrenField : childrenField
+      const nodeIds = []
+      let currList = treeList
+      while (currList.length) {
+        let targetNode = null
+        for (const item of currList) {
+          const kids = item[childField]
+          if (XEUtils.isArray(kids) && kids.length > 0) {
+            targetNode = item
+            break
+          }
+        }
+        if (targetNode) {
+          nodeIds.push($xeCascader.getNodeId(targetNode))
+          currList = targetNode[childField]
+        } else {
+          const endNode = XEUtils[type](currList)
+          nodeIds.push($xeCascader.getNodeId(endNode))
+          break
+        }
+      }
+      return nodeIds
+    },
     triggerSearchEvent: XEUtils.debounce(function (this: any) {
       const $xeCascader = this
+      const reactData = $xeCascader.reactData
+      const internalData = $xeCascader.internalData
 
       $xeCascader.handleData(true)
+      $xeCascader.updateModelChecked()
+      const filterOpts = $xeCascader.computeFilterOpts
+      const { autoExpandMode } = filterOpts
+      const { afterTreeList } = internalData
+      // 默认展开第
+      if (autoExpandMode === 'first' || autoExpandMode === 'last') {
+        const stItems = $xeCascader.handleHasChildNodeIds(afterTreeList, autoExpandMode)
+        reactData.currentItems = stItems
+      } else {
+        $xeCascader.handleCurrentItems()
+      }
+      $xeCascader.updateCurrentChunk()
     }, 350, { trailing: true }),
     loadData (list: any[]) {
       const $xeCascader = this
@@ -777,17 +816,20 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const internalData = $xeCascader.internalData
 
       const { currentItems } = reactData
-      const { treeFullData } = internalData
+      const { afterTreeList } = internalData
       const childrenField = $xeCascader.computeChildrenField
-      const currentCunkList: any[][] = [treeFullData]
+      const mapChildrenField = $xeCascader.computeMapChildrenField
+      const treeOpts = $xeCascader.computeTreeOpts
+      const { transform } = treeOpts
+      const currentCunkList: any[][] = [afterTreeList]
       if (currentItems.length) {
         let chunkIndex = 0
         let stNodeid = currentItems[chunkIndex]
-        let optList = treeFullData
+        let optList = afterTreeList
         while (stNodeid && optList && optList.length) {
           stNodeid = currentItems[chunkIndex++]
           const currOption = optList.find(item => stNodeid === $xeCascader.getNodeId(item))
-          optList = currOption ? currOption[childrenField] : []
+          optList = currOption ? currOption[transform ? mapChildrenField : childrenField] : []
           if (!optList || !optList.length) {
             break
           }
@@ -801,7 +843,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const reactData = $xeCascader.reactData
       const internalData = $xeCascader.internalData
 
-      const { treeFullData } = internalData
+      const { afterTreeList } = internalData
       const selectVals = $xeCascader.computeSelectVals
       const childrenField = $xeCascader.computeChildrenField
       const mapChildrenField = $xeCascader.computeMapChildrenField
@@ -811,7 +853,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const expandedMaps: Record<string, boolean> = {}
       if (selectVals.length) {
         const lastVal = enNodeValue(XEUtils.last(selectVals))
-        const stRest = XEUtils.findTree(treeFullData, (item) => lastVal === $xeCascader.getNodeId(item), { children: transform ? mapChildrenField : childrenField })
+        const stRest = XEUtils.findTree(afterTreeList, (item) => lastVal === $xeCascader.getNodeId(item), { children: transform ? mapChildrenField : childrenField })
         if (stRest) {
           const { nodes } = stRest
           nodes.forEach(item => {
@@ -945,7 +987,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
         return { checkNodeKeys: checkKeys, checkNodes }
       })
     },
-    clearCheckboxNode () {
+    clearSelectedNode () {
       const $xeCascader = this
       const reactData = $xeCascader.reactData
       const internalData = $xeCascader.internalData
@@ -953,6 +995,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       internalData.indeterminateRowMaps = {}
       internalData.selectCheckboxMaps = {}
       reactData.updateCheckboxFlag++
+      reactData.selectRadioKey = null
       $xeCascader.updateCheckboxStatus()
       return $xeCascader.$nextTick().then(() => {
         return { checkNodeKeys: [], checkNodes: [] }
@@ -1009,7 +1052,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { $event } = params
       const { multiple, checkedClosable } = props
       const value = multiple ? [] : null
-      $xeCascader.clearCheckboxNode().then(() => {
+      $xeCascader.clearSelectedNode().then(() => {
         if (checkedClosable) {
           $xeCascader.hideOptionPanel($event)
         }
@@ -1114,9 +1157,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { nodeMaps } = internalData
       const radioOpts = $xeCascader.computeRadioOpts
       const childrenField = $xeCascader.computeChildrenField
+      const mapChildrenField = $xeCascader.computeMapChildrenField
+      const treeOpts = $xeCascader.computeTreeOpts
+      const { transform } = treeOpts
       const { checkMode, checkMethod } = radioOpts
       const nodeid = $xeCascader.getNodeId(node)
-      const childList: any[] = node[childrenField]
+      const childList: any[] = node[transform ? mapChildrenField : childrenField]
       const isExistChild = childList && childList.length > 0
       const nodeItem = nodeMaps[nodeid] || {}
       const nLevel = nodeItem.level
@@ -1292,7 +1338,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
         const childRowList: any[][] = []
         XEUtils.eachTree(afterTreeList, (node) => {
           const nodeid = $xeCascader.getNodeId(node)
-          const childList = node[childrenField]
+          const childList = node[transform ? mapChildrenField : childrenField]
           if (childList && childList.length && !childRowMaps[nodeid]) {
             childRowMaps[nodeid] = 1
             childRowList.unshift([node, nodeid, childList])
@@ -1395,7 +1441,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const treeOpts = $xeCascader.computeTreeOpts
       const { transform } = treeOpts
       const nodeid = $xeCascader.getNodeId(node)
-      const childList: any[] = node[childrenField]
+      const childList: any[] = node[transform ? mapChildrenField : childrenField]
       const isExistChild = childList && childList.length > 0
       const nodeItem = nodeMaps[nodeid] || {}
       const nLevel = nodeItem.level
@@ -1668,11 +1714,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { currentNode, selectRadioKey, updateCheckboxFlag, updateExpandedFlag } = reactData
       const { nodeMaps, selectCheckboxMaps, indeterminateRowMaps, treeExpandedMaps, treeExpandLazyLoadedMaps } = internalData
       const treeOpts = $xeCascader.computeTreeOpts
-      const { lazy, iconLoaded, iconOpen, iconClose } = treeOpts
+      const { lazy, transform, iconLoaded, iconOpen, iconClose } = treeOpts
       const childrenField = $xeCascader.computeChildrenField
+      const mapChildrenField = $xeCascader.computeMapChildrenField
       const labelField = $xeCascader.computeLabelField
       const hasChildField = $xeCascader.computeHasChildField
-      const childList: any[] = node[childrenField]
+      const childList: any[] = node[transform ? mapChildrenField : childrenField]
       const isExistChild = childList && childList.length > 0
       const iconSlot = slots.icon
       const titleSlot = slots.title
@@ -1877,7 +1924,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
                         h('div', {
                           class: 'vxe-tree-select--header-button'
                         }, [
-                          showCheckedButton && showClearButton
+                          (showCheckedButton && multiple) || showClearButton
                             ? h('div', {
                               class: 'vxe-tree-select--selected-btns'
                             }, [
@@ -1939,7 +1986,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
                     })
                   ])
                 ]),
-                footerSlot || showTotalButton || (showCloseButton && multiple)
+                footerSlot || showTotalButton || showCloseButton
                   ? h('div', {
                     class: 'vxe-cascader--panel-footer'
                   }, footerSlot
@@ -1953,7 +2000,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
                               class: 'vxe-cascader--total-btns'
                             }, getI18n('vxe.treeSelect.total', [selectVals.length]))
                             : renderEmptyElement($xeCascader),
-                          showCloseButton && multiple
+                          showCloseButton
                             ? h('div', {
                               class: 'vxe-cascader--oper-btns'
                             }, [
@@ -2000,6 +2047,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
     const props = $xeCascader
     const reactData = $xeCascader.reactData
 
+    $xeCascader.internalData = createInternalData()
+
     if (!props.multiple) {
       reactData.selectRadioKey = enNodeValue(props.value)
     }
@@ -2007,11 +2056,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
   },
   mounted () {
     const $xeCascader = this
-    const props = $xeCascader
 
-    if (props.filterable) {
-      errLog('vxe.error.notProp', ['filterable'])
-    }
     globalEvents.on($xeCascader, 'mousewheel', $xeCascader.handleGlobalMousewheelEvent)
     globalEvents.on($xeCascader, 'mousedown', $xeCascader.handleGlobalMousedownEvent)
     globalEvents.on($xeCascader, 'blur', $xeCascader.handleGlobalBlurEvent)

package/packages/checkbox/src/group.ts

@@ -6,6 +6,10 @@ import VxeCheckboxComponent from './checkbox'
 
 import type { VxeCheckboxGroupEmits, CheckboxGroupInternalData, VxeCheckboxPropTypes, ValueOf, CheckboxGroupReactData, VxeComponentSizeType, VxeCheckboxGroupPropTypes, VxeFormConstructor, VxeFormPrivateMethods, VxeFormDefines } from '../../../types'
 
+function createReactData (): CheckboxGroupReactData {
+  return {}
+}
+
 function createInternalData (): CheckboxGroupInternalData {
   return {
     // isLoaded: false
@@ -55,13 +59,13 @@ export default /* define-vxe-component start */ defineVxeComponent({
     }
   },
   data () {
-    const reactData: CheckboxGroupReactData = {
-    }
-    const internalData = createInternalData()
+    const reactData: CheckboxGroupReactData = createReactData()
     return {
+      ...({} as {
+        internalData: CheckboxGroupInternalData
+      }),
       xID: XEUtils.uniqueId(),
-      reactData,
-      internalData
+      reactData
     }
   },
   computed: {
@@ -265,6 +269,11 @@ export default /* define-vxe-component start */ defineVxeComponent({
       $xeCheckboxGroup.loadData(val)
     }
   },
+  created () {
+    const $xeCheckboxGroup = this
+
+    $xeCheckboxGroup.internalData = createInternalData()
+  },
   mounted () {
     const $xeCheckboxGroup = this
     const props = $xeCheckboxGroup
@@ -276,6 +285,14 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
     })
   },
+  beforeDestroy () {
+    const $xeCheckboxGroup = this
+    const reactData = $xeCheckboxGroup.reactData
+    const internalData = $xeCheckboxGroup.internalData
+
+    XEUtils.assign(reactData, createReactData())
+    XEUtils.assign(internalData, createInternalData())
+  },
   render (this: any, h) {
     return this.renderVN(h)
   }

package/packages/context-menu/src/context-menu.ts

@@ -198,11 +198,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
     }
   },
   data () {
-    const internalData = createInternalData()
     const reactData = createReactData()
     return {
+      ...({} as {
+        internalData: ContextMenuInternalData
+      }),
       xID: XEUtils.uniqueId(),
-      internalData,
       reactData
     }
   },
@@ -699,6 +700,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
   created () {
     const $xeContextMenu = this
 
+    $xeContextMenu.internalData = createInternalData()
+
     $xeContextMenu.handleVisible()
     globalEvents.on($xeContextMenu, 'mousewheel', $xeContextMenu.handleGlobalMousewheelEvent)
     globalEvents.on($xeContextMenu, 'keydown', $xeContextMenu.handleGlobalKeydownEvent)

package/packages/date-panel/src/util.ts

@@ -2,6 +2,19 @@ import XEUtils from 'xe-utils'
 
 import type { VxeDatePanelPropTypes } from '../../../types'
 
+export function getChunkDefaultNum (selectKey: string) {
+  const currDate = new Date()
+  switch (selectKey) {
+    case 'y': return currDate.getFullYear()
+    case 'M': return currDate.getMonth() + 1
+    case 'd': return currDate.getDate()
+    case 'H': return currDate.getHours()
+    case 'm': return currDate.getMinutes()
+    case 's': return currDate.getSeconds()
+  }
+  return 0
+}
+
 export function hasTimestampValueType (valueFormat?: string) {
   return valueFormat === 'timestamp'
 }
@@ -25,19 +38,6 @@ export function handleValueFormat (type: string, valueFormat?: string) {
   return 'yyyy-MM-dd'
 }
 
-export function handleInputFormat (type: string, inputFormat?: string) {
-  if (inputFormat) {
-    return inputFormat
-  }
-  if (type === 'time') {
-    return 'HH:mm:ss'
-  }
-  if (type === 'datetime') {
-    return 'yyyy-MM-dd HH:mm:ss'
-  }
-  return 'yyyy-MM-dd'
-}
-
 export function toStringTimeDate (str: string | number | Date | null | undefined) {
   const rest = new Date(2e3, 0, 1)
   if (str) {
@@ -99,9 +99,9 @@ export const parseDateValue = (val: string | number | Date | null | undefined, t
   return null
 }
 
-export const parseDateString = (val: string | number | Date | null | undefined, type: VxeDatePanelPropTypes.Type, options: {
+export function parseDateString (val: string | number | Date | null | undefined, type: VxeDatePanelPropTypes.Type, options: {
   valueFormat: string
-}) => {
+}) {
   const dValue = parseDateValue(val, type, options)
   return dValue ? XEUtils.toDateString(dValue, options.valueFormat) : ''
 }
@@ -252,6 +252,18 @@ export function getRangeDateByCode (code: 'last1' | 'last3' | 'last7' | 'last30'
 /**
  * 判断周的年份是否跨年
  */
-const checkWeekOfsetYear = (W: number | string, M: number | string) => {
+function checkWeekOfsetYear (W: number | string, M: number | string) {
   return `${W}` === '1' && `${M}` === '12'
 }
+
+export function isAllSameChar (str: string, char: string) {
+  if (str.length === 0) {
+    return false
+  }
+  for (let i = 0; i < str.length; i++) {
+    if (str[i] !== char) {
+      return false
+    }
+  }
+  return true
+}