cd-vue-filter 2.4.8 → 2.4.10

package/dist/cd-vue-filter.js

@@ -1,6 +1,6 @@
-import { defineComponent as be, ref as _, watch as G, resolveComponent as F, openBlock as g, createBlock as J, withCtx as s, createElementVNode as i, createVNode as o, createTextVNode as T, createCommentVNode as X, computed as ee, createElementBlock as B, Fragment as W, renderList as Z, nextTick as ie, toDisplayString as se, normalizeStyle as de, normalizeClass as ue, renderSlot as fe, withDirectives as $e, vShow as Ve } from "vue";
+import { defineComponent as be, ref as _, watch as G, resolveComponent as O, openBlock as C, createBlock as J, withCtx as s, createElementVNode as i, createVNode as o, createTextVNode as T, createCommentVNode as X, computed as ee, createElementBlock as B, Fragment as W, renderList as Z, nextTick as ie, toDisplayString as se, normalizeStyle as de, normalizeClass as ue, renderSlot as fe, withDirectives as $e, vShow as Se } from "vue";
 import { MessagePlugin as re } from "tdesign-vue-next";
-const Se = [
+const Ve = [
   {
     name: "北京市",
     city: [{
@@ -5538,8 +5538,8 @@ const Se = [
   },
   emits: ["update:visible", "select"],
   setup(r, { emit: Y }) {
-    const d = r, k = Y, m = _(""), x = _(!1), I = _([]), e = _([]), $ = _(0), j = _(1), P = _([]), q = _(null), R = _([]), w = /* @__PURE__ */ new Map();
-    function O() {
+    const d = r, k = Y, m = _(""), A = _(!1), I = _([]), e = _([]), S = _(0), j = _(1), P = _([]), q = _(null), M = _([]), w = /* @__PURE__ */ new Map();
+    function F() {
       k("update:visible", !1), N();
     }
     function N() {
@@ -5547,28 +5547,28 @@ const Se = [
     }
     function K(a, p) {
       if (a.length > 0) {
-        const C = a[a.length - 1];
-        P.value = [C], q.value = I.value.find((l) => l.id === C) || null;
+        const g = a[a.length - 1];
+        P.value = [g], q.value = I.value.find((l) => l.id === g) || null;
       } else
         P.value = [], q.value = null;
     }
-    function D() {
+    function E() {
       if (!q.value) return;
       const a = q.value;
       let p = "";
-      const C = d.formType || (d.fieldType === "billdata" ? "form" : "basic");
-      if (C === "basic" || C === "tree" ? p = a.fname || "" : p = a.fbillno || "", !p && R.value.length > 0) {
-        const l = R.value[0];
+      const g = d.formType || (d.fieldType === "billdata" ? "form" : "basic");
+      if (g === "basic" || g === "tree" ? p = a.fname || "" : p = a.fbillno || "", !p && M.value.length > 0) {
+        const l = M.value[0];
         p = a[l.__vModel__] || "";
       }
       k("select", { id: a.id, displayName: p }), k("update:visible", !1), N();
     }
     function c(a) {
       const p = [];
-      for (const C of a) {
-        if (!C) continue;
-        const l = C.__config__ || {};
-        l.noShow || l.jnpfKey === "divider" || l.jnpfKey === "table" || l.jnpfKey === "vxeSubGrid" || (l.children && Array.isArray(l.children) ? p.push(...c(l.children)) : p.push(C));
+      for (const g of a) {
+        if (!g) continue;
+        const l = g.__config__ || {};
+        l.noShow || l.jnpfKey === "divider" || l.jnpfKey === "table" || l.jnpfKey === "vxeSubGrid" || (l.children && Array.isArray(l.children) ? p.push(...c(l.children)) : p.push(g));
       }
       return p;
     }
@@ -5577,16 +5577,16 @@ const Se = [
       if (d.releaseId) {
         if (w.has(d.releaseId)) {
           const p = w.get(d.releaseId);
-          R.value = p.fields, e.value = p.columns;
+          M.value = p.fields, e.value = p.columns;
           return;
         }
         try {
-          const C = await (await fetch(`/api/visualdev/OnlineDev/${d.releaseId}/Config`, {
+          const g = await (await fetch(`/api/visualdev/OnlineDev/${d.releaseId}/Config`, {
             credentials: "include"
-          })).json(), l = (a = C.data) != null && a.formData ? JSON.parse(C.data.formData) : null;
+          })).json(), l = (a = g.data) != null && a.formData ? JSON.parse(g.data.formData) : null;
           if (!(l != null && l.fields)) return;
           const t = c(l.fields);
-          R.value = t;
+          M.value = t;
           const y = t.slice(0, 6).map((z) => {
             var h;
             return {
@@ -5606,9 +5606,9 @@ const Se = [
       }
     }
     async function n() {
-      var a, p, C;
+      var a, p, g;
       if (d.releaseId) {
-        x.value = !0;
+        A.value = !0;
         try {
           const l = { currentPage: j.value, pageSize: pe };
           m.value.trim() && (l.keyword = m.value.trim());
@@ -5627,11 +5627,11 @@ const Se = [
               } catch {
               }
             return Object.assign(L, h), L;
-          }), $.value = ((C = (p = y.data) == null ? void 0 : p.pagination) == null ? void 0 : C.total) || 0;
+          }), S.value = ((g = (p = y.data) == null ? void 0 : p.pagination) == null ? void 0 : g.total) || 0;
         } catch (l) {
           console.error("[RelationSelectDialog] fetchData error:", l);
         } finally {
-          x.value = !1;
+          A.value = !1;
         }
       }
     }
@@ -5644,21 +5644,21 @@ const Se = [
     return G(() => d.visible, (a) => {
       a && d.releaseId && f().then(() => n());
     }), (a, p) => {
-      const C = F("t-input"), l = F("t-button"), t = F("t-table"), y = F("t-pagination"), z = F("t-dialog");
-      return g(), J(z, {
+      const g = O("t-input"), l = O("t-button"), t = O("t-table"), y = O("t-pagination"), z = O("t-dialog");
+      return C(), J(z, {
         visible: r.visible,
         header: r.dialogTitle || "选择关联数据",
         width: 900,
         footer: !0,
-        onClose: O,
-        onConfirm: D,
+        onClose: F,
+        onConfirm: E,
         attach: ".cd-form-select-modal",
         "close-on-overlay-click": !1
       }, {
         default: s(() => [
           i("div", xe, [
             i("div", De, [
-              o(C, {
+              o(g, {
                 modelValue: m.value,
                 "onUpdate:modelValue": p[0] || (p[0] = (h) => m.value = h),
                 placeholder: "请输入关键字搜索",
@@ -5682,7 +5682,7 @@ const Se = [
             o(t, {
               data: I.value,
               columns: e.value,
-              loading: x.value,
+              loading: A.value,
               "row-key": "id",
               "selected-row-keys": P.value,
               onSelectChange: K,
@@ -5690,11 +5690,11 @@ const Se = [
               size: "small",
               style: { "margin-top": "12px" }
             }, null, 8, ["data", "columns", "loading", "selected-row-keys"]),
-            $.value > 0 ? (g(), J(y, {
+            S.value > 0 ? (C(), J(y, {
               key: 0,
               current: j.value,
               "onUpdate:current": p[1] || (p[1] = (h) => j.value = h),
-              total: $.value,
+              total: S.value,
               "page-size": pe,
               "show-jumper": !0,
               size: "small",
@@ -5722,8 +5722,8 @@ const Se = [
   },
   emits: ["search"],
   setup(r, { emit: Y }) {
-    var a, p, C;
-    const d = ["北京市", "上海市", "天津市", "重庆市", "香港特别行政区", "澳门特别行政区"], k = ee(() => Se.map((l) => d.includes(l.name) ? {
+    var a, p, g;
+    const d = ["北京市", "上海市", "天津市", "重庆市", "香港特别行政区", "澳门特别行政区"], k = ee(() => Ve.map((l) => d.includes(l.name) ? {
       label: l.name,
       value: l.name,
       children: l.city[0].area.map((t) => ({
@@ -5756,7 +5756,7 @@ const Se = [
       "this_year",
       "last_year",
       "next_year"
-    ].includes(l), x = (l) => {
+    ].includes(l), A = (l) => {
       if (e.selectOptions && e.selectOptions[l])
         return e.selectOptions[l];
       if (e.selectOptions && Array.isArray(e.selectOptions)) {
@@ -5774,10 +5774,10 @@ const Se = [
     function I(l) {
       return [...l].sort((t, y) => t.value.localeCompare(y.value, "zh-CN"));
     }
-    const e = r, $ = Y, j = _({
+    const e = r, S = Y, j = _({
       field: ((a = e.filterCondition) == null ? void 0 : a.field) || "",
       operator: ((p = e.filterCondition) == null ? void 0 : p.operator) || "eq",
-      value: ((C = e.filterCondition) == null ? void 0 : C.value) || null
+      value: ((g = e.filterCondition) == null ? void 0 : g.value) || null
     });
     G(() => e.filterCondition, (l) => {
       l && (j.value = { ...l });
@@ -5787,23 +5787,23 @@ const Se = [
       return t ? t.type : "text";
     }, q = () => {
       typeof e.filterCondition.value == "string" && (e.filterCondition.value = e.filterCondition.value.trim()), ie(() => {
-        $("search", { ...e.filterCondition });
+        S("search", { ...e.filterCondition });
       });
-    }, R = () => {
+    }, M = () => {
       (e.filterCondition.operator === "is_empty" || e.filterCondition.operator === "is_not_empty") && (e.filterCondition.value = null), ie(() => {
-        $("search", { ...e.filterCondition });
+        S("search", { ...e.filterCondition });
       });
     }, w = (l) => {
-      e.filterCondition.value = l, $("search", { ...e.filterCondition });
-    }, O = _(!1), N = _(null), K = _("basedata"), D = (l) => {
+      e.filterCondition.value = l, S("search", { ...e.filterCondition });
+    }, F = _(!1), N = _(null), K = _("basedata"), E = (l) => {
       const t = e.fieldOptions.find((y) => y.value === l);
       return !!t && (t.type === "basedata" || t.type === "billdata") && !!t.relationConfig;
     }, c = (l) => l === "is_empty" || l === "is_not_empty", f = (l) => {
       const t = e.fieldOptions.find((y) => y.value === l);
-      t != null && t.relationConfig && (N.value = t.relationConfig, K.value = t.type === "billdata" ? "billdata" : "basedata", O.value = !0);
+      t != null && t.relationConfig && (N.value = t.relationConfig, K.value = t.type === "billdata" ? "billdata" : "basedata", F.value = !0);
     }, n = (l) => {
       e.filterCondition.value = l.displayName, ie(() => {
-        $("search", { ...e.filterCondition });
+        S("search", { ...e.filterCondition });
       });
     }, U = ee(() => {
       var y;
@@ -5896,18 +5896,18 @@ const Se = [
       }
     }), v = () => {
       ie(() => {
-        $("search", { ...e.filterCondition });
+        S("search", { ...e.filterCondition });
       });
     };
     return G(() => e.filterCondition.field, (l, t) => {
       l && t && (e.filterCondition.operator = "eq", e.filterCondition.value = null);
     }), (l, t) => {
       var le, te, ne, oe;
-      const y = F("t-option"), z = F("t-select"), h = F("t-input"), L = F("t-date-picker"), Q = F("t-cascader");
-      return g(), B("div", Ue, [
+      const y = O("t-option"), z = O("t-select"), h = O("t-input"), L = O("t-date-picker"), Q = O("t-cascader");
+      return C(), B("div", Ue, [
         o(z, {
           modelValue: e.filterCondition.field,
-          "onUpdate:modelValue": t[0] || (t[0] = (V) => e.filterCondition.field = V),
+          "onUpdate:modelValue": t[0] || (t[0] = (x) => e.filterCondition.field = x),
           placeholder: "请选择字段",
           size: e.size,
           style: { "min-width": "80px", "max-width": "110px" },
@@ -5916,64 +5916,64 @@ const Se = [
           "popup-props": { attach: ".cd-form-select-modal" }
         }, {
           default: s(() => [
-            (g(!0), B(W, null, Z(e.fieldOptions, (V) => (g(), J(y, {
-              key: V.key,
-              label: V.key,
-              value: V.value
+            (C(!0), B(W, null, Z(e.fieldOptions, (x) => (C(), J(y, {
+              key: x.key,
+              label: x.key,
+              value: x.value
             }, null, 8, ["label", "value"]))), 128))
           ]),
           _: 1
         }, 8, ["modelValue", "size"]),
         o(z, {
           modelValue: e.filterCondition.operator,
-          "onUpdate:modelValue": t[1] || (t[1] = (V) => e.filterCondition.operator = V),
+          "onUpdate:modelValue": t[1] || (t[1] = (x) => e.filterCondition.operator = x),
           placeholder: "请选择条件",
           size: e.size,
           style: { width: "80px" },
           clearable: "",
-          onChange: R,
+          onChange: M,
           "popup-props": { attach: ".cd-form-select-modal" }
         }, {
           default: s(() => [
-            (g(!0), B(W, null, Z(U.value, (V) => (g(), J(y, {
-              key: V.key,
-              label: V.label,
-              value: V.value
+            (C(!0), B(W, null, Z(U.value, (x) => (C(), J(y, {
+              key: x.key,
+              label: x.label,
+              value: x.value
             }, null, 8, ["label", "value"]))), 128))
           ]),
           _: 1
         }, 8, ["modelValue", "size"]),
-        P(e.filterCondition.field) === "number" ? (g(), J(h, {
+        P(e.filterCondition.field) === "number" ? (C(), J(h, {
           key: 0,
           type: "number",
           modelValue: e.filterCondition.value,
-          "onUpdate:modelValue": t[2] || (t[2] = (V) => e.filterCondition.value = V),
+          "onUpdate:modelValue": t[2] || (t[2] = (x) => e.filterCondition.value = x),
           placeholder: "请输入数字",
           size: e.size,
           style: { width: "80px" },
           onChange: q,
           clearable: ""
-        }, null, 8, ["modelValue", "size"])) : P(e.filterCondition.field) === "money" ? (g(), J(h, {
+        }, null, 8, ["modelValue", "size"])) : P(e.filterCondition.field) === "money" ? (C(), J(h, {
           key: 1,
           type: "number",
           modelValue: e.filterCondition.value,
-          "onUpdate:modelValue": t[3] || (t[3] = (V) => e.filterCondition.value = V),
+          "onUpdate:modelValue": t[3] || (t[3] = (x) => e.filterCondition.value = x),
           placeholder: "请输入金额",
           size: e.size,
           style: { width: "80px" },
           onChange: q,
           clearable: ""
-        }, null, 8, ["modelValue", "size"])) : P(e.filterCondition.field) === "date" ? (g(), B(W, { key: 2 }, [
-          m(e.filterCondition.operator) ? (g(), J(h, {
+        }, null, 8, ["modelValue", "size"])) : P(e.filterCondition.field) === "date" ? (C(), B(W, { key: 2 }, [
+          m(e.filterCondition.operator) ? (C(), J(h, {
             key: 1,
-            value: (le = U.value.find((V) => V.value === e.filterCondition.operator)) == null ? void 0 : le.label,
+            value: (le = U.value.find((x) => x.value === e.filterCondition.operator)) == null ? void 0 : le.label,
             disabled: "",
             size: e.size,
             style: { "min-width": "80px", "max-width": "120px" }
-          }, null, 8, ["value", "size"])) : (g(), J(L, {
+          }, null, 8, ["value", "size"])) : (C(), J(L, {
             key: 0,
             modelValue: e.filterCondition.value,
-            "onUpdate:modelValue": t[4] || (t[4] = (V) => e.filterCondition.value = V),
+            "onUpdate:modelValue": t[4] || (t[4] = (x) => e.filterCondition.value = x),
             placeholder: "请选择日期",
             size: e.size,
             style: { "min-width": "80px", "max-width": "120px" },
@@ -5981,10 +5981,10 @@ const Se = [
             clearable: "",
             "popup-props": { attach: ".cd-form-select-modal" }
           }, null, 8, ["modelValue", "size"]))
-        ], 64)) : P(e.filterCondition.field) === "time" ? (g(), J(L, {
+        ], 64)) : P(e.filterCondition.field) === "time" ? (C(), J(L, {
           key: 3,
           modelValue: e.filterCondition.value,
-          "onUpdate:modelValue": t[5] || (t[5] = (V) => e.filterCondition.value = V),
+          "onUpdate:modelValue": t[5] || (t[5] = (x) => e.filterCondition.value = x),
           placeholder: "请选择日期时间",
           size: e.size,
           style: { "min-width": "80px", "max-width": "120px" },
@@ -5993,21 +5993,21 @@ const Se = [
           onChange: q,
           clearable: "",
           "popup-props": { attach: ".cd-form-select-modal" }
-        }, null, 8, ["modelValue", "size"])) : P(e.filterCondition.field) === "select" ? (g(), J(z, {
+        }, null, 8, ["modelValue", "size"])) : P(e.filterCondition.field) === "select" ? (C(), J(z, {
           key: 4,
           modelValue: e.filterCondition.value,
-          "onUpdate:modelValue": t[6] || (t[6] = (V) => e.filterCondition.value = V),
-          options: x(e.filterCondition.field),
+          "onUpdate:modelValue": t[6] || (t[6] = (x) => e.filterCondition.value = x),
+          options: A(e.filterCondition.field),
           placeholder: "请选择",
           size: e.size,
           style: { "min-width": "80px", "max-width": "120px" },
           onChange: q,
           clearable: "",
           "popup-props": { attach: ".cd-form-select-modal" }
-        }, null, 8, ["modelValue", "options", "size"])) : P(e.filterCondition.field) === "selectProvince" ? (g(), J(Q, {
+        }, null, 8, ["modelValue", "options", "size"])) : P(e.filterCondition.field) === "selectProvince" ? (C(), J(Q, {
           key: 5,
           modelValue: e.filterCondition.value,
-          "onUpdate:modelValue": t[7] || (t[7] = (V) => e.filterCondition.value = V),
+          "onUpdate:modelValue": t[7] || (t[7] = (x) => e.filterCondition.value = x),
           options: k.value,
           placeholder: "请选择地区",
           size: e.size,
@@ -6016,11 +6016,11 @@ const Se = [
           loading: !1,
           onChange: w,
           "popup-props": { attach: ".cd-form-select-modal" }
-        }, null, 8, ["modelValue", "options", "size"])) : D(e.filterCondition.field) ? (g(), B(W, { key: 6 }, [
-          c(e.filterCondition.operator) ? X("", !0) : (g(), J(h, {
+        }, null, 8, ["modelValue", "options", "size"])) : E(e.filterCondition.field) ? (C(), B(W, { key: 6 }, [
+          c(e.filterCondition.operator) ? X("", !0) : (C(), J(h, {
             key: 0,
             modelValue: e.filterCondition.value,
-            "onUpdate:modelValue": t[9] || (t[9] = (V) => e.filterCondition.value = V),
+            "onUpdate:modelValue": t[9] || (t[9] = (x) => e.filterCondition.value = x),
             placeholder: "请选择",
             readonly: "",
             size: e.size,
@@ -6032,25 +6032,25 @@ const Se = [
               i("i", {
                 class: "ri-search-line",
                 style: { cursor: "pointer" },
-                onClick: t[8] || (t[8] = (V) => f(e.filterCondition.field))
+                onClick: t[8] || (t[8] = (x) => f(e.filterCondition.field))
               })
             ]),
             _: 1
           }, 8, ["modelValue", "size"])),
           o(Ee, {
-            visible: O.value,
-            "onUpdate:visible": t[10] || (t[10] = (V) => O.value = V),
+            visible: F.value,
+            "onUpdate:visible": t[10] || (t[10] = (x) => F.value = x),
             "release-id": ((te = N.value) == null ? void 0 : te.releaseId) || "",
             "field-type": K.value,
             "form-type": (ne = N.value) == null ? void 0 : ne.formType,
             "dialog-title": (oe = N.value) == null ? void 0 : oe.dialogTitle,
             onSelect: n
           }, null, 8, ["visible", "release-id", "field-type", "form-type", "dialog-title"])
-        ], 64)) : (g(), B(W, { key: 7 }, [
-          e.filterCondition.operator !== "is_empty" && e.filterCondition.operator !== "is_not_empty" ? (g(), J(h, {
+        ], 64)) : (C(), B(W, { key: 7 }, [
+          e.filterCondition.operator !== "is_empty" && e.filterCondition.operator !== "is_not_empty" ? (C(), J(h, {
             key: 0,
             modelValue: e.filterCondition.value,
-            "onUpdate:modelValue": t[11] || (t[11] = (V) => e.filterCondition.value = V),
+            "onUpdate:modelValue": t[11] || (t[11] = (x) => e.filterCondition.value = x),
             placeholder: "请输入关键字",
             size: e.size,
             style: { "min-width": "80px", "max-width": "100px" },
@@ -6113,12 +6113,12 @@ const Se = [
           { field: "", operator: "eq", value: "" }
         ]
       }
-    ]), x = _("and");
+    ]), A = _("and");
     let I = 3;
     G(() => d.initialFilterCards, (w) => {
       w && w.length > 0 && (m.value = w);
     }, { immediate: !0, deep: !0 }), G(() => d.initialType1, (w) => {
-      w && (x.value = w);
+      w && (A.value = w);
     }, { immediate: !0 });
     const e = () => {
       m.value.push({
@@ -6126,62 +6126,62 @@ const Se = [
         connector: "and",
         conditions: [{ field: "", operator: "eq", value: "" }]
       });
-    }, $ = (w) => {
+    }, S = (w) => {
       w >= 0 && w < m.value.length && m.value[w].conditions.push({
         field: "",
         operator: "eq",
         value: ""
       });
-    }, j = (w, O) => {
+    }, j = (w, F) => {
       if (w >= 0 && w < m.value.length) {
         const N = m.value[w];
-        N.conditions.length > 1 && O >= 0 && O < N.conditions.length ? N.conditions.splice(O, 1) : N.conditions.length <= 1 && re.warning("每个卡片至少需要一个筛选条件");
+        N.conditions.length > 1 && F >= 0 && F < N.conditions.length ? N.conditions.splice(F, 1) : N.conditions.length <= 1 && re.warning("每个卡片至少需要一个筛选条件");
       }
     }, P = (w) => {
       m.value.length > 1 ? m.value.splice(w, 1) : re.warning("至少需要保留一个筛选卡片");
     }, q = () => {
       k("submit", {
         filterCards: m.value,
-        type1: x.value
+        type1: A.value
       });
-    }, R = () => {
+    }, M = () => {
       k("close"), k("update:visible", !1);
     };
-    return (w, O) => {
-      const N = F("t-radio-button"), K = F("t-radio-group"), D = F("t-icon"), c = F("t-button"), f = F("t-dialog");
-      return g(), J(f, {
+    return (w, F) => {
+      const N = O("t-radio-button"), K = O("t-radio-group"), E = O("t-icon"), c = O("t-button"), f = O("t-dialog");
+      return C(), J(f, {
         header: "筛选条件设置",
         placement: "center",
         visible: r.visible,
-        "onUpdate:visible": O[1] || (O[1] = (n) => w.$emit("update:visible", n)),
+        "onUpdate:visible": F[1] || (F[1] = (n) => w.$emit("update:visible", n)),
         width: "700px",
         "z-index": 999,
         footer: !0,
-        onClose: R,
+        onClose: M,
         id: "leader-line-clip-container"
       }, {
         body: s(() => [
           i("div", Te, [
             i("div", Ne, [
               i("div", Be, [
-                m.value.length > 1 ? (g(), B("div", Pe, [
+                m.value.length > 1 ? (C(), B("div", Pe, [
                   i("div", Re, [
                     o(K, {
                       size: "small",
                       class: "connector-selector",
-                      modelValue: x.value,
-                      "onUpdate:modelValue": O[0] || (O[0] = (n) => x.value = n),
+                      modelValue: A.value,
+                      "onUpdate:modelValue": F[0] || (F[0] = (n) => A.value = n),
                       style: { "margin-right": "20px" }
                     }, {
                       default: s(() => [
                         o(N, { value: "and" }, {
-                          default: s(() => [...O[2] || (O[2] = [
+                          default: s(() => [...F[2] || (F[2] = [
                             T("且", -1)
                           ])]),
                           _: 1
                         }),
                         o(N, { value: "or" }, {
-                          default: s(() => [...O[3] || (O[3] = [
+                          default: s(() => [...F[3] || (F[3] = [
                             T("或", -1)
                           ])]),
                           _: 1
@@ -6193,7 +6193,7 @@ const Se = [
                 ])) : X("", !0),
                 i("div", Je, [
                   i("div", je, [
-                    (g(!0), B(W, null, Z(m.value, (n, U) => (g(), B("div", {
+                    (C(!0), B(W, null, Z(m.value, (n, U) => (C(), B("div", {
                       key: n.id,
                       class: "filter-card-item"
                     }, [
@@ -6208,13 +6208,13 @@ const Se = [
                           }, {
                             default: s(() => [
                               o(N, { value: "and" }, {
-                                default: s(() => [...O[4] || (O[4] = [
+                                default: s(() => [...F[4] || (F[4] = [
                                   T("且", -1)
                                 ])]),
                                 _: 1
                               }),
                               o(N, { value: "or" }, {
-                                default: s(() => [...O[5] || (O[5] = [
+                                default: s(() => [...F[5] || (F[5] = [
                                   T("或", -1)
                                 ])]),
                                 _: 1
@@ -6231,13 +6231,13 @@ const Se = [
                           disabled: m.value.length === 1
                         }, {
                           icon: s(() => [
-                            o(D, { name: "close" })
+                            o(E, { name: "close" })
                           ]),
                           _: 1
                         }, 8, ["onClick", "disabled"])
                       ]),
                       i("div", He, [
-                        (g(!0), B(W, null, Z(n.conditions, (v, a) => (g(), B("div", {
+                        (C(!0), B(W, null, Z(n.conditions, (v, a) => (C(), B("div", {
                           key: a,
                           class: "filter-combination"
                         }, [
@@ -6256,7 +6256,7 @@ const Se = [
                             disabled: n.conditions.length === 1
                           }, {
                             icon: s(() => [
-                              o(D, { name: "minus" })
+                              o(E, { name: "minus" })
                             ]),
                             _: 1
                           }, 8, ["onClick", "disabled"])
@@ -6265,13 +6265,13 @@ const Se = [
                           o(c, {
                             theme: "default",
                             size: "small",
-                            onClick: (v) => $(U)
+                            onClick: (v) => S(U)
                           }, {
                             icon: s(() => [
-                              o(D, { name: "add" })
+                              o(E, { name: "add" })
                             ]),
                             default: s(() => [
-                              O[6] || (O[6] = T(" 添加条件 ", -1))
+                              F[6] || (F[6] = T(" 添加条件 ", -1))
                             ]),
                             _: 1
                           }, 8, ["onClick"])
@@ -6283,8 +6283,8 @@ const Se = [
                       onClick: e
                     }, [
                       i("div", Ye, [
-                        o(D, { name: "add" }),
-                        O[7] || (O[7] = i("span", null, "增加筛选卡片", -1))
+                        o(E, { name: "add" }),
+                        F[7] || (F[7] = i("span", null, "增加筛选卡片", -1))
                       ])
                     ])
                   ])
@@ -6295,13 +6295,13 @@ const Se = [
         ]),
         footer: s(() => [
           i("div", Ge, [
-            O[10] || (O[10] = i("div", { class: "filter-dialog-footer2" }, null, -1)),
+            F[10] || (F[10] = i("div", { class: "filter-dialog-footer2" }, null, -1)),
             i("div", We, [
               o(c, {
                 theme: "default",
-                onClick: R
+                onClick: M
               }, {
-                default: s(() => [...O[8] || (O[8] = [
+                default: s(() => [...F[8] || (F[8] = [
                   T("取消", -1)
                 ])]),
                 _: 1
@@ -6310,7 +6310,7 @@ const Se = [
                 theme: "primary",
                 onClick: q
               }, {
-                default: s(() => [...O[9] || (O[9] = [
+                default: s(() => [...F[9] || (F[9] = [
                   T("确定", -1)
                 ])]),
                 _: 1
@@ -6404,15 +6404,15 @@ const Se = [
     "column-change"
   ],
   setup(r, { emit: Y }) {
-    const d = r, k = Y, m = _(JSON.parse(JSON.stringify(d.filterCards))), x = _(d.topOp), I = _(null);
+    const d = r, k = Y, m = _(JSON.parse(JSON.stringify(d.filterCards))), A = _(d.topOp), I = _(null);
     _([]);
     let e = 100;
     G(() => d.filterCards, (v) => {
       m.value = JSON.parse(JSON.stringify(v));
     }, { deep: !0 }), G(() => d.topOp, (v) => {
-      x.value = v;
+      A.value = v;
     });
-    const $ = () => {
+    const S = () => {
       m.value.push({
         id: e++,
         connector: "and",
@@ -6431,12 +6431,12 @@ const Se = [
         const p = m.value[v];
         p.conditions.length > 1 && a >= 0 && a < p.conditions.length ? p.conditions.splice(a, 1) : p.conditions.length <= 1 && re.warning("每个卡片至少需要一个筛选条件");
       }
-    }, R = (v) => v.map((a) => {
-      const p = a.conditions.filter((C) => C.field && C.field.trim() !== "").map((C) => {
+    }, M = (v) => v.map((a) => {
+      const p = a.conditions.filter((g) => g.field && g.field.trim() !== "").map((g) => {
         let l = "";
-        return C.value !== null && C.value !== void 0 && (Array.isArray(C.value) ? l = C.value.join("/") : l = String(C.value)), {
-          field: C.field.trim(),
-          operator: C.operator || "eq",
+        return g.value !== null && g.value !== void 0 && (Array.isArray(g.value) ? l = g.value.join("/") : l = String(g.value)), {
+          field: g.field.trim(),
+          operator: g.operator || "eq",
           value: l
         };
       });
@@ -6455,16 +6455,16 @@ const Se = [
             { field: "", operator: "eq", value: "" }
           ]
         }
-      ], x.value = "and", k("reset");
-    }, O = () => {
-      const v = R(m.value);
+      ], A.value = "and", k("reset");
+    }, F = () => {
+      const v = M(m.value);
       k("confirm", {
         filterCards: v,
-        type1: x.value
+        type1: A.value
       }), U(), N();
     }, N = () => {
       k("update:visible", !1);
-    }, K = _([]), D = _(!1), c = _({}), f = _({}), n = _([]);
+    }, K = _([]), E = _(!1), c = _({}), f = _({}), n = _([]);
     _(null), _(null), G(() => d.visibleColumns, (v) => {
       if (c.value = {}, f.value = {}, v && v.length > 0) {
         if (typeof v[0] == "object") {
@@ -6473,21 +6473,21 @@ const Se = [
           });
           const a = v.map((l) => l.value), p = a.map(
             (l) => d.fieldOptions.find((t) => t.value === l)
-          ).filter(Boolean), C = d.fieldOptions.filter(
+          ).filter(Boolean), g = d.fieldOptions.filter(
             (l) => !a.includes(l.value)
           );
-          n.value = [...p, ...C];
+          n.value = [...p, ...g];
         } else {
           K.value = [...v];
           const a = v.map(
-            (C) => d.fieldOptions.find((l) => l.value === C)
+            (g) => d.fieldOptions.find((l) => l.value === g)
           ).filter(Boolean), p = d.fieldOptions.filter(
-            (C) => !v.includes(C.value)
+            (g) => !v.includes(g.value)
           );
           n.value = [...a, ...p];
         }
-        D.value = K.value.length === d.fieldOptions.length;
-      } else d.fieldOptions.length > 0 && (K.value = d.fieldOptions.map((a) => a.value), n.value = [...d.fieldOptions], D.value = !0);
+        E.value = K.value.length === d.fieldOptions.length;
+      } else d.fieldOptions.length > 0 && (K.value = d.fieldOptions.map((a) => a.value), n.value = [...d.fieldOptions], E.value = !0);
       d.fieldOptions.forEach((a) => {
         f.value[a.value] || (f.value[a.value] = "none");
       });
@@ -6496,22 +6496,22 @@ const Se = [
     }, { immediate: !0 });
     const U = () => {
       const v = n.value.filter((a) => K.value.includes(a.value)).map((a) => {
-        const p = c.value[a.value], C = f.value[a.value] || "none";
+        const p = c.value[a.value], g = f.value[a.value] || "none";
         return {
           value: a.value,
           show: !0,
           // 已通过filter筛选，都是显示的
           width: p ? `${p}px` : "120px",
           // 没有设置宽度时使用默认值120px
-          fixed: C
+          fixed: g
           // 冻结状态
         };
       });
       k("column-change", v);
     };
     return (v, a) => {
-      const p = F("t-radio-button"), C = F("t-radio-group"), l = F("t-icon"), t = F("t-button"), y = F("t-dialog");
-      return g(), J(y, {
+      const p = O("t-radio-button"), g = O("t-radio-group"), l = O("t-icon"), t = O("t-button"), y = O("t-dialog");
+      return C(), J(y, {
         header: "高级筛选",
         placement: "center",
         attach: "body",
@@ -6529,13 +6529,13 @@ const Se = [
               i("div", ea, [
                 i("div", aa, [
                   i("div", la, [
-                    m.value.length > 1 ? (g(), B("div", ta, [
+                    m.value.length > 1 ? (C(), B("div", ta, [
                       i("div", na, [
-                        o(C, {
+                        o(g, {
                           size: r.size,
                           class: "connector-selector",
-                          modelValue: x.value,
-                          "onUpdate:modelValue": a[0] || (a[0] = (z) => x.value = z)
+                          modelValue: A.value,
+                          "onUpdate:modelValue": a[0] || (a[0] = (z) => A.value = z)
                         }, {
                           default: s(() => [
                             o(p, { value: "and" }, {
@@ -6556,14 +6556,14 @@ const Se = [
                       ])
                     ])) : X("", !0),
                     i("div", oa, [
-                      (g(!0), B(W, null, Z(m.value, (z, h) => (g(), B("div", {
+                      (C(!0), B(W, null, Z(m.value, (z, h) => (C(), B("div", {
                         key: z.id,
                         class: "filter-card-item"
                       }, [
                         i("div", ia, [
                           i("div", ra, [
                             i("span", sa, "筛选卡片 " + se(h + 1), 1),
-                            o(C, {
+                            o(g, {
                               size: r.size,
                               modelValue: z.connector,
                               "onUpdate:modelValue": (L) => z.connector = L,
@@ -6600,7 +6600,7 @@ const Se = [
                           }, 8, ["size", "onClick", "disabled"])
                         ]),
                         i("div", da, [
-                          (g(!0), B(W, null, Z(z.conditions, (L, Q) => (g(), B("div", {
+                          (C(!0), B(W, null, Z(z.conditions, (L, Q) => (C(), B("div", {
                             key: Q,
                             class: "filter-combination"
                           }, [
@@ -6642,7 +6642,7 @@ const Se = [
                       ]))), 128)),
                       i("div", {
                         class: "add-filter-card",
-                        onClick: $
+                        onClick: S
                       }, [
                         i("div", ma, [
                           o(l, { name: "add" }),
@@ -6672,7 +6672,7 @@ const Se = [
               o(t, {
                 theme: "primary",
                 size: r.size,
-                onClick: O
+                onClick: F
               }, {
                 default: s(() => [...a[9] || (a[9] = [
                   T("确定", -1)
@@ -6686,10 +6686,10 @@ const Se = [
       }, 8, ["visible", "width"]);
     };
   }
-}, pa = /* @__PURE__ */ ae(fa, [["__scopeId", "data-v-0ee31b05"]]), ya = { class: "dialog-header" }, ba = { class: "color-filter-dialog" }, Ca = { class: "color-filter-rules" }, ga = { class: "rule-content" }, ha = { class: "rule-color-section" }, _a = { class: "color-block-wrapper" }, ka = {
+}, pa = /* @__PURE__ */ ae(fa, [["__scopeId", "data-v-0ee31b05"]]), ya = { class: "dialog-header" }, ba = { class: "color-filter-dialog" }, ga = { class: "color-filter-rules" }, Ca = { class: "rule-content" }, ha = { class: "rule-color-section" }, _a = { class: "color-block-wrapper" }, ka = {
   key: 0,
   class: "bold-indicator"
-}, za = { class: "color-picker-panel" }, Fa = { class: "preset-colors" }, Oa = ["onClick"], wa = { class: "bold-option" }, $a = { class: "apply-to-section" }, Va = { class: "rule-condition" }, Sa = { class: "dialog-footer" }, xa = {
+}, za = { class: "color-picker-panel" }, Oa = { class: "preset-colors" }, Fa = ["onClick"], wa = { class: "bold-option" }, $a = { class: "apply-to-section" }, Sa = { class: "rule-condition" }, Va = { class: "dialog-footer" }, xa = {
   __name: "ColorFilterDialog",
   props: {
     visible: { type: Boolean, default: !1 },
@@ -6699,7 +6699,7 @@ const Se = [
   },
   emits: ["update:visible", "confirm", "clear", "smart-colors-change"],
   setup(r, { emit: Y }) {
-    const d = r, k = Y, m = _(d.visible), x = [
+    const d = r, k = Y, m = _(d.visible), A = [
       // 第一行 - 暖色系
       "#FFE7BA",
       "#FFD6E7",
@@ -6746,7 +6746,7 @@ const Se = [
       overlayInnerStyle: {
         width: "180px"
       }
-    }, $ = _([
+    }, S = _([
       {
         field: "",
         operator: "eq",
@@ -6757,18 +6757,18 @@ const Se = [
         applyTo: "cell"
       }
     ]);
-    G(() => d.visible, (D) => {
-      m.value = D, D && d.initialRules.length > 0 && ($.value = JSON.parse(JSON.stringify(d.initialRules)).map((c) => ({
+    G(() => d.visible, (E) => {
+      m.value = E, E && d.initialRules.length > 0 && (S.value = JSON.parse(JSON.stringify(d.initialRules)).map((c) => ({
         ...c,
         showColorPicker: !1
       })));
-    }), G(m, (D) => {
-      k("update:visible", D);
+    }), G(m, (E) => {
+      k("update:visible", E);
     });
-    const j = (D, c) => {
-      $.value[D].backgroundColor = c, $.value[D].showColorPicker = !1;
+    const j = (E, c) => {
+      S.value[E].backgroundColor = c, S.value[E].showColorPicker = !1;
     }, P = () => {
-      $.value.push({
+      S.value.push({
         field: "",
         operator: "eq",
         value: "",
@@ -6777,14 +6777,14 @@ const Se = [
         showColorPicker: !1,
         applyTo: "cell"
       });
-    }, q = (D) => {
-      $.value.length > 1 && $.value.splice(D, 1);
-    }, R = () => {
+    }, q = (E) => {
+      S.value.length > 1 && S.value.splice(E, 1);
+    }, M = () => {
       m.value = !1;
     }, w = () => {
       k("clear"), m.value = !1;
-    }, O = () => {
-      const D = $.value.filter(
+    }, F = () => {
+      const E = S.value.filter(
         (c) => c.field && c.operator && c.value
       ).map((c) => ({
         field: c.field,
@@ -6794,28 +6794,28 @@ const Se = [
         isBold: c.isBold,
         applyTo: c.applyTo
       }));
-      k("confirm", D), m.value = !1;
+      k("confirm", E), m.value = !1;
     }, N = ee(() => {
-      const D = $.value.length, c = Math.floor(x.length / D), f = [];
-      for (let n = 0; n < D; n++) {
-        const U = n * c % x.length;
-        f.push(x[U]);
+      const E = S.value.length, c = Math.floor(A.length / E), f = [];
+      for (let n = 0; n < E; n++) {
+        const U = n * c % A.length;
+        f.push(A[U]);
       }
       return f;
     }), K = () => {
-      $.value.forEach((D, c) => {
-        c < N.value.length && (D.backgroundColor = N.value[c]);
+      S.value.forEach((E, c) => {
+        c < N.value.length && (E.backgroundColor = N.value[c]);
       }), k("smart-colors-change", N.value);
     };
-    return (D, c) => {
-      const f = F("t-button"), n = F("t-checkbox"), U = F("t-popup"), v = F("t-radio-button"), a = F("t-radio-group"), p = F("t-select"), C = F("t-input"), l = F("t-icon"), t = F("t-dialog");
-      return g(), J(t, {
+    return (E, c) => {
+      const f = O("t-button"), n = O("t-checkbox"), U = O("t-popup"), v = O("t-radio-button"), a = O("t-radio-group"), p = O("t-select"), g = O("t-input"), l = O("t-icon"), t = O("t-dialog");
+      return C(), J(t, {
         visible: m.value,
         "onUpdate:visible": c[0] || (c[0] = (y) => m.value = y),
         width: "800px",
         "confirm-btn": null,
         "cancel-btn": null,
-        onClose: R
+        onClose: M
       }, {
         header: s(() => [
           i("div", ya, [
@@ -6838,12 +6838,12 @@ const Se = [
         ]),
         body: s(() => [
           i("div", ba, [
-            i("div", Ca, [
-              (g(!0), B(W, null, Z($.value, (y, z) => (g(), B("div", {
+            i("div", ga, [
+              (C(!0), B(W, null, Z(S.value, (y, z) => (C(), B("div", {
                 key: z,
                 class: "color-rule-item"
               }, [
-                i("div", ga, [
+                i("div", Ca, [
                   i("div", ha, [
                     o(U, {
                       visible: y.showColorPicker,
@@ -6853,13 +6853,13 @@ const Se = [
                     }, {
                       content: s(() => [
                         i("div", za, [
-                          i("div", Fa, [
-                            (g(), B(W, null, Z(x, (h) => i("div", {
+                          i("div", Oa, [
+                            (C(), B(W, null, Z(A, (h) => i("div", {
                               key: h,
                               class: ue(["preset-color-item", { active: y.backgroundColor === h }]),
                               style: de({ backgroundColor: h }),
                               onClick: (L) => j(z, h)
-                            }, null, 14, Oa)), 64))
+                            }, null, 14, Fa)), 64))
                           ]),
                           i("div", wa, [
                             o(n, {
@@ -6880,7 +6880,7 @@ const Se = [
                             class: "color-block",
                             style: de({ backgroundColor: y.backgroundColor })
                           }, [
-                            y.isBold ? (g(), B("span", ka, "B")) : X("", !0)
+                            y.isBold ? (C(), B("span", ka, "B")) : X("", !0)
                           ], 4)
                         ])
                       ]),
@@ -6917,7 +6917,7 @@ const Se = [
                       _: 1
                     }, 8, ["modelValue", "onUpdate:modelValue", "size"])
                   ]),
-                  i("div", Va, [
+                  i("div", Sa, [
                     o(p, {
                       modelValue: y.field,
                       "onUpdate:modelValue": (h) => y.field = h,
@@ -6936,7 +6936,7 @@ const Se = [
                       style: { width: "120px" },
                       "popup-props": e
                     }, null, 8, ["modelValue", "onUpdate:modelValue", "size"]),
-                    o(C, {
+                    o(g, {
                       modelValue: y.value,
                       "onUpdate:modelValue": (h) => y.value = h,
                       placeholder: "输入值",
@@ -6950,7 +6950,7 @@ const Se = [
                   variant: "text",
                   size: r.size,
                   onClick: (h) => q(z),
-                  disabled: $.value.length === 1
+                  disabled: S.value.length === 1
                 }, {
                   icon: s(() => [...c[8] || (c[8] = [
                     i("i", { class: "ri-close-fill" }, null, -1)
@@ -6977,11 +6977,11 @@ const Se = [
           ])
         ]),
         footer: s(() => [
-          i("div", Sa, [
+          i("div", Va, [
             o(f, {
               theme: "default",
               size: r.size,
-              onClick: R
+              onClick: M
             }, {
               default: s(() => [...c[10] || (c[10] = [
                 T("取消", -1)
@@ -7001,7 +7001,7 @@ const Se = [
             o(f, {
               theme: "primary",
               size: r.size,
-              onClick: O
+              onClick: F
             }, {
               default: s(() => [...c[12] || (c[12] = [
                 T("确定", -1)
@@ -7014,7 +7014,7 @@ const Se = [
       }, 8, ["visible"]);
     };
   }
-}, Ce = /* @__PURE__ */ ae(xa, [["__scopeId", "data-v-822b291e"]]), Da = { class: "column-settings-panel" }, Aa = { class: "column-list" }, Ea = ["onDragstart", "onDragover", "onDrop"], Ua = { class: "column-name" }, qa = { class: "column-show" }, Ta = ["onClick"], Na = { class: "column-freeze" }, Ba = { class: "column-width" }, Pa = { class: "column-sort-buttons" }, Ra = {
+}, ge = /* @__PURE__ */ ae(xa, [["__scopeId", "data-v-822b291e"]]), Da = { class: "column-settings-panel" }, Aa = { class: "column-list" }, Ea = ["onDragstart", "onDragover", "onDrop"], Ua = { class: "column-name" }, qa = { class: "column-show" }, Ta = ["onClick"], Na = { class: "column-freeze" }, Ba = { class: "column-width" }, Pa = { class: "column-sort-buttons" }, Ra = {
   __name: "ColumnSettingsDialog",
   props: {
     visible: { type: Boolean, default: !1 },
@@ -7023,11 +7023,11 @@ const Se = [
   },
   emits: ["update:visible", "column-change"],
   setup(r, { emit: Y }) {
-    const d = r, k = Y, m = _([]), x = _({}), I = _({}), e = _([]), $ = _(null), j = _(null), P = (f) => {
-      if (x.value = {}, I.value = {}, f && f.length > 0)
+    const d = r, k = Y, m = _([]), A = _({}), I = _({}), e = _([]), S = _(null), j = _(null), P = (f) => {
+      if (A.value = {}, I.value = {}, f && f.length > 0)
         if (typeof f[0] == "object") {
           m.value = f.filter((a) => a.show !== !1).map((a) => a.value), f.forEach((a) => {
-            x.value[a.value] = a.width ? parseInt(a.width) : void 0, I.value[a.value] = a.fixed || "none";
+            A.value[a.value] = a.width ? parseInt(a.width) : void 0, I.value[a.value] = a.fixed || "none";
           });
           const n = f.map((a) => a.value), U = n.map((a) => d.fieldOptions.find((p) => p.value === a)).filter(Boolean), v = d.fieldOptions.filter((a) => !n.includes(a.value));
           e.value = [...U, ...v];
@@ -7045,7 +7045,7 @@ const Se = [
     const q = (f) => {
       const n = m.value.indexOf(f);
       n === -1 ? m.value.push(f) : m.value.splice(n, 1);
-    }, R = (f) => {
+    }, M = (f) => {
       if (f > 0) {
         const n = [...e.value];
         [n[f], n[f - 1]] = [n[f - 1], n[f]], e.value = n;
@@ -7055,30 +7055,30 @@ const Se = [
         const n = [...e.value];
         [n[f], n[f + 1]] = [n[f + 1], n[f]], e.value = n;
       }
-    }, O = (f, n) => {
-      $.value = f, n.dataTransfer.effectAllowed = "move";
+    }, F = (f, n) => {
+      S.value = f, n.dataTransfer.effectAllowed = "move";
     }, N = (f, n) => {
       n.preventDefault(), j.value = f;
     }, K = () => {
-      $.value = null, j.value = null;
-    }, D = (f, n) => {
+      S.value = null, j.value = null;
+    }, E = (f, n) => {
       n.preventDefault();
-      const U = $.value;
+      const U = S.value;
       if (U === null || U === f) return;
       const v = [...e.value], a = v.splice(U, 1)[0];
-      v.splice(f, 0, a), e.value = v, $.value = null, j.value = null;
+      v.splice(f, 0, a), e.value = v, S.value = null, j.value = null;
     }, c = () => {
       const f = e.value.filter((n) => m.value.includes(n.value)).map((n) => ({
         value: n.value,
         show: !0,
-        width: x.value[n.value] ? `${x.value[n.value]}px` : "120px",
+        width: A.value[n.value] ? `${A.value[n.value]}px` : "120px",
         fixed: I.value[n.value] || "none"
       }));
       k("column-change", f), k("update:visible", !1);
     };
     return (f, n) => {
-      const U = F("t-icon"), v = F("t-option"), a = F("t-select"), p = F("t-input-number"), C = F("t-button"), l = F("t-dialog");
-      return g(), J(l, {
+      const U = O("t-icon"), v = O("t-option"), a = O("t-select"), p = O("t-input-number"), g = O("t-button"), l = O("t-dialog");
+      return C(), J(l, {
         header: "列配置",
         placement: "center",
         attach: "body",
@@ -7099,14 +7099,14 @@ const Se = [
               i("div", { class: "column-title column-title-sort" }, "排序")
             ], -1)),
             i("div", Aa, [
-              (g(!0), B(W, null, Z(e.value, (t, y) => (g(), B("div", {
+              (C(!0), B(W, null, Z(e.value, (t, y) => (C(), B("div", {
                 key: t.value,
-                class: ue(["column-item-row", { dragging: $.value === y, "col-hidden": !m.value.includes(t.value) }]),
+                class: ue(["column-item-row", { dragging: S.value === y, "col-hidden": !m.value.includes(t.value) }]),
                 draggable: "true",
-                onDragstart: (z) => O(y, z),
+                onDragstart: (z) => F(y, z),
                 onDragover: (z) => N(y, z),
                 onDragend: K,
-                onDrop: (z) => D(y, z)
+                onDrop: (z) => E(y, z)
               }, [
                 i("div", Ua, [
                   o(U, {
@@ -7148,8 +7148,8 @@ const Se = [
                 ]),
                 i("div", Ba, [
                   o(p, {
-                    modelValue: x.value[t.value],
-                    "onUpdate:modelValue": (z) => x.value[t.value] = z,
+                    modelValue: A.value[t.value],
+                    "onUpdate:modelValue": (z) => A.value[t.value] = z,
                     min: 50,
                     max: 500,
                     step: 10,
@@ -7159,11 +7159,11 @@ const Se = [
                   }, null, 8, ["modelValue", "onUpdate:modelValue"])
                 ]),
                 i("div", Pa, [
-                  o(C, {
+                  o(g, {
                     theme: "default",
                     variant: "text",
                     size: "small",
-                    onClick: (z) => R(y),
+                    onClick: (z) => M(y),
                     disabled: y === 0
                   }, {
                     icon: s(() => [
@@ -7174,7 +7174,7 @@ const Se = [
                     ]),
                     _: 1
                   }, 8, ["onClick", "disabled"]),
-                  o(C, {
+                  o(g, {
                     theme: "default",
                     variant: "text",
                     size: "small",
@@ -7195,7 +7195,7 @@ const Se = [
           ])
         ]),
         footer: s(() => [
-          o(C, {
+          o(g, {
             theme: "default",
             onClick: n[0] || (n[0] = (t) => f.$emit("update:visible", !1))
           }, {
@@ -7204,7 +7204,7 @@ const Se = [
             ])]),
             _: 1
           }),
-          o(C, {
+          o(g, {
             theme: "primary",
             onClick: c
           }, {
@@ -7218,10 +7218,13 @@ const Se = [
       }, 8, ["visible"]);
     };
   }
-}, Ja = /* @__PURE__ */ ae(Ra, [["__scopeId", "data-v-0a02ab86"]]), ja = { class: "cd-filter-bar" }, Ma = { class: "filter-toolbar-row" }, Ia = {
+}, Ja = /* @__PURE__ */ ae(Ra, [["__scopeId", "data-v-0a02ab86"]]), ja = { class: "cd-filter-bar" }, Ma = {
+  key: 0,
+  class: "filter-head-row"
+}, Ia = { class: "filter-toolbar-row" }, Ka = {
   key: 1,
   class: "inline-filter-toolbar"
-}, Ka = { class: "filter-action-buttons" }, Ha = { style: { "margin-left": "auto", display: "flex", "align-items": "center" } }, La = { class: "save-plan-content" }, Ya = {
+}, Ha = { class: "filter-action-buttons" }, La = { style: { "margin-left": "auto", display: "flex", "align-items": "center", gap: "8px" } }, Ya = { class: "save-plan-content" }, Ga = {
   __name: "cd-filter-bar",
   props: {
     fieldOptions: { type: Array, required: !0 },
@@ -7270,41 +7273,41 @@ const Se = [
     "refresh"
   ],
   setup(r, { emit: Y }) {
-    const d = r, k = Y, m = _([]), x = () => ({ field: "", operator: "eq", value: "" });
+    const d = r, k = Y, m = _([]), A = () => ({ field: "", operator: "eq", value: "" });
     (() => {
-      var u, A;
+      var u, $;
       if (d.filterCount === 0) {
         m.value = [];
         return;
       }
-      const b = ((A = (u = d.filterCards) == null ? void 0 : u[0]) == null ? void 0 : A.conditions) || [];
-      m.value = Array.from({ length: d.filterCount }, (E, M) => b[M] ? JSON.parse(JSON.stringify(b[M])) : x());
+      const b = (($ = (u = d.filterCards) == null ? void 0 : u[0]) == null ? void 0 : $.conditions) || [];
+      m.value = Array.from({ length: d.filterCount }, (V, R) => b[R] ? JSON.parse(JSON.stringify(b[R])) : A());
     })();
     const e = () => {
       if (d.filterCount === 0) {
         m.value = [];
         return;
       }
-      m.value = Array.from({ length: d.filterCount }, () => x());
-    }, $ = _("保存筛选方案"), j = _(!1), P = _(!1), q = _(d.topOp), R = _(JSON.parse(JSON.stringify(d.filterCards)));
-    G(() => d.topOp, (b) => q.value = b), G(() => d.filterCards, (b) => R.value = JSON.parse(JSON.stringify(b)));
-    const w = _(null), O = _("");
+      m.value = Array.from({ length: d.filterCount }, () => A());
+    }, S = _("保存筛选方案"), j = _(!1), P = _(!1), q = _(d.topOp), M = _(JSON.parse(JSON.stringify(d.filterCards)));
+    G(() => d.topOp, (b) => q.value = b), G(() => d.filterCards, (b) => M.value = JSON.parse(JSON.stringify(b)));
+    const w = _(null), F = _("");
     ee(() => d.planFilterOptions && d.planFilterOptions.length > 0 ? d.planFilterOptions : [{ content: "暂无方案", value: "empty", disabled: !0 }]);
     const N = (b) => {
-      const u = d.planFilterOptions.find((A) => A.value === b);
+      const u = d.planFilterOptions.find(($) => $.value === b);
       u && K(u);
     }, K = (b) => {
       if (!b.precepts || b.precepts.length === 0) return;
-      if (w.value = b, O.value = b.value, R.value = JSON.parse(JSON.stringify(b.precepts)), q.value = b.sqlConnectType, d.filterCount > 0) {
-        const E = b.precepts[0];
-        E && E.conditions && (m.value = Array.from({ length: d.filterCount }, (M, H) => E.conditions[H] ? JSON.parse(JSON.stringify(E.conditions[H])) : x()));
+      if (w.value = b, F.value = b.value, M.value = JSON.parse(JSON.stringify(b.precepts)), q.value = b.sqlConnectType, d.filterCount > 0) {
+        const V = b.precepts[0];
+        V && V.conditions && (m.value = Array.from({ length: d.filterCount }, (R, H) => V.conditions[H] ? JSON.parse(JSON.stringify(V.conditions[H])) : A()));
       }
-      const u = v(b.precepts), A = a(u, b.sqlConnectType);
-      if (k("confirm", A), b.columns && b.columns.length > 0) {
-        const E = b.columns.filter((M) => M.show !== !1);
-        k("column-change", E);
+      const u = v(b.precepts), $ = a(u, b.sqlConnectType);
+      if (k("confirm", $), b.columns && b.columns.length > 0) {
+        const V = b.columns.filter((R) => R.show !== !1);
+        k("column-change", V);
       }
-    }, D = () => {
+    }, E = () => {
       c();
     }, c = () => {
       if (d.filterCount === 0) {
@@ -7322,47 +7325,47 @@ const Se = [
     }, U = () => {
       j.value = !1;
     }, v = (b) => b.map((u) => {
-      const A = u.conditions.filter((E) => !(!E.field || E.field.trim() === "" || E.value === null || E.value === void 0 || E.value === "" || Array.isArray(E.value) && E.value.length === 0)).map((E) => {
-        let M = "";
-        return E.value !== null && E.value !== void 0 && (Array.isArray(E.value) ? M = E.value.join("/") : M = String(E.value).trim()), {
-          field: E.field.trim(),
-          operator: E.operator || "eq",
-          value: M
+      const $ = u.conditions.filter((V) => !(!V.field || V.field.trim() === "" || V.value === null || V.value === void 0 || V.value === "" || Array.isArray(V.value) && V.value.length === 0)).map((V) => {
+        let R = "";
+        return V.value !== null && V.value !== void 0 && (Array.isArray(V.value) ? R = V.value.join("/") : R = String(V.value).trim()), {
+          field: V.field.trim(),
+          operator: V.operator || "eq",
+          value: R
         };
       });
       return {
         ...u,
         connector: u.connector || "and",
-        conditions: A.length > 0 ? A : [{ field: "", operator: "eq", value: "" }]
+        conditions: $.length > 0 ? $ : [{ field: "", operator: "eq", value: "" }]
       };
     }).filter((u) => u.conditions.length > 0 && u.conditions[0].field !== "");
     function a(b, u) {
       if (u !== "and" && u !== "or")
         throw new Error('type参数必须是"and"或"or"');
-      function A(H) {
+      function $(H) {
         return {
           [H.field]: {
             [H.operator]: H.value
           }
         };
       }
-      function E(H) {
-        return H.conditions.length === 1 ? A(H.conditions[0]) : {
-          [H.connector]: H.conditions.map(A)
+      function V(H) {
+        return H.conditions.length === 1 ? $(H.conditions[0]) : {
+          [H.connector]: H.conditions.map($)
         };
       }
       return {
         conditions: {
-          [u]: b.map(E)
+          [u]: b.map(V)
         }
       };
     }
     const p = (b) => {
-      w.value ? ($.value = "更新筛选方案", h.value.name = w.value.content || "") : ($.value = "保存筛选方案", h.value.name = "", w.value = null), z.value = !0;
-    }, C = () => {
+      w.value ? (S.value = "更新筛选方案", h.value.name = w.value.content || "") : (S.value = "保存筛选方案", h.value.name = "", w.value = null), z.value = !0;
+    }, g = () => {
       z.value = !1;
     }, l = () => {
-      e(), w.value = null, O.value = "", R.value = [
+      e(), w.value = null, F.value = "", M.value = [
         {
           id: 1,
           connector: "and",
@@ -7373,34 +7376,39 @@ const Se = [
         }
       ], q.value = "and", k("reset"), c();
     }, t = () => {
-      const b = h.value.name.trim();
+      const b = h.value.name.trim(), u = JSON.parse(JSON.stringify(M.value));
+      if (d.filterCount > 0 && m.value.length > 0) {
+        u[0] || (u[0] = { id: 1, connector: "and", conditions: [] });
+        const $ = u[0].conditions || [];
+        m.value.forEach((V, R) => {
+          V.field && V.field.trim() !== "" && ($[R] = JSON.parse(JSON.stringify(V)));
+        }), u[0].conditions = $;
+      }
       if (w.value) {
-        const u = v(R.value);
+        const $ = v(u);
         k("update-plan", {
           name: b,
-          precepts: u,
+          precepts: $,
           topOp: q.value,
           plan: w.value,
           columns: d.visibleColumns || []
-          // 包含当前列配置
         });
       } else {
-        const u = v(R.value);
+        const $ = v(u);
         k("save-plan", {
           name: b,
-          precepts: u,
+          precepts: $,
           topOp: q.value,
           plan: w.value,
           columns: d.visibleColumns || []
-          // 包含当前列配置
         });
       }
-      C();
+      g();
     }, y = (b) => {
       const u = a(b.filterCards, b.type1);
       if (k("confirm", u), d.filterCount > 0) {
-        const A = b.filterCards[0];
-        A && A.conditions && (m.value = Array.from({ length: d.filterCount }, (E, M) => A.conditions[M] ? JSON.parse(JSON.stringify(A.conditions[M])) : x()));
+        const $ = b.filterCards[0];
+        $ && $.conditions && (m.value = Array.from({ length: d.filterCount }, (V, R) => $.conditions[R] ? JSON.parse(JSON.stringify($.conditions[R])) : A()));
       }
       U();
     }, z = _(!1), h = _({ name: "" }), L = _(!1), Q = _([]), le = () => {
@@ -7413,14 +7421,14 @@ const Se = [
     _("");
     const oe = (b) => {
       k("smart-colors-change", b);
-    }, V = ee(() => Q.value.filter((b) => b.field && b.operator && b.value).length), ge = ee(() => m.value.some((u) => u.field && u.field.trim() !== "") ? !0 : R.value.some(
-      (u) => u.conditions.some((A) => A.field && A.field.trim() !== "")
+    }, x = ee(() => Q.value.filter((b) => b.field && b.operator && b.value).length), Ce = ee(() => m.value.some((u) => u.field && u.field.trim() !== "") ? !0 : M.value.some(
+      (u) => u.conditions.some(($) => $.field && $.field.trim() !== "")
     )), he = ee(() => {
-      const b = Q.value.filter((A) => A.field && A.operator && A.value);
+      const b = Q.value.filter(($) => $.field && $.operator && $.value);
       return b.length === 0 ? "颜色筛选" : `
-${b.map((A) => {
-        const E = d.fieldOptions.find((H) => H.value === A.field);
-        return `${E ? E.label : A.field} ${_e(A.operator)} ${A.value}`;
+${b.map(($) => {
+        const V = d.fieldOptions.find((H) => H.value === $.field);
+        return `${V ? V.label : $.field} ${_e($.operator)} ${$.value}`;
       }).join(`
 `)}`;
     }), _e = (b) => ({
@@ -7434,36 +7442,38 @@ ${b.map((A) => {
       notContains: "不包含"
     })[b] || b;
     return (b, u) => {
-      const A = F("t-radio-button"), E = F("t-radio-group"), M = F("t-button"), H = F("t-icon"), ke = F("t-badge"), ce = F("t-tooltip"), ze = F("t-input"), Fe = F("t-form-item"), Oe = F("t-form"), we = F("t-dialog");
-      return g(), B("div", ja, [
-        i("div", Ma, [
-          fe(b.$slots, "header", {}, void 0, !0),
-          r.planFilterOptions.length > 0 ? (g(), J(E, {
+      const $ = O("t-radio-button"), V = O("t-radio-group"), R = O("t-button"), H = O("t-icon"), ke = O("t-badge"), ce = O("t-tooltip"), ze = O("t-input"), Oe = O("t-form-item"), Fe = O("t-form"), we = O("t-dialog");
+      return C(), B("div", ja, [
+        b.$slots.head ? (C(), B("div", Ma, [
+          fe(b.$slots, "head", {}, void 0, !0)
+        ])) : X("", !0),
+        i("div", Ia, [
+          r.planFilterOptions.length > 0 ? (C(), J(V, {
             key: 0,
-            modelValue: O.value,
-            "onUpdate:modelValue": u[0] || (u[0] = (S) => O.value = S),
+            modelValue: F.value,
+            "onUpdate:modelValue": u[0] || (u[0] = (D) => F.value = D),
             size: r.size,
             onChange: N
           }, {
             default: s(() => [
-              (g(!0), B(W, null, Z(r.planFilterOptions, (S) => (g(), J(A, {
-                key: S.value,
-                value: S.value,
-                disabled: S.disabled
+              (C(!0), B(W, null, Z(r.planFilterOptions, (D) => (C(), J($, {
+                key: D.value,
+                value: D.value,
+                disabled: D.disabled
               }, {
                 default: s(() => [
-                  T(se(S.content), 1)
+                  T(se(D.content), 1)
                 ]),
                 _: 2
               }, 1032, ["value", "disabled"]))), 128))
             ]),
             _: 1
           }, 8, ["modelValue", "size"])) : X("", !0),
-          o(M, {
+          o(R, {
             theme: "default",
             variant: "outline",
             size: r.size,
-            onClick: u[1] || (u[1] = (S) => P.value = !0),
+            onClick: u[1] || (u[1] = (D) => P.value = !0),
             title: "列配置"
           }, {
             icon: s(() => [...u[15] || (u[15] = [
@@ -7471,18 +7481,18 @@ ${b.map((A) => {
             ])]),
             _: 1
           }, 8, ["size"]),
-          r.filterCount > 0 ? (g(), B("div", Ia, [
-            (g(!0), B(W, null, Z(m.value, (S, ve) => (g(), J(me, {
+          r.filterCount > 0 ? (C(), B("div", Ka, [
+            (C(!0), B(W, null, Z(m.value, (D, ve) => (C(), J(me, {
               key: ve,
               "field-options": r.fieldOptions,
               size: r.size,
               "filter-condition": m.value[ve],
               "select-options": r.selectOptions,
-              onSearch: D
+              onSearch: E
             }, null, 8, ["field-options", "size", "filter-condition", "select-options"]))), 128))
           ])) : X("", !0),
-          i("div", Ka, [
-            r.filterCount > 0 ? (g(), J(M, {
+          i("div", Ha, [
+            r.filterCount > 0 ? (C(), J(R, {
               key: 0,
               theme: "primary",
               size: r.size,
@@ -7494,7 +7504,7 @@ ${b.map((A) => {
               ]),
               _: 1
             }, 8, ["size"])) : X("", !0),
-            r.filterCount > 0 ? (g(), J(M, {
+            r.filterCount > 0 ? (C(), J(R, {
               key: 1,
               theme: "primary",
               size: r.size,
@@ -7506,18 +7516,18 @@ ${b.map((A) => {
               ]),
               _: 1
             }, 8, ["size"])) : X("", !0),
-            r.filterCount > 0 ? (g(), J(ce, {
+            r.filterCount > 0 ? (C(), J(ce, {
               key: 2,
               content: he.value,
               placement: "top"
             }, {
               default: s(() => [
                 o(ke, {
-                  count: V.value,
+                  count: x.value,
                   "max-count": 99
                 }, {
                   default: s(() => [
-                    o(M, {
+                    o(R, {
                       theme: "primary",
                       size: r.size,
                       onClick: le
@@ -7533,13 +7543,13 @@ ${b.map((A) => {
               ]),
               _: 1
             }, 8, ["content"])) : X("", !0),
-            r.filterCount > 0 ? (g(), J(ce, {
+            r.filterCount > 0 ? (C(), J(ce, {
               key: 3,
               content: "保存方案",
               placement: "top"
             }, {
               default: s(() => [
-                $e(o(M, {
+                $e(o(R, {
                   theme: "primary",
                   size: r.size,
                   onClick: p
@@ -7549,23 +7559,23 @@ ${b.map((A) => {
                   ]),
                   _: 1
                 }, 8, ["size"]), [
-                  [Ve, ge.value]
+                  [Se, Ce.value]
                 ])
               ]),
               _: 1
             })) : X("", !0)
           ]),
-          i("div", Ha, [
-            fe(b.$slots, "plan-row-right", {}, void 0, !0)
+          i("div", La, [
+            fe(b.$slots, "toolbar-right", {}, void 0, !0)
           ])
         ]),
         o(pa, {
           visible: j.value,
-          "onUpdate:visible": u[2] || (u[2] = (S) => j.value = S),
+          "onUpdate:visible": u[2] || (u[2] = (D) => j.value = D),
           "field-options": r.fieldOptions,
           "select-options": r.selectOptions,
           "plan-filter-options": r.planFilterOptions,
-          "filter-cards": R.value,
+          "filter-cards": M.value,
           "top-op": q.value,
           size: r.size,
           "person-tabs": r.personTabs,
@@ -7574,36 +7584,36 @@ ${b.map((A) => {
           width: "1000",
           onConfirm: y,
           onReset: l,
-          onDeletePlan: u[3] || (u[3] = (S) => k("delete-plan", S)),
-          onCopyPlan: u[4] || (u[4] = (S) => k("copy-plan", S)),
-          onSetDefaultPlan: u[5] || (u[5] = (S) => k("set-default-plan", S)),
-          onUpdatePlan: u[6] || (u[6] = (S) => k("update-plan", S)),
-          onLoadUsers: u[7] || (u[7] = (S) => k("load-users", S)),
-          onSearch: u[8] || (u[8] = (S) => k("search-persons", S)),
-          onDeptClick: u[9] || (u[9] = (S) => k("dept-click", S)),
-          onColumnChange: u[10] || (u[10] = (S) => k("column-change", S))
+          onDeletePlan: u[3] || (u[3] = (D) => k("delete-plan", D)),
+          onCopyPlan: u[4] || (u[4] = (D) => k("copy-plan", D)),
+          onSetDefaultPlan: u[5] || (u[5] = (D) => k("set-default-plan", D)),
+          onUpdatePlan: u[6] || (u[6] = (D) => k("update-plan", D)),
+          onLoadUsers: u[7] || (u[7] = (D) => k("load-users", D)),
+          onSearch: u[8] || (u[8] = (D) => k("search-persons", D)),
+          onDeptClick: u[9] || (u[9] = (D) => k("dept-click", D)),
+          onColumnChange: u[10] || (u[10] = (D) => k("column-change", D))
         }, null, 8, ["visible", "field-options", "select-options", "plan-filter-options", "filter-cards", "top-op", "size", "person-tabs", "person-organizations", "visible-columns"]),
         o(we, {
-          header: $.value,
+          header: S.value,
           visible: z.value,
           width: "600px",
-          onClose: C
+          onClose: g
         }, {
           body: s(() => [
-            i("div", La, [
-              o(Oe, {
+            i("div", Ya, [
+              o(Fe, {
                 data: h.value,
                 "label-width": "100px"
               }, {
                 default: s(() => [
-                  o(Fe, {
+                  o(Oe, {
                     label: "方案名称",
                     required: ""
                   }, {
                     default: s(() => [
                       o(ze, {
                         modelValue: h.value.name,
-                        "onUpdate:modelValue": u[11] || (u[11] = (S) => h.value.name = S),
+                        "onUpdate:modelValue": u[11] || (u[11] = (D) => h.value.name = D),
                         placeholder: "请输入筛选方案名称"
                       }, null, 8, ["modelValue"])
                     ]),
@@ -7615,16 +7625,16 @@ ${b.map((A) => {
             ])
           ]),
           footer: s(() => [
-            o(M, {
+            o(R, {
               theme: "default",
-              onClick: C
+              onClick: g
             }, {
               default: s(() => [...u[17] || (u[17] = [
                 T("取消", -1)
               ])]),
               _: 1
             }),
-            o(M, {
+            o(R, {
               theme: "primary",
               onClick: t
             }, {
@@ -7638,14 +7648,14 @@ ${b.map((A) => {
         }, 8, ["header", "visible"]),
         o(Ja, {
           visible: P.value,
-          "onUpdate:visible": u[12] || (u[12] = (S) => P.value = S),
+          "onUpdate:visible": u[12] || (u[12] = (D) => P.value = D),
           "field-options": r.fieldOptions,
           "visible-columns": r.visibleColumns,
-          onColumnChange: u[13] || (u[13] = (S) => k("column-change", S))
+          onColumnChange: u[13] || (u[13] = (D) => k("column-change", D))
         }, null, 8, ["visible", "field-options", "visible-columns"]),
-        o(Ce, {
+        o(ge, {
           visible: L.value,
-          "onUpdate:visible": u[14] || (u[14] = (S) => L.value = S),
+          "onUpdate:visible": u[14] || (u[14] = (D) => L.value = D),
           "field-options": r.fieldOptions,
           size: r.size,
           "initial-rules": Q.value,
@@ -7656,15 +7666,15 @@ ${b.map((A) => {
       ]);
     };
   }
-}, Ga = /* @__PURE__ */ ae(Ya, [["__scopeId", "data-v-d428dbdd"]]), Xa = (r) => {
-  r.component("FilterDialog", ye), r.component("FilterComponent", ye), r.component("CdFilterBar", Ga), r.component("ColorFilterDialog", Ce);
+}, Wa = /* @__PURE__ */ ae(Ga, [["__scopeId", "data-v-d2af873f"]]), Za = (r) => {
+  r.component("FilterDialog", ye), r.component("FilterComponent", ye), r.component("CdFilterBar", Wa), r.component("ColorFilterDialog", ge);
 };
 export {
-  Ga as CdFilterBar,
-  Ce as ColorFilterDialog,
+  Wa as CdFilterBar,
+  ge as ColorFilterDialog,
   Ja as ColumnSettingsDialog,
   ye as FilterComponent,
   ye as FilterDialog,
   ye as default,
-  Xa as install
+  Za as install
 };