vxe-pc-ui 4.16.21 → 4.16.22

package/packages/date-range-picker/src/date-range-picker.ts

@@ -11,7 +11,7 @@ import VxeDatePanelComponent from '../../date-panel'
 import VxeButtonComponent from '../../button'
 import VxeButtonGroupComponent from '../../button-group'
 
-import type { VxeDateRangePickerConstructor, VxeDateRangePickerEmits, DateRangePickerInternalData, DateRangePickerReactData, DateRangePickerMethods, VxeDateRangePickerPropTypes, DateRangePickerPrivateRef, VxeFormConstructor, VxeFormPrivateMethods, VxeFormDefines, ValueOf, VxeModalConstructor, VxeDatePanelPropTypes, VxeDrawerConstructor, VxeModalMethods, VxeDrawerMethods, VxeDatePanelEvents, VxeDateRangePickerDefines, VxeButtonGroupEvents, VxeDatePanelConstructor } from '../../../types'
+import type { VxeDateRangePickerConstructor, VxeDateRangePickerEmits, DateRangePickerInternalData, DateRangePickerReactData, DateRangePickerMethods, VxeDateRangePickerPropTypes, DateRangePickerPrivateRef, VxeFormConstructor, VxeFormPrivateMethods, VxeFormDefines, ValueOf, VxeModalConstructor, VxeDatePanelPropTypes, VxeDrawerConstructor, VxeModalMethods, VxeDrawerMethods, VxeDatePanelEvents, VxeDateRangePickerDefines, VxeButtonGroupEvents, VxeDatePanelConstructor, VxeCardConstructor, VxeCardPrivateMethods } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'
 
 const { errLog } = createComponentLog('date-range-picker')
