vxe-pc-ui 3.14.40 → 3.15.1

package/packages/form/render/index.ts

@@ -344,15 +344,15 @@ function oldFormItemRadioAndCheckboxRender (h: CreateElement, renderOpts: VxeGlo
  */
 renderer.mixin({
   input: {
-    formItemAutoFocus: 'input',
+    formItemAutoFocus: true,
     renderFormItemContent: nativeItemRender
   },
   textarea: {
-    formItemAutoFocus: 'textarea',
+    formItemAutoFocus: true,
     renderFormItemContent: nativeItemRender
   },
   select: {
-    formItemAutoFocus: 'input',
+    formItemAutoFocus: true,
     renderFormItemContent (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderFormItemContentOptions, params: VxeGlobalRendererHandles.RenderFormItemContentParams) {
       return [
         h('select', {
@@ -367,27 +367,27 @@ renderer.mixin({
     }
   },
   VxeInput: {
-    formItemAutoFocus: 'input',
+    formItemAutoFocus: true,
     renderFormItemContent: defaultItemRender
   },
   VxeNumberInput: {
-    formItemAutoFocus: 'input',
+    formItemAutoFocus: true,
     renderFormItemContent: defaultItemRender
   },
   VxePasswordInput: {
-    formItemAutoFocus: 'input',
+    formItemAutoFocus: true,
     renderFormItemContent: defaultItemRender
   },
   VxeTextarea: {
-    formItemAutoFocus: 'textarea',
+    formItemAutoFocus: true,
     renderFormItemContent: defaultItemRender
   },
   VxeDatePicker: {
-    formItemAutoFocus: 'input',
+    formItemAutoFocus: true,
     renderFormItemContent: defaultItemRender
   },
   VxeDateRangePicker: {
-    formItemAutoFocus: 'input',
+    formItemAutoFocus: true,
     renderFormItemContent (h, renderOpts, params) {
       const { startField, endField } = renderOpts
       const { $form, data, field } = params
@@ -449,7 +449,7 @@ renderer.mixin({
     }
   },
   VxeSelect: {
-    formItemAutoFocus: 'input',
+    formItemAutoFocus: true,
     renderFormItemContent (h: CreateElement, renderOpts, params) {
       const { data, field } = params
       const { options, optionProps, optionGroups, optionGroupProps } = renderOpts
@@ -463,7 +463,21 @@ renderer.mixin({
     }
   },
   VxeTreeSelect: {
-    formItemAutoFocus: 'input',
+    formItemAutoFocus: true,
+    renderFormItemContent (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderFormItemContentOptions, params: VxeGlobalRendererHandles.RenderFormItemContentParams) {
+      const { data, field } = params
+      const { options, optionProps } = renderOpts
+      const itemValue = XEUtils.get(data, field)
+      return [
+        h(getDefaultComponent(renderOpts), {
+          props: getComponentFormItemProps(renderOpts, params, itemValue, { options, optionProps }),
+          on: getItemOns(renderOpts, params)
+        })
+      ]
+    }
+  },
+  VxeCascader: {
+    formItemAutoFocus: true,
     renderFormItemContent (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderFormItemContentOptions, params: VxeGlobalRendererHandles.RenderFormItemContentParams) {
       const { data, field } = params
       const { options, optionProps } = renderOpts
@@ -477,7 +491,7 @@ renderer.mixin({
     }
   },
   VxeTableSelect: {
-    formItemAutoFocus: 'input',
+    formItemAutoFocus: true,
     renderFormItemContent (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderFormItemContentOptions, params: VxeGlobalRendererHandles.RenderFormItemContentParams) {
       const { data, field } = params
       const { options, optionProps } = renderOpts
@@ -491,7 +505,7 @@ renderer.mixin({
     }
   },
   VxeColorPicker: {
-    formItemAutoFocus: 'input',
+    formItemAutoFocus: true,
     renderFormItemContent (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderFormItemContentOptions, params: VxeGlobalRendererHandles.RenderFormItemContentParams) {
       const { data, field } = params
       const { options } = renderOpts
@@ -505,7 +519,7 @@ renderer.mixin({
     }
   },
   VxeIconPicker: {
-    formItemAutoFocus: 'input',
+    formItemAutoFocus: true,
     renderFormItemContent (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderFormItemContentOptions, params: VxeGlobalRendererHandles.RenderFormItemContentParams) {
       const { data, field } = params
       const { options } = renderOpts

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

@@ -105,6 +105,14 @@ export default /* define-vxe-component start */ defineVxeComponent({
     },
     remote: Boolean as PropType<VxeTreeSelectPropTypes.Remote>,
     remoteConfig: Function as PropType<VxeTreeSelectPropTypes.RemoteConfig>,
+    showRadio: {
+      type: Boolean as PropType<VxeTreeSelectPropTypes.ShowRadio>,
+      default: () => getConfig().treeSelect.showRadio
+    },
+    showCheckbox: {
+      type: Boolean as PropType<VxeTreeSelectPropTypes.ShowCheckbox>,
+      default: () => getConfig().treeSelect.showCheckbox
+    },
     popupConfig: Object as PropType<VxeTreeSelectPropTypes.PopupConfig>,
     treeConfig: Object as PropType<VxeTreeSelectPropTypes.TreeConfig>,
     menuConfig: Object as PropType<VxeTreeSelectPropTypes.MenuConfig>,
@@ -277,20 +285,24 @@ export default /* define-vxe-component start */ defineVxeComponent({
     },
     computeTreeCheckboxOpts () {
       const $xeTreeSelect = this
+      const props = $xeTreeSelect
 
+      const { showCheckbox } = props
       const treeOpts = $xeTreeSelect.computeTreeOpts as VxeTreeSelectPropTypes.TreeConfig
       return Object.assign({
-        showIcon: !!treeOpts.showCheckbox
+        showIcon: XEUtils.isBoolean(showCheckbox) ? showCheckbox : !!treeOpts.showCheckbox
       }, treeOpts.checkboxConfig, {
         trigger: 'node'
       })
     },
     computeTreeRadioOpts () {
       const $xeTreeSelect = this
+      const props = $xeTreeSelect
 
+      const { showRadio } = props
       const treeOpts = $xeTreeSelect.computeTreeOpts as VxeTreeSelectPropTypes.TreeConfig
       return Object.assign({
-        showIcon: !!treeOpts.showRadio
+        showIcon: XEUtils.isBoolean(showRadio) ? showRadio : !!treeOpts.showRadio
       }, treeOpts.radioConfig, {
         trigger: 'node'
       })

package/styles/components/form.scss

@@ -289,7 +289,8 @@
     .vxe-select,
     .vxe-tree-select,
     .vxe-table-select,
-    .vxe-ico-picker {
+    .vxe-ico-picker,
+    .vxe-cascader {
       width: 100%;
     }
   }
@@ -324,7 +325,8 @@
     .vxe-default-input,
     .vxe-default-textarea,
     .vxe-default-select,
-    .vxe-ico-picker {
+    .vxe-ico-picker,
+    .vxe-cascader {
       border-color: var(--vxe-ui-form-validate-error-color);
     }
     .vxe-input,

package/types/components/cascader.d.ts

@@ -1,4 +1,5 @@
 import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentEventParams, VxeComponentSizeType, ValueOf } from '@vxe-ui/core'
+import { VxeListPropTypes } from './list'
 
 /* eslint-disable @typescript-eslint/no-empty-interface,no-use-before-define,@typescript-eslint/ban-types */
 
@@ -79,6 +80,7 @@ export namespace VxeCascaderPropTypes {
     disabled?: string
   }
   export type Remote = boolean
+  export type ShowRadio = boolean
   export interface RadioConfig<D = any> {
     strict?: boolean
     visibleMode?: 'all' | 'first' | 'last' | '' | null
@@ -91,9 +93,9 @@ export namespace VxeCascaderPropTypes {
       $cascader: VxeCascaderConstructor
       node: D
     }) => boolean
-    showIcon?: boolean
     trigger?: '' | 'default' | 'node'
   }
+  export type ShowCheckbox = boolean
   export interface CheckboxConfig<D = any> {
     checkStrictly?: boolean
     visibleMode?: 'all' | 'first' | 'last' | '' | null
@@ -106,7 +108,6 @@ export namespace VxeCascaderPropTypes {
       $cascader: VxeCascaderConstructor
       node: D
     }) => boolean
-    showIcon?: boolean
     trigger?: '' | 'default' | 'node'
   }
   export interface RemoteConfig {
@@ -196,7 +197,9 @@ export interface VxeCascaderProps<D = any> {
   options?: VxeCascaderPropTypes.Options<D>
   optionProps?: VxeCascaderPropTypes.OptionProps
   remote?: VxeCascaderPropTypes.Remote
+  showRadio?: VxeCascaderPropTypes.ShowRadio
   radioConfig?: VxeCascaderPropTypes.RadioConfig
+  showCheckbox?: VxeCascaderPropTypes.ShowCheckbox
   checkboxConfig?: VxeCascaderPropTypes.CheckboxConfig
   remoteConfig?: VxeCascaderPropTypes.RemoteConfig
   popupConfig?: VxeCascaderPropTypes.PopupConfig
@@ -231,6 +234,7 @@ export interface CascaderReactData {
 
 export interface CascaderInternalData {
   hpTimeout?: undefined | number
+  listVirtualYOpts: VxeListPropTypes.VirtualYConfig
   afterTreeList: any[]
   treeFullData: any[]
   afterVisibleList: any[]

package/types/components/tree-select.d.ts

@@ -102,6 +102,10 @@ export namespace VxeTreeSelectPropTypes {
       value: ModelValue | undefined
     }): Promise<void> | void
   }
+
+  export type ShowRadio = boolean
+  export type ShowCheckbox = boolean
+
   export type Transfer = boolean
   export interface PopupConfig {
     /**
@@ -122,7 +126,20 @@ export namespace VxeTreeSelectPropTypes {
     zIndex?: number | string
     className?: string | ((params: { $treeSelect: VxeTreeSelectConstructor }) => string)
   }
-  export interface TreeConfig<D = any> extends Omit<VxeTreeProps<D>, 'data' | 'size' | 'menuConfig'> {
+  export interface TreeConfig<D = any> extends Omit<VxeTreeProps<D>, 'data' | 'size' | 'menuConfig' | 'showRadio' | 'showCheckbox'> {
+    /**
+     * 已废弃，请使用 showRadio
+     * @deprecated
+     */
+    showRadio?: boolean
+    /**
+     * 已废弃，请使用 showCheckbox
+     * @deprecated
+     */
+    showCheckbox?: boolean
+    /**
+     * 自定义插槽模板
+     */
     slots?: {
       icon?: string | ((params: VxeTreeSlotTypes.IconSlotParams) => VxeComponentSlotType | VxeComponentSlotType[])
       title?: string | ((params: VxeTreeSlotTypes.TitleSlotParams) =>VxeComponentSlotType | VxeComponentSlotType[])
@@ -180,6 +197,8 @@ export interface VxeTreeSelectProps<D = any> {
   optionProps?: VxeTreeSelectPropTypes.OptionProps
   remote?: VxeTreeSelectPropTypes.Remote
   remoteConfig?: VxeTreeSelectPropTypes.RemoteConfig
+  showRadio?: VxeTreeSelectPropTypes.ShowRadio
+  showCheckbox?: VxeTreeSelectPropTypes.ShowCheckbox
   transfer?: VxeTreeSelectPropTypes.Transfer
   popupConfig?: VxeTreeSelectPropTypes.PopupConfig
   treeConfig?: VxeTreeSelectPropTypes.TreeConfig<D>