@farris/ui-vue 1.6.5-beta.7 → 1.6.5

package/components/property-editor/index.esm.js

@@ -1,13 +1,13 @@
-import { ref as T, computed as D, createVNode as P, withDirectives as ue, vModelText as ce, watch as _, mergeProps as fe, defineComponent as pe } from "vue";
-import { isPlainObject as z, cloneDeep as A } from "lodash-es";
-import { FComboList as B } from "../combo-list/index.esm.js";
+import { ref as T, computed as B, createVNode as V, withDirectives as ue, vModelText as ce, watch as _, mergeProps as pe, defineComponent as fe } from "vue";
+import { cloneDeep as D, isPlainObject as z } from "lodash-es";
+import { FComboList as A } from "../combo-list/index.esm.js";
 import { FNumberSpinner as de } from "../number-spinner/index.esm.js";
 import { useGuid as me, withInstall as ve } from "../common/index.esm.js";
 import { FExpressionTextbox as ge } from "../expression-editor/index.esm.js";
 function G(e, t) {
   let r;
   function s(a) {
-    const { properties: u, title: d, ignore: o } = a, n = o && Array.isArray(o), l = Object.keys(u).reduce((m, b) => ((!n || !o.find((x) => x === b)) && (m[b] = u[b].type === "object" && u[b].properties ? s(u[b]) : A(u[b].default)), m), {});
+    const { properties: u, title: d, ignore: o } = a, n = o && Array.isArray(o), l = Object.keys(u).reduce((m, b) => ((!n || !o.find((P) => P === b)) && (m[b] = u[b].type === "object" && u[b].properties ? s(u[b]) : D(u[b].default)), m), {});
     if (d && (!n || !o.find((m) => m === "id"))) {
       const m = d.toLowerCase().replace(/-/g, "_");
       l.id = `${m}_${Math.random().toString().slice(2, 6)}`;
@@ -17,7 +17,7 @@ function G(e, t) {
   function v(a) {
     const { properties: u, title: d, required: o } = a;
     if (o && Array.isArray(o)) {
-      const n = o.reduce((l, m) => (l[m] = u[m].type === "object" && u[m].properties ? s(u[m]) : A(u[m].default), l), {});
+      const n = o.reduce((l, m) => (l[m] = u[m].type === "object" && u[m].properties ? s(u[m]) : D(u[m].default), l), {});
       if (d && o.find((l) => l === "id")) {
         const l = d.toLowerCase().replace(/-/g, "_");
         n.id = `${l}_${Math.random().toString().slice(2, 6)}`;
@@ -41,7 +41,7 @@ function G(e, t) {
     const d = s(u);
     return Object.keys(d).reduce((o, n) => (Object.prototype.hasOwnProperty.call(a, n) && (o[n] && z(o[n]) && z(a[n] || !a[n]) ? Object.assign(o[n], a[n] || {}) : o[n] = a[n]), o), d), d;
   }
-  function p(a, u) {
+  function f(a, u) {
     return Object.keys(a).filter((o) => a[o] != null).reduce((o, n) => {
       if (u.has(n)) {
         const l = u.get(n);
@@ -56,9 +56,9 @@ function G(e, t) {
       return o;
     }, {});
   }
-  function f(a, u, d = /* @__PURE__ */ new Map()) {
+  function p(a, u, d = /* @__PURE__ */ new Map()) {
     const o = c(a, u);
-    return p(o, d);
+    return f(o, d);
   }
   function i(a) {
     var d;
@@ -79,9 +79,9 @@ function G(e, t) {
   function g(a) {
     r = a;
   }
-  return { getSchemaByType: C, resolveSchemaWithDefaultValue: i, resolveSchemaToProps: f, mappingSchemaToProps: p, setDesignerContext: g };
+  return { getSchemaByType: C, resolveSchemaWithDefaultValue: i, resolveSchemaToProps: p, mappingSchemaToProps: f, setDesignerContext: g };
 }
-const W = {}, Y = {}, { resolveSchemaWithDefaultValue: ye, resolveSchemaToProps: be, mappingSchemaToProps: Ce } = G(W, Y);
+const W = {}, Y = {}, { getSchemaByType: Nt, resolveSchemaWithDefaultValue: ye, resolveSchemaToProps: be, mappingSchemaToProps: Ce, setDesignerContext: jt } = G(W, Y);
 function he(e = {}) {
   function t(i, g, a, u) {
     if (typeof a == "number")
@@ -127,28 +127,28 @@ function he(e = {}) {
     }
     return !1;
   }
-  function p(i, g) {
+  function f(i, g) {
     return C(i).reduce((d, o) => d && c(o, g), !0);
   }
-  function f(i, g) {
-    const a = Object.keys(i), u = a.includes("allOf"), d = a.includes("anyOf"), o = u || d, m = (o ? i[o ? u ? "allOf" : "anyOf" : "allOf"] : [i]).map((x) => p(x, g));
+  function p(i, g) {
+    const a = Object.keys(i), u = a.includes("allOf"), d = a.includes("anyOf"), o = u || d, m = (o ? i[o ? u ? "allOf" : "anyOf" : "allOf"] : [i]).map((P) => f(P, g));
     return u ? !m.includes(!1) : m.includes(!0);
   }
-  return { parseValueSchema: f };
+  return { parseValueSchema: p };
 }
 const Te = {
   convertTo: (e, t, r, s) => {
     e.appearance || (e.appearance = {}), e.appearance[t] = r;
   },
   convertFrom: (e, t, r) => e.appearance ? e.appearance[t] : e[t]
-}, Ve = {
-  convertFrom: (e, t, r) => e.buttons && e.buttons.length ? `共 ${e.buttons.length} 项` : "无"
 }, xe = {
+  convertFrom: (e, t, r) => e.buttons && e.buttons.length ? `共 ${e.buttons.length} 项` : "无"
+}, Pe = {
   convertTo: (e, t, r, s) => {
     e.editor && (e.editor[t] = r);
   },
   convertFrom: (e, t, r) => e.editor && Object.prototype.hasOwnProperty.call(e.editor, t) ? e.editor[t] : e[t]
-}, Pe = {
+}, Ve = {
   button: { type: "button", name: "按钮" },
   "response-toolbar": { type: "response-toolbar", name: "工具栏" },
   "response-toolbar-item": { type: "response-toolbar-item", name: "按钮" },
@@ -199,7 +199,7 @@ const Te = {
   convertFrom: (e, t, r) => {
     var v;
     const s = e.editor && e.editor[t] ? e.editor[t] : e[t];
-    return ((v = Pe[s]) == null ? void 0 : v.name) || s;
+    return ((v = Ve[s]) == null ? void 0 : v.name) || s;
   }
 }, we = {
   convertTo: (e, t, r, s) => {
@@ -324,14 +324,14 @@ const Te = {
     var s, v;
     return t === "showCheckbox" ? (s = e.selection) != null && s.multiSelect ? !0 : (v = e.selection) == null ? void 0 : v.showCheckbox : e.selection ? e.selection[t] : e[t];
   }
-}, Ae = {
-  convertFrom: (e, t, r) => e[t] && e[t].length ? `共 ${e[t].length} 项` : ""
 }, De = {
+  convertFrom: (e, t, r) => e[t] && e[t].length ? `共 ${e[t].length} 项` : ""
+}, Be = {
   convertFrom: (e, t) => e[t] || "",
   convertTo: (e, t, r) => {
     e[t] = r;
   }
-}, Be = {
+}, Ae = {
   convertTo: (e, t, r, s) => {
     e.size || (e.size = {}), e.size[t] = r;
   },
@@ -380,9 +380,9 @@ const Te = {
 function H(e, t, r) {
   const s = /* @__PURE__ */ new Map([
     ["/converter/appearance.converter", Te],
-    ["/converter/buttons.converter", Ve],
-    ["/converter/property-editor.converter", xe],
-    ["/converter/items-count.converter", Ae],
+    ["/converter/buttons.converter", xe],
+    ["/converter/property-editor.converter", Pe],
+    ["/converter/items-count.converter", De],
     ["/converter/type.converter", Se],
     ["/converter/change-editor.converter", we],
     ["/converter/change-formatter.converter", Fe],
@@ -390,12 +390,12 @@ function H(e, t, r) {
     ["/converter/column-option.converter", Oe],
     ["/converter/summary.converter", Ee],
     ["/converter/group.converter", Ne],
-    ["/converter/form-group-label.converter", De],
+    ["/converter/form-group-label.converter", Be],
     ["/converter/field-selector.converter", je],
     ["/converter/pagination.converter", Re],
     ["/converter/row-number.converter", ke],
     ["/converter/grid-selection.converter", $e],
-    ["/converter/size.converter", Be],
+    ["/converter/size.converter", Ae],
     ["/converter/change-formatter-enum.converter", Le],
     ["/converter/grid-sort.converter", Ie],
     ["/converter/grid-filter.converter", Ue],
@@ -428,34 +428,34 @@ function H(e, t, r) {
   function c(o, n) {
     return () => C.parseValueSchema(o, n);
   }
-  function p(o, n, l) {
+  function f(o, n, l) {
     return o.includes("visible") && n.visible !== void 0 ? typeof n.visible == "boolean" ? () => !!n.visible : n.visible === void 0 ? !0 : c(n.visible, l) : () => !0;
   }
-  function f(o, n, l) {
+  function p(o, n, l) {
     return o.includes("readonly") && n.readonly !== void 0 ? typeof n.readonly == "boolean" ? () => !!n.readonly : c(n.readonly, l) : () => !1;
   }
   function i(o, n) {
     const l = o.$converter || n;
     return typeof l == "string" && l && s.has(l) ? s.get(l) || null : l || null;
   }
-  function g(o, n, l, m, b, x = "", h = "") {
-    return Object.keys(o).map((V) => {
-      const F = T(1), M = V, y = o[V], w = Object.keys(y), k = y.title, j = y.type, R = v.get(j) || { type: "input-group", enableClear: !1 }, N = y.editor ? Object.assign({}, R, y.editor) : Object.assign({}, R), L = p(w, y, n), $ = f(w, y, n);
+  function g(o, n, l, m, b, P = "", h = "") {
+    return Object.keys(o).map((x) => {
+      const F = T(1), M = x, y = o[x], w = Object.keys(y), k = y.title, j = y.type, R = v.get(j) || { type: "input-group", enableClear: !1 }, N = y.editor ? Object.assign({}, R, y.editor) : Object.assign({}, R), L = f(w, y, n), $ = p(w, y, n);
       N.readonly = N.readonly === void 0 ? $() : N.readonly;
-      const I = y.type === "cascade" ? g(y.properties, n, l, m, b, x, h) : [], ne = !0;
+      const I = y.type === "cascade" ? g(y.properties, n, l, m, b, P, h) : [], ne = !0;
       let O = i(y, h);
-      const re = D({
+      const re = B({
         get() {
           if (F.value) {
             if (["class", "style"].find((le) => le === M) && !O && (O = s.get("/converter/appearance.converter") || null), O && O.convertFrom)
-              return O.convertFrom(l, V, b, x);
-            const E = l[V];
+              return O.convertFrom(l, x, b, P);
+            const E = l[x];
             return Object.prototype.hasOwnProperty.call(y, "defaultValue") && (E === void 0 || typeof E == "string" && E === "") ? y.type === "boolean" ? y.defaultValue : y.defaultValue || "" : E;
           }
           return null;
         },
         set(E) {
-          F.value += 1, O && O.convertTo ? (O.convertTo(m, V, E, b, x), O.convertTo(l, V, E, b, x)) : (m[V] = E, l[V] = E);
+          F.value += 1, O && O.convertTo ? (O.convertTo(m, x, E, b, P), O.convertTo(l, x, E, b, P)) : (m[x] = E, l[x] = E);
         }
       }), { refreshPanelAfterChanged: oe, description: ie, isExpand: ae, parentPropertyID: se } = y, q = { propertyID: M, propertyName: k, propertyType: j, propertyValue: re, editor: N, visible: L, readonly: $, cascadeConfig: I, hideCascadeTitle: ne, refreshPanelAfterChanged: oe, description: ie, isExpand: ae, parentPropertyID: se };
       return n[M] = q, q;
@@ -464,12 +464,12 @@ function H(e, t, r) {
   function a(o, n, l = {}) {
     const m = {}, b = e[o];
     return b && b.categories ? Object.keys(b.categories).map((h) => {
-      const S = b.categories[h], V = S == null ? void 0 : S.title, F = g(S.properties || {}, m, {}, l, n);
-      return { categoryId: h, categoryName: V, properties: F };
+      const S = b.categories[h], x = S == null ? void 0 : S.title, F = g(S.properties || {}, m, {}, l, n);
+      return { categoryId: h, categoryName: x, properties: F };
     }) : [];
   }
   function u(o, n, l, m, b = "") {
-    const x = n.$ref.schema, h = n.$ref.converter, S = l[x], V = S.type, F = r(S), M = {}, y = e[V];
+    const P = n.$ref.schema, h = n.$ref.converter, S = l[P], x = S.type, F = r(S), M = {}, y = e[x];
     if (y && y.categories) {
       const w = y.categories[o], k = w == null ? void 0 : w.title;
       h && Object.keys(w.properties).forEach((N) => {
@@ -481,12 +481,12 @@ function H(e, t, r) {
     return { categoryId: o, categoryName: "", properties: [] };
   }
   function d(o, n, l, m, b) {
-    const x = o.type, h = r(o), S = {};
-    let V = b || e[x];
-    if (V && Object.keys(V).length === 0 && l && l.getPropConfig && (V = l.getPropConfig(m)), V && V.categories) {
+    const P = o.type, h = r(o), S = {};
+    let x = b || e[P];
+    if (x && Object.keys(x).length === 0 && l && l.getPropConfig && (x = l.getPropConfig(m)), x && x.categories) {
       const F = [];
-      return Object.keys(V.categories).map((M) => {
-        const y = V.categories[M];
+      return Object.keys(x.categories).map((M) => {
+        const y = x.categories[M];
         if (y.$ref) {
           F.push(u(M, y, o, n, m));
           return;
@@ -505,14 +505,14 @@ function H(e, t, r) {
 }
 const J = {}, Q = {};
 H(J, Q, ye);
-const X = {}, Z = {}, { resolveSchemaWithDefaultValue: ze } = G(X, Z), K = {}, ee = {};
+const X = {}, Z = {}, { getSchemaByType: Rt, resolveSchemaWithDefaultValue: ze, resolveSchemaToProps: kt, mappingSchemaToProps: $t, setDesignerContext: Dt } = G(X, Z), K = {}, ee = {};
 H(K, ee, ze);
-function _e(e, t, r = /* @__PURE__ */ new Map(), s = (c, p, f, i) => p, v = {}, C = (c) => c) {
-  return W[t.title] = t, Y[t.title] = s, J[t.title] = v, Q[t.title] = C, X[t.title] = t, Z[t.title] = s, K[t.title] = v, ee[t.title] = C, (c = {}, p = !0) => {
-    if (!p)
+function _e(e, t, r = /* @__PURE__ */ new Map(), s = (c, f, p, i) => f, v = {}, C = (c) => c) {
+  return W[t.title] = t, Y[t.title] = s, J[t.title] = v, Q[t.title] = C, X[t.title] = t, Z[t.title] = s, K[t.title] = v, ee[t.title] = C, (c = {}, f = !0) => {
+    if (!f)
       return Ce(c, r);
-    const f = be(c, t, r), i = Object.keys(e).reduce((g, a) => (g[a] = e[a].default, g), {});
-    return Object.assign(i, f);
+    const p = be(c, t, r), i = Object.keys(e).reduce((g, a) => (g[a] = e[a].default, g), {});
+    return Object.assign(i, p);
   };
 }
 function Ge(e, t) {
@@ -686,14 +686,14 @@ const He = "https://json-schema.org/draft/2020-12/schema", Je = "https://farris-
 }, ct = {
   /** 状态机列表 */
   stateMachines: { type: Array, default: [] }
-}, ft = {}, pt = {
+}, pt = {}, ft = {
   expressionConfig: { type: Object, default: {} }
 }, te = {
   ...lt,
   ...ut,
-  ...ft,
-  ...ct,
   ...pt,
+  ...ct,
+  ...ft,
   id: { Type: String, default: "" },
   modelValue: { type: [Number, String, Boolean, Object] },
   /** 属性类型列表 */
@@ -702,10 +702,10 @@ const He = "https://json-schema.org/draft/2020-12/schema", Je = "https://farris-
 function mt(e, t, r) {
   const s = T(!1), v = T(e.constType), C = T(e.constEnums), {
     getPropertyValue: c,
-    triggerValueChange: p
-  } = r, f = c("Const"), i = D(() => (n) => n === v.value);
+    triggerValueChange: f
+  } = r, p = c("Const"), i = B(() => (n) => n === v.value);
   function g(n) {
-    p(n);
+    f(n);
   }
   function a(n) {
     g(n);
@@ -717,19 +717,19 @@ function mt(e, t, r) {
     g(l);
   }
   function d() {
-    return P(de, {
+    return V(de, {
       nullable: !0,
       readonly: s.value,
-      modelValue: f.value,
-      "onUpdate:modelValue": (n) => f.value = n,
+      modelValue: p.value,
+      "onUpdate:modelValue": (n) => p.value = n,
       onChange: a
     }, null);
   }
   function o() {
-    return P(B, {
+    return V(A, {
       key: "const-combo-list",
-      modelValue: f.value,
-      "onUpdate:modelValue": (n) => f.value = n,
+      modelValue: p.value,
+      "onUpdate:modelValue": (n) => p.value = n,
       placeholder: "",
       viewType: "text",
       enableClear: !1,
@@ -741,12 +741,12 @@ function mt(e, t, r) {
       onChange: u
     }, null);
   }
-  return () => P("div", {
+  return () => V("div", {
     class: "f-property-editor-const-container"
   }, [i.value("number") && d(), i.value("enum") && o()]);
 }
 function vt(e, t, r) {
-  const s = T(e.newVariablePrefix), v = T(e.newVariableType), C = T(e.id), c = T(e.controlName), p = T(e.variables), { getPropertyValue: f } = r;
+  const s = T(e.newVariablePrefix), v = T(e.newVariableType), C = T(e.id), c = T(e.controlName), f = T(e.variables), { getPropertyValue: p } = r;
   function i(n) {
     return n[0].toUpperCase() + n.slice(1);
   }
@@ -771,10 +771,10 @@ function vt(e, t, r) {
     };
   }
   function d(n) {
-    return p.value.find((m) => m.path === n);
+    return f.value.find((m) => m.path === n);
   }
   function o() {
-    const n = f("Variable");
+    const n = p("Variable");
     return n.value || (n.value = {
       type: "Variable",
       field: "",
@@ -786,12 +786,12 @@ function vt(e, t, r) {
 }
 function gt(e, t, r) {
   const s = T(!1), v = T(e.variables), C = T(e.controlName), c = T(!!C.value), {
-    generateVariable: p,
-    getVariableByPath: f,
+    generateVariable: f,
+    getVariableByPath: p,
     getVariableValue: i
   } = vt(e, t, r), {
     triggerValueChange: g
-  } = r, a = i(), u = T(a.value.field), d = D(() => [{
+  } = r, a = i(), u = T(a.value.field), d = B(() => [{
     "form-control-select-show": c.value
   }, {
     "form-control-select-hide": !c.value
@@ -806,22 +806,23 @@ function gt(e, t, r) {
     }), u.value = a.value.field, g(a.value);
   }
   function n() {
-    const h = p(), S = f(h.path);
+    const h = f(), S = p(h.path);
     S ? o(S) : (v.value.push(h), o(h));
   }
   const l = () => (t.emit("beforeOpenVariables", v), Promise.resolve(!0));
   function m(h) {
     if (!h || h.length < 1)
       return;
-    const S = h[0], V = {
+    const S = h[0], x = {
       path: S.path,
       fullPath: S.fullPath,
-      field: S.field
+      field: S.field,
+      type: "Variable"
     };
-    o(V);
+    o(x);
   }
   function b() {
-    return P(B, {
+    return V(A, {
       key: "variable-combo-list",
       class: d.value,
       modelValue: u.value,
@@ -839,28 +840,28 @@ function gt(e, t, r) {
       onChange: m
     }, null);
   }
-  function x() {
-    return P("div", {
+  function P() {
+    return V("div", {
       class: "f-property-editor-variable-add-button"
-    }, [P("button", {
+    }, [V("button", {
       title: "新增变量",
       class: "f-variable-button",
       onClick: n
-    }, [P("span", {
+    }, [V("span", {
       class: "f-icon f-icon-add",
       style: "margin:unset;"
     }, null)])]);
   }
-  return () => P("div", {
+  return () => V("div", {
     class: "f-property-editor-variable-container"
-  }, [b(), c.value && x()]);
+  }, [b(), c.value && P()]);
 }
 function yt(e, t, r) {
   const s = /^(?:(!)?)viewModel\.stateMachine\['([^']+)'\]$/, { getPropertyValue: v } = r;
-  function C(p) {
-    if (!(typeof p.value == "string"))
+  function C(f) {
+    if (!(typeof f.value == "string"))
       return;
-    const i = p.value.match(s);
+    const i = f.value.match(s);
     if (!i || i.length < 3)
       return;
     const a = {
@@ -868,15 +869,15 @@ function yt(e, t, r) {
       status: i[1] !== "!",
       field: i[2]
     };
-    p.value = a, r.triggerValueChange(a);
+    f.value = a, r.triggerValueChange(a);
   }
   function c() {
-    const p = v("StateMachine");
-    return p.value ? (C(p), p) : (p.value = {
+    const f = v("StateMachine");
+    return f.value ? (C(f), f) : (f.value = {
       type: "StateMachine",
       field: "",
       status: !1
-    }, p);
+    }, f);
   }
   return { getStateMachineValue: c };
 }
@@ -885,29 +886,29 @@ function bt(e, t, r) {
     getStateMachineValue: C
   } = yt(e, t, r), {
     triggerValueChange: c
-  } = r, p = C(), f = T(p.value.field), i = T(p.value.status);
+  } = r, f = C(), p = T(f.value.field), i = T(f.value.status);
   function g() {
-    i.value = !i.value, p.value.status = i.value, c(p.value);
+    i.value = !i.value, f.value.status = i.value, c(f.value);
   }
   function a(o) {
     if (!o || o.length < 1)
       return;
     const n = o[0];
-    p.value.field = n.id, c(p.value);
+    f.value.field = n.id, c(f.value);
   }
   function u() {
-    return P("div", {
+    return V("div", {
       class: "f-stateMachine-status",
       onClick: g
     }, [i.value ? "是" : "非"]);
   }
   function d() {
-    return P("div", {
+    return V("div", {
       class: "f-stateMachine-combo-list"
-    }, [P(B, {
+    }, [V(A, {
       key: "state-machine-combo-list",
-      modelValue: f.value,
-      "onUpdate:modelValue": (o) => f.value = o,
+      modelValue: p.value,
+      "onUpdate:modelValue": (o) => p.value = o,
       placeholder: "",
       viewType: "text",
       enableClear: !1,
@@ -919,7 +920,7 @@ function bt(e, t, r) {
       onChange: a
     }, null)]);
   }
-  return () => P("div", {
+  return () => V("div", {
     class: "f-property-editor-stateMachine-container"
   }, [u(), d()]);
 }
@@ -928,37 +929,37 @@ function Ct(e, t, r) {
     getPropertyValue: v,
     triggerValueChange: C
   } = r, c = v("Custom");
-  function p(f) {
-    const i = f.target.value;
+  function f(p) {
+    const i = p.target.value;
     C(i);
   }
-  return () => P("div", {
+  return () => V("div", {
     class: "f-property-editor-customize-container"
-  }, [ue(P("input", {
+  }, [ue(V("input", {
     class: "form-control",
     placeholder: "输入自定义内容",
-    "onUpdate:modelValue": (f) => c.value = f,
-    onChange: p,
+    "onUpdate:modelValue": (p) => c.value = p,
+    onChange: f,
     disabled: s.value
   }, null), [[ce, c.value]])]);
 }
 function ht(e, t, r) {
   const { getPropertyValue: s } = r, v = e.id;
-  function C(f) {
-    return f + "_" + v;
+  function C(p) {
+    return p + "_" + v;
   }
-  function c(f) {
+  function c(p) {
     return {
       type: "Expression",
-      expressionId: C((f == null ? void 0 : f.targetId) || ""),
-      expressionInfo: f
+      expressionId: C((p == null ? void 0 : p.targetId) || ""),
+      expressionInfo: p
     };
   }
-  function p() {
-    const { expressionInfo: f = { value: "", targetId: "", targetType: "", expressionType: "" } } = e.expressionConfig, i = s("Expression");
-    return i.value ? (i.value.expressionInfo = f, i.value.expressionId = C(f == null ? void 0 : f.targetId), i) : (i.value = c(f), i);
+  function f() {
+    const { expressionInfo: p = { value: "", targetId: "", targetType: "", expressionType: "" } } = e.expressionConfig, i = s("Expression");
+    return i.value ? (i.value.expressionInfo = p, i.value.expressionId = C(p == null ? void 0 : p.targetId), i) : (i.value = c(p), i);
   }
-  return { getExpressionValue: p };
+  return { getExpressionValue: f };
 }
 function Tt(e, t, r) {
   const s = T(!1), {
@@ -968,10 +969,10 @@ function Tt(e, t, r) {
   } = ht(e, t, r);
   let c = C();
   const {
-    expressionInfo: p
-  } = c.value, f = T(p.value), i = T(p.message), g = T(e.expressionConfig);
+    expressionInfo: f
+  } = c.value, p = T(f.value), i = T(f.message), g = T(e.expressionConfig);
   _(() => [e.expressionConfig], () => {
-    g.value = e.expressionConfig, c = C(), f.value = c.value.expressionInfo.value;
+    g.value = e.expressionConfig, c = C(), p.value = c.value.expressionInfo.value;
   });
   function a({
     expression: d,
@@ -988,11 +989,11 @@ function Tt(e, t, r) {
       position: "top-center"
     }), !1);
   }
-  return () => P("div", {
+  return () => V("div", {
     class: "f-property-editor-expression-container"
-  }, [P(ge, fe(g.value, {
-    modelValue: f.value,
-    "onUpdate:modelValue": (d) => f.value = d,
+  }, [V(ge, pe(g.value, {
+    modelValue: p.value,
+    "onUpdate:modelValue": (d) => p.value = d,
     validateMessage: i.value,
     enableClear: !1,
     readonly: s.value,
@@ -1000,21 +1001,21 @@ function Tt(e, t, r) {
     onSubmitModal: a
   }), null)]);
 }
-function Vt(e, t, r) {
+function xt(e, t, r) {
   const s = T(e.modelValue), v = /* @__PURE__ */ new Map();
-  v.set(r, T(A(s.value)));
-  function C(f) {
-    t.emit("valueChange", A(f));
+  v.set(r, T(D(s.value)));
+  function C(p) {
+    t.emit("valueChange", D(p));
   }
-  function c(f) {
-    const i = v.get(f);
+  function c(p) {
+    const i = v.get(p);
     if (i)
       return i;
     const g = T();
-    return v.set(f, g), g;
+    return v.set(p, g), g;
   }
-  function p(f, i) {
-    switch (f) {
+  function f(p, i) {
+    switch (p) {
       case "Const":
         return i !== void 0;
       case "Variable":
@@ -1027,9 +1028,9 @@ function Vt(e, t, r) {
         return i && i.field;
     }
   }
-  return { triggerValueChange: C, getPropertyValue: c, isPropertyValueValid: p };
+  return { triggerValueChange: C, getPropertyValue: c, isPropertyValueValid: f };
 }
-const xt = [
+const Pt = [
   {
     id: "Const",
     name: "常量"
@@ -1051,20 +1052,20 @@ const xt = [
     name: "表达式"
   }
 ];
-function Pt(e, t) {
+function Vt(e, t) {
   const r = T(e.constType), s = T(e.constEnums), v = T(e.propertyTypes), C = T([]), c = T();
-  function p() {
+  function f() {
     const n = v.value;
-    return C.value = xt.filter((l) => n.includes(l.id)), C;
+    return C.value = Pt.filter((l) => n.includes(l.id)), C;
   }
   _(() => [e.propertyTypes], () => {
-    v.value = e.propertyTypes, p();
+    v.value = e.propertyTypes, f();
   });
-  function f(n) {
+  function p(n) {
     return typeof n != "string" ? !1 : /^(?:(!)?)viewModel\.stateMachine\['([^']+)'\]$/.test(n);
   }
   function i(n) {
-    const l = v.value, m = l.includes("Const") && r.value === "enum" && s.value.findIndex((x) => x.id === n) > -1, b = l.includes("Const") && r.value === "number" && typeof n == "number";
+    const l = v.value, m = l.includes("Const") && r.value === "enum" && s.value.findIndex((P) => P.id === n) > -1, b = l.includes("Const") && r.value === "number" && typeof n == "number";
     return m || b;
   }
   function g(n) {
@@ -1077,7 +1078,7 @@ function Pt(e, t) {
   function u(n) {
     const l = /* @__PURE__ */ new Map([
       ["Const", i],
-      ["StateMachine", f],
+      ["StateMachine", p],
       ["Custom", g]
     ]);
     for (const [m, b] of l.entries())
@@ -1091,9 +1092,9 @@ function Pt(e, t) {
   function o() {
     return c.value || (c.value = d()), c;
   }
-  return { getAllowedPropertyTypeItems: p, getCurrentPropertyType: o };
+  return { getAllowedPropertyTypeItems: f, getCurrentPropertyType: o };
 }
-const U = /* @__PURE__ */ pe({
+const U = /* @__PURE__ */ fe({
   name: "FPropertyEditor",
   props: te,
   emits: ["valueChange", "beforeOpenVariables"],
@@ -1101,22 +1102,22 @@ const U = /* @__PURE__ */ pe({
     const r = T(!1), {
       getAllowedPropertyTypeItems: s,
       getCurrentPropertyType: v
-    } = Pt(e), C = s(), c = v(), p = Vt(e, t, c.value), {
-      getPropertyValue: f,
+    } = Vt(e), C = s(), c = v(), f = xt(e, t, c.value), {
+      getPropertyValue: p,
       triggerValueChange: i,
       isPropertyValueValid: g
-    } = p, a = mt(e, t, p), u = gt(e, t, p), d = Ct(e, t, p), o = bt(e, t, p), n = Tt(e, t, p), l = D(() => (h) => h === c.value);
+    } = f, a = mt(e, t, f), u = gt(e, t, f), d = Ct(e, t, f), o = bt(e, t, f), n = Tt(e, t, f), l = B(() => (h) => h === c.value);
     t.expose({
       currentPropertyType: c
     });
     function m() {
-      const h = f(c.value);
+      const h = p(c.value);
       g(c.value, h.value) && i(h.value);
     }
     function b() {
-      return P("div", {
+      return V("div", {
         class: "f-property-editor-left"
-      }, [P(B, {
+      }, [V(A, {
         modelValue: c.value,
         "onUpdate:modelValue": (h) => c.value = h,
         placeholder: "",
@@ -1129,23 +1130,23 @@ const U = /* @__PURE__ */ pe({
         onChange: m
       }, null)]);
     }
-    function x() {
-      return P("div", {
+    function P() {
+      return V("div", {
         class: "f-property-editor-right"
       }, [l.value("Const") && a(), l.value("Variable") && u(), l.value("Custom") && d(), l.value("StateMachine") && o(), l.value("Expression") && n()]);
     }
-    return () => P("div", {
+    return () => V("div", {
       class: "f-property-editor-container clearfix"
-    }, [b(), x()]);
+    }, [b(), P()]);
   }
 });
 U.register = (e, t, r, s) => {
   e["property-editor"] = U, t["property-editor"] = dt;
 };
-const Nt = ve(U);
+const Bt = ve(U);
 export {
   U as FPropertyEditor,
-  Nt as default,
+  Bt as default,
   te as propertyEditorProps,
   dt as propsResolver
 };