tiddy 2.3.2 → 2.5.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import * as vue56 from "vue";
-import { AllowedComponentProps, CSSProperties, Component, ComputedRef, DefineComponent, ExtractPublicPropTypes, PropType, Raw, Ref as Ref$1, Slot } from "vue";
+import * as vue69 from "vue";
+import { AllowedComponentProps, CSSProperties, Component, ComputedRef, DefineComponent, ExtractPublicPropTypes, HTMLAttributes, PropType, Raw, Ref as Ref$1, Slot } from "vue";
 import * as element_plus0 from "element-plus";
 import { DialogInstance, DialogProps, FormInstance, FormItemProp, FormItemProps, FormItemRule, FormProps, SelectInstance, TableColumnInstance, TableInstance } from "element-plus";
 
@@ -23,6 +23,9 @@ type OrRef<T> = T | Ref<T>;
 type TdFieldsProps = {
   fields: TdFormFieldProps[];
 };
+type TdArrayFieldsProps = {
+  fields: OrFunction<TdFormFieldProps[]>;
+};
 declare const objectFieldPropsDef: {
   prop: {
     type: PropType<OrFunction<string>>;
@@ -148,7 +151,7 @@ declare const arrayFieldPropsDef: {
     type: PropType<FormProps["labelPosition"]>;
   };
   fields: {
-    type: PropType<any[]>;
+    type: PropType<OrFunction<any[]>>;
     default: () => never[];
   };
   type: {
@@ -180,7 +183,7 @@ declare const arrayFieldPropsDef: {
     default: boolean;
   };
 };
-type TdArrayFieldProps = TdFieldsProps & ExtractPublicPropTypes<typeof arrayFieldPropsDef> & AllowedComponentProps;
+type TdArrayFieldProps = TdArrayFieldsProps & ExtractPublicPropTypes<typeof arrayFieldPropsDef> & AllowedComponentProps;
 declare const layoutFieldPropsDef: {
   prop: {
     type: PropType<OrFunction<string>>;
@@ -241,9 +244,10 @@ declare const tdformItemProps: {
   };
 };
 type TdFormItemProps = ExtractPublicPropTypes<typeof tdformItemProps> & Partial<FormItemProps>;
-declare function widget<T>(c: T | Raw<T>, props?: OrRef<PropsOf<T>>): {
+type PropsOrRef<T> = { [K in keyof T]?: OrRef<T[K]> } | Ref$1<T>;
+declare function widget<T>(c: T | Raw<T>, props?: PropsOrRef<PropsOf<T> & HTMLAttributes>): {
   component: T | Raw<T>;
-  widget: any;
+  widget: PropsOrRef<PropsOf<T> & HTMLAttributes> | undefined;
 };
 //#endregion
 //#region src/form/form.vue.d.ts
@@ -252,7 +256,7 @@ declare function isValidateError(prop: string): boolean;
 declare const expose$1: {
   reValidateErrorFields: typeof reValidateErrorFields;
   isValidateError: typeof isValidateError;
-  model: vue56.ComputedRef<unknown>;
+  model: vue69.ComputedRef<unknown>;
 };
 type __TdFormExpose = typeof expose$1 & FormInstance;
 declare var __VLS_11$2: {}, __VLS_13$1: {}, __VLS_19$1: {};
@@ -263,24 +267,24 @@ type __VLS_Slots$4 = {} & {
 } & {
   suffix?: (props: typeof __VLS_19$1) => any;
 };
-declare const __VLS_base$4: vue56.DefineComponent<vue56.ExtractPropTypes<{
+declare const __VLS_base$4: vue69.DefineComponent<vue69.ExtractPropTypes<{
   fields: {
-    type: vue56.PropType<TdFormFieldProps[]>;
+    type: vue69.PropType<TdFormFieldProps[]>;
     default: () => never[];
   };
   item: {
-    type: vue56.PropType<element_plus0.FormItemProps>;
+    type: vue69.PropType<element_plus0.FormItemProps>;
     default: () => {};
   };
-}>, __TdFormExpose, {}, {}, {}, vue56.ComponentOptionsMixin, vue56.ComponentOptionsMixin, {
+}>, __TdFormExpose, {}, {}, {}, vue69.ComponentOptionsMixin, vue69.ComponentOptionsMixin, {
   submit: (data: any) => any;
-}, string, vue56.PublicProps, Readonly<vue56.ExtractPropTypes<{
+}, string, vue69.PublicProps, Readonly<vue69.ExtractPropTypes<{
   fields: {
-    type: vue56.PropType<TdFormFieldProps[]>;
+    type: vue69.PropType<TdFormFieldProps[]>;
     default: () => never[];
   };
   item: {
-    type: vue56.PropType<element_plus0.FormItemProps>;
+    type: vue69.PropType<element_plus0.FormItemProps>;
     default: () => {};
   };
 }>> & Readonly<{
@@ -288,7 +292,7 @@ declare const __VLS_base$4: vue56.DefineComponent<vue56.ExtractPropTypes<{
 }>, {
   fields: TdFormFieldProps[];
   item: element_plus0.FormItemProps;
-}, {}, {}, {}, string, vue56.ComponentProvideOptions, true, {}, any>;
+}, {}, {}, {}, string, vue69.ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export$6: __VLS_WithSlots$4<typeof __VLS_base$4, __VLS_Slots$4>;
 declare const _default$2: typeof __VLS_export$6;
 type __VLS_WithSlots$4<T, S> = T & {
@@ -300,37 +304,37 @@ type __VLS_WithSlots$4<T, S> = T & {
 //#region src/form/form-item.vue.d.ts
 declare var __VLS_10$1: string | number, __VLS_11$1: any;
 type __VLS_Slots$3 = {} & { [K in NonNullable<typeof __VLS_10$1>]?: (props: typeof __VLS_11$1) => any };
-declare const __VLS_base$3: vue56.DefineComponent<vue56.ExtractPropTypes<{
+declare const __VLS_base$3: vue69.DefineComponent<vue69.ExtractPropTypes<{
   messageLabel: {
-    type: vue56.PropType<OrRef<string>>;
+    type: vue69.PropType<OrRef<string>>;
     default: string;
   };
   formatMessage: {
-    type: vue56.PropType<AnyFunction>;
+    type: vue69.PropType<AnyFunction>;
     default: null;
   };
   hideRequiredAsterisk: {
-    type: vue56.PropType<boolean>;
+    type: vue69.PropType<boolean>;
     default: boolean;
   };
-}>, {}, {}, {}, {}, vue56.ComponentOptionsMixin, vue56.ComponentOptionsMixin, {}, string, vue56.PublicProps, Readonly<vue56.ExtractPropTypes<{
+}>, {}, {}, {}, {}, vue69.ComponentOptionsMixin, vue69.ComponentOptionsMixin, {}, string, vue69.PublicProps, Readonly<vue69.ExtractPropTypes<{
   messageLabel: {
-    type: vue56.PropType<OrRef<string>>;
+    type: vue69.PropType<OrRef<string>>;
     default: string;
   };
   formatMessage: {
-    type: vue56.PropType<AnyFunction>;
+    type: vue69.PropType<AnyFunction>;
     default: null;
   };
   hideRequiredAsterisk: {
-    type: vue56.PropType<boolean>;
+    type: vue69.PropType<boolean>;
     default: boolean;
   };
 }>> & Readonly<{}>, {
   hideRequiredAsterisk: boolean;
   messageLabel: any;
   formatMessage: AnyFunction;
-}, {}, {}, {}, string, vue56.ComponentProvideOptions, true, {}, any>;
+}, {}, {}, {}, string, vue69.ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export$5: __VLS_WithSlots$3<typeof __VLS_base$3, __VLS_Slots$3>;
 declare const _default$4: typeof __VLS_export$5;
 type __VLS_WithSlots$3<T, S> = T & {
@@ -340,7 +344,7 @@ type __VLS_WithSlots$3<T, S> = T & {
 };
 //#endregion
 //#region src/form/form-field.vue.d.ts
-declare const __VLS_export$4: vue56.DefineComponent<{}, {}, {}, {}, {}, vue56.ComponentOptionsMixin, vue56.ComponentOptionsMixin, {}, string, vue56.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, vue56.ComponentProvideOptions, true, {}, any>;
+declare const __VLS_export$4: vue69.DefineComponent<{}, {}, {}, {}, {}, vue69.ComponentOptionsMixin, vue69.ComponentOptionsMixin, {}, string, vue69.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, vue69.ComponentProvideOptions, true, {}, any>;
 declare const _default$3: typeof __VLS_export$4;
 //#endregion
 //#region src/form/index.d.ts
@@ -388,19 +392,19 @@ type __VLS_Slots$2 = {} & { [K in NonNullable<typeof __VLS_16>]?: (props: typeof
 } & {
   after?: (props: typeof __VLS_19) => any;
 };
-declare const __VLS_base$2: vue56.DefineComponent<vue56.ExtractPropTypes<{
+declare const __VLS_base$2: vue69.DefineComponent<vue69.ExtractPropTypes<{
   columns: {
-    type: vue56.PropType<TdTableColumnProps[]>;
+    type: vue69.PropType<TdTableColumnProps[]>;
     default: () => never[];
   };
-}>, TableInstance, {}, {}, {}, vue56.ComponentOptionsMixin, vue56.ComponentOptionsMixin, {}, string, vue56.PublicProps, Readonly<vue56.ExtractPropTypes<{
+}>, TableInstance, {}, {}, {}, vue69.ComponentOptionsMixin, vue69.ComponentOptionsMixin, {}, string, vue69.PublicProps, Readonly<vue69.ExtractPropTypes<{
   columns: {
-    type: vue56.PropType<TdTableColumnProps[]>;
+    type: vue69.PropType<TdTableColumnProps[]>;
     default: () => never[];
   };
 }>> & Readonly<{}>, {
   columns: TdTableColumnProps[];
-}, {}, {}, {}, string, vue56.ComponentProvideOptions, true, {}, any>;
+}, {}, {}, {}, string, vue69.ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export$3: __VLS_WithSlots$2<typeof __VLS_base$2, __VLS_Slots$2>;
 declare const _default$5: typeof __VLS_export$3;
 type __VLS_WithSlots$2<T, S> = T & {
@@ -410,55 +414,55 @@ type __VLS_WithSlots$2<T, S> = T & {
 };
 //#endregion
 //#region src/table/table-col.vue.d.ts
-declare const __VLS_export$2: vue56.DefineComponent<vue56.ExtractPropTypes<{
+declare const __VLS_export$2: vue69.DefineComponent<vue69.ExtractPropTypes<{
   slots: {
-    type: vue56.PropType<OrArray<SlotDef>>;
+    type: vue69.PropType<OrArray<SlotDef>>;
     default: null;
   };
   columns: {
-    type: vue56.PropType<TdTableColumnProps[]>;
+    type: vue69.PropType<TdTableColumnProps[]>;
     default: () => never[];
   };
   transform: {
-    type: vue56.PropType<AnyFunction[]>;
+    type: vue69.PropType<AnyFunction[]>;
     default: () => never[];
   };
   hide: {
-    type: vue56.PropType<boolean | vue56.Ref<boolean>>;
+    type: vue69.PropType<boolean | vue69.Ref<boolean>>;
     default: false;
   };
   dangerouslyUseHTMLString: {
-    type: vue56.PropType<boolean | vue56.Ref<boolean>>;
+    type: vue69.PropType<boolean | vue69.Ref<boolean>>;
     default: false;
   };
-}>, {}, {}, {}, {}, vue56.ComponentOptionsMixin, vue56.ComponentOptionsMixin, {}, string, vue56.PublicProps, Readonly<vue56.ExtractPropTypes<{
+}>, {}, {}, {}, {}, vue69.ComponentOptionsMixin, vue69.ComponentOptionsMixin, {}, string, vue69.PublicProps, Readonly<vue69.ExtractPropTypes<{
   slots: {
-    type: vue56.PropType<OrArray<SlotDef>>;
+    type: vue69.PropType<OrArray<SlotDef>>;
     default: null;
   };
   columns: {
-    type: vue56.PropType<TdTableColumnProps[]>;
+    type: vue69.PropType<TdTableColumnProps[]>;
     default: () => never[];
   };
   transform: {
-    type: vue56.PropType<AnyFunction[]>;
+    type: vue69.PropType<AnyFunction[]>;
     default: () => never[];
   };
   hide: {
-    type: vue56.PropType<boolean | vue56.Ref<boolean>>;
+    type: vue69.PropType<boolean | vue69.Ref<boolean>>;
     default: false;
   };
   dangerouslyUseHTMLString: {
-    type: vue56.PropType<boolean | vue56.Ref<boolean>>;
+    type: vue69.PropType<boolean | vue69.Ref<boolean>>;
     default: false;
   };
 }>> & Readonly<{}>, {
   slots: OrArray<SlotDef>;
   columns: TdTableColumnProps[];
   transform: AnyFunction[];
-  hide: boolean | vue56.Ref<boolean, boolean>;
-  dangerouslyUseHTMLString: boolean | vue56.Ref<boolean, boolean>;
-}, {}, {}, {}, string, vue56.ComponentProvideOptions, true, {}, any>;
+  hide: boolean | vue69.Ref<boolean, boolean>;
+  dangerouslyUseHTMLString: boolean | vue69.Ref<boolean, boolean>;
+}, {}, {}, {}, string, vue69.ComponentProvideOptions, true, {}, any>;
 declare const _default$6: typeof __VLS_export$2;
 //#endregion
 //#region src/table/index.d.ts
@@ -491,7 +495,7 @@ declare var __VLS_13: "default" | "title" | "header" | "footer", __VLS_14: {
     titleClass?: string | undefined;
   };
 type __VLS_Slots$1 = {} & { [K in NonNullable<typeof __VLS_13>]?: (props: typeof __VLS_14) => any };
-declare const __VLS_base$1: vue56.DefineComponent<{}, __TdDialogExpose, {}, {}, {}, vue56.ComponentOptionsMixin, vue56.ComponentOptionsMixin, {}, string, vue56.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, vue56.ComponentProvideOptions, true, {}, any>;
+declare const __VLS_base$1: vue69.DefineComponent<{}, __TdDialogExpose, {}, {}, {}, vue69.ComponentOptionsMixin, vue69.ComponentOptionsMixin, {}, string, vue69.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, vue69.ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export$1: __VLS_WithSlots$1<typeof __VLS_base$1, __VLS_Slots$1>;
 declare const _default: typeof __VLS_export$1;
 type __VLS_WithSlots$1<T, S> = T & {
@@ -505,29 +509,32 @@ type Instance = InstanceType<typeof _default>;
 type TdDialogInstance = Instance & Omit<DialogInstance, keyof Instance & string>;
 //#endregion
 //#region src/enum-select/store.d.ts
-type OptionItem<T> = {
+type OptionItem<T = any, E = undefined> = E extends undefined ? {
   label: string;
   value: T;
-};
-type DataOption<T> = {
+} : {
+  label: string;
+  value: T;
+} & E;
+type EnumData<T extends OptionItem> = {
   loading: boolean;
-  options: Array<OptionItem<T>>;
-  fetch?: (code: string) => Promise<OptionItem<T>[]>;
+  options: Array<T>;
+  fetch?: (code: string) => Promise<T[]>;
 };
 declare function clearEnum(code: string): void;
-declare function getEnum<T>(code: string, fetch?: DataOption<T>['fetch']): ComputedRef<OptionItem<T>[]>;
-declare function getEnum<T>(code: string, value: T, fetch?: DataOption<T>['fetch']): ComputedRef<OptionItem<T> | undefined>;
+declare function getEnum<V, E = undefined>(code: string, fetch?: EnumData<OptionItem<V, E>>['fetch']): ComputedRef<OptionItem<V, E>[]>;
+declare function getEnum<V, E = undefined>(code: string, value: V, fetch?: EnumData<OptionItem<V, E>>['fetch']): ComputedRef<OptionItem<V, E> | undefined>;
 declare function resetEnum(code: string): void;
-declare function setDefaultEnumFetch(fetch: Exclude<DataOption<any>['fetch'], undefined>): void;
+declare function setDefaultEnumFetch(fetch: Exclude<EnumData<any>['fetch'], undefined>): void;
 //#endregion
 //#region src/enum-select/enum-select.vue.d.ts
 type __VLS_Props = {
   code: string;
-  fetch?: DataOption<any>['fetch'];
+  fetch?: EnumData<any>['fetch'];
 };
 declare var __VLS_10: string | number, __VLS_11: any;
 type __VLS_Slots = {} & { [K in NonNullable<typeof __VLS_10>]?: (props: typeof __VLS_11) => any };
-declare const __VLS_base: vue56.DefineComponent<__VLS_Props, SelectInstance, {}, {}, {}, vue56.ComponentOptionsMixin, vue56.ComponentOptionsMixin, {}, string, vue56.PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, vue56.ComponentProvideOptions, false, {}, any>;
+declare const __VLS_base: vue69.DefineComponent<__VLS_Props, SelectInstance, {}, {}, {}, vue69.ComponentOptionsMixin, vue69.ComponentOptionsMixin, {}, string, vue69.PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, vue69.ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
 declare const _default$1: typeof __VLS_export;
 type __VLS_WithSlots<T, S> = T & {
@@ -540,10 +547,10 @@ type __VLS_WithSlots<T, S> = T & {
 type TdEnumSelectInstance = InstanceType<typeof _default$1>;
 //#endregion
 //#region src/hooks/use-reuse.d.ts
-declare function useReuse(): (vue56.DefineComponent<{}, () => null, {}, {}, {}, vue56.ComponentOptionsMixin, vue56.ComponentOptionsMixin, {}, string, vue56.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, vue56.ComponentProvideOptions, true, {}, any> | vue56.DefineComponent<{}, () => vue56.VNode<vue56.RendererNode, vue56.RendererElement, {
+declare function useReuse(): (vue69.DefineComponent<{}, () => null, {}, {}, {}, vue69.ComponentOptionsMixin, vue69.ComponentOptionsMixin, {}, string, vue69.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, vue69.ComponentProvideOptions, true, {}, any> | vue69.DefineComponent<{}, () => vue69.VNode<vue69.RendererNode, vue69.RendererElement, {
   [key: string]: any;
-}>[] | undefined, {}, {}, {}, vue56.ComponentOptionsMixin, vue56.ComponentOptionsMixin, {}, string, vue56.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, vue56.ComponentProvideOptions, true, {}, any> | vue56.ComputedRef<Readonly<{
-  [name: string]: vue56.Slot<any> | undefined;
+}>[] | undefined, {}, {}, {}, vue69.ComponentOptionsMixin, vue69.ComponentOptionsMixin, {}, string, vue69.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, vue69.ComponentProvideOptions, true, {}, any> | vue69.ComputedRef<Readonly<{
+  [name: string]: vue69.Slot<any> | undefined;
 }>>)[];
 //#endregion
 //#region src/utils/index.d.ts

package/dist/index.js

@@ -46,6 +46,10 @@ const fieldsPropsDef = { fields: {
 	type: Array,
 	default: () => []
 } };
+const arrayFieldsPropsDef = { fields: {
+	type: [Array, Function],
+	default: () => []
+} };
 const commonFieldPropsDef = {
 	prop: {
 		type: [String, Function],
@@ -188,7 +192,7 @@ const arrayFieldPropsDef = {
 		type: Boolean,
 		default: false
 	},
-	...fieldsPropsDef,
+	...arrayFieldsPropsDef,
 	...commonFieldPropsDef
 };
 const layoutFieldPropsDef = {
@@ -440,13 +444,14 @@ var widget_field_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ d
 		});
 		const Widget = resolveWidget(props.component);
 		const widgetAttrs = computed(() => {
-			return {
-				...pick(attrs, [{
-					from: /^widget/,
-					to: (k) => toCamelCase(k.slice(6))
-				}]),
+			const attr4Widget = pick(attrs, [{
+				from: /^widget/,
+				to: (k) => toCamelCase(k.slice(6))
+			}]);
+			return Object.fromEntries(Object.entries({
+				...attr4Widget,
 				...unref(props.widget)
-			};
+			}).map(([k, v]) => [k, unref(v)]));
 		});
 		const widgetSlots = formCtx.getParentSlots(resolveSlotNames(props.slots, props.prop));
 		const formItemSlots = formCtx.getParentSlots(resolveSlotNames(props.itemSlots, props.prop, "item"));
@@ -683,9 +688,11 @@ var form_field_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ def
 	setup(__props) {
 		const attrs = useAttrs();
 		const fullProp = computed(() => attrs["full-prop"] || attrs.prop);
+		const formCtx = inject(formCtxKey);
 		const fieldAttrs = computed(() => {
 			const attr = {};
 			for (const [k, v] of Object.entries(attrs)) if (k === "component" && v) attr[k] = markRaw(toRaw(v));
+			else if (k === "fields" && isFunction(v) && !attrs.type) attr[k] = v(getDeepValue(formCtx.model, attrs["full-prop"]));
 			else attr[k] = v;
 			return attr;
 		});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiddy",
-  "version": "2.3.2",
+  "version": "2.5.0",
   "packageManager": "pnpm@10.11.0",
   "description": "A set of Vue 3 components based on element-plus",
   "type": "module",