dlzn-ui 2.0.42 → 2.0.43

package/assets/Picker-BMwN00tM.css

@@ -0,0 +1 @@
+[data-v-e4c67c61] .t-radio-group{width:100%;margin-top:16px;row-gap:12px!important}[data-v-e4c67c61] .t-radio-group .t-radio{width:100%;display:inline-flex}[data-v-e4c67c61] .t-radio-group .t-radio .t-radio__input{top:6px}[data-v-e4c67c61] .t-radio-group .t-radio .t-radio__label{flex:1;line-height:32px}[data-v-e4c67c61] .t-checkbox-group{grid-template-columns:repeat(auto-fill,minmax(68px,1fr));gap:8px;display:grid}[data-v-e4c67c61] .t-select__wrap{width:100px;display:inline-flex}.t-textarea[data-v-e4c67c61] .t-textarea__inner{height:100%!important}

package/components/cron/src/Picker.mjs

@@ -15,11 +15,11 @@ import { t as u } from "../../../chunks/Month-DzGi1B-x.mjs";
 import { t as d } from "../../../chunks/Second-DwM7HaZz.mjs";
 import { computed as f, createBlock as p, createElementVNode as m, createVNode as h, defineComponent as g, openBlock as _, ref as v, unref as y, watch as b, withCtx as x } from "vue";
 import { Tabs as S } from "tdesign-vue-next";
-import { CronosExpression as C, validate as w } from "cronosjs";
-import T from "cronstrue";
+import { Cron as C } from "croner";
+import w from "cronstrue";
 import "cronstrue/locales/zh_CN";
