@farris/ui-vue 1.7.0-beta.4 → 1.7.0

package/components/filter-bar/index.esm.js

@@ -1,27 +1,28 @@
 var Re = Object.defineProperty;
-var Ae = (i, t, e) => t in i ? Re(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
-var x = (i, t, e) => Ae(i, typeof t != "symbol" ? t + "" : t, e);
-import { ref as I, createVNode as C, computed as U, defineComponent as D, inject as Q, onMounted as H, mergeProps as $e, createTextVNode as W, Fragment as le, Teleport as je, nextTick as Z, provide as se, watch as ae } from "vue";
-import { resolveAppearance as We, getSchemaByType as ie, createPropsResolver as qe } from "../dynamic-resolver/index.esm.js";
-import { DgControl as h, canvasChanged as _, refreshCanvas as Ge, useDesignerComponent as ze } from "../designer-canvas/index.esm.js";
-import { useGuid as ne, getCustomStyle as de, FormSchemaEntityField$Type as re, FormSchemaEntityFieldType$Type as De } from "../common/index.esm.js";
-import { useConditionValue as Qe, useConditionUtils as K, FConditionFields as _e } from "../condition/index.esm.js";
-import { useCondition as Xe, useSolutionUtils as ce } from "../query-solution/index.esm.js";
-import { FNotifyService as Je } from "../notify/index.esm.js";
-import { FDrawer as He } from "../drawer/index.esm.js";
-import { cloneDeep as z, isPlainObject as oe } from "lodash-es";
-import { LocaleService as ue } from "../locale/index.esm.js";
-import { FDynamicFormGroup as Ye, useTypeResolver as fe } from "../dynamic-form/index.esm.js";
-import { radioGroupProps as Ze } from "../radio-group/index.esm.js";
+var $e = (i, t, e) => t in i ? Re(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
+var S = (i, t, e) => $e(i, typeof t != "symbol" ? t + "" : t, e);
+import { ref as w, computed as $, createVNode as b, defineComponent as Q, inject as _, onMounted as K, mergeProps as je, createTextVNode as G, Fragment as de, Teleport as qe, nextTick as te, provide as ce, watch as ue, onUnmounted as fe } from "vue";
+import { resolveAppearance as We, getSchemaByType as oe, createPropsResolver as Ge } from "../dynamic-resolver/index.esm.js";
+import { DgControl as v, canvasChanged as Z, refreshCanvas as ze, useDesignerComponent as De } from "../designer-canvas/index.esm.js";
+import { useGuid as se, getMaxZIndex as Qe, getCustomStyle as pe, FormSchemaEntityField$Type as le, FormSchemaEntityFieldType$Type as _e } from "../common/index.esm.js";
+import { useConditionValue as He, useConditionUtils as ie } from "../condition/index.esm.js";
+import { useCondition as Xe, useSolutionUtils as me } from "../query-solution/index.esm.js";
+import { FNotifyService as Ze } from "../notify/index.esm.js";
+import { LocaleService as ge } from "../locale/index.esm.js";
+import { cloneDeep as H, isPlainObject as ae } from "lodash-es";
+import { FDynamicFormGroup as Je } from "../../designer/dynamic-form/index.esm.js";
+import { radioGroupProps as Ye } from "../radio-group/index.esm.js";
 import { useDataSource as Ke, FComboListContainer as et } from "../combo-list/index.esm.js";
-const pe = /* @__PURE__ */ new Map([
+import { useTypeResolver as ve } from "../dynamic-form/index.esm.js";
+import { DgControl as tt } from "../designer-canvas/index.esm.js/";
+const he = /* @__PURE__ */ new Map([
   ["appearance", We]
 ]);
-function tt(i, t) {
+function it(i, t) {
   const e = t == null ? void 0 : t.formSchemaUtils, n = i.parentComponentInstance, r = "54bddc89-5f7e-4b91-9c45-80dd6606cfe9";
-  function l() {
-    const u = ie(h["content-container"].type), f = ie(h["filter-bar"].type);
-    if (!u || !f)
+  function s() {
+    const u = oe(v["content-container"].type), c = oe(v["filter-bar"].type);
+    if (!u || !c)
       return;
     const o = Math.random().toString(36).substr(2, 4);
     Object.assign(u, {
@@ -29,31 +30,30 @@ function tt(i, t) {
       appearance: {
         class: "f-filter-container"
       },
-      contents: [f]
-    }), Object.assign(f, {
+      contents: [c]
+    }), Object.assign(c, {
       id: "filter-" + o,
       fields: []
     });
-    const d = n.belongedComponentId, g = e.getViewModelIdByComponentId(d), a = e.getViewModelById(g);
-    return a != null && a.states && (a.states.find((p) => p.code === "originalFilterConditionList") || a.states.push(
+    const d = n.belongedComponentId, g = e.getViewModelIdByComponentId(d), f = e.getViewModelById(g);
+    return f != null && f.states && (f.states.find((p) => p.code === "originalFilterConditionList") || f.states.push(
       {
-        id: ne().guid(),
+        id: se().guid(),
         category: "locale",
         code: "originalFilterConditionList",
         name: "筛选条过滤条件",
         type: "String"
       }
-    )), { filterBar: f, filterBarContainer: u };
+    )), { filterBar: c, filterBarContainer: u };
   }
-  function s() {
-    const u = e.getViewModelIdByComponentId(n.belongedComponentId), f = e.getViewModelById(u);
+  function l() {
+    const u = e.getViewModelIdByComponentId(n.belongedComponentId), c = e.getViewModelById(u);
     let o;
-    if (f && f.commands) {
-      const d = f.commands.find((g) => g.handlerName === "Filter" && g.cmpId === r);
-      if (!d)
+    if (c && c.commands) {
+      if (o = c.commands.find((d) => d.handlerName === "Filter" && d.cmpId === r), !o)
         o = {
-          id: ne().guid(),
-          code: `${f.id.replace(/-/g, "").replace("component", "").replace("viewmodel", "")}Filter1`,
+          id: se().guid(),
+          code: `${c.id.replace(/-/g, "").replace("component", "").replace("viewmodel", "")}Filter1`,
           name: "过滤并加载数据1",
           params: [
             {
@@ -71,19 +71,19 @@ function tt(i, t) {
           ],
           handlerName: "Filter",
           cmpId: r
-        }, f.commands.push(o);
-      else if (d.params && d.params.length) {
-        const g = d.params.find((a) => a.name === "filter");
-        g && (g.value = `{UISTATE~/#{${n.belongedComponentId}}/originalFilterConditionList}`);
+        }, c.commands.push(o);
+      else if (o.params && o.params.length) {
+        const d = o.params.find((g) => g.name === "filter");
+        d && (d.value = `{UISTATE~/#{${n.belongedComponentId}}/originalFilterConditionList}`);
       }
     }
     return { filterInGridViewModel: o };
   }
   function m(u) {
-    const f = e.getCommands();
-    if (!f)
+    const c = e.getCommands();
+    if (!c)
       return;
-    let o = f.find((d) => d.id === r);
+    let o = c.find((d) => d.id === r);
     o || (o = {
       id: r,
       path: "igix/Web/WebCmp/bo-webcmp/metadata/webcmd/data-commands",
@@ -96,23 +96,23 @@ function tt(i, t) {
       }
     );
   }
-  function c() {
-    const { filterBar: u, filterBarContainer: f } = l(), { filterInGridViewModel: o } = s();
+  function a() {
+    const { filterBar: u, filterBarContainer: c } = s(), { filterInGridViewModel: o } = l();
     u && o && (u.onQuery = o.code), m(o);
     const d = t == null ? void 0 : t.useFormCommand;
-    return d && d.checkCommands(), f;
+    return d && d.checkCommands(), c;
   }
-  return { createFilterBar: c };
+  return { createFilterBar: a };
 }
-function me(i, t, e, n) {
+function ye(i, t, e, n) {
   if (e.parentComponentInstance && n) {
-    const s = tt(e, n).createFilterBar();
-    if (s)
-      return s;
+    const l = it(e, n).createFilterBar();
+    if (l)
+      return l;
   }
   return t;
 }
-const it = "https://json-schema.org/draft/2020-12/schema", nt = "https://farris-design.gitee.io/filter-bar.schema.json", rt = "filter-bar", ot = "A Farris Component", lt = "object", st = {
+const nt = "https://json-schema.org/draft/2020-12/schema", rt = "https://farris-design.gitee.io/filter-bar.schema.json", ot = "filter-bar", st = "A Farris Component", lt = "object", at = {
   id: {
     description: "The unique identifier for filter-bar",
     type: "string"
@@ -156,21 +156,21 @@ const it = "https://json-schema.org/draft/2020-12/schema", nt = "https://farris-
     description: "",
     type: "string"
   }
-}, at = [
+}, dt = [
   "id",
   "type"
-], dt = {
+], ct = {
   onQuery: "查询事件"
-}, ge = {
-  $schema: it,
-  $id: nt,
-  title: rt,
-  description: ot,
+}, be = {
+  $schema: nt,
+  $id: rt,
+  title: ot,
+  description: st,
   type: lt,
-  properties: st,
-  required: at,
-  events: dt
-}, ee = {
+  properties: at,
+  required: dt,
+  events: ct
+}, ne = {
   /** 指定已设的筛选条件列表 */
   defaultValues: {
     type: Array,
@@ -188,169 +188,130 @@ const it = "https://json-schema.org/draft/2020-12/schema", nt = "https://farris-
   resetText: { type: String, default: "清空筛选" },
   customClass: { type: String, default: "" },
   customStyle: { type: String, default: "" }
-}, ct = qe(ee, ge, pe, me);
-function ut(i, t, e, n) {
-  const r = I([]), l = I([]), s = I([]), m = I("");
-  I(i.mode);
-  const c = /* @__PURE__ */ new Map(), { createConditionValue: u } = Qe(), { convertToControls: f } = K("filter-bar"), o = Xe(i, t), { getFilterConditions: d } = o, { fieldToCondition: g, judgeLoadNewValue: a } = ce(), p = new Je();
-  let v = "[]";
-  function y(F) {
-    return !i.disabled && !F.value.isEmpty();
-  }
-  function w(F) {
-    l.value = f(F), l.value.reduce((E, B) => (E.set(B.labelCode, B), E), c);
-  }
-  function T(F) {
-    const E = Array.isArray(F) ? F : [];
-    s.value = l.value.map((B) => {
-      const R = E.find((P) => P.id === B.id);
-      if (R) {
-        const P = g(B, R.value);
-        return a(P, B) && P.value.clear(), P;
+}, ut = Ge(ne, be, he, ye);
+function ee() {
+  const { getLocaleValue: i } = ge;
+  return {
+    confirm: i("filterBar.confirm"),
+    cancel: i("filterBar.cancel"),
+    advancedFilter: i("filterBar.advancedFilter"),
+    clearAll: i("filterBar.clearAll"),
+    expand: i("filterBar.expand"),
+    fold: i("filterBar.fold"),
+    require: i("filterBar.require")
+  };
+}
+function ft(i) {
+  return ge.getRealPropertyValue(i, "清空筛选", "filterBar.reset");
+}
+function pt(i, t, e, n) {
+  const r = w([]), s = w([]), l = w([]), m = w("");
+  w(i.mode);
+  const a = /* @__PURE__ */ new Map(), { createConditionValue: u } = He(), { convertToControls: c } = ie("filter-bar"), o = Xe(i, t), { getFilterConditions: d } = o, { fieldToCondition: g, judgeLoadNewValue: f } = me(), p = new Ze(), h = ee();
+  let y = "[]";
+  function C(I) {
+    return !i.disabled && !I.value.isEmpty();
+  }
+  function V(I) {
+    s.value = c(I), s.value.reduce((P, U) => (P.set(U.labelCode, U), P), a);
+  }
+  function B(I) {
+    const P = Array.isArray(I) ? I : [];
+    l.value = s.value.map((U) => {
+      const x = P.find((E) => E.id === U.id);
+      if (x) {
+        const E = g(U, x.value);
+        return f(E, U) && E.value.clear(), E;
       }
-      return g(B);
+      return g(U);
     });
   }
-  function V(F) {
-    s.value = s.value.filter((E) => E.id !== F.id), r.value = r.value.filter((E) => E.fieldCode !== F.fieldCode), l.value = l.value.filter((E) => E.id !== F.id), t.emit("remove", F.fieldCode);
+  function M(I) {
+    l.value = l.value.filter((P) => P.id !== I.id), r.value = r.value.filter((P) => P.fieldCode !== I.fieldCode), s.value = s.value.filter((P) => P.id !== I.id), t.emit("remove", I.fieldCode);
   }
-  function M() {
-    var F;
-    i.disabled ? e.value = !1 : e.value = ((F = s.value) == null ? void 0 : F.findIndex((E) => {
-      var B;
-      return E.value && !((B = E.value) != null && B.isEmpty());
+  function k() {
+    var I;
+    i.disabled ? e.value = !1 : e.value = ((I = l.value) == null ? void 0 : I.findIndex((P) => {
+      var U;
+      return P.value && !((U = P.value) != null && U.isEmpty());
     })) > -1;
   }
-  function k(F, E = []) {
-    const B = JSON.stringify(F || []);
-    B !== v && (t.emit("conditionChange", F), v = B, E.length === 0 && t.emit("query", F));
+  function A(I, P = []) {
+    const U = JSON.stringify(I || []);
+    U !== y && (t.emit("conditionChange", I), y = U, P.length === 0 && t.emit("query", I));
   }
-  function N() {
-    var R;
-    M();
-    const F = [];
-    (s.value || []).map((P) => {
-      P.required && (!P.value || P.value.isEmpty()) && F.push(P.fieldName || "");
+  function O() {
+    var x;
+    k();
+    const I = [];
+    (l.value || []).map((E) => {
+      E.required && (!E.value || E.value.isEmpty()) && I.push(E.fieldName || "");
     });
-    const E = (R = s.value) == null ? void 0 : R.filter((P) => {
-      var A;
-      return P.value && !((A = P.value) != null && A.isEmpty());
+    const P = (x = l.value) == null ? void 0 : x.filter((E) => {
+      var R;
+      return E.value && !((R = E.value) != null && R.isEmpty());
     });
-    if (E.length && F.length > 0) {
-      p.warning({ message: "请填写{fields}再进行筛选".replace("{fields}", F.join(",")), position: "top-center" });
+    if (I.length > 0) {
+      p.warning({ message: h.require.replace("[fields]", I.join(",")), position: "top-center" });
       return;
     }
-    const B = d(E, l.value);
-    k(B, F);
+    const U = d(P, s.value);
+    A(U, I);
   }
-  function L(F, E) {
-    w(F), T(E), N();
+  function T(I, P, U = !0) {
+    V(I), B(P), U && O();
   }
-  function b(F) {
-    F.value.clear(), r.value = r.value.filter((E) => E.fieldCode !== F.fieldCode), t.emit("clear", F.fieldCode), N();
+  function F(I) {
+    I.value.clear(), r.value = r.value.filter((P) => P.fieldCode !== I.fieldCode), t.emit("clear", I.fieldCode), O();
   }
-  function S() {
-    s.value.forEach((F) => F.value.clear());
+  function j() {
+    l.value.forEach((I) => I.value.clear());
   }
-  function O() {
-    s.value.forEach((F) => {
-      F.value.clear();
-    }), t.emit("reset"), N(), n.resizeFilerBar();
+  function L() {
+    l.value.forEach((I) => {
+      I.value.clear();
+    }), t.emit("reset"), O(), n.resizeFilerBar();
   }
   return {
-    clearAll: S,
-    clearFilterItem: b,
+    clearAll: j,
+    clearFilterItem: F,
     currentFilterId: m,
-    filterFields: l,
-    filterItems: s,
-    fieldMap: c,
-    loadFilterItems: L,
-    removeFilterItem: V,
-    reset: O,
-    shouldShowClearButtonInFilterItem: y,
-    handleQuery: N
+    filterFields: s,
+    filterItems: l,
+    fieldMap: a,
+    loadFilterItems: T,
+    removeFilterItem: M,
+    reset: L,
+    shouldShowClearButtonInFilterItem: C,
+    handleQuery: O
   };
 }
-function Y() {
-  const { getLocaleValue: i } = ue;
-  return {
-    confirm: i("filterBar.confirm"),
-    cancel: i("filterBar.cancel"),
-    advancedFilter: i("filterBar.advancedFilter"),
-    clearAll: i("filterBar.clearAll"),
-    expand: i("filterBar.expand"),
-    fold: i("filterBar.fold")
-  };
-}
-function ft(i) {
-  return ue.getRealPropertyValue(i, "清空筛选", "filterBar.reset");
-}
-function pt(i, t, e, n, r) {
-  const {
-    filterFields: l,
-    handleQuery: s
-  } = r, m = I(z(n.value)), c = Y(), u = I(c.advancedFilter);
-  function f() {
-    e.value = !1, m.value = z(n.value);
-  }
-  function o() {
-    e.value = !1, n.value.forEach((g) => {
-      const a = m.value.find((p) => p.id === g.id);
-      a != null && a.value && (g.value = a.value);
-    }), s();
-  }
-  function d() {
-    return C("div", null, [C(_e, {
-      fields: l.value,
-      conditions: m.value
-    }, null), C("div", null, [C("button", {
-      class: "btn btn-secondary",
-      onClick: f
-    }, [c.cancel]), C("button", {
-      class: "btn btn-primary",
-      onClick: o
-    }, [c.confirm])])]);
-  }
-  return () => C(He, {
-    modelValue: e.value,
-    "onUpdate:modelValue": (g) => e.value = g,
-    showClose: !1,
-    width: 480,
-    closeByMask: !1,
-    title: u.value
-  }, {
-    content: d
-  });
-}
 function mt(i, t, e, n) {
-  const r = I([]), l = Y(), s = I(l.advancedFilter), m = I(ft(i.resetText));
-  I(i.showReset);
-  const c = I(!1), {
+  const r = w([]), s = ee(), l = w(s.advancedFilter), m = w(ft(i.resetText)), a = w(!1), {
     clearAll: u,
-    reset: f,
+    reset: c,
     filterItems: o
   } = e;
   function d() {
-    r.value = o.value.filter((y) => y.isExtend);
+    r.value = o.value.filter((h) => h.isExtend);
   }
   d();
-  const g = U(() => r.value && r.value.length > 0);
-  function a(y) {
-    c.value = !0;
+  const g = $(() => r.value && r.value.length > 0);
+  function f(h) {
+    a.value = !0;
   }
-  function p(y) {
-    i.mode === "display-only" ? u() : f();
+  function p(h) {
+    i.mode === "display-only" ? u() : c();
   }
-  const v = pt(i, t, c, r, e);
-  return () => C("div", {
+  return () => b("div", {
     class: "f-filter-toolbars"
-  }, [g.value && C("button", {
+  }, [g.value && b("button", {
     class: "btn btn-link",
-    onClick: (y) => a()
-  }, [s.value]), n.value && C("button", {
+    onClick: (h) => f()
+  }, [l.value]), n.value && b("button", {
     class: "btn btn-link",
-    onClick: (y) => p()
-  }, [m.value]), v()]);
+    onClick: (h) => p()
+  }, [m.value])]);
 }
 const gt = {
   filterItem: { type: Object, default: null },
@@ -361,22 +322,22 @@ const gt = {
   reference: {
     type: Object
   }
-}, vt = Object.assign({}, Ze), ht = /* @__PURE__ */ D({
+}, vt = Object.assign({}, Ye), ht = /* @__PURE__ */ Q({
   name: "FFilterRadioGroup",
   props: vt,
   emits: ["update:modelValue", "change"],
   setup(i, t) {
-    const e = I(), {
+    const e = w(), {
       dataSource: n,
       displayText: r,
-      modelValue: l
+      modelValue: s
     } = Ke(i);
-    function s(m) {
+    function l(m) {
       r.value = m.map((u) => u[i.textField]).join(i.separator);
-      let c = "";
-      m.length === 1 ? c = m[0][i.valueField] : c = m.map((u) => u[i.valueField]).join(i.separator), l.value !== c && (l.value = c, t.emit("update:modelValue", l.value), t.emit("change", l.value));
+      let a = "";
+      m.length === 1 ? a = m[0][i.valueField] : a = m.map((u) => u[i.valueField]).join(i.separator), s.value !== a && (s.value = a, t.emit("update:modelValue", s.value), t.emit("change", s.value));
     }
-    return () => C(et, {
+    return () => b(et, {
       style: "margin: -2px -15px;padding: 0;",
       ref: e,
       idField: i.valueField,
@@ -384,415 +345,434 @@ const gt = {
       textField: i.textField,
       titleField: i.titleField,
       dataSource: n.value,
-      selectedValues: l.value,
+      selectedValues: s.value,
       multiSelect: !1,
       enableSearch: !1,
       onSelectionChange: (m) => {
-        s(m);
+        l(m);
       }
     }, null);
   }
-}), yt = /* @__PURE__ */ D({
+}), yt = /* @__PURE__ */ Q({
   name: "FFilterBarItemCondition",
   props: gt,
   emits: ["cancel", "confirm", "clearFilter"],
   setup(i, t) {
-    const e = I(z(i.filterItem)), n = Y(), r = I("0px"), l = I("0px"), s = I("0px"), m = I("auto"), c = U(() => ({
-      left: m.value === "auto" ? "26px" : "auto",
-      right: m.value
-    })), u = U(() => ({
-      left: r.value,
-      top: l.value,
-      width: s.value === "0px" ? null : s.value,
-      maxWidth: s.value === "0px" ? null : s.value
-    })), f = I(), {
-      useFilterItemsComposition: o,
-      resolveEditorProps: d
-    } = Q("useFilterItemsComposition"), {
-      fieldMap: g
-    } = o, {
-      renderFieldConditionEditor: a,
-      conditionChangeHandler: p
-    } = K("filter-bar"), v = I(""), y = I(!0);
-    function w() {
-      var F, E;
-      if (!i.reference || !f.value)
+    const e = w(H(i.filterItem)), n = w(), r = ee(), s = w("0px"), l = w("0px"), m = w("0px"), a = w("auto"), u = $(() => ({
+      left: a.value === "auto" ? "26px" : "auto",
+      right: a.value
+    })), c = $(() => ({
+      left: s.value,
+      top: l.value
+    })), o = $(() => ({
+      width: m.value === "0px" ? null : m.value,
+      maxWidth: m.value === "0px" ? null : m.value
+    })), d = w(), {
+      useFilterItemsComposition: g,
+      resolveEditorProps: f
+    } = _("useFilterItemsComposition"), {
+      fieldMap: p
+    } = g, {
+      renderFieldConditionEditor: h,
+      conditionChangeHandler: y
+    } = ie("filter-bar"), C = w("");
+    let V = !1, B = {};
+    const M = w(!0);
+    function k() {
+      var q, X;
+      if (!i.reference || !d.value)
         return;
-      const b = (F = i.reference) == null ? void 0 : F.getBoundingClientRect();
-      let S = (E = f.value) == null ? void 0 : E.getBoundingClientRect().width;
-      const O = document.body.clientWidth - b.left - 30;
-      S > O && (S = O), b.left > document.body.clientWidth - S - 20 ? (r.value = b.left + b.width - S + "px", l.value = b.top + b.height + "px", m.value = "26px") : (r.value = b.left + "px", l.value = b.top + b.height + "px", m.value = "auto"), s.value = S + "px";
+      const x = (q = i.reference) == null ? void 0 : q.getBoundingClientRect();
+      let E = (X = d.value) == null ? void 0 : X.getBoundingClientRect().width;
+      const R = document.body.clientWidth - x.x - 30, N = document.body.clientWidth - x.y - 30;
+      E > R && E > N && (E = Math.max(R, N)), x.left > document.body.clientWidth - E - 20 ? (s.value = x.left + x.width - E + "px", l.value = x.top + x.height + "px", a.value = "26px") : (s.value = x.left + "px", l.value = x.top + x.height + "px", a.value = "auto"), m.value = E + "px";
+    }
+    function A(x, E, R, N) {
+      V = !0, B = {
+        value: E,
+        editor: R,
+        option: N
+      };
     }
-    function T(b, S, O, F) {
-      p(b, S, O, F);
+    function O() {
+      if (!n.value)
+        return !1;
+      const x = n.value.parentElement, E = Array.from(x.children);
+      return E ? !!E.find((N) => !N || !N.classList ? !1 : N.classList.contains("popover") && N.style.visibility === "visible") : !1;
     }
-    function V(b, S, O, F) {
-      T(b, S, O, F), t.emit("confirm", e.value);
+    function T(x, E, R, N) {
+      y(x, E, R, N), t.emit("confirm", e.value);
     }
-    function M() {
+    function F() {
       const {
-        id: b,
-        editor: S,
-        needEmitChange: O
-      } = a(g, e.value, T);
-      if (v.value = "filter-panel--" + S.type, S.type === "radio-group") {
-        const F = d(S.type, S);
-        return y.value = !1, C(ht, $e(F, {
+        id: x,
+        editor: E,
+        needEmitChange: R
+      } = h(p, e.value, A);
+      if (C.value = "filter-panel--" + E.type, E.type === "radio-group") {
+        const N = f(E.type, E);
+        return M.value = !1, b(ht, je(N, {
           modelValue: e.value.value.value,
-          "onUpdate:modelValue": (E) => e.value.value.value = E,
-          onChange: (E) => {
-            V(e.value, E, S);
+          "onUpdate:modelValue": (q) => e.value.value.value = q,
+          onChange: (q) => {
+            T(e.value, q, E);
           }
         }), {
-          default: () => [W(" ")]
+          default: () => [G(" ")]
         });
       }
-      return C(Ye, {
+      return b(Je, {
         showLabelType: "force-none",
-        id: b,
-        key: b,
-        editor: S,
+        id: x,
+        key: x,
+        editor: E,
         modelValue: e.value.value.value,
-        "onUpdate:modelValue": (F) => e.value.value.value = F,
-        onChange: (F, E) => {
-          O && T(e.value, F, S, E);
+        "onUpdate:modelValue": (N) => e.value.value.value = N,
+        onChange: (N, q) => {
+          R && A(e.value, N, E, q);
         }
       }, null);
     }
-    H(() => {
-      w();
+    K(() => {
+      k();
     });
-    function k(b) {
-      t.emit("cancel");
+    function j(x) {
+      const E = C.value.replace("filter-panel--", "");
+      ["input", "radio-group", "switch"].findIndex((R) => R === E) > -1 ? t.emit("cancel") : O() || t.emit("cancel");
+    }
+    function L(x) {
+      x.stopPropagation(), V && y(e.value, B.value, B.editor, B.option), t.emit("confirm", e.value);
     }
-    function N(b) {
-      b.stopPropagation(), t.emit("confirm", e.value);
+    function I(x) {
+      e.value.value.clear(), x.stopPropagation(), t.emit("confirm", e.value);
     }
-    function L(b) {
-      e.value.value.clear(), b.stopPropagation(), t.emit("confirm", e.value);
+    function P() {
+      const x = Qe();
+      return {
+        zIndex: Math.max(x, 1050)
+      };
     }
-    return () => C("div", {
+    const U = P();
+    return () => b("div", {
       class: "f-filter-panel-wrapper can-close",
-      onClick: k
-    }, [C("div", {
-      class: "f-filter-panel " + v.value,
-      ref: f,
-      style: u.value
-    }, [C("div", {
+      ref: n,
+      onClick: j,
+      style: {
+        zIndex: U
+      }
+    }, [b("div", {
+      class: "f-filter-panel " + C.value,
+      ref: d,
+      style: c.value
+    }, [b("div", {
       class: "f-filter-panel-inner",
-      onClick: (b) => b.stopPropagation()
-    }, [C("div", {
+      style: o.value,
+      onClick: (x) => x.stopPropagation()
+    }, [b("div", {
       class: "f-filter-panel-arrow",
-      style: c.value
-    }, null), M(), y.value && C("div", {
+      style: u.value
+    }, null), F(), M.value && b("div", {
       class: "f-filter-panel-footer"
-    }, [C("div", {
+    }, [b("div", {
       class: "filter-panel-clear"
-    }, [C("button", {
+    }, [b("button", {
       class: "btn btn-link",
-      onClick: L,
+      onClick: I,
       style: "padding-left:0;"
-    }, [n.clearAll])]), C("div", {
+    }, [r.clearAll])]), b("div", {
       class: "filter-panel-btns"
-    }, [C("button", {
+    }, [b("button", {
       class: "btn btn-secondary can-close",
-      onClick: k
-    }, [n.cancel]), C("button", {
+      onClick: j
+    }, [r.cancel]), b("button", {
       class: "filter-panel-submit btn btn-primary",
-      onClick: N
-    }, [n.confirm])])])])])]);
+      onClick: L
+    }, [r.confirm])])])])])]);
   }
-}), ve = {
+}), Ce = {
   filterItem: { type: Object, default: null },
   disabled: { type: Boolean, default: !1 }
-}, bt = /* @__PURE__ */ D({
+}, bt = /* @__PURE__ */ Q({
   name: "FFilterBarItem",
-  props: ve,
+  props: Ce,
   emits: ["confirm"],
   setup(i, t) {
-    const e = I(i.filterItem), {
+    const e = w(i.filterItem), {
       useFilterItemsComposition: n
-    } = Q("useFilterItemsComposition"), {
+    } = _("useFilterItemsComposition"), {
       clearFilterItem: r,
-      currentFilterId: l,
-      removeFilterItem: s,
+      currentFilterId: s,
+      removeFilterItem: l,
       shouldShowClearButtonInFilterItem: m
-    } = n, c = I(!1), u = I(!1), f = I(), o = I(""), d = I(), g = function() {
+    } = n, a = w(!1), u = w(!1), c = w(), o = w(""), d = w(), g = function() {
       return {
         "f-filter-item": !0,
         "f-state-disabled": i.disabled,
         "f-filter-item-actived": !e.value.value.isEmpty(),
         // 'f-filter-item-last': index === filterItems.value.length - 1,
-        "f-filter-item-edit": e.value.id === l.value || c.value
+        "f-filter-item-edit": e.value.id === s.value || a.value
       };
     };
-    U(() => !i.disabled && i.mode === "editable");
-    function a(M) {
-      i.disabled || (i.mode === "display-only" ? s(e.value) : r(e.value));
+    $(() => !i.disabled && i.mode === "editable");
+    function f(M) {
+      i.disabled || (i.mode === "display-only" ? l(e.value) : r(e.value));
     }
     function p(M) {
-      i.disabled || (c.value = !0);
+      i.disabled || (a.value = !0);
     }
-    function v() {
-      c.value = !1;
+    function h() {
+      a.value = !1;
     }
     function y() {
       d.value && d.value.scrollWidth > d.value.clientWidth ? o.value = d.value.innerHTML : o.value = "";
     }
-    function w(M) {
-      c.value = !1, e.value.value = M.value, t.emit("confirm", M), Z(() => {
+    function C(M) {
+      a.value = !1, e.value.value = M.value, t.emit("confirm", M), te(() => {
         y();
       });
     }
-    function T() {
+    function V() {
       u.value = i.disabled ? !1 : m(e.value);
     }
-    function V() {
+    function B() {
       u.value = !1;
     }
-    return H(() => {
+    return K(() => {
       y();
-    }), () => C("div", {
+    }), () => b("div", {
       key: e.value.id,
       id: e.value.id,
       class: g(),
-      onMouseenter: () => T(),
-      onMouseleave: () => V()
-    }, [C("div", {
+      onMouseenter: () => V(),
+      onMouseleave: () => B()
+    }, [b("div", {
       class: "f-filter-item-inner",
-      ref: f,
+      ref: c,
       onClick: (M) => p()
-    }, [e.value.required && C("span", {
+    }, [e.value.required && b("span", {
       class: "f-filter-item-required text-danger"
-    }, [W("*")]), C("span", {
+    }, [G("*")]), b("span", {
       class: "f-filter-item-text"
-    }, [e.value.fieldName]), !e.value.value.isEmpty() && C(le, null, [C("span", {
+    }, [e.value.fieldName]), !e.value.value.isEmpty() && b(de, null, [b("span", {
       class: "f-filter-item-tip"
-    }, [W(":")]), C("span", {
+    }, [G(":")]), b("span", {
       class: "f-filter-item-content",
       ref: d,
       title: o.value
-    }, [e.value.value.getDisplayText()])]), !i.disabled && C("span", {
+    }, [e.value.value.getDisplayText()])]), !i.disabled && b("span", {
       class: "f-filter-item-arrow f-icon f-icon-arrow-chevron-down"
-    }, null)]), u.value && C("span", {
+    }, null)]), u.value && b("span", {
       class: "mr-3 f-filter-item-clear",
-      onClick: (M) => a()
-    }, [C("span", {
+      onClick: (M) => f()
+    }, [b("span", {
       class: "f-icon f-icon-close-circle"
-    }, null)]), c.value && C(je, {
+    }, null)]), a.value && b(qe, {
       to: "body"
     }, {
-      default: () => [C(yt, {
+      default: () => [b(yt, {
         filterItem: e.value,
-        reference: f.value,
-        onConfirm: w,
-        onCancel: v
+        reference: c.value,
+        onConfirm: C,
+        onCancel: h
       }, null)]
     })]);
   }
 });
-function he(i, t, e) {
-  const n = I(null), r = 20;
-  let l = 0, s = -1;
-  function m() {
-    var g, a, p, v, y;
-    if (t.value && s < 0) {
-      const w = (g = i.value) == null ? void 0 : g.querySelector(".f-filter-list-wrapper");
-      s = w ? parseFloat(getComputedStyle(w).marginRight) : 0;
-    }
-    const o = ((p = (a = i.value) == null ? void 0 : a.querySelector(".f-filter-list-ellipsis")) == null ? void 0 : p.clientWidth) || 0, d = ((y = (v = i.value) == null ? void 0 : v.querySelector(".f-filter-toolbars")) == null ? void 0 : y.clientWidth) || 0;
-    return s + o + d;
-  }
-  function c(o = -1, d = -1) {
-    var w;
-    let g = !1;
-    const a = (w = t.value) == null ? void 0 : w.children;
-    if (!t.value || !i.value || !a || a.length === 0 || (o < 0 && (o = i.value.clientWidth), l = d < 0 ? l : d, Math.abs(o - l) < r))
+function Fe(i, t) {
+  const e = w(null), n = 15;
+  let r = 0;
+  function s(a = -1, u = -1) {
+    var f;
+    if (!i.value)
       return;
-    const p = m();
-    let v = 0, y = 0;
-    Array.from(a).forEach((T) => {
-      T.style.display = "flex";
-    });
-    for (let T = 0; T < a.length; T++) {
-      const V = a[T], M = V.offsetWidth;
-      !g && v + M <= o - p ? (v += M, y++) : (V.style.display = "none", g = !0);
+    const c = (f = i.value) == null ? void 0 : f.querySelector(".f-filter-list");
+    if (!c)
+      return;
+    const o = c.children;
+    if (!o || o.length === 0 || (a < 0 && (a = i.value.clientWidth), r = u < 0 ? r : u, Math.abs(a - r) < n))
+      return;
+    Array.from(o).forEach((p) => {
+      p.style.display = "flex";
+    }), t.value = c.clientWidth < c.scrollWidth;
+    let d = !1, g = 0;
+    for (let p = 0; p < o.length; p++) {
+      const h = o[p], y = Math.ceil(h.offsetWidth + (parseFloat(getComputedStyle(h).marginRight) || 0) + parseFloat(getComputedStyle(h).marginLeft));
+      !d && g + y <= a ? g += y : (h.style.display = "none", d = !0);
     }
-    return e.value = g, l = o, y;
+    r = a;
   }
-  function u() {
-    var d;
-    if (!i.value || !t.value)
+  function l() {
+    var u, c;
+    if (!i.value)
       return;
-    (d = n.value) == null || d.unobserve(i.value);
-    const o = t.value.children;
-    Array.from(o).forEach((g) => {
-      g.style.display = "flex";
-    }), l = 0;
-  }
-  function f() {
-    if (!t.value || !i.value)
+    (u = e.value) == null || u.unobserve(i.value);
+    const a = ((c = i.value.querySelector(".f-filter-list")) == null ? void 0 : c.children) || [];
+    Array.from(a).forEach((o) => {
+      o.style.display = "flex";
+    }), r = 0;
+  }
+  function m() {
+    if (!i.value)
       return;
-    const o = new ResizeObserver((d) => {
-      const g = d[0].contentRect.width;
-      c(g);
+    const a = new ResizeObserver((u) => {
+      const c = u[0].contentRect.width;
+      s(c);
     });
-    return o.observe(i.value), n.value = o, o;
+    return a.observe(i.value), e.value = a, a;
   }
   return {
-    setupWidthObserver: f,
-    cancelWidthObserver: u,
-    handleVisibleChildren: c
+    setupWidthObserver: m,
+    cancelWidthObserver: l,
+    handleVisibleChildren: s
   };
 }
-const G = /* @__PURE__ */ D({
+const D = /* @__PURE__ */ Q({
   name: "FFilterBar",
-  props: ee,
+  props: ne,
   emits: ["clear", "remove", "reset", "conditionChange", "change", "query"],
   setup(i, t) {
-    const e = I(!0), n = I(!1), r = I(!1), l = I(null), s = I(null), m = I(!1), c = I(0), u = he(s, l, r), {
-      cancelWidthObserver: f,
-      setupWidthObserver: o,
-      handleVisibleChildren: d
-    } = u, g = {
+    const e = w(!1), n = w(!1), r = w(null), s = w(!1), l = w(0), m = Fe(r, n), {
+      cancelWidthObserver: a,
+      setupWidthObserver: u,
+      handleVisibleChildren: c
+    } = m, o = {
       resizeFilerBar: () => {
-        n.value || Z(() => {
-          d(-1, 0);
+        e.value || te(() => {
+          c(-1, 0);
         });
       }
-    }, a = ut(i, t, m, g), {
-      filterFields: p,
-      filterItems: v,
-      loadFilterItems: y,
-      handleQuery: w
-    } = a, {
-      resolveEditorProps: T
-    } = fe();
-    se("useFilterItemsComposition", {
-      useFilterItemsComposition: a,
-      resolveEditorProps: T
+    }, d = pt(i, t, s, o), {
+      filterFields: g,
+      filterItems: f,
+      loadFilterItems: p,
+      handleQuery: h
+    } = d, {
+      resolveEditorProps: y
+    } = ve();
+    ce("useFilterItemsComposition", {
+      useFilterItemsComposition: d,
+      resolveEditorProps: y
     });
-    const V = Y(), M = U(() => {
-      const P = {
-        display: p.value && p.value.length ? "" : "none"
+    const C = ee(), V = $(() => {
+      const L = {
+        display: g.value && g.value.length ? "" : "none"
       };
-      return de(P, i == null ? void 0 : i.customStyle);
+      return pe(L, i == null ? void 0 : i.customStyle);
     });
-    y(i.fields, i.defaultValues), ae([() => i.defaultValues, () => i.fields], ([P, A]) => {
-      y(A, P), c.value++, g.resizeFilerBar();
-    }), H(() => {
-      o();
+    p(i.fields, i.defaultValues, !!(i.defaultValues && i.defaultValues.length > 0)), ue([() => i.defaultValues, () => i.fields], ([L, I]) => {
+      p(I, L), l.value++, o.resizeFilerBar();
+    }), K(() => {
+      u();
+    }), fe(() => {
+      a();
     });
-    const k = U(() => n.value && e.value), N = U(() => ({
+    const B = $(() => ({
       "f-filter-list": !0,
-      "f-filter-list-extend": k.value
+      "f-filter-list-extend": e.value
       // 'f-utils-overflow-hidden': true
-    })), L = U(() => ({
+    })), M = $(() => ({
       "extend-btn-arrow": !0,
       "f-icon": !0,
-      "f-icon-arrow-chevron-up": n.value,
-      "f-icon-arrow-chevron-down": !n.value
-    })), b = U(() => v.value.length > 0), S = U(() => !n.value && r.value);
-    function O() {
-      n.value = !n.value, n.value ? f() : o();
+      "f-icon-arrow-chevron-up": e.value,
+      "f-icon-arrow-chevron-down": !e.value
+    })), k = $(() => !e.value && n.value);
+    function A() {
+      e.value = !e.value, e.value ? a() : u();
     }
-    const F = mt(i, t, a, m);
-    function E(P) {
-      t.emit("change", P), w(), g.resizeFilerBar();
+    const O = mt(i, t, d, s);
+    function T(L) {
+      t.emit("change", L), h(), o.resizeFilerBar();
     }
-    function B() {
-      return C("div", {
-        class: N.value,
-        ref: l
-      }, [v.value.map((P, A) => !P.isExtend && C(bt, {
-        filterItem: P,
-        onConfirm: E,
-        disabled: i.disabled || P.disabled
-      }, null)), n.value && F()]);
+    function F() {
+      return b("div", {
+        class: B.value,
+        key: i.id + "-main-" + l.value
+      }, [f.value.map((L, I) => !L.isExtend && b(bt, {
+        filterItem: L,
+        onConfirm: T,
+        disabled: i.disabled || L.disabled
+      }, null)), e.value && O()]);
     }
-    function R() {
-      return C("div", {
+    function j() {
+      return k.value && b("div", {
         class: "f-filter-list-ellipsis",
-        onClick: (P) => O()
-      }, [W("...")]);
+        onClick: (L) => A()
+      }, [G("...")]);
     }
-    return () => C("div", {
+    return () => b("div", {
       class: "f-filter-wrapper " + i.customClass,
-      style: M.value
-    }, [C("div", {
+      style: V.value
+    }, [b("div", {
       class: "f-filter-wrapper-inner f-utils-fill"
-    }, [C("div", {
-      class: "f-filter-main f-utils-fill",
-      ref: s
-    }, [C("div", {
-      class: "f-filter-list-wrapper",
-      key: i.id + "-main-" + c.value
-    }, [b.value && B()]), S.value && R(), !n.value && F()]), r.value && C("div", {
+    }, [b("div", {
+      class: "f-filter-main f-utils-fill"
+    }, [b("div", {
+      class: "f-filter-list-wrapper flex-fill",
+      ref: r
+    }, [F()]), j(), !e.value && O()]), n.value && b("div", {
       class: "f-filter-extend-btn"
-    }, [C("button", {
+    }, [b("button", {
       class: "btn btn-link",
-      onClick: O
-    }, [C("span", {
+      onClick: A
+    }, [b("span", {
       class: "extend-btn-text"
-    }, [n.value ? V.fold : V.expand]), C("span", {
-      class: L.value
+    }, [e.value ? C.fold : C.expand]), b("span", {
+      class: M.value
     }, null)])])])]);
   }
 });
 function Ct(i, t) {
-  I([]);
-  const e = I([]), n = I([]), r = I("");
-  I(!1), I(i.mode);
-  const l = /* @__PURE__ */ new Map(), { convertToControls: s } = K("filter-bar"), { fieldToCondition: m } = ce();
-  function c(d) {
+  w([]);
+  const e = w([]), n = w([]), r = w("");
+  w(!1), w(i.mode);
+  const s = /* @__PURE__ */ new Map(), { convertToControls: l } = ie("filter-bar"), { fieldToCondition: m } = me();
+  function a(d) {
     return !d.value.isEmpty();
   }
   function u(d) {
-    e.value = s(d), e.value.reduce((g, a) => (g.set(a.labelCode, a), g), l);
+    e.value = H(d), e.value.reduce((g, f) => (g.set(f.labelCode, f), g), s);
   }
-  function f(d) {
+  function c(d) {
     n.value = e.value.map((g) => m(g));
   }
   function o(d, g) {
-    u(d), f();
+    u(d), c();
   }
   return o(i.fields), {
     currentFilterId: r,
     filterFields: e,
     filterItems: n,
-    fieldMap: l,
+    fieldMap: s,
     loadFilterItems: o,
-    shouldShowClearButtonInFilterItem: c
+    shouldShowClearButtonInFilterItem: a
   };
 }
 function Ft(i, t, e) {
-  const n = I([]), r = I("更多筛选"), l = I(i.resetText), s = I(i.showReset), {
-    filterItems: m
+  const n = w([]), r = w("更多筛选"), {
+    filterItems: s
   } = e;
-  function c() {
-    n.value = m.value.filter((o) => o.isExtend);
+  function l() {
+    n.value = s.value.filter((a) => a.isExtend);
   }
-  c();
-  const u = U(() => n.value && n.value.length > 0), f = U(() => s.value);
-  return () => C("div", {
+  l();
+  const m = $(() => n.value && n.value.length > 0);
+  return () => b("div", {
     class: "f-filter-toolbars"
-  }, [u.value && C("button", {
-    class: "btn btn-link"
-  }, [r.value]), f.value && C("button", {
+  }, [m.value && b("button", {
     class: "btn btn-link"
-  }, [l.value])]);
+  }, [r.value])]);
 }
-const wt = /* @__PURE__ */ D({
+const wt = /* @__PURE__ */ Q({
   name: "FFilterBarItemDesign",
-  props: ve,
+  props: Ce,
   emits: ["confirm"],
   setup(i, t) {
-    const e = I(i.filterItem), {
+    const e = w(i.filterItem), {
       useFilterItemsComposition: n
-    } = Q("useFilterItemsComposition"), {
+    } = _("useFilterItemsComposition"), {
       currentFilterId: r,
-      shouldShowClearButtonInFilterItem: l
-    } = n, s = I(i.disabled), m = function() {
+      shouldShowClearButtonInFilterItem: s
+    } = n, l = w(i.disabled), m = function() {
       return {
         "f-filter-item": !0,
         "f-filter-item-actived": !e.value.value.isEmpty(),
@@ -800,59 +780,60 @@ const wt = /* @__PURE__ */ D({
         "f-filter-item-edit": e.value.id === r.value
       };
     };
-    return () => C("div", {
+    return () => b("div", {
       key: e.value.id,
       id: e.value.id,
       class: m()
-    }, [C("div", {
+    }, [b("div", {
       class: "f-filter-item-inner"
-    }, [e.value.required && C("span", {
+    }, [e.value.required && b("span", {
       class: "f-filter-item-required text-danger"
-    }, [W("*")]), C("span", {
+    }, [G("*")]), b("span", {
       class: "f-filter-item-text"
-    }, [e.value.fieldName]), e.value.value.getDisplayText() && C(le, null, [C("span", {
+    }, [e.value.fieldName]), e.value.value.getDisplayText() && b(de, null, [b("span", {
       class: "f-filter-item-tip"
-    }, [W(":")]), C("span", {
+    }, [G(":")]), b("span", {
       class: "f-filter-item-content"
-    }, [e.value.value.getDisplayText()])]), !s.value && C("span", {
+    }, [e.value.value.getDisplayText()])]), !l.value && b("span", {
       class: "f-filter-item-arrow f-icon f-icon-arrow-chevron-down"
-    }, null)]), l(e.value) && C("span", {
+    }, null)]), s(e.value) && b("span", {
       class: "mr-3 f-filter-item-clear"
-    }, [C("span", {
+    }, [b("span", {
       class: "f-icon f-icon-close-circle"
     }, null)])]);
   }
 });
 function It(i) {
   const { formSchemaUtils: t, formStateMachineUtils: e } = i;
-  function n(c, u = "") {
+  function n(a, u = "") {
     return {
-      path: u + c.code,
-      field: c.id,
-      fullPath: c.code
+      path: u + a.code,
+      field: a.id,
+      fullPath: a.code
     };
   }
-  function r(c, u = "") {
-    return t.getViewModelById(c).states.map((o) => n(o, u));
+  function r(a, u = "") {
+    const c = t.getViewModelById(a);
+    return c ? c.states.map((o) => n(o, u)) : [];
   }
-  function l(c) {
-    const u = t.getRootViewModelId(), f = r(c);
-    if (c === u)
-      return f;
+  function s(a) {
+    const u = t.getRootViewModelId(), c = r(a);
+    if (a === u)
+      return c;
     const o = r(u, "root-component.");
-    return [...f, ...o];
+    return [...c, ...o];
   }
-  function s(c) {
-    return c.binding && c.binding.path || c.id || "";
+  function l(a) {
+    return a.binding && a.binding.path || a.id || "";
   }
   function m() {
     return e && e.getRenderStates() || [];
   }
-  return { getVariables: l, getControlName: s, getStateMachines: m };
+  return { getVariables: s, getControlName: l, getStateMachines: m };
 }
-class ye {
+class we {
   constructor(t) {
-    x(this, "sessionVariables", [
+    S(this, "sessionVariables", [
       {
         key: "CurrentSysOrgName",
         name: "当前组织Name",
@@ -889,7 +870,7 @@ class ye {
         description: "当前登录的语言编号，例如简体中文返回'zh-CHS'，英文返回'en'，繁体中文'zh-CHT'"
       }
     ]);
-    x(this, "expressionNames", {
+    S(this, "expressionNames", {
       compute: "计算表达式",
       dependency: "依赖表达式",
       validate: "验证表达式",
@@ -898,20 +879,20 @@ class ye {
       readonly: "只读表达式",
       required: "必填表达式"
     });
-    x(this, "getExpressionConverter", (t, e) => ({
-      convertFrom: (n, r, l, s) => {
-        const m = l.getExpressionRuleValue(t, e || r);
+    S(this, "getExpressionConverter", (t, e) => ({
+      convertFrom: (n, r, s, l) => {
+        const m = s.getExpressionRuleValue(t, e || r);
         return m && m.value || "";
       },
-      convertTo: (n, r, l, s, m) => {
-        var c;
-        if (r === "dataPicking" && (l != null && l.target)) {
-          const u = `${l.target}_dataPicking`;
-          ((c = l.rules) == null ? void 0 : c.some(
+      convertTo: (n, r, s, l, m) => {
+        var a;
+        if (r === "dataPicking" && (s != null && s.target)) {
+          const u = `${s.target}_dataPicking`;
+          ((a = s.rules) == null ? void 0 : a.some(
             (o) => o.id === u && o.value
           )) ? n.dictPickingExpressionId = u : delete n.dictPickingExpressionId;
         }
-        s.updateExpression(l);
+        l.updateExpression(s);
       }
     }));
     this.formSchemaService = t;
@@ -920,11 +901,11 @@ class ye {
     const n = this.formSchemaService.getExpressions();
     if (!n)
       return "";
-    const r = n.find((s) => s.target === t);
+    const r = n.find((l) => l.target === t);
     if (!r)
       return "";
-    const l = r.rules.find((s) => s.type === e);
-    return l || "";
+    const s = r.rules.find((l) => l.type === e);
+    return s || "";
   }
   // 获取上下文表单变量
   getContextFormVariables() {
@@ -935,12 +916,12 @@ class ye {
     if (!n || !n.states || n.states.length === 0)
       return [];
     const r = [];
-    return n.states.filter((l) => l.category === "remote").forEach((l) => {
+    return n.states.filter((s) => s.category === "remote").forEach((s) => {
       r.push({
-        key: l.code,
-        name: l.name,
-        description: l.name,
-        category: l.category
+        key: s.code,
+        name: s.name,
+        description: s.name,
+        category: s.category
       });
     }), r;
   }
@@ -957,11 +938,11 @@ class ye {
     const n = [];
     return t == null || t.forEach((r) => {
       var m;
-      const l = this.createTreeNode(r, e);
-      let s = [];
-      (m = r.type) != null && m.fields && (s = this.buildEntityFieldsTreeData(r.type.fields, [...e, r.label])), n.push({
-        data: l,
-        children: s,
+      const s = this.createTreeNode(r, e);
+      let l = [];
+      (m = r.type) != null && m.fields && (l = this.buildEntityFieldsTreeData(r.type.fields, [...e, r.label])), n.push({
+        data: s,
+        children: l,
         expanded: !0
       });
     }), n;
@@ -969,13 +950,13 @@ class ye {
   buildChildEntityTreeData(t = null, e) {
     const n = [];
     return t == null || t.forEach((r) => {
-      var c, u;
-      const l = this.createTreeNode(r, e);
-      l.type = "entity";
-      const s = this.buildEntityFieldsTreeData((c = r.type) == null ? void 0 : c.fields, [...e, r.label]), m = this.buildChildEntityTreeData((u = r.type) == null ? void 0 : u.entities, [...e, r.label]);
-      m != null && m.length && (s == null || s.push(...m)), n.push({
-        data: l,
-        children: s || [],
+      var a, u;
+      const s = this.createTreeNode(r, e);
+      s.type = "entity";
+      const l = this.buildEntityFieldsTreeData((a = r.type) == null ? void 0 : a.fields, [...e, r.label]), m = this.buildChildEntityTreeData((u = r.type) == null ? void 0 : u.entities, [...e, r.label]);
+      m != null && m.length && (l == null || l.push(...m)), n.push({
+        data: s,
+        children: l || [],
         // 空值回退
         expanded: !0
       });
@@ -1015,86 +996,86 @@ class ye {
     };
   }
   onBeforeOpenExpression(t, e, n) {
-    const r = n === "Field" ? t.binding.field : t.id, l = this.getExpressionRule(r, e), s = this.getEntitiesAndVariables(), m = {
-      message: ["validate", "required", "dataPicking"].includes(e) && l ? l.message : "",
-      ...s
+    const r = n === "Field" ? t.binding.field : t.id, s = this.getExpressionRule(r, e), l = this.getEntitiesAndVariables(), m = {
+      message: ["validate", "required", "dataPicking"].includes(e) && s ? s.message : "",
+      ...l
     };
-    return l.messageType != null && (m.messageType = l.messageType), m;
+    return s.messageType != null && (m.messageType = s.messageType), m;
   }
   buildRule(t, e, n, r) {
-    const { expression: l, message: s, messageType: m } = e, c = {
+    const { expression: s, message: l, messageType: m } = e, a = {
       id: `${t}_${n}`,
       type: n,
-      value: l
+      value: s
     };
-    return (n === "validate" || n === "dataPicking" || n === "required") && (c.message = s), n === "dataPicking" && (c.messageType = m), n === "validate" && r && (c.elementId = r), c;
+    return (n === "validate" || n === "dataPicking" || n === "required") && (a.message = l), n === "dataPicking" && (a.messageType = m), n === "validate" && r && (a.elementId = r), a;
   }
   getExpressionData() {
     const { expressions: t } = this.formSchemaService.getFormSchema().module;
     return t || [];
   }
   updateExpression(t, e, n, r) {
-    const l = e === "Field" ? t.binding.field : t.id, s = this.buildRule(l, n, r, t.type === "form-group" ? t.id : "");
-    let c = this.getExpressionData().find((f) => f.targetType === e && f.target === l);
-    const u = (f) => f.value.trim() === "";
-    if (c) {
-      const f = c.rules.find((o) => o.id === s.id);
-      if (f)
-        u(s) ? c.rules = c.rules.filter((o) => o.id !== s.id) : (Object.assign(f, s), r === "validate" && t.type === "form-group" && (f.elementId = t.id));
+    const s = e === "Field" ? t.binding.field : t.id, l = this.buildRule(s, n, r, t.type === "form-group" ? t.id : "");
+    let a = this.getExpressionData().find((c) => c.targetType === e && c.target === s);
+    const u = (c) => c.value.trim() === "";
+    if (a) {
+      const c = a.rules.find((o) => o.id === l.id);
+      if (c)
+        u(l) ? a.rules = a.rules.filter((o) => o.id !== l.id) : (Object.assign(c, l), r === "validate" && t.type === "form-group" && (c.elementId = t.id));
       else {
-        if (u(s))
+        if (u(l))
           return null;
-        c.rules = c.rules || [], c.rules.push(s);
+        a.rules = a.rules || [], a.rules.push(l);
       }
     } else {
-      if (u(s))
+      if (u(l))
         return null;
-      c = {
-        target: `${l}`,
-        rules: [s],
+      a = {
+        target: `${s}`,
+        rules: [l],
         targetType: e
       };
     }
-    return c;
+    return a;
   }
   getExpressionEditorOptions(t, e, n, r) {
-    return n.reduce((l, s) => {
-      var c, u;
-      const m = e === "Field" ? (c = t == null ? void 0 : t.binding) == null ? void 0 : c.field : t.id;
-      return l[s] = {
+    return n.reduce((s, l) => {
+      var a, u;
+      const m = e === "Field" ? (a = t == null ? void 0 : t.binding) == null ? void 0 : a.field : t.id;
+      return s[l] = {
         hide: e === "Field" ? !!((u = t == null ? void 0 : t.binding) != null && u.field) : !1,
         description: "",
-        title: this.expressionNames[s],
+        title: this.expressionNames[l],
         type: "string",
         $converter: this.getExpressionConverter(m),
         refreshPanelAfterChanged: !0,
         editor: {
           type: "expression-editor",
           singleExpand: !1,
-          dialogTitle: `${this.expressionNames[s]}编辑器`,
-          showMessage: s === "validate" || s === "dataPicking" || s === "required",
-          showMessageType: s === "dataPicking",
-          beforeOpen: () => this.onBeforeOpenExpression(t, s, e),
-          onSubmitModal: (f) => {
-            const o = this.updateExpression(t, e, f, s);
+          dialogTitle: `${this.expressionNames[l]}编辑器`,
+          showMessage: l === "validate" || l === "dataPicking" || l === "required",
+          showMessageType: l === "dataPicking",
+          beforeOpen: () => this.onBeforeOpenExpression(t, l, e),
+          onSubmitModal: (c) => {
+            const o = this.updateExpression(t, e, c, l);
             if (r) {
-              const d = this.buildRule(m, f, s);
+              const d = this.buildRule(m, c, l);
               r(d);
             }
             return o;
           }
         }
-      }, l;
+      }, s;
     }, {});
   }
   getExpressionInfo(t, e, n) {
-    const r = e === "Field" ? t.binding.field : t.id, l = this.getExpressionRule(r, n), s = {
-      value: l && l.value,
+    const r = e === "Field" ? t.binding.field : t.id, s = this.getExpressionRule(r, n), l = {
+      value: s && s.value,
       targetId: r,
       targetType: e,
       expressionType: n
     };
-    return l && l.message && (s.message = l.message), s;
+    return s && s.message && (l.message = s.message), l;
   }
   getExpressionConfig(t, e, n = ["compute", "dependency", "validate"], r) {
     return {
@@ -1119,19 +1100,19 @@ class ye {
 }
 class Et {
   constructor(t, e) {
-    x(this, "componentId");
-    x(this, "viewModelId");
-    x(this, "eventsEditorUtils");
-    x(this, "formSchemaUtils");
-    x(this, "formMetadataConverter");
-    x(this, "designViewModelUtils");
-    x(this, "designViewModelField");
-    x(this, "controlCreatorUtils");
-    x(this, "designerHostService");
-    x(this, "designerContext");
-    x(this, "schemaService", null);
-    x(this, "metadataService", null);
-    x(this, "propertyConfig", {
+    S(this, "componentId");
+    S(this, "viewModelId");
+    S(this, "eventsEditorUtils");
+    S(this, "formSchemaUtils");
+    S(this, "formMetadataConverter");
+    S(this, "designViewModelUtils");
+    S(this, "designViewModelField");
+    S(this, "controlCreatorUtils");
+    S(this, "designerHostService");
+    S(this, "designerContext");
+    S(this, "schemaService", null);
+    S(this, "metadataService", null);
+    S(this, "propertyConfig", {
       type: "object",
       categories: {}
     });
@@ -1152,7 +1133,7 @@ class Et {
     if (e) {
       if (!this.designViewModelField) {
         const r = this.designViewModelUtils.getDgViewModel(this.viewModelId);
-        this.designViewModelField = r.fields.find((l) => l.id === e);
+        this.designViewModelField = r.fields.find((s) => s.id === e);
       }
       t.updateOn = (n = this.designViewModelField) == null ? void 0 : n.updateOn;
     }
@@ -1178,7 +1159,7 @@ class Et {
             valueField: "value",
             idField: "value",
             editable: !1,
-            data: [{ value: t.type, name: h[t.type] && h[t.type].name }]
+            data: [{ value: t.type, name: v[t.type] && v[t.type].name }]
           }
         }
       }
@@ -1188,7 +1169,7 @@ class Et {
     const r = {
       title: "外观",
       description: "Appearance"
-    }, l = {
+    }, s = {
       class: {
         title: "class样式",
         type: "string",
@@ -1204,21 +1185,21 @@ class Et {
         parentPropertyID: "appearance"
       }
     };
-    for (const s in e)
-      l[s] = Object.assign(l[s] || {}, e[s]);
+    for (const l in e)
+      s[l] = Object.assign(s[l] || {}, e[l]);
     return {
       ...r,
-      properties: { ...l },
-      setPropertyRelates(s, m) {
-        if (s) {
-          switch (s && s.propertyID) {
+      properties: { ...s },
+      setPropertyRelates(l, m) {
+        if (l) {
+          switch (l && l.propertyID) {
             case "class":
             case "style": {
-              _.value++;
+              Z.value++;
               break;
             }
           }
-          n && n(s, t, m);
+          n && n(l, t, m);
         }
       }
     };
@@ -1233,8 +1214,8 @@ class Et {
    * @param expressionType 指定表达式类型，存在属性和表达式类型不一致的情况
    * @returns 
    */
-  getPropertyEditorParams(t, e = [], n = "visible", r = {}, l = {}, s = "") {
-    const { getVariables: m, getControlName: c, getStateMachines: u } = It(this.designerHostService), f = this.getRealTargetType(t), o = e && e.length > 0 ? e : ["Const", "Variable", "StateMachine", "Expression"], d = {
+  getPropertyEditorParams(t, e = [], n = "visible", r = {}, s = {}, l = "") {
+    const { getVariables: m, getControlName: a, getStateMachines: u } = It(this.designerHostService), c = this.getRealTargetType(t), o = e && e.length > 0 ? e : ["Const", "Variable", "StateMachine", "Expression"], d = {
       type: "property-editor",
       propertyTypes: o
     };
@@ -1247,30 +1228,30 @@ class Et {
           }, r);
           break;
         case "Expression":
-          d.expressionConfig = this.getExpressionOptions(t, f, s || n);
+          d.expressionConfig = this.getExpressionOptions(t, c, l || n);
           break;
         case "StateMachine":
           d.stateMachines = u();
           break;
         case "Variable":
           Object.assign(d, {
-            controlName: c(t),
+            controlName: a(t),
             newVariablePrefix: "is",
             newVariableType: "Boolean",
             variables: m(this.viewModelId),
             parentComponentId: this.componentId === "root-component" ? "" : "root-component",
-            onBeforeOpenVariables: (a) => {
-              a.value = m(this.viewModelId);
+            onBeforeOpenVariables: (f) => {
+              f.value = m(this.viewModelId);
             }
-          }, l), this.designerContext.designerMode === "PC_RTC" && (d.newVariablePrefix = "ext_" + d.newVariablePrefix);
+          }, s), this.designerContext.designerMode === "PC_RTC" && (d.newVariablePrefix = "ext_" + d.newVariablePrefix);
           break;
       }
     }), d;
   }
   getVisibleProperty(t, e = "") {
-    var l;
+    var s;
     let n = ["Const", "Variable", "StateMachine", "Expression"];
-    return e === "gridFieldEditor" ? n = ["Const", "Expression"] : e === "form-group" && !((l = t.binding) != null && l.field) && (n = ["Const", "Variable", "StateMachine"]), {
+    return e === "gridFieldEditor" ? n = ["Const", "Expression"] : e === "form-group" && !((s = t.binding) != null && s.field) && (n = ["Const", "Variable", "StateMachine"]), {
       visible: {
         title: "是否可见",
         type: "boolean",
@@ -1286,26 +1267,26 @@ class Et {
    * @returns 
    */
   getBehaviorConfig(t, e = "", n = {}, r) {
-    const l = {
+    const s = {
       title: "行为",
       description: ""
-    }, s = this.getVisibleProperty(t, e);
-    for (const c in n)
-      s[c] = Object.assign(s[c] || {}, n[c]);
+    }, l = this.getVisibleProperty(t, e);
+    for (const a in n)
+      l[a] = Object.assign(l[a] || {}, n[a]);
     const m = this;
     return {
-      ...l,
-      properties: { ...s },
-      setPropertyRelates(c, u) {
-        if (c) {
-          switch (c.propertyID) {
+      ...s,
+      properties: { ...l },
+      setPropertyRelates(a, u) {
+        if (a) {
+          switch (a.propertyID) {
             case "disabled":
             case "readonly":
             case "visible":
-              m.afterMutilEditorChanged(t, c);
+              m.afterMutilEditorChanged(t, a);
               break;
           }
-          r && r(c, u);
+          r && r(a, u);
         }
       }
     };
@@ -1328,8 +1309,8 @@ class Et {
     const n = e && e.parent && e.parent.schema;
     if (!n)
       return;
-    const r = n.contents.findIndex((s) => s.id === t), l = z(n.contents[r]);
-    n.contents.splice(r, 1), n.contents.splice(r, 0, l), Ge();
+    const r = n.contents.findIndex((l) => l.id === t), s = H(n.contents[r]);
+    n.contents.splice(r, 1), n.contents.splice(r, 0, s), ze();
   }
   /**
    * 属性编辑器，在编辑过程中会新增变量，此处需要将新增的变量追加到ViewModel中
@@ -1341,7 +1322,7 @@ class Et {
     const n = t.propertyValue;
     if (!(n && typeof n == "object") || !(n.type === "Variable" && n.isNewVariable))
       return;
-    const s = {
+    const l = {
       id: n.field,
       category: "locale",
       code: n.fullPath,
@@ -1349,7 +1330,7 @@ class Et {
       type: n.newVariableType || "String",
       isRtcVariable: this.designerContext.designerMode === "PC_RTC" ? !0 : void 0
     };
-    delete n.newVariableType, delete n.isNewVariable, this.formSchemaUtils.getVariableByCode(s.code) || this.formSchemaUtils.getViewModelById("root-viewmodel").states.push(s);
+    delete n.newVariableType, delete n.isNewVariable, this.formSchemaUtils.getVariableByCode(l.code) || this.formSchemaUtils.getViewModelById("root-viewmodel").states.push(l);
   }
   /**
    * 更新表达式到expressions节点
@@ -1359,17 +1340,17 @@ class Et {
     const e = t.propertyValue;
     if (!((e && e.type) === "Expression" && e.expressionInfo))
       return;
-    const { expressionId: l, expressionInfo: s } = e, { targetId: m, targetType: c, expressionType: u, value: f, message: o } = s, d = this.formSchemaUtils.getModule();
+    const { expressionId: s, expressionInfo: l } = e, { targetId: m, targetType: a, expressionType: u, value: c, message: o } = l, d = this.formSchemaUtils.getModule();
     d.expressions = d.expressions || [];
     const { expressions: g } = d;
-    let a = g.find((v) => v.target === m);
-    a || (a = { target: m, rules: [], targetType: c }, g.push(a));
-    const p = a.rules.find((v) => v.type === u);
+    let f = g.find((h) => h.target === m);
+    f || (f = { target: m, rules: [], targetType: a }, g.push(f));
+    const p = f.rules.find((h) => h.type === u);
     if (p)
-      p.value = f, p.message = o;
+      p.value = c, p.message = o;
     else {
-      const v = { id: l, type: u, value: f, message: o };
-      a.rules.push(v);
+      const h = { id: s, type: u, value: c, message: o };
+      f.rules.push(h);
     }
     delete e.expressionInfo;
   }
@@ -1383,14 +1364,14 @@ class Et {
     const n = t.propertyValue;
     if (n && n.type === "Expression")
       return;
-    const l = t.propertyID, s = this.formSchemaUtils.getExpressions(), m = e.binding ? e.binding.field : e.id, c = s.find((u) => u.target === m);
-    !c || !c.rules || (c.rules = c.rules.filter((u) => u.type !== l));
+    const s = t.propertyID, l = this.formSchemaUtils.getExpressions(), m = e.binding ? e.binding.field : e.id, a = l.find((u) => u.target === m);
+    !a || !a.rules || (a.rules = a.rules.filter((u) => u.type !== s));
   }
   getExpressionOptions(t, e, n) {
-    return new ye(this.formSchemaUtils).getExpressionOptions(t, e, n);
+    return new we(this.formSchemaUtils).getExpressionOptions(t, e, n);
   }
   getRealTargetType(t) {
-    return ["response-toolbar-item", "tab-toolbar-item", "section-toolbar-item"].indexOf(t.type) > -1 ? "Button" : t.binding && t.binding.field ? "Field" : "Container";
+    return ["response-toolbar-item", "tab-toolbar-item", "section-toolbar-item", "drawer-toolbar-item"].indexOf(t.type) > -1 ? "Button" : t.binding && t.binding.field ? "Field" : "Container";
   }
   createBaseEventProperty(t) {
     const e = {};
@@ -1406,17 +1387,17 @@ class Et {
     }, e;
   }
 }
-const q = class q {
+const z = class z {
   /**
    * 根据绑定字段类型获取可用的输入类控件
    */
   static getEditorTypesByMDataType(t, e = !1, n = "") {
     if (e)
-      return [{ key: h["language-textbox"].type, value: h["language-textbox"].name }];
-    let r = q.fieldControlTypeMapping[t];
+      return [{ key: v["language-textbox"].type, value: v["language-textbox"].name }];
+    let r = z.fieldControlTypeMapping[t];
     if (n === "data-grid-column" && (r != null && r.length)) {
-      const l = [h["check-group"].type, h["radio-group"].type, h.image.type];
-      r = r.filter((s) => !l.includes(s.key));
+      const s = [v["check-group"].type, v["radio-group"].type, v.image.type, v["rich-text-editor"].type];
+      r = r.filter((l) => !s.includes(l.key));
     }
     return r;
   }
@@ -1425,8 +1406,8 @@ const q = class q {
    */
   static getAllInputTypes() {
     const t = [];
-    for (const e in q.fieldControlTypeMapping)
-      q.fieldControlTypeMapping[e].forEach((n) => {
+    for (const e in z.fieldControlTypeMapping)
+      z.fieldControlTypeMapping[e].forEach((n) => {
         t.find((r) => r.key === n.key && r.value === n.value) || t.push({ key: n.key, value: n.value });
       });
     return t;
@@ -1436,189 +1417,189 @@ const q = class q {
    * @param control 控件元数据
    */
   static mappingDomPropAndSchemaProp(t, e) {
-    var l;
-    const n = (l = t.editor) == null ? void 0 : l.type, r = [];
-    return (t.type === h["data-grid-column"].type || t.type === h["tree-grid-column"].type) && e && e.categoryId && e.categoryId.indexOf("gridFieldEditor") < 0 && r.push({ domField: "title", schemaField: "name" }), r.push({ domField: "label", schemaField: "name" }), r.push({ domField: "editor.required", schemaField: "require" }), r.push({ domField: "editor.readonly", schemaField: "readonly" }), (n === h["input-group"].type || n === h.textarea.type || n === h["number-spinner"].type) && r.push({ domField: "editor.maxLength", schemaField: "type.length" }), n === h["number-spinner"].type && r.push({ domField: "editor.precision", schemaField: "type.precision" }), (t.type === h["data-grid-column"].type || t.type === h["tree-grid-column"].type) && r.push({ domField: "formatter.precision", schemaField: "type.precision" }), (n === h["combo-list"].type || n === h["radio-group"].type) && r.push({ domField: "editor.data", schemaField: "type.enumValues" }), (t.type === h["data-grid-column"].type || t.type === h["tree-grid-column"].type) && r.push({ domField: "formatter.data", schemaField: "type.enumValues" }), n === h["date-picker"].type && (r.push({ domField: "editor.displayFormat", schemaField: "editor.format" }), r.push({ domField: "editor.fieldType", schemaField: "type.name" })), n === h["number-spinner"].type && (r.push({ domField: "editor.max", schemaField: "editor.maxValue" }), r.push({ domField: "editor.min", schemaField: "editor.minValue" })), n === h.lookup.type && (r.push({ domField: "editor.dataSource", schemaField: "editor.dataSource" }), r.push({ domField: "editor.valueField", schemaField: "editor.valueField" }), r.push({ domField: "editor.textField", schemaField: "editor.textField" }), r.push({ domField: "editor.displayType", schemaField: "editor.displayType" }), r.push({ domField: "editor.mapFields", schemaField: "editor.mapFields" }), r.push({ domField: "editor.helpId", schemaField: "editor.helpId" })), r.push({ domField: "path", schemaField: "bindingPath" }), r.push({ domField: "binding.path", schemaField: "bindingField" }), r.push({ domField: "binding.fullPath", schemaField: "path" }), (t.type === h["data-grid-column"].type || t.type === h["tree-grid-column"].type) && r.push({ domField: "field", schemaField: "bindingPath" }), r;
+    var s;
+    const n = (s = t.editor) == null ? void 0 : s.type, r = [];
+    return (t.type === v["data-grid-column"].type || t.type === v["tree-grid-column"].type) && e && e.categoryId && e.categoryId.indexOf("gridFieldEditor") < 0 && r.push({ domField: "title", schemaField: "name" }), r.push({ domField: "label", schemaField: "name" }), r.push({ domField: "editor.required", schemaField: "require" }), r.push({ domField: "editor.readonly", schemaField: "readonly" }), (n === v["input-group"].type || n === v.textarea.type || n === v["number-spinner"].type) && r.push({ domField: "editor.maxLength", schemaField: "type.length" }), n === v["number-spinner"].type && r.push({ domField: "editor.precision", schemaField: "type.precision" }), (t.type === v["data-grid-column"].type || t.type === v["tree-grid-column"].type) && r.push({ domField: "formatter.precision", schemaField: "type.precision" }), (n === v["combo-list"].type || n === v["radio-group"].type) && r.push({ domField: "editor.data", schemaField: "type.enumValues" }), (t.type === v["data-grid-column"].type || t.type === v["tree-grid-column"].type) && r.push({ domField: "formatter.data", schemaField: "type.enumValues" }), n === v["date-picker"].type && (r.push({ domField: "editor.displayFormat", schemaField: "editor.format" }), r.push({ domField: "editor.fieldType", schemaField: "type.name" })), n === v["number-spinner"].type && (r.push({ domField: "editor.max", schemaField: "editor.maxValue" }), r.push({ domField: "editor.min", schemaField: "editor.minValue" })), n === v.lookup.type && (r.push({ domField: "editor.dataSource", schemaField: "editor.dataSource" }), r.push({ domField: "editor.valueField", schemaField: "editor.valueField" }), r.push({ domField: "editor.textField", schemaField: "editor.textField" }), r.push({ domField: "editor.displayType", schemaField: "editor.displayType" }), r.push({ domField: "editor.mapFields", schemaField: "editor.mapFields" }), r.push({ domField: "editor.helpId", schemaField: "editor.helpId" })), r.push({ domField: "path", schemaField: "bindingPath" }), r.push({ domField: "binding.path", schemaField: "bindingField" }), r.push({ domField: "binding.fullPath", schemaField: "path" }), (t.type === v["data-grid-column"].type || t.type === v["tree-grid-column"].type) && r.push({ domField: "field", schemaField: "bindingPath" }), r;
   }
 };
 /**
  * <字段类型,可配置的控件类型列表>的映射
  */
-x(q, "fieldControlTypeMapping", {
+S(z, "fieldControlTypeMapping", {
   String: [
-    { key: h["input-group"].type, value: h["input-group"].name },
-    { key: h.lookup.type, value: h.lookup.name },
-    { key: h.image.type, value: h.image.name },
-    { key: h["date-picker"].type, value: h["date-picker"].name },
-    { key: h.switch.type, value: h.switch.name },
-    { key: h["check-box"].type, value: h["check-box"].name },
-    { key: h["check-group"].type, value: h["check-group"].name },
-    { key: h["radio-group"].type, value: h["radio-group"].name },
-    { key: h["combo-list"].type, value: h["combo-list"].name },
-    { key: h.textarea.type, value: h.textarea.name },
-    { key: h["time-picker"].type, value: h["time-picker"].name }
+    { key: v["input-group"].type, value: v["input-group"].name },
+    { key: v.lookup.type, value: v.lookup.name },
+    { key: v.image.type, value: v.image.name },
+    { key: v["date-picker"].type, value: v["date-picker"].name },
+    { key: v.switch.type, value: v.switch.name },
+    { key: v["check-box"].type, value: v["check-box"].name },
+    { key: v["check-group"].type, value: v["check-group"].name },
+    { key: v["radio-group"].type, value: v["radio-group"].name },
+    { key: v["combo-list"].type, value: v["combo-list"].name },
+    { key: v.textarea.type, value: v.textarea.name },
+    { key: v["time-picker"].type, value: v["time-picker"].name }
   ],
   Text: [
-    { key: h.textarea.type, value: h.textarea.name },
-    { key: h.lookup.type, value: h.lookup.name },
-    { key: h.image.type, value: h.image.name },
-    { key: h["rich-text-editor"].type, value: h["rich-text-editor"].name }
+    { key: v.textarea.type, value: v.textarea.name },
+    { key: v.lookup.type, value: v.lookup.name },
+    { key: v.image.type, value: v.image.name },
+    { key: v["rich-text-editor"].type, value: v["rich-text-editor"].name }
   ],
   Decimal: [
-    { key: h["number-spinner"].type, value: h["number-spinner"].name }
+    { key: v["number-spinner"].type, value: v["number-spinner"].name }
   ],
   Integer: [
-    { key: h["number-spinner"].type, value: h["number-spinner"].name }
+    { key: v["number-spinner"].type, value: v["number-spinner"].name }
   ],
   Number: [
-    { key: h["number-spinner"].type, value: h["number-spinner"].name },
-    { key: h.switch.type, value: h.switch.name },
-    { key: h["check-box"].type, value: h["check-box"].name }
+    { key: v["number-spinner"].type, value: v["number-spinner"].name },
+    { key: v.switch.type, value: v.switch.name },
+    { key: v["check-box"].type, value: v["check-box"].name }
   ],
   BigNumber: [
-    { key: h["number-spinner"].type, value: h["number-spinner"].name }
+    { key: v["number-spinner"].type, value: v["number-spinner"].name }
   ],
   Date: [
-    { key: h["date-picker"].type, value: h["date-picker"].name }
+    { key: v["date-picker"].type, value: v["date-picker"].name }
   ],
   DateTime: [
-    { key: h["date-picker"].type, value: h["date-picker"].name }
+    { key: v["date-picker"].type, value: v["date-picker"].name }
   ],
   Boolean: [
-    { key: h.switch.type, value: h.switch.name },
-    { key: h["check-box"].type, value: h["check-box"].name }
+    { key: v.switch.type, value: v.switch.name },
+    { key: v["check-box"].type, value: v["check-box"].name }
   ],
   Enum: [
-    { key: h["combo-list"].type, value: h["combo-list"].name },
-    { key: h["radio-group"].type, value: h["radio-group"].name }
+    { key: v["combo-list"].type, value: v["combo-list"].name },
+    { key: v["radio-group"].type, value: v["radio-group"].name }
   ],
   Object: [
-    { key: h.lookup.type, value: h.lookup.name },
-    { key: h["combo-list"].type, value: h["combo-list"].name },
-    { key: h["radio-group"].type, value: h["radio-group"].name }
+    { key: v.lookup.type, value: v.lookup.name },
+    { key: v["combo-list"].type, value: v["combo-list"].name },
+    { key: v["radio-group"].type, value: v["radio-group"].name }
   ]
 });
-let J = q;
-var X = /* @__PURE__ */ ((i) => (i.Form = "Form", i.Variable = "Variable", i))(X || {});
-class St {
+let Y = z;
+var J = /* @__PURE__ */ ((i) => (i.Form = "Form", i.Variable = "Variable", i))(J || {});
+class xt {
   constructor() {
     /** 控件标题 */
-    x(this, "label", "");
+    S(this, "label", "");
     /** 控件id */
-    x(this, "id", "");
+    S(this, "id", "");
     /** 每个控件占用的栅格数 */
-    x(this, "columnInSM", 12);
-    x(this, "columnInMD", 6);
-    x(this, "columnInLG", 3);
-    x(this, "columnInEL", 2);
+    S(this, "columnInSM", 12);
+    S(this, "columnInMD", 6);
+    S(this, "columnInLG", 3);
+    S(this, "columnInEL", 2);
     /** 每个控件占用的列数 */
-    x(this, "displayWidthInSM", 1);
-    x(this, "displayWidthInMD", 1);
-    x(this, "displayWidthInLG", 1);
-    x(this, "displayWidthInEL", 1);
+    S(this, "displayWidthInSM", 1);
+    S(this, "displayWidthInMD", 1);
+    S(this, "displayWidthInLG", 1);
+    S(this, "displayWidthInEL", 1);
     /** 编辑器内部默认显示的屏幕大小-----可以去掉 */
-    x(this, "displayColumnCountAtBreakPoint", "md");
+    S(this, "displayColumnCountAtBreakPoint", "md");
     /** 控件所在行，传0即可-----编辑器内部使用 */
-    x(this, "tagRow", 0);
+    S(this, "tagRow", 0);
     /** 控件是否显示上方空白：传0即可-----编辑器内部使用 */
-    x(this, "showTopBorder", 0);
+    S(this, "showTopBorder", 0);
     /** 区域，从1开始。卡片内的控件从上往下，从左往右划分区域，遇到分组fieldSet时group+1，分组结束后group+1 */
-    x(this, "group", 1);
+    S(this, "group", 1);
     /** 控件是否符合标准的class配置(设计器用的) */
-    x(this, "isSupportedClass", !0);
+    S(this, "isSupportedClass", !0);
     /** 控件所在分组id(设计器用的) */
-    x(this, "fieldSetId", "");
+    S(this, "fieldSetId", "");
   }
 }
-function xt(i) {
+function St(i) {
   let t, e;
   const n = /* @__PURE__ */ new Map();
   let r = [];
-  function l(f, o) {
-    const g = f.split(" ").filter((w) => w.startsWith("col-"));
+  function s(c, o) {
+    const g = c.split(" ").filter((C) => C.startsWith("col-"));
     if (g.length === 0) {
       o.isSupportedClass = !1;
       return;
     }
-    let a = g.find((w) => /^col-([1-9]|10|11|12)$/.test(w)), p = g.find((w) => /^col-md-([1-9]|10|11|12)$/.test(w)), v = g.find((w) => /^col-xl-([1-9]|10|11|12)$/.test(w)), y = g.find((w) => /^col-el-([1-9]|10|11|12)$/.test(w));
-    a = a || "col-12", o.columnInSM = parseInt(a.replace("col-", ""), 10), o.displayWidthInSM = o.columnInSM / 12, o.displayWidthInSM !== 1 && (o.isSupportedClass = !1), p = p || "col-md-" + o.columnInSM, o.columnInMD = parseInt(p.replace("col-md-", ""), 10), o.displayWidthInMD = o.columnInMD / 6, [1, 2].includes(o.displayWidthInMD) || (o.isSupportedClass = !1), v = v || "col-xl-" + o.columnInMD, o.columnInLG = parseInt(v.replace("col-xl-", ""), 10), o.displayWidthInLG = o.columnInLG / 3, [1, 2, 3, 4].includes(o.displayWidthInLG) || (o.isSupportedClass = !1), y = y || "col-el-" + o.columnInLG, o.columnInEL = parseInt(y.replace("col-el-", ""), 10), o.displayWidthInEL = o.columnInEL / 2, [1, 2, 3, 4, 5, 6].includes(o.displayWidthInEL) || (o.isSupportedClass = !1);
+    let f = g.find((C) => /^col-([1-9]|10|11|12)$/.test(C)), p = g.find((C) => /^col-md-([1-9]|10|11|12)$/.test(C)), h = g.find((C) => /^col-xl-([1-9]|10|11|12)$/.test(C)), y = g.find((C) => /^col-el-([1-9]|10|11|12)$/.test(C));
+    f = f || "col-12", o.columnInSM = parseInt(f.replace("col-", ""), 10), o.displayWidthInSM = o.columnInSM / 12, o.displayWidthInSM !== 1 && (o.isSupportedClass = !1), p = p || "col-md-" + o.columnInSM, o.columnInMD = parseInt(p.replace("col-md-", ""), 10), o.displayWidthInMD = o.columnInMD / 6, [1, 2].includes(o.displayWidthInMD) || (o.isSupportedClass = !1), h = h || "col-xl-" + o.columnInMD, o.columnInLG = parseInt(h.replace("col-xl-", ""), 10), o.displayWidthInLG = o.columnInLG / 3, [1, 2, 3, 4].includes(o.displayWidthInLG) || (o.isSupportedClass = !1), y = y || "col-el-" + o.columnInLG, o.columnInEL = parseInt(y.replace("col-el-", ""), 10), o.displayWidthInEL = o.columnInEL / 2, [1, 2, 3, 4, 5, 6].includes(o.displayWidthInEL) || (o.isSupportedClass = !1);
   }
-  function s(f, o, d, g = !1) {
-    let a = !1;
-    f.contents.forEach((p) => {
+  function l(c, o, d, g = !1) {
+    let f = !1;
+    c.contents.forEach((p) => {
       if (p.type === "fieldset") {
-        d += 1, s(p, o, d, !0), a = !0;
+        d += 1, l(p, o, d, !0), f = !0;
         return;
       }
-      a && (d += 1, a = !1);
-      const v = p.appearance && p.appearance.class, y = new St();
-      v ? l(v, y) : y.isSupportedClass = !1, y.label = p.label || p.id, y.id = p.id, y.group = d, g && (y.fieldSetId = f.id), e === p.id && (t = d), n.set(p.id, p), o.push(y);
+      f && (d += 1, f = !1);
+      const h = p.appearance && p.appearance.class, y = new xt();
+      h ? s(h, y) : y.isSupportedClass = !1, y.label = p.label || p.id, y.id = p.id, y.group = d, g && (y.fieldSetId = c.id), e === p.id && (t = d), n.set(p.id, p), o.push(y);
     });
   }
-  function m(f) {
-    const o = i.getComponentById(f);
+  function m(c) {
+    const o = i.getComponentById(c);
     if (!o || !o.componentType || !o.componentType.startsWith("form"))
       return { result: !1, message: "只可以在响应式表单组件中调整响应式布局配置" };
-    const d = i.selectNode(o, (g) => g.type === h["response-form"].type);
+    const d = i.selectNode(o, (g) => g.type === v["response-form"].type);
     return !d || !d.contents || d.contents.length === 0 ? { result: !1, message: "Form区域内没有控件，请先添加控件" } : { result: !0, message: "", formNode: d };
   }
-  function c(f, o) {
-    o = o || f.id;
-    const { result: d, message: g, formNode: a } = m(o);
+  function a(c, o) {
+    o = o || c.id;
+    const { result: d, message: g, formNode: f } = m(o);
     if (!d)
       return { result: d, message: g };
-    e = f.id, r = [], n.clear();
-    const p = a.contents[0].type === h.fieldset.type ? 0 : 1;
-    s(a, r, p);
-    const v = r.find((w) => !w.isSupportedClass);
+    e = c.id, r = [], n.clear();
+    const p = f.contents[0].type === v.fieldset.type ? 0 : 1;
+    l(f, r, p);
+    const h = r.find((C) => !C.isSupportedClass);
     return {
       defaultState: {
         defaultGroupNumber: t || 1,
-        model: v ? "customize" : "standard"
+        model: h ? "customize" : "standard"
       },
       importData: r
     };
   }
-  function u(f, o) {
+  function u(c, o) {
     o = o;
     const { result: d, formNode: g } = m(o);
     if (!d)
       return "";
-    const a = [];
-    return f.forEach((p) => {
-      var w;
-      const v = n.get(p.id), y = v.appearance && v.appearance.class;
+    const f = [];
+    return c.forEach((p) => {
+      var C;
+      const h = n.get(p.id), y = h.appearance && h.appearance.class;
       if (y) {
-        const V = y.split(" ").filter((S) => !S.startsWith("col-")), M = "col-" + p.columnInSM, k = "col-md-" + p.columnInMD, N = "col-xl-" + p.columnInLG, L = "col-el-" + p.columnInEL, b = [M, k, N, L].concat(V);
-        v.appearance.class = b.join(" ");
+        const B = y.split(" ").filter((F) => !F.startsWith("col-")), M = "col-" + p.columnInSM, k = "col-md-" + p.columnInMD, A = "col-xl-" + p.columnInLG, O = "col-el-" + p.columnInEL, T = [M, k, A, O].concat(B);
+        h.appearance.class = T.join(" ");
       }
       if (p.fieldSetId) {
-        const T = g.contents.find((M) => M.id === p.fieldSetId), V = a.find((M) => M.id === p.fieldSetId);
-        V ? (w = V.contents) == null || w.push(v) : (a.push(T), T.contents = [v]);
+        const V = g.contents.find((M) => M.id === p.fieldSetId), B = f.find((M) => M.id === p.fieldSetId);
+        B ? (C = B.contents) == null || C.push(h) : (f.push(V), V.contents = [h]);
       } else
-        a.push(v);
-    }), g.contents = a, g.id;
+        f.push(h);
+    }), g.contents = f, g.id;
   }
   return {
     checkCanFindFormNode: m,
-    checkCanOpenLayoutEditor: c,
+    checkCanOpenLayoutEditor: a,
     changeFormControlsByResponseLayoutConfig: u,
-    getResonseFormLayoutConfig: s
+    getResonseFormLayoutConfig: l
   };
 }
 class Mt extends Et {
   constructor(e, n) {
     super(e, n);
-    x(this, "responseLayoutEditorFunction");
+    S(this, "responseLayoutEditorFunction");
     /** 控件绑定的变量 */
-    x(this, "bindingVarible");
-    x(this, "numberEditorOptions", {
+    S(this, "bindingVarible");
+    S(this, "numberEditorOptions", {
       type: "number-spinner",
       useThousands: !1,
       keyboard: !1,
       showButton: !1
     });
-    this.responseLayoutEditorFunction = xt(this.formSchemaUtils);
+    this.responseLayoutEditorFunction = St(this.formSchemaUtils);
   }
   getCommonPropertyConfig(e, n, r = "Card") {
     this.propertyConfig.categories.basic = this.getBasicProperties(e, n, r), this.propertyConfig.categories.appearance = this.getAppearanceProperties(e, n), this.propertyConfig.categories.behavior = this.getBehaviorConfig(e, "form-group");
@@ -1631,9 +1612,9 @@ class Mt extends Et {
   }
   getBasicProperties(e, n, r = "Card") {
     var u;
-    const l = this;
+    const s = this;
     this.setDesignViewModelField(e);
-    const { canChangeControlType: s, editorTypeList: m } = this.getAvailableEditorType(e), c = {
+    const { canChangeControlType: l, editorTypeList: m } = this.getAvailableEditorType(e), a = {
       description: "Basic Information",
       title: "基本信息",
       properties: {
@@ -1656,7 +1637,7 @@ class Mt extends Et {
             idField: "key",
             editable: !1,
             data: m,
-            readonly: !s
+            readonly: !l
           }
         },
         label: {
@@ -1692,25 +1673,25 @@ class Mt extends Et {
           readonly: this.formSchemaUtils.designerMode === "PC_RTC" && !e.isRtcControl
         }
       },
-      setPropertyRelates(f, o, d) {
-        if (f)
-          switch (f && f.propertyID) {
+      setPropertyRelates(c, o, d) {
+        if (c)
+          switch (c && c.propertyID) {
             case "type": {
-              l.changeControlType(e, f, n);
+              s.changeControlType(e, c, n);
               break;
             }
             case "label": {
-              f.needRefreshControlTree = !0;
+              c.needRefreshControlTree = !0;
               break;
             }
             case "binding": {
-              l.changeBindingField(e, f, d);
+              s.changeBindingField(e, c, d);
               break;
             }
           }
       }
     };
-    return r.toLocaleLowerCase() !== "card" && delete c.properties.showLabelType, c;
+    return r.toLocaleLowerCase() !== "card" && delete a.properties.showLabelType, a;
   }
   /**
    * 校验控件是否支持切换类型
@@ -1722,7 +1703,7 @@ class Mt extends Et {
     if (e.binding.type === "Variable") {
       if (this.bindingVarible = this.formSchemaUtils.getVariableById(e.binding.field), !this.bindingVarible)
         return !1;
-    } else if (!this.designViewModelField || this.designViewModelField.$type !== re.SimpleField)
+    } else if (!this.designViewModelField || this.designViewModelField.$type !== le.SimpleField)
       return !1;
     return !0;
   }
@@ -1730,18 +1711,18 @@ class Mt extends Et {
    * 获取可选的编辑器类型
    */
   getAvailableEditorType(e) {
-    var l;
+    var s;
     const n = this.checkCanChangeControlType(e, this.viewModelId);
     if (!n)
       return {
         canChangeControlType: !1,
         editorTypeList: [{
           key: e.editor.type,
-          value: ((l = h[e.editor.type]) == null ? void 0 : l.name) || e.editor.type
+          value: ((s = v[e.editor.type]) == null ? void 0 : s.name) || e.editor.type
         }]
       };
     let r = [];
-    return this.designViewModelField && this.designViewModelField.$type === re.SimpleField ? r = J.getEditorTypesByMDataType(this.designViewModelField.type.name, this.designViewModelField.multiLanguage) : this.bindingVarible && (r = J.getEditorTypesByMDataType(this.bindingVarible.type, this.designViewModelField.multiLanguage)), { canChangeControlType: n, editorTypeList: r };
+    return this.designViewModelField && this.designViewModelField.$type === le.SimpleField ? r = Y.getEditorTypesByMDataType(this.designViewModelField.type.name, this.designViewModelField.multiLanguage) : this.bindingVarible && (r = Y.getEditorTypesByMDataType(this.bindingVarible.type, this.designViewModelField.multiLanguage)), { canChangeControlType: n, editorTypeList: r };
   }
   changeBindingField(e, n, r) {
     n.needRefreshEntityTree = !0;
@@ -1785,17 +1766,17 @@ class Mt extends Et {
           }
         }
       },
-      setPropertyRelates(l, s) {
-        if (l)
-          switch (l && l.propertyID) {
+      setPropertyRelates(s, l) {
+        if (s)
+          switch (s && s.propertyID) {
             case "responseLayout":
-              r.responseLayoutEditorFunction.changeFormControlsByResponseLayoutConfig(l.propertyValue, r.componentId || e.id), r.updateUnifiedLayoutAfterResponseLayoutChanged(r.componentId), r.updateElementByParentContainer(e.id, n), delete e.responseLayout;
+              r.responseLayoutEditorFunction.changeFormControlsByResponseLayoutConfig(s.propertyValue, r.componentId || e.id), r.updateUnifiedLayoutAfterResponseLayoutChanged(r.componentId), r.updateElementByParentContainer(e.id, n), delete e.responseLayout;
               break;
             case "class":
-              r.updateUnifiedLayoutAfterControlChanged(l.propertyValue, e.id, this.componentId), _.value++;
+              r.updateUnifiedLayoutAfterControlChanged(s.propertyValue, e.id, this.componentId), Z.value++;
               break;
             case "style": {
-              _.value++;
+              Z.value++;
               break;
             }
           }
@@ -1811,47 +1792,47 @@ class Mt extends Et {
    * @param newControlType 新控件类型
    */
   changeControlType(e, n, r) {
-    const l = n.propertyValue, s = r && r.parent && r.parent.schema;
-    if (!s)
+    const s = n.propertyValue, l = r && r.parent && r.parent.schema;
+    if (!l)
       return;
-    const m = s.contents.findIndex((f) => f.id === e.id);
+    const m = l.contents.findIndex((c) => c.id === e.id);
     if (m === -1)
       return;
-    const c = s.contents[m];
+    const a = l.contents[m];
     let u;
     if (this.designViewModelField) {
-      const d = this.formSchemaUtils.getViewModelById(this.viewModelId).fields.find((a) => a.id === this.designViewModelField.id).fieldSchema || {};
-      d.editor || (d.editor = {}), d.editor.$type = l, this.designViewModelUtils.getDgViewModel(this.viewModelId).changeField(this.designViewModelField.id, d, !1), u = this.controlCreatorUtils.setFormFieldProperty(this.designViewModelField, l);
+      const d = this.formSchemaUtils.getViewModelById(this.viewModelId).fields.find((f) => f.id === this.designViewModelField.id).fieldSchema || {};
+      d.editor || (d.editor = {}), d.editor.$type = s, this.designViewModelUtils.getDgViewModel(this.viewModelId).changeField(this.designViewModelField.id, d, !1), u = this.controlCreatorUtils.setFormFieldProperty(this.designViewModelField, s);
     }
-    u || (u = this.controlCreatorUtils.createFormGroupWithoutField(l)), Object.assign(u, {
-      id: c.id,
-      appearance: c.appearance,
-      size: c.size,
-      label: c.label,
-      binding: c.binding
-    }), Object.prototype.hasOwnProperty.call(c, "visible") && Object.assign(u, { visible: c.visible }), c.editor && ["readonly", "required", "placeholder"].map((f) => {
-      Object.prototype.hasOwnProperty.call(c.editor, f) && (u.editor[f] = c.editor[f]);
-    }), r != null && r.updateContextSchema ? r.updateContextSchema(u) : (r.schema = Object.assign(c, u), Object.assign(e, u)), Array.from(document.getElementsByClassName("dgComponentSelected")).forEach(
-      (f) => f.classList.remove("dgComponentSelected")
+    u || (u = this.controlCreatorUtils.createFormGroupWithoutField(s)), Object.assign(u, {
+      id: a.id,
+      appearance: a.appearance,
+      size: a.size,
+      label: a.label,
+      binding: a.binding
+    }), Object.prototype.hasOwnProperty.call(a, "visible") && Object.assign(u, { visible: a.visible }), a.editor && ["readonly", "required", "placeholder"].map((c) => {
+      Object.prototype.hasOwnProperty.call(a.editor, c) && (u.editor[c] = a.editor[c]);
+    }), r != null && r.updateContextSchema ? r.updateContextSchema(u) : (r.schema = Object.assign(a, u), Object.assign(e, u)), Array.from(document.getElementsByClassName("dgComponentSelected")).forEach(
+      (c) => c.classList.remove("dgComponentSelected")
     ), Array.from(document.getElementsByClassName("dgComponentFocused")).forEach(
-      (f) => f.classList.remove("dgComponentFocused")
-    ), _.value++, Z(() => {
+      (c) => c.classList.remove("dgComponentFocused")
+    ), Z.value++, te(() => {
       this.getFormDesignerInstance().reloadPropertyPanel();
     });
   }
-  getComponentConfig(e, n = {}, r = {}, l) {
+  getComponentConfig(e, n = {}, r = {}, s) {
     var d, g;
-    const s = Object.assign({
+    const l = Object.assign({
       description: "编辑器",
       title: "编辑器",
       type: "input-group",
       $converter: "/converter/property-editor.converter",
       parentPropertyID: "editor"
-    }, n), m = (d = e.binding) != null && d.field ? [] : ["Const", "Variable", "StateMachine"], c = this.getPropertyEditorParams(e, m, "readonly"), u = this.getPropertyEditorParams(e, m, "required"), f = {
+    }, n), m = (d = e.binding) != null && d.field ? [] : ["Const", "Variable", "StateMachine"], a = this.getPropertyEditorParams(e, m, "readonly"), u = this.getPropertyEditorParams(e, m, "required"), c = {
       readonly: {
         description: "",
         title: "只读",
-        editor: c
+        editor: a
       },
       required: {
         description: "",
@@ -1866,21 +1847,21 @@ class Mt extends Et {
         type: "string"
       }
     };
-    for (const a in r)
-      f[a] = Object.assign(f[a] || {}, r[a]);
+    for (const f in r)
+      c[f] = Object.assign(c[f] || {}, r[f]);
     const o = this;
     return {
-      ...s,
-      properties: { ...f },
-      setPropertyRelates(a, p) {
-        if (a) {
-          switch (a.propertyID) {
+      ...l,
+      properties: { ...c },
+      setPropertyRelates(f, p) {
+        if (f) {
+          switch (f.propertyID) {
             case "readonly":
             case "required":
-              o.afterMutilEditorChanged(e, a);
+              o.afterMutilEditorChanged(e, f);
               break;
           }
-          l && l.bind(o)(a, e, p);
+          s && s.bind(o)(f, e, p);
         }
       }
     };
@@ -1892,17 +1873,17 @@ class Mt extends Et {
   * @param componentId 控件所在组件id
   */
   updateUnifiedLayoutAfterControlChanged(e, n, r) {
-    const l = e.split(" ");
-    let s = l.find((o) => /^col-([1-9]|10|11|12)$/.test(o)), m = l.find((o) => /^col-md-([1-9]|10|11|12)$/.test(o)), c = l.find((o) => /^col-xl-([1-9]|10|11|12)$/.test(o)), u = l.find((o) => /^col-el-([1-9]|10|11|12)$/.test(o));
-    s = s || "col-12", m = m || "col-md-" + s.replace("col-", ""), c = c || "col-xl-" + m.replace("col-md-", ""), u = u || "col-el-" + c.replace("col-xl-", "");
-    const f = {
+    const s = e.split(" ");
+    let l = s.find((o) => /^col-([1-9]|10|11|12)$/.test(o)), m = s.find((o) => /^col-md-([1-9]|10|11|12)$/.test(o)), a = s.find((o) => /^col-xl-([1-9]|10|11|12)$/.test(o)), u = s.find((o) => /^col-el-([1-9]|10|11|12)$/.test(o));
+    l = l || "col-12", m = m || "col-md-" + l.replace("col-", ""), a = a || "col-xl-" + m.replace("col-md-", ""), u = u || "col-el-" + a.replace("col-xl-", "");
+    const c = {
       id: n,
-      columnInSM: parseInt(s.replace("col-", ""), 10),
+      columnInSM: parseInt(l.replace("col-", ""), 10),
       columnInMD: parseInt(m.replace("col-md-", ""), 10),
-      columnInLG: parseInt(c.replace("col-xl-", ""), 10),
+      columnInLG: parseInt(a.replace("col-xl-", ""), 10),
       columnInEL: parseInt(u.replace("col-el-", ""), 10)
     };
-    this.updateUnifiedLayoutAfterResponseLayoutChanged(r, f);
+    this.updateUnifiedLayoutAfterResponseLayoutChanged(r, c);
   }
   /**
    * 修改控件布局配置后更新Form统一布局配置
@@ -1913,14 +1894,14 @@ class Mt extends Et {
     const { formNode: r } = this.responseLayoutEditorFunction.checkCanFindFormNode(e);
     if (!r || !r.unifiedLayout)
       return;
-    const l = [];
-    if (this.responseLayoutEditorFunction.getResonseFormLayoutConfig(r, l, 1), n) {
-      const a = l.find((p) => p.id === n.id);
-      Object.assign(a || {}, n);
+    const s = [];
+    if (this.responseLayoutEditorFunction.getResonseFormLayoutConfig(r, s, 1), n) {
+      const f = s.find((p) => p.id === n.id);
+      Object.assign(f || {}, n);
     }
-    const s = l.map((a) => a.columnInSM), m = l.map((a) => a.columnInMD), c = l.map((a) => a.columnInLG), u = l.map((a) => a.columnInEL), f = this.checkIsUniqueColumn(s) ? s[0] : null, o = this.checkIsUniqueColumn(m) ? m[0] : null, d = this.checkIsUniqueColumn(c) ? c[0] : null, g = this.checkIsUniqueColumn(u) ? u[0] : null;
+    const l = s.map((f) => f.columnInSM), m = s.map((f) => f.columnInMD), a = s.map((f) => f.columnInLG), u = s.map((f) => f.columnInEL), c = this.checkIsUniqueColumn(l) ? l[0] : null, o = this.checkIsUniqueColumn(m) ? m[0] : null, d = this.checkIsUniqueColumn(a) ? a[0] : null, g = this.checkIsUniqueColumn(u) ? u[0] : null;
     Object.assign(r.unifiedLayout, {
-      uniqueColClassInSM: f,
+      uniqueColClassInSM: c,
       uniqueColClassInMD: o,
       uniqueColClassInLG: d,
       uniqueColClassInEL: g
@@ -1964,22 +1945,22 @@ class Mt extends Et {
   * @param propertyData 下拉框控件属性值
   */
   checkEnumDataReadonly(e) {
-    return !e.binding || e.binding.type !== "Form" ? !1 : !!(this.designViewModelField && this.designViewModelField.type && this.designViewModelField.type.$type === De.EnumType);
+    return !e.binding || e.binding.type !== "Form" ? !1 : !!(this.designViewModelField && this.designViewModelField.type && this.designViewModelField.type.$type === _e.EnumType);
   }
   /**
   * 将字段值变化前事件、变化后事件追加到交互面板
   * 注意：因为绑定字段值变化后事件与下拉框的值变化事件(valueChanged)重名，所以这里将事件label都重命名下
   */
   appendFieldValueChangeEvents(e, n) {
-    e.binding && e.binding.type === X.Form && e.binding.field ? (n.find((r) => r.label === "fieldValueChanging"), n.find((r) => r.label === "fieldValueChanged"), this.designViewModelField && (e.fieldValueChanging = this.designViewModelField.valueChanging, e.fieldValueChanged = this.designViewModelField.valueChanged)) : n = n.filter((r) => r.label !== "fieldValueChanging" && r.label !== "fieldValueChanged");
+    e.binding && e.binding.type === J.Form && e.binding.field ? (n.find((r) => r.label === "fieldValueChanging"), n.find((r) => r.label === "fieldValueChanged"), this.designViewModelField && (e.fieldValueChanging = this.designViewModelField.valueChanging, e.fieldValueChanged = this.designViewModelField.valueChanged)) : n = n.filter((r) => r.label !== "fieldValueChanging" && r.label !== "fieldValueChanged");
   }
   getControlMethodType(e) {
     if (!e.binding)
       return e.type;
     switch (e.binding.type) {
-      case X.Form:
+      case J.Form:
         return e.binding.path || e.type;
-      case X.Variable:
+      case J.Variable:
         return e.binding.fullPath || e.type;
     }
     return e.type;
@@ -1991,8 +1972,8 @@ class Mt extends Et {
   * @param showPosition 面板展示位置
   * @param customEvent 输入控件特有的事件配置
   */
-  getEventPropertyConfig(e, n = "card", r, l) {
-    const s = this;
+  getEventPropertyConfig(e, n = "card", r, s) {
+    const l = this;
     let m = [];
     if (r && (m = m.concat(r)), m.length === 0)
       return {
@@ -2004,27 +1985,27 @@ class Mt extends Et {
         hide: !0
       };
     this.appendFieldValueChangeEvents(e, m);
-    const c = s.eventsEditorUtils.formProperties(e, s.viewModelId, m);
+    const a = l.eventsEditorUtils.formProperties(e, l.viewModelId, m);
     return {
       title: "事件",
       hideTitle: !0,
-      properties: s.createBaseEventProperty(c),
+      properties: l.createBaseEventProperty(a),
       tabId: "commands",
       tabName: "交互",
       setPropertyRelates(o, d) {
         const g = o.propertyValue;
-        delete e[s.viewModelId], g && (g.setPropertyRelates = this.setPropertyRelates, g.controlInfo = { type: s.getControlMethodType(e), name: e.title }, s.eventsEditorUtils.saveRelatedParameters(e, s.viewModelId, g.events, g)), l && l(o, d, g);
-        const a = s.designViewModelUtils.getDgViewModel(s.viewModelId);
-        a && s.designViewModelField && a.changeField(s.designViewModelField.id, { valueChanging: e.fieldValueChanging, valueChanged: e.fieldValueChanged });
+        delete e[l.viewModelId], g && (g.setPropertyRelates = this.setPropertyRelates, g.controlInfo = { type: l.getControlMethodType(e), name: e.title }, l.eventsEditorUtils.saveRelatedParameters(e, l.viewModelId, g.events, g)), s && s(o, d, g);
+        const f = l.designViewModelUtils.getDgViewModel(l.viewModelId);
+        f && l.designViewModelField && f.changeField(l.designViewModelField.id, { valueChanging: e.fieldValueChanging, valueChanged: e.fieldValueChanged });
       }
     };
   }
-  getExpressionConfig(e, n, r = ["compute", "dependency", "validate"], l) {
-    return new ye(this.formSchemaUtils).getExpressionConfig(
+  getExpressionConfig(e, n, r = ["compute", "dependency", "validate"], s) {
+    return new we(this.formSchemaUtils).getExpressionConfig(
       e,
       n,
       r,
-      l
+      s
     );
   }
   getBindingDataType() {
@@ -2034,14 +2015,14 @@ class Mt extends Et {
     return this.getBindingDataType() === "number" ? this.numberEditorOptions : {};
   }
   updatePropertyValue(e, n, r) {
-    var l;
-    e.editor[n] !== r ? e.editor[n] = r : (l = this.getFormDesignerInstance()) == null || l.reloadPropertyPanel();
+    var s;
+    e.editor[n] !== r ? e.editor[n] = r : (s = this.getFormDesignerInstance()) == null || s.reloadPropertyPanel();
   }
   setBooleanValue(e, n, r) {
-    let l = r;
-    this.getBindingDataType() === "string" && (l = (l || "").trim() || (n === "trueValue" ? "true" : "false"));
+    let s = r;
+    this.getBindingDataType() === "string" && (s = (s || "").trim() || (n === "trueValue" ? "true" : "false"));
     const m = n === "trueValue" ? "falseValue" : "trueValue";
-    e.editor[m] === l && (l = l + 1), this.updatePropertyValue(e, n, l);
+    e.editor[m] === s && (s = s + 1), this.updatePropertyValue(e, n, s);
   }
   getBooleanValueConverter() {
     return {
@@ -2115,7 +2096,7 @@ class Tt extends Mt {
           editor: this.getPropertyEditorParams(t, ["Variable"], "", {}, { newVariableType: "Object" })
         }
       },
-      setPropertyRelates(r, l) {
+      setPropertyRelates(r, s) {
         if (r)
           switch (r.propertyID) {
             case "visible":
@@ -2135,26 +2116,26 @@ class Tt extends Mt {
         label: "onQuery",
         name: "查询事件"
       }
-    ], n = this, r = n.eventsEditorUtils.formProperties(t, n.viewModelId, e), l = n.createBaseEventProperty(r);
+    ], n = this, r = n.eventsEditorUtils.formProperties(t, n.viewModelId, e), s = n.createBaseEventProperty(r);
     this.propertyConfig.categories.eventsEditor = {
       title: "事件",
       hideTitle: !0,
-      properties: l,
+      properties: s,
       // 这个属性，标记当属性变更得时候触发重新更新属性
       refreshPanelAfterChanged: !0,
       tabId: "commands",
       tabName: "交互",
-      setPropertyRelates(s, m) {
-        const c = s.propertyValue;
-        delete t[n.viewModelId], c && (c.setPropertyRelates = this.setPropertyRelates, n.eventsEditorUtils.saveRelatedParameters(t, n.viewModelId, c.events, c)), t.remoteSort = !!t.columnSorted;
+      setPropertyRelates(l, m) {
+        const a = l.propertyValue;
+        delete t[n.viewModelId], a && (a.setPropertyRelates = this.setPropertyRelates, n.eventsEditorUtils.saveRelatedParameters(t, n.viewModelId, a.events, a)), t.remoteSort = !!t.columnSorted;
       }
     };
   }
 }
-function kt(i, t) {
-  function e(m, c) {
+function Pt(i, t) {
+  function e(m, a) {
     const u = i.schema;
-    return new Tt(m, t).getPropertyConfig(u, c);
+    return new Tt(m, t).getPropertyConfig(u, a);
   }
   function n() {
     return !1;
@@ -2162,46 +2143,49 @@ function kt(i, t) {
   function r() {
     return !1;
   }
-  function l() {
+  function s() {
     return !1;
   }
-  function s() {
-    var o, d, g, a, p, v;
-    if ((d = (o = i == null ? void 0 : i.parent) == null ? void 0 : o.parent) != null && d.schema) {
-      const y = (g = i == null ? void 0 : i.parent) == null ? void 0 : g.parent.schema;
-      (a = y.appearance) != null && a.class && ((p = y.appearance) != null && p.class.includes("f-page-has-scheme")) && (y.appearance.class = (v = y.appearance) == null ? void 0 : v.class.replace("f-page-has-scheme", "").replace("  ", ""));
-    }
-    const { formSchemaUtils: m } = t, c = i.componentInstance.value.belongedComponentId, u = m.getViewModelIdByComponentId(c), f = m.getViewModelById(u);
-    if (f && f.states) {
-      const y = f.states.findIndex((w) => w.code === "originalFilterConditionList");
-      y > -1 && f.states.splice(y, 1);
+  function l() {
+    var m;
+    if (i && t) {
+      const { formSchemaUtils: a } = t, u = a.getControlBasicInfoMap(), { schema: c } = i, o = tt["filter-bar"].name;
+      u.set(c.id, {
+        componentTitle: o,
+        parentPathName: o
+      }), (m = c.fields) != null && m.length && c.fields.map((d) => {
+        u.set(d.id, {
+          componentTitle: d.name,
+          parentPathName: `${o} > ${d.name}`
+        });
+      });
     }
   }
   return {
     getPropsConfig: e,
     canAccepts: n,
     checkCanDeleteComponent: r,
-    checkCanMoveComponent: l,
-    onRemoveComponent: s
+    checkCanMoveComponent: s,
+    setComponentBasicInfoMap: l
   };
 }
-function be(i, t) {
+function Ie(i, t) {
   let e;
   function n(o) {
-    const { properties: d, title: g, ignore: a } = o, p = a && Array.isArray(a), v = Object.keys(d).reduce((y, w) => ((!p || !a.find((T) => T === w)) && (y[w] = d[w].type === "object" && d[w].properties ? n(d[w]) : z(d[w].default)), y), {});
-    if (g && (!p || !a.find((y) => y === "id"))) {
+    const { properties: d, title: g, ignore: f } = o, p = f && Array.isArray(f), h = Object.keys(d).reduce((y, C) => ((!p || !f.find((V) => V === C)) && (y[C] = d[C].type === "object" && d[C].properties ? n(d[C]) : H(d[C].default)), y), {});
+    if (g && (!p || !f.find((y) => y === "id"))) {
       const y = g.toLowerCase().replace(/-/g, "_");
-      v.id = `${y}_${Math.random().toString().slice(2, 6)}`;
+      h.id = `${y}_${Math.random().toString().slice(2, 6)}`;
     }
-    return v;
+    return h;
   }
   function r(o) {
-    const { properties: d, title: g, required: a } = o;
-    if (a && Array.isArray(a)) {
-      const p = a.reduce((v, y) => (v[y] = d[y].type === "object" && d[y].properties ? n(d[y]) : z(d[y].default), v), {});
-      if (g && a.find((v) => v === "id")) {
-        const v = g.toLowerCase().replace(/-/g, "_");
-        p.id = `${v}_${Math.random().toString().slice(2, 6)}`;
+    const { properties: d, title: g, required: f } = o;
+    if (f && Array.isArray(f)) {
+      const p = f.reduce((h, y) => (h[y] = d[y].type === "object" && d[y].properties ? n(d[y]) : H(d[y].default), h), {});
+      if (g && f.find((h) => h === "id")) {
+        const h = g.toLowerCase().replace(/-/g, "_");
+        p.id = `${h}_${Math.random().toString().slice(2, 6)}`;
       }
       return p;
     }
@@ -2209,113 +2193,113 @@ function be(i, t) {
       type: g
     };
   }
-  function l(o, d = {}, g) {
-    const a = i[o];
-    if (a) {
-      let p = r(a);
-      const v = t[o];
-      return p = v ? v({ getSchemaByType: l }, p, d, g) : p, e != null && e.appendIdentifyForNewControl && e.appendIdentifyForNewControl(p), p;
+  function s(o, d = {}, g) {
+    const f = i[o];
+    if (f) {
+      let p = r(f);
+      const h = t[o];
+      return p = h ? h({ getSchemaByType: s }, p, d, g) : p, e != null && e.appendIdentifyForNewControl && e.appendIdentifyForNewControl(p), p;
     }
     return null;
   }
-  function s(o, d) {
+  function l(o, d) {
     const g = n(d);
-    return Object.keys(g).reduce((a, p) => (Object.prototype.hasOwnProperty.call(o, p) && (a[p] && oe(a[p]) && oe(o[p] || !o[p]) ? Object.assign(a[p], o[p] || {}) : a[p] = o[p]), a), g), g;
+    return Object.keys(g).reduce((f, p) => (Object.prototype.hasOwnProperty.call(o, p) && (f[p] && ae(f[p]) && ae(o[p] || !o[p]) ? Object.assign(f[p], o[p] || {}) : f[p] = o[p]), f), g), g;
   }
   function m(o, d) {
-    return Object.keys(o).filter((a) => o[a] != null).reduce((a, p) => {
+    return Object.keys(o).filter((f) => o[f] != null).reduce((f, p) => {
       if (d.has(p)) {
-        const v = d.get(p);
-        if (typeof v == "string")
-          a[v] = o[p];
+        const h = d.get(p);
+        if (typeof h == "string")
+          f[h] = o[p];
         else {
-          const y = v(p, o[p], o);
-          Object.assign(a, y);
+          const y = h(p, o[p], o);
+          Object.assign(f, y);
         }
       } else
-        a[p] = o[p];
-      return a;
+        f[p] = o[p];
+      return f;
     }, {});
   }
-  function c(o, d, g = /* @__PURE__ */ new Map()) {
-    const a = s(o, d);
-    return m(a, g);
+  function a(o, d, g = /* @__PURE__ */ new Map()) {
+    const f = l(o, d);
+    return m(f, g);
   }
   function u(o) {
     var g;
     const d = o.type;
     if (d) {
-      const a = i[d];
-      if (!a)
+      const f = i[d];
+      if (!f)
         return o;
-      const p = s(o, a), v = ((g = o.editor) == null ? void 0 : g.type) || "";
-      if (v) {
-        const y = i[v], w = s(o.editor, y);
-        p.editor = w;
+      const p = l(o, f), h = ((g = o.editor) == null ? void 0 : g.type) || "";
+      if (h) {
+        const y = i[h], C = l(o.editor, y);
+        p.editor = C;
       }
       return p;
     }
     return o;
   }
-  function f(o) {
+  function c(o) {
     e = o;
   }
-  return { getSchemaByType: l, resolveSchemaWithDefaultValue: u, resolveSchemaToProps: c, mappingSchemaToProps: m, setDesignerContext: f };
+  return { getSchemaByType: s, resolveSchemaWithDefaultValue: u, resolveSchemaToProps: a, mappingSchemaToProps: m, setDesignerContext: c };
 }
-const Ce = {}, Fe = {}, { resolveSchemaWithDefaultValue: Pt, resolveSchemaToProps: Vt, mappingSchemaToProps: Bt } = be(Ce, Fe);
+const Ee = {}, xe = {}, { resolveSchemaWithDefaultValue: kt, resolveSchemaToProps: Vt, mappingSchemaToProps: Bt } = Ie(Ee, xe);
 function Nt(i = {}) {
-  function t(u, f, o, d) {
+  function t(u, c, o, d) {
     if (typeof o == "number")
       return d[u].length === o;
     if (typeof o == "object") {
-      const g = Object.keys(o)[0], a = o[g];
+      const g = Object.keys(o)[0], f = o[g];
       if (g === "not")
-        return Number(d[u].length) !== Number(a);
+        return Number(d[u].length) !== Number(f);
       if (g === "moreThan")
-        return Number(d[u].length) >= Number(a);
+        return Number(d[u].length) >= Number(f);
       if (g === "lessThan")
-        return Number(d[u].length) <= Number(a);
+        return Number(d[u].length) <= Number(f);
     }
     return !1;
   }
-  function e(u, f, o, d) {
+  function e(u, c, o, d) {
     return d[u] && d[u].propertyValue && String(d[u].propertyValue.value) === String(o);
   }
   const n = /* @__PURE__ */ new Map([
     ["length", t],
     ["getProperty", e]
   ]);
-  Object.keys(i).reduce((u, f) => (u.set(f, i[f]), u), n);
-  function r(u, f) {
+  Object.keys(i).reduce((u, c) => (u.set(c, i[c]), u), n);
+  function r(u, c) {
     const o = u;
-    return typeof f == "number" ? [{ target: o, operator: "length", param: null, value: Number(f) }] : typeof f == "boolean" ? [{ target: o, operator: "getProperty", param: u, value: !!f }] : typeof f == "object" ? Object.keys(f).map((d) => {
+    return typeof c == "number" ? [{ target: o, operator: "length", param: null, value: Number(c) }] : typeof c == "boolean" ? [{ target: o, operator: "getProperty", param: u, value: !!c }] : typeof c == "object" ? Object.keys(c).map((d) => {
       if (d === "length")
-        return { target: o, operator: "length", param: null, value: f[d] };
-      const g = d, a = f[d];
-      return { target: o, operator: "getProperty", param: g, value: a };
+        return { target: o, operator: "length", param: null, value: c[d] };
+      const g = d, f = c[d];
+      return { target: o, operator: "getProperty", param: g, value: f };
     }) : [];
   }
-  function l(u) {
+  function s(u) {
     return Object.keys(u).reduce((o, d) => {
       const g = r(d, u[d]);
       return o.push(...g), o;
     }, []);
   }
-  function s(u, f) {
+  function l(u, c) {
     if (n.has(u.operator)) {
       const o = n.get(u.operator);
-      return o && o(u.target, u.param, u.value, f) || !1;
+      return o && o(u.target, u.param, u.value, c) || !1;
     }
     return !1;
   }
-  function m(u, f) {
-    return l(u).reduce((g, a) => g && s(a, f), !0);
+  function m(u, c) {
+    return s(u).reduce((g, f) => g && l(f, c), !0);
   }
-  function c(u, f) {
-    const o = Object.keys(u), d = o.includes("allOf"), g = o.includes("anyOf"), a = d || g, y = (a ? u[a ? d ? "allOf" : "anyOf" : "allOf"] : [u]).map((T) => m(T, f));
+  function a(u, c) {
+    const o = Object.keys(u), d = o.includes("allOf"), g = o.includes("anyOf"), f = d || g, y = (f ? u[f ? d ? "allOf" : "anyOf" : "allOf"] : [u]).map((V) => m(V, c));
     return d ? !y.includes(!1) : y.includes(!0);
   }
-  return { parseValueSchema: c };
+  return { parseValueSchema: a };
 }
 const Ot = {
   convertTo: (i, t, e, n) => {
@@ -2329,7 +2313,7 @@ const Ot = {
     i.editor && (i.editor[t] = e);
   },
   convertFrom: (i, t, e) => i.editor && Object.prototype.hasOwnProperty.call(i.editor, t) ? i.editor[t] : i[t]
-}, Rt = {
+}, At = {
   button: { type: "button", name: "按钮" },
   "response-toolbar": { type: "response-toolbar", name: "工具栏" },
   "response-toolbar-item": { type: "response-toolbar-item", name: "按钮" },
@@ -2356,6 +2340,7 @@ const Ot = {
   tabs: { type: "tabs", name: "标签页" },
   "tab-page": { type: "tab-page", name: "标签页项", dependentParentControl: "Tab" },
   "tab-toolbar-item": { type: "tab-toolbar-item", name: "标签页工具栏按钮" },
+  "drawer-toolbar-item": { type: "drawer-toolbar-item", name: "抽屉工具栏按钮" },
   "html-template": { type: "html-template", name: "模板容器" },
   "time-picker": { type: "time-picker", name: "时间选择" },
   section: { type: "section", name: "分组面板" },
@@ -2368,6 +2353,7 @@ const Ot = {
   "page-header": { type: "page-header", name: "页头" },
   "page-footer": { type: "page-footer", name: "页脚" },
   "tab-toolbar": { type: "tab-toolbar", name: "标签页工具栏" },
+  "drawer-toolbar": { type: "drawer-toolbar", name: "抽屉工具栏" },
   fieldset: { type: "fieldset", name: "分组" },
   "query-solution": { type: "query-solution", name: "筛选方案" },
   drawer: { type: "drawer", name: "抽屉" },
@@ -2380,13 +2366,13 @@ const Ot = {
   "discussion-editor": { type: "discussion-editor", name: "评论编辑区" },
   "discussion-list": { type: "discussion-list", name: "评论列表" },
   comment: { type: "comment", name: "评论区" },
-  "rich-text-editor": { type: "rich-text-editor", name: "富文本编辑器", icon: "rich-text-box" },
+  "rich-text-editor": { type: "rich-text-editor", name: "富文本", icon: "rich-text-box" },
   calendar: { type: "calendar", name: "日历", icon: "date-picker" }
-}, At = {
+}, Rt = {
   convertFrom: (i, t, e) => {
     var r;
     const n = i.editor && i.editor[t] ? i.editor[t] : i[t];
-    return ((r = Rt[n]) == null ? void 0 : r.name) || n;
+    return ((r = At[n]) == null ? void 0 : r.name) || n;
   }
 }, $t = {
   convertTo: (i, t, e, n) => {
@@ -2424,7 +2410,7 @@ const Ot = {
     }
     return "none";
   }
-}, Wt = {
+}, qt = {
   convertTo: (i, t, e, n) => {
     i.command ? i.command[t] = e : i.command = {
       [t]: e
@@ -2442,17 +2428,29 @@ const Ot = {
     ]), t === "enableType" && e === "custom" && (i.command.enable = !0, i.command.commands = [
       {
         value: "add",
-        text: "增加",
+        text: {
+          en: "add",
+          "zh-CHS": "增加",
+          "zh-CHT": "增加"
+        },
         type: "link"
       },
       {
         value: "edit",
-        text: "编辑",
+        text: {
+          en: "edit",
+          "zh-CHS": "编辑",
+          "zh-CHT": "編輯"
+        },
         type: "danger"
       },
       {
         value: "remove",
-        text: "删除",
+        text: {
+          en: "remove",
+          "zh-CHS": "删除",
+          "zh-CHT": "刪除"
+        },
         type: "remove"
       }
     ]), t === "enableType" && e === "unable" && (i.command.enable = !1);
@@ -2461,17 +2459,19 @@ const Ot = {
     var n, r;
     if (i.command) {
       if (t === "enableType") {
-        const l = (r = (n = i.command) == null ? void 0 : n.commands) == null ? void 0 : r.find((s) => s.command === "edit" && s.type === "primary");
-        return i.command.enable ? l ? "default" : "custom" : "unable";
+        const s = (r = (n = i.command) == null ? void 0 : n.commands) == null ? void 0 : r.find((l) => l.command === "edit" && l.type === "primary");
+        return i.command.enable ? s ? "default" : "custom" : "unable";
       }
       if (t === "commands")
         return i.command.enableType === "custom" ? i.command.commands : [];
       if (t === "formatter")
         return i.command.formatter;
+      if (t === "count")
+        return i.command.count;
     }
     return "";
   }
-}, qt = {
+}, Wt = {
   convertTo: (i, t, e, n) => {
     i.column ? i.column[t] = e : i.column = {
       [t]: e
@@ -2532,7 +2532,7 @@ const Ot = {
     i.rowNumber || (i.rowNumber = {}), i.rowNumber[t] = e;
   },
   convertFrom: (i, t, e) => i.rowNumber ? i.rowNumber[t] : i[t]
-}, Xt = {
+}, Ht = {
   convertTo: (i, t, e, n) => {
     i.selection || (i.selection = {}), i.selection[t] = e;
   },
@@ -2540,19 +2540,19 @@ const Ot = {
     var n, r;
     return t === "showCheckbox" ? (n = i.selection) != null && n.multiSelect ? !0 : (r = i.selection) == null ? void 0 : r.showCheckbox : i.selection ? i.selection[t] : i[t];
   }
-}, Jt = {
+}, Xt = {
   convertFrom: (i, t, e) => i[t] && i[t].length ? `共 ${i[t].length} 项` : ""
-}, Ht = {
+}, Zt = {
   convertFrom: (i, t) => i[t] || "",
   convertTo: (i, t, e) => {
     i[t] = e;
   }
-}, Yt = {
+}, Jt = {
   convertTo: (i, t, e, n) => {
     i.size || (i.size = {}), i.size[t] = e;
   },
   convertFrom: (i, t, e) => i.size ? i.size[t] : i[t]
-}, Zt = {
+}, Yt = {
   convertFrom: (i, t, e) => {
     var n, r;
     return (n = i.formatter) != null && n.data && t === "formatterEnumData" && !i.formatterEnumData ? (r = i.formatter) == null ? void 0 : r.data : i.formatterEnumData;
@@ -2605,26 +2605,26 @@ const Ot = {
   },
   convertFrom: (i, t, e) => t === "columnTemplate" ? i.columnTemplate : t === "columnTemplateType" ? i.columnTemplateType ? i.columnTemplateType || "default" : i.columnTemplate && !i.onClickLinkCommand ? "custom" : i.columnTemplate && i.onClickLinkCommand ? "hyperlink" : "default" : ""
 };
-function we(i, t, e) {
+function Se(i, t, e) {
   const n = /* @__PURE__ */ new Map([
     ["/converter/appearance.converter", Ot],
     ["/converter/buttons.converter", Lt],
     ["/converter/property-editor.converter", Ut],
-    ["/converter/items-count.converter", Jt],
-    ["/converter/type.converter", At],
+    ["/converter/items-count.converter", Xt],
+    ["/converter/type.converter", Rt],
     ["/converter/change-editor.converter", $t],
     ["/converter/change-formatter.converter", jt],
-    ["/converter/column-command.converter", Wt],
-    ["/converter/column-option.converter", qt],
+    ["/converter/column-command.converter", qt],
+    ["/converter/column-option.converter", Wt],
     ["/converter/summary.converter", Gt],
     ["/converter/group.converter", zt],
-    ["/converter/form-group-label.converter", Ht],
+    ["/converter/form-group-label.converter", Zt],
     ["/converter/field-selector.converter", Dt],
     ["/converter/pagination.converter", Qt],
     ["/converter/row-number.converter", _t],
-    ["/converter/grid-selection.converter", Xt],
-    ["/converter/size.converter", Yt],
-    ["/converter/change-formatter-enum.converter", Zt],
+    ["/converter/grid-selection.converter", Ht],
+    ["/converter/size.converter", Jt],
+    ["/converter/change-formatter-enum.converter", Yt],
     ["/converter/grid-sort.converter", Kt],
     ["/converter/grid-filter.converter", ei],
     ["/converter/row-option.converter", ti],
@@ -2653,76 +2653,76 @@ function we(i, t, e) {
     ["array", { type: "button-edit" }],
     ["number", { type: "number-spinner", placeholder: "" }],
     ["events-editor", { type: "events-editor", hide: !0 }]
-  ]), l = Nt();
-  function s(a, p) {
-    return () => l.parseValueSchema(a, p);
-  }
-  function m(a, p, v) {
-    return a.includes("visible") && p.visible !== void 0 ? typeof p.visible == "boolean" ? () => !!p.visible : p.visible === void 0 ? !0 : s(p.visible, v) : () => !0;
-  }
-  function c(a, p, v) {
-    return a.includes("readonly") && p.readonly !== void 0 ? typeof p.readonly == "boolean" ? () => !!p.readonly : s(p.readonly, v) : () => !1;
-  }
-  function u(a, p) {
-    const v = a.$converter || p;
-    return typeof v == "string" && v && n.has(v) ? n.get(v) || null : v || null;
-  }
-  function f(a, p, v, y, w, T = "", V = "") {
-    return Object.keys(a).map((k) => {
-      const N = I(1), L = k, b = a[k], S = Object.keys(b), O = b.title, F = b.type, E = r.get(F) || { type: "input-group", enableClear: !1 }, B = b.editor ? Object.assign({}, E, b.editor) : Object.assign({}, E), R = m(S, b, p), P = c(S, b, p);
-      B.readonly = B.readonly === void 0 ? P() : B.readonly;
-      const A = b.type === "cascade" ? f(b.properties, p, v, y, w, T, V) : [], Pe = !0;
-      let $ = u(b, V);
-      const Ve = U({
+  ]), s = Nt();
+  function l(f, p) {
+    return () => s.parseValueSchema(f, p);
+  }
+  function m(f, p, h) {
+    return f.includes("visible") && p.visible !== void 0 ? typeof p.visible == "boolean" ? () => !!p.visible : p.visible === void 0 ? !0 : l(p.visible, h) : () => !0;
+  }
+  function a(f, p, h) {
+    return f.includes("readonly") && p.readonly !== void 0 ? typeof p.readonly == "boolean" ? () => !!p.readonly : l(p.readonly, h) : () => !1;
+  }
+  function u(f, p) {
+    const h = f.$converter || p;
+    return typeof h == "string" && h && n.has(h) ? n.get(h) || null : h || null;
+  }
+  function c(f, p, h, y, C, V = "", B = "") {
+    return Object.keys(f).map((k) => {
+      const A = w(1), O = k, T = f[k], F = Object.keys(T), j = T.title, L = T.type, I = r.get(L) || { type: "input-group", enableClear: !1 }, P = T.editor ? Object.assign({}, I, T.editor) : Object.assign({}, I), U = m(F, T, p), x = a(F, T, p);
+      P.readonly = P.readonly === void 0 ? x() : P.readonly;
+      const E = T.type === "cascade" ? c(T.properties, p, h, y, C, V, B) : [], R = !0;
+      let N = u(T, B);
+      const q = $({
         get() {
-          if (N.value) {
-            if (["class", "style"].find((Ue) => Ue === L) && !$ && ($ = n.get("/converter/appearance.converter") || null), $ && $.convertFrom)
-              return $.convertFrom(v, k, w, T);
-            const j = v[k];
-            return Object.prototype.hasOwnProperty.call(b, "defaultValue") && (j === void 0 || typeof j == "string" && j === "") ? b.type === "boolean" ? b.defaultValue : b.defaultValue || "" : j;
+          if (A.value) {
+            if (["class", "style"].find((Ae) => Ae === O) && !N && (N = n.get("/converter/appearance.converter") || null), N && N.convertFrom)
+              return N.convertFrom(h, k, C, V);
+            const W = h[k];
+            return Object.prototype.hasOwnProperty.call(T, "defaultValue") && (W === void 0 || typeof W == "string" && W === "") ? T.type === "boolean" ? T.defaultValue : T.defaultValue || "" : W;
           }
           return null;
         },
-        set(j) {
-          N.value += 1, $ && $.convertTo ? ($.convertTo(y, k, j, w, T), $.convertTo(v, k, j, w, T)) : (y[k] = j, v[k] = j);
+        set(W) {
+          A.value += 1, N && N.convertTo ? (N.convertTo(y, k, W, C, V), N.convertTo(h, k, W, C, V)) : (y[k] = W, h[k] = W);
         }
-      }), { refreshPanelAfterChanged: Be, description: Ne, isExpand: Oe, parentPropertyID: Le } = b, te = { propertyID: L, propertyName: O, propertyType: F, propertyValue: Ve, editor: B, visible: R, readonly: P, cascadeConfig: A, hideCascadeTitle: Pe, refreshPanelAfterChanged: Be, description: Ne, isExpand: Oe, parentPropertyID: Le };
-      return p[L] = te, te;
+      }), { refreshPanelAfterChanged: X, description: Oe, isExpand: Le, parentPropertyID: Ue } = T, re = { propertyID: O, propertyName: j, propertyType: L, propertyValue: q, editor: P, visible: U, readonly: x, cascadeConfig: E, hideCascadeTitle: R, refreshPanelAfterChanged: X, description: Oe, isExpand: Le, parentPropertyID: Ue };
+      return p[O] = re, re;
     });
   }
-  function o(a, p, v = {}) {
-    const y = {}, w = i[a];
-    return w && w.categories ? Object.keys(w.categories).map((V) => {
-      const M = w.categories[V], k = M == null ? void 0 : M.title, N = f(M.properties || {}, y, {}, v, p);
-      return { categoryId: V, categoryName: k, properties: N };
+  function o(f, p, h = {}) {
+    const y = {}, C = i[f];
+    return C && C.categories ? Object.keys(C.categories).map((B) => {
+      const M = C.categories[B], k = M == null ? void 0 : M.title, A = c(M.properties || {}, y, {}, h, p);
+      return { categoryId: B, categoryName: k, properties: A };
     }) : [];
   }
-  function d(a, p, v, y, w = "") {
-    const T = p.$ref.schema, V = p.$ref.converter, M = v[T], k = M.type, N = e(M), L = {}, b = i[k];
-    if (b && b.categories) {
-      const S = b.categories[a], O = S == null ? void 0 : S.title;
-      V && Object.keys(S.properties).forEach((B) => {
-        S.properties[B].$converter = V;
+  function d(f, p, h, y, C = "") {
+    const V = p.$ref.schema, B = p.$ref.converter, M = h[V], k = M.type, A = e(M), O = {}, T = i[k];
+    if (T && T.categories) {
+      const F = T.categories[f], j = F == null ? void 0 : F.title;
+      B && Object.keys(F.properties).forEach((P) => {
+        F.properties[P].$converter = B;
       });
-      const F = (S == null ? void 0 : S.properties) || {}, E = f(F, L, N, M, y, w);
-      return { categoryId: a, categoryName: O, properties: E };
+      const L = (F == null ? void 0 : F.properties) || {}, I = c(L, O, A, M, y, C);
+      return { categoryId: f, categoryName: j, properties: I };
     }
-    return { categoryId: a, categoryName: "", properties: [] };
-  }
-  function g(a, p, v, y, w) {
-    const T = a.type, V = e(a), M = {};
-    let k = w || i[T];
-    if (k && Object.keys(k).length === 0 && v && v.getPropConfig && (k = v.getPropConfig(y)), k && k.categories) {
-      const N = [];
-      return Object.keys(k.categories).map((L) => {
-        const b = k.categories[L];
-        if (b.$ref) {
-          N.push(d(L, b, a, p, y));
+    return { categoryId: f, categoryName: "", properties: [] };
+  }
+  function g(f, p, h, y, C) {
+    const V = f.type, B = e(f), M = {};
+    let k = C || i[V];
+    if (!(k && Object.keys(k).length > 0) && h && h.getPropConfig && (k = h.getPropConfig(y)), k && k.categories) {
+      const O = [];
+      return Object.keys(k.categories).map((T) => {
+        const F = k.categories[T];
+        if (F.$ref) {
+          O.push(d(T, F, f, p, y));
           return;
         }
-        const S = b == null ? void 0 : b.title, O = b == null ? void 0 : b.tabId, F = b == null ? void 0 : b.tabName, E = b == null ? void 0 : b.hide, B = b == null ? void 0 : b.hideTitle, R = f(b.properties || {}, M, V, a, p, y, b.$converter), { setPropertyRelates: P } = b, A = b == null ? void 0 : b.parentPropertyID;
-        N.push({ categoryId: L, categoryName: S, tabId: O, tabName: F, hide: E, properties: R, hideTitle: B, setPropertyRelates: P, parentPropertyID: A });
-      }), N;
+        const j = F == null ? void 0 : F.title, L = F == null ? void 0 : F.tabId, I = F == null ? void 0 : F.tabName, P = F == null ? void 0 : F.hide, U = F == null ? void 0 : F.hideTitle, x = c(F.properties || {}, M, B, f, p, y, F.$converter), { setPropertyRelates: E } = F, R = F == null ? void 0 : F.parentPropertyID;
+        O.push({ categoryId: T, categoryName: j, tabId: L, tabName: I, hide: P, properties: x, hideTitle: U, setPropertyRelates: E, parentPropertyID: R });
+      }), O;
     }
     return [];
   }
@@ -2732,97 +2732,106 @@ function we(i, t, e) {
     propertyConverterMap: n
   };
 }
-const Ie = {}, Ee = {};
-we(Ie, Ee, Pt);
-const Se = {}, xe = {}, { resolveSchemaWithDefaultValue: ni } = be(Se, xe), Me = {}, Te = {};
-we(Me, Te, ni);
-function ri(i, t, e = /* @__PURE__ */ new Map(), n = (s, m, c, u) => m, r = {}, l = (s) => s) {
-  return Ce[t.title] = t, Fe[t.title] = n, Ie[t.title] = r, Ee[t.title] = l, Se[t.title] = t, xe[t.title] = n, Me[t.title] = r, Te[t.title] = l, (s = {}, m = !0) => {
+const Me = {}, Te = {};
+Se(Me, Te, kt);
+const Pe = {}, ke = {}, { resolveSchemaWithDefaultValue: ni } = Ie(Pe, ke), Ve = {}, Be = {};
+Se(Ve, Be, ni);
+function ri(i, t, e = /* @__PURE__ */ new Map(), n = (l, m, a, u) => m, r = {}, s = (l) => l) {
+  return Ee[t.title] = t, xe[t.title] = n, Me[t.title] = r, Te[t.title] = s, Pe[t.title] = t, ke[t.title] = n, Ve[t.title] = r, Be[t.title] = s, (l = {}, m = !0) => {
     if (!m)
-      return Bt(s, e);
-    const c = Vt(s, t, e), u = Object.keys(i).reduce((f, o) => (f[o] = i[o].default, f), {});
-    return Object.assign(u, c);
+      return Bt(l, e);
+    const a = Vt(l, t, e), u = Object.keys(i).reduce((c, o) => (c[o] = i[o].default, c), {});
+    return Object.assign(u, a);
   };
 }
-const ke = Object.assign({}, ee, {
+const Ne = Object.assign({}, ne, {
   componentId: { type: String, default: "" }
-}), oi = ri(ke, ge, pe, me), li = /* @__PURE__ */ D({
+}), oi = ri(Ne, be, he, ye), si = /* @__PURE__ */ Q({
   name: "FFilterBarDesign",
-  props: ke,
+  props: Ne,
   emits: ["Clear", "Remove", "Reset"],
   setup(i, t) {
-    const e = I(!1), n = I(!1), r = I(!1), l = I(null), s = I(null), m = Ct(i), {
-      filterFields: c,
-      filterItems: u,
-      loadFilterItems: f
-    } = m, o = I(0), d = I(), g = Q("design-item-context"), a = Q("designer-host-service"), p = kt(g, a), v = ze(d, g, p), y = he(s, l, r), {
-      setupWidthObserver: w
-    } = y, {
-      resolveEditorProps: T
-    } = fe();
-    se("useFilterItemsComposition", {
-      useFilterItemsComposition: m,
-      resolveEditorProps: T
+    const e = w(!1), n = w(!1), r = w(!1), s = w(null), l = Ct(i), {
+      filterFields: m,
+      filterItems: a,
+      loadFilterItems: u
+    } = l, c = w(0), o = w(), d = _("design-item-context"), g = _("designer-host-service"), f = Pt(d, g), p = De(o, d, f), h = Fe(s, r), {
+      cancelWidthObserver: y,
+      setupWidthObserver: C
+    } = h, {
+      resolveEditorProps: V
+    } = ve();
+    ce("useFilterItemsComposition", {
+      useFilterItemsComposition: l,
+      resolveEditorProps: V
     });
-    const V = U(() => {
-      const E = {
-        display: c.value && c.value.length ? "" : "none"
+    const B = $(() => {
+      const F = {
+        display: m.value && m.value.length ? "" : "none"
       };
-      return de(E, i == null ? void 0 : i.customStyle);
+      return pe(F, i == null ? void 0 : i.customStyle);
     });
-    H(() => {
-      d.value.componentInstance = v, w();
-    }), t.expose(v.value), ae(() => i.fields, (E) => {
-      f(E, []), o.value++;
+    K(() => {
+      o.value.componentInstance = p, C();
+    }), fe(() => {
+      y();
+    }), t.expose(p.value), ue(() => i.fields, (F) => {
+      u(F, []), c.value++;
     }, {
       immediate: !0
     });
-    const M = U(() => n.value && e.value), k = U(() => ({
+    const M = $(() => n.value && e.value), k = $(() => ({
       "f-filter-list": !0,
       "f-filter-list-extend": M.value
-    })), N = U(() => u.value.length > 0);
-    function L() {
-      return C("div", {
+    }));
+    function A() {
+      return b("div", {
         class: k.value,
-        ref: l
-      }, [u.value.map((E, B) => C(wt, {
-        filterItem: E
+        key: i.id + "-main-" + c.value
+      }, [a.value.map((F, j) => b(wt, {
+        filterItem: F
       }, null))]);
     }
-    const b = U(() => !n.value && r.value);
-    function S() {
-      return C("div", {
+    function O() {
+      return r.value && b("div", {
         class: "f-filter-list-ellipsis"
-      }, [W("...")]);
+      }, [G("...")]);
     }
-    const O = U(() => !n.value), F = Ft(i, t, m);
-    return () => C("div", {
-      ref: d,
+    const T = Ft(i, t, l);
+    return () => b("div", {
+      ref: o,
       class: "f-filter-wrapper " + i.customClass,
-      style: V.value
-    }, [C("div", {
+      style: B.value
+    }, [b("div", {
       class: "f-filter-wrapper-inner f-utils-fill"
-    }, [C("div", {
-      class: "f-filter-main f-utils-fill",
+    }, [b("div", {
+      class: "f-filter-main f-utils-fill"
+    }, [b("div", {
+      class: "f-filter-list-wrapper flex-fill",
       ref: s
-    }, [C("div", {
-      class: "f-filter-list-wrapper",
-      key: i.id + "-main-" + o.value
-    }, [N.value && L()]), b.value && S(), O.value && F()])])]);
+    }, [A()]), O(), T()]), r.value && b("div", {
+      class: "f-filter-extend-btn"
+    }, [b("button", {
+      class: "btn btn-link"
+    }, [b("span", {
+      class: "extend-btn-text"
+    }, [G("展开")]), b("span", {
+      class: "extend-btn-arrow f-icon f-icon-arrow-chevron-down"
+    }, null)])])])]);
   }
 });
-G.install = (i) => {
-  i.component(G.name, G);
+D.install = (i) => {
+  i.component(D.name, D);
 };
-G.register = (i, t, e, n) => {
-  i["filter-bar"] = G, t["filter-bar"] = ct;
+D.register = (i, t, e, n) => {
+  i["filter-bar"] = D, t["filter-bar"] = ut;
 };
-G.registerDesigner = (i, t, e) => {
-  i["filter-bar"] = li, t["filter-bar"] = oi;
+D.registerDesigner = (i, t, e) => {
+  i["filter-bar"] = si, t["filter-bar"] = oi;
 };
 export {
-  G as FFilterBar,
-  G as default,
-  ee as filterBarProps,
-  ct as propsResolver
+  D as FFilterBar,
+  D as default,
+  ne as filterBarProps,
+  ut as propsResolver
 };