tiddy 2.0.7 → 2.0.9

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as vue32 from "vue";
-import { AllowedComponentProps, CSSProperties, Component, DefineComponent, ExtractPublicPropTypes, PropType, Raw, Slot } from "vue";
+import { AllowedComponentProps, CSSProperties, Component, 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, TableColumnInstance, TableInstance } from "element-plus";
 
@@ -39,7 +39,7 @@ declare const objectFieldPropsDef: {
     type: PropType<OrFunction<string | number>>;
   };
   labelPosition: {
-    type: PropType<"left" | "right" | "auto">;
+    type: PropType<FormProps["labelPosition"]>;
   };
   fields: {
     type: PropType<any[]>;
@@ -67,7 +67,7 @@ declare const widgetFieldPropsDef: {
     type: PropType<OrFunction<string | number>>;
   };
   labelPosition: {
-    type: PropType<"left" | "right" | "auto">;
+    type: PropType<FormProps["labelPosition"]>;
   };
   type: {
     type: PropType<"widget">;
@@ -145,7 +145,7 @@ declare const arrayFieldPropsDef: {
     type: PropType<OrFunction<string | number>>;
   };
   labelPosition: {
-    type: PropType<"left" | "right" | "auto">;
+    type: PropType<FormProps["labelPosition"]>;
   };
   fields: {
     type: PropType<any[]>;
@@ -197,7 +197,7 @@ declare const layoutFieldPropsDef: {
     type: PropType<OrFunction<string | number>>;
   };
   labelPosition: {
-    type: PropType<"left" | "right" | "auto">;
+    type: PropType<FormProps["labelPosition"]>;
   };
   fields: {
     type: PropType<any[]>;
@@ -327,9 +327,9 @@ declare const __VLS_base$2: vue32.DefineComponent<vue32.ExtractPropTypes<{
     default: boolean;
   };
 }>> & Readonly<{}>, {
+  hideRequiredAsterisk: boolean;
   messageLabel: any;
   formatMessage: AnyFunction;
-  hideRequiredAsterisk: boolean;
 }, {}, {}, {}, string, vue32.ComponentProvideOptions, true, {}, any>;
 declare const __VLS_export$4: __VLS_WithSlots$2<typeof __VLS_base$2, __VLS_Slots$2>;
 declare const _default$3: typeof __VLS_export$4;
@@ -352,16 +352,20 @@ type TdFormItemInstance = InstanceType<typeof _default$3>;
 type TableColumnProp = {
   slots: {
     type: PropType<OrArray<SlotDef>>;
-    default: () => null;
+    default: null;
   };
   columns: {
-    type: PropType<any[]>;
+    type: PropType<TdTableColumnProps[]>;
     default: () => never[];
   };
   transform: {
     type: PropType<AnyFunction[]>;
     default: () => never[];
   };
+  hide: {
+    type: PropType<boolean | Ref$1<boolean>>;
+    default: false;
+  };
 };
 type TdTableColumnProps = ExtractPublicPropTypes<TableColumnProp> & TableColumnInstance["$props"];
 declare const tableColumnPropsDef: TableColumnProp;
@@ -405,32 +409,41 @@ type __VLS_WithSlots$1<T, S> = T & {
 declare const __VLS_export$1: vue32.DefineComponent<vue32.ExtractPropTypes<{
   slots: {
     type: vue32.PropType<OrArray<SlotDef>>;
-    default: () => null;
+    default: null;
   };
   columns: {
-    type: vue32.PropType<any[]>;
+    type: vue32.PropType<TdTableColumnProps[]>;
     default: () => never[];
   };
   transform: {
     type: vue32.PropType<AnyFunction[]>;
     default: () => never[];
   };
+  hide: {
+    type: vue32.PropType<boolean | vue32.Ref<boolean>>;
+    default: false;
+  };
 }>, {}, {}, {}, {}, vue32.ComponentOptionsMixin, vue32.ComponentOptionsMixin, {}, string, vue32.PublicProps, Readonly<vue32.ExtractPropTypes<{
   slots: {
     type: vue32.PropType<OrArray<SlotDef>>;
-    default: () => null;
+    default: null;
   };
   columns: {
-    type: vue32.PropType<any[]>;
+    type: vue32.PropType<TdTableColumnProps[]>;
     default: () => never[];
   };
   transform: {
     type: vue32.PropType<AnyFunction[]>;
     default: () => never[];
   };
+  hide: {
+    type: vue32.PropType<boolean | vue32.Ref<boolean>>;
+    default: false;
+  };
 }>> & Readonly<{}>, {
+  hide: boolean | vue32.Ref<boolean, boolean>;
   slots: OrArray<SlotDef>;
-  columns: any[];
+  columns: TdTableColumnProps[];
   transform: AnyFunction[];
 }, {}, {}, {}, string, vue32.ComponentProvideOptions, true, {}, any>;
 declare const _default$5: typeof __VLS_export$1;

package/dist/index.js

@@ -413,15 +413,15 @@ var widget_field_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ d
 		const props = __props;
 		const attrs = useAttrs();
 		const formCtx = inject(formCtxKey);
-		const tempValue = shallowRef(props.formatter(getDeepValue(formCtx.model, attrs["full-prop"])));
+		const modelModifiers = computed(() => Object.fromEntries(props.modifiers.map((m) => [m, true])));
+		console.log(modelModifiers.value);
 		const widgetModel = computed({
 			get() {
-				if (props.modifiers.includes("lazy")) return tempValue.value;
 				return props.formatter(getDeepValue(formCtx.model, attrs["full-prop"]));
 			},
 			set(v) {
-				if (props.modifiers.includes("lazy")) tempValue.value = v;
-				else updateModelValue(v);
+				const parsed = props.parser(v);
+				setDeepValue(formCtx.model, attrs["full-prop"], parsed);
 			}
 		});
 		if (!isNullOrUndef(props.default)) widgetModel.value = props.default;
@@ -435,16 +435,6 @@ var widget_field_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ d
 				...pick(props, ["rules", /^label/])
 			};
 		});
-		function onModelChange(...args) {
-			if (props.modifiers.includes("lazy")) updateModelValue(tempValue.value);
-			props.on.blur?.(...args);
-		}
-		function updateModelValue(v) {
-			const parsed = props.parser(v);
-			if (props.modifiers.includes("trim")) setDeepValue(formCtx.model, attrs["full-prop"], parsed.trim());
-			else if (props.modifiers.includes("number")) setDeepValue(formCtx.model, attrs["full-prop"], Number(parsed));
-			else setDeepValue(formCtx.model, attrs["full-prop"], parsed);
-		}
 		const Widget = resolveWidget(props.component);
 		const widgetAttrs = computed(() => {
 			return {
@@ -471,8 +461,8 @@ var widget_field_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ d
 					!!unref(Widget) ? (openBlock(), createBlock(unref(Widget), mergeProps({ key: 0 }, widgetAttrs.value, toHandlers(_ctx.on), {
 						modelValue: widgetModel.value,
 						"onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => widgetModel.value = $event),
-						class: "widget-component",
-						onBlur: onModelChange
+						modelModifiers: modelModifiers.value,
+						class: "widget-component"
 					}), createSlots({ _: 2 }, [renderList(unref(widgetSlots), (sc) => {
 						return {
 							name: sc.name,
@@ -481,7 +471,7 @@ var widget_field_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ d
 								"ctx-key": unref(formCtxKey)
 							}), null, 16, ["scope", "ctx-key"])])
 						};
-					})]), 1040, ["modelValue"])) : createCommentVNode("v-if", true),
+					})]), 1040, ["modelValue", "modelModifiers"])) : createCommentVNode("v-if", true),
 					(openBlock(true), createElementBlock(Fragment, null, renderList(unref(afterSlots), (ssc) => {
 						return openBlock(), createBlock(deep_slot_default, mergeProps({ key: ssc.name }, { ref_for: true }, ssc, {
 							scope: { value: widgetModel.value },
@@ -792,7 +782,7 @@ const tableColumnPropsDef = {
 			Object,
 			String
 		],
-		default: () => null
+		default: null
 	},
 	columns: {
 		type: Array,
@@ -801,6 +791,10 @@ const tableColumnPropsDef = {
 	transform: {
 		type: Array,
 		default: () => []
+	},
+	hide: {
+		type: [Boolean, Object],
+		default: false
 	}
 };
 const tablePropsDef = { columns: {
@@ -818,6 +812,7 @@ var table_col_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 	setup(__props) {
 		const props = __props;
 		const attrs = useAttrs();
+		const visibleColumns = computed(() => props.columns.filter((col) => !unref(col.hide)));
 		function filtered(scope) {
 			const { row, column } = scope;
 			return props.transform.reduce((res, filter) => filter(res, row, column), getDeepValue(row, column.property));
@@ -826,7 +821,7 @@ var table_col_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defi
 		return (_ctx, _cache) => {
 			const _component_TdTableCol = resolveComponent("TdTableCol");
 			return openBlock(), createBlock(unref(ElTableColumn), normalizeProps(guardReactiveProps(_ctx.$attrs)), createSlots({
-				default: withCtx(() => [_ctx.columns.length ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(_ctx.columns, (col) => {
+				default: withCtx(() => [visibleColumns.value.length ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(visibleColumns.value, (col) => {
 					return openBlock(), createBlock(_component_TdTableCol, mergeProps({ key: col.label }, { ref_for: true }, col), null, 16);
 				}), 128)) : createCommentVNode("v-if", true)]),
 				_: 2
@@ -859,6 +854,8 @@ var table_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 	__name: "table",
 	props: tablePropsDef,
 	setup(__props, { expose: __expose }) {
+		const props = __props;
+		const visibleColumns = computed(() => props.columns.filter((col) => !unref(col.hide)));
 		const slots = useSlots();
 		const tableRef = ref(null);
 		const slotNames = computed(() => Object.keys(slots));
@@ -878,7 +875,7 @@ var table_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineCo
 					ref_key: "tableRef",
 					ref: tableRef
 				}, _ctx.$attrs), createSlots({
-					default: withCtx(() => [(openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.columns, (col) => {
+					default: withCtx(() => [(openBlock(true), createElementBlock(Fragment, null, renderList(visibleColumns.value, (col) => {
 						return openBlock(), createBlock(table_col_default, mergeProps({ key: col.label }, { ref_for: true }, col), null, 16);
 					}), 128))]),
 					_: 2

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "tiddy",
-  "version": "2.0.7",
+  "version": "2.0.9",
+  "packageManager": "pnpm@10.11.0",
   "description": "A set of Vue 3 components based on element-plus",
   "type": "module",
   "license": "MIT",
@@ -13,9 +14,7 @@
     "url": "git+https://github.com/leemotive/tiddy.git"
   },
   "author": "leemotive <wstation@163.com>",
-  "files": [
-    "dist"
-  ],
+  "files": ["dist"],
   "main": "./dist/index.js",
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -24,6 +23,19 @@
     "./package.json": "./package.json",
     "./*": "./dist/*"
   },
+  "scripts": {
+    "lint": "biome lint .",
+    "build": "tsdown",
+    "dev": "tsdown --watch",
+    "play": "vite",
+    "test": "vitest",
+    "type": "vue-tsc --noEmit",
+    "format": "biome format --write .",
+    "prepublishOnly": "pnpm run build",
+    "docs:dev": "vitepress dev docs",
+    "docs:build": "vitepress build docs",
+    "docs:preview": "vitepress preview docs"
+  },
   "peerDependencies": {
     "element-plus": "^2.11.7",
     "vue": "^3.0.0"
@@ -51,17 +63,5 @@
   },
   "dependencies": {
     "yatter": "^3.0.0"
-  },
-  "scripts": {
-    "lint": "biome lint .",
-    "build": "tsdown",
-    "dev": "tsdown --watch",
-    "play": "vite",
-    "test": "vitest",
-    "type": "vue-tsc --noEmit",
-    "format": "biome format --write .",
-    "docs:dev": "vitepress dev docs",
-    "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress preview docs"
   }
-}
+}