vxe-pc-ui 3.17.20 → 3.17.22

package/packages/space/src/space.ts

@@ -41,6 +41,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
     separator: {
       type: String as PropType<VxeSpacePropTypes.Separator>,
       default: () => getConfig().space.separator
+    },
+    align: {
+      type: String as PropType<VxeSpacePropTypes.Align>,
+      default: () => getConfig().space.align
     }
   },
   data () {
@@ -62,7 +66,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const $xeSpace = this
       const props = $xeSpace
 
-      const { gap } = props
+      const { align, gap } = props
       const stys: VxeComponentStyleType = {}
       let rowGap: string | number = ''
       let columGap: string | number = ''
@@ -78,6 +82,9 @@ export default /* define-vxe-component start */ defineVxeComponent({
           columGap = gap.columGap || ''
         }
       }
+      if (align) {
+        stys['align-items'] = align
+      }
       if (!eqEmptyValue(rowGap)) {
         stys['--vxe-ui-space-current-row-gap'] = toCssUnit(rowGap)
       }
@@ -99,15 +106,42 @@ export default /* define-vxe-component start */ defineVxeComponent({
     //
     // Render
     //
-    renderVN (h: CreateElement): VNode {
+    renderItems (h: CreateElement) {
       const $xeSpace = this
       const props = $xeSpace
       const slots = $xeSpace.$scopedSlots
 
-      const { vertical, wrap, className, itemClassName } = props
+      const { separator, itemClassName } = props
+      const itemVNs: VNode[] = []
+      const defaultSlot = slots.default
+      const separatorSlot = slots.separator
+      if (defaultSlot) {
+        XEUtils.each(defaultSlot({}), (itemVN, index, items) => {
+          itemVNs.push(
+            h('div', {
+              key: 'i' + index,
+              class: ['vxe-space--item', getPropClass(itemClassName, { index })]
+            }, [itemVN])
+          )
+          if ((separator || separatorSlot) && index < items.length - 1) {
+            itemVNs.push(
+              h('div', {
+                key: 's' + index,
+                class: 'vxe-space--separator'
+              }, separatorSlot ? separatorSlot({}) : ('' + separator))
+            )
+          }
+        })
+      }
+      return itemVNs
+    },
+    renderVN (h: CreateElement): VNode {
+      const $xeSpace = this
+      const props = $xeSpace
+
+      const { vertical, wrap, className } = props
       const wrapperStyle = $xeSpace.computeWrapperStyle
       const vSize = $xeSpace.computeSize
-      const defaultSlot = slots.default
       return h('div', {
         ref: 'refElem',
         class: ['vxe-space', getPropClass(className, {}), {
@@ -116,14 +150,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
           'is--vertical': vertical
         }],
         style: wrapperStyle
-      }, defaultSlot
-        ? (defaultSlot({}) || []).map((itemVN, index) => {
-            return h('div', {
-              key: index,
-              class: ['vxe-space--item', getPropClass(itemClassName, { index })]
-            }, [itemVN])
-          })
-        : [])
+      }, $xeSpace.renderItems(h))
     }
   },
   render (this: any, h) {

package/styles/components/slider.scss

@@ -50,7 +50,7 @@ $sliderThemeList: (
 .vxe-slider {
   position: relative;
   display: block;
-  padding: 0.5em 1em;
+  padding: 0.8em;
   @for $index from 0 to list.length($sliderThemeList) {
     $item: list.nth($sliderThemeList, $index + 1);
     &.theme--#{map.get($item, name)} {
@@ -80,10 +80,10 @@ $sliderThemeList: (
     }
     .vxe-slider--bar-btn {
       &:hover {
-        transform: scale(1.2);
+        transform: translate(-50%, -50%) scale(1.2);
       }
       &:active {
-        transform: scale(1.1);
+        transform: translate(-50%, -50%) scale(1.1);
       }
     }
   }
@@ -122,19 +122,14 @@ $sliderThemeList: (
 
 .vxe-slider--bar-btn {
   position: absolute;
-  width: 0.9em;
-  height: 0.9em;
-  top: -0.3em;
+  width: 1.2em;
+  height: 1.2em;
+  top: 50%;
+  transform: translate(-50%, -50%);
   border-radius: 50%;
-  border: 0.15em solid  var(--vxe-ui-font-primary-color);
+  border: 2px solid  var(--vxe-ui-font-primary-color);
   background-color: #fff;
   cursor: pointer;
   z-index: 1;
   @include baseMixin.createAnimationTransition(transform, 0.1s);
-}
-.vxe-slider--start-btn {
-  left: -0.45em;
-}
-.vxe-slider--end-btn {
-  right: -0.45em;
 }

package/styles/components/space.scss

@@ -27,6 +27,7 @@
 .vxe-space {
   display: inline-flex;
   flex-direction: row;
+  align-items: center;
   gap: var(--vxe-ui-space-current-row-gap) var(--vxe-ui-space-current-column-gap);
   &.is--wrap {
     flex-wrap: wrap;

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/slider.d.ts

@@ -19,6 +19,8 @@ export interface VxeSliderPrivateRef extends SliderPrivateRef { }
 export namespace VxeSliderPropTypes {
   export type Size = VxeComponentSizeType
   export type ModelValue = number | string | null | (number | string | null)[]
+  export type StartValue = number | string | null
+  export type EndValue = number | string | null
   export type Max = number | string
   export type Min = number | string
   export type Vertical = boolean
@@ -33,6 +35,8 @@ export namespace VxeSliderPropTypes {
 export interface VxeSliderProps {
   size?: VxeSliderPropTypes.Size
   value?: VxeSliderPropTypes.ModelValue
+  startValue?: VxeSliderPropTypes.StartValue
+  endValue?: VxeSliderPropTypes.EndValue
   max?: VxeSliderPropTypes.Max
   min?: VxeSliderPropTypes.Min
   vertical?: VxeSliderPropTypes.Vertical
@@ -49,11 +53,12 @@ export interface SliderPrivateComputed {
 export interface VxeSliderPrivateComputed extends SliderPrivateComputed { }
 
 export interface SliderReactData {
-  startValue: number
-  endValue: number
 }
 export interface SliderInternalData {
   _isUp?: boolean
+  currValue: number
+  startValue: number
+  endValue: number
 }
 
 export interface SliderMethods {
@@ -65,6 +70,8 @@ export interface VxeSliderPrivateMethods extends SliderPrivateMethods { }
 
 export type VxeSliderEmits = [
   'modelValue',
+  'update:startValue',
+  'update:endValue',
   'change',
   'track-dragstart',
   'track-dragover',

package/types/components/space.d.ts

@@ -23,6 +23,7 @@ export namespace VxeSpacePropTypes {
   export type ClassName = string
   export type ItemClassName = string
   export type Separator = string
+  export type Align = 'stretch' | 'start' | 'end' | 'center' | 'baseline' | '' | null
 }
 
 export interface VxeSpaceProps {
@@ -45,6 +46,7 @@ export interface VxeSpaceProps {
    * 分隔符
    */
   separator?: VxeSpacePropTypes.Separator
+  align?: VxeSpacePropTypes.Align
 }
 
 export interface SpacePrivateComputed {

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