vxe-pc-ui 3.17.21 → 3.17.23

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

@@ -31,6 +31,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
     disabled: Boolean as PropType<VxePasswordInputPropTypes.Disabled>,
     maxLength: [String, Number] as PropType<VxePasswordInputPropTypes.MaxLength>,
     placeholder: String as PropType<VxePasswordInputPropTypes.Placeholder>,
+    floatContent: {
+      type: String as PropType<VxePasswordInputPropTypes.FloatContent>,
+      default: () => getConfig().passwordInput.floatContent
+    },
     autoComplete: {
       type: String as PropType<VxePasswordInputPropTypes.AutoComplete>,
       default: 'off'
@@ -431,8 +435,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const $xePasswordInput = this
       const props = $xePasswordInput
       const reactData = $xePasswordInput.reactData
+      const slots = $xePasswordInput.$scopedSlots
 
-      const { className, inputClassName, name, autocomplete, autoComplete, maxLength } = props
+      const { className, inputClassName, name, floatContent, autocomplete, autoComplete, maxLength } = props
       const { inputValue, isActivated } = reactData
       const isDisabled = $xePasswordInput.computeIsDisabled
       const formReadonly = $xePasswordInput.computeFormReadonly
@@ -449,6 +454,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const inputReadonly = $xePasswordInput.computeInputReadonly
       const prefix = $xePasswordInput.renderPrefixIcon(h)
       const suffix = $xePasswordInput.renderSuffixIcon(h)
+      const floatSlot = slots.float
       return h('div', {
         ref: 'refElem',
         class: ['vxe-password-input', className, {
@@ -492,7 +498,12 @@ export default /* define-vxe-component start */ defineVxeComponent({
             }
           })
         ]),
-        suffix || renderEmptyElement($xePasswordInput)
+        suffix || renderEmptyElement($xePasswordInput),
+        floatContent || floatSlot
+          ? h('span', {
+            class: 'vxe-password-input--float-wrapper'
+          }, floatSlot ? floatSlot({}) : getText(floatContent))
+          : renderEmptyElement($xePasswordInput)
       ])
     }
   },

package/styles/components/input.scss

@@ -103,7 +103,6 @@
   border-radius: var(--vxe-ui-base-border-radius);
   width: 180px;
   border: 1px solid var(--vxe-ui-input-border-color);
-  overflow: hidden;
   &.is--active {
     border: 1px solid var(--vxe-ui-font-primary-color);
   }
@@ -167,6 +166,16 @@
   }
 }
 
+.vxe-input--float-wrapper {
+  position: absolute;
+  left: 1em;
+  top: -0.5em;
+  line-height: 1;
+  padding: 0 0.2em;
+  color: var(--vxe-ui-input-placeholder-color);
+  background-color: var(--vxe-ui-layout-background-color);
+}
+
 .vxe-input--number-btn {
   height: 50%;
   display: flex;

package/styles/components/number-input.scss

@@ -100,7 +100,6 @@
   border-radius: var(--vxe-ui-base-border-radius);
   width: 180px;
   border: 1px solid var(--vxe-ui-input-border-color);
-  overflow: hidden;
   &.is--active {
     border: 1px solid var(--vxe-ui-font-primary-color);
   }
@@ -157,6 +156,16 @@
   }
 }
 
