yc-vep-ui 0.3.66 → 0.3.68

package/dist/components/Filter/type.d.ts

@@ -11,7 +11,7 @@ interface IFieldSlot<T> extends IField<T> {
 // 表格筛选
 export interface IField<T> {
   label?: string
-  prop?: keyof T
+  prop?: keyof T | string
   required?: boolean
   rules?: Record<string, any>
   span?: number

package/dist/{entry-Dl3ojaXs.js → entry-CXdzWmYz.js}

@@ -1206,113 +1206,111 @@ var _hoisted_1$11 = { style: {
 		"update:modelValue"
 	],
 	setup(e, { expose: n, emit: r }) {
-		useCssVars((e) => ({ v45212a72: unref(p) / 2 }));
-		let i = r, a = e, { fields: o, labelWidth: s = "100px", valueWidth: c = "auto", omitFields: l = [], rules: u = reactive({}), labelPosition: d = "top", valueModel: f = "default", column: p = 24 } = a, m = ref(0), g = ref(), _ = computed(() => a.modelValue !== void 0), v = reactive({}), y = computed(() => _.value ? a.modelValue : a.model || v), b = computed({
-			get: () => y.value,
-			set: (e) => {
-				_.value && i("update:modelValue", e);
-			}
-		}), x = computed(() => o.filter((e) => typeof e.prop == "string")), S = computed(() => {
+		useCssVars((e) => ({ v5f0ec3d3: unref(f) / 2 }));
+		let i = r, a = e, { labelWidth: o = "100px", valueWidth: s = "auto", omitFields: c = [], rules: l = reactive({}), labelPosition: u = "top", valueModel: d = "default", column: f = 24 } = a, p = ref(0), m = ref(), g = computed(() => a.modelValue !== void 0), _ = reactive({}), v = computed(() => g.value ? a.modelValue : a.model || _), y = computed({
+			get: () => v.value,
+			set: (e) => g.value && i("update:model", e)
+		}), b = computed(() => toRaw(a?.fields).filter((e) => typeof e.prop == "string")), x = computed(() => {
 			let e = {};
-			return x.value.forEach((n) => {
+			return b.value.forEach((n) => {
 				let r = n.prop;
-				u && u[r] ? e[r] = u[r] : n.rules && Object.keys(n.rules).length ? e[r] = n.rules : n.required && (e[r] = [{
+				l && l[r] ? e[r] = l[r] : n.rules && Object.keys(n.rules).length ? e[r] = n.rules : n.required && (e[r] = [{
 					required: !0,
 					message: `请输入${n.label}`,
 					trigger: "change"
 				}]);
 			}), e;
 		});
-		async function C() {
-			await g.value?.validate().catch(() => !1) && i("submit", toRaw(y.value));
+		async function S() {
+			await m.value?.validate().catch(() => !1) && i("submit", toRaw(v.value), () => D());
 		}
-		function w() {
+		function C() {
 			let e = {};
-			Object.keys(y.value).forEach((n) => {
-				l.includes(n) || (e[n] = void 0);
-			}), Object.assign(y.value, e), m.value += 1, i("reset", toRaw(y.value));
+			Object.keys(v.value).forEach((n) => {
+				c.includes(n) || (e[n] = void 0);
+			}), Object.assign(v.value, e), p.value += 1, i("reset", toRaw(v.value));
 		}
-		function T() {
-			return toRaw(y.value);
+		function w() {
+			return toRaw(v.value);
 		}
-		function E(e) {
-			Object.assign(y.value, e);
+		function T(e) {
+			Object.assign(v.value, e);
 		}
-		function D() {
-			g.value?.clearValidate();
+		function E() {
+			m.value?.clearValidate();
 		}
-		async function O() {
+		async function D() {
 			return new Promise((e) => {
-				g.value?.validate((n, r) => e(r));
+				m.value?.validate((n, r) => e(r));
 			});
 		}
 		return n({
-			getValues: T,
-			setValues: E,
-			clearValidate: D,
-			onSubmit: C,
-			validate: O
+			getValues: w,
+			setValues: T,
+			clearValidate: E,
+			onSubmit: S,
+			validate: D
 		}), (e, n) => {
-			let r = resolveComponent("el-input"), i = resolveComponent("el-form-item"), a = resolveComponent("el-form"), o = resolveComponent("el-button");
+			let r = resolveComponent("el-input"), i = resolveComponent("el-form-item"), a = resolveComponent("el-form"), c = resolveComponent("el-button");
 			return openBlock(), createElementBlock(Fragment, null, [createVNode(a, mergeProps({
 				ref_key: "uiFormRef",
-				ref: g,
-				model: b.value
+				ref: m,
+				model: y.value
 			}, e.$attrs, {
-				rules: S.value,
-				inline: unref(d) !== "top",
-				"label-position": unref(d),
+				rules: x.value,
+				inline: unref(u) !== "top",
+				"label-position": unref(u),
 				class: {
 					"ui-form": !0,
-					horizontal: unref(d) !== "top"
+					horizontal: unref(u) !== "top"
 				},
 				"validate-on-rule-change": !1
 			}), {
-				default: withCtx(() => [(openBlock(!0), createElementBlock(Fragment, null, renderList(x.value, (n, a) => (openBlock(), createBlock(i, {
-					key: `${n.prop}-${a}-${m.value}`,
+				default: withCtx(() => [(openBlock(!0), createElementBlock(Fragment, null, renderList(b.value, (n, a) => (openBlock(), createBlock(i, {
+					key: `${String(n.prop)}-${a}-${p.value}`,
 					label: n.label,
-					"label-width": unref(s),
-					"value-width": unref(c),
+					"label-width": unref(o),
+					"value-width": unref(s),
 					prop: n.prop,
 					style: normalizeStyle({
 						width: `${n?.width ? n?.width + "px" : "100%"}`,
-						gridColumn: `span ${(n?.span || unref(p)) / 2 || 1}`
+						gridColumn: `span ${(n?.span || unref(f)) / 2 || 1}`
 					})
 				}, {
-					default: withCtx(() => [n.render ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [isVNode(unref(renderNode)(n, b.value)) ? (openBlock(), createBlock(resolveDynamicComponent(unref(renderNode)(n, b.value)), {
+					default: withCtx(() => [n.render ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [isVNode(unref(renderNode)(n, y.value)) ? (openBlock(), createBlock(resolveDynamicComponent(unref(renderNode)(n, y.value)), {
 						key: 0,
 						style: { display: "inline-block" }
-					})) : unref(renderNode)(n, b.value).component ? (openBlock(), createBlock(resolveDynamicComponent(unref(renderNode)(n, b.value).component), mergeProps({
+					})) : unref(renderNode)(n, y.value).component ? (openBlock(), createBlock(resolveDynamicComponent(unref(renderNode)(n, y.value).component), mergeProps({
 						key: 1,
-						modelValue: b.value[n.prop],
-						"onUpdate:modelValue": (e) => b.value[n.prop] = e
-					}, { ref_for: !0 }, unref(renderNode)(n, b.value).props, {
+						modelValue: y.value[n.prop],
+						"onUpdate:modelValue": (e) => y.value[n.prop] = e
+					}, { ref_for: !0 }, unref(renderNode)(n, y.value).props, {
 						clearable: !0,
-						key: `${n.prop}-${m.value}`,
+						key: `${String(n.prop)}-${p.value}`,
 						style: { height: "100%" },
-						class: { underline: unref(f) === "underline" }
+						class: { underline: unref(d) === "underline" }
 					}), null, 16, [
 						"modelValue",
 						"onUpdate:modelValue",
 						"class"
-					])) : (openBlock(), createElementBlock("span", _hoisted_1$10, toDisplayString(unref(renderNode)(n, b.value) || "-"), 1)), (openBlock(!0), createElementBlock(Fragment, null, renderList(n.slots, (n) => renderSlot(e.$slots, "default", { form: b.value }, () => [isVNode(unref(renderNode)(n, b.value)) ? (openBlock(), createBlock(resolveDynamicComponent(unref(renderNode)(n, b.value)), {
+					])) : (openBlock(), createElementBlock("span", _hoisted_1$10, toDisplayString(unref(renderNode)(n, y.value) || "-"), 1)), (openBlock(!0), createElementBlock(Fragment, null, renderList(n.slots, (n) => renderSlot(e.$slots, "default", { form: y.value }, () => [isVNode(unref(renderNode)(n, y.value)) ? (openBlock(), createBlock(resolveDynamicComponent(unref(renderNode)(n, y.value)), {
 						key: 0,
 						style: { display: "inline-block" }
-					})) : unref(renderNode)(n, b.value).component ? (openBlock(), createBlock(resolveDynamicComponent(unref(renderNode)(n, b.value).component), mergeProps({
+					})) : unref(renderNode)(n, y.value).component ? (openBlock(), createBlock(resolveDynamicComponent(unref(renderNode)(n, y.value).component), mergeProps({
 						key: 1,
-						modelValue: b.value[n.prop],
-						"onUpdate:modelValue": (e) => b.value[n.prop] = e,
+						modelValue: y.value[n.prop],
+						"onUpdate:modelValue": (e) => y.value[n.prop] = e,
 						"default-value": n.defaultValue,
 						placeholder: n.placeholder
-					}, { ref_for: !0 }, unref(renderNode)(n, b.value).props, {
+					}, { ref_for: !0 }, unref(renderNode)(n, y.value).props, {
 						style: {
 							display: "inline-block",
 							marginLeft: "10px",
 							width: `${n.width ? n.width + "px" : "100%"}`
 						},
-						class: { underline: unref(f) === "underline" },
+						class: { underline: unref(d) === "underline" },
 						clearable: !0,
-						key: `${n.prop}-${m.value}`
+						key: `${n.prop}-${p.value}`
 					}), null, 16, [
 						"modelValue",
 						"onUpdate:modelValue",
@@ -1320,13 +1318,13 @@ var _hoisted_1$11 = { style: {
 						"placeholder",
 						"style",
 						"class"
-					])) : (openBlock(), createElementBlock("span", _hoisted_2$6, toDisplayString(unref(renderNode)(n, b.value) || "-"), 1))], !0)), 256))], 64)) : (openBlock(), createBlock(r, {
+					])) : (openBlock(), createElementBlock("span", _hoisted_2$6, toDisplayString(unref(renderNode)(n, y.value) || "-"), 1))], !0)), 256))], 64)) : (openBlock(), createBlock(r, {
 						key: 1,
-						modelValue: b.value[n.prop],
-						"onUpdate:modelValue": (e) => b.value[n.prop] = e,
+						modelValue: y.value[n.prop],
+						"onUpdate:modelValue": (e) => y.value[n.prop] = e,
 						placeholder: "请输入",
 						clearable: !0,
-						class: normalizeClass({ underline: unref(f) === "underline" })
+						class: normalizeClass({ underline: unref(d) === "underline" })
 					}, null, 8, [
 						"modelValue",
 						"onUpdate:modelValue",
@@ -1348,19 +1346,19 @@ var _hoisted_1$11 = { style: {
 				"label-position",
 				"class"
 			]), e.$attrs?.hideHandle ? createCommentVNode("", !0) : (openBlock(), createElementBlock("div", _hoisted_3$4, [
-				renderSlot(e.$slots, "handle", { form: b.value }, void 0, !0),
-				createVNode(o, {
+				renderSlot(e.$slots, "handle", { form: y.value }, void 0, !0),
+				createVNode(c, {
 					icon: unref(Refresh_default),
-					onClick: w,
+					onClick: C,
 					size: e.$props.size
 				}, {
 					default: withCtx(() => [...n[0] ||= [createTextVNode("重置", -1)]]),
 					_: 1
 				}, 8, ["icon", "size"]),
-				createVNode(o, {
+				createVNode(c, {
 					icon: unref(Promotion_default),
 					type: "primary",
-					onClick: C,
+					onClick: S,
 					size: e.$props.size
 				}, {
 					default: withCtx(() => [...n[1] ||= [createTextVNode("提交", -1)]]),
@@ -1369,7 +1367,7 @@ var _hoisted_1$11 = { style: {
 			]))], 64);
 		};
 	}
-}), Form_exports = /* @__PURE__ */ __exportAll$1({ default: () => Form_default }), Form_default = /* @__PURE__ */ _plugin_vue_export_helper_default(index_vue_vue_type_script_setup_true_lang_default$9, [["__scopeId", "data-v-d3c1716d"]]), _hoisted_1$9 = ["disabled"], index_vue_vue_type_script_setup_true_lang_default$8 = /* @__PURE__ */ defineComponent({
+}), Form_exports = /* @__PURE__ */ __exportAll$1({ default: () => Form_default }), Form_default = /* @__PURE__ */ _plugin_vue_export_helper_default(index_vue_vue_type_script_setup_true_lang_default$9, [["__scopeId", "data-v-2b3acf49"]]), _hoisted_1$9 = ["disabled"], index_vue_vue_type_script_setup_true_lang_default$8 = /* @__PURE__ */ defineComponent({
 	__name: "index",
 	props: /* @__PURE__ */ mergeModels({
 		defaultValue: { default: "" },
@@ -2520,9 +2518,12 @@ var _hoisted_1$4 = { style: {
 //#endregion
 //#region src/hooks/useFetch.ts
 function useFetch(e, n = {}) {
-	let { immediate: r = !0, method: i = "GET", onBefore: a, onSuccess: o, onError: s, onFinally: c, ...l } = n, u = ref(!1), d = ref(null), f = ref(null), p = reactive({}), m = !1;
+	let { immediate: r = !0, method: i = "GET", onBefore: a, onSuccess: o, onError: s, onFinally: c, ...l } = n;
+	console.log("immediate ->>", r);
+	let u = ref(!1), d = ref(null), f = ref(null), p = reactive({}), m = !1;
 	async function g() {
 		if (m) return Promise.reject(/* @__PURE__ */ Error("请求正在进行中，请勿重复触发"));
+		if (!r) return Promise.reject(/* @__PURE__ */ Error("未开启 immediate 选项，请手动触发"));
 		m = !0, u.value = !0, f.value = null;
 		try {
 			v = JSON.stringify(toRaw(p)), y = isRef(n.ready) ? n.ready.value : n.ready ?? !0;

package/dist/hooks/index.js

@@ -1,2 +1,2 @@
-import { c as e, d as t, f as n, l as r, s as i, u as a } from "../entry-Dl3ojaXs.js";
+import { c as e, d as t, f as n, l as r, s as i, u as a } from "../entry-CXdzWmYz.js";
 export { e as useDictionary, n as useFetch, r as useRoute, a as useRouter, t as useTable, i as useUser };

package/dist/index.css

@@ -43,24 +43,24 @@
 }
 }
 
-.ui-form-buttons[data-v-d3c1716d] {
+.ui-form-buttons[data-v-2b3acf49] {
   display: flex;
   justify-content: flex-start;
   align-items: center;
 }
 .ui-form {
-&[data-v-d3c1716d] {
+&[data-v-2b3acf49] {
   display: grid;
-  grid-template-columns: repeat(var(--v45212a72), minmax(0, 1fr));
+  grid-template-columns: repeat(var(--v5f0ec3d3), minmax(0, 1fr));
   gap: 0px 40px;
   }
-&[data-v-d3c1716d] .el-form-item__label {
+&[data-v-2b3acf49] .el-form-item__label {
     margin-bottom: 0;
     font-weight: bold;
     font-size: 0.8em;
     color: #6b7280;
 }
-&[data-v-d3c1716d] .el-form-item__content {
+&[data-v-2b3acf49] .el-form-item__content {
     display: flex;
     flex-wrap: inherit;
     width: 100%;
@@ -78,8 +78,8 @@
 
 /* 下划线样式 */
 .underline {
-&[data-v-d3c1716d] .el-input__wrapper,
-  &[data-v-d3c1716d] .el-textarea__inner {
+&[data-v-2b3acf49] .el-input__wrapper,
+  &[data-v-2b3acf49] .el-textarea__inner {
     box-shadow: 0px 1px 0px var(--el-input-border-color, var(--el-border-color));
 }
 }

package/dist/utils/index.js

@@ -1,2 +1,2 @@
-import { O as e, _ as t, b as n, v as r, y as i } from "../entry-Dl3ojaXs.js";
+import { O as e, _ as t, b as n, v as r, y as i } from "../entry-CXdzWmYz.js";
 export { t as baseUrl, n as request, e as tempToRender, r as uniq, i as uniqBy };

package/dist/vep-ui.js

@@ -1,2 +1,2 @@
-import { A as e, C as t, D as n, E as r, S as i, T as a, a as o, g as s, h as c, i as l, k as u, m as d, n as f, o as p, p as m, r as h, t as g, w as _, x as v } from "./entry-Dl3ojaXs.js";
+import { A as e, C as t, D as n, E as r, S as i, T as a, a as o, g as s, h as c, i as l, k as u, m as d, n as f, o as p, p as m, r as h, t as g, w as _, x as v } from "./entry-CXdzWmYz.js";
 export { e as UiCard, i as UiDescriptions, v as UiDialog, a as UiEditor, n as UiFilter, r as UiForm, t as UiInfiniteScroll, d as UiStaffSelect, u as UiTable, _ as UiTree, m as UiUpload, s as WcUtils, o as YcApproval, c as YcMessage, l as YcPageAgent, h as default, h as ycPlugin, g as getHostVue, p as hooks, f as setHostVue };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yc-vep-ui",
-  "version": "0.3.66",
+  "version": "0.3.68",
   "type": "module",
   "description": "基于 Vue 3 + Element Plus 的企业级 UI 组件库",
   "keywords": [