@aplus-frontend/ui 0.0.15 → 0.0.16

package/es/src/ap-form/modal-form/index.vue.mjs

@@ -97,7 +97,7 @@ const Se = /* @__PURE__ */ q({
       defaultValue: !1
     }), {
       t: v
-    } = oe(), h = ie("uiMode"), {
+    } = oe(), h = ie("uiMode", "aplus"), {
       b: M,
       e: C
     } = se("ap-form-modal-form");

package/es/src/ap-table/ap-table.vue.d.ts

@@ -34,7 +34,7 @@ type ApTableSlots = {
  */
 declare function setSearchFormValues(fields: any): void;
 declare function getSearchFormValues(): Partial<any> | undefined;
-declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApTableProps<any, any, "text">>, {
+declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApTableProps<any, any>>, {
     bordered: boolean;
     childrenColumnName: string;
     defaultExpandAllRows: boolean;
@@ -59,7 +59,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     setSearchFormValues: typeof setSearchFormValues;
     getSearchFormValues: typeof getSearchFormValues;
     dataSource: ComputedRef<any[]>;
-}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApTableProps<any, any, "text">>, {
+}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly< ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToRuntimeProps<ApTableProps<any, any>>, {
     bordered: boolean;
     childrenColumnName: string;
     defaultExpandAllRows: boolean;

package/es/src/ap-table/ap-table.vue.mjs

@@ -136,7 +136,7 @@ const Pe = {
     } = Te(), {
       e: y,
       b: u
-    } = Be("ap-table"), W = ve("uiMode"), {
+    } = Be("ap-table"), W = ve("uiMode", "aplus"), {
       height: _,
       contentRef: j
     } = we(), h = d(() => {

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

@@ -54,6 +54,7 @@ export type ApTableValueFields = {
      */
     password: ApFormItemTextPasswordProps;
 };
+export type ApTableValueTypes = keyof ApTableValueFields;
 export type ValueEnum = Record<string, ValueEnumType>;
 export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children' | 'filters'> & {
     sorter?: string | boolean | CompareFn<T> | {
@@ -62,8 +63,8 @@ export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children' | 'filters'>
         multiple?: number;
     };
 };
-export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text', RecordType = any> = ExtraProColumnType<RecordType> & {
-    children?: ApColumnType<any, RecordType>[];
+export type ApColumnType<RecordType = any, ValueType extends ApTableValueTypes = ApTableValueTypes> = ValueType extends ApTableValueTypes ? ExtraProColumnType<RecordType> & {
+    children?: ApColumnType<RecordType, ValueType>[];
     /**
      * 表单项所占据的格子数（1-24格）
      */
@@ -91,11 +92,11 @@ export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text', Re
     /**
      * 自定义查询表单渲染
      */
-    customRenderFormItem?: (config: ApColumnType) => any;
+    customRenderFormItem?: (config: ApColumnType<RecordType, ValueType>) => any;
     /**
      * 指定值类型（将会用于默认渲染和查询表单生成）
      */
-    valueType?: keyof ApTableValueFields;
+    valueType?: ValueType;
     /**
      * 值类型额外配置的参数（用于查询表单渲染）
      */
@@ -105,7 +106,7 @@ export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text', Re
         record: RecordType;
         index: number;
         renderIndex: number;
-        column: ApColumnType<ValueType, RecordType>;
+        column: ApColumnType<RecordType, ValueType>;
     }) => ApTableValueFields[ValueType]);
     /**
      * 用于表单项排序的字段
@@ -116,16 +117,16 @@ export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text', Re
      * 表头的菜单筛选项，设置为true后会尝试使用valueEnum生成filters
      */
     filters?: ColumnType<RecordType>['filters'] | true;
-};
+} : never;
 export type RequestData<T> = {
     data: T[] | undefined;
     total: number;
 } & Record<string, any>;
-export type ApTableProps<RecordType = any, ParamsType = any, ValueType extends keyof ApTableValueFields = 'text'> = Omit<TableProps<RecordType>, 'columns' | 'pagination' | 'dataSource' | 'size'> & {
+export type ApTableProps<RecordType = any, ParamsType = any> = Omit<TableProps<RecordType>, 'columns' | 'pagination' | 'dataSource' | 'size'> & {
     /**
      * 列配置
      */
-    columns?: ApColumnType<any, RecordType>[];
+    columns?: ApColumnType<RecordType, any>[];
     /**
      * 是否启用卡片样式
      */
@@ -138,13 +139,13 @@ export type ApTableProps<RecordType = any, ParamsType = any, ValueType extends k
      * 自定义渲染搜索表单
      * @deprecated 未实现 暂不可用
      */
-    searchFormRender?: (props: ApTableProps<RecordType, ParamsType, ValueType>, defaultDom: any) => any;
+    searchFormRender?: (props: ApTableProps<RecordType, ParamsType>, defaultDom: any) => any;
     /**
      * 请求获取dataSource
      * @param params
      * @returns
      */
-    request?: (params: ParamsType & {
+    request?: (params: Partial<ParamsType> & {
         pageSize?: number;
         current?: number;
         sort?: Record<string, SortOrder>;
@@ -229,6 +230,6 @@ export type ApTableExpose<SearchParamsType = Recordable, RecordType = any> = {
      */
     dataSource: ComputedRef<RecordType>;
 };
-export type FixedApColumnType<ValueType extends keyof ApTableValueFields = 'text', RecordType = any> = Omit<ApColumnType<ValueType, RecordType>, 'filters'> & {
+export type FixedApColumnType<RecordType = any, ValueType extends ApTableValueTypes = ApTableValueTypes> = Omit<ApColumnType<RecordType, ValueType>, 'filters'> & {
     filters?: ColumnType<RecordType>['filters'];
 };