yc-vep-ui 0.3.83 → 0.3.85

package/dist/{entry-B0UFeX-p.js → entry-BQSBoqVF.js}

@@ -2590,66 +2590,66 @@ function useDefaultTable(e, n) {
 	}), o = ref([]), s = reactive({
 		page: 1,
 		pageSize: 10
-	}), c = null;
-	if (n?.onBefore?.(s) === !1) return {
+	}), { defaultParams: c, immediate: l = !0, ...u } = n;
+	if (u?.onBefore?.(s) === !1) return {
 		loading: ref(!1),
 		data: i,
 		pagination: a
 	};
-	let l = useFetch(e, {
-		...n,
-		defaultParams: s,
+	let d = useFetch(e, {
+		...u,
 		immediate: !1,
 		onSuccess: (e) => {
-			n?.onSuccess?.(e), a.total = e[r?.replaceAttrs?.total] || 0, i.value = e[r?.replaceAttrs?.table] || [];
-		}
-	});
-	watchEffect(() => {
-		let e = toValue(n.ready) ?? !0, r = toValue(n.defaultParams || {});
-		if (console.log("=== watchEffect triggered ==="), console.log("ready ->>", e), console.log("tempParams ->>", JSON.parse(JSON.stringify(r))), console.log("requestParams ->>", JSON.parse(JSON.stringify(s))), a.page = 1, a.pageSize = 10, !e) {
-			console.log("ready is false, caching pendingParams"), c = { ...r }, console.log("pendingParams ->>", JSON.parse(JSON.stringify(c)));
-			return;
+			u?.onSuccess?.(e), a.total = e[r?.replaceAttrs?.total] || 0, i.value = e[r?.replaceAttrs?.table] || [];
 		}
-		if (c) {
-			console.log("applying pendingParams ->>", JSON.parse(JSON.stringify(c)));
-			for (let e in c) e !== "page" && e !== "pageSize" && (s[e] = c[e]);
-			c = null;
-		}
-		for (let e in r) e !== "page" && e !== "pageSize" && (s[e] = r[e]);
-		console.log("executing request with ->>", JSON.parse(JSON.stringify(s))), l.execute({ ...s });
+	}), f = !1;
+	l && watchEffect(() => {
+		(toValue(n.ready) ?? !0) && !f && (f = !0, p());
 	});
-	function u(e = {}) {
-		console.log("=== reset called ==="), console.log("data input ->>", JSON.parse(JSON.stringify(e))), console.log("requestParams before ->>", JSON.parse(JSON.stringify(s))), a.page = 1, a.pageSize = 10, Object.keys(s).forEach((n) => {
-			n !== "tableId" && (r.ignoreAttrs?.includes(n) || n in e || (console.log(`deleting key: ${n}, value:`, s[n]), delete s[n]));
-		}), c = null, Object.assign(s, {
+	function p(e) {
+		if (!(toValue(n.ready) ?? !0)) return;
+		let r = {
+			...toValue(n.defaultParams) || {},
+			...s,
+			...e
+		};
+		return Object.keys(r).forEach((e) => {
+			e !== "page" && e !== "pageSize" && (s[e] = r[e]);
+		}), d.execute(r);
+	}
+	function m(e = {}) {
+		a.page = 1, a.pageSize = 10, e && (Object.keys(s).forEach((n) => {
+			r.ignoreAttrs?.includes(n) || Object.keys(e).includes(n) || delete s[n];
+		}), Object.assign(s, {
 			...e,
 			page: 1,
 			pageSize: 10
-		}), console.log("requestParams after ->>", JSON.parse(JSON.stringify(s))), console.log("=== reset done ===");
+		})), p();
 	}
-	function d({ page: e, pageSize: n }) {
-		a.page = e, a.pageSize = n, Object.assign(s, {
+	function g({ page: e, pageSize: n }) {
+		a.page = e, a.pageSize = n, p({
 			page: e,
 			pageSize: n
 		});
 	}
-	function f(e) {
+	function _(e) {
 		o.value = e;
 	}
 	return reactive({
-		...l,
+		...d,
 		data: i,
 		pagination: a,
 		selection: o,
-		reset: u,
-		updatePagination: d,
-		selectionChange: f
+		reset: m,
+		updatePagination: g,
+		selectionChange: _,
+		execute: p
 	});
 }
 //#endregion
 //#region src/hooks/useTable/common.ts
 function useComTable(e, n) {
-	let { defaultParams: r, ...i } = n, a = isRef(r) ? r : isReactive(r) ? toRef(r) : ref(r || {}), o = useDefaultTable(e, {
+	let { defaultParams: r, ...i } = n, a = isRef(r) ? r : isReactive(r) ? toRef(r) : ref(r || {}), o = toValue(a)?.sort, s = useDefaultTable(e, {
 		...i,
 		ready: computed(() => {
 			let e = isRef(n.ready) ? n.ready.value : n.ready, r = !!a.value?.tableId;
@@ -2673,62 +2673,70 @@ function useComTable(e, n) {
 			...n?.ignoreAttrs || []
 		]
 	});
-	function s(e = {}) {
-		console.log("=== useComTable reset called ==="), console.log("paramsRef.value before ->>", JSON.parse(JSON.stringify(a.value))), console.log("data input ->>", JSON.parse(JSON.stringify(e)));
+	function c(e) {
 		let n = [
 			"tableId",
 			"page",
-			"pageSize",
-			"sort"
-		];
-		Object.keys(a.value).forEach((r) => {
-			!n.includes(r) && !(r in e) && (console.log(`deleting from paramsRef: ${r}`), delete a.value[r]);
-		}), Object.assign(a.value, e, {
+			"pageSize"
+		], r = {}, i = {};
+		return Object.keys(e || {}).forEach((a) => {
+			n.includes(a) ? r[a] = e[a] : i[a] = e[a];
+		}), Object.keys(i).length > 0 && (r.params = i), s.execute(r);
+	}
+	function l(e = {}) {
+		let { tableId: n } = toValue(a);
+		a.value = {
+			tableId: n,
 			page: 1,
-			pageSize: 10
-		}), console.log("paramsRef.value after ->>", JSON.parse(JSON.stringify(a.value)));
+			pageSize: 10,
+			sort: o,
+			...e
+		}, s.reset();
 	}
-	async function c(e) {
+	async function u(e) {
 		let n = toValue(a);
 		return request_default.post("/common/insert", {
 			params: { ...e },
 			tableId: n?.tableId
 		});
 	}
-	async function l(e) {
+	async function d(e) {
 		let n = toValue(a);
 		return request_default.post("/common/update", {
 			params: { ...e },
 			tableId: n?.tableId
 		});
 	}
-	async function u(e) {
+	async function f(e) {
 		let n = toValue(a);
 		return request_default.post("/common/delete", {
 			idList: e,
 			tableId: n?.tableId
 		});
 	}
-	async function d(e) {
+	async function p(e) {
 		let { title: n = "export" } = e || {}, r = toValue(a), i = await request_default.blob(e?.url ?? "/common/exportExcel", {
 			tableId: r?.tableId,
 			type: e?.type || "all"
 		}), o = new Blob([i]), s = document.createElement("a");
 		s.href = window.URL.createObjectURL(o), s.download = `${n}.xlsx`, s.click(), VepMessage.success("导出成功"), window.URL.revokeObjectURL(s.href);
 	}
-	let f = reactive({
+	let m = reactive({
 		loading: !1,
 		data: [],
 		selection: [],
-		insert: c,
-		update: l,
-		remove: u,
-		delete: u,
-		exportData: d
+		insert: u,
+		update: d,
+		remove: f,
+		delete: f,
+		exportData: p
 	});
 	return watchEffect(() => {
-		Object.assign(f, o, { reset: s });
-	}, { flush: "sync" }), f;
+		Object.assign(m, s, {
+			reset: l,
+			execute: c
+		});
+	}, { flush: "sync" }), m;
 }
 //#endregion
 //#region src/hooks/useTable/index.ts

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-B0UFeX-p.js";
+import { c as e, d as t, f as n, l as r, s as i, u as a } from "../entry-BQSBoqVF.js";
 export { e as useDictionary, n as useFetch, r as useRoute, a as useRouter, t as useTable, i as useUser };

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-B0UFeX-p.js";
+import { O as e, _ as t, b as n, v as r, y as i } from "../entry-BQSBoqVF.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-B0UFeX-p.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-BQSBoqVF.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.83",
+  "version": "0.3.85",
   "type": "module",
   "description": "基于 Vue 3 + Element Plus 的企业级 UI 组件库",
   "keywords": [