-import '../../../assets/Picker-CBqZNv2a.css';//#region ../../packages/dlzn-ui/components/cron/src/Picker.vue?vue&type=script&setup=true&lang.ts
-var E = { class: "grow" }, D = { class: "mt-8 grid grid-cols-4 gap-3" }, O = { class: "row-span-4 flex flex-col gap-1" }, k = "0 * * ? * *", A = /*#__PURE__*/ n(/* @__PURE__ */ g({
+import '../../../assets/Picker-BMwN00tM.css';//#region ../../packages/dlzn-ui/components/cron/src/Picker.vue?vue&type=script&setup=true&lang.ts
+var T = { class: "grow" }, E = { class: "mt-8 grid grid-cols-4 gap-3" }, D = { class: "row-span-4 flex flex-col gap-1" }, O = "0 * * ? * *", k = /*#__PURE__*/ n(/* @__PURE__ */ g({
 	__name: "Picker",
 	props: {
 		disabled: {
@@ -33,47 +33,65 @@ var E = { class: "grow" }, D = { class: "mt-8 grid grid-cols-4 gap-3" }, O = { c
 		}
 	},
 	setup(n, { expose: g }) {
-		let A = n;
+		let k = n, A = {
+			alternativeWeekdays: !0,
+			domAndDow: !0,
+			sloppyRanges: !0
+		};
 		function j() {
-			let e = k;
-			return A.modelValue === "" || (w(A.modelValue) === !0 ? e = A.modelValue : t.error(`${A.modelValue} 不是一个有效的 cron 表达式, 已使用默认值 ${k}`)), e.split(" ");
+			let e = O;
+			return k.modelValue === "" || (M(k.modelValue) === !0 ? e = k.modelValue : t.error(`${k.modelValue} 不是一个有效的 cron 表达式, 已使用默认值 ${O}`)), e.split(" ");
 		}
-		let M = j(), N = v(M[0]), P = v(M[1]), F = v(M[2]), I = v(M[3]), L = v(M[4]), R = v(M[5]), z = f(() => `${N.value} ${P.value} ${F.value} ${I.value} ${L.value} ${R.value}`), B = v(""), V = v("");
-		b(z, (e) => {
-			B.value = "", V.value = "", w(e) ? B.value = C.parse(e).nextNDates(void 0, 10).map((e) => i(e).format("YYYY-MM-DD HH:mm:ss")).join("\n") : V.value = "不是一个有效的 cron 表达式";
+		function M(e) {
+			try {
+				return new C(e, A), !0;
+			} catch {
+				return !1;
+			}
+		}
+		let N = j(), P = v(N[0]), F = v(N[1]), I = v(N[2]), L = v(N[3]), R = v(N[4]), z = v(N[5]), B = f(() => `${P.value} ${F.value} ${I.value} ${L.value} ${R.value} ${z.value}`), V = v(""), H = v("");
+		b(B, (e) => {
+			if (V.value = "", H.value = "", M(e)) {
+				let t = new C(e, {
+					alternativeWeekdays: !0,
+					domAndDow: !0,
+					sloppyRanges: !0
+				});
+				V.value = t.nextRuns(10).map((e) => i(e).format("YYYY-MM-DD HH:mm:ss")).join("\n");
+			} else H.value = "不是一个有效的 cron 表达式";
 		}, { immediate: !0 });
-		let H = f(() => {
+		let U = f(() => {
 			try {
-				return V.value === "" ? T.toString(z.value, {
+				return H.value === "" ? w.toString(B.value, {
 					dayOfWeekStartIndexZero: !1,
 					locale: "zh_CN",
 					trimHoursLeadingZero: !0,
 					use24HourTimeFormat: !0
-				}) : V.value;
+				}) : H.value;
 			} catch (e) {
 				return e.message ?? "解析失败";
 			}
 		});
-		function U() {
+		function W() {
 			return new Promise((e) => {
-				w(z.value) ? e(z.value) : t.error("不是一个有效的 cron 表达式");
+				M(B.value) ? e(B.value) : t.error("不是一个有效的 cron 表达式");
 			});
 		}
-		return g({ handleSubmit: U }), (t, i) => (_(), p(y(e), {
+		return g({ handleSubmit: W }), (t, i) => (_(), p(y(e), {
 			disabled: n.disabled,
 			items: [{ slot: "content" }],
 			layout: "vertical",
 			readonly: n.readonly
 		}, {
-			content: x(() => [m("div", E, [h(y(S), { "default-value": "second" }, {
+			content: x(() => [m("div", T, [h(y(S), { "default-value": "second" }, {
 				default: x(() => [
 					h(y(o), {
 						label: "秒",
 						value: "second"
 					}, {
 						default: x(() => [h(d, {
-							modelValue: N.value,
-							"onUpdate:modelValue": i[0] ||= (e) => N.value = e
+							modelValue: P.value,
+							"onUpdate:modelValue": i[0] ||= (e) => P.value = e
 						}, null, 8, ["modelValue"])]),
 						_: 1
 					}),
@@ -82,8 +100,8 @@ var E = { class: "grow" }, D = { class: "mt-8 grid grid-cols-4 gap-3" }, O = { c
 						value: "minute"
 					}, {
 						default: x(() => [h(l, {
-							modelValue: P.value,
-							"onUpdate:modelValue": i[1] ||= (e) => P.value = e
+							modelValue: F.value,
+							"onUpdate:modelValue": i[1] ||= (e) => F.value = e
 						}, null, 8, ["modelValue"])]),
 						_: 1
 					}),
@@ -92,8 +110,8 @@ var E = { class: "grow" }, D = { class: "mt-8 grid grid-cols-4 gap-3" }, O = { c
 						value: "hour"
 					}, {
 						default: x(() => [h(c, {
-							modelValue: F.value,
-							"onUpdate:modelValue": i[2] ||= (e) => F.value = e
+							modelValue: I.value,
+							"onUpdate:modelValue": i[2] ||= (e) => I.value = e
 						}, null, 8, ["modelValue"])]),
 						_: 1
 					}),
@@ -102,10 +120,10 @@ var E = { class: "grow" }, D = { class: "mt-8 grid grid-cols-4 gap-3" }, O = { c
 						value: "day"
 					}, {
 						default: x(() => [h(s, {
-							day: I.value,
-							"onUpdate:day": i[3] ||= (e) => I.value = e,
-							week: R.value,
-							"onUpdate:week": i[4] ||= (e) => R.value = e
+							day: L.value,
+							"onUpdate:day": i[3] ||= (e) => L.value = e,
+							week: z.value,
+							"onUpdate:week": i[4] ||= (e) => z.value = e
 						}, null, 8, ["day", "week"])]),
 						_: 1
 					}),
@@ -114,68 +132,68 @@ var E = { class: "grow" }, D = { class: "mt-8 grid grid-cols-4 gap-3" }, O = { c
 						value: "month"
 					}, {
 						default: x(() => [h(u, {
-							modelValue: L.value,
-							"onUpdate:modelValue": i[5] ||= (e) => L.value = e
+							modelValue: R.value,
+							"onUpdate:modelValue": i[5] ||= (e) => R.value = e
 						}, null, 8, ["modelValue"])]),
 						_: 1
 					})
 				]),
 				_: 1
-			}), m("div", D, [
+			}), m("div", E, [
 				h(y(r), {
-					modelValue: N.value,
-					"onUpdate:modelValue": i[6] ||= (e) => N.value = e,
+					modelValue: P.value,
+					"onUpdate:modelValue": i[6] ||= (e) => P.value = e,
 					adornment: { prepend: () => "秒" },
 					readonly: ""
 				}, null, 8, ["modelValue"]),
 				h(y(r), {
-					modelValue: P.value,
-					"onUpdate:modelValue": i[7] ||= (e) => P.value = e,
+					modelValue: F.value,
+					"onUpdate:modelValue": i[7] ||= (e) => F.value = e,
 					adornment: { prepend: () => "分" },
 					readonly: ""
 				}, null, 8, ["modelValue"]),
 				h(y(r), {
-					modelValue: F.value,
-					"onUpdate:modelValue": i[8] ||= (e) => F.value = e,
+					modelValue: I.value,
+					"onUpdate:modelValue": i[8] ||= (e) => I.value = e,
 					adornment: { prepend: () => "时" },
 					readonly: ""
 				}, null, 8, ["modelValue"]),
-				m("div", O, [i[12] ||= m("span", { class: "text-xs" }, "近十次执行时间：", -1), h(y(a), {
+				m("div", D, [i[12] ||= m("span", { class: "text-xs" }, "近十次执行时间：", -1), h(y(a), {
 					class: "flex-1",
 					maxlength: "",
-					"model-value": B.value,
+					"model-value": V.value,
 					placeholder: "",
 					readonly: ""
 				}, null, 8, ["model-value"])]),
 				h(y(r), {
-					modelValue: I.value,
-					"onUpdate:modelValue": i[9] ||= (e) => I.value = e,
+					modelValue: L.value,
+					"onUpdate:modelValue": i[9] ||= (e) => L.value = e,
 					adornment: { prepend: () => "日" },
 					readonly: ""
 				}, null, 8, ["modelValue"]),
 				h(y(r), {
-					modelValue: L.value,
-					"onUpdate:modelValue": i[10] ||= (e) => L.value = e,
+					modelValue: R.value,
+					"onUpdate:modelValue": i[10] ||= (e) => R.value = e,
 					adornment: { prepend: () => "月" },
 					readonly: ""
 				}, null, 8, ["modelValue"]),
 				h(y(r), {
-					modelValue: R.value,
-					"onUpdate:modelValue": i[11] ||= (e) => R.value = e,
+					modelValue: z.value,
+					"onUpdate:modelValue": i[11] ||= (e) => z.value = e,
 					adornment: { prepend: () => "星期" },
 					readonly: ""
 				}, null, 8, ["modelValue"]),
 				h(y(r), {
 					adornment: { prepend: () => "式" },
 					class: "col-span-3",
-					"model-value": z.value,
+					"model-value": B.value,
 					readonly: "",
-					status: y(w)(z.value) ? "default" : "error"
+					status: M(B.value) ? "default" : "error"
 				}, null, 8, ["model-value", "status"]),
 				h(y(a), {
 					class: "col-span-3",
 					maxlength: "",
-					"model-value": H.value,
+					"model-value": U.value,
 					placeholder: "",
 					readonly: ""
 				}, null, 8, ["model-value"])
@@ -183,6 +201,6 @@ var E = { class: "grow" }, D = { class: "mt-8 grid grid-cols-4 gap-3" }, O = { c
 			_: 1
 		}, 8, ["disabled", "readonly"]));
 	}
-}), [["__scopeId", "data-v-f7e27435"]]);
+}), [["__scopeId", "data-v-e4c67c61"]]);
 //#endregion
-export { A as default };
+export { k as default };

package/components/page-list/src/page-list.d.ts

@@ -1127,7 +1127,7 @@ export declare function useBaseCustomPageListMixin({ pageQueryRef, pageTableRef,
         label?: string | boolean | ((h: typeof import('vue').h, props: import('tdesign-vue-next').TreeNodeModel<import('tdesign-vue-next/es/tree/utils/adapt').TypeTreeOptionData>) => import('tdesign-vue-next').TNodeReturnValue) | undefined;
         filter?: ((node: import('tdesign-vue-next').TreeNodeModel<import('tdesign-vue-next/es/tree/utils/adapt').TypeTreeOptionData>) => boolean) | undefined;
         keys?: import('tdesign-vue-next').TreeKeysType | undefined;
-        icon?: ((_h: typeof import('vue').h, node: import('tdesign-vue-next').TreeNodeModel<import('tdesign-vue-next').TreeOptionData>) => null | import('vue').VNode) | boolean | undefined;
+        icon?: ((h: typeof import('vue').h, props: import('tdesign-vue-next').TreeNodeModel<import('tdesign-vue-next').TreeOptionData>) => import('tdesign-vue-next').TNodeReturnValue) | boolean | undefined;
         load?: ((node: import('tdesign-vue-next').TreeNodeModel<import('tdesign-vue-next/es/tree/utils/adapt').TypeTreeOptionData>) => Promise<import('tdesign-vue-next/es/tree/utils/adapt').TypeTreeOptionData[]>) | undefined;
         scroll?: import('tdesign-vue-next').TScroll | undefined;
         onChange?: ((value: Array<import('tdesign-vue-next').TreeNodeValue>, context: {

package/components/tree/src/tree.d.ts

@@ -1,11 +1,11 @@
-import { TreeProps as _TreeProps, TreeNodeModel, TreeNodeValue, TreeOptionData } from 'tdesign-vue-next';
-import { VNode, h } from 'vue';
+import { TreeProps as _TreeProps, TNodeReturnValue, TreeNodeModel, TreeNodeValue, TreeOptionData } from 'tdesign-vue-next';
+import { h } from 'vue';
 export declare const treePropsInit: {
     readonly checkable: false;
     readonly disabled: undefined;
     readonly expandOnClickNode: undefined;
     readonly hover: true;
-    readonly icon: () => (_h: typeof h, node: TreeNodeModel<TreeOptionData>) => VNode<import('vue').RendererNode, import('vue').RendererElement, {
+    readonly icon: () => (_h: typeof h, node: TreeNodeModel<TreeOptionData>) => import('vue').VNode<import('vue').RendererNode, import('vue').RendererElement, {
         [key: string]: any;
     }> | null;
     readonly label: true;
@@ -15,7 +15,7 @@ export declare const treePropsInit: {
     readonly valueMode: "all";
 };
 export interface TreeProps extends Omit<_TreeProps, 'icon' | 'value'> {
-    icon?: ((_h: typeof h, node: TreeNodeModel<TreeOptionData>) => null | VNode) | boolean;
+    icon?: ((h: typeof import('vue').h, props: TreeNodeModel<TreeOptionData>) => TNodeReturnValue) | boolean;
     'onUpdate:actived'?: (value: TreeNodeValue[]) => void;
     'onUpdate:expanded'?: (value: TreeNodeValue[]) => void;
     'onUpdate:modelValue'?: (value: TreeNodeValue[]) => void;

package/components/tree/src/tree.vue.d.ts

@@ -1,9 +1,8 @@
 import { TreeInstanceFunctions } from 'tdesign-vue-next';
 import { TreeProps } from './tree';
-import { h } from 'vue';
 declare const __VLS_export: import('vue').DefineComponent<TreeProps, TreeInstanceFunctions<import('tdesign-vue-next').TreeOptionData>, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<TreeProps> & Readonly<{}>, {
     label: string | boolean | ((h: typeof import('vue').h, props: import('tdesign-vue-next').TreeNodeModel<import('tdesign-vue-next/es/tree/utils/adapt').TypeTreeOptionData>) => import('tdesign-vue-next').TNodeReturnValue);
-    icon: ((_h: typeof h, node: import('tdesign-vue-next').TreeNodeModel<import('tdesign-vue-next').TreeOptionData>) => null | import('vue').VNode) | boolean;
+    icon: ((h: typeof import('vue').h, props: import('tdesign-vue-next').TreeNodeModel<import('tdesign-vue-next').TreeOptionData>) => import('tdesign-vue-next').TNodeReturnValue) | boolean;
     disabled: boolean;
     line: boolean | import('tdesign-vue-next').TNode;
     lazy: boolean;

package/package.json

@@ -90,7 +90,7 @@
     "@formkit/auto-animate": "^0.10.0",
     "@iconify/vue": "^5.0.1",
     "@types/file-saver": "^2.0.7",
-    "cronosjs": "^1.7.1",
+    "croner": "^10.0.1",
     "cronstrue": "^3.24.0",
     "crypto-js": "^4.2.0",
     "element-plus": "^2.14.5",
@@ -108,7 +108,7 @@
     "> 1%",
     "not dead"
   ],
-  "version": "2.0.42",
+  "version": "2.0.43",
   "scripts": {
     "dev": "vite --config play/vite.config.ts"
   }

package/proj-template/.vscode/settings.json

@@ -14,6 +14,7 @@
   "[markdown]": {
     "editor.acceptSuggestionOnEnter": "on",
     "editor.defaultFormatter": "DavidAnson.vscode-markdownlint",
+    "editor.formatOnSave": true,
     "editor.quickSuggestions": {
       "comments": "off",
       "other": "on",

package/assets/Picker-CBqZNv2a.css

@@ -1 +0,0 @@
-[data-v-f7e27435] .t-radio-group{width:100%;margin-top:16px;row-gap:12px!important}[data-v-f7e27435] .t-radio-group .t-radio{width:100%;display:inline-flex}[data-v-f7e27435] .t-radio-group .t-radio .t-radio__input{top:6px}[data-v-f7e27435] .t-radio-group .t-radio .t-radio__label{flex:1;line-height:32px}[data-v-f7e27435] .t-checkbox-group{grid-template-columns:repeat(auto-fill,minmax(68px,1fr));gap:8px;display:grid}[data-v-f7e27435] .t-select__wrap{width:100px;display:inline-flex}.t-textarea[data-v-f7e27435] .t-textarea__inner{height:100%!important}