+.vxe-number-input--float-wrapper {
+  position: absolute;
+  left: 1em;
+  top: -0.5em;
+  line-height: 1;
+  padding: 0 0.2em;
+  color: var(--vxe-ui-input-placeholder-color);
+  background-color: var(--vxe-ui-layout-background-color);
+}
+
 // 统计字数
 .vxe-number-input--count {
   flex-shrink: 0;
@@ -234,13 +243,27 @@
   }
 }
 .vxe-number-input {
-  &.is--controls {
+  &.ctl--default {
     & > .vxe-number-input--input-wrapper {
       .vxe-number-input--input {
         border-radius: 0;
       }
     }
   }
+  &.ctl--left {
+    & > .vxe-number-input--input-wrapper {
+      .vxe-number-input--input {
+        border-radius: 0 var(--vxe-ui-base-border-radius) var(--vxe-ui-base-border-radius) 0;
+      }
+    }
+  }
+  &.ctl--right {
+    & > .vxe-number-input--input-wrapper {
+      .vxe-number-input--input {
+        border-radius: var(--vxe-ui-base-border-radius) 0 0 var(--vxe-ui-base-border-radius);
+      }
+    }
+  }
   &.ctl--default {
     & > .vxe-number-input--minus-btn {
       border-right: 1px solid var(--vxe-ui-input-border-color);

package/styles/components/password-input.scss

@@ -142,6 +142,16 @@
   }
 }
 
+.vxe-password-input--float-wrapper {
+  position: absolute;
+  left: 1em;
+  top: -0.5em;
+  line-height: 1;
+  padding: 0 0.2em;
+  color: var(--vxe-ui-input-placeholder-color);
+  background-color: var(--vxe-ui-layout-background-color);
+}
+
 .vxe-password-input--number-btn {
   height: 50%;
   display: flex;

package/styles/theme/base.scss

@@ -125,12 +125,12 @@
   --vxe-ui-tooltip-dark-background-color: #303133;
 
   /*form*/
-  --vxe-ui-space-margin-xlarge: 64px;
-  --vxe-ui-space-margin-large: 60px;
-  --vxe-ui-space-margin-default: 56px;
-  --vxe-ui-space-margin-medium: 52px;
-  --vxe-ui-space-margin-small: 48px;
-  --vxe-ui-space-margin-mini: 44px;
+  --vxe-ui-form-item-min-height-xlarge: 64px;
+  --vxe-ui-form-item-min-height-large: 60px;
+  --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-item-padding-xlarge: 10px;
   --vxe-ui-form-item-padding-large: 9px;

package/types/components/input.d.ts

@@ -30,6 +30,7 @@ export namespace VxeInputPropTypes {
   export type Readonly = boolean
   export type Disabled = boolean
   export type Placeholder = string
+  export type FloatContent = string
   export type MaxLength = string | number | null
   export type Multiple = boolean
   export type ShowWordCount = boolean
@@ -102,6 +103,7 @@ export interface VxeInputProps {
   readonly?: VxeInputPropTypes.Readonly
   disabled?: VxeInputPropTypes.Disabled
   placeholder?: VxeInputPropTypes.Placeholder
+  floatContent?: VxeInputPropTypes.FloatContent
   maxLength?: VxeInputPropTypes.MaxLength
   multiple?: VxeInputPropTypes.Multiple
   /**
@@ -427,6 +429,7 @@ export interface VxeInputSlots {
   default: (params: VxeInputSlotTypes.DefaultSlotParams) => any
   prefix: (params: VxeInputSlotTypes.DefaultSlotParams) => any
   suffix: (params: VxeInputSlotTypes.DefaultSlotParams) => any
+  float: (params: VxeInputSlotTypes.DefaultSlotParams) => any
 }
 
 export const Input: typeof VxeInput

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

@@ -27,6 +27,7 @@ export namespace VxeNumberInputPropTypes {
   export type Readonly = boolean
   export type Disabled = boolean
   export type Placeholder = string
+  export type FloatContent = string
   export type MaxLength = string | number | null
   export type Multiple = boolean
   export type AutoComplete = string
@@ -115,6 +116,7 @@ export interface VxeNumberInputProps {
   readonly?: VxeNumberInputPropTypes.Readonly
   disabled?: VxeNumberInputPropTypes.Disabled
   placeholder?: VxeNumberInputPropTypes.Placeholder
+  floatContent?: VxeNumberInputPropTypes.FloatContent
   maxLength?: VxeNumberInputPropTypes.MaxLength
   multiple?: VxeNumberInputPropTypes.Multiple
   autoComplete?: VxeNumberInputPropTypes.AutoComplete
@@ -312,6 +314,7 @@ export interface VxeNumberInputSlots {
   default?: (params: VxeNumberInputSlotTypes.DefaultSlotParams) => any
   prefix: (params: VxeNumberInputSlotTypes.DefaultSlotParams) => any
   suffix: (params: VxeNumberInputSlotTypes.DefaultSlotParams) => any
+  float: (params: VxeNumberInputSlotTypes.DefaultSlotParams) => any
 }
 
 export const NumberInput: typeof VxeNumberInput

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

@@ -27,6 +27,7 @@ export namespace VxePasswordInputPropTypes {
   export type Disabled = boolean
   export type MaxLength = string | number
   export type Placeholder = string
+  export type FloatContent = string
   export type AutoComplete = string
   export type PrefixIcon = string
   export type SuffixIcon = string
@@ -52,6 +53,7 @@ export interface VxePasswordInputProps {
   maxLength?: VxePasswordInputPropTypes.MaxLength
   autoComplete?: VxePasswordInputPropTypes.AutoComplete
   placeholder?: VxePasswordInputPropTypes.Placeholder
+  floatContent?: VxePasswordInputPropTypes.FloatContent
   prefixIcon?: VxePasswordInputPropTypes.PrefixIcon
   suffixIcon?: VxePasswordInputPropTypes.SuffixIcon
   controls?: VxePasswordInputPropTypes.Controls
@@ -127,6 +129,7 @@ export interface VxePasswordInputSlots {
   default?: (params: VxePasswordInputSlotTypes.DefaultSlotParams) => any
   prefix: (params: VxePasswordInputSlotTypes.DefaultSlotParams) => any
   suffix: (params: VxePasswordInputSlotTypes.DefaultSlotParams) => any
+  float: (params: VxePasswordInputSlotTypes.DefaultSlotParams) => any
 }
 
 export const PasswordInput: typeof VxePasswordInput

package/types/components/table-module/filter.d.ts

@@ -128,6 +128,10 @@ export interface TableFilterPrivateMethods<D = any> {
    * @private
    */
   handleFilterResetFilter (evnt: Event | null, column: VxeTableDefines.ColumnInfo | null): void
+  /**
+   * @private
+   */
+  handleFilterStyle(): Promise<any>
 }
 
 declare module '../grid' {

package/types/components/table-module/menu.d.ts

@@ -1,3 +1,5 @@
+import { VxeTableDefines } from '../table'
+
 /* eslint-disable @typescript-eslint/no-unused-vars,no-use-before-define */
 
 export interface TableMenuMethods<D = any> {
@@ -8,12 +10,30 @@ export interface TableMenuMethods<D = any> {
 }
 
 export interface TableMenuPrivateMethods<D = any> {
+  /**
+   * @private
+   */
   moveCtxMenu(evnt: KeyboardEvent, ctxMenuStore: any, property: 'selectChild' | 'selected', hasOper: boolean, operRest: any, menuList: any[]): void
+  /**
+   * @private
+   */
   handleOpenMenuEvent(evnt: Event, type: 'header' | 'body' | 'footer', params: any): void
-  handleGlobalContextmenuEvent(evnt: any): void
-  ctxMenuMouseoverEvent(evnt: any, item: any, child?: any): void
-  ctxMenuMouseoutEvent(evnt: any, item: any): void
-  ctxMenuLinkEvent(evnt: any, menu: any): void
+  /**
+   * @private
+   */
+  handleGlobalContextmenuEvent(evnt: Event): void
+  /**
+   * @private
+   */
+  ctxMenuMouseoverEvent(evnt: Event, item: VxeTableDefines.MenuFirstOption | VxeTableDefines.MenuChildOption, child?: any): void
+  /**
+   * @private
+   */
+  ctxMenuMouseoutEvent(evnt: Event, item: VxeTableDefines.MenuFirstOption | VxeTableDefines.MenuChildOption): void
+  /**
+   * @private
+   */
+  ctxMenuLinkEvent(evnt: Event, menu: VxeTableDefines.MenuFirstOption | VxeTableDefines.MenuChildOption): void
 }
 
 declare module '../grid' {

package/types/components/table.d.ts

@@ -376,6 +376,10 @@ export namespace VxeTablePropTypes {
      * 当鼠标点击行时，是否要高亮当前行
      */
     isCurrent?: boolean
+    /**
+     * 当鼠标点击的行存在合并时，是否合并高亮显示
+     */
+    // isMergeCurrent?: boolean
     /**
      * 已废弃，请使用 current-row-config.beforeSelectMethod
      * @deprecated
@@ -387,6 +391,10 @@ export namespace VxeTablePropTypes {
      * 当鼠标移到行时，是否要高亮当前行
      */
     isHover?: boolean
+    /**
+     * 当鼠标移到行存在合并时，是否合并高亮显示
+     */
+    // isMergeHover?: boolean
     /**
      * 每一行开启调整行高度
      */
@@ -3168,6 +3176,13 @@ export namespace VxeTablePropTypes {
      * 排除列
      */
     excludeFields?: string[]
+    /**
+     * 是否允许列选中的方法，该方法的返回值用来决定这一列的 checkbox 是否可以选中
+     */
+    checkMethod?(params: {
+      $table: VxeTableConstructor<D>
+      column: VxeTableDefines.ColumnInfo<D>
+    }): boolean
     /**
      * 列过滤方法
      */
@@ -6216,6 +6231,7 @@ export namespace VxeTableDefines {
   }
 
   export interface FilterStoreObj {
+    targetEl: HTMLDivElement | null
     isAllSelected: boolean
     isIndeterminate: boolean
     style: any