npm - @form-create/element-ui - Versions diffs - 2.7.4 → 2.7.5 - Mend

@form-create/element-ui 2.7.4 → 2.7.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/form-create.esm.js +546 -526
package/dist/form-create.js +3 -3
package/dist/form-create.min.js +3 -3
package/package.json +4 -4
package/src/core/api.js +4 -3

package/dist/form-create.esm.js CHANGED Viewed

@@ -1,6 +1,6 @@
 /*!
  * FormCreate 低代码表单渲染器
- * @form-create/element-ui v2.7.4
+ * @form-create/element-ui v2.7.5
  * (c) 2018-2025 xaboy
  * Github https://github.com/xaboy/form-create
  * Site https://form-create.com/
@@ -19,20 +19,20 @@ var at = (t, e, r) => e in t ? tr(t, e, { enumerable: !0, configurable: !0, writ
       sr.call(e, r) && at(t, r, e[r]);
   return t;
 }, q = (t, e) => rr(t, ir(e));
-import $e, { getCurrentInstance as or, provide as ar, inject as lr, toRefs as lt, reactive as ne, onBeforeMount as ur, watch as B, onMounted as cr, onBeforeUnmount as fr, onUpdated as hr, nextTick as T, markRaw as ge, computed as ye, toRef as De, ref as dr } from "vue";
+import $e, { getCurrentInstance as or, provide as ar, inject as lr, toRefs as lt, reactive as ne, onBeforeMount as ur, watch as L, onMounted as cr, onBeforeUnmount as fr, onUpdated as hr, nextTick as I, markRaw as ge, computed as ye, toRef as je, ref as dr } from "vue";
 function pr(t) {
   return t && t.__esModule && Object.prototype.hasOwnProperty.call(t, "default") ? t.default : t;
 }
-function He() {
-  return He = Object.assign ? Object.assign.bind() : function(t) {
+function Ge() {
+  return Ge = Object.assign ? Object.assign.bind() : function(t) {
     for (var e, r = 1; r < arguments.length; r++) for (var i in e = arguments[r], e) Object.prototype.hasOwnProperty.call(e, i) && (t[i] = e[i]);
     return t;
-  }, He.apply(this, arguments);
+  }, Ge.apply(this, arguments);
 }
 var mr = ["attrs", "props", "domProps"], gr = ["class", "style", "directives"], yr = ["on", "nativeOn"], $r = function(t) {
   return t.reduce(function(e, r) {
     for (var i in r) if (!e[i]) e[i] = r[i];
-    else if (mr.indexOf(i) !== -1) e[i] = He({}, e[i], r[i]);
+    else if (mr.indexOf(i) !== -1) e[i] = Ge({}, e[i], r[i]);
     else if (gr.indexOf(i) !== -1) {
       var s = e[i] instanceof Array ? e[i] : [e[i]], n = r[i] instanceof Array ? r[i] : [r[i]];
       e[i] = [].concat(s, n);
@@ -51,7 +51,7 @@ var mr = ["attrs", "props", "domProps"], gr = ["class", "style", "directives"],
   };
 }, br = $r;
 const V = /* @__PURE__ */ pr(br);
-function Qe(t, e) {
+function Ze(t, e) {
   return Object.keys(t).reduce((r, i) => (r.push(t[i]), r), []);
 }
 const _r = "fcCheckbox", Cr = {
@@ -117,7 +117,7 @@ const _r = "fcCheckbox", Cr = {
       }, {
         key: s + r + "-" + e.value
       }]));
