tiddy 2.3.1 → 2.4.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import * as vue37 from "vue";
-import { AllowedComponentProps, CSSProperties, Component, DefineComponent, ExtractPublicPropTypes, PropType, Raw, Ref as Ref$1, Slot } from "vue";
+import * as vue14 from "vue";
+import { AllowedComponentProps, CSSProperties, Component, ComputedRef, DefineComponent, ExtractPublicPropTypes, 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";
 
@@ -241,7 +241,8 @@ 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]> };
+declare function widget<T>(c: T | Raw<T>, props?: OrRef<PropsOrRef<PropsOf<T>>>): {
   component: T | Raw<T>;
   widget: any;
 };
@@ -252,7 +253,7 @@ declare function isValidateError(prop: string): boolean;
 declare const expose$1: {
   reValidateErrorFields: typeof reValidateErrorFields;
   isValidateError: typeof isValidateError;
-  model: vue37.ComputedRef<unknown>;
+  model: vue14.ComputedRef<unknown>;
 };
 type __TdFormExpose = typeof expose$1 & FormInstance;
 declare var __VLS_11$2: {}, __VLS_13$1: {}, __VLS_19$1: {};
@@ -263,24 +264,24 @@ type __VLS_Slots$4 = {} & {
 } & {
   suffix?: (props: typeof __VLS_19$1) => any;
 };
