liyu-pc-base 1.0.627 → 1.0.629

package/dist/components/index.js

@@ -97457,17 +97457,25 @@ var sQ = function(e, t, n, r) {
 				}
 			}
 		}, Qe = async (e) => {
-			let t = e.cellHeaderPaths?.colHeaderPaths || [], n = e.cellHeaderPaths?.rowHeaderPaths || [], a = [];
-			for (let e of [...t, ...n]) !e.role && e.dimensionKey && a.push({
+			let t = e.cellHeaderPaths?.colHeaderPaths || [], n = e.cellHeaderPaths?.rowHeaderPaths || [], a = [], o = {};
+			for (let e of [...Me.value, ...Ne.value]) o[e.key] = e.label;
+			let s = [];
+			for (let e of [...t, ...n]) !e.role && e.dimensionKey && (a.push({
 				id: e.dimensionKey,
 				value: e.value
-			});
+			}), s.push({
+				label: o[e.dimensionKey],
+				value: e.value
+			}));
 			if (!a.length) return;
-			let o = ye({
+			let c = ye({
 				type: "pivot_table_match",
 				matchFields: a
-			}), s = r.config.pivot_table_url;
-			i("filterForIdKey", (await g(o, s.replace("__tree", ""), s.includes("__tree"), { api_log: `pivotTable ${r.config.key} ${r.config.title}` }))?.filter_id_key || "");
+			}), l = r.config.pivot_table_url;
+			i("filterForIdKey", {
+				filter_id_key: (await g(c, l.replace("__tree", ""), l.includes("__tree"), { api_log: `pivotTable ${r.config.key} ${r.config.title}` }))?.filter_id_key || "",
+				filterStrList: s
+			});
 		}, $e = (e) => {
 			let t = document.createElement("textarea");
 			t.value = e, t.style.position = "fixed", t.style.opacity = "0", document.body.appendChild(t), t.select();
@@ -97842,7 +97850,7 @@ var sQ = function(e, t, n, r) {
 			}, 512)], 512);
 		};
 	}
-}), [["__scopeId", "data-v-0e581aa4"]]), mQ = {
+}), [["__scopeId", "data-v-def4e337"]]), mQ = {
 	key: 0,
 	class: "pivot-echarts-loading"
 }, hQ = {
@@ -98408,7 +98416,7 @@ var sQ = function(e, t, n, r) {
 			}, 8, ["disabled"])])) : H("", !0);
 		};
 	}
