vxe-pc-ui 4.6.0 → 4.6.2

package/packages/language/uk-UA.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} років'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: 'Січень',

package/packages/language/uz-UZ.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} yillar'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: '01 oy',

package/packages/language/vi-VN.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} năm'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: 'Tháng Một',

package/packages/language/zh-CHT.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} 年'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: '01 月',

package/packages/language/zh-CN.ts

@@ -245,6 +245,9 @@ export default {
     datePicker: {
       yearTitle: '{0} 年'
     },
+    dateRangePicker: {
+      pleaseRange: '请选择开始日期与结束日期'
+    },
     input: {
       date: {
         m1: '01 月',

package/styles/components/form.scss

@@ -247,6 +247,7 @@
     .vxe-number-input,
     .vxe-password-input,
     .vxe-date-picker,
+    .vxe-date-range-picker,
     .vxe-textarea,
     .vxe-select,
     .vxe-tree-select,
@@ -260,6 +261,7 @@
     .vxe-number-input,
     .vxe-password-input,
     .vxe-date-picker,
+    .vxe-date-range-picker,
     .vxe-textarea > .vxe-textarea--inner,
     .vxe-upload .vxe-upload--image-action-box,
     .vxe-upload .vxe-upload--file-action-btn > .vxe-button,
@@ -276,6 +278,7 @@
     .vxe-number-input,
     .vxe-password-input,
     .vxe-date-picker,
+    .vxe-date-range-picker,
     .vxe-textarea>.vxe-textarea--inner,
     .vxe-default-input[type="text"],
     .vxe-default-input[type="search"],

package/types/components/column.d.ts

@@ -131,6 +131,9 @@ export namespace VxeColumnPropTypes {
      */
     children?: any[]
 
+    startField?: string
+    endField?: string
+
     enabled?: boolean
     options?: any[]
     optionProps?: VxeGlobalRendererHandles.RenderOptionProps
@@ -219,6 +222,9 @@ export namespace VxeColumnPropTypes {
      */
     children?: any[]
 
+    startField?: string
+    endField?: string
+
     events?: Record<string, (cellParams: VxeColumnSlotTypes.DefaultSlotParams<D>, ...args: any[]) => any>
     options?: any[]
     optionProps?: VxeGlobalRendererHandles.RenderOptionProps
@@ -253,6 +259,9 @@ export namespace VxeColumnPropTypes {
      */
     children?: any[]
 
+    startField?: string
+    endField?: string
+
     events?: Record<string, (cellParams: VxeColumnSlotTypes.EditSlotParams<D>, ...args: any[]) => any>
     enabled?: boolean
     options?: any[]

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

@@ -70,6 +70,15 @@ export namespace VxeFormItemPropTypes {
 
   export type TitleOverflow = VxeFormPropTypes.TitleOverflow
 
+  export type Formatter<D = any> = string | ((params: {
+    $grid: VxeGridConstructor | null | undefined
+    $form: VxeFormConstructor<D>
+    data: D
+    item: VxeFormDefines.ItemInfo
+    field: string
+    itemValue: any
+  }) => string | number)
+
   export type ResetValue = string | number | any[] | object | RegExp | null | undefined | ((params: {
     $grid: VxeGridConstructor | null | undefined
     $form: VxeFormConstructor
@@ -115,6 +124,10 @@ export namespace VxeFormItemPropTypes {
       key?: string
     }
     children?: any[]
+
+    startField?: string
+    endField?: string
+
     /**
      * 渲染组件的内容（需要渲染器支持）
      */
@@ -217,6 +230,10 @@ export interface VxeFormItemProps<D = any> {
    */
   titleSuffix?: VxeFormItemPropTypes.TitleSuffix
   titleOverflow?: VxeFormItemPropTypes.TitleOverflow
+  /**
+   * 格式化显示内容
+   */
+  formatter?: VxeFormItemPropTypes.Formatter
   /**
    * 重置时的默认值
    */

package/types/components/form.d.ts

@@ -146,6 +146,13 @@ export interface FormInternalData {
     item: VxeFormDefines.ItemInfo | null
     visible: boolean
   }
+  itemFormatCache: Record<string, {
+    field: string
+    formatData?: {
+      value?: any
+      label?: any
+    }
+  }>
 }
 
 export interface FormMethods<D = any> {
@@ -257,6 +264,7 @@ export namespace VxeFormDefines {
     readonly: VxeFormItemPropTypes.Readonly
     itemRender: VxeFormItemPropTypes.ItemRender
     rules: VxeFormItemPropTypes.Rules
+    formatter: VxeFormItemPropTypes.Formatter
     // 渲染属性
     showError: boolean
     errRule: any

package/types/ui/formats.d.ts

@@ -1,3 +1,4 @@
+import { VxeFormDefines } from '../components/form'
 import { VxeTableDefines } from '../components/table'
 
 /* eslint-disable no-use-before-define */
@@ -5,6 +6,10 @@ import { VxeTableDefines } from '../components/table'
 declare module '@vxe-ui/core' {
   export namespace VxeGlobalFormatsHandles {
     export interface FormatsOptions {
+      /**
+       * 表单 - 自定义表单项格式化方法
+       */
+      formItemFormatMethod?: (params: FormItemFormatMethodParams, ...args: any[]) => string | number
       /**
        * 表格 - 自定义单元格格式化方法
        */
@@ -20,11 +25,20 @@ declare module '@vxe-ui/core' {
        */
       cellFormatMethod?: (params: TableCellFormatMethodParams, ...args: any[]) => string | number
     }
+
+    export interface FormItemFormatMethodParams {
+      itemValue: any
+      data: any
+      item: VxeFormDefines.ItemInfo
+      field: string
+    }
+
     export interface TableCellFormatMethodParams {
       cellValue: any
       row: any
       column: VxeTableDefines.ColumnInfo
     }
+
     export interface TableFooterCellFormatMethodParams {
       itemValue: any
       column: VxeTableDefines.ColumnInfo