act-plus 1.1.50 → 1.1.52

package/lib/{dialogAddField-9be2adae.js → dialogAddField-3e7ab338.js}

@@ -1,5 +1,5 @@
 import { defineAsyncComponent as de, inject as E, reactive as se, ref as A, watch as ie, resolveComponent as C, resolveDirective as me, openBlock as r, createBlock as i, withCtx as a, createElementVNode as L, createVNode as l, unref as m, createTextVNode as S, withDirectives as pe, createElementBlock as c, Fragment as y, renderList as g, createCommentVNode as U, toDisplayString as fe } from "vue";
-import { _ as be, U as Q, F as ce, k as ye, l as Ce, m as M, T as ge, A as Ve, C as _e } from "./index-38232fe1.js";
+import { _ as be, U as Q, F as ce, k as ye, l as Ce, m as M, T as ge, A as Ve, C as _e } from "./index-fa25c385.js";
 import "vue-router";
 import "js-base64";
 import "element-plus";
@@ -13,7 +13,7 @@ const ve = { slot: "prepend" }, Te = { class: "dialog-footer" }, Se = {
   },
   emits: ["update:visible", "refresh"],
   setup(I, { emit: K }) {
-    const W = de(() => import("./dialogSiteComponentsParams-f94d7982.js")), h = K, N = I, P = E("pageKey")(), O = E("conditionList")(), Y = E("configData")();
+    const W = de(() => import("./dialogSiteComponentsParams-d82a76fd.js")), h = K, N = I, P = E("pageKey")(), O = E("conditionList")(), Y = E("configData")();
     let k = se((() => ({
       btnLoading: !1,
       showSiteComponentsParamsDialog: !1
@@ -935,7 +935,7 @@ const ve = { slot: "prepend" }, Te = { class: "dialog-footer" }, Se = {
       }, 8, ["model-value", "title"]);
     };
   }
-}, we = /* @__PURE__ */ be(Se, [["__scopeId", "data-v-3da504a4"]]);
+}, we = /* @__PURE__ */ be(Se, [["__scopeId", "data-v-ec695cc7"]]);
 export {
   we as default
 };

package/lib/{dialogConfigBtn-d24c07af.js → dialogConfigBtn-b6625b2d.js}

@@ -1,5 +1,5 @@
 import { defineAsyncComponent as O, inject as N, computed as ue, reactive as ne, ref as q, watch as de, resolveComponent as y, resolveDirective as re, openBlock as d, createBlock as m, withCtx as e, createElementVNode as se, createVNode as l, unref as o, createTextVNode as U, withDirectives as ie, toDisplayString as A, createCommentVNode as C, createElementBlock as b, Fragment as f, renderList as _ } from "vue";
-import { _ as me, B as pe, c as ce, d as be, e as fe, f as _e, g as ge, h as Ve, i as ye, j as he } from "./index-38232fe1.js";
+import { _ as me, B as pe, c as ce, d as be, e as fe, f as _e, g as ge, h as Ve, i as ye, j as he } from "./index-fa25c385.js";
 import { useRoute as Ce } from "vue-router";
 import "js-base64";
 import "element-plus";
@@ -13,7 +13,7 @@ const ve = { class: "dialog-footer" }, Fe = {
   },
   emits: ["update:visible", "refresh"],
   setup(x, { emit: D }) {
-    const P = O(() => import("./index-aace8656.js")), E = O(() => import("./index-38232fe1.js").then((p) => p.q)), W = Ce(), R = N("request"), I = D, T = x, Y = ue(() => W.params.key);
+    const P = O(() => import("./index-ec6f916c.js")), E = O(() => import("./index-fa25c385.js").then((p) => p.q)), W = Ce(), R = N("request"), I = D, T = x, Y = ue(() => W.params.key);
     let k = ne((() => ({
       btnLoading: !1
     }))());
@@ -685,7 +685,33 @@ const ve = { class: "dialog-footer" }, Fe = {
                       })
                     ]),
                     _: 1
-                  })) : C("", !0)
+                  })) : C("", !0),
+                  l(i, { span: 6 }, {
+                    default: e(() => [
+                      l(r, { label: "关联菜单" }, {
+                        default: e(() => [
+                          l(V, {
+                            modelValue: o(t).associationMenuId,
+                            "onUpdate:modelValue": u[10] || (u[10] = (a) => o(t).associationMenuId = a),
+                            placeholder: "请选择关联菜单",
+                            filterable: "",
+                            clearable: ""
+                          }, {
+                            default: e(() => [
+                              (d(!0), b(f, null, _(o(j), (a, s) => (d(), m(g, {
+                                key: s,
+                                label: a.name,
+                                value: a.id
+                              }, null, 8, ["label", "value"]))), 128))
+                            ]),
+                            _: 1
+                          }, 8, ["modelValue"])
+                        ]),
+                        _: 1
+                      })
+                    ]),
+                    _: 1
+                  })
                 ]),
                 _: 1
               }),
