vxe-pc-ui 3.15.2 → 3.15.3

package/packages/cascader/src/cascader.ts

@@ -4,7 +4,7 @@ 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 { createComponentLog } from '../../ui/src/log'
 import XEUtils from 'xe-utils'
 import VxeListComponent from '../../list/src/list'
 import VxeInputComponent from '../../input/src/input'
@@ -13,6 +13,8 @@ import VxeButtonComponent from '../../button/src/button'
 import type { CascaderReactData, VxeCascaderEmits, CascaderInternalData, VxeComponentSizeType, VxeButtonDefines, VxeCascaderDefines, VxeListSlotTypes, ValueOf, VxeInputConstructor, VxeComponentStyleType, VxeCascaderPropTypes, VxeFormDefines, VxeDrawerConstructor, VxeDrawerMethods, VxeFormConstructor, VxeFormPrivateMethods, VxeModalConstructor, VxeModalMethods } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'
 
+const { errLog } = createComponentLog('cascader')
+
 /**
  * 生成节点的唯一主键
  */
@@ -187,11 +189,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: {
@@ -2000,6 +2003,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)
     }

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
+}