@@ -176,6 +176,7 @@ export default defineVxeComponent({
     const $xeModal = inject<(VxeModalConstructor & VxeModalMethods) | null>('$xeModal', null)
     const $xeDrawer = inject<(VxeDrawerConstructor & VxeDrawerMethods) | null>('$xeDrawer', null)
     const $xeTable = inject<(VxeTableConstructor & VxeTablePrivateMethods) | null>('$xeTable', null)
+    const $xeCard = inject<(VxeCardConstructor & VxeCardPrivateMethods) | null>('$xeCard', null)
     const $xeForm = inject<(VxeFormConstructor & VxeFormPrivateMethods) | null>('$xeForm', null)
     const formItemInfo = inject<VxeFormDefines.ProvideItemInfo | null>('xeFormItemInfo', null)
 
@@ -222,7 +223,7 @@ export default defineVxeComponent({
         if (XEUtils.isBoolean(globalTransfer)) {
           return globalTransfer
         }
-        if ($xeTable || $xeModal || $xeDrawer || $xeForm) {
+        if ($xeTable || $xeModal || $xeDrawer || $xeCard || $xeForm) {
           return true
         }
       }

package/packages/select/src/select.ts

@@ -9,7 +9,7 @@ import { createComponentLog } from '../../ui/src/log'
 import VxeInputComponent from '../../input/src/input'
 import VxeButtonComponent from '../../button/src/button'
 
-import type { VxeSelectPropTypes, VxeSelectConstructor, SelectInternalData, SelectReactData, VxeSelectDefines, VxeButtonEvents, ValueOf, VxeSelectEmits, VxeComponentSlotType, VxeInputConstructor, SelectMethods, SelectPrivateRef, VxeSelectMethods, VxeOptionProps, VxeDrawerConstructor, VxeDrawerMethods, VxeFormDefines, VxeFormConstructor, VxeFormPrivateMethods, VxeModalConstructor, VxeModalMethods, VxeInputEvents, VxeComponentStyleType } from '../../../types'
+import type { VxeSelectPropTypes, VxeSelectConstructor, SelectInternalData, SelectReactData, VxeSelectDefines, VxeButtonEvents, ValueOf, VxeSelectEmits, VxeComponentSlotType, VxeInputConstructor, SelectMethods, SelectPrivateRef, VxeSelectMethods, VxeOptionProps, VxeDrawerConstructor, VxeDrawerMethods, VxeFormDefines, VxeFormConstructor, VxeFormPrivateMethods, VxeModalConstructor, VxeModalMethods, VxeInputEvents, VxeComponentStyleType, VxeCardConstructor, VxeCardPrivateMethods } from '../../../types'
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types/components/table'
 
 const { errLog } = createComponentLog('select')
@@ -216,6 +216,7 @@ export default defineVxeComponent({
     const $xeModal = inject<(VxeModalConstructor & VxeModalMethods)| null>('$xeModal', null)
     const $xeDrawer = inject<(VxeDrawerConstructor & VxeDrawerMethods) | null>('$xeDrawer', null)
     const $xeTable = inject<(VxeTableConstructor & VxeTablePrivateMethods) | null>('$xeTable', null)
+    const $xeCard = inject<(VxeCardConstructor & VxeCardPrivateMethods) | null>('$xeCard', null)
     const $xeForm = inject<(VxeFormConstructor & VxeFormPrivateMethods)| null>('$xeForm', null)
     const formItemInfo = inject<VxeFormDefines.ProvideItemInfo | null>('xeFormItemInfo', null)
 
@@ -280,7 +281,7 @@ export default defineVxeComponent({
         if (XEUtils.isBoolean(globalTransfer)) {
           return globalTransfer
         }
-        if ($xeTable || $xeModal || $xeDrawer || $xeForm) {
+        if ($xeTable || $xeModal || $xeDrawer || $xeCard || $xeForm) {
           return true
         }
       }

package/types/components/color-picker.d.ts

@@ -146,6 +146,53 @@ export interface VxeColorPickerMethods extends ColorPickerMethods { }
 export interface ColorPickerPrivateMethods { }
 export interface VxeColorPickerPrivateMethods extends ColorPickerPrivateMethods { }
 
+export interface ColorController {
+  /**
+   * 解析颜色
+   */
+  parseColor<T extends keyof VxeColorPickerDefines.ParseResultMap>(color: string, format?: T): VxeColorPickerDefines.ParseResultMap[T] | null
+  /**
+   * 判断颜色是否 RGB 格式
+   */
+  hasRgb(color: string): boolean
+  /**
+   * 判断颜色是否 HEX 格式
+   */
+  hasHex(color: string): boolean
+  /**
+   * 转成 RGB 格式
+   */
+  toRgb(color: string): VxeColorPickerDefines.RgbObj | null
+  /**
+   * 转成 RGB 字符串格式
+   */
+  toRgbString(color: string): string
+  /**
+   * 转成 HEX 格式
+   */
+  toHex(color: string): VxeColorPickerDefines.HexObj | null
+  /**
+   * 转成 HEX 字符串格式
+   */
+  toHexString(color: string): string
+  /**
+   * 转成 HSL 格式
+   */
+  toHsl(color: string): VxeColorPickerDefines.HslObj | null
+  /**
+   * 转成 HSV 格式
+   */
+  toHsv(color: string): VxeColorPickerDefines.HsvObj | null
+  /**
+   * 对颜色进行高亮
+   */
+  lighten(color: string, ratio: number): string
+  /**
+   * 对颜色进行加深
+   */
+  darken(color: string, ratio: number): string
+}
+
 export type VxeColorPickerEmits = [
   'update:modelValue',
   'change',
@@ -157,6 +204,52 @@ export namespace VxeColorPickerDefines {
   export interface ColorPickerEventParams extends VxeComponentEventParams {
     $colorPicker: VxeColorPickerConstructor
   }
+
+  export type ParseResultMap = {
+    '': VxeColorPickerDefines.RgbObj
+    'rgb': VxeColorPickerDefines.RgbObj
+    'rgba': VxeColorPickerDefines.RgbObj
+    'hex': VxeColorPickerDefines.HexObj
+    'hsl': VxeColorPickerDefines.HslObj
+    'hsv': VxeColorPickerDefines.HsvObj
+  }
+
+  export interface RgbObj {
+    type: 'rgba' | 'rgb'
+    value: string
+    label: string
+    r: number
+    g: number
+    b: number
+    a: number
+  }
+
+  export interface HexObj {
+    type: 'hex'
+    value: string
+    label: string
+    hex: string
+    hexV: string
+    hexA: string
+    a: number
+  }
+
+  export interface HslObj {
+    type: 'hsl'
+    value: string
+    h: number
+    s: number
+    l: number
+    a: number
+  }
+
+  export interface HsvObj {
+    type: 'hsv'
+    value: string
+    h: number
+    s: number
+    v: number
+  }
 }
 
 export type VxeColorPickerEventProps = {

package/types/components/grid.d.ts

@@ -419,6 +419,12 @@ export interface GridMethods<D = any> {
     }
     pendingRecords: D[]
   } | null
+  /**
+   * 获取个性化设置分页数据
+   */
+  getCustomPagerData(): {
+    pSize?: number
+  },
   /**
    * 获取自定义的 params 属性
    */

package/types/components/table.d.ts

@@ -7070,8 +7070,8 @@ export namespace VxeTableDefines {
   export type CustomEventType = 'reset' | 'confirm' | 'update:width' | 'update:fixed' | 'update:sort' | 'update:visible' | 'update:align' | 'update:headerAlign' | 'update:footerAlign' | 'update:aggGroup' | 'update:aggFunc'
 
   export interface CustomStoreData {
-    pageData?: {
-      ps?: number
+    pagerData?: {
+      pSize?: number
     }
     alignData?: Record<string, VxeColumnPropTypes.Align>
     headerAlignData?: Record<string, VxeColumnPropTypes.HeaderAlign>

package/types/ui/index.d.ts

@@ -1,6 +1,7 @@
 import { App } from 'vue'
 import { VxeUI, getI18n, setConfig } from '@vxe-ui/core'
 import { LoadingController } from '../components/loading'
+import { ColorController } from '../components/color-picker'
 import { ModalController } from '../components/modal'
 import { DrawerController } from '../components/drawer'
 import { WatermarkController } from '../components/watermark'
@@ -34,6 +35,7 @@ export const readFile: VxeUploadDefines.ReadFileFunction
 declare module '@vxe-ui/core' {
   export interface VxeUIExport {
     loading: LoadingController
+    color: ColorController
     modal: ModalController
     drawer: DrawerController
     watermark: WatermarkController