@harbor-design/proform 1.3.7 → 1.3.9

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 Te = Object.defineProperty;
+var ze = (t, e, r) => e in t ? Te(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 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";
+import { ref as z, readonly as _e, nextTick as P, isRef as q, watch as _, isReactive as U, 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);
@@ -145,7 +145,7 @@ class ke {
     P(() => {
       this.runtimeCore.hydrateEffect.trackEffect(
         () => {
-          T(e) ? _(
+          q(e) ? _(
             () => e.value,
             () => {
               h(this.runtimeCore.model.value, e.value);
@@ -154,7 +154,7 @@ class ke {
               deep: !0,
               immediate: !0
             }
-          ) : q(e) ? _(
+          ) : U(e) ? _(
             () => e,
             () => {
               h(this.runtimeCore.model.value, e);
@@ -173,7 +173,7 @@ class ke {
   }
   share(e) {
     P(() => {
-      if (T(e)) {
+      if (q(e)) {
         const r = _(
           () => e.value,
           () => {
@@ -186,7 +186,7 @@ class ke {
             immediate: !0
           }
         );
-      } else if (q(e)) {
+      } else if (U(e)) {
         const r = _(
           () => e,
           () => {
@@ -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 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, 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, Me = Object.prototype, Xe = Me.hasOwnProperty, Ye = Me.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 Ee(t) {
+function je(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 st = "[object Symbol]";
 function J(t) {
-  return typeof t == "symbol" || rt(t) && Ee(t) == st;
+  return typeof t == "symbol" || rt(t) && je(t) == st;
 }
 function it(t, e) {
   for (var r = -1, s = t == null ? 0 : t.length, i = Array(s); ++r < s; )
@@ -297,7 +297,7 @@ var ot = "[object AsyncFunction]", at = "[object Function]", lt = "[object Gener
 function ct(t) {
   if (!G(t))
     return !1;
-  var e = Ee(t);
+  var e = je(t);
   return e == at || e == lt || e == ot || e == ut;
 }
 var k = Z["__core-js_shared__"], Oe = function() {
@@ -337,19 +337,19 @@ function A(t, e) {
   var r = It(t, e);
   return Ct(r) ? r : void 0;
 }
-var Me = function() {
+var Ee = function() {
   try {
     var t = A(Object, "defineProperty");
     return t({}, "", {}), t;
   } catch {
   }
 }(), St = 9007199254740991, Ot = /^(?:0|[1-9]\d*)$/;
-function Mt(t, e) {
+function Et(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__" && Me ? Me(t, e, {
+function Mt(t, e, r) {
+  e == "__proto__" && Ee ? Ee(t, e, {
     configurable: !0,
     enumerable: !0,
     value: r,
@@ -359,10 +359,10 @@ function jt(t, e, r) {
 function Fe(t, e) {
   return t === e || t !== t && e !== e;
 }
-var Et = Object.prototype, wt = Et.hasOwnProperty;
+var jt = Object.prototype, wt = jt.hasOwnProperty;
 function Ft(t, e, r) {
   var s = t[e];
-  (!(wt.call(t, e) && Fe(s, r)) || r === void 0 && !(e in t)) && jt(t, e, r);
+  (!(wt.call(t, e) && Fe(s, r)) || r === void 0 && !(e in t)) && Mt(t, e, r);
 }
 var xt = /\.|\[(?:[^[\]]*|(["'])(?:(?!\1)[^\\]|\\.)*?\1)\]/, Rt = /^\w*$/;
 function $t(t, e) {
@@ -371,45 +371,45 @@ function $t(t, e) {
   var r = typeof t;
   return r == "number" || r == "symbol" || r == "boolean" || t == null || J(t) ? !0 : Rt.test(t) || !xt.test(t) || e != null && t in Object(e);
 }
-var U = A(Object, "create");
+var T = A(Object, "create");
 function Vt() {
-  this.__data__ = U ? U(null) : {}, this.size = 0;
+  this.__data__ = T ? T(null) : {}, this.size = 0;
 }
 function Nt(t) {
   var e = this.has(t) && delete this.__data__[t];
   return this.size -= e ? 1 : 0, e;
 }
-var Tt = "__lodash_hash_undefined__", qt = Object.prototype, Ut = qt.hasOwnProperty;
+var qt = "__lodash_hash_undefined__", Ut = Object.prototype, Tt = Ut.hasOwnProperty;
 function zt(t) {
   var e = this.__data__;
-  if (U) {
+  if (T) {
     var r = e[t];
-    return r === Tt ? void 0 : r;
+    return r === qt ? void 0 : r;
   }
-  return Ut.call(e, t) ? e[t] : void 0;
+  return Tt.call(e, t) ? e[t] : void 0;
 }
 var Lt = Object.prototype, Dt = Lt.hasOwnProperty;
 function Gt(t) {
   var e = this.__data__;
-  return U ? e[t] !== void 0 : Dt.call(e, t);
+  return T ? e[t] !== void 0 : Dt.call(e, t);
 }
 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 ? Wt : e, this;
+  return this.size += this.has(t) ? 0 : 1, r[t] = T && e === void 0 ? Wt : e, this;
 }
-function M(t) {
+function E(t) {
   var e = -1, r = t == null ? 0 : t.length;
   for (this.clear(); ++e < r; ) {
     var s = t[e];
     this.set(s[0], s[1]);
   }
 }
-M.prototype.clear = Vt;
-M.prototype.delete = Nt;
-M.prototype.get = zt;
-M.prototype.has = Gt;
-M.prototype.set = Bt;
+E.prototype.clear = Vt;
+E.prototype.delete = Nt;
+E.prototype.get = zt;
+E.prototype.has = Gt;
+E.prototype.set = Bt;
 function kt() {
   this.__data__ = [], this.size = 0;
 }
@@ -453,9 +453,9 @@ R.prototype.set = Jt;
 var Qt = A(Z, "Map");
 function At() {
   this.size = 0, this.__data__ = {
-    hash: new M(),
+    hash: new E(),
     map: new (Qt || R)(),
-    string: new M()
+    string: new E()
   };
 }
 function er(t) {
@@ -480,18 +480,18 @@ function ir(t, e) {
   var r = B(this, t), s = r.size;
   return r.set(t, e), this.size += r.size == s ? 0 : 1, this;
 }
-function j(t) {
+function M(t) {
   var e = -1, r = t == null ? 0 : t.length;
   for (this.clear(); ++e < r; ) {
     var s = t[e];
     this.set(s[0], s[1]);
   }
 }
-j.prototype.clear = At;
-j.prototype.delete = tr;
-j.prototype.get = rr;
-j.prototype.has = sr;
-j.prototype.set = ir;
+M.prototype.clear = At;
+M.prototype.delete = tr;
+M.prototype.get = rr;
+M.prototype.has = sr;
+M.prototype.set = ir;
 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, s);
     return r.cache = n.set(i, a) || n, a;
   };
-  return r.cache = new (ee.Cache || j)(), r;
+  return r.cache = new (ee.Cache || M)(), r;
 }
-ee.Cache = j;
+ee.Cache = M;
 var or = 500;
 function ar(t) {
   var e = ee(t, function(s) {
@@ -552,7 +552,7 @@ function hr(t, e, r, s) {
       return t;
     if (i != a) {
       var p = l[c];
-      d = s ? s(p, c, l) : void 0, d === void 0 && (d = G(p) ? p : Mt(e[i + 1]) ? [] : {});
+      d = s ? s(p, c, l) : void 0, d === void 0 && (d = G(p) ? p : Et(e[i + 1]) ? [] : {});
     }
     Ft(l, c, d), l = l[c];
   }
@@ -578,14 +578,11 @@ class mr {
     u(this, "defaultValueInprogressMap", /* @__PURE__ */ new Map());
     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,
       () => {
-        this.modelTriggerTimer && clearTimeout(this.modelTriggerTimer), this.modelTriggerTimer = setTimeout(() => {
-          this.schemaEffect.triggerEffects();
-        }, 0);
+        this.schemaEffect.triggerEffects();
       },
       {
         deep: !0
@@ -792,7 +789,7 @@ class mr {
         e.name.startsWith("__proform_onetime_") && (e.__proform_cached_result = n), this.promiseFieldParser(n, r, i, s);
       }
     else
-      T(e) ? _(
+      q(e) ? _(
         () => e.value,
         () => {
           o.isUndefined(e.value) || (i && o.isObject(e.value) && !o.isNativeObject(e.value) ? this.objectParser({
@@ -806,7 +803,7 @@ class mr {
           immediate: !0,
           deep: !0
         }
-      ) : q(e) ? _(
+      ) : U(e) ? _(
         () => e,
         () => {
           this.reactiveWatchMap.get(e) || (this.reactiveWatchMap.set(e, !0), !o.isArrayEmpty(e) && !o.isObjectEmpty(e) && (o.isUndefined(e) || (i && o.isObject(e) && !o.isNativeObject(e) ? this.objectParser({
@@ -852,7 +849,7 @@ class mr {
       }
   }
 }
-class E {
+class j {
   static getFormContainer({ ui: e } = {}) {
     return f.presets.uiPresets[e ?? f.presets.ui].container.Form;
   }
@@ -936,19 +933,21 @@ class br {
     u(this, "shared", {});
     this.setup = e, this.processor = new mr(this);
     const r = this.setup(this);
-    this.ui = r.ui ?? f.presets.ui, this.runtimeAdapter = new gr(this.ui), Object.assign(this.globalNativeFormOverride, this.runtimeAdapter.getRuntimeNative()), T(r.schemas) ? _(
+    this.ui = r.ui ?? f.presets.ui, this.runtimeAdapter = new gr(this.ui), Object.assign(this.globalNativeFormOverride, this.runtimeAdapter.getRuntimeNative()), q(r.schemas) ? _(
       // @ts-expect-error
       () => r.schemas.value,
       () => {
         this.processor.schemaEffect.clearEffects(), this.processor.processedSchemas.value = [], this.processor.processedModel.value = {}, this.processor.stableModel = {}, this.processor.parseSchemas(r.schemas.value);
       },
       {
-        deep: !0
+        deep: !0,
+        immediate: !0
       }
-    ) : q(r.schemas) ? _(() => r.schemas, () => {
+    ) : U(r.schemas) ? _(() => r.schemas, () => {
       this.processor.schemaEffect.clearEffects(), this.processor.processedSchemas.value = [], this.processor.processedModel.value = {}, this.processor.stableModel = {}, this.processor.parseSchemas(r.schemas);
     }, {
-      deep: !0
+      deep: !0,
+      immediate: !0
     }) : this.processor.parseSchemas(r.schemas);
   }
   getRuntimeMeta() {
@@ -958,18 +957,18 @@ class br {
       shared: this.shared,
       // share 增加防抖，当开发者在过程中进行 share 时避免频繁触发爆栈
       share: (r) => {
-        if (T(r)) {
+        if (q(r)) {
           const s = _(() => r.value, () => {
-            h(this.shared, r.value), P(() => {
+            h(this.shared, r.value), this.processor.schemaEffect.triggerEffects(), P(() => {
               s();
             });
           }, {
             deep: !0,
             immediate: !0
           });
-        } else if (q(r)) {
+        } else if (U(r)) {
           const s = _(() => r, () => {
-            h(this.shared, r), P(() => {
+            h(this.shared, r), this.processor.schemaEffect.triggerEffects(), P(() => {
               s();
             });
           }, {
@@ -977,7 +976,7 @@ class br {
             immediate: !0
           });
         } else
-          h(this.shared, r);
+          h(this.shared, r), this.processor.schemaEffect.triggerEffects();
       }
     };
   }
@@ -1009,7 +1008,7 @@ class br {
     const $e = this.runtimeAdapter.getRuntimeRequired({
       ...e,
       label: y
-    }), Ve = E.getItemContainer(this), Ne = E.getFormItemContainer(this), Te = this, qe = e.componentSlots;
+    }), Ve = j.getItemContainer(this), Ne = j.getFormItemContainer(this), qe = this, Ue = e.componentSlots;
     return g("div", {
       style: l
     }, [g(Ve, {
@@ -1020,12 +1019,12 @@ class br {
           label: `${y ? `${y}:` : ""}`
         }, d, $e), {
           default() {
-            return Te.runtimeAdapter.formComponentRenderer({
+            return qe.runtimeAdapter.formComponentRenderer({
               Component: n,
               schema: e,
               baseModel: s,
               placeholder: S,
-              componentSlots: qe,
+              componentSlots: Ue,
               props: m
             });
           },
@@ -1040,7 +1039,7 @@ class br {
       display: "grid",
       gridColumn: "1 / -1",
       ...e.grid
-    }, i = E.getGroupContainer(this);
+    }, i = j.getGroupContainer(this);
     let n = e.show;
     return n === void 0 && (n = !0), g("div", {
       style: s
@@ -1052,7 +1051,7 @@ class br {
   }
   addListItem(e) {
     var r, s;
-    if (!((r = this.processor.stableModel[e.field]) != null && r[0]))
+    if (console.log("this", this.processor.stableModel), !((r = this.processor.stableModel[e.field]) != null && r[0]))
       return Promise.reject({
         code: "0001",
         message: "异步默认值数据正在处理中，请您耐心等待... "
@@ -1071,7 +1070,7 @@ class br {
     s.model.value[e.field] || (s.model.value[e.field] = [{}]);
     let i = e.show;
     i === void 0 && (i = !0);
-    const n = E.getListContainer(this), a = E.getListItemContainer(this);
+    const n = j.getListContainer(this), a = j.getListItemContainer(this);
     return g("div", {
       style: r
     }, [i && g(n, {
@@ -1113,7 +1112,7 @@ class br {
       gridColumn: "1 / -1",
       gridAutoColumns: "1fr",
       ...this.grid
-    }, r = this, s = h(this.globalNativeFormOverride.props.Form, C((c = (l = this.native) == null ? void 0 : l.props) == null ? void 0 : c.Form) ?? {}), i = h(this.globalNativeFormOverride.slots.Form, C((p = (d = this.native) == null ? void 0 : d.slots) == null ? void 0 : p.Form) ?? {}), n = E.getFormContainer(this), a = this.runtimeAdapter.getFormModelPropName();
+    }, r = this, s = h(this.globalNativeFormOverride.props.Form, C((c = (l = this.native) == null ? void 0 : l.props) == null ? void 0 : c.Form) ?? {}), i = h(this.globalNativeFormOverride.slots.Form, C((p = (d = this.native) == null ? void 0 : d.slots) == null ? void 0 : p.Form) ?? {}), n = j.getFormContainer(this), a = this.runtimeAdapter.getFormModelPropName();
     return g(n, N(s, {
       ref: this.formRef
     }, {
@@ -1471,13 +1470,13 @@ function te(t, e) {
 function Or(t) {
   return te(t, "native");
 }
-function Mr(t) {
+function Er(t) {
   return t.__proform_raw_object = !0, t;
 }
-function jr(t) {
+function Mr(t) {
   return te(t, "onetime");
 }
-function Er(t) {
+function jr(t) {
   function e() {
     return t;
   }
@@ -1489,9 +1488,9 @@ function Er(t) {
 export {
   Cr as ProForm,
   Or as markNativeFunction,
-  Mr as markNativeObject,
-  jr as markOnetimeFunction,
-  Er as markStructuredPathParsing,
+  Er as markNativeObject,
+  Mr as markOnetimeFunction,
+  jr as markStructuredPathParsing,
   Ir as useForm,
   Sr as useFormPresetConfigurer,
   te as useModifiers

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

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Ref } from "vue";
 import { AnyObject, Schema, ProxyedSchema, AnyFunction, ObjectParserRoot } from "../../types";
 import { RuntimeCore } from "..";
@@ -23,7 +22,6 @@ export default class Processor {
     defaultValueInprogressMap: Map<any, any>;
     baseDefaultValueFunctionsLength: number;
     isModelInitialized: boolean;
-    modelTriggerTimer: NodeJS.Timeout;
     reactiveWatchMap: Map<any, any>;
     constructor(runtimeCore: RuntimeCore);
     parse<T extends object = any>(data: T[], parentMeta?: AnyObject): void;

package/package.json

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