-declare const __VLS_base$4: vue37.DefineComponent<vue37.ExtractPropTypes<{
+declare const __VLS_base$4: vue14.DefineComponent<vue14.ExtractPropTypes<{
   fields: {
-    type: vue37.PropType<TdFormFieldProps[]>;
+    type: vue14.PropType<TdFormFieldProps[]>;
     default: () => never[];
   };
   item: {
-    type: vue37.PropType<element_plus0.FormItemProps>;
+    type: vue14.PropType<element_plus0.FormItemProps>;
     default: () => {};
   };
-}>, __TdFormExpose, {}, {}, {}, vue37.ComponentOptionsMixin, vue37.ComponentOptionsMixin, {
+}>, __TdFormExpose, {}, {}, {}, vue14.ComponentOptionsMixin, vue14.ComponentOptionsMixin, {
   submit: (data: any) => any;
-}, string, vue37.PublicProps, Readonly<vue37.ExtractPropTypes<{
+}, string, vue14.PublicProps, Readonly<vue14.ExtractPropTypes<{
   fields: {
-    type: vue37.PropType<TdFormFieldProps[]>;
+    type: vue14.PropType<TdFormFieldProps[]>;
     default: () => never[];
   };
   item: {
-    type: vue37.PropType<element_plus0.FormItemProps>;
+    type: vue14.PropType<element_plus0.FormItemProps>;
     default: () => {};
   };
 }>> & Readonly<{
@@ -288,7 +289,7 @@ declare const __VLS_base$4: vue37.DefineComponent<vue37.ExtractPropTypes<{
 }>, {
   fields: TdFormFieldProps[];
   item: element_plus0.FormItemProps;
-}, {}, {}, {}, string, vue37.ComponentProvideOptions, true, {}, any>;
+}, {}, {}, {}, string, vue14.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 +301,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: vue37.DefineComponent<vue37.ExtractPropTypes<{
+declare const __VLS_base$3: vue14.DefineComponent<vue14.ExtractPropTypes<{
   messageLabel: {
-    type: vue37.PropType<OrRef<string>>;
+    type: vue14.PropType<OrRef<string>>;
     default: string;
   };
   formatMessage: {
-    type: vue37.PropType<AnyFunction>;
+    type: vue14.PropType<AnyFunction>;
     default: null;
   };
   hideRequiredAsterisk: {
-    type: vue37.PropType<boolean>;
+    type: vue14.PropType<boolean>;
     default: boolean;
   };
-}>, {}, {}, {}, {}, vue37.ComponentOptionsMixin, vue37.ComponentOptionsMixin, {}, string, vue37.PublicProps, Readonly<vue37.ExtractPropTypes<{
+}>, {}, {}, {}, {}, vue14.ComponentOptionsMixin, vue14.ComponentOptionsMixin, {}, string, vue14.PublicProps, Readonly<vue14.ExtractPropTypes<{
   messageLabel: {
-    type: vue37.PropType<OrRef<string>>;
+    type: vue14.PropType<OrRef<string>>;
     default: string;
   };
   formatMessage: {
-    type: vue37.PropType<AnyFunction>;
+    type: vue14.PropType<AnyFunction>;
     default: null;
   };
   hideRequiredAsterisk: {
-    type: vue37.PropType<boolean>;
+    type: vue14.PropType<boolean>;
     default: boolean;
   };
 }>> & Readonly<{}>, {
   hideRequiredAsterisk: boolean;
   messageLabel: any;
   formatMessage: AnyFunction;
-}, {}, {}, {}, string, vue37.ComponentProvideOptions, true, {}, any>;
+}, {}, {}, {}, string, vue14.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 +341,7 @@ type __VLS_WithSlots$3<T, S> = T & {
 };
 //#endregion
 //#region src/form/form-field.vue.d.ts
-declare const __VLS_export$4: vue37.DefineComponent<{}, {}, {}, {}, {}, vue37.ComponentOptionsMixin, vue37.ComponentOptionsMixin, {}, string, vue37.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, vue37.ComponentProvideOptions, true, {}, any>;
+declare const __VLS_export$4: vue14.DefineComponent<{}, {}, {}, {}, {}, vue14.ComponentOptionsMixin, vue14.ComponentOptionsMixin, {}, string, vue14.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, vue14.ComponentProvideOptions, true, {}, any>;
 declare const _default$3: typeof __VLS_export$4;
 //#endregion
 //#region src/form/index.d.ts
@@ -388,19 +389,19 @@ type __VLS_Slots$2 = {} & { [K in NonNullable<typeof __VLS_16>]?: (props: typeof
 } & {
   after?: (props: typeof __VLS_19) => any;
 };
-declare const __VLS_base$2: vue37.DefineComponent<vue37.ExtractPropTypes<{
+declare const __VLS_base$2: vue14.DefineComponent<vue14.ExtractPropTypes<{
   columns: {
-    type: vue37.PropType<TdTableColumnProps[]>;
+    type: vue14.PropType<TdTableColumnProps[]>;
     default: () => never[];
   };
-}>, TableInstance, {}, {}, {}, vue37.ComponentOptionsMixin, vue37.ComponentOptionsMixin, {}, string, vue37.PublicProps, Readonly<vue37.ExtractPropTypes<{
+}>, TableInstance, {}, {}, {}, vue14.ComponentOptionsMixin, vue14.ComponentOptionsMixin, {}, string, vue14.PublicProps, Readonly<vue14.ExtractPropTypes<{
   columns: {
-    type: vue37.PropType<TdTableColumnProps[]>;
+    type: vue14.PropType<TdTableColumnProps[]>;
     default: () => never[];
   };
 }>> & Readonly<{}>, {
   columns: TdTableColumnProps[];
-}, {}, {}, {}, string, vue37.ComponentProvideOptions, true, {}, any>;
+}, {}, {}, {}, string, vue14.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 +411,55 @@ type __VLS_WithSlots$2<T, S> = T & {
 };
 //#endregion
 //#region src/table/table-col.vue.d.ts
-declare const __VLS_export$2: vue37.DefineComponent<vue37.ExtractPropTypes<{
+declare const __VLS_export$2: vue14.DefineComponent<vue14.ExtractPropTypes<{
   slots: {
-    type: vue37.PropType<OrArray<SlotDef>>;
+    type: vue14.PropType<OrArray<SlotDef>>;
     default: null;
   };
   columns: {
-    type: vue37.PropType<TdTableColumnProps[]>;
+    type: vue14.PropType<TdTableColumnProps[]>;
     default: () => never[];
   };
   transform: {
-    type: vue37.PropType<AnyFunction[]>;
+    type: vue14.PropType<AnyFunction[]>;
     default: () => never[];
   };
   hide: {
-    type: vue37.PropType<boolean | vue37.Ref<boolean>>;
+    type: vue14.PropType<boolean | vue14.Ref<boolean>>;
     default: false;
   };
   dangerouslyUseHTMLString: {
-    type: vue37.PropType<boolean | vue37.Ref<boolean>>;
+    type: vue14.PropType<boolean | vue14.Ref<boolean>>;
     default: false;
   };
-}>, {}, {}, {}, {}, vue37.ComponentOptionsMixin, vue37.ComponentOptionsMixin, {}, string, vue37.PublicProps, Readonly<vue37.ExtractPropTypes<{
+}>, {}, {}, {}, {}, vue14.ComponentOptionsMixin, vue14.ComponentOptionsMixin, {}, string, vue14.PublicProps, Readonly<vue14.ExtractPropTypes<{
   slots: {
-    type: vue37.PropType<OrArray<SlotDef>>;
+    type: vue14.PropType<OrArray<SlotDef>>;
     default: null;
   };
   columns: {
-    type: vue37.PropType<TdTableColumnProps[]>;
+    type: vue14.PropType<TdTableColumnProps[]>;
     default: () => never[];
   };
   transform: {
-    type: vue37.PropType<AnyFunction[]>;
+    type: vue14.PropType<AnyFunction[]>;
     default: () => never[];
   };
   hide: {
-    type: vue37.PropType<boolean | vue37.Ref<boolean>>;
+    type: vue14.PropType<boolean | vue14.Ref<boolean>>;
     default: false;
   };
   dangerouslyUseHTMLString: {
-    type: vue37.PropType<boolean | vue37.Ref<boolean>>;
+    type: vue14.PropType<boolean | vue14.Ref<boolean>>;
     default: false;
   };
 }>> & Readonly<{}>, {
-  hide: boolean | vue37.Ref<boolean, boolean>;
+  hide: boolean | vue14.Ref<boolean, boolean>;
   slots: OrArray<SlotDef>;
   columns: TdTableColumnProps[];
   transform: AnyFunction[];
-  dangerouslyUseHTMLString: boolean | vue37.Ref<boolean, boolean>;
-}, {}, {}, {}, string, vue37.ComponentProvideOptions, true, {}, any>;
+  dangerouslyUseHTMLString: boolean | vue14.Ref<boolean, boolean>;
+}, {}, {}, {}, string, vue14.ComponentProvideOptions, true, {}, any>;
 declare const _default$6: typeof __VLS_export$2;
 //#endregion
 //#region src/table/index.d.ts
@@ -491,7 +492,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: vue37.DefineComponent<{}, __TdDialogExpose, {}, {}, {}, vue37.ComponentOptionsMixin, vue37.ComponentOptionsMixin, {}, string, vue37.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, vue37.ComponentProvideOptions, true, {}, any>;
+declare const __VLS_base$1: vue14.DefineComponent<{}, __TdDialogExpose, {}, {}, {}, vue14.ComponentOptionsMixin, vue14.ComponentOptionsMixin, {}, string, vue14.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, vue14.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,33 +506,32 @@ type Instance = InstanceType<typeof _default>;
 type TdDialogInstance = Instance & Omit<DialogInstance, keyof Instance & string>;
 //#endregion
 //#region src/enum-select/store.d.ts
-type DataOption = {
+type OptionItem<T = any, E = undefined> = E extends undefined ? {
+  label: string;
+  value: T;
+} : {
+  label: string;
+  value: T;
+} & E;
+type EnumData<T extends OptionItem> = {
   loading: boolean;
-  options: Array<{
-    label: string;
-    value: string;
-  }>;
-  fetch?: (code: string) => Promise<Array<{
-    label: string;
-    value: string;
-  }>>;
+  options: Array<T>;
+  fetch?: (code: string) => Promise<T[]>;
 };
 declare function clearEnum(code: string): void;
-declare function getEnum(code: string, value: string, fetch?: DataOption['fetch']): vue37.ComputedRef<{
-  label: string;
-  value: string;
-} | 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['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['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: vue37.DefineComponent<__VLS_Props, SelectInstance, {}, {}, {}, vue37.ComponentOptionsMixin, vue37.ComponentOptionsMixin, {}, string, vue37.PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, vue37.ComponentProvideOptions, false, {}, any>;
+declare const __VLS_base: vue14.DefineComponent<__VLS_Props, SelectInstance, {}, {}, {}, vue14.ComponentOptionsMixin, vue14.ComponentOptionsMixin, {}, string, vue14.PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, vue14.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 & {
@@ -544,10 +544,10 @@ type __VLS_WithSlots<T, S> = T & {
 type TdEnumSelectInstance = InstanceType<typeof _default$1>;
 //#endregion
 //#region src/hooks/use-reuse.d.ts
-declare function useReuse(): (vue37.DefineComponent<{}, () => null, {}, {}, {}, vue37.ComponentOptionsMixin, vue37.ComponentOptionsMixin, {}, string, vue37.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, vue37.ComponentProvideOptions, true, {}, any> | vue37.DefineComponent<{}, () => vue37.VNode<vue37.RendererNode, vue37.RendererElement, {
+declare function useReuse(): (vue14.DefineComponent<{}, () => null, {}, {}, {}, vue14.ComponentOptionsMixin, vue14.ComponentOptionsMixin, {}, string, vue14.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, vue14.ComponentProvideOptions, true, {}, any> | vue14.DefineComponent<{}, () => vue14.VNode<vue14.RendererNode, vue14.RendererElement, {
   [key: string]: any;
-}>[] | undefined, {}, {}, {}, vue37.ComponentOptionsMixin, vue37.ComponentOptionsMixin, {}, string, vue37.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, vue37.ComponentProvideOptions, true, {}, any> | vue37.ComputedRef<Readonly<{
-  [name: string]: vue37.Slot<any> | undefined;
+}>[] | undefined, {}, {}, {}, vue14.ComponentOptionsMixin, vue14.ComponentOptionsMixin, {}, string, vue14.PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, vue14.ComponentProvideOptions, true, {}, any> | vue14.ComputedRef<Readonly<{
+  [name: string]: vue14.Slot<any> | undefined;
 }>>)[];
 //#endregion
 //#region src/utils/index.d.ts

package/dist/index.js

@@ -440,13 +440,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"));
@@ -1015,9 +1016,12 @@ function clearEnum(code) {
 	if (!data) return;
 	data.options = [];
 }
-function getEnum(code, value, fetch) {
+function getEnum(code, valueOrFetch, fetch) {
+	const value = isFunction(valueOrFetch) ? void 0 : valueOrFetch;
+	const fetchArg = isFunction(valueOrFetch) ? valueOrFetch : fetch;
+	if (isNullOrUndef(value)) return getOptions(code, fetchArg);
 	return computed(() => {
-		return getOptions(code, fetch).value.find((item) => item.value === value);
+		return getOptions(code, fetchArg).value.find((item) => item.value === value);
 	});
 }
 function resetEnum(code) {

package/package.json

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