-}), bQ = { class: "table-wrapper" }, xQ = { key: 0 }, SQ = { key: 0 }, CQ = { key: 0 }, wQ = /*#__PURE__*/ m(/* @__PURE__ */ Te({
+}), bQ = { class: "table-wrapper" }, xQ = { class: "filter-message" }, SQ = { key: 0 }, CQ = { key: 0 }, wQ = { key: 0 }, TQ = /*#__PURE__*/ m(/* @__PURE__ */ Te({
 	__name: "rightTable",
 	props: /*@__PURE__*/ je({
 		eventBus: { default: null },
@@ -98423,23 +98431,23 @@ var sQ = function(e, t, n, r) {
 	emits: /*@__PURE__*/ je(["changeMode"], ["update:leftOpen"]),
 	setup(e, { expose: t, emit: n }) {
 		let r = G(null), i = G(null), o = G(null), s = e, c = n, l = a(), { t: u } = Ct(), d = xt(), f = () => {
-			_.value?.refresh();
-		}, p = G(null), m = G(null), h = G(null), g = G(""), _ = be(() => s.tableMode === "pivot" ? m.value : s.tableMode === "pivot_charts" ? h.value : p.value), v = Qe(e, "leftOpen");
+			v.value?.refresh();
+		}, p = G(null), m = G(null), h = G(null), g = G(""), _ = G([]), v = be(() => s.tableMode === "pivot" ? m.value : s.tableMode === "pivot_charts" ? h.value : p.value), y = Qe(e, "leftOpen");
 		Be(() => {
-			r.value = C("normal"), i.value = C("pivot"), o.value = C("pivot_charts");
+			r.value = w("normal"), i.value = w("pivot"), o.value = w("pivot_charts");
 		}), tt(() => s.tableMode, async (e) => {
 			await Ne();
-			let t = e === "pivot" ? "pivot:" : e === "pivot_charts" ? "pivotcharts:" : "", n = _.value?.currentView?.uid || "";
+			let t = e === "pivot" ? "pivot:" : e === "pivot_charts" ? "pivotcharts:" : "", n = v.value?.currentView?.uid || "";
 			window.location.hash = `${t}${n}`;
 		}), t({
 			tableProRef: p,
 			pivotTableRef: m,
 			pivotChartsRef: h,
-			activeTableRef: _
+			activeTableRef: v
 		});
-		let y = () => {
-			v.value = !v.value;
-		}, x = (e, t, n) => {
+		let x = () => {
+			y.value = !y.value;
+		}, S = (e, t, n) => {
 			let r = {
 				...e,
 				name: void 0,
@@ -98447,7 +98455,7 @@ var sQ = function(e, t, n, r) {
 				operator_list: []
 			};
 			return n[e.name] && (r.options = n[e.name]), t[e.name] && (r.default_value = t[e.name]), ["rangepicker", "monthrangepicker"].includes(r.type) ? r.default_operator = "between" : r.default_operator = "eq", r;
-		}, S = () => {
+		}, C = () => {
 			let e = {};
 			d.query?.query_json && (e = JSON.parse(d.query?.query_json));
 			let t = JSON.parse(JSON.stringify({
@@ -98470,7 +98478,7 @@ var sQ = function(e, t, n, r) {
 					n[e] = t[e];
 				}), n;
 			} else return t;
-		}, C = (e) => {
+		}, w = (e) => {
 			let t = e === "normal", n = e === "pivot", r = e === "pivot_charts", i = "", a = "";
 			n ? (i = "pivot-", a = "pivot:") : r && (i = "pivotcharts-", a = "pivotcharts:");
 			let o = s.pageConfig.is_show_normal_search || s.pageConfig.is_show_advantage, c = s.pageConfig.is_show_advantage, f = [], p = [];
@@ -98498,7 +98506,7 @@ var sQ = function(e, t, n, r) {
 				}
 			} else {
 				let e = s.pageConfig.searchConfig;
-				if (e) for (let t of e.fields) f.push(x(t, e.model || {}, e.options || {}));
+				if (e) for (let t of e.fields) f.push(S(t, e.model || {}, e.options || {}));
 			}
 			let m = "";
 			window.location.hash && (m = window.location.hash.substring(1), a ? m = m.startsWith(a) ? m.substring(a.length) : "" : (m.startsWith("pivot:") || m.startsWith("pivotcharts:")) && (m = ""));
@@ -98507,7 +98515,7 @@ var sQ = function(e, t, n, r) {
 				let e = null;
 				Array.isArray(s.pageConfig.advanced_base_conditions) && s.pageConfig.advanced_base_conditions.length > 0 && (e = s.pageConfig.advanced_base_conditions);
 				let t = [];
-				Object.entries(S()).forEach(([e, n]) => {
+				Object.entries(C()).forEach(([e, n]) => {
 					Array.isArray(n) || (n = [n]), t.push({
 						field_name: e,
 						operator: "in",
@@ -98522,7 +98530,7 @@ var sQ = function(e, t, n, r) {
 					op: "and",
 					children: t
 				}] : e?.length > 0 ? h = e : t?.length > 0 && (h = t);
-			} else Object.assign(_, S());
+			} else Object.assign(_, C());
 			g.value && (_.filter_id_key = g.value);
 			let v = (s.pageConfig.baseColumns || []).filter((e) => e.dataIndex !== "action");
 			return l.HAS_ACTION_BTN(s.pageConfig) && v.push({
@@ -98581,32 +98589,37 @@ var sQ = function(e, t, n, r) {
 					pageConfig: s.pageConfig
 				}
 			};
-		}, w = (e) => {
-			g.value = e, r.value = C("normal"), c("changeMode", "normal"), Ne(() => {
+		}, T = (e) => {
+			g.value = e.filter_id_key, _.value = e.filterStrList, r.value = w("normal"), c("changeMode", "normal"), Ne(() => {
 				p.value.currentView = { id: "no-view" }, p.value.setViewData(null);
 			});
-		}, T = () => {
-			g.value = "", r.value = C("normal");
+		}, E = () => {
+			g.value = "", r.value = w("normal");
 		};
 		return (e, t) => {
-			let n = qe("a-alert"), a = qe("MenuFoldOutlined"), s = qe("MenuUnfoldOutlined");
-			return W(), xe("div", bQ, [(W(), V(ve, null, [r.value && e.tableMode === "normal" ? (W(), xe(_e, { key: 0 }, [g.value ? (W(), V(n, {
+			let n = qe("a-tag"), a = qe("a-alert"), s = qe("MenuFoldOutlined"), c = qe("MenuUnfoldOutlined");
+			return W(), xe("div", bQ, [(W(), V(ve, null, [r.value && e.tableMode === "normal" ? (W(), xe(_e, { key: 0 }, [g.value ? (W(), V(a, {
 				key: 0,
-				message: "当前数据已通过透视表定位，此功能为临时过滤，不会被视图记录。关闭可恢复原始数据。",
 				type: "warning",
 				closable: "",
 				"show-icon": "",
-				onClose: T
+				onClose: E
+			}, {
+				message: K(() => [Se("div", xQ, [(W(!0), xe(_e, null, Ge(_.value, (e) => (W(), xe("span", { key: e.label }, [Ce(Xe(e.label) + ": ", 1), U(n, null, {
+					default: K(() => [Ce(Xe(e.value), 1)]),
+					_: 2
+				}, 1024)]))), 128))]), t[0] ||= Se("div", null, " 当前数据已通过透视表定位，此功能为临时过滤，不会被视图记录。关闭可恢复原始数据。 ", -1)]),
+				_: 1
 			})) : H("", !0), U(de, {
 				config: r.value,
 				ref_key: "tableProRef",
 				ref: p,
 				eventBus: e.eventBus
 			}, {
-				header_bar_before_title: K(() => [e.pageConfig.isView ? (W(), xe("div", xQ, [Se("div", {
+				header_bar_before_title: K(() => [e.pageConfig.isView ? (W(), xe("div", SQ, [Se("div", {
 					class: "toggle-button",
-					onClick: y
-				}, [v.value ? (W(), V(a, { key: 0 })) : (W(), V(s, { key: 1 }))])])) : H("", !0)]),
+					onClick: x
+				}, [y.value ? (W(), V(s, { key: 0 })) : (W(), V(c, { key: 1 }))])])) : H("", !0)]),
 				header_bar_before_btn: K(() => [U(yQ, {
 					modalType: e.modalType,
 					app_flag: e.app_flag,
@@ -98628,12 +98641,12 @@ var sQ = function(e, t, n, r) {
 				ref_key: "pivotTableRef",
 				ref: m,
 				eventBus: e.eventBus,
-				onFilterForIdKey: w
+				onFilterForIdKey: T
 			}, {
-				header_bar_before_title: K(() => [e.pageConfig.isView ? (W(), xe("div", SQ, [Se("div", {
+				header_bar_before_title: K(() => [e.pageConfig.isView ? (W(), xe("div", CQ, [Se("div", {
 					class: "toggle-button",
-					onClick: y
-				}, [v.value ? (W(), V(a, { key: 0 })) : (W(), V(s, { key: 1 }))])])) : H("", !0)]),
+					onClick: x
+				}, [y.value ? (W(), V(s, { key: 0 })) : (W(), V(c, { key: 1 }))])])) : H("", !0)]),
 				header_bar_before_btn: K(() => [U(yQ, {
 					modalType: e.modalType,
 					app_flag: e.app_flag,
@@ -98656,10 +98669,10 @@ var sQ = function(e, t, n, r) {
 				ref: h,
 				eventBus: e.eventBus
 			}, {
-				header_bar_before_title: K(() => [e.pageConfig.isView ? (W(), xe("div", CQ, [Se("div", {
+				header_bar_before_title: K(() => [e.pageConfig.isView ? (W(), xe("div", wQ, [Se("div", {
 					class: "toggle-button",
-					onClick: y
-				}, [v.value ? (W(), V(a, { key: 0 })) : (W(), V(s, { key: 1 }))])])) : H("", !0)]),
+					onClick: x
+				}, [y.value ? (W(), V(s, { key: 0 })) : (W(), V(c, { key: 1 }))])])) : H("", !0)]),
 				header_bar_before_btn: K(() => [U(yQ, {
 					modalType: e.modalType,
 					app_flag: e.app_flag,
@@ -98678,10 +98691,10 @@ var sQ = function(e, t, n, r) {
 			}, 8, ["config", "eventBus"])) : H("", !0)], 1024))]);
 		};
 	}
-}), [["__scopeId", "data-v-f7f6e469"]]), TQ = {
+}), [["__scopeId", "data-v-5a706579"]]), EQ = {
 	key: 0,
 	class: "pri-page"
-}, EQ = { class: "pri-wrapper" }, DQ = { class: "right-wrapper" }, OQ = /*#__PURE__*/ m(/* @__PURE__ */ Te({
+}, DQ = { class: "pri-wrapper" }, OQ = { class: "right-wrapper" }, kQ = /*#__PURE__*/ m(/* @__PURE__ */ Te({
 	__name: "index",
 	setup(e) {
 		let t = G(!0), n = G(!1), r = G(null), i = wt(), o = G("normal"), s = a(), c = G(null), { t: d } = Ct(), f = s.currentOrg, p = xt(), m = l(), h = p.path.split("/"), g = {
@@ -98720,7 +98733,7 @@ var sQ = function(e, t, n, r) {
 		}), ze(() => {
 			u()?.off("refresh", x), u()?.off("reset_and_reload", b), u()?.off("local_refresh", S);
 		}), (e, a) => (W(), V(On, null, {
-			default: K(() => [n.value ? (W(), xe("div", TQ, [Se("div", EQ, [U(ye, { name: "left-slide" }, {
+			default: K(() => [n.value ? (W(), xe("div", EQ, [Se("div", DQ, [U(ye, { name: "left-slide" }, {
 				default: K(() => [t.value ? (W(), xe("div", {
 					key: 0,
 					class: Pe(["left-slide-outer", { "setting-open": v.value }])
@@ -98738,7 +98751,7 @@ var sQ = function(e, t, n, r) {
 					"tableMode"
 				])], 2)], 2)) : H("", !0)]),
 				_: 1
-			}), Se("div", DQ, [U(wQ, {
+			}), Se("div", OQ, [U(TQ, {
 				pageConfig: c.value,
 				modalType: g.modalType,
 				ref_key: "rightTableRef",
@@ -98762,4 +98775,4 @@ var sQ = function(e, t, n, r) {
 	}
 }), [["__scopeId", "data-v-d9ad39ea"]]);
 //#endregion
-export { Vt as AddConditionGroupModal, p as BoldMatcher, j as CodeEditor, O as FieldRender, N as FieldRender2, en as FormRender, rn as FormRender2, P as FormRender3, Zt as GeneralFilter, M as IconSelect, E as JsonObj, T as JsonStr, C as RemoteModal, w as RemoteSelectPro, k as RemoteTreeSelectPro, ee as SearchRender, Tn as SideSearchRender, L as SmallTableSerarchField, Sn as ViewManage, A as debugCode, On as fullLayout, f as getFormConfig, br as gridPage, OQ as remotePagesV2, de as tablePro };
+export { Vt as AddConditionGroupModal, p as BoldMatcher, j as CodeEditor, O as FieldRender, N as FieldRender2, en as FormRender, rn as FormRender2, P as FormRender3, Zt as GeneralFilter, M as IconSelect, E as JsonObj, T as JsonStr, C as RemoteModal, w as RemoteSelectPro, k as RemoteTreeSelectPro, ee as SearchRender, Tn as SideSearchRender, L as SmallTableSerarchField, Sn as ViewManage, A as debugCode, On as fullLayout, f as getFormConfig, br as gridPage, kQ as remotePagesV2, de as tablePro };