@harbor-design/proform 1.2.21 → 1.2.23

package/dist/index.js

@@ -118,7 +118,7 @@ function g(r) {
   }
   return t(r);
 }
-function x(r, e) {
+function _(r, e) {
   return r.replace(/undefined/g, e);
 }
 class be {
@@ -230,7 +230,7 @@ class be {
     ), this.readonlyReactiveModel.value = se(this.runtimeCore.model.value), this.runtimeCore.runtimeAdapter.clearValidate(this.runtimeCore));
   }
 }
-class L {
+class x {
   constructor() {
     a(this, "effects", /* @__PURE__ */ new Set());
   }
@@ -258,8 +258,8 @@ class ve {
     a(this, "componentPropsPreset", C.componentPropsPreset);
     a(this, "stableUpdaterProcessProgress");
     a(this, "stableUpdaterTimes", 0);
-    a(this, "schemaEffect", new L());
-    a(this, "defaultValueEffect", new L());
+    a(this, "schemaEffect", new x());
+    a(this, "defaultValueEffect", new x());
     a(this, "defaultValueInprogressMap", /* @__PURE__ */ new Map());
     a(this, "baseDefaultValueFunctionsLength");
     a(this, "isModelInitialized", !0);
@@ -331,11 +331,11 @@ class ve {
       const c = f.index, d = f.key, y = f.keyIndex;
       if (l.isUndefined(f.stable))
         return;
-      const F = i.parseStable(f.stable), E = s == null ? void 0 : s.index, I = s == null ? void 0 : s.key;
-      let b = F;
+      const V = i.parseStable(f.stable), F = s == null ? void 0 : s.index, I = s == null ? void 0 : s.key;
+      let b = V;
       if (l.isProcessInprogress(b) || (o[y] = !0), s) {
-        const m = i.processedSchemas.value[E][I][c][d];
-        m && l.isObject(m) && d !== "component" && (b = h(m, b)), i.processedSchemas.value[E][I][c][d] = b, i.stableUpdater(o);
+        const m = i.processedSchemas.value[F][I][c][d];
+        m && l.isObject(m) && d !== "component" && (b = h(m, b)), i.processedSchemas.value[F][I][c][d] = b, i.stableUpdater(o);
       } else {
         const m = i.processedSchemas.value[c][d];
         m && l.isObject(m) && d !== "component" && (b = h(m, b)), i.processedSchemas.value[c][d] = b, i.stableUpdater(o);
@@ -406,11 +406,11 @@ class ve {
   }
   promiseFieldParser(e, t, s) {
     l.isPromise(e) ? e.then((i) => {
-      l.isString(i) && (i = x(i, "")), s && l.isObject(i) && !l.isNativeObject(i) ? this.objectParser({
+      l.isString(i) && (i = _(i, "")), s && l.isObject(i) && !l.isNativeObject(i) ? this.objectParser({
         data: i,
         updater: t
       }) : t(i);
-    }) : (l.isString(e) && (e = x(e, "")), s && l.isObject(e) && !l.isNativeObject(e) ? this.objectParser({
+    }) : (l.isString(e) && (e = _(e, "")), s && l.isObject(e) && !l.isNativeObject(e) ? this.objectParser({
       data: e,
       updater: t
     }) : t(e));
@@ -425,9 +425,12 @@ class ve {
             ...this.getRuntimeMeta()
           })
         );
-      else {
-        const i = e(this.getRuntimeMeta());
+      else if (e.__proform_async_result) {
+        const i = e.__proform_async_result;
         this.promiseFieldParser(i, t, s);
+      } else {
+        const i = e(this.getRuntimeMeta());
+        e.__proform_async_result = i, this.promiseFieldParser(i, t, s);
       }
     else
       q(e) ? v(
@@ -539,7 +542,7 @@ class ge {
       list: this.runtimeListProcessor.bind(this)
     });
     a(this, "formRef", N(null));
-    a(this, "hydrateEffect", new L());
+    a(this, "hydrateEffect", new x());
     a(this, "native", re({}));
     a(this, "grid", {});
     a(this, "runtime", {});
@@ -613,11 +616,11 @@ class ge {
     };
   }
   runtimeItemProcessor(e, t, s = this.model.value, i) {
-    var _, z, k, B, D, T, G, W, K, H, J, Q, X, Y, Z, A, ee;
+    var $, z, k, B, D, T, G, W, K, H, J, Q, X, Y, Z, A, ee;
     const o = S(e.component);
     if (!o)
       return;
-    (z = (_ = e.native) == null ? void 0 : _.props) != null && z.Form && h(this.globalNativeFormOverride.props.Form, (B = (k = e.native) == null ? void 0 : k.props) == null ? void 0 : B.Form), (T = (D = e.native) == null ? void 0 : D.slots) != null && T.Form && h(this.globalNativeFormOverride.slots.Form, (W = (G = e.native) == null ? void 0 : G.slots) == null ? void 0 : W.Form);
+    (z = ($ = e.native) == null ? void 0 : $.props) != null && z.Form && h(this.globalNativeFormOverride.props.Form, (B = (k = e.native) == null ? void 0 : k.props) == null ? void 0 : B.Form), (T = (D = e.native) == null ? void 0 : D.slots) != null && T.Form && h(this.globalNativeFormOverride.slots.Form, (W = (G = e.native) == null ? void 0 : G.slots) == null ? void 0 : W.Form);
     const n = h(g((H = (K = this.native) == null ? void 0 : K.slots) == null ? void 0 : H.FormItem) ?? {}, (Q = (J = e.native) == null ? void 0 : J.slots) == null ? void 0 : Q.FormItem), f = {
       display: "grid",
       gridColumn: "1 / -1",
@@ -626,16 +629,15 @@ class ge {
       schema: e,
       parentSchema: i,
       index: t
-    }), y = o.name, F = e.componentProps ?? {}, E = C.placeholderPresetByComponentName;
+    }), y = o.name, V = e.componentProps ?? {}, F = C.placeholderPresetByComponentName;
     let I = e.placeholder, b = e.show;
     b === void 0 && (b = !0);
-    let m = e.label ?? "";
-    const V = (i == null ? void 0 : i.runtime) ?? this.runtime;
-    if (!l.isUndefined(t) && !l.isObjectEmpty(V) && (m = x((ee = V == null ? void 0 : V.customizeListItemLabel) == null ? void 0 : ee.call(V, e.label ?? "", t + 1), "")), !I) {
+    let m = e.label ?? "", E;
+    if (e.runtime ? E = e.runtime : E = (i == null ? void 0 : i.runtime) ?? this.runtime, !l.isUndefined(t) && !l.isObjectEmpty(E) && (m = _((ee = E == null ? void 0 : E.customizeListItemLabel) == null ? void 0 : ee.call(E, e.label ?? "", t + 1), "")), !I) {
       let w = "请输入";
-      l.isUndefined(y) ? I = `${w}${m}` : /* @ts-expect-error */ E[y.toLowerCase()] ? (w = // @ts-expect-error
-      E[y.toLowerCase()], I = `${w}${m}`) : (Object.keys(E).forEach((te) => {
-        y.toLowerCase().includes(te.toLowerCase()) && (w = E[te]);
+      l.isUndefined(y) ? I = `${w}${m}` : /* @ts-expect-error */ F[y.toLowerCase()] ? (w = // @ts-expect-error
+      F[y.toLowerCase()], I = `${w}${m}`) : (Object.keys(F).forEach((te) => {
+        y.toLowerCase().includes(te.toLowerCase()) && (w = F[te]);
       }), I = `${w}${m}`);
     }
     const ie = this.runtimeAdapter.getRuntimeRequired({
@@ -658,7 +660,7 @@ class ge {
               baseModel: s,
               placeholder: I,
               componentSlots: ae,
-              props: F
+              props: V
             });
           },
           ...n
@@ -717,11 +719,11 @@ class ge {
           delete({
             container: d
           } = {}) {
-            var F;
+            var V;
             const y = d ?? p("button", null, null);
             return fe(p(y, {
               onClick: () => s.deleteListItem(e, c)
-            }, null), [[de, ((F = s.model.value[e.field]) == null ? void 0 : F.length) > 1]]);
+            }, null), [[de, ((V = s.model.value[e.field]) == null ? void 0 : V.length) > 1]]);
           }
         }));
       },
@@ -1023,6 +1025,9 @@ a(R, "schemaPreset", {
   },
   grid: {
     default: void 0
+  },
+  runtime: {
+    default: void 0
   }
 }), a(R, "componentPropsPreset", {
   options: {
@@ -1030,9 +1035,9 @@ a(R, "schemaPreset", {
   }
 }), // 基于基本功能提出基本预设
 a(R, "placeholderPresetByComponentName", R.getPlaceholderPrefixPresetByComponentName());
-let $ = R;
+let L = R;
 const C = {
-  ...$,
+  ...L,
   adapters: {
     ...Ce
   }

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

@@ -59,6 +59,7 @@ export interface ItemSchema {
     show?: boolean;
     required?: boolean;
     placeholder?: string;
+    runtime?: Runtime;
     native?: NativeCustomizationOptions;
     grid?: GridStyle;
     label?: string;

package/package.json

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