vxe-pc-ui 4.5.31 → 4.5.33

package/styles/components/tooltip.scss

@@ -60,7 +60,7 @@
       }
     }
     .vxe-tooltip--arrow {
-      bottom: -12px;
+      bottom: -11px;
       &:before {
         top: -7px;
       }

package/styles/theme/base.scss

@@ -92,10 +92,10 @@
   --vxe-ui-tooltip-dark-background-color: #303133;
 
   /*form*/
-  --vxe-ui-form-item-min-height-default: 48px;
-  --vxe-ui-form-item-min-height-medium: 44px;
-  --vxe-ui-form-item-min-height-small: 40px;
-  --vxe-ui-form-item-min-height-mini: 36px;
+  --vxe-ui-form-item-min-height-default: 56px;
+  --vxe-ui-form-item-min-height-medium: 52px;
+  --vxe-ui-form-item-min-height-small: 48px;
+  --vxe-ui-form-item-min-height-mini: 44px;
   --vxe-ui-form-validate-error-color: var(--vxe-ui-status-error-color);
   --vxe-ui-form-validate-error-background-color: inherit;
 

package/styles/theme/dark.scss

@@ -63,6 +63,9 @@
   --vxe-ui-input-placeholder-color: #3c3d3e;
   --vxe-ui-input-disabled-background-color: #262727;
 
+  /*number-input*/
+  --vxe-ui-number-input-control-button-color: #262727;
+
   /*modal*/
   --vxe-ui-modal-header-background-color: var(--vxe-ui-layout-background-color);
 

package/styles/theme/light.scss

@@ -61,6 +61,9 @@
   --vxe-ui-input-border-color: #{light_variable.$vxe-ui-input-border-color};
   --vxe-ui-input-placeholder-color: #{light_variable.$vxe-ui-input-placeholder-color};
   --vxe-ui-input-disabled-background-color: #{light_variable.$vxe-ui-input-disabled-background-color};
+
+  /*number-input*/
+  --vxe-ui-number-input-control-button-color: #f5f7fa;
   
   /*modal*/
   --vxe-ui-modal-header-background-color: #{light_variable.$vxe-ui-modal-header-background-color};

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

@@ -1,4 +1,4 @@
-import { RenderFunction, SetupContext, Ref } from 'vue'
+import { RenderFunction, SetupContext, Ref, ComputedRef } from 'vue'
 import { DefineVxeComponentApp, DefineVxeComponentOptions, DefineVxeComponentInstance, VxeComponentBaseOptions, VxeComponentEventParams, ValueOf, VxeComponentSizeType } from '@vxe-ui/core'
 
 /* eslint-disable no-use-before-define,@typescript-eslint/ban-types */
@@ -42,10 +42,33 @@ export namespace VxeNumberInputPropTypes {
   export type Max = string | number
   export type Step = string | number
   export type Exponential = boolean
+  /**
+   * @deprecated
+   */
   export type Controls = boolean
+  export interface ControlConfig {
+    /**
+     * 是否启用，支持局部/全局启用
+     */
+    enabled?: boolean
+    /**
+     * 只对 enabled 启用后有效，是否显示控制按钮
+     */
+    showButton?: boolean
+    /**
+     * 只对 enabled 启用后有效，是否启用鼠标滚轮操作
+     */
+    isWheel?: boolean
+    /**
+     * 按钮的布局方式
+     */
+    layout?: 'left' | 'right' | 'default' | ''
+  }
   export type Digits = string | number
   export type AutoFill = boolean
   export type Editable = boolean
+  export type PlusIcon = string
+  export type MinusIcon = string
   export type PrefixIcon = string
   export type SuffixIcon = string
 
@@ -81,21 +104,56 @@ export interface VxeNumberInputProps {
   align?: VxeNumberInputPropTypes.Align
   form?: VxeNumberInputPropTypes.Form
 
-  // number、integer、float
+  /**
+   * 最小值
+   */
   min?: VxeNumberInputPropTypes.Min
+  /**
+   * 最大值
+   */
   max?: VxeNumberInputPropTypes.Max
+  /**
+   * 数字间隔，当启用控制按钮时有效
+   */
   step?: VxeNumberInputPropTypes.Step
+  /**
+   * 是否允许输入科学计数
+   */
   exponential?: VxeNumberInputPropTypes.Exponential
 
-  // number、integer、float、password
+  /**
+   * 已废弃，请使用 control-config.showButton
+   * @deprecated
+   */
   controls?: VxeNumberInputPropTypes.Controls
+  /**
+   * 控制按钮配置项
+   */
+  controlConfig?: VxeNumberInputPropTypes.ControlConfig
 
-  // float
+  /**
+   * 小数位数
+   */
   digits?: VxeNumberInputPropTypes.Digits
+  /**
+   * 只对 type=float,amount 有效，当输入的小数位数不足时，自动给小数后面补 0
+   */
   autoFill?: VxeNumberInputPropTypes.AutoFill
 
+  /**
+   * 文本框是否允许输入
+   */
   editable?: VxeNumberInputPropTypes.Editable
 
+  /**
+   * 自定义增加按钮图标
+   */
+  plusIcon?: VxeNumberInputPropTypes.PlusIcon
+  /**
+   * 自定义减少按钮图标
+   */
+  minusIcon?: VxeNumberInputPropTypes.MinusIcon
+
   prefixIcon?: VxeNumberInputPropTypes.PrefixIcon
   suffixIcon?: VxeNumberInputPropTypes.SuffixIcon
 
@@ -121,6 +179,7 @@ export interface VxeNumberInputProps {
 }
 
 export interface NumberInputPrivateComputed {
+  computeControlOpts: ComputedRef<VxeNumberInputPropTypes.ControlConfig>
 }
 export interface VxeNumberInputPrivateComputed extends NumberInputPrivateComputed { }
 
@@ -132,6 +191,8 @@ export interface NumberInputReactData {
 
 export interface NumberInputInternalData {
   dnTimeout?: undefined | number
+  ainTimeout?: undefined | number
+  isMouseDown?: boolean
   isUM?: boolean
 }
 
@@ -166,10 +227,14 @@ export type VxeNumberInputEmits = [
   'focus',
   'blur',
   'clear',
+  'plus-number',
+  'minus-number',
+  'prefix-click',
+  'suffix-click',
+
+  // 已废弃
   'prev-number',
   'next-number',
-  'prefix-click',
-  'suffix-click'
 ]
 
 export namespace VxeNumberInputDefines {
@@ -184,21 +249,30 @@ export namespace VxeNumberInputDefines {
 
   export interface ChangeParams extends NumberInputParams {}
   export interface ChangeEventParams extends NumberInputEventParams, ChangeParams { }
+
+  export interface PlusNumberEventParams extends NumberInputEventParams, NumberInputParams { }
+  export interface MinusNumberEventParams extends NumberInputEventParams, NumberInputParams { }
 }
 
 export type VxeNumberInputEventProps = {
   onInput?: VxeNumberInputEvents.Input
   onChange?: VxeNumberInputEvents.Change
+  onPlusNumber?: VxeNumberInputEvents.PlusNumber
+  onMinusNumber?: VxeNumberInputEvents.MinusNumber
 }
 
 export interface VxeNumberInputListeners {
   input?: VxeNumberInputEvents.Input
   change?: VxeNumberInputEvents.Change
+  plusNumber?: VxeNumberInputEvents.PlusNumber
+  minusNumber?: VxeNumberInputEvents.MinusNumber
 }
 
 export namespace VxeNumberInputEvents {
   export type Input = (params: VxeNumberInputDefines.InputEventParams) => void
   export type Change = (params: VxeNumberInputDefines.ChangeEventParams) => void
+  export type PlusNumber = (params: VxeNumberInputDefines.PlusNumberEventParams) => void
+  export type MinusNumber = (params: VxeNumberInputDefines.MinusNumberEventParams) => void
 }
 
 export namespace VxeNumberInputSlotTypes {

package/types/components/table.d.ts

@@ -3530,10 +3530,13 @@ export interface TableInternalData<D = any> {
   // 已删除行
   removeRowMaps: Record<string, D | null>
 
+  // 单元格值缓存
+  cvCacheMaps: Record<string, any>
+
   // 上一个拖动的行
   prevDragRow?: any
   // 上一个拖动的列
-  prevDragCol?: VxeTableDefines.ColumnInfo
+  prevDragCol?: VxeTableDefines.ColumnInfo | null
   prevDragToChild?: boolean
   prevDragPos?: 'top' | 'bottom' | 'left' | 'right' | ''
 

package/types/ui/global-icon.d.ts

@@ -89,10 +89,12 @@ declare module '@vxe-ui/core' {
     // input
     INPUT_CLEAR?: string
     INPUT_SEARCH?: string
+    INPUT_PLUS_NUM?: string
+    INPUT_MINUS_NUM?: string
 
     // number-picker
-    NUMBER_INPUT_PREV_NUM?: string
-    NUMBER_INPUT_NEXT_NUM?: string
+    NUMBER_INPUT_PLUS_NUM?: string
+    NUMBER_INPUT_MINUS_NUM?: string
 
     // date-picker
     DATE_PICKER_DATE?: string