@aplus-frontend/ui 0.1.15 → 0.1.17

package/lib/src/ap-table/interface.d.ts

@@ -1,6 +1,6 @@
 import { ColumnType, TableProps } from 'ant-design-vue/es/table';
 import { CompareFn, SortOrder, TableRowSelection } from 'ant-design-vue/es/table/interface';
-import { ApFormSearchFormProps } from '../ap-form';
+import { ApFormItemProps, ApFormSearchFormProps } from '../ap-form';
 import { ApFormItemCheckboxProps, ApFormItemDateProps, ApFormItemDateRangeProps, ApFormItemNumberProps, ApFormItemRadioProps, ApFormItemSelectProps, ApFormItemSwitchProps, ApFormItemTextAreaProps, ApFormItemTextPasswordProps, ApFormItemTextProps } from '../ap-form/items/interface';
 import { Recordable } from '../type';
 import { ComputedRef, CSSProperties, VNode } from 'vue';
@@ -67,8 +67,21 @@ export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children' | 'filters' |
 export type ApTableRowSelection<RecordType = any> = Omit<TableRowSelection<RecordType>, 'selectedRowKeys' | 'onChange' | 'onSelect' | 'onSelectAll' | 'onSelectInvert' | 'onSelectNone'> & {
     mode: 'internal';
 };
-export type ApColumnType<RecordType = any, ValueType extends ApTableValueTypes = ApTableValueTypes> = ValueType extends ApTableValueTypes ? ExtraProColumnType<RecordType> & {
-    children?: ApColumnType<RecordType, ValueType>[];
+export type CommonFieldReturnType = ApFormItemProps & {
+    field: Recordable;
+    placeholder?: string;
+    disabled?: boolean;
+};
+export type FieldPropsType<ReturnType, RecordType, ExtraValueType, ValueType extends ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType> = ReturnType | ((opt: Partial<{
+    value: any;
+    text: any;
+    record: RecordType;
+    index: number;
+    renderIndex: number;
+    column: ApColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>;
+}>) => ReturnType);
+export type ApColumnType<RecordType = any, ExtraValueType = 'text', ValueType extends ApTableValueTypes = ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType = ExtraValueType | ValueType> = MergedValueType extends ExtraValueType | ValueType ? ExtraProColumnType<RecordType> & {
+    children?: ApColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>[];
     /**
      * 表单项所占据的格子数（1-24格）
      */
@@ -100,7 +113,7 @@ export type ApColumnType<RecordType = any, ValueType extends ApTableValueTypes =
     /**
      * 自定义查询表单渲染
      */
-    customRenderFormItem?: (config: ApColumnType<RecordType, ValueType>) => any;
+    customRenderFormItem?: (config: ApColumnType<RecordType>) => any;
     /**
      * 自定义渲染文本，和customRender相比，其必须返回字符串，并且后续的渲染（例如copy/ellipsis）都将使用这个值
      */
@@ -115,18 +128,11 @@ export type ApColumnType<RecordType = any, ValueType extends ApTableValueTypes =
     /**
      * 指定值类型（将会用于默认渲染和查询表单生成）
      */
-    valueType?: ValueType;
+    valueType?: MergedValueType;
     /**
      * 值类型额外配置的参数（用于查询表单渲染）
      */
-    fieldProps?: ApTableValueFields[ValueType] | ((opt: Partial<{
-        value: any;
-        text: any;
-        record: RecordType;
-        index: number;
-        renderIndex: number;
-        column: ApColumnType<RecordType, ValueType>;
-    }>) => ApTableValueFields[ValueType]);
+    fieldProps?: FieldPropsType<Extract<MergedValueType, ValueType> extends never ? CommonFieldReturnType : ApTableValueFields[Extract<MergedValueType, ValueType>], RecordType, ExtraValueType, ValueType, MergedValueType>;
     /**
      * 用于表单项排序的字段
      * @description 值越大，越排在前面，请设置正整数，设置为0或负数将会无效