vxe-pc-ui 3.14.38 → 3.14.40

package/packages/cascader/src/util.ts

@@ -0,0 +1,9 @@
+import XEUtils from 'xe-utils'
+
+export function enNodeValue (nodeid: string | number | null) {
+  return XEUtils.eqNull(nodeid) ? '' : encodeURIComponent(`${nodeid}`)
+}
+
+export function deNodeValue (nodeid: string | number | null) {
+  return nodeid ? decodeURIComponent(`${nodeid}`) : nodeid
+}

package/packages/input/src/input.ts

@@ -967,7 +967,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { type, exponential } = props
       const inpMaxLength = $xeInput.computeInpMaxLength
       const digitsValue = $xeInput.computeDigitsValue
-      const restVal = (type === 'float' ? toFloatValueFixed(val, digitsValue) : XEUtils.toValueString(val))
+      const restVal = (type === 'float' ? toFloatValueFixed(val, type, digitsValue, '') : XEUtils.toValueString(val))
       if (exponential && (val === restVal || XEUtils.toValueString(val).toLowerCase() === XEUtils.toNumber(restVal).toExponential())) {
         return val
       }
@@ -1200,7 +1200,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
         $xeInput.changeValue()
       } else if (type === 'float') {
         if (inputValue) {
-          const validValue = toFloatValueFixed(inputValue, digitsValue)
+          const validValue = toFloatValueFixed(inputValue, type, digitsValue, '')
           if (inputValue !== validValue) {
             $xeInput.handleChange(validValue, { type: 'init' })
           }

package/packages/language/ar-EG.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/de-DE.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/en-US.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0}',
       monthLabel: '{0}'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/es-ES.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/fr-FR.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/hu-HU.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/hy-AM.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/id-ID.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/it-IT.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/ja-JP.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/ko-KR.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/ms-MY.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/nb-NO.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/pt-BR.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/ru-RU.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/th-TH.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/ug-CN.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/uk-UA.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/uz-UZ.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '¥'
     },

package/packages/language/vi-VN.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '$'
     },

package/packages/language/zh-CHT.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '¥'
     },

package/packages/language/zh-CN.ts

@@ -351,6 +351,13 @@ export default {
       yearLabel: '{0} 年',
       monthLabel: '{0} 月'
     },
+    cascader: {
+      clearChecked: '清除',
+      allChecked: '全选',
+      total: '已选 {0} 项',
+      close: '关闭',
+      search: '搜索'
+    },
     numberInput: {
       currencySymbol: '¥'
     },

package/packages/number-input/src/number-input.ts

@@ -1,6 +1,6 @@
 import { CreateElement, PropType, VNode } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
-import XEUtils from 'xe-utils'
+import XEUtils, { CommafyOptions } from 'xe-utils'
 import { getConfig, getIcon, getI18n, globalEvents, GLOBAL_EVENT_KEYS, createEvent, globalMixins, renderEmptyElement } from '../../ui'
 import { getFuncText, eqEmptyValue, isEnableConf } from '../../ui/src/utils'
 import { hasClass, getEventTargetNode, hasControlKey } from '../../ui/src/dom'
