vxe-pc-ui 4.7.17 → 4.7.19

package/packages/pulldown/src/pulldown.ts

@@ -171,7 +171,7 @@ export default defineVxeComponent({
     /**
      * 隐藏下拉面板
      */
-    const hidePanel = () => {
+    const hideOptionPanel = () => {
       reactData.visiblePanel = false
       dispatchEvent('visible-change', { visible: false }, null)
       emit('update:modelValue', false)
@@ -196,7 +196,7 @@ export default defineVxeComponent({
      */
     const togglePanel = () => {
       if (reactData.visiblePanel) {
-        return hidePanel()
+        return hideOptionPanel()
       }
       return showPanel()
     }
@@ -204,7 +204,7 @@ export default defineVxeComponent({
     const handleOptionEvent = (evnt: Event, option: VxePulldownPropTypes.Option) => {
       if (!option.disabled) {
         if (reactData.visiblePanel) {
-          hidePanel()
+          hideOptionPanel()
           dispatchEvent('hide-panel', {}, evnt)
         }
         dispatchEvent('option-click', { option }, evnt)
@@ -215,7 +215,7 @@ export default defineVxeComponent({
       const { trigger } = props
       if (trigger === 'click') {
         if (reactData.visiblePanel) {
-          hidePanel()
+          hideOptionPanel()
           dispatchEvent('hide-panel', {}, evnt)
         } else {
           showPanel()
@@ -234,7 +234,7 @@ export default defineVxeComponent({
           if (getEventTargetNode(evnt, panelElem).flag) {
             updatePlacement()
           } else {
-            hidePanel()
+            hideOptionPanel()
             dispatchEvent('hide-panel', {}, evnt)
           }
         }
@@ -249,18 +249,21 @@ export default defineVxeComponent({
       if (!disabled) {
         reactData.isActivated = getEventTargetNode(evnt, el).flag || getEventTargetNode(evnt, panelElem).flag
         if (visiblePanel && !reactData.isActivated) {
-          hidePanel()
+          hideOptionPanel()
           dispatchEvent('hide-panel', {}, evnt)
         }
       }
     }
 
     const handleGlobalBlurEvent = (evnt: Event) => {
-      if (reactData.visiblePanel) {
-        reactData.isActivated = false
-        hidePanel()
+      const { visiblePanel, isActivated } = reactData
+      if (visiblePanel) {
+        hideOptionPanel()
         dispatchEvent('hide-panel', {}, evnt)
       }
+      if (isActivated) {
+        reactData.isActivated = false
+      }
     }
 
     const handleGlobalResizeEvent = () => {
@@ -279,7 +282,7 @@ export default defineVxeComponent({
       isPanelVisible,
       togglePanel,
       showPanel,
-      hidePanel
+      hidePanel: hideOptionPanel
     }
 
     Object.assign($xePulldown, pulldownMethods)
@@ -289,7 +292,7 @@ export default defineVxeComponent({
       if (value) {
         showPanel()
       } else {
-        hidePanel()
+        hideOptionPanel()
       }
     })
 

package/packages/select/src/select.ts

@@ -414,7 +414,7 @@ export default defineVxeComponent({
       if (filterable && filterMethod) {
         avList = fullData.filter(option => isOptionVisible(option) && filterMethod({ $select: $xeSelect, group: null, option, searchValue, value: modelValue }))
       } else if (filterable) {
-        avList = fullData.filter(option => isOptionVisible(option) && (!searchStr || `${option[labelField]}`.toLowerCase().indexOf(searchStr) > -1))
+        avList = fullData.filter(option => isOptionVisible(option) && (!searchStr || `${option[labelField] || option[valueField]}`.toLowerCase().indexOf(searchStr) > -1))
       } else {
         avList = fullData.filter(isOptionVisible)
       }
@@ -749,7 +749,19 @@ export default defineVxeComponent({
     }
 
     const handleGlobalBlurEvent = () => {
-      hideOptionPanel()
+      const { visiblePanel, isActivated } = reactData
+      if (visiblePanel) {
+        hideOptionPanel()
+      }
+      if (isActivated) {
+        reactData.isActivated = false
+      }
+      if (visiblePanel || isActivated) {
+        const $input = refInput.value
+        if ($input) {
+          $input.blur()
+        }
+      }
     }
 
     const handleGlobalResizeEvent = () => {
@@ -1200,7 +1212,7 @@ export default defineVxeComponent({
         } else if (defaultSlot) {
           optVNs = callSlot(defaultSlot, optParams)
         } else {
-          optLabel = getFuncText(option[(isOptGroup ? groupLabelField : labelField) as 'label'])
+          optLabel = getFuncText(option[(isOptGroup ? groupLabelField : labelField) as 'label'] || optionValue)
           optVNs = optLabel
         }
 

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

@@ -452,7 +452,19 @@ export default defineVxeComponent({
     }
 
     const handleGlobalBlurEvent = () => {
-      hideOptionPanel()
+      const { visiblePanel, isActivated } = reactData
+      if (visiblePanel) {
+        hideOptionPanel()
+      }
+      if (isActivated) {
+        reactData.isActivated = false
+      }
+      if (visiblePanel || isActivated) {
+        const $input = refInput.value
+        if ($input) {
+          $input.blur()
+        }
+      }
     }
 
     const handleGlobalResizeEvent = () => {

package/packages/tree/src/tree.ts

@@ -759,11 +759,15 @@ export default defineVxeComponent({
 
     /**
      * 如果有滚动条，则滚动到对应的位置
-     * @param {Number} scrollLeft 左距离
-     * @param {Number} scrollTop 上距离
      */
-    const scrollTo = (scrollLeft: number | null, scrollTop?: number | null) => {
+    const scrollTo = (scrollLeft: { top?: number | null; left?: number | null; } | number | null | undefined, scrollTop?: number | null) => {
       const scrollBodyElem = refVirtualWrapper.value
+      if (scrollLeft) {
+        if (!XEUtils.isNumber(scrollLeft)) {
+          scrollTop = scrollLeft.top
+          scrollLeft = scrollLeft.left
+        }
+      }
       if (scrollBodyElem) {
         if (XEUtils.isNumber(scrollLeft)) {
           scrollBodyElem.scrollLeft = scrollLeft

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

@@ -509,7 +509,19 @@ export default defineVxeComponent({
     }
 
     const handleGlobalBlurEvent = () => {
-      hideOptionPanel()
+      const { visiblePanel, isActivated } = reactData
+      if (visiblePanel) {
+        hideOptionPanel()
+      }
+      if (isActivated) {
+        reactData.isActivated = false
+      }
+      if (visiblePanel || isActivated) {
+        const $input = refInput.value
+        if ($input) {
+          $input.blur()
+        }
+      }
     }
 
     const handleGlobalResizeEvent = () => {

package/styles/components/date-panel.scss

@@ -173,6 +173,7 @@
 .vxe-date-panel--view-body {
   .vxe-date-panel--view-item {
     cursor: pointer;
+    &.is--range-disabled,
     &.is--disabled {
       cursor: no-drop;
     }
@@ -263,6 +264,17 @@
   }
 }
 
+// .vxe-date-range-picker--panel {
+//   .vxe-date-panel--view-item {
+//     &.is--range-disabled {
+//       .vxe-date-panel--view-item-inner {
+//         color: var(--vxe-ui-input-disabled-color);
+//         background-color: inherit;
+//       }
+//     }
+//   }
+// }
+
 .vxe-date-panel--view-wrapper {
   &.type--week {
     .vxe-date-panel--view-item {

package/styles/components/form.scss

@@ -54,20 +54,22 @@
       white-space: nowrap;
     }
   }
+  .vxe-form--item-title-tip-prefix,
+  .vxe-form--item-title-tip-suffix,
+  .vxe-form--item-title-postfix,
   .vxe-form--item-title-prefix,
-  .vxe-form--item-title-suffix,
-  .vxe-form--item-title-postfix {
+  .vxe-form--item-title-suffix {
     flex-shrink: 0;
   }
-  .vxe-form--item-title-prefix,
-  .vxe-form--item-title-suffix {
+  .vxe-form--item-title-tip-prefix,
+  .vxe-form--item-title-tip-suffix {
     cursor: help;
     vertical-align: middle;
   }
-  .vxe-form--item-title-prefix {
+  .vxe-form--item-title-tip-prefix {
     margin-right: 0.25em;
   }
-  .vxe-form--item-title-suffix {
+  .vxe-form--item-title-tip-suffix {
     margin-left: 0.2em;
   }
   .vxe-form--item-title-postfix {
@@ -80,12 +82,11 @@
   .vxe-form--item-title-label {
     vertical-align: middle;
   }
-  .vxe-form--item-title-extra {
-    display: flex;
+  .vxe-form--item-title-prefix,
+  .vxe-form--item-title-suffix {
+    display: inline-flex;
     flex-direction: row;
-    align-items: center;
-    justify-content: right;
-    flex-grow: 1;
+    vertical-align: middle;
   }
 }
 

package/types/components/form-design.d.ts

@@ -264,11 +264,22 @@ export namespace VxeFormDesignEvents {
 export namespace VxeFormDesignSlotTypes {
   export interface DefaultSlotParams {}
   export interface HeaderSlotParams {}
+  export interface TitleSlotParams {}
   export interface ExtraSlotParams {}
 }
 export interface VxeFormDesignSlots {
   default: (params: VxeFormDesignSlotTypes.DefaultSlotParams) => any
   header: (params: VxeFormDesignSlotTypes.HeaderSlotParams) => any
+  title: (params: VxeFormDesignSlotTypes.TitleSlotParams) => any
+  titlePrefix: (params: VxeFormDesignSlotTypes.DefaultSlotParams) => any
+  'title-prefix': (params: VxeFormDesignSlotTypes.DefaultSlotParams) => any
+  titleSuffix: (params: VxeFormDesignSlotTypes.DefaultSlotParams) => any
+  'title-suffix': (params: VxeFormDesignSlotTypes.DefaultSlotParams) => any
+
+  /**
+   * 已废弃，请使用 suffix
+   * @deprecated
+   */
   extra: (params: VxeFormDesignSlotTypes.ExtraSlotParams) => any
 }
 

package/types/components/form-item.d.ts

@@ -146,7 +146,13 @@ export namespace VxeFormItemPropTypes {
     title?: string | ((params: VxeFormItemSlotTypes.TitleSlotParams) => VxeComponentSlotType | VxeComponentSlotType[]) | null
     default?: string | ((params: VxeFormItemSlotTypes.DefaultSlotParams) => VxeComponentSlotType | VxeComponentSlotType[]) | null
     valid?: string | ((params: VxeFormItemSlotTypes.ValidSlotParams) => VxeComponentSlotType | VxeComponentSlotType[]) | null
-    extra?: string | ((params: VxeFormItemSlotTypes.ExtraSlotParams) => VxeComponentSlotType | VxeComponentSlotType[]) | null
+    prefix?: string | ((params: VxeFormItemSlotTypes.PrefixSlotParams) => VxeComponentSlotType | VxeComponentSlotType[]) | null
+    suffix?: string | ((params: VxeFormItemSlotTypes.SuffixSlotParams) => VxeComponentSlotType | VxeComponentSlotType[]) | null
+    /**
+     * 已废弃，请使用 suffix
+     * @deprecated
+     */
+    extra?: string | ((params: VxeFormItemSlotTypes.SuffixSlotParams) => VxeComponentSlotType | VxeComponentSlotType[]) | null
   }
 
   /**
@@ -373,7 +379,8 @@ export namespace VxeFormItemSlotTypes {
     rule: VxeFormDefines.FormRule<D>
   }
   export interface TitleSlotParams<D = any> extends DefaultSlotParams<D> {}
-  export interface ExtraSlotParams<D = any> extends DefaultSlotParams<D> {}
+  export interface PrefixSlotParams<D = any> extends DefaultSlotParams<D> {}
+  export interface SuffixSlotParams<D = any> extends DefaultSlotParams<D> {}
 }
 
 export interface VxeFormItemSlots {
@@ -386,7 +393,14 @@ export interface VxeFormItemSlots {
    */
   title: (params: VxeFormItemSlotTypes.TitleSlotParams) => any
   valid: (params: VxeFormItemSlotTypes.ValidSlotParams) => any
-  extra: (params: VxeFormItemSlotTypes.ExtraSlotParams) => any
+  prefix: (params: VxeFormItemSlotTypes.PrefixSlotParams) => any
+  suffix: (params: VxeFormItemSlotTypes.SuffixSlotParams) => any
+
+  /**
+   * 已废弃，请使用 suffix
+   * @deprecated
+   */
+  extra: (params: VxeFormItemSlotTypes.SuffixSlotParams) => any
 }
 
 export const FormItem: typeof VxeFormItem

package/types/components/input.d.ts

@@ -36,7 +36,7 @@ export namespace VxeInputPropTypes {
   export type Readonly = boolean
   export type Disabled = boolean
   export type Placeholder = string
-  export type MaxLength = string | number
+  export type MaxLength = string | number | null
   export type Multiple = boolean
   export type ShowWordCount = boolean
   export type CountMethod = (params: {
@@ -46,13 +46,13 @@ export namespace VxeInputPropTypes {
   export type AutoFocus = boolean
   export type Align = VxeComponentAlignType
   export type Form = string
-  export type Min = string | number
-  export type Max = string | number
-  export type Step = string | number
+  export type Min = string | number | null
+  export type Max = string | number | null
+  export type Step = string | number | null
   export type Trim = boolean
   export type Exponential = boolean
   export type Controls = boolean
-  export type Digits = string | number
+  export type Digits = string | number | null
   export type StartDate = string | number | Date
   export type EndDate = string | number | Date
   export type MinDate = string | number | Date

package/types/components/list.d.ts

@@ -143,10 +143,11 @@ export interface ListMethods {
 
   /**
    * 如果有滚动条，则滚动到对应的位置
-   * @param scrollLeft 左边距离
-   * @param scrollTop 顶部距离
    */
-  scrollTo(scrollLeft: number | null, scrollTop?: number | null): Promise<void>
+  scrollTo(x: {
+    top?: number | null
+    left?: number | null
+  } | number | null | undefined, y?: number | null): Promise<void>
 
   /**
    * 刷新滚动操作，手动同步滚动相关位置

package/types/components/number-input.d.ts

@@ -33,14 +33,14 @@ export namespace VxeNumberInputPropTypes {
   export type Readonly = boolean
   export type Disabled = boolean
   export type Placeholder = string
-  export type MaxLength = string | number
+  export type MaxLength = string | number | null
   export type Multiple = boolean
   export type AutoComplete = string
   export type Align = string
   export type Form = string
-  export type Min = string | number
-  export type Max = string | number
-  export type Step = string | number
+  export type Min = string | number | null
+  export type Max = string | number | null
+  export type Step = string | number | null
   export type Exponential = boolean
   /**
    * @deprecated
@@ -64,7 +64,7 @@ export namespace VxeNumberInputPropTypes {
      */
     layout?: 'left' | 'right' | 'default' | ''
   }
-  export type Digits = string | number
+  export type Digits = string | number | null
   export type AutoFill = boolean
   export type Editable = boolean
   export type PlusIcon = string

package/types/components/table.d.ts

@@ -4621,10 +4621,11 @@ export interface TableMethods<DT = any> {
   }
   /**
    * 如果有滚动条，则滚动到对应的位置
-   * @param scrollLeft 左边距离
-   * @param scrollTop 顶部距离
    */
-  scrollTo(scrollLeft: number | null, scrollTop?: number | null): Promise<void>
+  scrollTo(x: {
+    top?: number | null
+    left?: number | null
+  } | number | null | undefined, y?: number | null): Promise<void>
   /**
    * 如果有滚动条，则滚动到对应的行
    * @param row 指定行

package/types/components/textarea.d.ts

@@ -25,7 +25,7 @@ export interface VxeTextareaPrivateRef extends TextareaPrivateRef { }
 
 export namespace VxeTextareaPropTypes {
   export type Size = VxeComponentSizeType
-  export type ModelValue = string | number
+  export type ModelValue = string | number | null
   export type ClassName = string
   export type Immediate = boolean
   export type Name = string
@@ -33,16 +33,16 @@ export namespace VxeTextareaPropTypes {
   export type Editable = boolean
   export type Disabled = boolean
   export type Placeholder = string
-  export type MaxLength = string | number
-  export type Rows = string | number
-  export type Cols = string | number
+  export type MaxLength = string | number | null
+  export type Rows = string | number | null
+  export type Cols = string | number | null
   export type ShowWordCount = boolean
   export type CountMethod = (params: {
     value: string
   }) => number
   export type Autosize = {
-    minRows?: number
-    maxRows?: number
+    minRows?: number | null
+    maxRows?: number | null
   }
   export type Form = string
   export type Resize = string

package/types/components/tree.d.ts

@@ -322,12 +322,15 @@ export interface TreeMethods<D = any> {
    * 重新计算列表
    */
   recalculate(): Promise<void>
+
   /**
    * 如果有滚动条，则滚动到对应的位置
-   * @param scrollLeft 左边距离
-   * @param scrollTop 顶部距离
    */
-  scrollTo(scrollLeft: number | null, scrollTop?: number | null): Promise<void>
+  scrollTo(x: {
+    top?: number | null
+    left?: number | null
+  } | number | null | undefined, y?: number | null): Promise<void>
+
   /**
    * 手动清除滚动相关信息，还原到初始状态
    */