yc-vep-ui 0.4.6 → 0.4.8

package/dist/{entry-1vDWqFVE.js → entry-D40zjrJF.js}

@@ -2573,89 +2573,84 @@ function useFetch(e, n = {}) {
 //#endregion
 //#region src/hooks/useTable/default.ts
 function useDefaultTable(e, n) {
-	let { isManualExecuting: r, ignoreAttrs: i, replaceAttrs: a } = n, o = [
+	let r = [
 		"tableName",
 		"sort",
-		...i || []
-	], s = a || {
+		...n?.ignoreAttrs || []
+	], i = n?.replaceAttrs || {
 		table: "table",
 		total: "total"
-	}, c = shallowRef([]), l = reactive({
+	}, a = shallowRef([]), o = reactive({
 		total: 0,
 		page: 1,
 		pageSize: 10
-	}), u = ref([]), d = reactive({
+	}), s = ref([]), c = reactive({
 		page: 1,
 		pageSize: 10
 	});
-	if (n?.onBefore?.(d) === !1) return reactive({
+	if (n?.onBefore?.(c) === !1) return reactive({
 		loading: ref(!1),
-		data: c,
-		pagination: l,
-		selection: u,
+		data: a,
+		pagination: o,
+		selection: s,
 		execute: () => {},
 		reset: () => {},
 		updatePagination: () => {},
 		selectionChange: () => {}
 	});
-	let f = useFetch(e, {
+	let l = useFetch(e, {
 		...n,
-		defaultParams: d,
+		defaultParams: c,
 		immediate: !1,
 		onSuccess: (e) => {
-			n?.onSuccess?.(e), l.total = e[s.total] || 0, c.value = e[s.table] || [];
+			n?.onSuccess?.(e), o.total = e[i.total] || 0, a.value = e[i.table] || [];
 		}
-	});
+	}), u = !1;
 	watchEffect(() => {
-		let e = toValue(n.ready) ?? !0, i = r?.value || !1;
-		if (!e || i) return;
-		let a = toValue(n.defaultParams || {});
-		(l.page !== 1 || l.pageSize !== 10) && (l.page = 1, l.pageSize = 10);
-		let o = {};
-		for (let e in a) e !== "page" && e !== "pageSize" && (o[e] = a[e], d[e] = a[e]);
-		f.execute({
-			...d,
-			...o
-		});
+		if (u) return;
+		let e = toValue(n.ready) ?? !0, r = toValue(n.defaultParams || {});
+		if (!(!e || !r)) {
+			for (let e in r) c[e] = r[e];
+			l.execute({ ...c }), u = !0;
+		}
 	}, { flush: "sync" });
-	function p(e = {}) {
-		let { page: n, pageSize: r, ...i } = e;
-		l.page = n || 1, l.pageSize = r || 10;
-		let a = [];
-		Object.keys(d).forEach((e) => {
-			!o.includes(e) && !(e in i) && a.push(e);
-		}), a.forEach((e) => delete d[e]), Object.assign(d, i, {
-			page: l.page,
-			pageSize: l.pageSize
+	function d(e = {}) {
+		let { page: n, pageSize: i, ...a } = e;
+		o.page = n || 1, o.pageSize = i || 10;
+		let s = [];
+		Object.keys(c).forEach((e) => {
+			!r.includes(e) && !(e in a) && s.push(e);
+		}), s.forEach((e) => delete c[e]), Object.assign(c, a, {
+			page: o.page,
+			pageSize: o.pageSize
 		});
 	}
-	function m({ page: e, pageSize: n }) {
-		l.page = e, l.pageSize = n, d.page = e, d.pageSize = n;
+	function f({ page: e, pageSize: n }) {
+		o.page = e, o.pageSize = n, c.page = e, c.pageSize = n;
 	}
-	function g(e) {
-		u.value = e;
+	function p(e) {
+		s.value = e;
 	}
 	return reactive({
-		...f,
-		data: c,
-		pagination: l,
-		selection: u,
-		reset: p,
-		updatePagination: m,
-		selectionChange: g
+		...l,
+		data: a,
+		pagination: o,
+		selection: s,
+		reset: d,
+		updatePagination: f,
+		selectionChange: 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 = ["sort", ...n?.ignoreAttrs || []], s = ref(!1), c = useDefaultTable(e, {
+	let { defaultParams: r, ...i } = n, a = isRef(r) ? r : isReactive(r) ? toRef(r) : ref(r || {}), o = ["sort", ...n?.ignoreAttrs || []], s = useDefaultTable(e, {
 		...i,
 		ready: computed(() => {
 			let e = isRef(n.ready) ? n.ready.value : n.ready, r = !!a.value?.tableId;
 			return (e === void 0 || e) && r;
 		}),
 		defaultParams: computed(() => {
-			if (s.value) return null;
 			let { tableId: e, page: n, pageSize: r, ...i } = toValue(a) || {};
 			return {
 				tableId: e,
@@ -2664,10 +2659,9 @@ function useComTable(e, n) {
 				params: i
 			};
 		}),
-		ignoreAttrs: o,
-		isManualExecuting: s
+		ignoreAttrs: o
 	});
-	function l(e = {}) {
+	function c(e = {}) {
 		let { tableId: n, ...r } = toValue(a), i = {};
 		o.forEach((e) => {
 			r[e] !== void 0 && (i[e] = r[e]);
@@ -2677,62 +2671,63 @@ function useComTable(e, n) {
 			pageSize: 10,
 			...i,
 			...e
-		}, c.reset();
+		}, s.reset();
+		let { tableId: c, page: l, pageSize: u, ...d } = a.value, f = {
+			tableId: c,
+			page: l,
+			pageSize: u
+		};
+		Object.keys(d).length > 0 && (f.params = d), s.execute(f);
 	}
-	function u(e) {
+	function l(e) {
 		let n = [
 			"tableId",
 			"page",
 			"pageSize"
 		], r = {}, i = {}, o = toValue(a) || {};
-		Object.keys(e || {}).forEach((a) => {
+		return Object.keys(e || {}).forEach((a) => {
 			n.includes(a) ? r[a] = e[a] : i[a] = e[a];
-		}), r.tableId ||= o.tableId, r.page ||= o.page || 1, r.pageSize ||= o.pageSize || 10, Object.keys(i).length > 0 && (r.params = i), s.value = !0;
-		let l = c.execute(r);
-		return a.value = {
-			...o,
-			...e
-		}, s.value = !1, l;
+		}), r.tableId ||= o.tableId, r.page ||= o.page || 1, r.pageSize ||= o.pageSize || 10, Object.keys(i).length > 0 && (r.params = i), s.execute(r);
 	}
-	let d = () => toValue(a)?.tableId;
-	async function f(e) {
+	let u = () => toValue(a)?.tableId;
+	async function d(e) {
 		return request_default.post("/common/insert", {
 			params: { ...e },
-			tableId: d()
+			tableId: u()
 		});
 	}
-	async function p(e) {
+	async function f(e) {
 		return request_default.post("/common/update", {
 			params: { ...e },
-			tableId: d()
+			tableId: u()
 		});
 	}
-	async function m(e) {
+	async function p(e) {
 		return request_default.post("/common/delete", {
 			idList: e,
-			tableId: d()
+			tableId: u()
 		});
 	}
-	async function g({ title: e = "export", url: n } = {}) {
+	async function m({ title: e = "export", url: n } = {}) {
 		let r = await request_default.blob(n ?? "/common/exportExcel", {
-			tableId: d(),
+			tableId: u(),
 			type: "all"
 		}), i = new Blob([r]), a = document.createElement("a");
 		a.href = window.URL.createObjectURL(i), a.download = `${e}.xlsx`, a.click(), VepMessage.success("导出成功"), window.URL.revokeObjectURL(a.href);
 	}
-	let _ = reactive({
-		insert: f,
-		update: p,
-		remove: m,
-		delete: m,
-		exportData: g
+	let g = reactive({
+		insert: d,
+		update: f,
+		remove: p,
+		delete: p,
+		exportData: m
 	});
 	return watchEffect(() => {
-		Object.assign(_, c, {
-			reset: l,
-			execute: u
+		Object.assign(g, s, {
+			reset: c,
+			execute: l
 		});
-	}, { flush: "sync" }), _;
+	}, { flush: "sync" }), g;
 }
 //#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-1vDWqFVE.js";
+import { c as e, d as t, f as n, l as r, s as i, u as a } from "../entry-D40zjrJF.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-1vDWqFVE.js";
+import { O as e, _ as t, b as n, v as r, y as i } from "../entry-D40zjrJF.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-1vDWqFVE.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-D40zjrJF.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.4.6",
+  "version": "0.4.8",
   "type": "module",
   "description": "基于 Vue 3 + Element Plus 的企业级 UI 组件库",
   "keywords": [