vxe-pc-ui 3.14.5 → 3.14.7

package/packages/language/ru-RU.ts

@@ -556,6 +556,10 @@ export default {
     contextMenu: {
       loadingText: '加载中...'
     },
+    switch: {
+      onText: '打开',
+      offText: '关闭'
+    },
     gantt: {
       tFullFormat: {
         year: '{yyyy}年',

package/packages/language/th-TH.ts

@@ -556,6 +556,10 @@ export default {
     contextMenu: {
       loadingText: '加载中...'
     },
+    switch: {
+      onText: '打开',
+      offText: '关闭'
+    },
     gantt: {
       tFullFormat: {
         year: '{yyyy}年',

package/packages/language/ug-CN.ts

@@ -556,6 +556,10 @@ export default {
     contextMenu: {
       loadingText: '加载中...'
     },
+    switch: {
+      onText: '打开',
+      offText: '关闭'
+    },
     gantt: {
       tFullFormat: {
         year: '{yyyy}年',

package/packages/language/uk-UA.ts

@@ -556,6 +556,10 @@ export default {
     contextMenu: {
       loadingText: '加载中...'
     },
+    switch: {
+      onText: '打开',
+      offText: '关闭'
+    },
     gantt: {
       tFullFormat: {
         year: '{yyyy}年',

package/packages/language/uz-UZ.ts

@@ -556,6 +556,10 @@ export default {
     contextMenu: {
       loadingText: '加载中...'
     },
+    switch: {
+      onText: '打开',
+      offText: '关闭'
+    },
     gantt: {
       tFullFormat: {
         year: '{yyyy}年',

package/packages/language/vi-VN.ts

@@ -556,6 +556,10 @@ export default {
     contextMenu: {
       loadingText: '加载中...'
     },
+    switch: {
+      onText: '打开',
+      offText: '关闭'
+    },
     gantt: {
       tFullFormat: {
         year: '{yyyy}年',

package/packages/language/zh-CHT.ts

@@ -556,6 +556,10 @@ export default {
     contextMenu: {
       loadingText: '加载中...'
     },
+    switch: {
+      onText: '打开',
+      offText: '关闭'
+    },
     gantt: {
       tFullFormat: {
         year: '{yyyy}年',

package/packages/language/zh-CN.ts

@@ -556,6 +556,10 @@ export default {
     contextMenu: {
       loadingText: '加载中...'
     },
+    switch: {
+      onText: '打开',
+      offText: '关闭'
+    },
     gantt: {
       tFullFormat: {
         year: '{yyyy}年',

package/packages/radio/src/button.ts

@@ -2,7 +2,7 @@ import { PropType, CreateElement, VNode } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { getFuncText } from '../../ui/src/utils'
-import { getConfig, createEvent, globalMixins } from '../../ui'
+import { getConfig, createEvent, globalMixins, renderEmptyElement } from '../../ui'
 
 import type { VxeRadioButtonPropTypes, RadioButtonReactData, RadioGroupPrivateComputed, VxeRadioGroupConstructor, ValueOf, VxeRadioButtonEmits, VxeRadioGroupPrivateMethods, VxeFormConstructor, VxeComponentPermissionInfo, VxeComponentSizeType, VxeFormPrivateMethods, VxeFormDefines } from '../../../types'
 
@@ -75,8 +75,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { disabled } = $xeRadioButton
       if (disabled === null) {
         if ($xeRadioGroup) {
-          const isDisabled = $xeRadioGroup.computeIsDisabled
-          return isDisabled
+          const isGroupDisabled = $xeRadioGroup.computeIsDisabled
+          const isGroupReadonly = $xeRadioGroup.computeIsReadonly
+          return isGroupDisabled || isGroupReadonly
         }
       }
       return disabled
@@ -176,14 +177,34 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const $xeRadioButton = this
       const props = $xeRadioButton
       const slots = $xeRadioButton.$scopedSlots
+      const $xeRadioGroup = $xeRadioButton.$xeRadioGroup
 
-      const { label, checkedValue } = props
+      const { label, content, checkedValue } = props
       const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
       const vSize = $xeRadioButton.computeSize
       const isDisabled = $xeRadioButton.computeIsDisabled
       const name = $xeRadioButton.computeName
       const isChecked = $xeRadioButton.computeChecked
+      const defaultSlot = slots.default
 
+      if ($xeRadioGroup) {
+        const isGroupReadonly = $xeRadioGroup.computeIsReadonly
+        if (isGroupReadonly) {
+          if (isChecked) {
+            return h('label', {
+              class: ['vxe-radio vxe-radio--button-view', {
+                [`size--${vSize}`]: vSize,
+                'is--readonly': isGroupReadonly
+              }]
+            }, [
+              h('span', {
+                class: 'vxe-checkbox--label'
+              }, defaultSlot ? defaultSlot({}) : getFuncText(content))
+            ])
+          }
+          return renderEmptyElement($xeRadioButton)
+        }
+      }
       return h('label', {
         key: radioValue,
         class: ['vxe-radio vxe-radio--button', {
@@ -211,7 +232,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
         }),
         h('span', {
           class: 'vxe-radio--label'
-        }, slots.default ? slots.default({}) : getFuncText(props.content))
+        }, defaultSlot ? defaultSlot({}) : getFuncText(content))
       ])
     }
   },

package/packages/radio/src/group.ts

@@ -25,6 +25,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
       type: Boolean as PropType<VxeRadioGroupPropTypes.Disabled>,
       default: null
     },
+    readonly: {
+      type: Boolean as PropType<VxeRadioGroupPropTypes.Readonly>,
+      default: null
+    },
     type: String as PropType<VxeRadioGroupPropTypes.Type>,
     options: Array as PropType<VxeRadioGroupPropTypes.Options>,
     optionProps: Object as PropType<VxeRadioGroupPropTypes.OptionProps>,
@@ -71,6 +75,20 @@ export default /* define-vxe-component start */ defineVxeComponent({
       $xeForm(): (VxeFormConstructor & VxeFormPrivateMethods) | null
       formItemInfo(): VxeFormDefines.ProvideItemInfo | null
     }),
+    computeIsReadonly () {
+      const $xeRadioGroup = this
+      const props = $xeRadioGroup
+      const $xeForm = $xeRadioGroup.$xeForm
+
+      const { readonly } = props
+      if (readonly === null) {
+        if ($xeForm) {
+          return $xeForm.readonly
+        }
+        return false
+      }
+      return readonly
+    },
     computeIsDisabled () {
       const $xeRadioGroup = this
       const props = $xeRadioGroup
@@ -79,7 +97,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { disabled } = props
       if (disabled === null) {
         if ($xeForm) {
-          return $xeForm.readonly || $xeForm.disabled
+          return $xeForm.disabled
         }
         return false
       }

package/packages/radio/src/radio.ts

@@ -2,7 +2,7 @@ import { PropType, CreateElement, VNode } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
 import { getFuncText } from '../../ui/src/utils'
-import { getConfig, createEvent, globalMixins, getIcon } from '../../ui'
+import { getConfig, createEvent, globalMixins, getIcon, renderEmptyElement } from '../../ui'
 
 import type { VxeRadioPropTypes, RadioReactData, VxeRadioEmits, RadioGroupPrivateComputed, VxeRadioGroupConstructor, VxeRadioGroupPrivateMethods, VxeFormConstructor, VxeFormPrivateMethods, VxeComponentPermissionInfo, VxeComponentSizeType, VxeFormDefines, ValueOf } from '../../../types'
 
@@ -76,8 +76,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const { disabled } = $xeRadio
       if (disabled === null) {
         if ($xeRadioGroup) {
-          const isDisabled = $xeRadioGroup.computeIsDisabled
-          return isDisabled
+          const isGroupDisabled = $xeRadioGroup.computeIsDisabled
+          const isGroupReadonly = $xeRadioGroup.computeIsReadonly
+          return isGroupDisabled || isGroupReadonly
         }
       }
       return disabled
@@ -178,15 +179,35 @@ export default /* define-vxe-component start */ defineVxeComponent({
     renderVN (h: CreateElement): VNode {
       const $xeRadio = this
       const props = $xeRadio
+      const $xeRadioGroup = $xeRadio.$xeRadioGroup
 
-      const { label, checkedValue } = props
+      const { label, content, checkedValue } = props
       const radioValue = XEUtils.isUndefined(checkedValue) ? label : checkedValue
       const slots = $xeRadio.$scopedSlots
       const vSize = $xeRadio.computeSize
       const isDisabled = $xeRadio.computeIsDisabled
       const name = $xeRadio.computeName
       const isChecked = $xeRadio.computeChecked
+      const defaultSlot = slots.default
 
+      if ($xeRadioGroup) {
+        const isGroupReadonly = $xeRadioGroup.computeIsReadonly
+        if (isGroupReadonly) {
+          if (isChecked) {
+            return h('label', {
+              class: ['vxe-radio vxe-radio--view', {
+                [`size--${vSize}`]: vSize,
+                'is--readonly': isGroupReadonly
+              }]
+            }, [
+              h('span', {
+                class: 'vxe-checkbox--label'
+              }, defaultSlot ? defaultSlot({}) : getFuncText(content))
+            ])
+          }
+          return renderEmptyElement($xeRadio)
+        }
+      }
       return h('label', {
         key: radioValue,
         class: ['vxe-radio vxe-radio--default', {
@@ -218,7 +239,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
         }),
         h('span', {
           class: 'vxe-radio--label'
-        }, slots.default ? slots.default({}) : getFuncText(props.content))
+        }, defaultSlot ? defaultSlot({}) : getFuncText(content))
       ])
     }
   },

package/packages/switch/src/switch.ts

@@ -1,7 +1,7 @@
 import { PropType, CreateElement, VNode } from 'vue'
 import { defineVxeComponent } from '../../ui/src/comp'
 import XEUtils from 'xe-utils'
-import { getConfig, createEvent, globalMixins, renderEmptyElement } from '../../ui'
+import { getConfig, getI18n, createEvent, globalMixins, renderEmptyElement } from '../../ui'
 import { getFuncText } from '../../ui/src/utils'
 
 import type { VxeSwitchPropTypes, VxeSwitchEmits, VxeFormConstructor, VxeFormPrivateMethods, VxeFormDefines, SwitchReactData, SwitchInternalData, VxeComponentPermissionInfo, VxeComponentSizeType, ValueOf } from '../../../types'
@@ -71,33 +71,33 @@ export default /* define-vxe-component start */ defineVxeComponent({
       $xeForm(): (VxeFormConstructor & VxeFormPrivateMethods) | null
       formItemInfo(): VxeFormDefines.ProvideItemInfo | null
     }),
-    computeIsDisabled () {
+    computeIsReadonly () {
       const $xeSwitch = this
       const props = $xeSwitch
       const $xeForm = $xeSwitch.$xeForm
 
-      const { disabled } = props
-      if (disabled === null) {
+      const { readonly } = props
+      if (readonly === null) {
         if ($xeForm) {
-          return $xeForm.readonly || $xeForm.disabled
+          return $xeForm.readonly
         }
         return false
       }
-      return disabled
+      return readonly
     },
-    computeIsReadonly () {
+    computeIsDisabled () {
       const $xeSwitch = this
       const props = $xeSwitch
       const $xeForm = $xeSwitch.$xeForm
 
-      const { readonly } = props
-      if (readonly === null) {
+      const { disabled } = props
+      if (disabled === null) {
         if ($xeForm) {
-          return $xeForm.readonly || $xeForm.disabled
+          return $xeForm.disabled
         }
         return false
       }
-      return readonly
+      return disabled
     },
     computeOnShowLabel () {
       const $xeSwitch = this
@@ -219,6 +219,14 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const isDisabled = $xeSwitch.computeIsDisabled
       const isReadonly = $xeSwitch.computeIsReadonly
 
+      if (isReadonly) {
+        return h('div', {
+          class: ['vxe-switch', isChecked ? 'is--on' : 'is--off', {
+            [`size--${vSize}`]: vSize,
+            'is--readonly': isReadonly
+          }]
+        }, isChecked ? (onShowLabel || getI18n('vxe.switch.onText')) : offShowLabel || getI18n('vxe.switch.offText'))
+      }
       return h('div', {
         class: ['vxe-switch', isChecked ? 'is--on' : 'is--off', {
           [`size--${vSize}`]: vSize,

package/packages/tree/src/tree.ts

@@ -649,6 +649,14 @@ export default /* define-vxe-component start */ defineVxeComponent({
       type: String as PropType<VxeTreePropTypes.IconLoaded>,
       default: () => getConfig().tree.iconLoaded
     },
+    rootParentValue: {
+      type: [String, Number] as PropType<VxeTreePropTypes.RootParentValue>,
+      default: () => getConfig().tree.rootParentValue
+    },
+    rootValues: {
+      type: Array as PropType<VxeTreePropTypes.RootValues>,
+      default: () => getConfig().tree.rootValues
+    },
     filterValue: [String, Number] as PropType<VxeTreePropTypes.FilterValue>,
     filterConfig: Object as PropType<VxeTreePropTypes.FilterConfig>,
     size: {
@@ -671,7 +679,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
       xID,
       reactData,
       internalData,
-      crossTreeDragNodeInfo: crossTreeDragNodeGlobal
+      crossTreeDragNodeInfo: crossTreeDragNodeGlobal,
+
+      hFlag: 0,
+      rootConf: 0
     }
   },
   computed: {
@@ -1286,12 +1297,20 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const props = $xeTree
       const internalData = $xeTree.internalData
 
-      const { expandAll, expandNodeKeys, transform } = props
+      const { expandAll, expandNodeKeys, transform, rootParentValue, rootValues } = props
       const { initialized, scrollYStore } = internalData
       const keyField = $xeTree.computeKeyField
       const parentField = $xeTree.computeParentField
       const childrenField = $xeTree.computeChildrenField
-      const fullData = transform ? XEUtils.toArrayTree(list, { key: keyField, parentKey: parentField, mapChildren: childrenField }) : list ? list.slice(0) : []
+      const fullData = transform
+        ? XEUtils.toArrayTree(list, {
+          key: keyField,
+          parentKey: parentField,
+          mapChildren: childrenField,
+          rootParentValue,
+          rootValues
+        })
+        : list ? list.slice(0) : []
       internalData.treeFullData = fullData
       Object.assign(scrollYStore, {
         startIndex: 0,
@@ -3001,20 +3020,43 @@ export default /* define-vxe-component start */ defineVxeComponent({
 
       $xeTree.triggerSearchEvent(new Event('filter'))
     },
+
     height () {
       const $xeTree = this
 
-      $xeTree.recalculate()
+      $xeTree.hFlag++
     },
     minHeight () {
       const $xeTree = this
 
-      $xeTree.recalculate()
+      $xeTree.hFlag++
     },
     maxHeight () {
       const $xeTree = this
 
+      $xeTree.hFlag++
+    },
+    hFlag () {
+      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 () {

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

@@ -1029,6 +1029,8 @@ export default /* define-vxe-component start */ defineVxeComponent({
                         loadMethod: treeOpts.loadMethod,
                         toggleMethod: treeOpts.toggleMethod,
                         transform: treeOpts.transform,
+                        rootParentValue: treeOpts.rootParentValue,
+                        rootValues: treeOpts.rootValues,
                         trigger: treeOpts.trigger,
                         showIcon: treeOpts.showIcon,
                         showLine: treeOpts.showLine,

package/styles/helpers/baseMixin.scss

@@ -3,6 +3,9 @@
 }
 
 @mixin createCheckboxIcon {
+  & {
+    cursor: pointer;
+  }
   .vxe-checkbox--icon {
     font-size: 1.22em;
   }
@@ -20,7 +23,6 @@
     }
   }
   &:not(.is--disabled) {
-    cursor: pointer;
     &:hover {
       .vxe-checkbox--icon {
         color: var(--vxe-ui-font-primary-color);
@@ -30,6 +32,9 @@
   &.is--hidden {
     cursor: default;
   }
+  &.is--readonly {
+    cursor: auto;
+  }
   &.is--disabled {
     color: var(--vxe-ui-font-disabled-color);
     cursor: not-allowed;
@@ -44,7 +49,9 @@
 }
 
 @mixin createRadioIcon {
-  cursor: pointer;
+  & {
+    cursor: pointer;
+  }
   .vxe-radio--icon {
     font-size: 1.26em;
   }
@@ -62,13 +69,15 @@
     }
   }
   &:not(.is--disabled) {
-    cursor: pointer;
     &:hover {
       .vxe-radio--icon {
         color: var(--vxe-ui-font-primary-color);
       }
     }
   }
+  &.is--readonly {
+    cursor: auto;
+  }
   &.is--disabled {
     color: var(--vxe-ui-font-disabled-color);
     cursor: not-allowed;

package/types/components/checkbox-group.d.ts

@@ -32,6 +32,7 @@ export namespace VxeCheckboxGroupPropTypes {
   }
   export type Max = string | number
   export type Disabled = boolean
+  export type Readonly = boolean
   export interface DefaultConfig {
     /**
      * 默认选择模式，默认选中行为只会在初始化时触发一次
@@ -53,12 +54,14 @@ export interface VxeCheckboxGroupProps {
    * 是否禁用
    */
   disabled?: VxeCheckboxGroupPropTypes.Disabled
+  readonly?: VxeCheckboxGroupPropTypes.Readonly
   defaultConfig?: VxeCheckboxGroupPropTypes.DefaultConfig
 }
 
 export interface CheckboxGroupPrivateComputed {
   computeIsMaximize: boolean
   computeIsDisabled: boolean | undefined
+  computeIsReadonly: boolean | undefined
 }
 export interface VxeCheckboxGroupPrivateComputed extends CheckboxGroupPrivateComputed { }
 

package/types/components/radio-group.d.ts

@@ -34,6 +34,7 @@ export namespace VxeRadioGroupPropTypes {
   export type ModelValue = any
   export type Strict = boolean
   export type Disabled = boolean
+  export type Readonly = boolean
   export interface DefaultConfig {
     /**
      * 默认选择模式，默认选中行为只会在初始化时触发一次
@@ -53,11 +54,13 @@ export interface VxeRadioGroupProps {
   strict?: VxeRadioGroupPropTypes.Strict
   value?: VxeRadioGroupPropTypes.ModelValue
   disabled?: VxeRadioGroupPropTypes.Disabled
+  readonly?: VxeRadioGroupPropTypes.Readonly
   defaultConfig?: VxeRadioGroupPropTypes.DefaultConfig
 }
 
 export interface RadioGroupPrivateComputed {
   computeIsDisabled: boolean | undefined
+  computeIsReadonly: boolean | undefined
 }
 export interface VxeRadioGroupPrivateComputed extends RadioGroupPrivateComputed { }
 

package/types/components/tree.d.ts

@@ -43,6 +43,8 @@ export namespace VxeTreePropTypes {
   export type HasChildField = string
   export type MapChildrenField = string
   export type Transform = boolean
+  export type RootParentValue = string | number | null
+  export type RootValues = (string | number)[]
   export type Trigger = '' | 'default' | 'node'
   /**
    * 已废弃，请使用 nodeConfig.isCurrent
@@ -287,6 +289,14 @@ export interface VxeTreeProps<D = any> {
    */
   expandNodeKeys?: VxeTreePropTypes.ExpandNodeKeys
   transform?: VxeTreePropTypes.Transform
+  /**
+   * 用于 transform 模式，指定根节点的父级节点值
+   */
+  rootParentValue?: VxeTreePropTypes.RootParentValue
+  /**
+   * 用于 transform 模式，指定根节点的值
+   */
+  rootValues?: VxeTreePropTypes.RootValues
   trigger?: VxeTreePropTypes.Trigger
   /**
    * 已废弃，请使用 nodeConfig.isCurrent