@wyfex/ivue 0.22.0 → 0.22.2

package/dist/types/UseCrud/defaultExtConfig.d.ts

@@ -1,7 +1,7 @@
 declare const _default: {
-    crudFetch: {
-        queryImmediate: true;
-        autoCancelQueryStrategy: "unmount";
+    query: {
+        immediate: true;
+        autoCancelStrategy: "unmount";
     };
     mode: {
         type: "PAGE";

package/dist/types/UseCrud/hook.d.ts

@@ -1,9 +1,11 @@
-import { ComputedRef, Slots } from 'vue';
+import { ComputedRef, Slots, Ref } from 'vue';
 import { Props, UseCrudReturn } from './types';
 import { GlobalConfig } from '../../types';
-export declare const useCrud: ({ mergedProps, globalConfig, slots, uefRef, modalRef }: {
+export declare const useCrud: ({ mergedProps, globalConfig, waitDictReady, dictKeys, slots, uefRef, modalRef }: {
     mergedProps: ComputedRef<Props>;
     globalConfig: ComputedRef<GlobalConfig>;
+    waitDictReady: Function;
+    dictKeys: Ref<string[]>;
     slots: Slots;
     uefRef: any;
     modalRef: any;

package/dist/types/UseCrud/index.vue.d.ts

@@ -3,6 +3,10 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
         type: import('vue').PropType<import('./types').Configs[]>;
         required: boolean;
     };
+    dict: {
+        type: import('vue').PropType<import('../../types').Dict>;
+        default: () => {};
+    };
     extConfig: {
         type: import('vue').PropType<import('./types').MergedExtConfig>;
         default: () => {};
@@ -14,7 +18,8 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
     handleDelete: (payload: {
         id?: string | number;
         ids?: string | Array<string | number>;
-    }, loadingConfig: {
+    }, config: {
+        api: Function;
         source?: Record<string, unknown>;
         key?: string;
     }, successCb?: () => void, errorCb?: (err: unknown) => void, successMsg?: string) => Promise<void>;
@@ -28,6 +33,10 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
         type: import('vue').PropType<import('./types').Configs[]>;
         required: boolean;
     };
+    dict: {
+        type: import('vue').PropType<import('../../types').Dict>;
+        default: () => {};
+    };
     extConfig: {
         type: import('vue').PropType<import('./types').MergedExtConfig>;
         default: () => {};
@@ -36,6 +45,7 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
     onOnDictKeys?: ((value?: string[] | undefined) => any) | undefined;
 }>, {
     extConfig: import('./types').MergedExtConfig;
+    dict: import('../../types').Dict;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/types/UseCrud/props.d.ts

@@ -1,10 +1,15 @@
 import { PropType } from 'vue';
 import { Configs, MergedExtConfig } from './types';
+import { Dict } from '../../types';
 declare const _default: {
     configs: {
         type: PropType<Configs[]>;
         required: boolean;
     };
+    dict: {
+        type: PropType<Dict>;
+        default: () => {};
+    };
     extConfig: {
         type: PropType<MergedExtConfig>;
         default: () => {};

package/dist/types/UseCrud/types.d.ts

@@ -26,14 +26,6 @@ export interface ActionBar {
     divider?: Divider;
 }
 export interface ExtConfig {
-    crudFetch?: {
-        queryApi?: Function;
-        queryImmediate?: boolean;
-        autoCancelQueryStrategy?: 'none' | 'unmount' | 'deactivate' | 'both';
-        onQueryBefore?: (done: () => void) => void;
-        onQueryError?: (err: any) => void;
-        deleteApi?: Function;
-    };
     actionBar?: ActionBar;
     modal?: {
         type?: 'Drawer' | 'Dialog';
@@ -44,12 +36,12 @@ export interface UseCrudState {
     formColumns: FormColumn[];
     tableColumns: TableColumn[];
     formModel: Record<string, any>;
+    formParams: Record<string, any>;
     tableLoading: boolean;
     tableData: any[];
     currentPage: number;
     pageSize: number;
     total: number;
-    dictMap: Record<string, any>;
 }
 export interface UseCrudReturn {
     state: Ref<UseCrudState>;
@@ -63,7 +55,8 @@ export interface UseCrudReturn {
     handleDelete: (payload: {
         id?: string | number;
         ids?: string | Array<string | number>;
-    }, loadingConfig: {
+    }, config: {
+        api: Function;
         source?: Record<string, unknown>;
         key?: string;
     }, successCb?: () => void, errorCb?: (err: unknown) => void, successMsg?: string) => Promise<void>;

package/dist/types/UseElConfigProvider/defaultExtConfig.d.ts

@@ -1,8 +1,14 @@
 declare const _default: {
-    dictProps: {
-        value: string;
-        label: string;
-        children: string;
+    dict: {
+        props: {
+            value: string;
+            label: string;
+            children: string;
+        };
+    };
+    queryApiPayload: {
+        records: string;
+        total: string;
     };
     table: {
         pageBottomOffset: number;

package/dist/types/UseElConfigProvider/index.vue.d.ts

@@ -23,8 +23,8 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
         default: () => {};
     };
 }>> & Readonly<{}>, {
-    extConfig: import('./types').ExtConfig;
     language: string;
+    extConfig: import('./types').ExtConfig;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/types/UseElConfigProvider/types.d.ts

@@ -1,9 +1,15 @@
 import { ExtractPropTypes } from 'vue';
 import { default as componentProps } from './props';
-import { DictProps, UploadConfig } from '../../types';
+import { Dict, UploadConfig } from '../../types';
 export type Props = ExtractPropTypes<typeof componentProps>;
+export interface QueryApiPayload {
+    default?: string;
+    records?: string;
+    total?: string;
+}
 export interface ExtConfig {
-    dictProps?: DictProps;
+    dict?: Dict;
+    queryApiPayload?: QueryApiPayload;
     crud?: {
         pageHeight?: string;
         modalHeight?: string;

package/dist/types/UseElSelect/hook.d.ts

@@ -9,7 +9,7 @@ export declare const useElSelect: ({ props, emits, globalConfig }: {
     optionsComputed: ComputedRef<{
         [x: string]: any;
     }[]>;
-    defaultProps: ComputedRef<import('../../types').DictProps>;
+    finalDictProps: import('../../types').DictProps;
     modelValue: ComputedRef<string | string[]>;
     contentComputed: ComputedRef<{}>;
     handleSelectChange: (e: string | number | (string | number)[]) => void;

package/dist/types/UseElSelect/index.vue.d.ts

@@ -7,8 +7,8 @@ declare const __VLS_export: import('vue').DefineComponent<import('vue').ExtractP
         type: import('vue').PropType<Record<string, any>[]>;
         default: () => never[];
     };
-    dictProps: {
-        type: import('vue').PropType<import('../../types').DictProps>;
+    dict: {
+        type: import('vue').PropType<import('../../types').Dict>;
         default: () => {};
     };
     useRender: {
@@ -47,8 +47,8 @@ declare const __VLS_export: import('vue').DefineComponent<import('vue').ExtractP
         type: import('vue').PropType<Record<string, any>[]>;
         default: () => never[];
     };
-    dictProps: {
-        type: import('vue').PropType<import('../../types').DictProps>;
+    dict: {
+        type: import('vue').PropType<import('../../types').Dict>;
         default: () => {};
     };
     useRender: {
@@ -80,7 +80,7 @@ declare const __VLS_export: import('vue').DefineComponent<import('vue').ExtractP
     "onUpdate:label"?: ((label: string | string[]) => any) | undefined;
 }>, {
     useRender: boolean | import('../../types').RenderConfig;
-    dictProps: import('../../types').DictProps;
+    dict: import('../../types').Dict;
     clearable: boolean;
     placeholder: string;
     width: string;

package/dist/types/UseElSelect/props.d.ts

@@ -1,5 +1,5 @@
 import { PropType } from 'vue';
-import { DictProps, RenderConfig } from '../../types';
+import { Dict, RenderConfig } from '../../types';
 declare const _default: {
     modelValue: {
         type: (ArrayConstructor | BooleanConstructor | StringConstructor | NumberConstructor)[];
@@ -9,8 +9,8 @@ declare const _default: {
         type: PropType<Record<string, any>[]>;
         default: () => never[];
     };
-    dictProps: {
-        type: PropType<DictProps>;
+    dict: {
+        type: PropType<Dict>;
         default: () => {};
     };
     useRender: {

package/dist/types/UseElTable/index.vue.d.ts

@@ -114,13 +114,13 @@ declare const __VLS_base: import('vue').DefineComponent<import('vue').ExtractPro
 }>, {
     dictMap: import('../../types').DictMap;
     dictProps: import('../../types').DictProps;
+    extConfig: import('./types').ExtConfig;
     tableLoading: boolean;
     tableColumnAlign: string;
     currentPage: number;
     pageSize: number;
     showOverflowTooltip: boolean;
     headerCellStyle: Record<string, string>;
-    extConfig: import('./types').ExtConfig;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default: typeof __VLS_export;

package/dist/types/UseElTable/types.d.ts

@@ -1,6 +1,7 @@
 import { Component, ExtractPropTypes } from 'vue';
 import { EditAttrs, GlobalConfig, UseDict } from '../../types';
 import { default as componentProps } from './props';
+import { QueryApiPayload } from '../UseElConfigProvider/types';
 export type Props = ExtractPropTypes<typeof componentProps>;
 export type Emits = {
     (e: 'onDictKeys', value?: string[]): void;
@@ -59,7 +60,18 @@ export interface Selection {
     align?: string;
     fixed?: boolean;
 }
+export type Query = {
+    api?: Function;
+    immediate?: boolean;
+    autoCancelStrategy?: 'none' | 'unmount' | 'deactivate' | 'both';
+    onQueryBefore?: (opts: {
+        dictKeys: string[];
+        done: (continueRequest?: boolean) => void;
+    }) => void;
+    onQueryError?: (err: any) => void;
+} & QueryApiPayload;
 export interface ExtConfig {
+    query?: Query;
     extraHeader?: {
         border?: boolean;
         class?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wyfex/ivue",
-  "version": "0.22.0",
+  "version": "0.22.2",
   "description": "万有前端 X 体系下基于 Vite8 + Vue3 + Typescript6 + ElementPlus2 构建的以配置驱动视图组件库",
   "homepage": "https://wyfex.top/idocs/ivue",
   "type": "module",
@@ -50,19 +50,19 @@
     "vue": ">=3.2.0 <4.0.0"
   },
   "devDependencies": {
-    "@types/node": "^26.4.0",
+    "@types/node": "^26.4.1",
     "@vitejs/plugin-vue": "^6.0.8",
     "@vue/tsconfig": "^0.9.1",
-    "@wyfex/iutils": "^0.80.0",
+    "@wyfex/iutils": "^0.95.0",
     "dayjs": "^1.11.23",
     "element-plus": "^2.14.5",
     "sass-embedded": "^1.103.1",
     "typescript": "~6.0.3",
     "unplugin-auto-import": "^21.1.0",
-    "unplugin-dts": "^1.0.3",
+    "unplugin-dts": "^1.1.0",
     "unplugin-vue-components": "^32.1.0",
     "vite": "^8.2.2",
-    "vite-svg-loader": "^5.1.2",
+    "vite-svg-loader": "^5.1.3",
     "vue": "^3.5.42",
     "vue-tsc": "^3.3.11"
   }

package/src/components/UseCrud/defaultExtConfig.ts

@@ -4,7 +4,7 @@ import type { MergedExtConfig } from './types'
  * 默认扩展配置
  */
 export default {
-  crudFetch: { queryImmediate: true, autoCancelQueryStrategy: 'unmount' },
+  query: { immediate: true, autoCancelStrategy: 'unmount' },
   mode: { type: 'PAGE' },
   actionBar: {
     margin: '20px 0',

package/src/components/UseCrud/props.ts

@@ -1,5 +1,6 @@
 import type { PropType } from 'vue'
 import type { Configs, MergedExtConfig } from './types'
+import type { Dict } from '@/types'
 
 /**
  * 组件props
@@ -14,6 +15,13 @@ export default {
     type: Array as PropType<Configs[]>,
     required: true
   },
+  /**
+   * 字典 可配置api、payload和props等，默认由UseElConfigProvider提供
+   */
+  dict: {
+    type: Object as PropType<Dict>,
+    default: () => ({})
+  },
   /**
    * 扩展配置 如【操作栏/弹窗】等
    * 该extConfig是本组件extConfig和UseElTable组件extConfig合并后的扩展配置

package/src/components/UseCrud/types.ts

@@ -76,21 +76,6 @@ export interface ActionBar {
  * extConfig接口
  */
 export interface ExtConfig {
-  /** 增删改查请求配置项 */
-  crudFetch?: {
-    /** 查询api */
-    queryApi?: Function
-    /** 是否立即查询 */
-    queryImmediate?: boolean
-    /** 自动取消查询策略 配合signal实现接口取消请求 */
-    autoCancelQueryStrategy?: 'none' | 'unmount' | 'deactivate' | 'both'
-    /** 开始查询前钩子 用于注入字典数据等 */
-    onQueryBefore?: (done: () => void) => void
-    /** 查询错误钩子  */
-    onQueryError?: (err: any) => void
-    /** 删除api */
-    deleteApi?: Function
-  }
   /** 操作栏配置项 */
   actionBar?: ActionBar
   /** 弹窗配置项 */
@@ -116,6 +101,8 @@ export interface UseCrudState {
   tableColumns: TableColumn[]
   /** 表单模型 */
   formModel: Record<string, any>
+  /** 表单查询参数 */
+  formParams: Record<string, any>
   /** 表格loading */
   tableLoading: boolean
   /** 表格数据 */
@@ -126,8 +113,6 @@ export interface UseCrudState {
   pageSize: number
   /** 分页总数 */
   total: number
-  /** 字典映射 */
-  dictMap: Record<string, any>
 }
 
 /**
@@ -144,7 +129,7 @@ export interface UseCrudReturn {
   onCancelQueryRequest: () => void
   handleDelete: (
     payload: { id?: string | number; ids?: string | Array<string | number> },
-    loadingConfig: { source?: Record<string, unknown>; key?: string },
+    config: { api: Function; source?: Record<string, unknown>; key?: string },
     successCb?: () => void,
     errorCb?: (err: unknown) => void,
     successMsg?: string

package/src/components/UseElConfigProvider/defaultExtConfig.ts

@@ -4,6 +4,7 @@ import type { ExtConfig } from './types'
  * 默认扩展配置
  */
 export default {
-  dictProps: { value: 'value', label: 'label', children: 'children' },
+  dict: { props: { value: 'value', label: 'label', children: 'children' } },
+  queryApiPayload: { records: 'records', total: 'total' },
   table: { pageBottomOffset: 20, modalBottomOffset: 92 }
 } satisfies ExtConfig

package/src/components/UseElConfigProvider/types.ts

@@ -1,18 +1,32 @@
 import type { ExtractPropTypes } from 'vue'
 import componentProps from './props'
-import type { DictProps, UploadConfig } from '@/types'
+import type { Dict, UploadConfig } from '@/types'
 
 /**
  * props类型
  */
 export type Props = ExtractPropTypes<typeof componentProps>
 
+/**
+ * 查询接口载荷接口
+ */
+export interface QueryApiPayload {
+  /** 非分页接口响应数据载荷 */
+  default?: string
+  /** 分页接口响应数据载荷 */
+  records?: string
+  /** 分页接口响应总数载荷 */
+  total?: string
+}
+
 /**
  * extConfig接口
  */
 export interface ExtConfig {
-  /** 字典属性配置项 */
-  dictProps?: DictProps
+  /** 字典配置项 */
+  dict?: Dict
+  /** 查询接口载荷配置项 */
+  queryApiPayload?: QueryApiPayload
   /** crud配置项 */
   crud?: {
     /** crud表格页面高度 extConfig.mode.type='PAGE'时生效，显式设置则表格自适应高度不生效，否则默认使用表格自适应高度 */

package/src/components/UseElSelect/props.ts

@@ -1,5 +1,5 @@
 import type { PropType } from 'vue'
-import type { DictProps, RenderConfig } from '@/types'
+import type { Dict, RenderConfig } from '@/types'
 
 /**
  * 组件props
@@ -20,10 +20,10 @@ export default {
     default: () => []
   },
   /**
-   * 字典属性 默认为{ value: 'value', label: 'label', children: 'children' }，可通过全局配置进行设置，为适配全局配置此处不再设置默认值
+   * 字典 可配置api、payload和props等，默认由UseElConfigProvider提供
    */
-  dictProps: {
-    type: Object as PropType<DictProps>,
+  dict: {
+    type: Object as PropType<Dict>,
     default: () => ({})
   },
   /**

package/src/components/UseElTable/types.ts

@@ -1,6 +1,7 @@
 import type { Component, ExtractPropTypes } from 'vue'
 import type { EditAttrs, GlobalConfig, UseDict } from '@/types'
 import componentProps from './props'
+import type { QueryApiPayload } from '../UseElConfigProvider/types'
 
 /**
  * props类型
@@ -134,10 +135,31 @@ export interface Selection {
   fixed?: boolean
 }
 
+/**
+ * 查询类型
+ */
+export type Query = {
+  /** 查询api */
+  api?: Function
+  /** 是否立即查询 */
+  immediate?: boolean
+  /** 自动取消查询策略 配合signal实现接口取消请求 */
+  autoCancelStrategy?: 'none' | 'unmount' | 'deactivate' | 'both'
+  /** 开始查询前钩子 用于注入字典数据等 */
+  onQueryBefore?: (opts: {
+    dictKeys: string[]
+    done: (continueRequest?: boolean) => void
+  }) => void
+  /** 查询错误钩子  */
+  onQueryError?: (err: any) => void
+} & QueryApiPayload
+
 /**
  * UseElTable的extConfig接口
  */
 export interface ExtConfig {
+  /** 查询配置项 */
+  query?: Query
   /** 额外表头配置项 */
   extraHeader?: {
     /** 是否显示边框线 默认和el-table的border保持一致 */

package/src/types/index.ts

@@ -68,6 +68,20 @@ export interface UseDict {
   /** 字典分割符 默认为逗号(,) */
   separator?: string
 }
+
+/**
+ * 字典接口
+ */
+export interface Dict {
+  /** 字典接口 */
+  api?: Function
+  /** 字典接口参数 */
+  apiParam?: string
+  /** 字典接口响应数据载荷 */
+  apiPayload?: string
+  /** 字典属性 */
+  props?: DictProps
+}
 // =========================== 字典相关接口 end ===========================
 
 // =========================== 其他接口 start ===========================
@@ -91,10 +105,23 @@ export interface UploadConfig {
 export interface GlobalConfig {
   /** 最终语言 */
   finalLanguage: string
+
+  /** 最终字典api */
+  finalDictApi: Function
+  /** 最终字典接口响应数据载荷 */
+  finalDictApiPayload: string
   /** 最终字典属性 */
   finalDictProps: DictProps
   /** 最终字典映射 */
   finalDictMap: DictMap
+
+  /** 最终查询接口非分页数据载荷 */
+  finalQueryApiDefaultPayload: string
+  /** 最终查询接口分页数据载荷 */
+  finalQueryApiRecordsPayload: string
+  /** 最终查询接口分页总数载荷 */
+  finalQueryApiTotalPayload: string
+
   /** 最终crud表格页面高度 */
   finalCrudTablePageHeight: string
   /** 最终crud表格弹窗高度 */
@@ -103,10 +130,12 @@ export interface GlobalConfig {
   finalTablePageHeight: string
   /** 最终表格弹窗高度 */
   finalTableModalHeight: string
+
   /** 最终表格页面底部预留偏移 */
   finalTablePageBottomOffset: number
   /** 最终表格弹窗底部预留偏移 tableMode=modal生效 */
   finalTableModalBottomOffset: number
+
   /** 最终上传配置 */
   finalUploadConfig: UploadConfig
 }