@harbor-design/proform 1.3.3 → 1.3.5

package/dist/index.js

@@ -1,7 +1,7 @@
 var Ue = Object.defineProperty;
 var ze = (t, e, r) => e in t ? Ue(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
 var u = (t, e, r) => (ze(t, typeof e != "symbol" ? e + "" : e, r), r);
-import { ref as z, readonly as _e, nextTick as P, isRef as T, watch as _, isReactive as q, toRaw as E, reactive as Pe, createVNode as g, mergeProps as N, withDirectives as Le, vShow as De, createTextVNode as Ge, isVNode as Be, defineComponent as ke } from "vue";
+import { ref as z, readonly as _e, nextTick as P, isRef as T, watch as _, isReactive as q, toRaw as F, reactive as Pe, createVNode as g, mergeProps as N, withDirectives as Le, vShow as De, createTextVNode as Ge, isVNode as We, defineComponent as Be } from "vue";
 class o {
   static typeChecker(e) {
     return {}.toString.call(e);
@@ -121,7 +121,7 @@ function C(t) {
 function K(t, e) {
   return t.replace(/undefined/g, e);
 }
-class He {
+class ke {
   constructor(e) {
     u(this, "runtimeCore");
     u(this, "readonlyReactiveModel", z({}));
@@ -247,7 +247,7 @@ class X {
     return !r.lazy && e(), r.identifier ? this.identifierMap.get(r.identifier) || (this.effects.add(e), this.identifierMap.set(r.identifier, !0)) : this.effects.add(e), () => this.effects.delete(e);
   }
 }
-var We = typeof global == "object" && global && global.Object === Object && global, Ke = typeof self == "object" && self && self.Object === Object && self, Z = We || Ke || Function("return this")(), x = Z.Symbol, je = Object.prototype, Xe = je.hasOwnProperty, Ye = je.toString, V = x ? x.toStringTag : void 0;
+var He = typeof global == "object" && global && global.Object === Object && global, Ke = typeof self == "object" && self && self.Object === Object && self, Z = He || Ke || Function("return this")(), x = Z.Symbol, Ee = Object.prototype, Xe = Ee.hasOwnProperty, Ye = Ee.toString, V = x ? x.toStringTag : void 0;
 function Ze(t) {
   var e = Xe.call(t, V), r = t[V];
   try {
@@ -263,7 +263,7 @@ function Ae(t) {
   return Qe.call(t);
 }
 var et = "[object Null]", tt = "[object Undefined]", Ce = x ? x.toStringTag : void 0;
-function we(t) {
+function Me(t) {
   return t == null ? t === void 0 ? tt : et : Ce && Ce in Object(t) ? Ze(t) : Ae(t);
 }
 function rt(t) {
@@ -271,7 +271,7 @@ function rt(t) {
 }
 var it = "[object Symbol]";
 function J(t) {
-  return typeof t == "symbol" || rt(t) && we(t) == it;
+  return typeof t == "symbol" || rt(t) && Me(t) == it;
 }
 function st(t, e) {
   for (var r = -1, i = t == null ? 0 : t.length, s = Array(i); ++r < i; )
@@ -279,11 +279,11 @@ function st(t, e) {
   return s;
 }
 var Q = Array.isArray, nt = 1 / 0, Ie = x ? x.prototype : void 0, Se = Ie ? Ie.toString : void 0;
-function Me(t) {
+function we(t) {
   if (typeof t == "string")
     return t;
   if (Q(t))
-    return st(t, Me) + "";
+    return st(t, we) + "";
   if (J(t))
     return Se ? Se.call(t) : "";
   var e = t + "";
@@ -297,11 +297,11 @@ var ot = "[object AsyncFunction]", at = "[object Function]", lt = "[object Gener
 function ct(t) {
   if (!G(t))
     return !1;
-  var e = we(t);
+  var e = Me(t);
   return e == at || e == lt || e == ot || e == ut;
 }
-var H = Z["__core-js_shared__"], Oe = function() {
-  var t = /[^.]+$/.exec(H && H.keys && H.keys.IE_PROTO || "");
+var k = Z["__core-js_shared__"], Oe = function() {
+  var t = /[^.]+$/.exec(k && k.keys && k.keys.IE_PROTO || "");
   return t ? "Symbol(src)_1." + t : "";
 }();
 function ft(t) {
@@ -337,32 +337,32 @@ function A(t, e) {
   var r = It(t, e);
   return Ct(r) ? r : void 0;
 }
-var Fe = function() {
+var je = function() {
   try {
     var t = A(Object, "defineProperty");
     return t({}, "", {}), t;
   } catch {
   }
 }(), St = 9007199254740991, Ot = /^(?:0|[1-9]\d*)$/;
-function Ft(t, e) {
+function jt(t, e) {
   var r = typeof t;
   return e = e ?? St, !!e && (r == "number" || r != "symbol" && Ot.test(t)) && t > -1 && t % 1 == 0 && t < e;
 }
-function jt(t, e, r) {
-  e == "__proto__" && Fe ? Fe(t, e, {
+function Et(t, e, r) {
+  e == "__proto__" && je ? je(t, e, {
     configurable: !0,
     enumerable: !0,
     value: r,
     writable: !0
   }) : t[e] = r;
 }
-function Ee(t, e) {
+function Fe(t, e) {
   return t === e || t !== t && e !== e;
 }
-var wt = Object.prototype, Mt = wt.hasOwnProperty;
-function Et(t, e, r) {
+var Mt = Object.prototype, wt = Mt.hasOwnProperty;
+function Ft(t, e, r) {
   var i = t[e];
-  (!(Mt.call(t, e) && Ee(i, r)) || r === void 0 && !(e in t)) && jt(t, e, r);
+  (!(wt.call(t, e) && Fe(i, r)) || r === void 0 && !(e in t)) && Et(t, e, r);
 }
 var xt = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/, Rt = /^\w*$/;
 function $t(t, e) {
@@ -393,49 +393,49 @@ function Gt(t) {
   var e = this.__data__;
   return U ? e[t] !== void 0 : Dt.call(e, t);
 }
-var Bt = "__lodash_hash_undefined__";
-function kt(t, e) {
+var Wt = "__lodash_hash_undefined__";
+function Bt(t, e) {
   var r = this.__data__;
-  return this.size += this.has(t) ? 0 : 1, r[t] = U && e === void 0 ? Bt : e, this;
+  return this.size += this.has(t) ? 0 : 1, r[t] = U && e === void 0 ? Wt : e, this;
 }
-function F(t) {
+function j(t) {
   var e = -1, r = t == null ? 0 : t.length;
   for (this.clear(); ++e < r; ) {
     var i = t[e];
     this.set(i[0], i[1]);
   }
 }
-F.prototype.clear = Vt;
-F.prototype.delete = Nt;
-F.prototype.get = zt;
-F.prototype.has = Gt;
-F.prototype.set = kt;
-function Ht() {
+j.prototype.clear = Vt;
+j.prototype.delete = Nt;
+j.prototype.get = zt;
+j.prototype.has = Gt;
+j.prototype.set = Bt;
+function kt() {
   this.__data__ = [], this.size = 0;
 }
-function B(t, e) {
+function W(t, e) {
   for (var r = t.length; r--; )
-    if (Ee(t[r][0], e))
+    if (Fe(t[r][0], e))
       return r;
   return -1;
 }
-var Wt = Array.prototype, Kt = Wt.splice;
+var Ht = Array.prototype, Kt = Ht.splice;
 function Xt(t) {
-  var e = this.__data__, r = B(e, t);
+  var e = this.__data__, r = W(e, t);
   if (r < 0)
     return !1;
   var i = e.length - 1;
   return r == i ? e.pop() : Kt.call(e, r, 1), --this.size, !0;
 }
 function Yt(t) {
-  var e = this.__data__, r = B(e, t);
+  var e = this.__data__, r = W(e, t);
   return r < 0 ? void 0 : e[r][1];
 }
 function Zt(t) {
-  return B(this.__data__, t) > -1;
+  return W(this.__data__, t) > -1;
 }
 function Jt(t, e) {
-  var r = this.__data__, i = B(r, t);
+  var r = this.__data__, i = W(r, t);
   return i < 0 ? (++this.size, r.push([t, e])) : r[i][1] = e, this;
 }
 function R(t) {
@@ -445,7 +445,7 @@ function R(t) {
     this.set(i[0], i[1]);
   }
 }
-R.prototype.clear = Ht;
+R.prototype.clear = kt;
 R.prototype.delete = Xt;
 R.prototype.get = Yt;
 R.prototype.has = Zt;
@@ -453,45 +453,45 @@ R.prototype.set = Jt;
 var Qt = A(Z, "Map");
 function At() {
   this.size = 0, this.__data__ = {
-    hash: new F(),
+    hash: new j(),
     map: new (Qt || R)(),
-    string: new F()
+    string: new j()
   };
 }
 function er(t) {
   var e = typeof t;
   return e == "string" || e == "number" || e == "symbol" || e == "boolean" ? t !== "__proto__" : t === null;
 }
-function k(t, e) {
+function B(t, e) {
   var r = t.__data__;
   return er(e) ? r[typeof e == "string" ? "string" : "hash"] : r.map;
 }
 function tr(t) {
-  var e = k(this, t).delete(t);
+  var e = B(this, t).delete(t);
   return this.size -= e ? 1 : 0, e;
 }
 function rr(t) {
-  return k(this, t).get(t);
+  return B(this, t).get(t);
 }
 function ir(t) {
-  return k(this, t).has(t);
+  return B(this, t).has(t);
 }
 function sr(t, e) {
-  var r = k(this, t), i = r.size;
+  var r = B(this, t), i = r.size;
   return r.set(t, e), this.size += r.size == i ? 0 : 1, this;
 }
-function j(t) {
+function E(t) {
   var e = -1, r = t == null ? 0 : t.length;
   for (this.clear(); ++e < r; ) {
     var i = t[e];
     this.set(i[0], i[1]);
   }
 }
-j.prototype.clear = At;
-j.prototype.delete = tr;
-j.prototype.get = rr;
-j.prototype.has = ir;
-j.prototype.set = sr;
+E.prototype.clear = At;
+E.prototype.delete = tr;
+E.prototype.get = rr;
+E.prototype.has = ir;
+E.prototype.set = sr;
 var nr = "Expected a function";
 function ee(t, e) {
   if (typeof t != "function" || e != null && typeof e != "function")
@@ -503,9 +503,9 @@ function ee(t, e) {
     var a = t.apply(this, i);
     return r.cache = n.set(s, a) || n, a;
   };
-  return r.cache = new (ee.Cache || j)(), r;
+  return r.cache = new (ee.Cache || E)(), r;
 }
-ee.Cache = j;
+ee.Cache = E;
 var or = 500;
 function ar(t) {
   var e = ee(t, function(i) {
@@ -520,7 +520,7 @@ var lr = /[^.[\]]+|\[(?:(-?\d+(?:\.\d+)?)|(["'])((?:(?!\2)[^\\]|\\.)*?)\2)\]|(?=
   }), e;
 });
 function fr(t) {
-  return t == null ? "" : Me(t);
+  return t == null ? "" : we(t);
 }
 function xe(t, e) {
   return Q(t) ? t : $t(t, e) ? [t] : cr(fr(t));
@@ -552,9 +552,9 @@ function hr(t, e, r, i) {
       return t;
     if (s != a) {
       var p = l[c];
-      d = i ? i(p, c, l) : void 0, d === void 0 && (d = G(p) ? p : Ft(e[s + 1]) ? [] : {});
+      d = i ? i(p, c, l) : void 0, d === void 0 && (d = G(p) ? p : jt(e[s + 1]) ? [] : {});
     }
-    Et(l, c, d), l = l[c];
+    Ft(l, c, d), l = l[c];
   }
   return t;
 }
@@ -579,6 +579,7 @@ class mr {
     u(this, "baseDefaultValueFunctionsLength");
     u(this, "isModelInitialized", !0);
     u(this, "modelTriggerTimer");
+    u(this, "reactiveWatchMap", /* @__PURE__ */ new Map());
     this.runtimeCore = e, this.processedSchemas = e.schemas, this.processedModel = e.model, this.getRuntimeMeta = e.getRuntimeMeta.bind(e), _(
       () => this.processedModel.value,
       () => {
@@ -633,7 +634,7 @@ class mr {
   // 对于稳定初始化更新的抽象
   stableUpdater(e = []) {
     if (e.every(Boolean)) {
-      const r = E(this.processedSchemas.value);
+      const r = F(this.processedSchemas.value);
       !o.isProcessInprogress(r) && o.isObjectEmpty(this.stableModel) && (this.stableUpdaterProcessProgress || (this.stableUpdaterProcessProgress = Array.from({
         length: r.length
       }).fill(!1)), this.stableUpdaterProcessProgress[this.stableUpdaterTimes] = !0, this.stableUpdaterTimes++, this.modelProcessor(r));
@@ -808,12 +809,12 @@ class mr {
       ) : q(e) ? _(
         () => e,
         () => {
-          o.isUndefined(e) || (s && o.isObject(e) && !o.isNativeObject(e) ? this.objectParser({
+          this.reactiveWatchMap.get(e) || (this.reactiveWatchMap.set(e, !0), !o.isArrayEmpty(e) && !o.isObjectEmpty(e) && (o.isUndefined(e) || (s && o.isObject(e) && !o.isNativeObject(e) ? this.objectParser({
             data: e,
             updater: r,
             index: i.rootIndex,
             parentMeta: i.parentMeta
-          }) : r(e));
+          }) : r(e))));
         },
         {
           immediate: !0,
@@ -851,7 +852,7 @@ class mr {
       }
   }
 }
-class w {
+class M {
   static getFormContainer({ ui: e } = {}) {
     return f.presets.uiPresets[e ?? f.presets.ui].container.Form;
   }
@@ -906,7 +907,7 @@ class gr {
   }
 }
 function yr(t) {
-  return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !Be(t);
+  return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !We(t);
 }
 class br {
   constructor(e) {
@@ -935,31 +936,24 @@ class br {
     u(this, "shared", {});
     this.setup = e, this.processor = new mr(this);
     const r = this.setup(this);
-    if (this.ui = r.ui ?? f.presets.ui, this.runtimeAdapter = new gr(this.ui), Object.assign(this.globalNativeFormOverride, this.runtimeAdapter.getRuntimeNative()), T(r.schemas))
-      _(
-        // @ts-expect-error
-        () => r.schemas.value,
-        () => {
-          this.processor.parseSchemas(r.schemas.value);
-        },
-        {
-          deep: !0
-        }
-      );
-    else if (q(r.schemas)) {
-      const i = _(() => r.schemas, () => {
-        this.processor.parseSchemas(r.schemas), P(() => {
-          i();
-        });
-      }, {
+    this.ui = r.ui ?? f.presets.ui, this.runtimeAdapter = new gr(this.ui), Object.assign(this.globalNativeFormOverride, this.runtimeAdapter.getRuntimeNative()), T(r.schemas) ? _(
+      // @ts-expect-error
+      () => r.schemas.value,
+      () => {
+        this.processor.schemaEffect.clearEffects(), this.processor.processedSchemas.value = [], this.processor.parseSchemas(r.schemas.value);
+      },
+      {
         deep: !0
-      });
-    } else
-      this.processor.parseSchemas(r.schemas);
+      }
+    ) : q(r.schemas) ? _(() => r.schemas, () => {
+      this.processor.schemaEffect.clearEffects(), this.processor.processedSchemas.value = [], this.processor.parseSchemas(r.schemas);
+    }, {
+      deep: !0
+    }) : this.processor.parseSchemas(r.schemas);
   }
   getRuntimeMeta() {
     return {
-      model: E(C(this.model.value)),
+      model: F(C(this.model.value)),
       reactiveModel: this.model.value,
       shared: this.shared,
       // share 增加防抖，当开发者在过程中进行 share 时避免频繁触发爆栈
@@ -989,7 +983,7 @@ class br {
   }
   runtimeItemProcessor(e, r, i = this.model.value, s) {
     var re, ie, se, ne, oe, ae, le, ue, ce, fe, de, pe, he, me, ge, ye, be;
-    const n = E(e.component);
+    const n = F(e.component);
     if (!n)
       return;
     (ie = (re = e.native) == null ? void 0 : re.props) != null && ie.Form && h(this.globalNativeFormOverride.props.Form, (ne = (se = e.native) == null ? void 0 : se.props) == null ? void 0 : ne.Form), (ae = (oe = e.native) == null ? void 0 : oe.slots) != null && ae.Form && h(this.globalNativeFormOverride.slots.Form, (ue = (le = e.native) == null ? void 0 : le.slots) == null ? void 0 : ue.Form);
@@ -1015,7 +1009,7 @@ class br {
     const $e = this.runtimeAdapter.getRuntimeRequired({
       ...e,
       label: y
-    }), Ve = w.getItemContainer(this), Ne = w.getFormItemContainer(this), Te = this, qe = e.componentSlots;
+    }), Ve = M.getItemContainer(this), Ne = M.getFormItemContainer(this), Te = this, qe = e.componentSlots;
     return g("div", {
       style: l
     }, [g(Ve, {
@@ -1046,7 +1040,7 @@ class br {
       display: "grid",
       gridColumn: "1 / -1",
       ...e.grid
-    }, s = w.getGroupContainer(this);
+    }, s = M.getGroupContainer(this);
     let n = e.show;
     return n === void 0 && (n = !0), g("div", {
       style: i
@@ -1077,7 +1071,7 @@ class br {
     i.model.value[e.field] || (i.model.value[e.field] = [{}]);
     let s = e.show;
     s === void 0 && (s = !0);
-    const n = w.getListContainer(this), a = w.getListItemContainer(this);
+    const n = M.getListContainer(this), a = M.getListItemContainer(this);
     return g("div", {
       style: r
     }, [s && g(n, {
@@ -1119,7 +1113,7 @@ class br {
       gridColumn: "1 / -1",
       gridAutoColumns: "1fr",
       ...this.grid
-    }, r = this, i = h(this.globalNativeFormOverride.props.Form, C((c = (l = this.native) == null ? void 0 : l.props) == null ? void 0 : c.Form) ?? {}), s = h(this.globalNativeFormOverride.slots.Form, C((p = (d = this.native) == null ? void 0 : d.slots) == null ? void 0 : p.Form) ?? {}), n = w.getFormContainer(this), a = this.runtimeAdapter.getFormModelPropName();
+    }, r = this, i = h(this.globalNativeFormOverride.props.Form, C((c = (l = this.native) == null ? void 0 : l.props) == null ? void 0 : c.Form) ?? {}), s = h(this.globalNativeFormOverride.slots.Form, C((p = (d = this.native) == null ? void 0 : d.slots) == null ? void 0 : p.Form) ?? {}), n = M.getFormContainer(this), a = this.runtimeAdapter.getFormModelPropName();
     return g(n, N(i, {
       ref: this.formRef
     }, {
@@ -1145,7 +1139,7 @@ class f {
   }
 }
 u(f, "presets");
-function W({
+function H({
   parentSchema: t,
   schema: e,
   index: r
@@ -1155,7 +1149,7 @@ function W({
 const vr = {
   ArcoVue: {
     getRuntimeField(t) {
-      const e = W(t);
+      const e = H(t);
       return o.isFunction(e) ? {
         field: e()
       } : {
@@ -1212,7 +1206,7 @@ const vr = {
     },
     validateForm(t) {
       return new Promise((e, r) => {
-        t.runtimeCore.formRef.value.validate((i) => i ? r(i) : e(t.cleanFallbackFields(E(t.runtimeCore.processor.processedModel.value))));
+        t.runtimeCore.formRef.value.validate((i) => i ? r(i) : e(t.cleanFallbackFields(F(t.runtimeCore.processor.processedModel.value))));
       });
     },
     clearValidate(t) {
@@ -1222,7 +1216,7 @@ const vr = {
   },
   NutUI: {
     getRuntimeField(t) {
-      const e = W(t);
+      const e = H(t);
       return o.isFunction(e) ? {
         prop: e()
       } : {
@@ -1284,7 +1278,7 @@ const vr = {
           valid: i,
           errors: s
         }) => {
-          i ? e(t.cleanFallbackFields(E(t.runtimeCore.processor.processedModel.value))) : r(s);
+          i ? e(t.cleanFallbackFields(F(t.runtimeCore.processor.processedModel.value))) : r(s);
         });
       });
     },
@@ -1295,7 +1289,7 @@ const vr = {
   },
   NaiveUI: {
     getRuntimeField(t) {
-      const e = W(t);
+      const e = H(t);
       return o.isFunction(e) ? {
         path: e()
       } : {
@@ -1355,7 +1349,7 @@ const vr = {
     },
     validateForm(t) {
       return new Promise((e, r) => {
-        t.runtimeCore.formRef.value.validate((i) => i ? r(i) : e(t.cleanFallbackFields(E(t.runtimeCore.processor.processedModel.value))));
+        t.runtimeCore.formRef.value.validate((i) => i ? r(i) : e(t.cleanFallbackFields(F(t.runtimeCore.processor.processedModel.value))));
       });
     },
     clearValidate(t) {
@@ -1363,7 +1357,7 @@ const vr = {
       (r = (e = t.formRef.value) == null ? void 0 : e.restoreValidation) == null || r.call(e);
     }
   }
-}, M = class M {
+}, w = class w {
   static getPlaceholderPrefixPresetByComponentName() {
     const e = {
       请选择: ["select", "tree"],
@@ -1376,7 +1370,7 @@ const vr = {
     return r;
   }
 };
-u(M, "schemaPreset", {
+u(w, "schemaPreset", {
   type: {
     defaultValue: "item"
   },
@@ -1422,19 +1416,19 @@ u(M, "schemaPreset", {
   runtime: {
     default: void 0
   }
-}), u(M, "componentPropsPreset", {
+}), u(w, "componentPropsPreset", {
   options: {
     defaultValue: []
   }
 }), // 基于基本功能提出基本预设
-u(M, "placeholderPresetByComponentName", M.getPlaceholderPrefixPresetByComponentName());
-let Y = M;
+u(w, "placeholderPresetByComponentName", w.getPlaceholderPrefixPresetByComponentName());
+let Y = w;
 const I = {
   ...Y,
   adapters: {
     ...vr
   }
-}, Cr = /* @__PURE__ */ ke({
+}, Cr = /* @__PURE__ */ Be({
   props: {
     setup: {
       type: Function,
@@ -1447,7 +1441,7 @@ const I = {
   }
 });
 function Ir(t) {
-  const e = new He(t);
+  const e = new ke(t);
   return [
     e.setup.bind(e),
     {
@@ -1477,13 +1471,13 @@ function te(t, e) {
 function Or(t) {
   return te(t, "native");
 }
-function Fr(t) {
+function jr(t) {
   return t.__proform_raw_object = !0, t;
 }
-function jr(t) {
+function Er(t) {
   return te(t, "onetime");
 }
-function wr(t) {
+function Mr(t) {
   function e() {
     return t;
   }
@@ -1495,9 +1489,9 @@ function wr(t) {
 export {
   Cr as ProForm,
   Or as markNativeFunction,
-  Fr as markNativeObject,
-  jr as markOnetimeFunction,
-  wr as markStructuredPathParsing,
+  jr as markNativeObject,
+  Er as markOnetimeFunction,
+  Mr as markStructuredPathParsing,
   Ir as useForm,
   Sr as useFormPresetConfigurer,
   te as useModifiers

package/dist/types/src/services/Processor/index.d.ts

@@ -24,6 +24,7 @@ export default class Processor {
     baseDefaultValueFunctionsLength: number;
     isModelInitialized: boolean;
     modelTriggerTimer: NodeJS.Timeout;
+    reactiveWatchMap: Map<any, any>;
     constructor(runtimeCore: RuntimeCore);
     parse<T extends object = any>(data: T[], parentMeta?: AnyObject): void;
     initSchemas(schemas: AnyObject[]): AnyObject[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@harbor-design/proform",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",