-    }), Qe(this.$slots)]);
+    }), Ze(this.$slots)]);
   },
   mounted() {
     this.$emit("fc.el", this.$refs.el);
@@ -496,7 +496,7 @@ const wr = "fcFrame", Fr = {
   mounted() {
     this.$on("fc.closeModal", this.closeModal);
   }
-}, Or = "fcRadio", Rr = {
+}, Or = "fcRadio", Sr = {
   name: Or,
   props: {
     formCreateInject: {
@@ -556,7 +556,7 @@ const wr = "fcFrame", Fr = {
       }, {
         key: s + r + "-" + e.value
       }]));
-    }), Qe(this.$slots)]);
+    }), Ze(this.$slots)]);
   },
   mounted() {
     this.$emit("fc.el", this.$refs.el);
@@ -594,7 +594,7 @@ const wr = "fcFrame", Fr = {
 function D(t, e) {
   return {}.hasOwnProperty.call(t, e);
 }
-const Er = "fcSelect", Sr = {
+const Er = "fcSelect", Rr = {
   name: Er,
   functional: !0,
   props: {
@@ -677,7 +677,7 @@ const Er = "fcSelect", Sr = {
         check: () => this.updateValue(),
         "node-click": () => this.updateValue()
       }
-    }]), [Qe(this.$slots)]);
+    }]), [Ze(this.$slots)]);
   },
   mounted() {
     this.setValue(), this.$emit("fc.el", this.$refs.tree);
@@ -917,7 +917,7 @@ function E(t, e, r) {
 function ie(t, e) {
   ($e.del || $e.delete)(t, e);
 }
-function _e(t, e = {}, r) {
+function Ce(t, e = {}, r) {
   let i = !1;
   for (let s in e)
     if (Object.prototype.hasOwnProperty.call(e, s)) {
@@ -935,14 +935,14 @@ function _e(t, e = {}, r) {
           }
         else
           o && E(t, s, {});
-        t[s] = _e(t[s], n, r);
+        t[s] = Ce(t[s], n, r);
       } else
         E(t, s, n), h.Undef(n) || (h.Undef(n.__json) || (t[s].__json = n.__json), h.Undef(n.__origin) || (t[s].__origin = n.__origin));
     }
   return r !== void 0 && Array.isArray(t) ? t.filter((s) => !s || !s.__ctrl) : t;
 }
-function X(t) {
-  return _e({}, { value: t }).value;
+function W(t) {
+  return Ce({}, { value: t }).value;
 }
 const Ir = Object.assign || function(t) {
   for (let e, r = 1; r < arguments.length; r++)
@@ -953,7 +953,7 @@ const Ir = Object.assign || function(t) {
 function _() {
   return Ir.apply(this, arguments);
 }
-function Ge(t) {
+function Je(t) {
   return typeof t != "object" || t === null ? t : t instanceof Array ? [...t] : b({}, t);
 }
 const Pr = "fcGroup", Tr = {
@@ -1038,13 +1038,13 @@ const Pr = "fcGroup", Tr = {
             const s = i.$f.formData();
             if (t === e)
               i.$f.deferSyncValue(() => {
-                _e(i.rule, t), i.$f.setValue(s);
+                Ce(i.rule, t), i.$f.setValue(s);
               }, !0);
             else {
               const n = i.$f.formData();
               i.$f.once("reloading", () => {
                 i.$f.setValue(n);
-              }), i.rule = X(t);
+              }), i.rule = W(t);
             }
           }
         });
@@ -1109,7 +1109,7 @@ const Pr = "fcGroup", Tr = {
       };
       if (this.defaultValue) {
         i.formData || (i.formData = {});
-        const s = X(this.defaultValue);
+        const s = W(this.defaultValue);
         _(i.formData, this.field ? {
           [this.field]: s
         } : s);
@@ -1133,7 +1133,10 @@ const Pr = "fcGroup", Tr = {
       this.$delete(this.cacheRule, t), this.$delete(this.cacheValue, t), e && this.$nextTick(() => this.$emit("remove", r));
     },
     add(t) {
-      this.disabled || this.onBeforeAdd(this.value) === !1 || this.addRule(t, !0);
+      if (this.disabled || this.onBeforeAdd(this.value) === !1)
+        return;
+      const e = [...this.value];
+      e.push(this.defaultValue ? W(this.defaultValue) : this.field ? null : {}), this.input(e);
     },
     del(t, e) {
       if (this.disabled || this.onBeforeRemove(this.value, t) === !1)
@@ -1232,9 +1235,9 @@ const Pr = "fcGroup", Tr = {
         key: o
       }, {
         on: {
-          "update:value": (d) => this.formData(o, d),
-          "emit-event": (d, ...m) => this.emitEvent(d, m, a, o),
-          input: (d) => this.add$f(a, o, d)
+          "update:value": (p) => this.formData(o, p),
+          "emit-event": (p, ...m) => this.emitEvent(p, m, a, o),
+          input: (p) => this.add$f(a, o, p)
         }
       }, {}, {
         props: {
@@ -1345,8 +1348,8 @@ const Pr = "fcGroup", Tr = {
 }, Mr = [
   Cr,
   Fr,
-  Rr,
   Sr,
+  Rr,
   Dr,
   Vr,
   Tr,
@@ -1362,172 +1365,8 @@ function be(t) {
   let e = t.replace(/([A-Z])/g, "-$1").toLocaleLowerCase();
   return e.indexOf("-") === 0 && (e = e.substr(1)), e;
 }
-const Se = (t, e) => {
-  if (!(!t || t === e || !t.$props)) {
-    if (t.$props.formCreateInject)
-      return t.$props.formCreateInject;
-    if (t.$parent)
-      return Se(t.$parent, e);
-  }
-};
-function Nr(t, e, r) {
-  const i = "FormCreate" + (t.isMobile ? "Mobile" : "");
-  return {
-    name: i,
-    componentName: i,
-    model: {
-      prop: "api"
-    },
-    components: e,
-    directives: r,
-    provide() {
-      return {
-        $pfc: this
-      };
-    },
-    inject: { $pfc: { default: null } },
-    props: {
-      rule: {
-        type: Array,
-        required: !0,
-        default: () => []
-      },
-      option: {
-        type: Object,
-        default: () => ({})
-      },
-      extendOption: Boolean,
-      driver: [String, Object],
-      value: Object,
-      disabled: {
-        type: Boolean,
-        default: void 0
-      },
-      preview: {
-        type: Boolean,
-        default: void 0
-      },
-      index: [String, Number],
-      api: Object,
-      locale: [String, Object],
-      name: String,
-      subForm: {
-        type: Boolean,
-        default: !0
-      },
-      inFor: Boolean
-    },
-    render() {
-      return this.fc.render();
-    },
-    setup(s) {
-      const n = or().proxy;
-      ar("parentFC", n);
-      const o = lr("parentFC", null);
-      let a = o;
-      if (o)
-        for (; a.parent; )
-          a = a.parent;
-      else
-        a = n;
-      const { rule: l, value: u, subForm: c, inFor: d } = lt(s), m = ne({
-        ctxInject: {},
-        destroyed: !1,
-        isShow: !0,
-        unique: 1,
-        renderRule: [...l.value || []],
-        updateValue: JSON.stringify(u.value || {})
-      }), g = new t(n), $ = g.api(), w = d.value, O = () => {
-        if (o) {
-          const R = Se(n, o);
-          if (R) {
-            let S;
-            w ? (S = H(R.getSubForm()), S.push($)) : S = $, R.subForm(S);
-          }
-        }
-      }, G = () => {
-        const R = Se(n, o);
-        if (R)
-          if (w) {
-            const S = H(R.getSubForm()), N = S.indexOf($);
-            N > -1 && S.splice(N, 1);
-          } else
-            R.subForm();
-      };
-      let P = null;
-      ur(() => {
-        B(() => {
-          let R = "";
-          const S = s.option && s.option.globalClass || {};
-          Object.keys(S).forEach((N) => {
-            let pe = "";
-            S[N].style && Object.keys(S[N].style).forEach((W) => {
-              pe += be(W) + ":" + S[N].style[W] + ";";
-            }), S[N].content && (pe += S[N].content + ";"), pe && (R += `.${N}{${pe}}`);
-          }), s.option && s.option.style && (R += s.option.style), P || (P = document.createElement("style"), P.type = "text/css", document.head.appendChild(P)), P.innerHTML = R || "";
-        }, () => {
-        });
-      });
-      const M = se(() => {
-        g.bus.$emit("$loadData.$topForm");
-      }, 100), he = se(function() {
-        g.bus.$emit("$loadData.$scopeForm");
-      }, 100), Ae = se(() => {
-        g.bus.$emit("$loadData.$form");
-      }, 100), de = (R) => {
-        g.bus.$emit("change-$form." + R);
-      };
-      return cr(() => {
-        o && ($.top.bus.$on("$loadData.$form", M), $.top.bus.$on("change", de)), $ !== $.scope && $.scope.bus.$on("$loadData.$scopeForm", he), g.mounted();
-      }), fr(() => {
-        o && ($.top.bus.$off("$loadData.$form", M), $.top.bus.$off("change", de)), $ !== $.scope && $.scope.bus.$off("$loadData.$scopeForm", he), P && document.head.removeChild(P), G(), m.destroyed = !0, g.unmount();
-      }), hr(() => {
-        g.updated();
-      }), B(c, (R) => {
-        R ? O() : G();
-      }, { immediate: !0 }), B(() => s.option, () => {
-        g.initOptions(), $.refresh();
-      }, { deep: !0 }), B(() => [...l.value], (R) => {
-        g.$handle.isBreakWatch() || R.length === m.renderRule.length && R.every((S) => m.renderRule.indexOf(S) > -1) || (g.$handle.updateAppendData(), g.$handle.reloadRule(l.value), n.renderRule());
-      }), B(() => [s.disabled, s.preview], () => {
-        $.refresh();
-      }), B(u, (R) => {
-        JSON.stringify(R || {}) !== m.updateValue && ($.config.forceCoverValue ? $.coverValue(R || {}) : $.setValue(R || {}));
-      }, { deep: !0, flush: "post" }), B(() => s.index, () => {
-        $.coverValue({}), g.$handle.updateAppendData(), T(() => {
-          T(() => {
-            $.clearValidateState();
-          });
-        });
-      }, { flush: "sync" }), q(b({
-        fc: ge(g),
-        parent: o && ge(o),
-        top: ge(a),
-        fapi: ge($)
-      }, lt(m)), {
-        getGroupInject: () => Se(n, o),
-        refresh() {
-          ++m.unique;
-        },
-        renderRule() {
-          m.renderRule = [...l.value || []];
-        },
-        updateValue(R) {
-          if (m.destroyed) return;
-          const S = JSON.stringify(R);
-          m.updateValue !== S && (m.updateValue = S, n.$emit("update:value", R), T(() => {
-            Ae(), o ? c.value || he() : (M(), he());
-          }));
-        }
-      });
-    },
-    created() {
-      this.$emit("input", this.fapi), this.fc.init();
-    }
-  };
-}
-const Ot = ["attrs", "props", "domProps", "scopedSlots"], Rt = ["class", "style", "directives"], Et = ["on", "nativeOn", "hook"], ee = (t, e = {}, r = {}) => {
-  const i = [...Ot, ...r.normal || []], s = [...Rt, ...r.array || []], n = [...Et, ...r.functional || []], o = r.props || [];
+const Ot = ["attrs", "props", "domProps", "scopedSlots"], St = ["class", "style", "directives"], Et = ["on", "nativeOn", "hook"], ee = (t, e = {}, r = {}) => {
+  const i = [...Ot, ...r.normal || []], s = [...St, ...r.array || []], n = [...Et, ...r.functional || []], o = r.props || [];
   return t.reduce((a, l) => {
     for (const u in l)
       if (a[u])
@@ -1536,64 +1375,64 @@ const Ot = ["attrs", "props", "domProps", "scopedSlots"], Rt = ["class", "style"
         else if (i.indexOf(u) > -1)
           a[u] = b(b({}, a[u]), l[u]);
         else if (s.indexOf(u) > -1) {
-          const c = a[u] instanceof Array ? a[u] : [a[u]], d = l[u] instanceof Array ? l[u] : [l[u]];
-          a[u] = [...c, ...d];
+          const c = a[u] instanceof Array ? a[u] : [a[u]], p = l[u] instanceof Array ? l[u] : [l[u]];
+          a[u] = [...c, ...p];
         } else if (n.indexOf(u) > -1)
           for (const c in l[u])
             if (a[u][c]) {
-              const d = a[u][c] instanceof Array ? a[u][c] : [a[u][c]], m = l[u][c] instanceof Array ? l[u][c] : [l[u][c]];
-              a[u][c] = [...d, ...m];
+              const p = a[u][c] instanceof Array ? a[u][c] : [a[u][c]], m = l[u][c] instanceof Array ? l[u][c] : [l[u][c]];
+              a[u][c] = [...p, ...m];
             } else
               a[u][c] = l[u][c];
         else if (u === "hook")
           for (let c in l[u])
-            a[u][c] ? a[u][c] = qr(a[u][c], l[u][c]) : a[u][c] = l[u][c];
+            a[u][c] ? a[u][c] = Nr(a[u][c], l[u][c]) : a[u][c] = l[u][c];
         else
           a[u] = l[u];
       else
         i.indexOf(u) > -1 || n.indexOf(u) > -1 || o.indexOf(u) > -1 ? a[u] = b({}, l[u]) : s.indexOf(u) > -1 ? a[u] = l[u] instanceof Array ? [...l[u]] : typeof l[u] == "object" ? b({}, l[u]) : l[u] : a[u] = l[u];
     return a;
   }, e);
-}, qr = (t, e) => function() {
+}, Nr = (t, e) => function() {
   t && t.apply(this, arguments), e && e.apply(this, arguments);
-}, St = ["type", "slot", "ignore", "emitPrefix", "value", "name", "native", "hidden", "display", "inject", "options", "emit", "nativeEmit", "link", "prefix", "suffix", "update", "sync", "optionsTo", "key", "slotUpdate", "computed", "preview", "component", "cache"], Ze = ["validate", "children", "control"], Ye = ["effect", "deep", "renderSlots"];
+}, Rt = ["type", "slot", "ignore", "emitPrefix", "value", "name", "native", "hidden", "display", "inject", "options", "emit", "nativeEmit", "link", "prefix", "suffix", "update", "sync", "optionsTo", "key", "slotUpdate", "computed", "preview", "component", "cache"], Ye = ["validate", "children", "control"], xe = ["effect", "deep", "renderSlots"];
 function kt() {
-  return [...St, ...Ot, ...Rt, ...Et, ...Ze, ...Ye];
+  return [...Rt, ...Ot, ...St, ...Et, ...Ye, ...xe];
 }
 function Dt(t, e, r) {
   return `[form-create ${t}]: ${e}`;
 }
-function xe(t, e) {
+function et(t, e) {
   console.error(Dt("err", t));
 }
-function Ur(t) {
-  xe(t.toString()), console.error(t);
+function qr(t) {
+  et(t.toString()), console.error(t);
 }
 function jt(t) {
   return t == null ? "" : typeof t == "object" ? JSON.stringify(t, null, 2) : String(t);
 }
-const Je = "[[FORM-CREATE-PREFIX-", We = "-FORM-CREATE-SUFFIX]]";
-function et(t, e) {
-  return JSON.stringify(_e(Array.isArray(t) ? [] : {}, t, !0), function(r, i) {
+const We = "[[FORM-CREATE-PREFIX-", Ke = "-FORM-CREATE-SUFFIX]]";
+function _e(t, e) {
+  return JSON.stringify(Ce(Array.isArray(t) ? [] : {}, t, !0), function(r, i) {
     if (!(i && i._isVue === !0)) {
       if (typeof i != "function")
         return i;
       if (i.__json)
         return i.__json;
       if (i.__origin && (i = i.__origin), !i.__emit)
-        return Je + i + We;
+        return We + i + Ke;
     }
   }, e);
 }
-function Te(t) {
+function Be(t) {
   return new Function("return " + t)();
 }
 function z(t, e) {
   if (t && h.String(t) && t.length > 4) {
     let r = t.trim(), i = !1;
     try {
-      if (r.indexOf(We) > 0 && r.indexOf(Je) === 0)
-        r = r.replace(We, "").replace(Je, ""), i = !0;
+      if (r.indexOf(Ke) > 0 && r.indexOf(We) === 0)
+        r = r.replace(Ke, "").replace(We, ""), i = !0;
       else if (r.indexOf("$FN:") === 0)
         r = r.substring(4), i = !0;
       else if (r.indexOf("$EXEC:") === 0)
@@ -1607,19 +1446,19 @@ function z(t, e) {
         }, r.__json = t, r.__inject = !0, r;
       } else {
         if (r.indexOf("$FNX:") === 0)
-          return r = Te("function($inject){" + r.substring(5) + "}"), r.__json = t, r.__inject = !0, r;
+          return r = Be("function($inject){" + r.substring(5) + "}"), r.__json = t, r.__inject = !0, r;
         (!e && r.indexOf("function ") === 0 && r !== "function " || !e && r.indexOf("function(") === 0 && r !== "function(") && (i = !0);
       }
       if (!i) return t;
       let s;
       try {
-        s = Te(r);
+        s = Be(r);
       } catch (n) {
-        s = Te("function " + r);
+        s = Be("function " + r);
       }
       return s.__json = t, s;
     } catch (s) {
-      xe(`解析失败:${r}
+      et(`解析失败:${r}
 err: ${s}`);
       return;
@@ -1632,9 +1471,9 @@ function At(t, e) {
     return h.Undef(i) || !i.indexOf ? i : z(i, e);
   });
 }
-let Hr = 0;
-function je() {
-  const t = 370 + ++Hr;
+let Ur = 0;
+function Ae() {
+  const t = 370 + ++Ur;
   return "F" + Math.random().toString(36).substr(3, 3) + (+`${Date.now()}`).toString(36) + t.toString(36) + "c";
 }
 function oe(t, e, r) {
@@ -1643,7 +1482,7 @@ function oe(t, e, r) {
     s && ((!i[s] || typeof i[s] != "object") && E(i, s, {}), i = i[s]), s = n;
   }), E(i, s, r), i;
 }
-function Ke(t, e) {
+function Xe(t, e) {
   return {
     value: t,
     enumerable: !1,
@@ -1655,16 +1494,16 @@ function Vt(t, e) {
   return It([t], e || !1)[0];
 }
 function It(t, e) {
-  return _e([], [...t], e || !1);
+  return Ce([], [...t], e || !1);
 }
 function te(t, e) {
-  return ee(Array.isArray(e) ? e : [e], t, { array: Ze, normal: Ye }), t;
+  return ee(Array.isArray(e) ? e : [e], t, { array: Ye, normal: xe }), t;
 }
 function ft(t) {
   const e = h.Function(t.getRule) ? t.getRule() : t;
   return e.type || (e.type = "input"), e;
 }
-function Gr(t, e) {
+function Hr(t, e) {
   return t ? (Object.keys(e || {}).forEach((r) => {
     e[r] && (t[r] = te(t[r] || {}, e[r]));
   }), t) : e;
@@ -1683,28 +1522,28 @@ function F(t, e) {
   try {
     e = t();
   } catch (r) {
-    Ur(r);
+    qr(r);
   }
   return e;
 }
-function Xe(t, e) {
+function ze(t, e) {
   let r = null;
-  return h.Function(t) ? r = t() : Array.isArray(t) ? r = t.map((i) => Xe(i, e)) : r = t, r && e && H(r).forEach((i) => {
+  return h.Function(t) ? r = t() : Array.isArray(t) ? r = t.map((i) => ze(i, e)) : r = t, r && e && H(r).forEach((i) => {
     (Array.isArray(i) ? i : [i]).forEach((n) => {
       n && typeof n == "object" && (n.data || (n.data = {}), (!n.data.slot || n.data.slot === "default") && (n.data.slot = e || "default"));
     });
   }), r;
 }
-function Jr(t, e) {
+function Gr(t, e) {
   if (h.Object(t)) {
     const r = {};
     return Object.keys(t).forEach((i) => {
-      r[i] = Xe(t[i], i);
+      r[i] = ze(t[i], i);
     }), r;
   } else
-    return Xe(t, e);
+    return ze(t, e);
 }
-function Oe() {
+function Se() {
   const t = {}, e = (r) => r || "default";
   return {
     setSlot(r, i) {
@@ -1720,7 +1559,7 @@ function Oe() {
           const n = s();
           Array.isArray(n) ? i.push(...n) : i.push(n);
         } else h.Undef(s) || i.push(s);
-      }), Jr(i, r);
+      }), Gr(i, r);
     },
     getSlots() {
       let r = [];
@@ -1740,7 +1579,7 @@ function Oe() {
     }
   };
 }
-function Re(t, e) {
+function Ee(t, e) {
   return Object.setPrototypeOf(t, e), t;
 }
 const ht = (t, e) => typeof t == "string" ? String(e) : typeof t == "number" ? Number(e) : e, ce = {
@@ -1778,12 +1617,12 @@ const ht = (t, e) => typeof t == "string" ? String(e) : typeof t == "number" ? N
     return new RegExp(e, "g").test(t);
   }
 };
-function L(t, e) {
+function B(t, e) {
   return (Array.isArray(e) ? e : (e || "").split(".")).forEach((r) => {
     t != null && (t = t[r]);
   }), t;
 }
-function Wr(t) {
+function Jr(t) {
   const e = /{{\s*(.*?)\s*}}/g;
   let r;
   const i = {};
@@ -1797,6 +1636,170 @@ function dt(t) {
     n === 0 ? i = s : i += "." + s, r.push(i);
   }), r.join(" && ");
 }
+const ke = (t, e) => {
+  if (!(!t || t === e || !t.$props)) {
+    if (t.$props.formCreateInject)
+      return t.$props.formCreateInject;
+    if (t.$parent)
+      return ke(t.$parent, e);
+  }
+};
+function Wr(t, e, r) {
+  const i = "FormCreate" + (t.isMobile ? "Mobile" : "");
+  return {
+    name: i,
+    componentName: i,
+    model: {
+      prop: "api"
+    },
+    components: e,
+    directives: r,
+    provide() {
+      return {
+        $pfc: this
+      };
+    },
+    inject: { $pfc: { default: null } },
+    props: {
+      rule: {
+        type: Array,
+        required: !0,
+        default: () => []
+      },
+      option: {
+        type: Object,
+        default: () => ({})
+      },
+      extendOption: Boolean,
+      driver: [String, Object],
+      value: Object,
+      disabled: {
+        type: Boolean,
+        default: void 0
+      },
+      preview: {
+        type: Boolean,
+        default: void 0
+      },
+      index: [String, Number],
+      api: Object,
+      locale: [String, Object],
+      name: String,
+      subForm: {
+        type: Boolean,
+        default: !0
+      },
+      inFor: Boolean
+    },
+    render() {
+      return this.fc.render();
+    },
+    setup(s) {
+      const n = or().proxy;
+      ar("parentFC", n);
+      const o = lr("parentFC", null);
+      let a = o;
+      if (o)
+        for (; a.parent; )
+          a = a.parent;
+      else
+        a = n;
+      const { rule: l, value: u, subForm: c, inFor: p } = lt(s), m = ne({
+        ctxInject: {},
+        destroyed: !1,
+        isShow: !0,
+        unique: 1,
+        renderRule: [...l.value || []],
+        updateValue: JSON.stringify(u.value || {})
+      }), g = new t(n), $ = g.api(), w = p.value, O = () => {
+        if (o) {
+          const S = ke(n, o);
+          if (S) {
+            let R;
+            w ? (R = H(S.getSubForm()), R.push($)) : R = $, S.subForm(R);
+          }
+        }
+      }, G = () => {
+        const S = ke(n, o);
+        if (S)
+          if (w) {
+            const R = H(S.getSubForm()), N = R.indexOf($);
+            N > -1 && R.splice(N, 1);
+          } else
+            S.subForm();
+      };
+      let T = null;
+      ur(() => {
+        L(() => {
+          let S = "";
+          const R = s.option && s.option.globalClass || {};
+          Object.keys(R).forEach((N) => {
+            let pe = "";
+            R[N].style && Object.keys(R[N].style).forEach((K) => {
+              pe += be(K) + ":" + R[N].style[K] + ";";
+            }), R[N].content && (pe += R[N].content + ";"), pe && (S += `.${N}{${pe}}`);
+          }), s.option && s.option.style && (S += s.option.style), T || (T = document.createElement("style"), T.type = "text/css", document.head.appendChild(T)), T.innerHTML = S || "";
+        }, () => {
+        });
+      });
+      const M = se(() => {
+        g.bus.$emit("$loadData.$topForm");
+      }, 100), he = se(function() {
+        g.bus.$emit("$loadData.$scopeForm");
+      }, 100), Ve = se(() => {
+        g.bus.$emit("$loadData.$form");
+      }, 100), de = (S) => {
+        g.bus.$emit("change-$form." + S);
+      };
+      return cr(() => {
+        o && ($.top.bus.$on("$loadData.$form", M), $.top.bus.$on("change", de)), $ !== $.scope && $.scope.bus.$on("$loadData.$scopeForm", he), g.mounted();
+      }), fr(() => {
+        o && ($.top.bus.$off("$loadData.$form", M), $.top.bus.$off("change", de)), $ !== $.scope && $.scope.bus.$off("$loadData.$scopeForm", he), T && document.head.removeChild(T), G(), m.destroyed = !0, g.unmount();
+      }), hr(() => {
+        g.updated();
+      }), L(c, (S) => {
+        S ? O() : G();
+      }, { immediate: !0 }), L(() => s.option, () => {
+        g.initOptions(), $.refresh();
+      }, { deep: !0 }), L(() => [...l.value], (S) => {
+        g.$handle.isBreakWatch() || S.length === m.renderRule.length && S.every((R) => m.renderRule.indexOf(R) > -1) || (g.$handle.updateAppendData(), g.$handle.reloadRule(l.value), n.renderRule());
+      }), L(() => [s.disabled, s.preview], () => {
+        $.refresh();
+      }), L(u, (S) => {
+        _e(S || {}) !== m.updateValue && ($.config.forceCoverValue ? $.coverValue(S || {}) : $.setValue(S || {}));
+      }, { deep: !0, flush: "post" }), L(() => s.index, () => {
+        $.coverValue({}), g.$handle.updateAppendData(), I(() => {
+          I(() => {
+            $.clearValidateState();
+          });
+        });
+      }, { flush: "sync" }), q(b({
+        fc: ge(g),
+        parent: o && ge(o),
+        top: ge(a),
+        fapi: ge($)
+      }, lt(m)), {
+        getGroupInject: () => ke(n, o),
+        refresh() {
+          ++m.unique;
+        },
+        renderRule() {
+          m.renderRule = [...l.value || []];
+        },
+        updateValue(S) {
+          if (m.destroyed) return;
+          const R = _e(S);
+          m.updateValue !== R && (m.updateValue = R, n.$emit("update:value", S), I(() => {
+            Ve(), o ? c.value || he() : (M(), he());
+          }));
+        }
+      });
+    },
+    created() {
+      this.$emit("input", this.fapi), this.fc.init();
+    }
+  };
+}
 function Tt() {
   return {
     props: {},
@@ -1809,7 +1812,7 @@ function Tt() {
     value: void 0
   };
 }
-function I(t, e) {
+function P(t, e) {
   return (r, i, s, n = {}) => {
     const o = new tt(t, r, i, s, n);
     return e && (h.Function(e) ? e(o) : o.props(e)), o;
@@ -1838,7 +1841,7 @@ function Bt(t) {
   });
 }
 Bt(kt());
-const Lt = I("");
+const Lt = P("");
 function Kr(t, e, r) {
   let i = Lt("", e);
   return i._data.type = t, i._data.title = r, i;
@@ -1852,7 +1855,7 @@ function Xr() {
     create: Kr,
     createTmp: pt,
     template: pt,
-    factory: I
+    factory: P
   };
 }
 function zr(t, e, r) {
@@ -1902,7 +1905,7 @@ function gt(t, e, r) {
       onSuccess(n) {
         let o = (l) => l;
         const a = z(t.parse);
-        h.Function(a) ? o = a : a && h.String(a) && (o = (l) => L(l, a)), i(o(n, void 0, r));
+        h.Function(a) ? o = a : a && h.String(a) && (o = (l) => B(l, a)), i(o(n, void 0, r));
       },
       onError(n) {
         s(n);
@@ -1911,16 +1914,17 @@ function gt(t, e, r) {
   });
 }
 function ve(t) {
-  return X(t);
+  return W(t);
 }
 function Qr(t) {
   function e(n) {
     return h.Undef(n) ? n = t.fields() : Array.isArray(n) || (n = [n]), n;
   }
   function r(n, o, a) {
-    e(n).forEach((l) => {
-      t.getCtxs(l).forEach((u) => {
-        E(u.rule, o, a), t.$render.clearCache(u);
+    h.Undef(n) ? n = Object.keys(b(b({}, t.fieldCtx), t.nameCtx)) : Array.isArray(n) || (n = [n]), n.forEach((l) => {
+      const u = t.fieldCtx[l] || t.nameCtx[l];
+      u && u.forEach((c) => {
+        E(c.rule, o, a), t.$render.clearCache(c);
       });
     });
   }
@@ -1932,6 +1936,12 @@ function Qr(t) {
     }, []);
   }
   const s = {
+    get isScope() {
+      return t.vm.$props.subForm === !1;
+    },
+    get isPreview() {
+      return t.preview;
+    },
     get config() {
       return t.options;
     },
@@ -2206,9 +2216,9 @@ function Qr(t) {
         t.getCtxs(o).forEach((a) => {
           t.$render.clearCache(a), a.rule.value = ve(a.defaultValue);
         });
-      }), T(() => {
-        T(() => {
-          T(() => {
+      }), I(() => {
+        I(() => {
+          I(() => {
             s.clearValidateState(n);
           });
         });
@@ -2224,7 +2234,7 @@ function Qr(t) {
       return F(() => s.method(n, o)(...a));
     },
     toJson(n) {
-      return et(s.rule, n);
+      return _e(s.rule, n);
     },
     trigger(n, o, ...a) {
       const l = s.el(n);
@@ -2247,8 +2257,8 @@ function Qr(t) {
       if (!l)
         return [];
       const u = [];
-      return ((d) => {
-        d && d.forEach((m) => {
+      return ((p) => {
+        p && p.forEach((m) => {
           typeof m == "object" && (m.field && u.push(m), u.push(...s.getChildrenRuleList(m)));
         });
       })(a ? a.loadChildrenPending() : l.children), u;
@@ -2311,7 +2321,7 @@ function Qr(t) {
     bus: t.bus,
     fetch(n) {
       return new Promise((o, a) => {
-        n = X(n), n = t.loadFetchVar(n), t.beforeFetch(n).then(() => gt(n, t.fc.create.fetch, s).then((l) => {
+        n = W(n), n = t.loadFetchVar(n), t.beforeFetch(n).then(() => gt(n, t.fc.create.fetch, s).then((l) => {
           F(() => n.onSuccess && n.onSuccess(l)), o(l);
         }).catch((l) => {
           F(() => n.onError && n.onError(l)), a(l);
@@ -2320,11 +2330,11 @@ function Qr(t) {
     },
     watchFetch(n, o, a, l) {
       return t.fc.watchLoadData((u, c) => {
-        let d = X(n);
-        d = t.loadFetchVar(d, u), !(l && l(d, c) === !1) && t.beforeFetch(d).then(() => gt(d, t.fc.create.fetch, s).then((m) => {
-          F(() => d.onSuccess && d.onSuccess(m)), o && o(m, c);
+        let p = W(n);
+        p = t.loadFetchVar(p, u), !(l && l(p, c) === !1) && t.beforeFetch(p).then(() => gt(p, t.fc.create.fetch, s).then((m) => {
+          F(() => p.onSuccess && p.onSuccess(m)), o && o(m, c);
         }).catch((m) => {
-          F(() => d.onError && d.onError(m)), a && a(m);
+          F(() => p.onError && p.onError(m)), a && a(m);
         }));
       }, n.wait == null ? 1e3 : n.wait);
     },
@@ -2413,7 +2423,7 @@ function Yr(t) {
       if (!this.vm.isShow)
         return;
       this.$manager.beforeRender();
-      const e = Oe();
+      const e = Se();
       return this.sort.forEach((r) => {
         this.renderSlot(e, this.$handle.ctxs[r]);
       }), this.$manager.render(e);
@@ -2476,8 +2486,8 @@ function Yr(t) {
             };
             l.length && i.slotUpdate && F(() => i.slotUpdate(u));
             let c = [];
-            const d = e.loadChildrenPending();
-            e.parser.renderChildren ? c = e.parser.renderChildren(d, e) : e.parser.loadChildren !== !1 && (c = this.renderChildren(d, e)), Object.keys(n.renderSlots || {}).forEach(($) => {
+            const p = e.loadChildrenPending();
+            e.parser.renderChildren ? c = e.parser.renderChildren(p, e) : e.parser.loadChildren !== !1 && (c = this.renderChildren(p, e)), Object.keys(n.renderSlots || {}).forEach(($) => {
               c.push(this.renderRule({
                 type: "template",
                 slot: $
@@ -2490,7 +2500,7 @@ function Yr(t) {
             });
             const m = this.getTypeSlot(e);
             let g;
-            return m ? (u.children = c, g = m(u)) : g = a ? e.parser.preview(Ge(c), e) : e.parser.render(Ge(c), e), g = this.renderSides(g, e), !(!e.input && h.Undef(n.native)) && n.native !== !0 && (this.fc.targetFormDriver("updateWrap", e), g = this.$manager.makeWrap(e, g)), e.none && (Array.isArray(g) ? g = g.map(($) => !$ || !$.tag ? $ : this.none($)) : g = this.none(g)), o && this.setCache(e, () => this.stable(g), r), g;
+            return m ? (u.children = c, g = m(u)) : g = a ? e.parser.preview(Je(c), e) : e.parser.render(Je(c), e), g = this.renderSides(g, e), !(!e.input && h.Undef(n.native)) && n.native !== !0 && (this.fc.targetFormDriver("updateWrap", e), g = this.$manager.makeWrap(e, g)), e.none && (Array.isArray(g) ? g = g.map(($) => !$ || !$.tag ? $ : this.none($)) : g = this.none(g)), o && this.setCache(e, () => this.stable(g), r), g;
           }, this.setCache(e, s, r);
         }
         return (...s) => {
@@ -2566,7 +2576,11 @@ function Yr(t) {
     ctxProp(e) {
       const { ref: r, key: i, rule: s } = e;
       this.$manager.mergeProp(e), e.parser.mergeProp(e);
-      const n = [
+      const n = b({}, e.prop.on || {}), o = {};
+      Object.keys(n).forEach((l) => {
+        l.indexOf("native.") === 0 && (o[l.replace("native.", "")] = n[l], delete n[l]);
+      }), e.prop.on = n;
+      const a = [
         {
           ref: r,
           key: s.key || `${i}fc`,
@@ -2575,30 +2589,33 @@ function Yr(t) {
             "hook:mounted": () => {
               this.onMounted(e);
             },
-            "fc.updateValue": (o) => {
-              this.$handle.onUpdateValue(e, o);
+            "fc.updateValue": (l) => {
+              this.$handle.onUpdateValue(e, l);
             },
-            "fc.el": (o) => {
-              e.exportEl = o, o && ((o.$el || o).__rule__ = e.rule);
+            "fc.el": (l) => {
+              e.exportEl = l, l && ((l.$el || l).__rule__ = e.rule);
             }
           }
+        },
+        {
+          nativeOn: o
         }
       ];
       if (e.input) {
-        const o = this.tmpInput;
+        const l = this.tmpInput;
         this.vm.$props.disabled === !0 && (e.prop.props.disabled = !0), e.prop.model = {
           value: this.$handle.getFormData(e),
-          callback: (a) => {
-            o && o(e.field, a, e.rule), this.onInput(e, a);
+          callback: (u) => {
+            l && l(e.field, u, e.rule), this.onInput(e, u);
           },
           expression: `formData.${e.id}`
-        }, e.prop.modelEmit && n.push({
+        }, e.prop.modelEmit && a.push({
           on: {
             [e.prop.modelEmit]: () => this.onEmitInput(e)
           }
         });
       }
-      return ee(n, e.prop), e.prop;
+      return ee(a, e.prop), e.prop;
     },
     onMounted(e) {
       e.el = this.vm.$refs[e.ref], e.el && ((e.el.$el || e.el).__rule__ = e.rule), e.parser.mounted(e), this.$handle.effect(e, "mounted"), this.$handle.targetHook(e, "mounted");
@@ -2615,7 +2632,7 @@ function Yr(t) {
     },
     renderChildren(e, r, i) {
       if (!h.trueArray(e)) return [];
-      const s = Oe();
+      const s = Se();
       return e.map((n) => {
         if (n) {
           if (h.String(n)) return s.setSlot(null, i ? this.renderRule({
@@ -2624,7 +2641,7 @@ function Yr(t) {
           }) : n);
           if (n.__fc__)
             return this.renderSlot(s, n.__fc__, r);
-          n.type && T(() => {
+          n.type && I(() => {
             this.$handle.loadChildren(e, r), this.$handle.refresh();
           });
         }
@@ -2641,7 +2658,7 @@ function Yr(t) {
     },
     createRuleVnode(e, r, i) {
       this.force = i !== !1, this.tmpInput = r;
-      const s = Oe();
+      const s = Se();
       return this.renderSlot(s, e, e.parent), this.force = !1, this.tmpInput = null, s.getSlots();
     },
     renderRule(e, r, i) {
@@ -2656,7 +2673,7 @@ function Yr(t) {
         a && (s = J(a));
       }
       if (!s) return;
-      const n = Oe();
+      const n = Se();
       h.trueArray(e.children) && e.children.forEach((a) => {
         a && n.setSlot(a == null ? void 0 : a.slot, () => this.renderRule(a));
       });
@@ -2714,16 +2731,16 @@ function ei(t) {
       let i = {}, s = e.rule, { emitPrefix: n, field: o, name: a, inject: l } = s, u = s[r ? "emit" : "nativeEmit"] || [];
       return h.trueArray(u) && u.forEach((c) => {
         if (!c) return;
-        let d, m = n || o || a;
-        if (h.Object(c) && (d = c.inject, c = c.name, m = c.prefix || m), m) {
+        let p, m = n || o || a;
+        if (h.Object(c) && (p = c.inject, c = c.name, m = c.prefix || m), m) {
           r || (m = `native-${m}`);
           const g = be(`${m}-${c}`), $ = (...w) => {
             this.vm.$emit(g, ...w), this.vm.$emit("emit-event", g, ...w), this.bus.$emit(g, ...w);
           };
-          if ($.__emit = !0, !d && l === !1)
+          if ($.__emit = !0, !p && l === !1)
             i[c] = $;
           else {
-            let w = d || l || this.options.injectEvent;
+            let w = p || l || this.options.injectEvent;
             i[c] = h.Undef(w) ? $ : this.inject(s, $, w);
           }
         }
@@ -2754,21 +2771,21 @@ function ei(t) {
     },
     loadStrVar(e, r, i) {
       if (e && typeof e == "string" && e.indexOf("{{") > -1 && e.indexOf("}}") > -1) {
-        const s = e, n = Wr(e);
+        const s = e, n = Jr(e);
         let o;
         if (n.forEach((a) => {
           const l = a.split("||"), u = l[0].trim();
           if (u) {
             const c = (l[1] || "").trim();
-            let d, m = !1;
+            let p, m = !1;
             if (i && u.indexOf("$form.") === 0) {
               const g = u.split(".");
-              g.shift(), D(i.value, g[0]) && (m = !0, d = r ? r({
+              g.shift(), D(i.value, g[0]) && (m = !0, p = r ? r({
                 id: "$form." + g[0] + "_" + i.rule.__fc__.id,
-                getValue: () => L(i.value, g)
-              }) : L(i.value, g));
+                getValue: () => B(i.value, g)
+              }) : B(i.value, g));
             }
-            m || (d = r ? r(u, c) : this.fc.getLoadData(u, c)), o = d, e = e.replaceAll(`{{${a}}}`, d == null ? "" : d);
+            m || (p = r ? r(u, c) : this.fc.getLoadData(u, c)), o = p, e = e.replaceAll(`{{${a}}}`, p == null ? "" : p);
           }
         }), n.length === 1 && s === `{{${n[0]}}}`)
           return o;
@@ -2831,13 +2848,13 @@ function ii(t) {
 }
 function ni(t) {
   Object.defineProperties(t.origin, {
-    __fc__: Ke(ge(t), !0)
+    __fc__: Xe(ge(t), !0)
   }), t.rule !== t.origin && Object.defineProperties(t.rule, {
-    __fc__: Ke(ge(t), !0)
+    __fc__: Xe(ge(t), !0)
   });
 }
 function qt(t, e, r) {
-  const i = je(), s = !!e.field;
+  const i = Ae(), s = !!e.field;
   _(this, {
     id: i,
     ref: i,
@@ -2862,7 +2879,7 @@ function qt(t, e, r) {
     input: s,
     el: void 0,
     exportEl: void 0,
-    defaultValue: s ? X(r) : void 0,
+    defaultValue: s ? W(r) : void 0,
     field: e.field || void 0
   }), this.updateKey(), ni(this), this.update(t, !0);
 }
@@ -2903,8 +2920,8 @@ _(qt.prototype, {
         rule: this.rule,
         api: this.$api,
         update: (u) => {
-          const c = u || i, d = this.getPending(e, i);
-          this.setPending(e, r, c), o && o(c, d);
+          const c = u || i, p = this.getPending(e, i);
+          this.setPending(e, r, c), o && o(c, p);
         },
         reload: () => {
           const u = this.getPending(e, i);
@@ -2936,7 +2953,7 @@ _(qt.prototype, {
     t === void 0 ? this.payload = {} : delete this.payload[t];
   },
   updateKey(t) {
-    this.key = je(), t && this.parent && this.parent.updateKey(t);
+    this.key = Ae(), t && this.parent && this.parent.updateKey(t);
   },
   updateType() {
     this.originType = this.rule.type, this.type = J(this.rule.type), this.trueType = this.$handle.getType(this.originType);
@@ -3017,14 +3034,14 @@ function si(t) {
   _(t.prototype, {
     nextRefresh(e) {
       const r = this.loadedId;
-      T(() => {
+      I(() => {
         r === this.loadedId && (e ? e() : this.refresh());
       });
     },
     parseRule(e) {
       const r = ft(e);
       return Object.defineProperties(r, {
-        __origin__: Ke(e, !0)
+        __origin__: Xe(e, !0)
       }), oi(r), this.appendValue(r), [r, r.prefix, r.suffix].forEach((i) => {
         i && this.loadFn(i, r);
       }), this.loadCtrl(r), r.update && (r.update = z(r.update)), r;
@@ -3075,7 +3092,7 @@ function si(t) {
         let l = ft(o);
         const u = () => !!(l.field && this.fieldCtx[l.field] && this.fieldCtx[l.field][0] !== o.__fc__);
         this.fc.targetFormDriver("loadRule", { rule: l, api: this.api }, this.fc), this.ruleEffect(l, "init", { repeat: u() }), u() && this.vm.$emit("repeat-field", o, this.api);
-        let c, d = !1, m = !!o.__fc__, g = l.value;
+        let c, p = !1, m = !!o.__fc__, g = l.value;
         if (m) {
           if (c = o.__fc__, g = c.defaultValue, c.deleted) {
             if ($t(c))
@@ -3084,7 +3101,7 @@ function si(t) {
           } else if (!c.check(this)) {
             if ($t(c))
               return;
-            e[a] = o = o._clone ? o._clone() : At(et(o)), c = null, d = !0;
+            e[a] = o = o._clone ? o._clone() : At(_e(o)), c = null, p = !0;
           }
         }
         if (c)
@@ -3093,7 +3110,7 @@ function si(t) {
           const O = this.parseRule(o);
           c = new qt(this, O, g), this.bindParser(c);
         }
-        [!1, !0].forEach((O) => this.parseEmit(c, O)), this.syncProp(c), c.parent = r || null, c.root = e, this.setCtx(c), !d && !m && (this.effect(c, "load"), this.targetHook(c, "load")), this.effect(c, "created");
+        [!1, !0].forEach((O) => this.parseEmit(c, O)), this.syncProp(c), c.parent = r || null, c.root = e, this.setCtx(c), !p && !m && (this.effect(c, "load"), this.targetHook(c, "load")), this.effect(c, "created");
         const $ = c.loadChildrenPending();
         if (c.parser.loadChildren === !1 || s($, c), !r) {
           const O = i(a);
@@ -3113,8 +3130,8 @@ function si(t) {
       const r = ai(e), i = [], s = this.api;
       if (!r.length) return !1;
       for (let a = 0; a < r.length; a++) {
-        const l = r[a], u = l.handle || function(d) {
-          return (ce[l.condition || "=="] || ce["=="])(d, l.value);
+        const l = r[a], u = l.handle || function(p) {
+          return (ce[l.condition || "=="] || ce["=="])(p, l.value);
         };
         if (!h.trueArray(l.rule)) continue;
         const c = q(b({}, l), {
@@ -3128,7 +3145,7 @@ function si(t) {
       const n = [];
       let o = !1;
       return this.deferSyncValue(() => {
-        i.reverse().forEach(({ isHidden: a, valid: l, rule: u, prepend: c, append: d, child: m, ctrl: g, method: $ }) => {
+        i.reverse().forEach(({ isHidden: a, valid: l, rule: u, prepend: c, append: p, child: m, ctrl: g, method: $ }) => {
           if (a) {
             l ? e.ctrlRule.push({
               __ctrl: !0,
@@ -3150,7 +3167,7 @@ function si(t) {
               children: u
             };
             e.ctrlRule.push(w), this.bus.$once("load-start", () => {
-              c ? s.prepend(w, c, m) : d || m ? s.append(w, d || e.id, m) : e.root.splice(e.root.indexOf(e.origin) + 1, 0, w);
+              c ? s.prepend(w, c, m) : p || m ? s.append(w, p || e.id, m) : e.root.splice(e.root.indexOf(e.origin) + 1, 0, w);
             });
           } else {
             e.ctrlRule.splice(e.ctrlRule.indexOf(g), 1);
@@ -3160,7 +3177,7 @@ function si(t) {
         });
       }), n.length && (this.loading ? n.length && this.bus.$once("load-end", () => {
         n.forEach((a) => a());
-      }) : n.length && T(() => {
+      }) : n.length && I(() => {
         n.forEach((a) => a());
       })), this.vm.$emit("control", e.origin, this.api), this.effect(e, "control"), o;
     },
@@ -3209,9 +3226,9 @@ function ui(t) {
         rule: e.origin,
         api: this.api,
         setFlag: s || !1
-      }), s && T(() => {
-        T(() => {
-          T(() => {
+      }), s && I(() => {
+        I(() => {
+          I(() => {
             this.api.clearValidateState(e.id);
           });
         });
@@ -3246,9 +3263,9 @@ function ui(t) {
     },
     syncForm() {
       const e = {}, r = this.fields(), i = [];
-      this.options.appendValue !== !1 && Object.keys(this.appendData).reduce((s, n) => (r.indexOf(n) === -1 && (s[n] = De(this.appendData, n)), s), e), r.reduce((s, n) => {
+      this.options.appendValue !== !1 && Object.keys(this.appendData).reduce((s, n) => (r.indexOf(n) === -1 && (s[n] = je(this.appendData, n)), s), e), r.reduce((s, n) => {
         const o = (this.fieldCtx[n] || []).filter((a) => !this.isIgnore(a.rule))[0] || this.fieldCtx[n][0];
-        return this.isIgnore(o.rule) && i.push(n), s[n] = De(o.rule, "value"), s;
+        return this.isIgnore(o.rule) && i.push(n), s[n] = je(o.rule, "value"), s;
       }, e), this.form = ne(e), this.ignoreFields = i, this.syncValue();
     },
     isIgnore(e) {
@@ -3275,7 +3292,7 @@ function ui(t) {
       return JSON.stringify(this.getFormData(e), vt) !== JSON.stringify(r, vt);
     },
     isQuote(e, r) {
-      return (h.Object(r) || Array.isArray(r)) && r === e.rule.value;
+      return (r instanceof Function || h.Object(r) || Array.isArray(r)) && r === e.rule.value;
     },
     refreshUpdate(e, r, i, s) {
       if (h.Function(e.rule.update)) {
@@ -3308,7 +3325,7 @@ function ui(t) {
 function vt(t, e) {
   return typeof e == "function" ? "" + e : e;
 }
-const ke = {
+const De = {
   init(t) {
   },
   toFormValue(t, e) {
@@ -3363,7 +3380,7 @@ function fi(t) {
         if (n)
           return n;
       }
-      return r[e.originType] || r[J(e.type)] || r[e.trueType] || ke;
+      return r[e.originType] || r[J(e.type)] || r[e.trueType] || De;
     },
     bindParser(e) {
       e.setParser(this.getParser(e));
@@ -3377,17 +3394,17 @@ function fi(t) {
     },
     watchCtx(e) {
       if (kt().filter((i) => i[0] !== "_" && i[0] !== "$" && ci.indexOf(i) === -1).forEach((i) => {
-        const s = De(e.rule, i), n = i === "children";
-        e.refRule[i] = s, e.watch.push(B(n ? () => h.Function(s.value) ? s.value : [...s.value || []] : () => s.value, (o, a) => {
+        const s = je(e.rule, i), n = i === "children";
+        e.refRule[i] = s, e.watch.push(L(n ? () => h.Function(s.value) ? s.value : [...s.value || []] : () => s.value, (o, a) => {
           let l = s.value;
           if (!this.isBreakWatch()) {
             if (n && e.parser.loadChildren === !1) {
               this.$render.clearCache(e), this.nextRefresh();
               return;
             }
-            if (this.watching = !0, T(() => {
+            if (this.watching = !0, I(() => {
               this.targetHook(e, "watch", { key: i, oldValue: a, newValue: l });
-            }), i === "hidden" && !!l != !!a && (this.$render.clearCacheAll(), T(() => {
+            }), i === "hidden" && !!l != !!a && (this.$render.clearCacheAll(), I(() => {
               this.targetHook(e, "hidden", { value: l });
             })), i === "ignore" && e.input || i === "hidden" && e.input && (e.rule.ignore === "hidden" || this.options.ignoreHiddenFields))
               this.syncForm();
@@ -3433,8 +3450,8 @@ function fi(t) {
         }
         return s;
       })), e.input) {
-        const i = De(e.rule, "value");
-        e.watch.push(B(() => i.value, () => {
+        const i = je(e.rule, "value");
+        e.watch.push(L(() => i.value, () => {
           let s = e.parser.toFormValue(i.value, e);
           this.isChange(e, s) && this.setValue(e, i.value, s, !0);
         }));
@@ -3451,7 +3468,7 @@ function fi(t) {
           }), a = (l) => {
             s === "value" ? this.onInput(e, l) : s[0] === "$" ? this.api.setEffect(e.id, s, l) : oe(e.rule, s, l);
           };
-          (s === "value" ? [void 0, null, ""].indexOf(e.rule.value) > -1 : o.value !== L(e.rule, s)) && a(o.value), e.watch.push(B(o, (l) => {
+          (s === "value" ? [void 0, null, ""].indexOf(e.rule.value) > -1 : o.value !== B(e.rule, s)) && a(o.value), e.watch.push(L(o, (l) => {
             n = l, setTimeout(() => {
               a(l);
             });
@@ -3468,16 +3485,16 @@ function fi(t) {
           const l = a.mode === "OR";
           let u = !0;
           for (let c = 0; c < a.group.length; c++) {
-            const d = a.group[c];
+            const p = a.group[c];
             let m, g = null;
-            if (d.variable)
-              g = JSON.stringify(this.fc.getLoadData(d.variable) || "");
-            else if (d.field)
-              g = dt(d.field || "");
-            else
+            if (p.variable)
+              g = JSON.stringify(this.fc.getLoadData(p.variable) || "");
+            else if (p.field)
+              g = dt(p.field || "");
+            else if (!p.mode)
               return !0;
-            let $ = d.compare;
-            if ($ && ($ = dt($ || "")), d.mode ? m = n(d) : ce[d.condition] ? h.Function(d.handler) ? m = F(() => d.handler(this.api, e.rule)) : m = F(() => new Function("$condition", "$val", "$form", "$scope", "$group", "$rule", `with($form){with($scope){with(this){with($group){ return $condition['${d.condition}'](${g}, ${$ || "$val"}); }}}}`).call(this.api.form, ce, d.value, this.api.top.form, this.api.top === this.api.scope ? {} : this.api.scope.form, s ? this.subRuleData[s.id] || {} : {}, e.rule)) : m = !1, l && m)
+            let $ = p.compare;
+            if ($ && ($ = dt($ || "")), p.mode ? m = n(p) : ce[p.condition] ? h.Function(p.handler) ? m = F(() => p.handler(this.api, e.rule)) : m = F(() => new Function("$condition", "$val", "$form", "$scope", "$group", "$rule", `with($form){with($scope){with(this){with($group){ return $condition['${p.condition}'](${g}, ${$ || "$val"}); }}}}`).call(this.api.form, ce, p.value, this.api.top.form, this.api.top === this.api.scope ? {} : this.api.scope.form, s ? this.subRuleData[s.id] || {} : {}, e.rule)) : m = !1, l && m)
               return !0;
             l || (u = u && m);
           }
@@ -3502,7 +3519,7 @@ function fi(t) {
           fc: s.fc
         }, ...l);
       }, o), {});
-      return new Function("$formulas", "$form", "$scope", "$group", "$rule", "$api", `with($form){with($scope){with(this){with($group){with($formulas){ return ${e} }}}}}`).call(this.api.form, n, this.api.top.form, this.api.top === this.api.scope ? {} : this.api.scope.form, i ? this.subRuleData[i.id] || {} : {}, r.rule, this.api);
+      return F(() => new Function("$formulas", "$form", "$scope", "$group", "$rule", "$api", `with($form){with($scope){with(this){with($group){with($formulas){ return ${e} }}}}}`).call(this.api.form, n, this.api.top.form, this.api.top === this.api.scope ? {} : this.api.scope.form, i ? this.subRuleData[i.id] || {} : {}, r.rule, this.api));
     },
     updateChildren(e, r, i) {
       this.deferSyncValue(() => {
@@ -3593,7 +3610,7 @@ function di(t) {
       }), Object.keys(e.rule).forEach((i) => {
         i[0] === "$" && (r[i.substr(1)] = () => e.rule[i]);
       }), Object.keys(r).forEach((i) => {
-        e.watch.push(B(r[i], (s) => {
+        e.watch.push(L(r[i], (s) => {
           this.effect(e, "watch", { [i]: s });
         }, { deep: !0 }));
       });
@@ -3626,15 +3643,15 @@ function di(t) {
       Object.keys(l).forEach((u) => {
         const c = this.providers[u];
         if (!c || c.input && !i) return;
-        let d;
+        let p;
         if (!c._c)
-          d = "*";
+          p = "*";
         else if (c._used.indexOf(s) > -1)
-          d = s;
+          p = s;
         else
           return;
         const m = b({ value: l[u], getValue: () => this.getEffect(r, u) }, a || {});
-        e && (m.getProp = () => e.effectData(u), m.clearProp = () => e.clearEffectData(u), m.mergeProp = (g) => te(m.getProp(), [g]), m.id = e.id), this.bus.$emit(`p:${u}:${d}:${c.input ? 1 : 0}`, o, [m, r, this.api]);
+        e && (m.getProp = () => e.effectData(u), m.clearProp = () => e.clearEffectData(u), m.mergeProp = (g) => te(m.getProp(), [g]), m.id = e.id), this.bus.$emit(`p:${u}:${p}:${c.input ? 1 : 0}`, o, [m, r, this.api]);
       });
     }
   });
@@ -3660,7 +3677,7 @@ function Q(t) {
       return t.bus;
     },
     preview() {
-      return t.vm.$options.propsData.preview != null ? t.vm.$options.propsData.preview : t.options.value.preview || !1;
+      return t.vm.$options.propsData.preview != null ? t.vm.$options.propsData.preview : t.vm.parent && t.vm.parent.$props.preview != null ? t.vm.parent.$props.preview : t.options.value.preview || !1;
     }
   }), _(this, {
     fc: t,
@@ -3720,7 +3737,8 @@ _(Q.prototype, {
     return new Promise((e, r) => {
       const i = t && t.beforeFetch && F(() => t.beforeFetch(t, { api: this.api }));
       i && h.Function(i.then) ? i.then(e).catch(r) : i === !1 ? r() : e();
-    }).then(() => this.globalBeforeFetch(t));
+    }).then(() => this.globalBeforeFetch(t)).catch(() => {
+    });
   }
 });
 ei(Q);
@@ -3731,7 +3749,7 @@ ui(Q);
 fi(Q);
 hi(Q);
 di(Q);
-const gi = "fcFragment", Be = {
+const gi = "fcFragment", Le = {
   name: gi,
   functional: !0,
   props: ["vnode"],
@@ -3805,7 +3823,7 @@ _(Ut.prototype, {
     this.$render = this.$handle.$render, this.$r = (...t) => this.$render.renderRule(...t);
   },
   updateKey() {
-    this.key = je();
+    this.key = Ae();
   },
   //TODO interface
   init() {
@@ -3849,22 +3867,23 @@ const bi = function(t) {
   const e = {
     name: "loadData",
     _fn: [],
-    mounted(r, i, s) {
-      this.deleted(r);
-      let n = H(r.getValue());
-      const o = [];
-      n.forEach((a) => {
-        if (a && (a.attr || a.template)) {
-          let l = (d) => {
-            let m;
-            a.template ? m = t.$handle.loadStrVar(a.template, d) : a.handler && h.Function(a.handler) ? m = a.handler(d, i, s) : m = d(a.attr, a.default), a.copy !== !1 && (m = X(m));
-            const g = a.modify ? i : r.getProp();
-            a.to === "child" ? g.children ? E(g.children, 0, m) : E(g, "children", [m]) : oe(g, a.to || "options", m), s.sync(i);
-          }, u = (d) => l(d);
-          const c = t.watchLoadData(u);
-          l = se(l, a.wait || 300), a.watch !== !1 ? o.push(c) : c();
-        }
-      }), this._fn[r.id] = o;
+    loaded(r, i, s) {
+      this.deleted(r), I(() => {
+        let n = H(r.getValue());
+        const o = [];
+        n.forEach((a) => {
+          if (a && (a.attr || a.template)) {
+            let l = (p) => {
+              let m;
+              a.template ? m = t.$handle.loadStrVar(a.template, p) : a.handler && h.Function(a.handler) ? m = a.handler(p, i, s) : m = p(a.attr, a.default), a.copy !== !1 && (m = W(m));
+              const g = a.modify ? i : r.getProp();
+              a.to === "child" ? g.children ? E(g.children, 0, m) : E(g, "children", [m]) : oe(g, a.to || "options", m), s.sync(i);
+            }, u = (p) => l(p);
+            const c = t.watchLoadData(u);
+            l = se(l, a.wait || 300), a.watch !== !1 ? o.push(c) : c();
+          }
+        }), this._fn[r.id] = o;
+      });
     },
     deleted(r) {
       this._fn[r.id] && (this._fn[r.id].forEach((i) => {
@@ -3872,7 +3891,7 @@ const bi = function(t) {
       }), delete this._fn[r.id]), r.clearProp();
     }
   };
-  return e.watch = e.mounted, e;
+  return e.watch = e.loaded, e;
 }, _i = function(t) {
   const e = {
     name: "t",
@@ -3889,8 +3908,8 @@ const bi = function(t) {
             let $ = t.t(u ? l.attr : l, u ? l.params : null, g);
             const w = u && l.modify ? i : r.getProp();
             a === "child" ? w.children ? E(w.children, 0, $) : E(w, "children", [$]) : oe(w, a, $), s.sync(i);
-          }, d = (g) => c(g);
-          const m = t.watchLoadData(d);
+          }, p = (g) => c(g);
+          const m = t.watchLoadData(p);
           c = se(c, l.wait || 300), l.watch !== !1 ? o.push(m) : m();
         }
       }), this._fn[r.id] = o;
@@ -3937,43 +3956,43 @@ const bi = function(t) {
   function r(s, n, o) {
     let a = s.value;
     i.deleted(s), h.Function(a) && (a = a(n, o)), a = e(a);
-    const l = (d) => {
-      d === void 0 ? s.clearProp() : oe(s.getProp(), a.to || "options", d), o.sync(n);
+    const l = (p) => {
+      p === void 0 ? s.clearProp() : oe(s.getProp(), a.to || "options", p), o.sync(n);
     };
     if (!a || !a.action && !a.key) {
       l(void 0);
       return;
     }
-    if (a = X(a), a.to || (a.to = "options"), a.key) {
-      const d = t.$handle.options.globalData[a.key];
-      if (!d) {
+    if (a = W(a), a.to || (a.to = "options"), a.key) {
+      const p = t.$handle.options.globalData[a.key];
+      if (!p) {
         l(void 0);
         return;
       }
-      if (d.type === "static") {
-        l(d.data);
+      if (p.type === "static") {
+        l(p.data);
         return;
       } else
-        a = b(b({}, a), d);
+        a = b(b({}, a), p);
     }
     const u = a.onError, c = () => {
       if (!s.getValue())
         return s.clearProp(), o.sync(n), !0;
     };
-    i._fn[s.id] = t.watchLoadData(se((d, m) => {
+    i._fn[s.id] = t.watchLoadData(se((p, m) => {
       if (m && a.watch === !1)
         return i._fn[s.id]();
-      const g = t.$handle.loadFetchVar(X(a), d, n), $ = q(b({
+      const g = t.$handle.loadFetchVar(W(a), p, n), $ = q(b({
         headers: {}
       }, g), {
         onSuccess(w, O) {
           if (c()) return;
           let G = (M) => O ? M : D(M, "data") ? M.data : M;
-          const P = z(g.parse);
-          h.Function(P) ? G = P : P && h.String(P) && (G = (M) => L(M, P)), l(G(w, n, o)), o.sync(n);
+          const T = z(g.parse);
+          h.Function(T) ? G = T : T && h.String(T) && (G = (M) => B(M, T)), l(G(w, n, o));
         },
         onError(w) {
-          l(void 0), !c() && (u || ((O) => xe(O.message || "fetch fail " + g.action)))(w, n, o);
+          l(void 0), !c() && (u || ((O) => et(O.message || "fetch fail " + g.action)))(w, n, o);
         }
       });
       t.$handle.beforeFetch($, { rule: n, api: o }).then(() => {
@@ -4033,7 +4052,7 @@ function Fi(t) {
   };
   return e;
 }
-const Oi = "html", Ri = {
+const Oi = "html", Si = {
   name: Oi,
   loadChildren: !1,
   render(t, e) {
@@ -4061,7 +4080,7 @@ function Ei(t) {
   }
   return null;
 }
-function Si(t) {
+function Ri(t) {
   const e = localStorage.getItem(t);
   if (e)
     try {
@@ -4086,13 +4105,13 @@ function it(t, e) {
     return null;
   const r = e.split(".");
   let i = t(r.shift());
-  return r.length ? i == null ? null : L(i, r) : i;
+  return r.length ? i == null ? null : B(i, r) : i;
 }
 function Di(t) {
   return it(Ei, t);
 }
 function ji(t) {
-  return it(Si, t);
+  return it(Ri, t);
 }
 function Ai(t) {
   return it(ki, t);
@@ -4101,7 +4120,7 @@ function Vi(t, e) {
   let r;
   return arguments.length === 2 ? (r = arguments[1], e = r[t]) : r = arguments[2], { id: e, prop: r };
 }
-function Le() {
+function Me() {
   return Vi("name", ...arguments);
 }
 function Ii(t) {
@@ -4120,79 +4139,79 @@ function Pi(t, e) {
 }
 function Ti(t) {
   const e = t.key || [], r = t.array || [], i = t.normal || [];
-  St.push(...e), Ze.push(...r), Ye.push(...i), Bt([...e, ...r, ...i]);
+  Rt.push(...e), Ye.push(...r), xe.push(...i), Bt([...e, ...r, ...i]);
 }
 let Bi = 1;
-const U = {}, Ee = Symbol("defValue");
+const U = {}, Re = Symbol("defValue");
 function Gt(t) {
   const e = {
-    [Be.name]: Be
+    [Le.name]: Le
   }, r = {}, i = {}, s = {}, n = {}, o = [], a = [], l = [
     t.extendApi
   ], u = b({}, wi), c = Xr();
-  let d = { global: {} };
+  let p = { global: {} };
   const m = t.isMobile === !0, g = ne({
     $mobile: m
   }), $ = $i(), w = {}, O = {};
   Ti(t.attrs || {});
   function G(f) {
-    const p = U[f];
-    if (Array.isArray(p))
-      return p.map((y) => y.api());
-    if (p)
-      return p.api();
+    const d = U[f];
+    if (Array.isArray(d))
+      return d.map((y) => y.api());
+    if (d)
+      return d.api();
   }
-  function P(f) {
+  function T(f) {
     o.push(f);
   }
   function M() {
-    const f = Le(...arguments);
+    const f = Me(...arguments);
     f.id && f.prop && (i[f.id] = f.prop);
   }
   function he() {
-    const f = Le(...arguments);
+    const f = Me(...arguments);
     f.id && f.prop && (u[f.id] = h.Function(f.prop) ? f.prop : q(b({}, f.prop), {
       name: f.id
     }));
   }
-  function Ae(f) {
+  function Ve(f) {
     $.use(f);
   }
   function de() {
-    const f = Le(...arguments);
-    if (!f.id || !f.prop) return ke;
-    const p = J(f.id), y = f.prop, v = y.merge === !0 ? r[p] : void 0;
-    r[p] = Re(y, v || ke), c[p] = I(p), y.maker && _(c, y.maker);
+    const f = Me(...arguments);
+    if (!f.id || !f.prop) return De;
+    const d = J(f.id), y = f.prop, v = y.merge === !0 ? r[d] : void 0;
+    r[d] = Ee(y, v || De), c[d] = P(d), y.maker && _(c, y.maker);
   }
-  function R(f, p) {
+  function S(f, d) {
     let y;
     if (h.String(f)) {
-      if (y = f, p === void 0)
-        return ["form-create", "formcreate"].indexOf(y) > -1 ? S() : e[y];
+      if (y = f, d === void 0)
+        return ["form-create", "formcreate"].indexOf(y) > -1 ? R() : e[y];
     } else
-      y = J(f.name), p = f;
-    if (!y || !p) return;
+      y = J(f.name), d = f;
+    if (!y || !d) return;
     const v = J(y);
-    e[y] = p, e[v] = p, delete $.aliasMap[y], delete $.aliasMap[v], delete r[y], delete r[v], p.formCreateParser && de(y, p.formCreateParser);
+    e[y] = d, e[v] = d, delete $.aliasMap[y], delete $.aliasMap[v], delete r[y], delete r[v], d.formCreateParser && de(y, d.formCreateParser);
   }
-  function S() {
-    return Nr(Ie, e, i);
+  function R() {
+    return Wr(Pe, e, i);
   }
   function N() {
-    return Be;
+    return Le;
   }
-  function pe(f, p) {
-    return h.Function(f.install) ? f.install(W, p) : h.Function(f) && f(W, p), this;
+  function pe(f, d) {
+    return h.Function(f.install) ? f.install(K, d) : h.Function(f) && f(K, d), this;
   }
-  function W(f, p, y) {
-    let v = Pi(f, p || {});
+  function K(f, d, y) {
+    let v = Pi(f, d || {});
     const C = v.$refs.fc.formCreate;
     return C.$parent = y, Ii(C.options).appendChild(v.$el), C.api();
   }
-  Re(W, O);
+  Ee(K, O);
   function Wt(f) {
-    let p = b({}, t);
-    return f ? p.inherit = {
+    let d = b({}, t);
+    return f ? d.inherit = {
       components: e,
       parsers: r,
       directives: i,
@@ -4202,57 +4221,57 @@ function Gt(t) {
       maker: c,
       formulas: w,
       loadData: g
-    } : delete p.inherit, Gt(p);
+    } : delete d.inherit, Gt(d);
   }
-  function Kt(f, p) {
-    s[f] = p;
+  function Kt(f, d) {
+    s[f] = d;
   }
-  function Xt(f, p) {
-    w[f] = p;
+  function Xt(f, d) {
+    w[f] = d;
   }
-  function zt(f, p) {
+  function zt(f, d) {
     const y = n[f] || {}, v = y.parsers || {};
-    p.parsers && Object.keys(p.parsers).forEach((C) => {
-      v[C] = Re(p.parsers[C], ke);
-    }), p.name = f, n[f] = q(b(b({}, y), p), { parsers: v });
+    d.parsers && Object.keys(d.parsers).forEach((C) => {
+      v[C] = Ee(d.parsers[C], De);
+    }), d.name = f, n[f] = q(b(b({}, y), d), { parsers: v });
   }
-  function Ce(f) {
-    f && Object.keys(U).forEach((p) => {
-      (Array.isArray(U[p]) ? U[p] : [U[p]]).forEach((v) => {
+  function we(f) {
+    f && Object.keys(U).forEach((d) => {
+      (Array.isArray(U[d]) ? U[d] : [U[d]]).forEach((v) => {
         v.bus.$emit("$loadData." + f);
       });
     });
   }
-  function Ve(f, p) {
-    oe(g, f, p), Ce(f);
+  function Ie(f, d) {
+    oe(g, f, d), we(f);
   }
-  function we(f, p) {
-    const y = (...v) => F(() => p(...v));
-    y._driver = !0, Ve(f, y);
+  function Fe(f, d) {
+    const y = (...v) => F(() => d(...v));
+    y._driver = !0, Ie(f, y);
   }
-  function nt(f, p) {
+  function nt(f, d) {
     const y = (f || "").split(".");
     f = y.shift();
     const v = y.join(".");
-    if (D(g, f) || E(g, f, Ee), g[f] !== Ee) {
+    if (D(g, f) || E(g, f, Re), g[f] !== Re) {
       let C = g[f];
-      return C && C._driver ? C = C(v) : y.length && (C = L(C, y)), C == null || C === "" ? p : C;
+      return C && C._driver ? C = C(v) : y.length && (C = B(C, y)), C == null || C === "" ? d : C;
     } else
-      return p;
+      return d;
   }
   function Qt(f) {
     l.push(f);
   }
   function Zt(f) {
-    delete g[f], Ce(f);
+    delete g[f], we(f);
   }
-  function Yt(f, p) {
-    a.push({ name: f, callback: p });
+  function Yt(f, d) {
+    a.push({ name: f, callback: d });
   }
-  function Ie(f) {
+  function Pe(f) {
     _(this, {
       id: Bi++,
-      create: W,
+      create: K,
       vm: f,
       manager: vi(t.manager),
       parsers: r,
@@ -4261,7 +4280,7 @@ function Gt(t) {
       formulas: w,
       isMobile: m,
       rules: f.$options.propsData.rule,
-      name: f.$options.propsData.name || je(),
+      name: f.$options.propsData.name || Ae(),
       inFor: f.$options.propsData.inFor,
       prop: {
         components: e,
@@ -4270,7 +4289,7 @@ function Gt(t) {
       get: null,
       drivers: n,
       renderDriver: null,
-      refreshData: Ce,
+      refreshData: we,
       loadData: g,
       CreateNode: $,
       bus: new Fi(),
@@ -4279,60 +4298,60 @@ function Gt(t) {
       extendApiFn: l,
       fetchCache: /* @__PURE__ */ new WeakMap(),
       tmpData: ne({})
-    }), a.forEach((p) => {
-      this.bus.$on(p.name, p.callback);
-    }), T(() => {
-      B(this.options, () => {
+    }), a.forEach((d) => {
+      this.bus.$on(d.name, d.callback);
+    }), I(() => {
+      L(this.options, () => {
         this.$handle.$manager.updateOptions(this.options.value), this.api().refresh();
       }, { deep: !0 });
     }), _(f.$options.components, e), _(f.$options.directives, i), this.$handle = new Q(this), this.name && (this.inFor ? (U[this.name] || (U[this.name] = []), U[this.name].push(this)) : U[this.name] = this);
   }
-  Ie.isMobile = m, _(Ie.prototype, {
+  Pe.isMobile = m, _(Pe.prototype, {
     init() {
-      this.isSub() && this.unwatch.push(B(() => this.vm.parent.fc.options.value, () => {
+      this.isSub() && this.unwatch.push(L(() => this.vm.parent.fc.options.value, () => {
         this.initOptions(), this.$handle.api.refresh();
-      }, { deep: !0 })), this.vm.$options.propsData.driver && (this.renderDriver = typeof this.vm.$options.propsData.driver == "object" ? this.vm.$options.propsData.driver : this.drivers[this.vm.$options.propsData.driver]), !this.renderDriver && this.vm.parent && (this.renderDriver = this.vm.parent.renderDriver), this.renderDriver || (this.renderDriver = this.drivers.default), this.initOptions(), this.$handle.init();
+      }, { deep: !0 })), this.vm.$options.propsData.driver && (this.renderDriver = typeof this.vm.$options.propsData.driver == "object" ? this.vm.$options.propsData.driver : this.drivers[this.vm.$options.propsData.driver]), !this.renderDriver && this.vm.parent && (this.renderDriver = this.vm.parent.fc.renderDriver), this.renderDriver || (this.renderDriver = this.drivers.default), this.initOptions(), this.$handle.init();
     },
-    targetFormDriver(f, ...p) {
+    targetFormDriver(f, ...d) {
       if (this.renderDriver && this.renderDriver[f])
-        return F(() => this.renderDriver[f](...p));
+        return F(() => this.renderDriver[f](...d));
     },
-    t(f, p, y) {
+    t(f, d, y) {
       let v = y ? y("$t." + f) : this.globalLanguageDriver(f);
-      return v == null && (v = ""), v && p && Object.keys(p).forEach((C) => {
+      return v == null && (v = ""), v && d && Object.keys(d).forEach((C) => {
         const j = new RegExp(`{${C}}`, "g");
-        v = v.replace(j, p[C]);
+        v = v.replace(j, d[C]);
       }), v;
     },
     globalDataDriver(f) {
-      let p = f.split(".");
-      const y = p.shift(), v = this.options.value.globalData && this.options.value.globalData[y];
+      let d = f.split(".");
+      const y = d.shift(), v = this.options.value.globalData && this.options.value.globalData[y];
       if (v) {
         if (v.type === "static")
-          return L(v.data, p);
+          return B(v.data, d);
         {
           let C;
           const j = this.fetchCache.get(v);
           if (j) {
-            if (j.status && (C = L(j.data, p)), !j.loading)
+            if (j.status && (C = B(j.data, d)), !j.loading)
               return C;
             j.loading = !1, this.fetchCache.set(v, j);
           } else
             this.fetchCache.set(v, { status: !1 });
           const k = se(() => {
             le();
-            const K = this.fetchCache.get(v);
-            this.options.value.globalData && Object.values(this.options.value.globalData).indexOf(v) !== -1 ? (K && (K.loading = !0, this.fetchCache.set(v, K)), this.bus.$emit("$loadData.$globalData." + y)) : this.fetchCache.delete(v);
-          }, v.wait || 600), ae = (K) => {
-            this.fetchCache.set(v, { status: !0, data: K }), this.bus.$emit("$loadData.$globalData." + y);
-          }, Z = (K, ue) => {
+            const X = this.fetchCache.get(v);
+            this.options.value.globalData && Object.values(this.options.value.globalData).indexOf(v) !== -1 ? (X && (X.loading = !0, this.fetchCache.set(v, X)), this.bus.$emit("$loadData.$globalData." + y)) : this.fetchCache.delete(v);
+          }, v.wait || 600), ae = (X) => {
+            this.fetchCache.set(v, { status: !0, data: X }), this.bus.$emit("$loadData.$globalData." + y);
+          }, Z = (X, ue) => {
             if (ue && v.watch === !1)
               return le();
             if (ue) {
               k();
               return;
             }
-            const me = this.$handle.loadFetchVar(Ge(v), K);
+            const me = this.$handle.loadFetchVar(Je(v), X);
             this.$handle.api.fetch(me).then((re) => {
               ae(re);
             }).catch((re) => {
@@ -4348,15 +4367,16 @@ function Gt(t) {
       return f && typeof f == "object" ? f.name : typeof f == "string" ? f : "zh-cn";
     },
     globalLanguageDriver(f) {
-      let p = this.vm.top.$props.locale, y;
-      if (p && typeof p == "object" && (y = L(p, f)), y == null) {
+      let d = this.vm.top.$props.locale, y;
+      if (d && typeof d == "object" && (y = B(d, f)), y == null) {
         const v = this.options.value.language || {}, C = this.getLocale();
-        y = L(v[C], f);
+        y = B(v[C], f);
       }
       return y;
     },
     globalVarDriver(f) {
-      const y = f.split(".").shift(), v = this.options.value.globalVariable && this.options.value.globalVariable[y];
+      let d = f.split(".");
+      const y = d.shift(), v = this.options.value.globalVariable && this.options.value.globalVariable[y];
       if (v) {
         const C = h.Function(v) ? v : z(v.handle);
         if (C) {
@@ -4364,14 +4384,14 @@ function Gt(t) {
           const k = this.watchLoadData((ae, Z) => {
             Z ? (this.bus.$emit("$loadData.$var." + y), k()) : j = C(ae, this.$handle.api);
           });
-          return this.unwatch.push(k), j;
+          return this.unwatch.push(k), B(j, d);
         }
       }
     },
-    setData(f, p, y) {
-      y ? Ve(f, p) : (oe(this.vm.top.fc.tmpData, f, p), this.bus.$emit("$loadData." + f));
+    setData(f, d, y) {
+      y ? Ie(f, d) : (oe(this.vm.top.fc.tmpData, f, d), this.bus.$emit("$loadData." + f));
     },
-    getLoadData(f, p) {
+    getLoadData(f, d) {
       let y = null;
       if (f != null) {
         let v = f.split(".");
@@ -4397,14 +4417,14 @@ function Gt(t) {
             return this.$handle.preview;
           {
             const j = this.vm.top.fc.tmpData;
-            D(j, C) || E(j, C, Ee), y = j[C] !== Ee ? L(j, f) : nt(f), v = [];
+            D(j, C) || E(j, C, Re), y = j[C] !== Re ? B(j, f) : nt(f), v = [];
           }
         }
-        y && v.length && (y = L(y, v));
+        y && v.length && (y = B(y, v));
       }
-      return y == null || y === "" ? p : y;
+      return y == null || y === "" ? d : y;
     },
-    watchLoadData(f, p) {
+    watchLoadData(f, d) {
       let y = {};
       const v = (k) => {
         this.get || (this.get = C), F(() => {
@@ -4414,12 +4434,12 @@ function Gt(t) {
         let Z;
         if (typeof k == "object" && (Z = k.getValue, k = k.id), y[k])
           return y[k].val;
-        const le = ye(() => Z ? Z() : this.getLoadData(k, ae)), K = k.split("."), ue = K.shift(), me = K.shift() || "", re = se(() => {
-          const Pe = Z ? Z() : this.getLoadData(k, ae);
+        const le = ye(() => Z ? Z() : this.getLoadData(k, ae)), X = k.split("."), ue = X.shift(), me = X.shift() || "", re = se(() => {
+          const Te = Z ? Z() : this.getLoadData(k, ae);
           if (y[k])
-            JSON.stringify(Pe) !== JSON.stringify(y[k].val) && (y[k].val = Pe, v(!0));
+            JSON.stringify(Te) !== JSON.stringify(y[k].val) && (y[k].val = Te, v(!0));
           else return;
-        }, p || 0), er = B(le, (Pe) => {
+        }, d || 0), er = L(le, (Te) => {
           re();
         });
         return this.bus.$on("$loadData." + ue, re), me && this.bus.$on("$loadData." + ue + "." + me, re), y[k] = {
@@ -4446,13 +4466,13 @@ function Gt(t) {
         resetBtn: {},
         globalEvent: {},
         globalData: {}
-      }, X(d));
+      }, W(p));
       this.isSub() && (f = this.mergeOptions(f, this.vm.parent.fc.options.value || {}, !0)), f = this.mergeOptions(f, this.vm.$options.propsData.option || {}), this.updateOptions(f);
     },
-    mergeOptions(f, p, y) {
-      return p = b({}, p || {}), y && ["page", "onSubmit", "onReset", "onCreated", "onChange", "onMounted", "mounted", "onReload", "reload", "formData", "el", "globalClass", "style"].forEach((v) => {
-        delete p[v];
-      }), p.global && (f.global = Gr(f.global, p.global), delete p.global), this.$handle.$manager.mergeOptions([p], f), f;
+    mergeOptions(f, d, y) {
+      return d = b({}, d || {}), y && ["page", "onSubmit", "onReset", "onCreated", "onChange", "onMounted", "mounted", "onReload", "reload", "formData", "el", "globalClass", "style"].forEach((v) => {
+        delete d[v];
+      }), d.global && (f.global = Hr(f.global, d.global), delete d.global), this.$handle.$manager.mergeOptions([d], f), f;
     },
     updateOptions(f) {
       this.options.value = this.mergeOptions(this.options.value, f), this.$handle.$manager.updateOptions(this.options.value), this.bus.$emit("$loadData.$options");
@@ -4488,12 +4508,12 @@ function Gt(t) {
       isMobile: m,
       extendApi: Qt,
       getData: nt,
-      setDataDriver: we,
-      setData: Ve,
+      setDataDriver: Fe,
+      setData: Ie,
       removeData: Zt,
-      refreshData: Ce,
+      refreshData: we,
       maker: c,
-      component: R,
+      component: S,
       directive: M,
       setModelField: Kt,
       setFormula: Xt,
@@ -4503,43 +4523,43 @@ function Gt(t) {
       parser: de,
       use: pe,
       factory: Wt,
-      componentAlias: Ae,
+      componentAlias: Ve,
       copyRule: Vt,
       copyRules: It,
       mergeRule: te,
       fetch: Mt,
-      $form: S,
+      $form: R,
       parseFn: z,
       parseJson: At,
-      toJson: et,
-      useApp: P,
+      toJson: _e,
+      useApp: T,
       getApi: G,
       on: Yt
     });
   }
   function xt(f) {
     _(f, {
-      create: W,
-      install(p, y) {
-        if (d = b(b({}, d), y || {}), p._installedFormCreate === !0) return;
-        p._installedFormCreate = !0;
+      create: K,
+      install(d, y) {
+        if (p = b(b({}, p), y || {}), d._installedFormCreate === !0) return;
+        d._installedFormCreate = !0;
         const v = function(j, k = {}) {
-          return W(j, k, this);
+          return K(j, k, this);
         };
-        st(v), p.prototype.$formCreate = v;
-        const C = S();
-        p.component(C.name, C), p.component("FcFragment", N()), o.forEach((j) => {
-          F(() => j(f, p));
+        st(v), d.prototype.$formCreate = v;
+        const C = R();
+        d.component(C.name, C), d.component("FcFragment", N()), o.forEach((j) => {
+          F(() => j(f, d));
         });
       }
     });
   }
-  if (st(O), xt(O), we("$cookie", Di), we("$localStorage", ji), we("$sessionStorage", Ai), $.use({ fragment: "fcFragment" }), t.install && W.use(t), de(Ri), t.inherit) {
+  if (st(O), xt(O), Fe("$cookie", Di), Fe("$localStorage", ji), Fe("$sessionStorage", Ai), $.use({ fragment: "fcFragment" }), t.install && K.use(t), de(Si), t.inherit) {
     const f = t.inherit;
     f.components && _(e, f.components), f.parsers && _(r, f.parsers), f.directives && _(i, f.directives), f.modelFields && _(s, f.modelFields), f.providers && _(u, f.providers), f.useApps && _(o, f.useApps), f.maker && _(c, f.maker), f.loadData && _(g, f.loadData), f.formulas && _(w, f.formulas);
   }
-  const Fe = S();
-  return Re(Fe, O), Object.defineProperties(Fe, {
+  const Oe = R();
+  return Ee(Oe, O), Object.defineProperties(Oe, {
     fetch: {
       get() {
         return O.fetch;
@@ -4548,7 +4568,7 @@ function Gt(t) {
         O.fetch = f;
       }
     }
-  }), Fe.util = O, Fe;
+  }), Oe.util = O, Oe;
 }
 const bt = {
   date: "yyyy-MM-dd",
@@ -4562,25 +4582,25 @@ const bt = {
 }, _t = "datePicker", Li = {
   name: _t,
   maker: function() {
-    return ["year", "month", "date", "dates", "week", "datetime", "datetimeRange", "dateRange", "monthRange"].reduce((t, e) => (t[e] = I(_t, { type: e.toLowerCase() }), t), {});
+    return ["year", "month", "date", "dates", "week", "datetime", "datetimeRange", "dateRange", "monthRange"].reduce((t, e) => (t[e] = P(_t, { type: e.toLowerCase() }), t), {});
   }(),
   mergeProp(t) {
     const e = t.prop.props;
     e.valueFormat || (e.valueFormat = bt[e.type] || bt.date);
   }
-}, Me = "hidden", Mi = {
-  name: Me,
+}, Ne = "hidden", Mi = {
+  name: Ne,
   maker: {
-    [Me]: (t, e) => I(Me)("", t, e)
+    [Ne]: (t, e) => P(Ne)("", t, e)
   },
   render() {
     return [];
   }
-}, Ne = "input", Ni = {
-  name: Ne,
+}, qe = "input", Ni = {
+  name: qe,
   maker: function() {
-    const t = ["password", "url", "email", "text", "textarea"].reduce((e, r) => (e[r] = I(Ne, { type: r }), e), {});
-    return t.idate = I(Ne, { type: "date" }), t;
+    const t = ["password", "url", "email", "text", "textarea"].reduce((e, r) => (e[r] = P(qe, { type: r }), e), {});
+    return t.idate = P(qe, { type: "date" }), t;
   }(),
   mergeProp(t) {
     let { props: e } = t.prop;
@@ -4589,17 +4609,17 @@ const bt = {
 }, Ct = "slider", qi = {
   name: Ct,
   maker: {
-    sliderRange: I(Ct, { range: !0 })
+    sliderRange: P(Ct, { range: !0 })
   },
   toFormValue(t, e) {
     let r = Array.isArray(t), i = e.prop.props, s = i.min || 0, n;
     return i.range === !0 ? n = r ? t : [s, parseFloat(t) || s] : n = r ? parseFloat(t[0]) || s : parseFloat(t), n;
   }
-}, qe = "timePicker", Ui = {
-  name: qe,
+}, Ue = "timePicker", Ui = {
+  name: Ue,
   maker: {
-    time: I(qe, (t) => t.props.isRange = !1),
-    timeRange: I(qe, (t) => t.props.isRange = !0)
+    time: P(Ue, (t) => t.props.isRange = !1),
+    timeRange: P(Ue, (t) => t.props.isRange = !0)
   },
   mergeProp(t) {
     const e = t.prop.props;
@@ -4704,7 +4724,7 @@ function Y(t) {
 function Qi(t, e) {
   D(t, e) && !h.Object(t[e]) && (t[e] = { show: !!t[e] });
 }
-function Ue(t) {
+function He(t) {
   const e = b({}, t);
   return delete e.children, e;
 }
@@ -4781,7 +4801,7 @@ const Zi = {
       props: q(b({
         labelWidth: o === void 0 ? o : jt(o),
         label: n ? r.title.title : void 0
-      }, Ue(r.wrap || {})), {
+      }, He(r.wrap || {})), {
         prop: t.id,
         rules: t.injectValidate()
       }),
@@ -4798,9 +4818,9 @@ const Zi = {
     return !(!e.title && !e.native || Y(e.show));
   },
   makeInfo(t, e, r) {
-    var c, d, m, g, $, w;
+    var c, p, m, g, $, w;
     const i = b({}, t.title), s = b({}, t.info), n = zi(s), o = this.options.form, a = this.getSlot("title"), l = [a ? a({
-      title: (d = (c = r.refRule) == null ? void 0 : c.__$title) == null ? void 0 : d.value,
+      title: (p = (c = r.refRule) == null ? void 0 : c.__$title) == null ? void 0 : p.value,
       rule: r.rule,
       options: this.options
     }) : ((g = (m = r.refRule) == null ? void 0 : m.__$title) == null ? void 0 : g.value) + (o.labelSuffix || o["label-suffix"] || "")];
@@ -4808,7 +4828,7 @@ const Zi = {
       const O = {
         type: s.type || "popover",
         slot: "label",
-        props: Ue(s),
+        props: He(s),
         key: `${e}pop`
       };
       delete O.props.icon, delete O.props.show, delete O.props.info, delete O.props.align, delete O.props.native;
@@ -4823,7 +4843,7 @@ const Zi = {
       ]));
     }
     const u = ee([i, {
-      props: Ue(i),
+      props: He(i),
       key: `${e}tit`,
       class: "fc-form-title",
       slot: i.slot || "label",
@@ -4906,16 +4926,16 @@ tn(fe);
 rn(fe);
 function Yi(t) {
   ["group", "tree", "switch", "upload", "autoComplete", "checkbox", "cascader", "colorPicker", "datePicker", "frame", "inputNumber", "radio", "rate"].forEach((e) => {
-    t[e] = I(e);
+    t[e] = P(e);
   }), t.auto = t.autoComplete, t.number = t.inputNumber, t.color = t.colorPicker;
 }
 function xi(t) {
   const e = "select", r = "multiple";
-  t.selectMultiple = I(e, { [r]: !0 }), t.selectOne = I(e, { [r]: !1 });
+  t.selectMultiple = P(e, { [r]: !0 }), t.selectOne = P(e, { [r]: !1 });
 }
 function en(t) {
   const e = "tree", r = { treeSelected: "selected", treeChecked: "checked" };
-  Object.keys(r).reduce((i, s) => (i[s] = I(e, { type: r[s] }), i), t);
+  Object.keys(r).reduce((i, s) => (i[s] = P(e, { type: r[s] }), i), t);
 }
 function tn(t) {
   const e = "upload", r = {
@@ -4924,7 +4944,7 @@ function tn(t) {
     uploadFileOne: ["file", 1],
     uploadImageOne: ["image", 1]
   };
-  Object.keys(r).reduce((i, s) => (i[s] = I(e, (n) => n.props({ uploadType: r[s][0], maxLength: r[s][1] })), i), t), t.uploadImage = t.image, t.uploadFile = t.file;
+  Object.keys(r).reduce((i, s) => (i[s] = P(e, (n) => n.props({ uploadType: r[s][0], maxLength: r[s][1] })), i), t), t.uploadImage = t.image, t.uploadFile = t.file;
 }
 function rn(t) {
   const e = {
@@ -4935,7 +4955,7 @@ function rn(t) {
     frameFileOne: ["file", 1],
     frameImageOne: ["image", 1]
   };
-  return Object.keys(e).reduce((r, i) => (r[i] = I("frame", (s) => s.props({ type: e[i][0], maxLength: e[i][1] })), r), t), t.frameInput = t.frameInputs, t.frameFile = t.frameFiles, t.frameImage = t.frameImages, t;
+  return Object.keys(e).reduce((r, i) => (r[i] = P("frame", (s) => s.props({ type: e[i][0], maxLength: e[i][1] })), r), t), t.frameInput = t.frameInputs, t.frameFile = t.frameFiles, t.frameImage = t.frameImages, t;
 }
 function Ft(t, e) {
   return h.Boolean(t) ? t = { show: t } : !h.Undef(t) && !h.Object(t) && (t = { show: e }), t;
@@ -4953,7 +4973,7 @@ function nn(t, e) {
     validate(r) {
       return new Promise((i, s) => {
         const n = t.children, o = [e.$manager.validate()];
-        n.forEach((a) => {
+        n.filter((a) => !a.isScope).forEach((a) => {
           o.push(a.validate());
         }), Promise.all(o).then(() => {
           i(!0), r && r(!0);
@@ -4967,7 +4987,7 @@ function nn(t, e) {
         const o = e.getFieldCtx(r);
         if (!o) return;
         const a = e.subForm[o.id], l = [e.$manager.validateField(o.id)];
-        H(a).forEach((u) => {
+        H(a).filter((u) => !u.isScope).forEach((u) => {
           l.push(u.validate());
         }), Promise.all(l).then(() => {
           s(null), i && i(null);
@@ -5025,11 +5045,11 @@ function nn(t, e) {
     },
     submit(r, i) {
       return new Promise((s, n) => {
-        t.validate().then(() => {
-          let o = t.formData();
-          h.Function(r) && F(() => r(o, t)), h.Function(e.options.onSubmit) && F(() => e.options.onSubmit(o, t)), e.vm.$emit("submit", o, t), s(o);
-        }).catch((...o) => {
-          h.Function(i) && F(() => i(t, ...o)), n(...o);
+        (e.options.validateOnSubmit === !1 ? Promise.resolve() : t.validate()).then(() => {
+          let a = t.formData();
+          h.Function(r) && F(() => r(a, t)), h.Function(e.options.onSubmit) && F(() => e.options.onSubmit(a, t)), e.vm.$emit("submit", a, t), s(a);
+        }).catch((...a) => {
+          h.Function(i) && F(() => i(t, ...a)), n(...a);
         });
       });
     }
@@ -5078,7 +5098,7 @@ function on(t) {
 function an() {
   return Gt({
     ui: "element-ui",
-    version: "2.7.4",
+    version: "2.7.5",
     manager: Zi,
     extendApi: nn,
     install: on,
@@ -5089,10 +5109,10 @@ function an() {
     }
   });
 }
-const ze = an();
-typeof window != "undefined" && (window.formCreate = ze, window.Vue && ze.install(window.Vue));
-const cn = ze.maker;
+const Qe = an();
+typeof window != "undefined" && (window.formCreate = Qe, window.Vue && Qe.install(window.Vue));
+const cn = Qe.maker;
 export {
-  ze as default,
+  Qe as default,
   cn as maker
 };