@harbor-design/proform 1.3.0 → 1.3.2

package/dist/index.js

@@ -1,7 +1,7 @@
-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 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 q, watch as _, isReactive as U, toRaw as E, reactive as Pe, createVNode as y, 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 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";
 class o {
   static typeChecker(e) {
     return {}.toString.call(e);
@@ -145,7 +145,7 @@ class He {
     P(() => {
       this.runtimeCore.hydrateEffect.trackEffect(
         () => {
-          q(e) ? _(
+          T(e) ? _(
             () => e.value,
             () => {
               h(this.runtimeCore.model.value, e.value);
@@ -154,7 +154,7 @@ class He {
               deep: !0,
               immediate: !0
             }
-          ) : U(e) ? _(
+          ) : q(e) ? _(
             () => e,
             () => {
               h(this.runtimeCore.model.value, e);
@@ -173,7 +173,7 @@ class He {
   }
   share(e) {
     P(() => {
-      if (q(e)) {
+      if (T(e)) {
         const r = _(
           () => e.value,
           () => {
@@ -186,7 +186,7 @@ class He {
             immediate: !0
           }
         );
-      } else if (U(e)) {
+      } else if (q(e)) {
         const r = _(
           () => e,
           () => {
@@ -321,13 +321,13 @@ function ht(t) {
   }
   return "";
 }
-var mt = /[\\^$.*+?()[\]{}|]/g, yt = /^\[object .+?Constructor\]$/, gt = Function.prototype, bt = Object.prototype, vt = gt.toString, _t = bt.hasOwnProperty, Pt = RegExp(
+var mt = /[\\^$.*+?()[\]{}|]/g, gt = /^\[object .+?Constructor\]$/, yt = Function.prototype, bt = Object.prototype, vt = yt.toString, _t = bt.hasOwnProperty, Pt = RegExp(
   "^" + vt.call(_t).replace(mt, "\\$&").replace(/hasOwnProperty|(function).*?(?=\\\()| for .+?(?=\\\])/g, "$1.*?") + "$"
 );
 function Ct(t) {
   if (!G(t) || ft(t))
     return !1;
-  var e = ct(t) ? Pt : yt;
+  var e = ct(t) ? Pt : gt;
   return e.test(ht(t));
 }
 function It(t, e) {
@@ -371,32 +371,32 @@ 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 T = A(Object, "create");
+var U = A(Object, "create");
 function Vt() {
-  this.__data__ = T ? T(null) : {}, this.size = 0;
+  this.__data__ = U ? U(null) : {}, this.size = 0;
 }
 function Nt(t) {
   var e = this.has(t) && delete this.__data__[t];
   return this.size -= e ? 1 : 0, e;
 }
-var qt = "__lodash_hash_undefined__", Ut = Object.prototype, Tt = Ut.hasOwnProperty;
+var Tt = "__lodash_hash_undefined__", qt = Object.prototype, Ut = qt.hasOwnProperty;
 function zt(t) {
   var e = this.__data__;
-  if (T) {
+  if (U) {
     var r = e[t];
-    return r === qt ? void 0 : r;
+    return r === Tt ? void 0 : r;
   }
-  return Tt.call(e, t) ? e[t] : void 0;
+  return Ut.call(e, t) ? e[t] : void 0;
 }
 var Lt = Object.prototype, Dt = Lt.hasOwnProperty;
 function Gt(t) {
   var e = this.__data__;
-  return T ? e[t] !== void 0 : Dt.call(e, t);
+  return U ? e[t] !== void 0 : Dt.call(e, t);
 }
 var Bt = "__lodash_hash_undefined__";
 function kt(t, e) {
   var r = this.__data__;
-  return this.size += this.has(t) ? 0 : 1, r[t] = T && e === void 0 ? Bt : e, this;
+  return this.size += this.has(t) ? 0 : 1, r[t] = U && e === void 0 ? Bt : e, this;
 }
 function F(t) {
   var e = -1, r = t == null ? 0 : t.length;
@@ -578,10 +578,13 @@ class mr {
     u(this, "defaultValueInprogressMap", /* @__PURE__ */ new Map());
     u(this, "baseDefaultValueFunctionsLength");
     u(this, "isModelInitialized", !0);
+    u(this, "modelTriggerTimer");
     this.runtimeCore = e, this.processedSchemas = e.schemas, this.processedModel = e.model, this.getRuntimeMeta = e.getRuntimeMeta.bind(e), _(
       () => this.processedModel.value,
       () => {
-        this.schemaEffect.triggerEffects();
+        this.modelTriggerTimer && clearTimeout(this.modelTriggerTimer), this.modelTriggerTimer = setTimeout(() => {
+          this.schemaEffect.triggerEffects();
+        }, 0);
       },
       {
         deep: !0
@@ -649,11 +652,11 @@ class mr {
       const m = s.parseStable(l.stable), b = i == null ? void 0 : i.index, S = i == null ? void 0 : i.key;
       let v = m;
       if (o.isProcessInprogress(v) || (n[p] = !0), i) {
-        const g = s.processedSchemas.value[b][S][c][d];
-        g && o.isObject(g) && d !== "component" && (v = h(g, v)), s.processedSchemas.value[b][S][c][d] = v, s.stableUpdater(n);
+        const y = s.processedSchemas.value[b][S][c][d];
+        y && o.isObject(y) && d !== "component" && (v = h(y, v)), s.processedSchemas.value[b][S][c][d] = v, s.stableUpdater(n);
       } else {
-        const g = s.processedSchemas.value[c][d];
-        g && o.isObject(g) && d !== "component" && (v = h(g, v)), s.processedSchemas.value[c][d] = v, s.stableUpdater(n);
+        const y = s.processedSchemas.value[c][d];
+        y && o.isObject(y) && d !== "component" && (v = h(y, v)), s.processedSchemas.value[c][d] = v, s.stableUpdater(n);
       }
     }
   }
@@ -788,7 +791,7 @@ class mr {
         e.name.startsWith("__proform_onetime_") && (e.__proform_cached_result = n), this.promiseFieldParser(n, r, s, i);
       }
     else
-      q(e) ? _(
+      T(e) ? _(
         () => e.value,
         () => {
           o.isUndefined(e.value) || (s && o.isObject(e.value) && !o.isNativeObject(e.value) ? this.objectParser({
@@ -802,7 +805,7 @@ class mr {
           immediate: !0,
           deep: !0
         }
-      ) : U(e) ? _(
+      ) : q(e) ? (console.log("root", e), _(
         () => e,
         () => {
           o.isUndefined(e) || (s && o.isObject(e) && !o.isNativeObject(e) ? this.objectParser({
@@ -816,7 +819,7 @@ class mr {
           immediate: !0,
           deep: !0
         }
-      ) : s && o.isObject(e) && !o.isNativeObject(e) ? this.objectParser({
+      )) : s && o.isObject(e) && !o.isNativeObject(e) ? this.objectParser({
         data: e,
         updater: r,
         index: i.rootIndex,
@@ -868,7 +871,7 @@ class w {
     return f.presets.uiPresets[e ?? f.presets.ui].container.ListItem;
   }
 }
-class yr {
+class gr {
   constructor(e) {
     this.ui = e;
   }
@@ -902,7 +905,7 @@ class yr {
     return (r == null ? void 0 : r.clearValidate(e)) ?? (i == null ? void 0 : i.clearValidate(e));
   }
 }
-function gr(t) {
+function yr(t) {
   return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !Be(t);
 }
 class br {
@@ -932,7 +935,7 @@ 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 yr(this.ui), Object.assign(this.globalNativeFormOverride, this.runtimeAdapter.getRuntimeNative()), q(r.schemas))
+    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,
@@ -943,7 +946,7 @@ class br {
           deep: !0
         }
       );
-    else if (U(r.schemas)) {
+    else if (q(r.schemas)) {
       const i = _(() => r.schemas, () => {
         this.processor.parseSchemas(r.schemas), P(() => {
           i();
@@ -961,7 +964,7 @@ class br {
       shared: this.shared,
       // share 增加防抖，当开发者在过程中进行 share 时避免频繁触发爆栈
       share: (r) => {
-        if (q(r)) {
+        if (T(r)) {
           const i = _(() => r.value, () => {
             h(this.shared, r.value), P(() => {
               i();
@@ -970,7 +973,7 @@ class br {
             deep: !0,
             immediate: !0
           });
-        } else if (U(r)) {
+        } else if (q(r)) {
           const i = _(() => r, () => {
             h(this.shared, r), P(() => {
               i();
@@ -985,7 +988,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, ye, ge, be;
+    var re, ie, se, ne, oe, ae, le, ue, ce, fe, de, pe, he, me, ge, ye, be;
     const n = E(e.component);
     if (!n)
       return;
@@ -994,41 +997,41 @@ class br {
       display: "grid",
       gridColumn: "1 / -1",
       ...e.grid
-    }, c = h(C((me = (he = this.native) == null ? void 0 : he.props) == null ? void 0 : me.FormItem) ?? {}, (ge = (ye = e.native) == null ? void 0 : ye.props) == null ? void 0 : ge.FormItem), d = this.runtimeAdapter.getRuntimeField({
+    }, c = h(C((me = (he = this.native) == null ? void 0 : he.props) == null ? void 0 : me.FormItem) ?? {}, (ye = (ge = e.native) == null ? void 0 : ge.props) == null ? void 0 : ye.FormItem), d = this.runtimeAdapter.getRuntimeField({
       schema: e,
       parentSchema: s,
       index: r
     }), p = n.name, m = e.componentProps ?? {}, b = I.placeholderPresetByComponentName;
     let S = e.placeholder, v = e.show;
     v === void 0 && (v = !0);
-    let g = e.label ?? "", O;
-    if (e.runtime ? O = e.runtime : O = (s == null ? void 0 : s.runtime) ?? this.runtime, !o.isUndefined(r) && !o.isObjectEmpty(O) && (g = K((be = O == null ? void 0 : O.customizeListItemLabel) == null ? void 0 : be.call(O, e.label ?? "", r + 1), "")), !S) {
+    let y = e.label ?? "", O;
+    if (e.runtime ? O = e.runtime : O = (s == null ? void 0 : s.runtime) ?? this.runtime, !o.isUndefined(r) && !o.isObjectEmpty(O) && (y = K((be = O == null ? void 0 : O.customizeListItemLabel) == null ? void 0 : be.call(O, e.label ?? "", r + 1), "")), !S) {
       let $ = "请输入";
-      o.isUndefined(p) ? S = `${$}${g}` : /* @ts-expect-error */ b[p.toLowerCase()] ? ($ = // @ts-expect-error
-      b[p.toLowerCase()], S = `${$}${g}`) : (Object.keys(b).forEach((ve) => {
+      o.isUndefined(p) ? S = `${$}${y}` : /* @ts-expect-error */ b[p.toLowerCase()] ? ($ = // @ts-expect-error
+      b[p.toLowerCase()], S = `${$}${y}`) : (Object.keys(b).forEach((ve) => {
         p.toLowerCase().includes(ve.toLowerCase()) && ($ = b[ve]);
-      }), S = `${$}${g}`);
+      }), S = `${$}${y}`);
     }
     const $e = this.runtimeAdapter.getRuntimeRequired({
       ...e,
-      label: g
-    }), Ve = w.getItemContainer(this), Ne = w.getFormItemContainer(this), qe = this, Ue = e.componentSlots;
-    return y("div", {
+      label: y
+    }), Ve = w.getItemContainer(this), Ne = w.getFormItemContainer(this), Te = this, qe = e.componentSlots;
+    return g("div", {
       style: l
-    }, [y(Ve, {
+    }, [g(Ve, {
       show: v
     }, {
       default() {
-        return v && y(Ne, N(c, {
-          label: `${g ? `${g}:` : ""}`
+        return v && g(Ne, N(c, {
+          label: `${y ? `${y}:` : ""}`
         }, d, $e), {
           default() {
-            return qe.runtimeAdapter.formComponentRenderer({
+            return Te.runtimeAdapter.formComponentRenderer({
               Component: n,
               schema: e,
               baseModel: i,
               placeholder: S,
-              componentSlots: Ue,
+              componentSlots: qe,
               props: m
             });
           },
@@ -1045,11 +1048,11 @@ class br {
       ...e.grid
     }, s = w.getGroupContainer(this);
     let n = e.show;
-    return n === void 0 && (n = !0), y("div", {
+    return n === void 0 && (n = !0), g("div", {
       style: i
-    }, [n && y(s, {
+    }, [n && g(s, {
       schema: e
-    }, gr(r = e.children.map((a) => this.runtimeItemProcessor(a))) ? r : {
+    }, yr(r = e.children.map((a) => this.runtimeItemProcessor(a))) ? r : {
       default: () => [r]
     })]);
   }
@@ -1075,13 +1078,13 @@ class br {
     let s = e.show;
     s === void 0 && (s = !0);
     const n = w.getListContainer(this), a = w.getListItemContainer(this);
-    return y("div", {
+    return g("div", {
       style: r
-    }, [s && y(n, {
+    }, [s && g(n, {
       schema: e
     }, {
       default() {
-        return i.model.value[e.field].map((l, c) => y(a, null, {
+        return i.model.value[e.field].map((l, c) => g(a, null, {
           default() {
             return e.children.map((d) => i.runtimeItemProcessor(d, c, l, e));
           },
@@ -1089,8 +1092,8 @@ class br {
             container: d
           } = {}) {
             var m;
-            const p = d ?? y("button", null, null);
-            return Le(y(p, {
+            const p = d ?? g("button", null, null);
+            return Le(g(p, {
               onClick: () => i.deleteListItem(e, c)
             }, null), [[De, ((m = i.model.value[e.field]) == null ? void 0 : m.length) > 1]]);
           }
@@ -1099,8 +1102,8 @@ class br {
       add({
         container: l
       } = {}) {
-        const c = l ?? y("button", null, [Ge("添加")]);
-        return y(c, {
+        const c = l ?? g("button", null, [Ge("添加")]);
+        return g(c, {
           onClick: () => i.addListItem(e)
         }, null);
       }
@@ -1117,13 +1120,13 @@ class br {
       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();
-    return y(n, N(i, {
+    return g(n, N(i, {
       ref: this.formRef
     }, {
       [a]: this.model.value
     }), {
       default() {
-        return y("div", {
+        return g("div", {
           style: e
         }, [r.runtimeProcessor(r.schemas.value)]);
       },
@@ -1197,7 +1200,7 @@ const vr = {
       props: n
     }) {
       let a;
-      return o.isFunction(r.field) ? a = L(e, r.field()) : a = e[r.field], y(t, N({
+      return o.isFunction(r.field) ? a = L(e, r.field()) : a = e[r.field], g(t, N({
         modelValue: a,
         "onUpdate:modelValue": (l) => {
           o.isFunction(r.field) ? D(e, r.field(), l) : e[r.field] = l;
@@ -1265,7 +1268,7 @@ const vr = {
       props: n
     }) {
       let a;
-      return o.isFunction(r.field) ? a = L(e, r.field()) : a = e[r.field], y(t, N({
+      return o.isFunction(r.field) ? a = L(e, r.field()) : a = e[r.field], g(t, N({
         modelValue: a,
         "onUpdate:modelValue": (l) => {
           o.isFunction(r.field) ? D(e, r.field(), l) : e[r.field] = l;
@@ -1340,7 +1343,7 @@ const vr = {
       props: n
     }) {
       let a;
-      return o.isFunction(r.field) ? a = L(e, r.field()) : a = e[r.field], y(t, N({
+      return o.isFunction(r.field) ? a = L(e, r.field()) : a = e[r.field], g(t, N({
         value: a,
         "onUpdate:value": (l) => {
           o.isFunction(r.field) ? D(e, r.field(), l) : e[r.field] = l;

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

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

package/dist/types/src/types/formCustomizerTypes.d.ts

@@ -68,7 +68,7 @@ export interface ItemSchema {
     field: string;
     component: DomType;
     componentProps?: Record<string, ProFormProxyRule<AnyLike>>;
-    componentSlots?: AnyObject;
+    componentSlots?: Record<string, ProFormProxyRule<AnyLike>>;
     defaultValue?: PropertyKey | object;
 }
 export interface GroupSchema {

package/package.json

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