@@ -34,7 +34,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
     name: String as PropType<VxeNumberInputPropTypes.Name>,
     type: {
       type: String as PropType<VxeNumberInputPropTypes.Type>,
-      default: 'number'
+      default: 'number' as VxeNumberInputPropTypes.Type
     },
     clearable: {
       type: Boolean as PropType<VxeNumberInputPropTypes.Clearable>,
@@ -89,6 +89,11 @@ export default /* define-vxe-component start */ defineVxeComponent({
     },
     controlConfig: Object as PropType<VxeNumberInputPropTypes.ControlConfig>,
 
+    // float
+    roundingMode: {
+      type: String as PropType<VxeNumberInputPropTypes.RoundingMode>,
+      default: () => getConfig().numberInput.roundingMode
+    },
     // float
     digits: {
       type: [String, Number] as PropType<VxeNumberInputPropTypes.Digits>,
@@ -303,12 +308,20 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const props = $xeNumberInput
       const reactData = $xeNumberInput.reactData
 
-      const { type, showCurrency, currencySymbol, autoFill } = props
+      const { type, roundingMode, showCurrency, currencySymbol, autoFill } = props
       const { inputValue } = reactData
       const digitsValue = $xeNumberInput.computeDigitsValue
       if (type === 'amount') {
         const num = XEUtils.toNumber(inputValue)
-        let amountLabel = XEUtils.commafy(num, { digits: digitsValue })
+        const cfyOpts: CommafyOptions = { digits: digitsValue }
+        if (roundingMode === 'floor') {
+          cfyOpts.floor = true
+        } else if (roundingMode === 'ceil') {
+          cfyOpts.ceil = true
+        } else {
+          cfyOpts.round = true
+        }
+        let amountLabel = XEUtils.commafy(num, cfyOpts)
         if (!autoFill) {
           const [iStr, dStr] = amountLabel.split('.')
           if (dStr) {
@@ -404,13 +417,13 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const $xeNumberInput = this
       const props = $xeNumberInput
 
-      const { exponential, autoFill } = props
+      const { type, exponential, roundingMode, autoFill } = props
       const inpMaxLength = $xeNumberInput.computeInpMaxLength
       const digitsValue = $xeNumberInput.computeDigitsValue
       const decimalsType = $xeNumberInput.computeDecimalsType
       let restVal = ''
       if (decimalsType) {
-        restVal = toFloatValueFixed(val, digitsValue)
+        restVal = toFloatValueFixed(val, type, digitsValue, roundingMode)
         if (!autoFill) {
           restVal = handleNumberString(XEUtils.toNumber(restVal))
         }
@@ -533,18 +546,18 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const props = $xeNumberInput
       const reactData = $xeNumberInput.reactData
 
-      const { autoFill } = props
+      const { type, roundingMode, autoFill } = props
       const { inputValue } = reactData
       const digitsValue = $xeNumberInput.computeDigitsValue
       const decimalsType = $xeNumberInput.computeDecimalsType
       if (eqEmptyValue(val)) {
         reactData.inputValue = ''
       } else {
-        let textValue = `${val}`
+        let textValue = '' + val
         if (decimalsType) {
-          textValue = toFloatValueFixed(val, digitsValue)
+          textValue = toFloatValueFixed(val, type, digitsValue, roundingMode)
           if (!autoFill) {
-            textValue = `${XEUtils.toNumber(textValue)}`
+            textValue = '' + XEUtils.toNumber(textValue)
           }
         }
         if (textValue !== inputValue) {
@@ -560,7 +573,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const props = $xeNumberInput
       const reactData = $xeNumberInput.reactData
 
-      const { autoFill } = props
+      const { type, roundingMode, autoFill } = props
       const { inputValue } = reactData
       const digitsValue = $xeNumberInput.computeDigitsValue
       const decimalsType = $xeNumberInput.computeDecimalsType
@@ -569,7 +582,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
           let textValue = ''
           let validValue: number | null = null
           if (inputValue) {
-            textValue = toFloatValueFixed(inputValue, digitsValue)
+            textValue = toFloatValueFixed(inputValue, type, digitsValue, roundingMode)
             validValue = XEUtils.toNumber(textValue)
             if (!autoFill) {
               textValue = `${validValue}`

package/packages/number-input/src/util.ts

@@ -1,12 +1,25 @@
 import XEUtils from 'xe-utils'
 
+import type { VxeNumberInputPropTypes } from '../../../types'
+
 export function handleNumber (val: string | number | null | undefined) {
-  return XEUtils.isString(val) ? val.replace(/,/g, '') : val
+  return XEUtils.isString(val) ? val.replace(/[^0-9e.-]/g, '') : val
 }
 
-export function toFloatValueFixed (inputValue: string | number, digitsValue: number) {
-  if (/^-/.test('' + inputValue)) {
-    return XEUtils.toFixed(XEUtils.ceil(inputValue, digitsValue), digitsValue)
+export function toFloatValueFixed (inputValue: string | number, type: VxeNumberInputPropTypes.Type, digitsValue: number, roundingMode: VxeNumberInputPropTypes.RoundingMode) {
+  if (type !== 'integer' && (!roundingMode || roundingMode === 'default')) {
+    // 默认截取忽略
+    if (/^-/.test('' + inputValue)) {
+      return XEUtils.toFixed(XEUtils.ceil(inputValue, digitsValue), digitsValue)
+    }
+    return XEUtils.toFixed(XEUtils.floor(inputValue, digitsValue), digitsValue)
+  } else {
+    if (roundingMode === 'ceil') {
+      return XEUtils.toFixed(XEUtils.ceil(inputValue, digitsValue), digitsValue)
+    }
+    if (roundingMode === 'floor') {
+      return XEUtils.toFixed(XEUtils.floor(inputValue, digitsValue), digitsValue)
+    }
+    return XEUtils.toFixed(XEUtils.round(inputValue, digitsValue), digitsValue)
   }
-  return XEUtils.toFixed(XEUtils.floor(inputValue, digitsValue), digitsValue)
 }

package/packages/tree/src/tree.ts

@@ -694,7 +694,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       crossTreeDragNodeInfo: crossTreeDragNodeGlobal,
 
       hFlag: 0,
-      rootConf: 0
+      dataFlag: 0
     }
   },
   computed: {
@@ -859,6 +859,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
     getNodeId (node: any) {
       const $xeTree = this
 
+      if (!node) {
+        return ''
+      }
       const valueField = $xeTree.computeValueField
       const nodeKey = XEUtils.get(node, valueField)
       return enNodeValue(nodeKey)
@@ -1104,7 +1107,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const valueField = $xeTree.computeValueField
       const childrenField = $xeTree.computeChildrenField
       const keyMaps: Record<string, VxeTreeDefines.NodeCacheItem> = {}
-      XEUtils.eachTree(treeFullData, (item, index, items, path, parent, nodes) => {
+      XEUtils.eachTree(treeFullData, (item, index, items, path, parenItem, nodes) => {
         let nodeid = $xeTree.getNodeId(item)
         if (!nodeid) {
           nodeid = getNodeUniqueId()
@@ -1116,7 +1119,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
           $index: -1,
           _index: -1,
           items,
-          parent,
+          parent: parenItem,
           nodes,
           level: nodes.length - 1,
           treeIndex: index,
@@ -1136,7 +1139,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const childrenField = $xeTree.computeChildrenField
       const mapChildrenField = $xeTree.computeMapChildrenField
       let vtIndex = 0
-      XEUtils.eachTree(afterTreeList, (item, index, items) => {
+      XEUtils.eachTree(afterTreeList, (item, index, items, path, parenItem, nodes) => {
         const nodeid = $xeTree.getNodeId(item)
         const nodeItem = nodeMaps[nodeid]
         if (nodeItem) {
@@ -1150,9 +1153,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
             $index: -1,
             _index: vtIndex,
             items,
-            parent,
-            nodes: [],
-            level: 0,
+            parent: parenItem,
+            nodes,
+            level: nodes.length - 1,
             treeIndex: index,
             lineCount: 0,
             treeLoaded: false
@@ -2730,7 +2733,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const extraSlot = slots.extra
       const isExpand = updateExpandedFlag && treeExpandedMaps[nodeid]
       const nodeItem = nodeMaps[nodeid] || {}
-      const nodeValue = XEUtils.get(node, titleField)
+      const nodeTitle = XEUtils.get(node, titleField)
       const nLevel = nodeItem.level
 
       let isRadioChecked = false
@@ -2842,7 +2845,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
           }, [
             h('div', {
               class: 'vxe-tree--node-item-title'
-            }, titleSlot ? getSlotVNs(titleSlot(nParams)) : `${nodeValue}`),
+            }, titleSlot ? getSlotVNs(titleSlot(nParams)) : `${nodeTitle}`),
             extraSlot
               ? h('div', {
                 class: 'vxe-tree--node-item-extra'
@@ -3022,10 +3025,26 @@ export default /* define-vxe-component start */ defineVxeComponent({
     }
   },
   watch: {
-    data (val) {
+    data () {
+      const $xeTree = this
+
+      $xeTree.dataFlag++
+    },
+    rootParentValue () {
+      const $xeTree = this
+
+      $xeTree.dataFlag++
+    },
+    rootValues () {
       const $xeTree = this
 
-      $xeTree.loadData(val || [])
+      $xeTree.dataFlag++
+    },
+    dataFlag () {
+      const $xeTree = this
+      const props = $xeTree
+
+      $xeTree.loadData(props.data || [])
     },
     checkNodeKey (nodeKey) {
       const $xeTree = this
@@ -3064,23 +3083,6 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const $xeTree = this
 
       $xeTree.recalculate()
-    },
-
-    rootParentValue () {
-      const $xeTree = this
-
-      $xeTree.rootConf++
-    },
-    rootValues () {
-      const $xeTree = this
-
-      $xeTree.rootConf++
-    },
-    rootConf () {
-      const $xeTree = this
-      const props = $xeTree
-
-      $xeTree.loadData(props.data || [])
     }
   },
   created () {
@@ -3104,6 +3106,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
     if (dragOpts.isCrossTreeDrag) {
       errLog('vxe.error.notProp', ['drag-config.isCrossTreeDrag'])
     }
+    // if (valueField) {
+    //   errLog('vxe.error.delProp', ['value-field', 'value-field'])
+    // }
     const VxeUIContextMenu = VxeUI.getComponent('VxeContextMenu')
     if (menuConfig && !VxeUIContextMenu) {
       errLog('vxe.error.reqComp', ['vxe-context-menu'])