@farris/ui-vue 1.7.2-beta.1 → 1.7.2-beta.2

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

@@ -1,27 +1,27 @@
-var Re = Object.defineProperty;
-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, useTypeResolver as ve } from "../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";
-import { DgControl as tt } from "../designer-canvas/index.esm.js/";
-const he = /* @__PURE__ */ new Map([
-  ["appearance", We]
+var $e = Object.defineProperty;
+var je = (i, t, e) => t in i ? $e(i, t, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[t] = e;
+var S = (i, t, e) => je(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 qe, createTextVNode as z, Fragment as ce, Teleport as We, nextTick as te, provide as ue, watch as fe, onUnmounted as pe } from "vue";
+import { resolveAppearance as ze, getSchemaByType as oe, createPropsResolver as Ge } from "../dynamic-resolver/index.esm.js";
+import { DgControl as v, canvasChanged as J, refreshCanvas as De, useDesignerComponent as Qe } from "../designer-canvas/index.esm.js";
+import { useGuid as se, getMaxZIndex as _e, getCustomStyle as me, FormSchemaEntityField$Type as le, FormSchemaEntityFieldType$Type as Xe } from "../common/index.esm.js";
+import { useConditionValue as Ze, useConditionUtils as ie } from "../condition/index.esm.js";
+import { useCondition as Je, useSolutionUtils as ge } from "../query-solution/index.esm.js";
+import { FNotifyService as Ye } from "../notify/index.esm.js";
+import { LocaleService as ve } from "../locale/index.esm.js";
+import { cloneDeep as X, isPlainObject as ae } from "lodash-es";
+import { FDynamicFormGroup as He, useTypeResolver as he } from "../dynamic-form/index.esm.js";
+import { radioGroupProps as Ke } from "../radio-group/index.esm.js";
+import { useDataSource as et, FComboListContainer as tt } from "../combo-list/index.esm.js";
+import { DgControl as it } from "../designer-canvas/index.esm.js/";
+const ye = /* @__PURE__ */ new Map([
+  ["appearance", ze]
 ]);
-function it(i, t) {
+function nt(i, t) {
   const e = t == null ? void 0 : t.formSchemaUtils, n = i.parentComponentInstance, r = "54bddc89-5f7e-4b91-9c45-80dd6606cfe9";
   function s() {
-    const u = oe(v["content-container"].type), c = oe(v["filter-bar"].type);
-    if (!u || !c)
+    const u = oe(v["content-container"].type), d = oe(v["filter-bar"].type);
+    if (!u || !d)
       return;
     const o = Math.random().toString(36).substr(2, 4);
     Object.assign(u, {
@@ -29,12 +29,12 @@ function it(i, t) {
       appearance: {
         class: "f-filter-container"
       },
-      contents: [c]
-    }), Object.assign(c, {
+      contents: [d]
+    }), Object.assign(d, {
       id: "filter-" + o,
       fields: []
     });
-    const d = n.belongedComponentId, g = e.getViewModelIdByComponentId(d), f = e.getViewModelById(g);
+    const c = n.belongedComponentId, g = e.getViewModelIdByComponentId(c), f = e.getViewModelById(g);
     return f != null && f.states && (f.states.find((p) => p.code === "originalFilterConditionList") || f.states.push(
       {
         id: se().guid(),
@@ -43,16 +43,16 @@ function it(i, t) {
         name: "筛选条过滤条件",
         type: "String"
       }
-    )), { filterBar: c, filterBarContainer: u };
+    )), { filterBar: d, filterBarContainer: u };
   }
   function l() {
-    const u = e.getViewModelIdByComponentId(n.belongedComponentId), c = e.getViewModelById(u);
+    const u = e.getViewModelIdByComponentId(n.belongedComponentId), d = e.getViewModelById(u);
     let o;
-    if (c && c.commands) {
-      if (o = c.commands.find((d) => d.handlerName === "Filter" && d.cmpId === r), !o)
+    if (d && d.commands) {
+      if (o = d.commands.find((c) => c.handlerName === "Filter" && c.cmpId === r), !o)
         o = {
           id: se().guid(),
-          code: `${c.id.replace(/-/g, "").replace("component", "").replace("viewmodel", "")}Filter1`,
+          code: `${d.id.replace(/-/g, "").replace("component", "").replace("viewmodel", "")}Filter1`,
           name: "过滤并加载数据1",
           params: [
             {
@@ -70,25 +70,25 @@ function it(i, t) {
           ],
           handlerName: "Filter",
           cmpId: r
-        }, c.commands.push(o);
+        }, d.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}`);
+        const c = o.params.find((g) => g.name === "filter");
+        c && (c.value = `{UISTATE~/#{${n.belongedComponentId}}/originalFilterConditionList}`);
       }
     }
     return { filterInGridViewModel: o };
   }
   function m(u) {
-    const c = e.getCommands();
-    if (!c)
+    const d = e.getCommands();
+    if (!d)
       return;
-    let o = c.find((d) => d.id === r);
+    let o = d.find((c) => c.id === r);
     o || (o = {
       id: r,
       path: "igix/Web/WebCmp/bo-webcmp/metadata/webcmd/data-commands",
       name: "LoadCommands.webcmd",
       refedHandlers: []
-    }, e.getCommands().push(o)), u && !o.refedHandlers.find((d) => d.host === u.id) && o.refedHandlers.push(
+    }, e.getCommands().push(o)), u && !o.refedHandlers.find((c) => c.host === u.id) && o.refedHandlers.push(
       {
         host: u.id,
         handler: "Filter"
@@ -96,22 +96,22 @@ function it(i, t) {
     );
   }
   function a() {
-    const { filterBar: u, filterBarContainer: c } = s(), { filterInGridViewModel: o } = l();
+    const { filterBar: u, filterBarContainer: d } = s(), { filterInGridViewModel: o } = l();
     u && o && (u.onQuery = o.code), m(o);
-    const d = t == null ? void 0 : t.useFormCommand;
-    return d && d.checkCommands(), c;
+    const c = t == null ? void 0 : t.useFormCommand;
+    return c && c.checkCommands(), d;
   }
   return { createFilterBar: a };
 }
-function ye(i, t, e, n) {
+function be(i, t, e, n) {
   if (e.parentComponentInstance && n) {
-    const l = it(e, n).createFilterBar();
+    const l = nt(e, n).createFilterBar();
     if (l)
       return l;
   }
   return t;
 }
-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 = {
+const rt = "https://json-schema.org/draft/2020-12/schema", ot = "https://farris-design.gitee.io/filter-bar.schema.json", st = "filter-bar", lt = "A Farris Component", at = "object", dt = {
   id: {
     description: "The unique identifier for filter-bar",
     type: "string"
@@ -155,20 +155,20 @@ const nt = "https://json-schema.org/draft/2020-12/schema", rt = "https://farris-
     description: "",
     type: "string"
   }
-}, dt = [
+}, ct = [
   "id",
   "type"
-], ct = {
+], ut = {
   onQuery: "查询事件"
-}, be = {
-  $schema: nt,
-  $id: rt,
-  title: ot,
-  description: st,
-  type: lt,
-  properties: at,
-  required: dt,
-  events: ct
+}, Ce = {
+  $schema: rt,
+  $id: ot,
+  title: st,
+  description: lt,
+  type: at,
+  properties: dt,
+  required: ct,
+  events: ut
 }, ne = {
   /** 指定已设的筛选条件列表 */
   defaultValues: {
@@ -187,9 +187,9 @@ const nt = "https://json-schema.org/draft/2020-12/schema", rt = "https://farris-
   resetText: { type: String, default: "清空筛选" },
   customClass: { type: String, default: "" },
   customStyle: { type: String, default: "" }
-}, ut = Ge(ne, be, he, ye);
+}, ft = Ge(ne, Ce, ye, be);
 function ee() {
-  const { getLocaleValue: i } = ge;
+  const { getLocaleValue: i } = ve;
   return {
     confirm: i("filterBar.confirm"),
     cancel: i("filterBar.cancel"),
@@ -200,19 +200,19 @@ function ee() {
     require: i("filterBar.require")
   };
 }
-function ft(i) {
-  return ge.getRealPropertyValue(i, "清空筛选", "filterBar.reset");
+function pt(i) {
+  return ve.getRealPropertyValue(i, "清空筛选", "filterBar.reset");
 }
-function pt(i, t, e, n) {
+function mt(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();
+  const a = /* @__PURE__ */ new Map(), { createConditionValue: u } = Ze(), { convertToControls: d } = ie("filter-bar"), o = Je(i, t), { getFilterConditions: c } = o, { fieldToCondition: g, judgeLoadNewValue: f } = ge(), p = new Ye(), 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);
+    s.value = d(I), s.value.reduce((P, U) => (P.set(U.labelCode, U), P), a);
   }
   function B(I) {
     const P = Array.isArray(I) ? I : [];
@@ -235,11 +235,11 @@ function pt(i, t, e, n) {
       return P.value && !((U = P.value) != null && U.isEmpty());
     })) > -1;
   }
-  function A(I, P = []) {
+  function R(I, P = []) {
     const U = JSON.stringify(I || []);
     U !== y && (t.emit("conditionChange", I), y = U, P.length === 0 && t.emit("query", I));
   }
-  function O() {
+  function N() {
     var x;
     k();
     const I = [];
@@ -247,29 +247,29 @@ function pt(i, t, e, n) {
       E.required && (!E.value || E.value.isEmpty()) && I.push(E.fieldName || "");
     });
     const P = (x = l.value) == null ? void 0 : x.filter((E) => {
-      var R;
-      return E.value && !((R = E.value) != null && R.isEmpty());
+      var A;
+      return E.value && !((A = E.value) != null && A.isEmpty());
     });
     if (I.length > 0) {
       p.warning({ message: h.require.replace("[fields]", I.join(",")), position: "top-center" });
       return;
     }
-    const U = d(P, s.value);
-    A(U, I);
+    const U = c(P, s.value);
+    R(U, I);
   }
   function T(I, P, U = !0) {
-    V(I), B(P), U && O();
+    V(I), B(P), U && N();
   }
   function F(I) {
-    I.value.clear(), r.value = r.value.filter((P) => P.fieldCode !== I.fieldCode), t.emit("clear", I.fieldCode), O();
+    I.value.clear(), r.value = r.value.filter((P) => P.fieldCode !== I.fieldCode), t.emit("clear", I.fieldCode), N();
   }
   function j() {
     l.value.forEach((I) => I.value.clear());
   }
-  function L() {
+  function O() {
     l.value.forEach((I) => {
       I.value.clear();
-    }), t.emit("reset"), O(), n.resizeFilerBar();
+    }), t.emit("reset"), N(), n.resizeFilerBar();
   }
   return {
     clearAll: j,
@@ -280,27 +280,27 @@ function pt(i, t, e, n) {
     fieldMap: a,
     loadFilterItems: T,
     removeFilterItem: M,
-    reset: L,
+    reset: O,
     shouldShowClearButtonInFilterItem: C,
-    handleQuery: O
+    handleQuery: N
   };
 }
-function mt(i, t, e, n) {
-  const r = w([]), s = ee(), l = w(s.advancedFilter), m = w(ft(i.resetText)), a = w(!1), {
+function gt(i, t, e, n) {
+  const r = w([]), s = ee(), l = w(s.advancedFilter), m = w(pt(i.resetText)), a = w(!1), {
     clearAll: u,
-    reset: c,
+    reset: d,
     filterItems: o
   } = e;
-  function d() {
+  function c() {
     r.value = o.value.filter((h) => h.isExtend);
   }
-  d();
+  c();
   const g = $(() => r.value && r.value.length > 0);
   function f(h) {
     a.value = !0;
   }
   function p(h) {
-    i.mode === "display-only" ? u() : c();
+    i.mode === "display-only" ? u() : d();
   }
   return () => b("div", {
     class: "f-filter-toolbars"
@@ -312,7 +312,7 @@ function mt(i, t, e, n) {
     onClick: (h) => p()
   }, [m.value])]);
 }
-const gt = {
+const vt = {
   filterItem: { type: Object, default: null },
   position: { type: Object, default: null },
   /**
@@ -321,22 +321,22 @@ const gt = {
   reference: {
     type: Object
   }
-}, vt = Object.assign({}, Ye), ht = /* @__PURE__ */ Q({
+}, ht = Object.assign({}, Ke), yt = /* @__PURE__ */ Q({
   name: "FFilterRadioGroup",
-  props: vt,
+  props: ht,
   emits: ["update:modelValue", "change"],
   setup(i, t) {
     const e = w(), {
       dataSource: n,
       displayText: r,
       modelValue: s
-    } = Ke(i, t);
+    } = et(i, t);
     function l(m) {
       r.value = m.map((u) => u[i.textField]).join(i.separator);
       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 () => b(et, {
+    return () => b(tt, {
       style: "margin: -2px -15px;padding: 0;",
       ref: e,
       idField: i.valueField,
@@ -352,21 +352,21 @@ const gt = {
       }
     }, null);
   }
-}), yt = /* @__PURE__ */ Q({
+}), bt = /* @__PURE__ */ Q({
   name: "FFilterBarItemCondition",
-  props: gt,
+  props: vt,
   emits: ["cancel", "confirm", "clearFilter"],
   setup(i, t) {
-    const e = w(H(i.filterItem)), n = w(), r = ee(), s = w("0px"), l = w("0px"), m = w("0px"), a = w("auto"), u = $(() => ({
+    const e = w(X(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 = $(() => ({
+    })), d = $(() => ({
       left: s.value,
       top: l.value
     })), o = $(() => ({
       width: m.value === "0px" ? null : m.value,
       maxWidth: m.value === "0px" ? null : m.value
-    })), d = w(), {
+    })), c = w(), {
       useFilterItemsComposition: g,
       resolveEditorProps: f
     } = _("useFilterItemsComposition"), {
@@ -378,57 +378,57 @@ const gt = {
     let V = !1, B = {};
     const M = w(!0);
     function k() {
-      var q, X;
-      if (!i.reference || !d.value)
+      var q, Z;
+      if (!i.reference || !c.value)
         return;
       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";
+      let E = (Z = c.value) == null ? void 0 : Z.getBoundingClientRect().width;
+      const A = document.body.clientWidth - x.x - 30, L = document.body.clientWidth - x.y - 30;
+      E > A && E > L && (E = Math.max(A, L)), 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) {
+    function R(x, E, A, L) {
       V = !0, B = {
         value: E,
-        editor: R,
-        option: N
+        editor: A,
+        option: L
       };
     }
-    function O() {
+    function N() {
       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;
+      return E ? !!E.find((L) => !L || !L.classList ? !1 : L.classList.contains("popover") && L.style.visibility === "visible") : !1;
     }
-    function T(x, E, R, N) {
-      y(x, E, R, N), t.emit("confirm", e.value);
+    function T(x, E, A, L) {
+      y(x, E, A, L), t.emit("confirm", e.value);
     }
     function F() {
       const {
         id: x,
         editor: E,
-        needEmitChange: R
-      } = h(p, e.value, A);
+        needEmitChange: A
+      } = h(p, e.value, R);
       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, {
+        const L = f(E.type, E);
+        return M.value = !1, b(yt, qe(L, {
           modelValue: e.value.value.value,
           "onUpdate:modelValue": (q) => e.value.value.value = q,
           onChange: (q) => {
             T(e.value, q, E);
           }
         }), {
-          default: () => [G(" ")]
+          default: () => [z(" ")]
         });
       }
-      return b(Je, {
+      return b(He, {
         showLabelType: "force-none",
         id: x,
         key: x,
         editor: E,
         modelValue: e.value.value.value,
-        "onUpdate:modelValue": (N) => e.value.value.value = N,
-        onChange: (N, q) => {
-          R && A(e.value, N, E, q);
+        "onUpdate:modelValue": (L) => e.value.value.value = L,
+        onChange: (L, q) => {
+          A && R(e.value, L, E, q);
         }
       }, null);
     }
@@ -437,16 +437,16 @@ const gt = {
     });
     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");
+      ["input", "radio-group", "switch"].findIndex((A) => A === E) > -1 ? t.emit("cancel") : N() || t.emit("cancel");
     }
-    function L(x) {
+    function O(x) {
       x.stopPropagation(), V && y(e.value, B.value, B.editor, B.option), t.emit("confirm", e.value);
     }
     function I(x) {
       e.value.value.clear(), x.stopPropagation(), t.emit("confirm", e.value);
     }
     function P() {
-      const x = Qe();
+      const x = _e();
       return {
         zIndex: Math.max(x, 1050)
       };
@@ -461,8 +461,8 @@ const gt = {
       }
     }, [b("div", {
       class: "f-filter-panel " + C.value,
-      ref: d,
-      style: c.value
+      ref: c,
+      style: d.value
     }, [b("div", {
       class: "f-filter-panel-inner",
       style: o.value,
@@ -485,15 +485,15 @@ const gt = {
       onClick: j
     }, [r.cancel]), b("button", {
       class: "filter-panel-submit btn btn-primary",
-      onClick: L
+      onClick: O
     }, [r.confirm])])])])])]);
   }
-}), Ce = {
+}), Fe = {
   filterItem: { type: Object, default: null },
   disabled: { type: Boolean, default: !1 }
-}, bt = /* @__PURE__ */ Q({
+}, Ct = /* @__PURE__ */ Q({
   name: "FFilterBarItem",
-  props: Ce,
+  props: Fe,
   emits: ["confirm"],
   setup(i, t) {
     const e = w(i.filterItem), {
@@ -503,7 +503,7 @@ const gt = {
       currentFilterId: s,
       removeFilterItem: l,
       shouldShowClearButtonInFilterItem: m
-    } = n, a = w(!1), u = w(!1), c = w(), o = w(""), d = w(), g = function() {
+    } = n, a = w(!1), u = w(!1), d = w(), o = w(""), c = w(), g = function() {
       return {
         "f-filter-item": !0,
         "f-state-disabled": i.disabled,
@@ -523,7 +523,7 @@ const gt = {
       a.value = !1;
     }
     function y() {
-      d.value && d.value.scrollWidth > d.value.clientWidth ? o.value = d.value.innerHTML : o.value = "";
+      c.value && c.value.scrollWidth > c.value.clientWidth ? o.value = c.value.innerHTML : o.value = "";
     }
     function C(M) {
       a.value = !1, e.value.value = M.value, t.emit("confirm", M), te(() => {
@@ -546,17 +546,17 @@ const gt = {
       onMouseleave: () => B()
     }, [b("div", {
       class: "f-filter-item-inner",
-      ref: c,
+      ref: d,
       onClick: (M) => p()
     }, [e.value.required && b("span", {
       class: "f-filter-item-required text-danger"
-    }, [G("*")]), b("span", {
+    }, [z("*")]), b("span", {
       class: "f-filter-item-text"
-    }, [e.value.fieldName]), !e.value.value.isEmpty() && b(de, null, [b("span", {
+    }, [e.value.fieldName]), !e.value.value.isEmpty() && b(ce, null, [b("span", {
       class: "f-filter-item-tip"
-    }, [G(":")]), b("span", {
+    }, [z(":")]), b("span", {
       class: "f-filter-item-content",
-      ref: d,
+      ref: c,
       title: o.value
     }, [e.value.value.getDisplayText()])]), !i.disabled && b("span", {
       class: "f-filter-item-arrow f-icon f-icon-arrow-chevron-down"
@@ -565,47 +565,47 @@ const gt = {
       onClick: (M) => f()
     }, [b("span", {
       class: "f-icon f-icon-close-circle"
-    }, null)]), a.value && b(qe, {
+    }, null)]), a.value && b(We, {
       to: "body"
     }, {
-      default: () => [b(yt, {
+      default: () => [b(bt, {
         filterItem: e.value,
-        reference: c.value,
+        reference: d.value,
         onConfirm: C,
         onCancel: h
       }, null)]
     })]);
   }
 });
-function Fe(i, t) {
+function we(i, t) {
   const e = w(null), n = 15;
   let r = 0;
   function s(a = -1, u = -1) {
     var f;
     if (!i.value)
       return;
-    const c = (f = i.value) == null ? void 0 : f.querySelector(".f-filter-list");
-    if (!c)
+    const d = (f = i.value) == null ? void 0 : f.querySelector(".f-filter-list");
+    if (!d)
       return;
-    const o = c.children;
+    const o = d.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;
+    }), t.value = d.clientWidth < d.scrollWidth;
+    let c = !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);
+      !c && g + y <= a ? g += y : (h.style.display = "none", c = !0);
     }
     r = a;
   }
   function l() {
-    var u, c;
+    var u, d;
     if (!i.value)
       return;
     (u = e.value) == null || u.unobserve(i.value);
-    const a = ((c = i.value.querySelector(".f-filter-list")) == null ? void 0 : c.children) || [];
+    const a = ((d = i.value.querySelector(".f-filter-list")) == null ? void 0 : d.children) || [];
     Array.from(a).forEach((o) => {
       o.style.display = "flex";
     }), r = 0;
@@ -614,8 +614,8 @@ function Fe(i, t) {
     if (!i.value)
       return;
     const a = new ResizeObserver((u) => {
-      const c = u[0].contentRect.width;
-      s(c);
+      const d = u[0].contentRect.width;
+      s(d);
     });
     return a.observe(i.value), e.value = a, a;
   }
@@ -630,39 +630,39 @@ const D = /* @__PURE__ */ Q({
   props: ne,
   emits: ["clear", "remove", "reset", "conditionChange", "change", "query"],
   setup(i, t) {
-    const e = w(!1), n = w(!1), r = w(null), s = w(!1), l = w(0), m = Fe(r, n), {
+    const e = w(!1), n = w(!1), r = w(null), s = w(!1), l = w(0), m = we(r, n), {
       cancelWidthObserver: a,
       setupWidthObserver: u,
-      handleVisibleChildren: c
+      handleVisibleChildren: d
     } = m, o = {
       resizeFilerBar: () => {
         e.value || te(() => {
-          c(-1, 0);
+          d(-1, 0);
         });
       }
-    }, d = pt(i, t, s, o), {
+    }, c = mt(i, t, s, o), {
       filterFields: g,
       filterItems: f,
       loadFilterItems: p,
       handleQuery: h
-    } = d, {
+    } = c, {
       resolveEditorProps: y
-    } = ve();
-    ce("useFilterItemsComposition", {
-      useFilterItemsComposition: d,
+    } = he();
+    ue("useFilterItemsComposition", {
+      useFilterItemsComposition: c,
       resolveEditorProps: y
     });
     const C = ee(), V = $(() => {
-      const L = {
+      const O = {
         display: g.value && g.value.length ? "" : "none"
       };
-      return pe(L, i == null ? void 0 : i.customStyle);
+      return me(O, i == null ? void 0 : i.customStyle);
     });
-    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();
+    p(i.fields, i.defaultValues, !!(i.defaultValues && i.defaultValues.length > 0)), fe([() => i.defaultValues, () => i.fields], ([O, I]) => {
+      p(I, O), l.value++, o.resizeFilerBar();
     }), K(() => {
       u();
-    }), fe(() => {
+    }), pe(() => {
       a();
     });
     const B = $(() => ({
@@ -675,28 +675,28 @@ const D = /* @__PURE__ */ Q({
       "f-icon-arrow-chevron-up": e.value,
       "f-icon-arrow-chevron-down": !e.value
     })), k = $(() => !e.value && n.value);
-    function A() {
+    function R() {
       e.value = !e.value, e.value ? a() : u();
     }
-    const O = mt(i, t, d, s);
-    function T(L) {
-      t.emit("change", L), h(), o.resizeFilerBar();
+    const N = gt(i, t, c, s);
+    function T(O) {
+      t.emit("change", O), h(), o.resizeFilerBar();
     }
     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,
+      }, [f.value.map((O, I) => !O.isExtend && b(Ct, {
+        filterItem: O,
         onConfirm: T,
-        disabled: i.disabled || L.disabled
-      }, null)), e.value && O()]);
+        disabled: i.disabled || O.disabled
+      }, null)), e.value && N()]);
     }
     function j() {
       return k.value && b("div", {
         class: "f-filter-list-ellipsis",
-        onClick: (L) => A()
-      }, [G("...")]);
+        onClick: (O) => R()
+      }, [z("...")]);
     }
     return () => b("div", {
       class: "f-filter-wrapper " + i.customClass,
@@ -708,11 +708,11 @@ const D = /* @__PURE__ */ Q({
     }, [b("div", {
       class: "f-filter-list-wrapper flex-fill",
       ref: r
-    }, [F()]), j(), !e.value && O()]), n.value && b("div", {
+    }, [F()]), j(), !e.value && N()]), n.value && b("div", {
       class: "f-filter-extend-btn"
     }, [b("button", {
       class: "btn btn-link",
-      onClick: A
+      onClick: R
     }, [b("span", {
       class: "extend-btn-text"
     }, [e.value ? C.fold : C.expand]), b("span", {
@@ -720,22 +720,22 @@ const D = /* @__PURE__ */ Q({
     }, null)])])])]);
   }
 });
-function Ct(i, t) {
+function Ft(i, t) {
   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();
+  const s = /* @__PURE__ */ new Map(), { convertToControls: l } = ie("filter-bar"), { fieldToCondition: m } = ge();
+  function a(c) {
+    return !c.value.isEmpty();
   }
-  function u(d) {
-    e.value = H(d), e.value.reduce((g, f) => (g.set(f.labelCode, f), g), s);
+  function u(c) {
+    e.value = X(c), e.value.reduce((g, f) => (g.set(f.labelCode, f), g), s);
   }
-  function c(d) {
+  function d(c) {
     n.value = e.value.map((g) => m(g));
   }
-  function o(d, g) {
-    u(d), c();
+  function o(c, g) {
+    u(c), d();
   }
   return o(i.fields), {
     currentFilterId: r,
@@ -746,7 +746,7 @@ function Ct(i, t) {
     shouldShowClearButtonInFilterItem: a
   };
 }
-function Ft(i, t, e) {
+function wt(i, t, e) {
   const n = w([]), r = w("更多筛选"), {
     filterItems: s
   } = e;
@@ -761,9 +761,9 @@ function Ft(i, t, e) {
     class: "btn btn-link"
   }, [r.value])]);
 }
-const wt = /* @__PURE__ */ Q({
+const It = /* @__PURE__ */ Q({
   name: "FFilterBarItemDesign",
-  props: Ce,
+  props: Fe,
   emits: ["confirm"],
   setup(i, t) {
     const e = w(i.filterItem), {
@@ -787,11 +787,11 @@ const wt = /* @__PURE__ */ Q({
       class: "f-filter-item-inner"
     }, [e.value.required && b("span", {
       class: "f-filter-item-required text-danger"
-    }, [G("*")]), b("span", {
+    }, [z("*")]), b("span", {
       class: "f-filter-item-text"
-    }, [e.value.fieldName]), e.value.value.getDisplayText() && b(de, null, [b("span", {
+    }, [e.value.fieldName]), e.value.value.getDisplayText() && b(ce, null, [b("span", {
       class: "f-filter-item-tip"
-    }, [G(":")]), b("span", {
+    }, [z(":")]), b("span", {
       class: "f-filter-item-content"
     }, [e.value.value.getDisplayText()])]), !l.value && b("span", {
       class: "f-filter-item-arrow f-icon f-icon-arrow-chevron-down"
@@ -802,7 +802,7 @@ const wt = /* @__PURE__ */ Q({
     }, null)])]);
   }
 });
-function It(i) {
+function Et(i) {
   const { formSchemaUtils: t, formStateMachineUtils: e } = i;
   function n(a, u = "") {
     return {
@@ -812,15 +812,15 @@ function It(i) {
     };
   }
   function r(a, u = "") {
-    const c = t.getViewModelById(a);
-    return c ? c.states.map((o) => n(o, u)) : [];
+    const d = t.getViewModelById(a);
+    return d ? d.states.map((o) => n(o, u)) : [];
   }
   function s(a) {
-    const u = t.getRootViewModelId(), c = r(a);
+    const u = t.getRootViewModelId(), d = r(a);
     if (a === u)
-      return c;
+      return d;
     const o = r(u, "root-component.");
-    return [...c, ...o];
+    return [...d, ...o];
   }
   function l(a) {
     return a.binding && a.binding.path || a.id || "";
@@ -830,7 +830,7 @@ function It(i) {
   }
   return { getVariables: s, getControlName: l, getStateMachines: m };
 }
-class we {
+class Ie {
   constructor(t) {
     S(this, "sessionVariables", [
       {
@@ -1015,12 +1015,12 @@ class we {
   }
   updateExpression(t, e, n, r) {
     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() === "";
+    let a = this.getExpressionData().find((d) => d.targetType === e && d.target === s);
+    const u = (d) => d.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));
+      const d = a.rules.find((o) => o.id === l.id);
+      if (d)
+        u(l) ? a.rules = a.rules.filter((o) => o.id !== l.id) : (Object.assign(d, l), r === "validate" && t.type === "form-group" && (d.elementId = t.id));
       else {
         if (u(l))
           return null;
@@ -1055,11 +1055,11 @@ class we {
           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);
+          onSubmitModal: (d) => {
+            const o = this.updateExpression(t, e, d, l);
             if (r) {
-              const d = this.buildRule(m, c, l);
-              r(d);
+              const c = this.buildRule(m, d, l);
+              r(c);
             }
             return o;
           }
@@ -1097,7 +1097,7 @@ class we {
     };
   }
 }
-class Et {
+class xt {
   constructor(t, e) {
     S(this, "componentId");
     S(this, "viewModelId");
@@ -1194,7 +1194,7 @@ class Et {
           switch (l && l.propertyID) {
             case "class":
             case "style": {
-              Z.value++;
+              J.value++;
               break;
             }
           }
@@ -1214,26 +1214,26 @@ class Et {
    * @returns 
    */
   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 = {
+    const { getVariables: m, getControlName: a, getStateMachines: u } = Et(this.designerHostService), d = this.getRealTargetType(t), o = e && e.length > 0 ? e : ["Const", "Variable", "StateMachine", "Expression"], c = {
       type: "property-editor",
       propertyTypes: o
     };
     return o.map((g) => {
       switch (g) {
         case "Const":
-          Object.assign(d, {
+          Object.assign(c, {
             constType: "enum",
             constEnums: [{ id: !0, name: "是" }, { id: !1, name: "否" }]
           }, r);
           break;
         case "Expression":
-          d.expressionConfig = this.getExpressionOptions(t, c, l || n);
+          c.expressionConfig = this.getExpressionOptions(t, d, l || n);
           break;
         case "StateMachine":
-          d.stateMachines = u();
+          c.stateMachines = u();
           break;
         case "Variable":
-          Object.assign(d, {
+          Object.assign(c, {
             controlName: a(t),
             newVariablePrefix: "is",
             newVariableType: "Boolean",
@@ -1242,10 +1242,10 @@ class Et {
             onBeforeOpenVariables: (f) => {
               f.value = m(this.viewModelId);
             }
-          }, s), this.designerContext.designerMode === "PC_RTC" && (d.newVariablePrefix = "ext_" + d.newVariablePrefix);
+          }, s), this.designerContext.designerMode === "PC_RTC" && (c.newVariablePrefix = "ext_" + c.newVariablePrefix);
           break;
       }
-    }), d;
+    }), c;
   }
   getVisibleProperty(t, e = "") {
     var s;
@@ -1308,8 +1308,8 @@ class Et {
     const n = e && e.parent && e.parent.schema;
     if (!n)
       return;
-    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();
+    const r = n.contents.findIndex((l) => l.id === t), s = X(n.contents[r]);
+    n.contents.splice(r, 1), n.contents.splice(r, 0, s), De();
   }
   /**
    * 属性编辑器，在编辑过程中会新增变量，此处需要将新增的变量追加到ViewModel中
@@ -1339,16 +1339,16 @@ class Et {
     const e = t.propertyValue;
     if (!((e && e.type) === "Expression" && e.expressionInfo))
       return;
-    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;
+    const { expressionId: s, expressionInfo: l } = e, { targetId: m, targetType: a, expressionType: u, value: d, message: o } = l, c = this.formSchemaUtils.getModule();
+    c.expressions = c.expressions || [];
+    const { expressions: g } = c;
     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 = c, p.message = o;
+      p.value = d, p.message = o;
     else {
-      const h = { id: s, type: u, value: c, message: o };
+      const h = { id: s, type: u, value: d, message: o };
       f.rules.push(h);
     }
     delete e.expressionInfo;
@@ -1367,7 +1367,7 @@ class Et {
     !a || !a.rules || (a.rules = a.rules.filter((u) => u.type !== s));
   }
   getExpressionOptions(t, e, n) {
-    return new we(this.formSchemaUtils).getExpressionOptions(t, e, n);
+    return new Ie(this.formSchemaUtils).getExpressionOptions(t, e, n);
   }
   getRealTargetType(t) {
     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";
@@ -1386,14 +1386,14 @@ class Et {
     }, e;
   }
 }
-const z = class z {
+const G = class G {
   /**
    * 根据绑定字段类型获取可用的输入类控件
    */
   static getEditorTypesByMDataType(t, e = !1, n = "") {
     if (e)
       return [{ key: v["language-textbox"].type, value: v["language-textbox"].name }];
-    let r = z.fieldControlTypeMapping[t];
+    let r = G.fieldControlTypeMapping[t];
     if (n === "data-grid-column" && (r != null && r.length)) {
       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));
@@ -1405,8 +1405,8 @@ const z = class z {
    */
   static getAllInputTypes() {
     const t = [];
-    for (const e in z.fieldControlTypeMapping)
-      z.fieldControlTypeMapping[e].forEach((n) => {
+    for (const e in G.fieldControlTypeMapping)
+      G.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;
@@ -1424,7 +1424,7 @@ const z = class z {
 /**
  * <字段类型,可配置的控件类型列表>的映射
  */
-S(z, "fieldControlTypeMapping", {
+S(G, "fieldControlTypeMapping", {
   String: [
     { key: v["input-group"].type, value: v["input-group"].name },
     { key: v.lookup.type, value: v.lookup.name },
@@ -1478,9 +1478,9 @@ S(z, "fieldControlTypeMapping", {
     { key: v["radio-group"].type, value: v["radio-group"].name }
   ]
 });
-let Y = z;
-var J = /* @__PURE__ */ ((i) => (i.Form = "Form", i.Variable = "Variable", i))(J || {});
-class xt {
+let H = G;
+var Y = /* @__PURE__ */ ((i) => (i.Form = "Form", i.Variable = "Variable", i))(Y || {});
+class de {
   constructor() {
     /** 控件标题 */
     S(this, "label", "");
@@ -1514,8 +1514,8 @@ function St(i) {
   let t, e;
   const n = /* @__PURE__ */ new Map();
   let r = [];
-  function s(c, o) {
-    const g = c.split(" ").filter((C) => C.startsWith("col-"));
+  function s(d, o) {
+    const g = ((d == null ? void 0 : d.split(" ")) || []).filter((C) => C.startsWith("col-"));
     if (g.length === 0) {
       o.isSupportedClass = !1;
       return;
@@ -1523,31 +1523,38 @@ function St(i) {
     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 l(c, o, d, g = !1) {
+  function l(d, o, c, g = !1) {
     let f = !1;
-    c.contents.forEach((p) => {
+    if (!d.contents || d.contents.length === 0) {
+      const p = new de();
+      s(d.layout, p), o.push(p);
+      return;
+    }
+    d.contents.forEach((p) => {
       if (p.type === "fieldset") {
-        d += 1, l(p, o, d, !0), f = !0;
+        c += 1, l(p, o, c, !0), f = !0;
         return;
       }
-      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);
+      if (p.type === "dynamic-form")
+        return;
+      f && (c += 1, f = !1);
+      const h = p.appearance && p.appearance.class, y = new de();
+      h ? s(h, y) : y.isSupportedClass = !1, y.label = p.label || p.id, y.id = p.id, y.group = c, g && (y.fieldSetId = d.id), e === p.id && (t = c), n.set(p.id, p), o.push(y);
     });
   }
-  function m(c) {
-    const o = i.getComponentById(c);
+  function m(d) {
+    const o = i.getComponentById(d);
     if (!o || !o.componentType || !o.componentType.startsWith("form"))
       return { result: !1, message: "只可以在响应式表单组件中调整响应式布局配置" };
-    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 };
+    const c = i.selectNode(o, (g) => g.type === v["response-form"].type);
+    return !c || !c.contents || c.contents.length === 0 ? { result: !1, message: "Form区域内没有控件，请先添加控件" } : { result: !0, message: "", formNode: c };
   }
-  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 = c.id, r = [], n.clear();
+  function a(d, o) {
+    o = o || d.id;
+    const { result: c, message: g, formNode: f } = m(o);
+    if (!c)
+      return { result: c, message: g };
+    e = d.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);
@@ -1559,17 +1566,17 @@ function St(i) {
       importData: r
     };
   }
-  function u(c, o) {
+  function u(d, o) {
     o = o;
-    const { result: d, formNode: g } = m(o);
-    if (!d)
+    const { result: c, formNode: g } = m(o);
+    if (!c)
       return "";
     const f = [];
-    return c.forEach((p) => {
+    return d.forEach((p) => {
       var C;
       const h = n.get(p.id), y = h.appearance && h.appearance.class;
       if (y) {
-        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);
+        const B = y.split(" ").filter((F) => !F.startsWith("col-")), M = "col-" + p.columnInSM, k = "col-md-" + p.columnInMD, R = "col-xl-" + p.columnInLG, N = "col-el-" + p.columnInEL, T = [M, k, R, N].concat(B);
         h.appearance.class = T.join(" ");
       }
       if (p.fieldSetId) {
@@ -1586,7 +1593,7 @@ function St(i) {
     getResonseFormLayoutConfig: l
   };
 }
-class Mt extends Et {
+class Mt extends xt {
   constructor(e, n) {
     super(e, n);
     S(this, "responseLayoutEditorFunction");
@@ -1672,19 +1679,19 @@ class Mt extends Et {
           readonly: this.formSchemaUtils.designerMode === "PC_RTC" && !e.isRtcControl
         }
       },
-      setPropertyRelates(c, o, d) {
-        if (c)
-          switch (c && c.propertyID) {
+      setPropertyRelates(d, o, c) {
+        if (d)
+          switch (d && d.propertyID) {
             case "type": {
-              s.changeControlType(e, c, n);
+              s.changeControlType(e, d, n);
               break;
             }
             case "label": {
-              c.needRefreshControlTree = !0;
+              d.needRefreshControlTree = !0;
               break;
             }
             case "binding": {
-              s.changeBindingField(e, c, d);
+              s.changeBindingField(e, d, c);
               break;
             }
           }
@@ -1721,7 +1728,7 @@ class Mt extends Et {
         }]
       };
     let 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, !!((l = this.designViewModelField) != null && l.multiLanguage))), { canChangeControlType: n, editorTypeList: r };
+    return this.designViewModelField && this.designViewModelField.$type === le.SimpleField ? r = H.getEditorTypesByMDataType(this.designViewModelField.type.name, this.designViewModelField.multiLanguage) : this.bindingVarible && (r = H.getEditorTypesByMDataType(this.bindingVarible.type, !!((l = this.designViewModelField) != null && l.multiLanguage))), { canChangeControlType: n, editorTypeList: r };
   }
   changeBindingField(e, n, r) {
     n.needRefreshEntityTree = !0;
@@ -1772,10 +1779,10 @@ class Mt extends Et {
               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(s.propertyValue, e.id, this.componentId), Z.value++;
+              r.updateUnifiedLayoutAfterControlChanged(s.propertyValue, e.id, this.componentId), J.value++;
               break;
             case "style": {
-              Z.value++;
+              J.value++;
               break;
             }
           }
@@ -1794,14 +1801,14 @@ class Mt extends Et {
     const s = n.propertyValue, l = r && r.parent && r.parent.schema;
     if (!l)
       return;
-    const m = l.contents.findIndex((c) => c.id === e.id);
+    const m = l.contents.findIndex((d) => d.id === e.id);
     if (m === -1)
       return;
     const a = l.contents[m];
     let u;
     if (this.designViewModelField) {
-      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);
+      const c = this.formSchemaUtils.getViewModelById(this.viewModelId).fields.find((f) => f.id === this.designViewModelField.id).fieldSchema || {};
+      c.editor || (c.editor = {}), c.editor.$type = s, this.designViewModelUtils.getDgViewModel(this.viewModelId).changeField(this.designViewModelField.id, c, !1), u = this.controlCreatorUtils.setFormFieldProperty(this.designViewModelField, s);
     }
     u || (u = this.controlCreatorUtils.createFormGroupWithoutField(s)), Object.assign(u, {
       id: a.id,
@@ -1809,25 +1816,25 @@ class Mt extends Et {
       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]);
+    }), Object.prototype.hasOwnProperty.call(a, "visible") && Object.assign(u, { visible: a.visible }), a.editor && ["readonly", "required", "placeholder"].map((d) => {
+      Object.prototype.hasOwnProperty.call(a.editor, d) && (u.editor[d] = a.editor[d]);
     }), 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")
+      (d) => d.classList.remove("dgComponentSelected")
     ), Array.from(document.getElementsByClassName("dgComponentFocused")).forEach(
-      (c) => c.classList.remove("dgComponentFocused")
-    ), Z.value++, te(() => {
+      (d) => d.classList.remove("dgComponentFocused")
+    ), J.value++, te(() => {
       this.getFormDesignerInstance().reloadPropertyPanel();
     });
   }
   getComponentConfig(e, n = {}, r = {}, s) {
-    var d, g;
+    var c, g;
     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"], a = this.getPropertyEditorParams(e, m, "readonly"), u = this.getPropertyEditorParams(e, m, "required"), c = {
+    }, n), m = (c = e.binding) != null && c.field ? [] : ["Const", "Variable", "StateMachine"], a = this.getPropertyEditorParams(e, m, "readonly"), u = this.getPropertyEditorParams(e, m, "required"), d = {
       readonly: {
         description: "",
         title: "只读",
@@ -1847,11 +1854,11 @@ class Mt extends Et {
       }
     };
     for (const f in r)
-      c[f] = Object.assign(c[f] || {}, r[f]);
+      d[f] = Object.assign(d[f] || {}, r[f]);
     const o = this;
     return {
       ...l,
-      properties: { ...c },
+      properties: { ...d },
       setPropertyRelates(f, p) {
         if (f) {
           switch (f.propertyID) {
@@ -1875,14 +1882,14 @@ class Mt extends Et {
     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 = {
+    const d = {
       id: n,
       columnInSM: parseInt(l.replace("col-", ""), 10),
       columnInMD: parseInt(m.replace("col-md-", ""), 10),
       columnInLG: parseInt(a.replace("col-xl-", ""), 10),
       columnInEL: parseInt(u.replace("col-el-", ""), 10)
     };
-    this.updateUnifiedLayoutAfterResponseLayoutChanged(r, c);
+    this.updateUnifiedLayoutAfterResponseLayoutChanged(r, d);
   }
   /**
    * 修改控件布局配置后更新Form统一布局配置
@@ -1898,11 +1905,11 @@ class Mt extends Et {
       const f = s.find((p) => p.id === n.id);
       Object.assign(f || {}, n);
     }
-    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;
+    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), d = this.checkIsUniqueColumn(l) ? l[0] : null, o = this.checkIsUniqueColumn(m) ? m[0] : null, c = this.checkIsUniqueColumn(a) ? a[0] : null, g = this.checkIsUniqueColumn(u) ? u[0] : null;
     Object.assign(r.unifiedLayout, {
-      uniqueColClassInSM: c,
+      uniqueColClassInSM: d,
       uniqueColClassInMD: o,
-      uniqueColClassInLG: d,
+      uniqueColClassInLG: c,
       uniqueColClassInEL: g
     });
   }
@@ -1944,22 +1951,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 === _e.EnumType);
+    return !e.binding || e.binding.type !== "Form" ? !1 : !!(this.designViewModelField && this.designViewModelField.type && this.designViewModelField.type.$type === Xe.EnumType);
   }
   /**
   * 将字段值变化前事件、变化后事件追加到交互面板
   * 注意：因为绑定字段值变化后事件与下拉框的值变化事件(valueChanged)重名，所以这里将事件label都重命名下
   */
   appendFieldValueChangeEvents(e, n) {
-    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");
+    e.binding && e.binding.type === Y.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 J.Form:
+      case Y.Form:
         return e.binding.path || e.type;
-      case J.Variable:
+      case Y.Variable:
         return e.binding.fullPath || e.type;
     }
     return e.type;
@@ -1991,16 +1998,16 @@ class Mt extends Et {
       properties: l.createBaseEventProperty(a),
       tabId: "commands",
       tabName: "交互",
-      setPropertyRelates(o, d) {
+      setPropertyRelates(o, c) {
         const g = o.propertyValue;
-        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);
+        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, c, 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"], s) {
-    return new we(this.formSchemaUtils).getExpressionConfig(
+    return new Ie(this.formSchemaUtils).getExpressionConfig(
       e,
       n,
       r,
@@ -2148,14 +2155,14 @@ function Pt(i, t) {
   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, {
+      const { formSchemaUtils: a } = t, u = a.getControlBasicInfoMap(), { schema: d } = i, o = it["filter-bar"].name;
+      u.set(d.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}`
+      }), (m = d.fields) != null && m.length && d.fields.map((c) => {
+        u.set(c.id, {
+          componentTitle: c.name,
+          parentPathName: `${o} > ${c.name}`
         });
       });
     }
@@ -2168,10 +2175,10 @@ function Pt(i, t) {
     setComponentBasicInfoMap: l
   };
 }
-function Ie(i, t) {
+function Ee(i, t) {
   let e;
   function n(o) {
-    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), {});
+    const { properties: c, title: g, ignore: f } = o, p = f && Array.isArray(f), h = Object.keys(c).reduce((y, C) => ((!p || !f.find((V) => V === C)) && (y[C] = c[C].type === "object" && c[C].properties ? n(c[C]) : X(c[C].default)), y), {});
     if (g && (!p || !f.find((y) => y === "id"))) {
       const y = g.toLowerCase().replace(/-/g, "_");
       h.id = `${y}_${Math.random().toString().slice(2, 6)}`;
@@ -2179,9 +2186,9 @@ function Ie(i, t) {
     return h;
   }
   function r(o) {
-    const { properties: d, title: g, required: f } = o;
+    const { properties: c, 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), {});
+      const p = f.reduce((h, y) => (h[y] = c[y].type === "object" && c[y].properties ? n(c[y]) : X(c[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)}`;
@@ -2192,23 +2199,23 @@ function Ie(i, t) {
       type: g
     };
   }
-  function s(o, d = {}, g) {
+  function s(o, c = {}, 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 p = h ? h({ getSchemaByType: s }, p, c, g) : p, e != null && e.appendIdentifyForNewControl && e.appendIdentifyForNewControl(p), p;
     }
     return null;
   }
-  function l(o, d) {
-    const g = n(d);
+  function l(o, c) {
+    const g = n(c);
     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) {
+  function m(o, c) {
     return Object.keys(o).filter((f) => o[f] != null).reduce((f, p) => {
-      if (d.has(p)) {
-        const h = d.get(p);
+      if (c.has(p)) {
+        const h = c.get(p);
         if (typeof h == "string")
           f[h] = o[p];
         else {
@@ -2220,15 +2227,15 @@ function Ie(i, t) {
       return f;
     }, {});
   }
-  function a(o, d, g = /* @__PURE__ */ new Map()) {
-    const f = l(o, d);
+  function a(o, c, g = /* @__PURE__ */ new Map()) {
+    const f = l(o, c);
     return m(f, g);
   }
   function u(o) {
     var g;
-    const d = o.type;
-    if (d) {
-      const f = i[d];
+    const c = o.type;
+    if (c) {
+      const f = i[c];
       if (!f)
         return o;
       const p = l(o, f), h = ((g = o.editor) == null ? void 0 : g.type) || "";
@@ -2240,79 +2247,79 @@ function Ie(i, t) {
     }
     return o;
   }
-  function c(o) {
+  function d(o) {
     e = o;
   }
-  return { getSchemaByType: s, resolveSchemaWithDefaultValue: u, resolveSchemaToProps: a, mappingSchemaToProps: m, setDesignerContext: c };
+  return { getSchemaByType: s, resolveSchemaWithDefaultValue: u, resolveSchemaToProps: a, mappingSchemaToProps: m, setDesignerContext: d };
 }
-const Ee = {}, xe = {}, { resolveSchemaWithDefaultValue: kt, resolveSchemaToProps: Vt, mappingSchemaToProps: Bt } = Ie(Ee, xe);
-function Nt(i = {}) {
-  function t(u, c, o, d) {
+const xe = {}, Se = {}, { resolveSchemaWithDefaultValue: kt, resolveSchemaToProps: Vt, mappingSchemaToProps: Bt } = Ee(xe, Se);
+function Lt(i = {}) {
+  function t(u, d, o, c) {
     if (typeof o == "number")
-      return d[u].length === o;
+      return c[u].length === o;
     if (typeof o == "object") {
       const g = Object.keys(o)[0], f = o[g];
       if (g === "not")
-        return Number(d[u].length) !== Number(f);
+        return Number(c[u].length) !== Number(f);
       if (g === "moreThan")
-        return Number(d[u].length) >= Number(f);
+        return Number(c[u].length) >= Number(f);
       if (g === "lessThan")
-        return Number(d[u].length) <= Number(f);
+        return Number(c[u].length) <= Number(f);
     }
     return !1;
   }
-  function e(u, c, o, d) {
-    return d[u] && d[u].propertyValue && String(d[u].propertyValue.value) === String(o);
+  function e(u, d, o, c) {
+    return c[u] && c[u].propertyValue && String(c[u].propertyValue.value) === String(o);
   }
   const n = /* @__PURE__ */ new Map([
     ["length", t],
     ["getProperty", e]
   ]);
-  Object.keys(i).reduce((u, c) => (u.set(c, i[c]), u), n);
-  function r(u, c) {
+  Object.keys(i).reduce((u, d) => (u.set(d, i[d]), u), n);
+  function r(u, d) {
     const o = u;
-    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: c[d] };
-      const g = d, f = c[d];
+    return typeof d == "number" ? [{ target: o, operator: "length", param: null, value: Number(d) }] : typeof d == "boolean" ? [{ target: o, operator: "getProperty", param: u, value: !!d }] : typeof d == "object" ? Object.keys(d).map((c) => {
+      if (c === "length")
+        return { target: o, operator: "length", param: null, value: d[c] };
+      const g = c, f = d[c];
       return { target: o, operator: "getProperty", param: g, value: f };
     }) : [];
   }
   function s(u) {
-    return Object.keys(u).reduce((o, d) => {
-      const g = r(d, u[d]);
+    return Object.keys(u).reduce((o, c) => {
+      const g = r(c, u[c]);
       return o.push(...g), o;
     }, []);
   }
-  function l(u, c) {
+  function l(u, d) {
     if (n.has(u.operator)) {
       const o = n.get(u.operator);
-      return o && o(u.target, u.param, u.value, c) || !1;
+      return o && o(u.target, u.param, u.value, d) || !1;
     }
     return !1;
   }
-  function m(u, c) {
-    return s(u).reduce((g, f) => g && l(f, c), !0);
+  function m(u, d) {
+    return s(u).reduce((g, f) => g && l(f, d), !0);
   }
-  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);
+  function a(u, d) {
+    const o = Object.keys(u), c = o.includes("allOf"), g = o.includes("anyOf"), f = c || g, y = (f ? u[f ? c ? "allOf" : "anyOf" : "allOf"] : [u]).map((V) => m(V, d));
+    return c ? !y.includes(!1) : y.includes(!0);
   }
   return { parseValueSchema: a };
 }
-const Ot = {
+const Nt = {
   convertTo: (i, t, e, n) => {
     i.appearance || (i.appearance = {}), i.appearance[t] = e;
   },
   convertFrom: (i, t, e) => i.appearance ? i.appearance[t] : i[t]
-}, Lt = {
+}, Ot = {
   convertFrom: (i, t, e) => i.buttons && i.buttons.length ? `共 ${i.buttons.length} 项` : "无"
 }, Ut = {
   convertTo: (i, t, e, n) => {
     i.editor && (i.editor[t] = e);
   },
   convertFrom: (i, t, e) => i.editor && Object.prototype.hasOwnProperty.call(i.editor, t) ? i.editor[t] : i[t]
-}, At = {
+}, Rt = {
   button: { type: "button", name: "按钮" },
   "response-toolbar": { type: "response-toolbar", name: "工具栏" },
   "response-toolbar-item": { type: "response-toolbar-item", name: "按钮" },
@@ -2366,12 +2373,17 @@ const Ot = {
   "discussion-list": { type: "discussion-list", name: "评论列表" },
   comment: { type: "comment", name: "评论区" },
   "rich-text-editor": { type: "rich-text-editor", name: "富文本", icon: "rich-text-box" },
-  calendar: { type: "calendar", name: "日历", icon: "date-picker" }
-}, Rt = {
+  calendar: { type: "calendar", name: "日历", icon: "date-picker" },
+  wizard: { type: "wizard", name: "向导", icon: "wizard" },
+  "wizard-page": { type: "wizard-page", name: "向导页", icon: "wizard" },
+  "wizard-page-detail": { type: "wizard-page-detail", name: "向导详情", icon: "wizard" },
+  step: { type: "step", name: "步骤条", icon: "step" },
+  "dynamic-form": { type: "dynamic-form", name: "动态表单" }
+}, At = {
   convertFrom: (i, t, e) => {
     var r;
     const n = i.editor && i.editor[t] ? i.editor[t] : i[t];
-    return ((r = At[n]) == null ? void 0 : r.name) || n;
+    return ((r = Rt[n]) == null ? void 0 : r.name) || n;
   }
 }, $t = {
   convertTo: (i, t, e, n) => {
@@ -2406,6 +2418,8 @@ const Ot = {
         return i.formatter.customFormat;
       if (t === "type")
         return i.formatter.type || "none";
+      if (t === "customFormat")
+        return i.formmater.customFormat;
     }
     return "none";
   }
@@ -2427,29 +2441,17 @@ const Ot = {
     ]), t === "enableType" && e === "custom" && (i.command.enable = !0, i.command.commands = [
       {
         value: "add",
-        text: {
-          en: "add",
-          "zh-CHS": "增加",
-          "zh-CHT": "增加"
-        },
+        text: "增加",
         type: "link"
       },
       {
         value: "edit",
-        text: {
-          en: "edit",
-          "zh-CHS": "编辑",
-          "zh-CHT": "編輯"
-        },
+        text: "编辑",
         type: "danger"
       },
       {
         value: "remove",
-        text: {
-          en: "remove",
-          "zh-CHS": "删除",
-          "zh-CHT": "刪除"
-        },
+        text: "删除",
         type: "remove"
       }
     ]), t === "enableType" && e === "unable" && (i.command.enable = !1);
@@ -2467,6 +2469,8 @@ const Ot = {
         return i.command.formatter;
       if (t === "count")
         return i.command.count;
+      if (t === "columnWidth")
+        return i.command.columnWidth || 150;
     }
     return "";
   }
@@ -2485,7 +2489,7 @@ const Ot = {
     }
     return "";
   }
-}, Gt = {
+}, zt = {
   convertTo: (i, t, e, n) => {
     i.summary ? i.summary[t] = e : i.summary = {
       [t]: e
@@ -2494,8 +2498,11 @@ const Ot = {
       groupFields: []
     });
   },
-  convertFrom: (i, t, e) => i.summary && t === "enable" ? i.summary.enable : i.type === "data-grid-column" ? i.enableSummary === void 0 ? !1 : i.enableSummary : ""
-}, zt = {
+  convertFrom: (i, t, e) => {
+    var n;
+    return t === "customSummaryStyle" ? i.summary.customSummaryStyle : t === "position" ? ((n = i.summary) == null ? void 0 : n[t]) || "bottom" : i.summary && t === "enable" ? i.summary.enable : i.type === "data-grid-column" ? i.enableSummary === void 0 ? !1 : i.enableSummary : "";
+  }
+}, Gt = {
   convertTo: (i, t, e, n) => {
     i.group ? i.group[t] = e : i.group = {
       [t]: e
@@ -2523,15 +2530,15 @@ const Ot = {
   }
 }, Qt = {
   convertTo: (i, t, e, n) => {
-    i.pagination || (i.pagination = {}), i.pagination[t] = e;
+    i.pagination || (i.pagination = {}), t === "sizeLimits" ? i.pagination.sizeLimits = e.split(",") : i.pagination[t] = e;
   },
-  convertFrom: (i, t, e) => i.pagination ? i.pagination[t] : i[t]
+  convertFrom: (i, t, e) => i.pagination ? t === "sizeLimits" ? i.pagination.sizeLimits.join(",") : i.pagination[t] : i[t]
 }, _t = {
   convertTo: (i, t, e, n) => {
     i.rowNumber || (i.rowNumber = {}), i.rowNumber[t] = e;
   },
   convertFrom: (i, t, e) => i.rowNumber ? i.rowNumber[t] : i[t]
-}, Ht = {
+}, Xt = {
   convertTo: (i, t, e, n) => {
     i.selection || (i.selection = {}), i.selection[t] = e;
   },
@@ -2539,19 +2546,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];
   }
-}, Xt = {
-  convertFrom: (i, t, e) => i[t] && i[t].length ? `共 ${i[t].length} 项` : ""
 }, Zt = {
+  convertFrom: (i, t, e) => i[t] && i[t].length ? `共 ${i[t].length} 项` : ""
+}, Jt = {
   convertFrom: (i, t) => i[t] || "",
   convertTo: (i, t, e) => {
     i[t] = e;
   }
-}, Jt = {
+}, Yt = {
   convertTo: (i, t, e, n) => {
     i.size || (i.size = {}), i.size[t] = e;
   },
   convertFrom: (i, t, e) => i.size ? i.size[t] : i[t]
-}, Yt = {
+}, Ht = {
   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;
@@ -2588,6 +2595,8 @@ const Ot = {
         return i.rowOption.customRowStyle;
       if (t === "customCellStyle")
         return i.rowOption.customCellStyle;
+      if (t === "height")
+        return i.rowOption.height;
     }
     return "";
   }
@@ -2604,26 +2613,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 Se(i, t, e) {
+function Me(i, t, e) {
   const n = /* @__PURE__ */ new Map([
-    ["/converter/appearance.converter", Ot],
-    ["/converter/buttons.converter", Lt],
+    ["/converter/appearance.converter", Nt],
+    ["/converter/buttons.converter", Ot],
     ["/converter/property-editor.converter", Ut],
-    ["/converter/items-count.converter", Xt],
-    ["/converter/type.converter", Rt],
+    ["/converter/items-count.converter", Zt],
+    ["/converter/type.converter", At],
     ["/converter/change-editor.converter", $t],
     ["/converter/change-formatter.converter", jt],
     ["/converter/column-command.converter", qt],
     ["/converter/column-option.converter", Wt],
-    ["/converter/summary.converter", Gt],
-    ["/converter/group.converter", zt],
-    ["/converter/form-group-label.converter", Zt],
+    ["/converter/summary.converter", zt],
+    ["/converter/group.converter", Gt],
+    ["/converter/form-group-label.converter", Jt],
     ["/converter/field-selector.converter", Dt],
     ["/converter/pagination.converter", Qt],
     ["/converter/row-number.converter", _t],
-    ["/converter/grid-selection.converter", Ht],
-    ["/converter/size.converter", Jt],
-    ["/converter/change-formatter-enum.converter", Yt],
+    ["/converter/grid-selection.converter", Xt],
+    ["/converter/size.converter", Yt],
+    ["/converter/change-formatter-enum.converter", Ht],
     ["/converter/grid-sort.converter", Kt],
     ["/converter/grid-filter.converter", ei],
     ["/converter/row-option.converter", ti],
@@ -2652,7 +2661,7 @@ function Se(i, t, e) {
     ["array", { type: "button-edit" }],
     ["number", { type: "number-spinner", placeholder: "" }],
     ["events-editor", { type: "events-editor", hide: !0 }]
-  ]), s = Nt();
+  ]), s = Lt();
   function l(f, p) {
     return () => s.parseValueSchema(f, p);
   }
@@ -2666,44 +2675,44 @@ function Se(i, t, e) {
     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 = "") {
+  function d(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);
+      const R = w(1), N = k, T = f[k], F = Object.keys(T), j = T.title, O = T.type, I = r.get(O) || { 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 E = T.type === "cascade" ? d(T.properties, p, h, y, C, V, B) : [], A = !0;
+      let L = u(T, B);
       const q = $({
         get() {
-          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);
+          if (R.value) {
+            if (["class", "style"].find((Ae) => Ae === N) && !L && (L = n.get("/converter/appearance.converter") || null), L && L.convertFrom)
+              return L.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(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);
+          R.value += 1, L && L.convertTo ? (L.convertTo(y, k, W, C, V), L.convertTo(h, k, W, C, V)) : (y[k] = W, h[k] = W);
         }
-      }), { 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;
+      }), { refreshPanelAfterChanged: Z, description: Oe, isExpand: Ue, parentPropertyID: Re } = T, re = { propertyID: N, propertyName: j, propertyType: O, propertyValue: q, editor: P, visible: U, readonly: x, cascadeConfig: E, hideCascadeTitle: A, refreshPanelAfterChanged: Z, description: Oe, isExpand: Ue, parentPropertyID: Re };
+      return p[N] = re, re;
     });
   }
   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 };
+      const M = C.categories[B], k = M == null ? void 0 : M.title, R = d(M.properties || {}, y, {}, h, p);
+      return { categoryId: B, categoryName: k, properties: R };
     }) : [];
   }
-  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];
+  function c(f, p, h, y, C = "") {
+    const V = p.$ref.schema, B = p.$ref.converter, M = h[V], k = M.type, R = e(M), N = {}, 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 L = (F == null ? void 0 : F.properties) || {}, I = c(L, O, A, M, y, C);
+      const O = (F == null ? void 0 : F.properties) || {}, I = d(O, N, R, M, y, C);
       return { categoryId: f, categoryName: j, properties: I };
     }
     return { categoryId: f, categoryName: "", properties: [] };
@@ -2712,16 +2721,16 @@ function Se(i, t, e) {
     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 = [];
+      const N = [];
       return Object.keys(k.categories).map((T) => {
         const F = k.categories[T];
         if (F.$ref) {
-          O.push(d(T, F, f, p, y));
+          N.push(c(T, F, f, p, y));
           return;
         }
-        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;
+        const j = F == null ? void 0 : F.title, O = 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 = d(F.properties || {}, M, B, f, p, y, F.$converter), { setPropertyRelates: E } = F, A = F == null ? void 0 : F.parentPropertyID;
+        N.push({ categoryId: T, categoryName: j, tabId: O, tabName: I, hide: P, properties: x, hideTitle: U, setPropertyRelates: E, parentPropertyID: A });
+      }), N;
     }
     return [];
   }
@@ -2731,36 +2740,36 @@ function Se(i, t, e) {
     propertyConverterMap: n
   };
 }
-const Me = {}, Te = {};
-Se(Me, Te, kt);
-const Pe = {}, ke = {}, { resolveSchemaWithDefaultValue: ni } = Ie(Pe, ke), Ve = {}, Be = {};
-Se(Ve, Be, ni);
+const Te = {}, Pe = {};
+Me(Te, Pe, kt);
+const ke = {}, Ve = {}, { resolveSchemaWithDefaultValue: ni } = Ee(ke, Ve), Be = {}, Le = {};
+Me(Be, Le, 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) => {
+  return xe[t.title] = t, Se[t.title] = n, Te[t.title] = r, Pe[t.title] = s, ke[t.title] = t, Ve[t.title] = n, Be[t.title] = r, Le[t.title] = s, (l = {}, m = !0) => {
     if (!m)
       return Bt(l, e);
-    const a = Vt(l, t, e), u = Object.keys(i).reduce((c, o) => (c[o] = i[o].default, c), {});
+    const a = Vt(l, t, e), u = Object.keys(i).reduce((d, o) => (d[o] = i[o].default, d), {});
     return Object.assign(u, a);
   };
 }
 const Ne = Object.assign({}, ne, {
   componentId: { type: String, default: "" }
-}), oi = ri(Ne, be, he, ye), si = /* @__PURE__ */ Q({
+}), oi = ri(Ne, Ce, ye, be), si = /* @__PURE__ */ Q({
   name: "FFilterBarDesign",
   props: Ne,
   emits: ["Clear", "Remove", "Reset"],
   setup(i, t) {
-    const e = w(!1), n = w(!1), r = w(!1), s = w(null), l = Ct(i), {
+    const e = w(!1), n = w(!1), r = w(!1), s = w(null), l = Ft(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), {
+    } = l, d = w(0), o = w(), c = _("design-item-context"), g = _("designer-host-service"), f = Pt(c, g), p = Qe(o, c, f), h = we(s, r), {
       cancelWidthObserver: y,
       setupWidthObserver: C
     } = h, {
       resolveEditorProps: V
-    } = ve();
-    ce("useFilterItemsComposition", {
+    } = he();
+    ue("useFilterItemsComposition", {
       useFilterItemsComposition: l,
       resolveEditorProps: V
     });
@@ -2768,14 +2777,14 @@ const Ne = Object.assign({}, ne, {
       const F = {
         display: m.value && m.value.length ? "" : "none"
       };
-      return pe(F, i == null ? void 0 : i.customStyle);
+      return me(F, i == null ? void 0 : i.customStyle);
     });
     K(() => {
       o.value.componentInstance = p, C();
-    }), fe(() => {
+    }), pe(() => {
       y();
-    }), t.expose(p.value), ue(() => i.fields, (F) => {
-      u(F, []), c.value++;
+    }), t.expose(p.value), fe(() => i.fields, (F) => {
+      u(F, []), d.value++;
     }, {
       immediate: !0
     });
@@ -2783,20 +2792,20 @@ const Ne = Object.assign({}, ne, {
       "f-filter-list": !0,
       "f-filter-list-extend": M.value
     }));
-    function A() {
+    function R() {
       return b("div", {
         class: k.value,
-        key: i.id + "-main-" + c.value
-      }, [a.value.map((F, j) => b(wt, {
+        key: i.id + "-main-" + d.value
+      }, [a.value.map((F, j) => b(It, {
         filterItem: F
       }, null))]);
     }
-    function O() {
+    function N() {
       return r.value && b("div", {
         class: "f-filter-list-ellipsis"
-      }, [G("...")]);
+      }, [z("...")]);
     }
-    const T = Ft(i, t, l);
+    const T = wt(i, t, l);
     return () => b("div", {
       ref: o,
       class: "f-filter-wrapper " + i.customClass,
@@ -2808,13 +2817,13 @@ const Ne = Object.assign({}, ne, {
     }, [b("div", {
       class: "f-filter-list-wrapper flex-fill",
       ref: s
-    }, [A()]), O(), T()]), r.value && b("div", {
+    }, [R()]), N(), 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", {
+    }, [z("展开")]), b("span", {
       class: "extend-btn-arrow f-icon f-icon-arrow-chevron-down"
     }, null)])])])]);
   }
@@ -2823,7 +2832,7 @@ D.install = (i) => {
   i.component(D.name, D);
 };
 D.register = (i, t, e, n) => {
-  i["filter-bar"] = D, t["filter-bar"] = ut;
+  i["filter-bar"] = D, t["filter-bar"] = ft;
 };
 D.registerDesigner = (i, t, e) => {
   i["filter-bar"] = si, t["filter-bar"] = oi;
@@ -2832,5 +2841,5 @@ export {
   D as FFilterBar,
   D as default,
   ne as filterBarProps,
-  ut as propsResolver
+  ft as propsResolver
 };