@@ -704,7 +730,7 @@ const ve = { class: "dialog-footer" }, Fe = {
                         default: e(() => [
                           l(o(E), {
                             modelValue: o(t).codeStr,
-                            "onUpdate:modelValue": u[10] || (u[10] = (a) => o(t).codeStr = a)
+                            "onUpdate:modelValue": u[11] || (u[11] = (a) => o(t).codeStr = a)
                           }, null, 8, ["modelValue"])
                         ]),
                         _: 1
@@ -720,7 +746,7 @@ const ve = { class: "dialog-footer" }, Fe = {
                 gutter: 24
               }, {
                 default: e(() => [
-                  l(i, { span: 9 }, {
+                  l(i, { span: 10 }, {
                     default: e(() => [
                       l(r, {
                         label: "组件名称",
@@ -730,7 +756,7 @@ const ve = { class: "dialog-footer" }, Fe = {
                         default: e(() => [
                           l(c, {
                             modelValue: o(t).customComponentName,
-                            "onUpdate:modelValue": u[11] || (u[11] = (a) => o(t).customComponentName = a),
+                            "onUpdate:modelValue": u[12] || (u[12] = (a) => o(t).customComponentName = a),
                             placeholder: "请输入组件名称",
                             clearable: ""
                           }, {
@@ -745,7 +771,7 @@ const ve = { class: "dialog-footer" }, Fe = {
                     ]),
                     _: 1
                   }),
-                  l(i, { span: 8 }, {
+                  l(i, { span: 14 }, {
                     default: e(() => [
                       l(r, {
                         label: "组件地址",
@@ -755,7 +781,7 @@ const ve = { class: "dialog-footer" }, Fe = {
                         default: e(() => [
                           l(c, {
                             modelValue: o(t).customComponentUrl,
-                            "onUpdate:modelValue": u[12] || (u[12] = (a) => o(t).customComponentUrl = a),
+                            "onUpdate:modelValue": u[13] || (u[13] = (a) => o(t).customComponentUrl = a),
                             placeholder: "请输入组件地址",
                             clearable: ""
                           }, null, 8, ["modelValue"])
@@ -764,32 +790,6 @@ const ve = { class: "dialog-footer" }, Fe = {
                       })
                     ]),
                     _: 1
-                  }),
-                  l(i, { span: 7 }, {
-                    default: e(() => [
-                      l(r, { label: "关联菜单" }, {
-                        default: e(() => [
-                          l(V, {
-                            modelValue: o(t).associationMenuId,
-                            "onUpdate:modelValue": u[13] || (u[13] = (a) => o(t).associationMenuId = a),
-                            placeholder: "请选择关联菜单",
-                            filterable: "",
-                            clearable: ""
-                          }, {
-                            default: e(() => [
-                              (d(!0), b(f, null, _(o(j), (a, s) => (d(), m(g, {
-                                key: s,
-                                label: a.name,
-                                value: a.id
-                              }, null, 8, ["label", "value"]))), 128))
-                            ]),
-                            _: 1
-                          }, 8, ["modelValue"])
-                        ]),
-                        _: 1
-                      })
-                    ]),
-                    _: 1
                   })
                 ]),
                 _: 1
@@ -802,7 +802,7 @@ const ve = { class: "dialog-footer" }, Fe = {
       }, 8, ["model-value", "title"]);
     };
   }
-}, Ie = /* @__PURE__ */ me(Fe, [["__scopeId", "data-v-75eab9b4"]]);
+}, Ie = /* @__PURE__ */ me(Fe, [["__scopeId", "data-v-66a03452"]]);
 export {
   Ie as default
 };

package/lib/{dialogSiteComponentsParams-f94d7982.js → dialogSiteComponentsParams-d82a76fd.js}

@@ -8,7 +8,7 @@ const B = { class: "dialog-footer" }, h = {
   },
   emits: ["update:visible", "refresh", "update:modelValue"],
   setup(f, { emit: c }) {
-    const v = _(() => import("./index-38232fe1.js").then((l) => l.q)), n = c, o = f;
+    const v = _(() => import("./index-fa25c385.js").then((l) => l.q)), n = c, o = f;
     let t = y();
     C(
       () => o.visible,

package/lib/{index-f1e88828.js → index-5a545acc.js}

@@ -1,5 +1,5 @@
 import { reactive as m, watch as b, resolveComponent as s, openBlock as v, createBlock as g, withCtx as o, createElementVNode as i, createVNode as x, createTextVNode as y, toDisplayString as h, unref as C } from "vue";
-import { _ as k, u as w } from "./index-38232fe1.js";
+import { _ as k, u as w } from "./index-fa25c385.js";
 import "vue-router";
 import "js-base64";
 import "element-plus";

package/lib/{index-b57275c1.js → index-6789c178.js}

@@ -1,5 +1,5 @@
 import { defineAsyncComponent as re, inject as C, ref as U, watch as ne, resolveComponent as f, resolveDirective as se, unref as t, openBlock as s, createElementBlock as V, createVNode as ue, normalizeStyle as de, withCtx as g, Fragment as q, renderList as L, createBlock as d, mergeProps as _, withKeys as I, withModifiers as B, createCommentVNode as h, resolveDynamicComponent as pe, createElementVNode as ie, toDisplayString as S, createTextVNode as M, withDirectives as ce } from "vue";
-import { _ as fe, u as ye, P as me, a as be, b as Ve } from "./index-38232fe1.js";
+import { _ as fe, u as ye, P as me, a as be, b as Ve } from "./index-fa25c385.js";
 import "vue-router";
 import "js-base64";
 import "element-plus";
@@ -14,13 +14,13 @@ const _e = {
   },
   emits: ["reset", "search"],
   setup(j, { emit: H }) {
-    const K = re(() => import("./index-38232fe1.js").then((r) => r.t)), { t: p } = ye(), W = C("request"), O = C("globalProps"), G = C("loadComponents"), y = C("getFieldUiProps"), x = C("formatDataType"), z = C("disposeDate"), J = C("getDefaultQueryValues"), A = H, m = j, X = U({});
+    const K = re(() => import("./index-fa25c385.js").then((r) => r.t)), { t: p } = ye(), W = C("request"), O = C("globalProps"), G = C("loadComponents"), y = C("getFieldUiProps"), x = C("formatDataType"), z = C("disposeDate"), J = C("getDefaultQueryValues"), A = H, m = j, X = U({});
     let b = U([]), Y = U([]), T = U(!0);
     const Z = (r) => m.data.tableConfig.isExpandQuery && T.value ? m.data.tableConfig.tableQueryRowWidth > r + 1 : !0, ee = async (r) => {
       b.value = await Promise.all(
         r.filter((l) => l.useScenes.includes("tableSearch")).map(async (l) => {
           l.tableQueryDefaultValue && (["date", "dateRange"].includes(l.fieldType) ? l.queryValue = z(l) : l.queryValue = l.tableQueryDefaultValue ? l.tableQueryDefaultValue : void 0), O.defaultParams.some((o) => {
-            o.field == l.fieldKey && (l.queryValue = o.value);
+            o.field == l.fieldKey && o.operate === l.tableQueryCondition && (l.queryValue = o.value);
           });
           const u = (l.formCustomComponentes ?? []).find((o) => o.permissionCode === "tableSearch");
           if (l.isQueryFieldCustom = !1, u && u.isFieldCustom) {
@@ -40,19 +40,19 @@ const _e = {
       const o = y(u), { label: k, value: P, children: $, isLeaf: w } = { ...Ve, ...o.treeProps || {} };
       if (r[w])
         return l([]);
-      const D = u.postRequestParams.filter((n) => n.submitType === "default").reduce((n, e) => (n[e.submitName] = x(e.paramsType, e.submitValue), n), {}), Q = u.postRequestParams.filter((n) => n.submitType === "match").reduce((n, e) => (n[e.submitName] = x(e.paramsType, O.matchData[e.submitValue][e.submitName]), n), {}), R = u.postRequestParams.filter((n) => n.submitType === "dynamic").map((n) => ({
+      const Q = u.postRequestParams.filter((n) => n.submitType === "default").reduce((n, e) => (n[e.submitName] = x(e.paramsType, e.submitValue), n), {}), D = u.postRequestParams.filter((n) => n.submitType === "match").reduce((n, e) => (n[e.submitName] = x(e.paramsType, O.matchData[e.submitValue][e.submitName]), n), {}), R = u.postRequestParams.filter((n) => n.submitType === "dynamic").map((n) => ({
         field: n.submitName,
         operate: n.submitMatchType,
         value: o.loadCode ? r == null ? void 0 : r.data.value : x(n.paramsType, n.submitValue)
       }));
       let c = {};
-      Object.keys(D).length && (c = { ...c, ...D }), Object.keys(Q).length && (c = { ...c, ...Q }), R.length && (c.dynamicFilters = R), o.loadCode && Reflect.has(c, o.loadCode) && (c[o.loadCode] = r == null ? void 0 : r.data.value);
-      const { data: v } = await W({
+      Object.keys(Q).length && (c = { ...c, ...Q }), Object.keys(D).length && (c = { ...c, ...D }), R.length && (c.dynamicFilters = R), o.loadCode && Reflect.has(c, o.loadCode) && (c[o.loadCode] = r == null ? void 0 : r.data.value);
+      const { data: E } = await W({
         url: u.fieldRequestUrl,
         method: u.fieldRequestType || "GET",
         data: c
-      }), E = (v || []).map((n) => ({ label: n[k], value: n[P], children: [], isLeaf: n[w] }));
-      l(E);
+      }), v = (E || []).map((n) => ({ label: n[k], value: n[P], children: [], isLeaf: n[w] }));
+      l(v);
     };
     ne(
       () => m.data,
@@ -86,9 +86,9 @@ const _e = {
     };
     return (r, l) => {
       var n;
-      const u = f("el-input"), o = f("el-option"), k = f("el-select"), P = f("el-select-v2"), $ = f("el-cascader"), w = f("el-tree-select"), D = f("el-date-picker"), Q = f("el-form-item"), R = f("a-svg-icon"), c = f("el-button"), v = f("el-form"), E = se("debounce");
+      const u = f("el-input"), o = f("el-option"), k = f("el-select"), P = f("el-select-v2"), $ = f("el-cascader"), w = f("el-tree-select"), Q = f("el-date-picker"), D = f("el-form-item"), R = f("a-svg-icon"), c = f("el-button"), E = f("el-form"), v = se("debounce");
       return t(b) && t(b).length ? (s(), V("div", _e, [
-        ue(v, {
+        ue(E, {
           style: de({ "--table-query-row": m.data.tableConfig.tableQueryRowWidth }),
           class: "form-content",
           ref: "elForm",
@@ -114,7 +114,7 @@ const _e = {
                     ie("span", Ce, "【" + S(e.fieldName) + "】", 1),
                     M(S(t(p)("act.fieldCustom")), 1)
                   ]))
-                ], 64)) : (s(), d(Q, {
+                ], 64)) : (s(), d(D, {
                   key: 0,
                   class: "search-form-item",
                   "label-width": m.data.tableConfig.tableQueryLabelWidth,
@@ -207,7 +207,7 @@ const _e = {
                       ref_for: !0
                     }, t(y)(e), {
                       onChange: l[5] || (l[5] = (a) => i({ permissionCode: 1001 }))
-                    }), null, 16, ["modelValue", "onUpdate:modelValue", "placeholder", "load"])) : e.fieldType === "date" ? (s(), d(D, _({
+                    }), null, 16, ["modelValue", "onUpdate:modelValue", "placeholder", "load"])) : e.fieldType === "date" ? (s(), d(Q, _({
                       key: 6,
                       modelValue: e.queryValue,
                       "onUpdate:modelValue": (a) => e.queryValue = a,
@@ -218,7 +218,7 @@ const _e = {
                       ref_for: !0
                     }, t(y)(e), {
                       onChange: l[6] || (l[6] = (a) => i({ permissionCode: 1001 }))
-                    }), null, 16, ["modelValue", "onUpdate:modelValue", "placeholder"])) : e.fieldType === "dateRange" ? (s(), d(D, _({
+                    }), null, 16, ["modelValue", "onUpdate:modelValue", "placeholder"])) : e.fieldType === "dateRange" ? (s(), d(Q, _({
                       key: 7,
                       modelValue: e.queryValue,
                       "onUpdate:modelValue": (a) => e.queryValue = a,
@@ -236,7 +236,7 @@ const _e = {
                 }, 1032, ["label-width", "label"]))
               ], 64)) : h("", !0)
             ], 64))), 128)),
-            t(b).length ? (s(), d(Q, {
+            t(b).length ? (s(), d(D, {
               key: 0,
               class: "search-form-btn",
               "label-width": "0"
@@ -261,7 +261,7 @@ const _e = {
                   ]),
                   _: 2
                 }, 1032, ["type", "loading", "onClick"])), [
-                  [E]
+                  [v]
                 ])), 128))
               ]),
               _: 1
@@ -285,7 +285,7 @@ const _e = {
       ])) : h("", !0);
     };
   }
-}, Qe = /* @__PURE__ */ fe(he, [["__scopeId", "data-v-425e86c9"]]);
+}, De = /* @__PURE__ */ fe(he, [["__scopeId", "data-v-3c6eb654"]]);
 export {
-  Qe as default
+  De as default
 };

package/lib/{index-25b94358.js → index-9e047760.js}

@@ -1,5 +1,5 @@
 import { defineAsyncComponent as A, inject as K, ref as w, watch as Te, resolveComponent as g, resolveDirective as le, openBlock as u, createBlock as y, withCtx as T, createElementVNode as ae, createVNode as te, createTextVNode as J, toDisplayString as O, unref as d, withDirectives as oe, createElementBlock as k, Fragment as q, renderList as Q, mergeProps as V, createCommentVNode as se, resolveDynamicComponent as De, toRaw as Ke } from "vue";
-import { _ as we, u as Ne, P as Pe, a as Ue, b as ke } from "./index-38232fe1.js";
+import { _ as we, u as Ne, P as Pe, a as Ue, b as ke } from "./index-fa25c385.js";
 import { ElNotification as Se } from "element-plus";
 import "vue-router";
 import "js-base64";
@@ -13,7 +13,7 @@ const Le = { class: "no-config-field" }, Re = { class: "dialog-footer" }, $e = {
   },
   emits: ["update:visible", "refresh"],
   setup(N, { emit: re }) {
-    const de = A(() => import("./index-38232fe1.js").then((l) => l.t)), ie = A(() => import("./index-aace8656.js")), ne = A(() => import("./index-38232fe1.js").then((l) => l.s)), ue = A(() => import("./index-38232fe1.js").then((l) => l.r)), { t: b } = Ne(), x = K("request"), ce = K("loadComponents"), P = K("formatDataType"), M = K("globalProps"), fe = K("stringToBoolean"), h = K("getFieldUiProps"), pe = K("disposeRequestData"), X = re, p = N, S = w(!1), L = w(!1), E = w(null), R = w([]), t = w({}), j = w({}), me = (l) => l.formColumnCol == null ? 24 : l.formColumnCol ? l.formColumnCol : 24 / l.formRow, ye = (l) => ["input", "textarea"].includes(l.fieldType) ? "blur" : (["select", "multipleSelect", "datetimerange", "treeSelect", "provinceCascade"].includes(l.fieldType), "change"), be = async ({ node: l, resolve: c }, a) => {
+    const de = A(() => import("./index-fa25c385.js").then((l) => l.t)), ie = A(() => import("./index-ec6f916c.js")), ne = A(() => import("./index-fa25c385.js").then((l) => l.s)), ue = A(() => import("./index-fa25c385.js").then((l) => l.r)), { t: b } = Ne(), x = K("request"), ce = K("loadComponents"), P = K("formatDataType"), M = K("globalProps"), fe = K("stringToBoolean"), h = K("getFieldUiProps"), pe = K("disposeRequestData"), X = re, p = N, S = w(!1), L = w(!1), E = w(null), R = w([]), t = w({}), j = w({}), me = (l) => l.formColumnCol == null ? 24 : l.formColumnCol ? l.formColumnCol : 24 / l.formRow, ye = (l) => ["input", "textarea"].includes(l.fieldType) ? "blur" : (["select", "multipleSelect", "datetimerange", "treeSelect", "provinceCascade"].includes(l.fieldType), "change"), be = async ({ node: l, resolve: c }, a) => {
       const r = h(a), { label: m, value: i, children: _, isLeaf: o } = { ...ke, ...r.treeProps || {} };
       if (l[o])
         return c([]);

package/lib/{index-aace8656.js → index-ec6f916c.js}

@@ -1,5 +1,5 @@
 import { ref as d, watch as h, resolveComponent as m, openBlock as r, createElementBlock as _, createVNode as v, unref as u, isRef as w, withCtx as f, createElementVNode as g, createBlock as C, createCommentVNode as N, createTextVNode as $, Fragment as B, renderList as E, normalizeClass as L } from "vue";
-import { _ as P } from "./index-38232fe1.js";
+import { _ as P } from "./index-fa25c385.js";
 import "vue-router";
 import "js-base64";
 import "element-plus";

package/lib/{index-7dce1760.js → index-f0b70454.js}

@@ -1,5 +1,5 @@
 import { ref as R, inject as l, watch as j, resolveComponent as y, resolveDirective as q, openBlock as r, createElementBlock as u, Fragment as f, renderList as E, unref as d, createBlock as i, resolveDynamicComponent as H, withCtx as b, withDirectives as C, createCommentVNode as _, createTextVNode as k, toDisplayString as B } from "vue";
-import { _ as M, u as z } from "./index-38232fe1.js";
+import { _ as M, u as z } from "./index-fa25c385.js";
 import "vue-router";
 import "js-base64";
 import "element-plus";