@harbor-design/proform 1.1.20 → 1.1.21

package/dist/index.js

@@ -1,7 +1,7 @@
 var ie = Object.defineProperty;
 var oe = (r, e, t) => e in r ? ie(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
 var a = (r, e, t) => (oe(r, typeof e != "symbol" ? e + "" : e, t), t);
-import { isRef as x, watch as I, isReactive as z, toRaw as E, nextTick as w, ref as q, reactive as ne, createVNode as p, withDirectives as Z, mergeProps as R, vShow as A, createTextVNode as le, isVNode as ae, defineComponent as ue } from "vue";
+import { isRef as x, watch as I, isReactive as k, toRaw as E, nextTick as w, ref as q, reactive as ne, createVNode as p, withDirectives as Z, mergeProps as S, vShow as A, createTextVNode as le, isVNode as ae, defineComponent as ue } from "vue";
 class l {
   static typeChecker(e) {
     return {}.toString.call(e);
@@ -112,10 +112,10 @@ function g(r) {
   }
   return t(r);
 }
-function N(r, e) {
+function U(r, e) {
   return r.replace(/undefined/g, e);
 }
-class fe {
+class ce {
   constructor(e) {
     a(this, "runtimeCore");
     this.formCustomization = e;
@@ -131,7 +131,7 @@ class fe {
   }
   submit() {
     var s;
-    const e = (s = c.presets.uiPresets[this.runtimeCore.ui]) == null ? void 0 : s.adapter, t = b.adapters[this.runtimeCore.ui];
+    const e = (s = f.presets.uiPresets[this.runtimeCore.ui]) == null ? void 0 : s.adapter, t = b.adapters[this.runtimeCore.ui];
     return (e == null ? void 0 : e.validateForm(this)) ?? (t == null ? void 0 : t.validateForm(this));
   }
   hydrate(e) {
@@ -151,7 +151,7 @@ class fe {
             deep: !0,
             immediate: !0
           }
-        ) : z(e) ? I(
+        ) : k(e) ? I(
           () => e,
           () => {
             m(this.runtimeCore.model.value, e);
@@ -168,7 +168,7 @@ class fe {
     );
   }
 }
-class U {
+class N {
   constructor() {
     a(this, "effects", /* @__PURE__ */ new Set());
   }
@@ -184,7 +184,7 @@ class U {
     return !t.lazy && e(), this.effects.add(e), () => this.effects.delete(e);
   }
 }
-class ce {
+class fe {
   constructor(e) {
     a(this, "runtimeCore");
     a(this, "processedSchemas");
@@ -196,8 +196,8 @@ class ce {
     a(this, "componentPropsPreset", b.componentPropsPreset);
     a(this, "stableUpdaterProcessProgress");
     a(this, "stableUpdaterTimes", 0);
-    a(this, "schemaEffect", new U());
-    a(this, "defaultValueEffect", new U());
+    a(this, "schemaEffect", new N());
+    a(this, "defaultValueEffect", new N());
     a(this, "defaultValueInprogressMap", /* @__PURE__ */ new Map());
     a(this, "baseDefaultValueFunctionsLength");
     a(this, "isModelInitialized", !0);
@@ -265,17 +265,17 @@ class ce {
     }).fill(!1);
     this.objectParser({ data: e, index: t, updater: n });
     function n(u) {
-      const f = u.index, d = u.key, y = u.keyIndex;
+      const c = u.index, d = u.key, y = u.keyIndex;
       if (l.isUndefined(u.stable))
         return;
       const O = i.parseStable(u.stable), C = s == null ? void 0 : s.index, v = s == null ? void 0 : s.key;
       let P = O;
       if (l.isProcessInprogress(P) || (o[y] = !0), s) {
-        let h = i.processedSchemas.value[C][v][f][d];
-        h && l.isObject(h) && d !== "component" && (P = m(h, P)), i.processedSchemas.value[C][v][f][d] = P, i.stableUpdater(o);
+        let h = i.processedSchemas.value[C][v][c][d];
+        h && l.isObject(h) && d !== "component" && (P = m(h, P)), i.processedSchemas.value[C][v][c][d] = P, i.stableUpdater(o);
       } else {
-        let h = i.processedSchemas.value[f][d];
-        h && l.isObject(h) && d !== "component" && (P = m(h, P)), i.processedSchemas.value[f][d] = P, i.stableUpdater(o);
+        let h = i.processedSchemas.value[c][d];
+        h && l.isObject(h) && d !== "component" && (P = m(h, P)), i.processedSchemas.value[c][d] = P, i.stableUpdater(o);
       }
     }
   }
@@ -307,20 +307,20 @@ class ce {
         }) : this.defaultValueEffect.trackEffect(
           () => {
             const u = this.schemaEffect.trackEffect(() => {
-              /\{\s*model\s*\}/.test(t[i].toString()) ? this.fieldParser(t[i], (f) => {
-                if (!f)
-                  return n(f);
-                this.defaultValueInprogressMap.set(t[i], f), !l.isProcessInprogress(f) && this.defaultValueInprogressMap.size === this.baseDefaultValueFunctionsLength && Array.from(
+              /\{\s*model\s*\}/.test(t[i].toString()) ? this.fieldParser(t[i], (c) => {
+                if (!c)
+                  return n(c);
+                this.defaultValueInprogressMap.set(t[i], c), !l.isProcessInprogress(c) && this.defaultValueInprogressMap.size === this.baseDefaultValueFunctionsLength && Array.from(
                   this.defaultValueInprogressMap.values()
-                ).every((d) => !d.includes("undefined")) ? (n(f), this.defaultValueEffect.clearEffects(), w(() => {
+                ).every((d) => !d.includes("undefined")) ? (n(c), this.defaultValueEffect.clearEffects(), w(() => {
                   u();
-                })) : n(f);
-              }) : this.fieldParser(t[i], (f) => {
-                this.defaultValueInprogressMap.set(t[i], f), !l.isProcessInprogress(f) && this.defaultValueInprogressMap.size === this.baseDefaultValueFunctionsLength && Array.from(
+                })) : n(c);
+              }) : this.fieldParser(t[i], (c) => {
+                this.defaultValueInprogressMap.set(t[i], c), !l.isProcessInprogress(c) && this.defaultValueInprogressMap.size === this.baseDefaultValueFunctionsLength && Array.from(
                   this.defaultValueInprogressMap.values()
-                ).every((d) => !d.includes("undefined")) ? (n(f), this.defaultValueEffect.clearEffects(), w(() => {
+                ).every((d) => !d.includes("undefined")) ? (n(c), this.defaultValueEffect.clearEffects(), w(() => {
                   u();
-                })) : n(f);
+                })) : n(c);
               });
             });
           },
@@ -333,11 +333,11 @@ class ce {
   }
   promiseFieldParser(e, t, s) {
     l.isPromise(e) ? e.then((i) => {
-      l.isString(i) && (i = N(i, "")), s && l.isObject(i) ? this.objectParser({
+      l.isString(i) && (i = U(i, "")), s && l.isObject(i) ? this.objectParser({
         data: i,
         updater: t
       }) : t(i);
-    }) : (l.isString(e) && (e = N(e, "")), s && l.isObject(e) ? this.objectParser({
+    }) : (l.isString(e) && (e = U(e, "")), s && l.isObject(e) ? this.objectParser({
       data: e,
       updater: t
     }) : t(e));
@@ -369,7 +369,7 @@ class ce {
           immediate: !0,
           deep: !0
         }
-      ) : z(e) ? I(
+      ) : k(e) ? I(
         () => e,
         () => {
           l.isUndefined(e) || (s && l.isObject(e) ? this.objectParser({
@@ -401,22 +401,22 @@ class ce {
 }
 class F {
   static getFormContainer({ ui: e } = {}) {
-    return c.presets.uiPresets[e ?? c.presets.ui].container.Form;
+    return f.presets.uiPresets[e ?? f.presets.ui].container.Form;
   }
   static getFormItemContainer({ ui: e } = {}) {
-    return c.presets.uiPresets[e ?? c.presets.ui].container.FormItem;
+    return f.presets.uiPresets[e ?? f.presets.ui].container.FormItem;
   }
   static getItemContainer({ ui: e } = {}) {
-    return c.presets.uiPresets[e ?? c.presets.ui].container.Item;
+    return f.presets.uiPresets[e ?? f.presets.ui].container.Item;
   }
   static getGroupContainer({ ui: e } = {}) {
-    return c.presets.uiPresets[e ?? c.presets.ui].container.Group;
+    return f.presets.uiPresets[e ?? f.presets.ui].container.Group;
   }
   static getListContainer({ ui: e } = {}) {
-    return c.presets.uiPresets[e ?? c.presets.ui].container.List;
+    return f.presets.uiPresets[e ?? f.presets.ui].container.List;
   }
   static getListItemContainer({ ui: e } = {}) {
-    return c.presets.uiPresets[e ?? c.presets.ui].container.ListItem;
+    return f.presets.uiPresets[e ?? f.presets.ui].container.ListItem;
   }
 }
 class de {
@@ -425,27 +425,27 @@ class de {
   }
   getRuntimeField(e) {
     var i;
-    const t = (i = c.presets.uiPresets[this.ui]) == null ? void 0 : i.adapter, s = b.adapters[this.ui];
+    const t = (i = f.presets.uiPresets[this.ui]) == null ? void 0 : i.adapter, s = b.adapters[this.ui];
     return (t == null ? void 0 : t.getRuntimeField(e)) ?? (s == null ? void 0 : s.getRuntimeField(e));
   }
   getRuntimeRequired(e) {
     var i;
-    const t = (i = c.presets.uiPresets[this.ui]) == null ? void 0 : i.adapter, s = b.adapters[this.ui];
+    const t = (i = f.presets.uiPresets[this.ui]) == null ? void 0 : i.adapter, s = b.adapters[this.ui];
     return (t == null ? void 0 : t.getRuntimeRequired(e)) ?? (s == null ? void 0 : s.getRuntimeRequired(e));
   }
   getFormModelPropName() {
     var s;
-    const e = (s = c.presets.uiPresets[this.ui]) == null ? void 0 : s.adapter, t = b.adapters[this.ui];
+    const e = (s = f.presets.uiPresets[this.ui]) == null ? void 0 : s.adapter, t = b.adapters[this.ui];
     return (e == null ? void 0 : e.getFormModelPropName()) ?? (t == null ? void 0 : t.getFormModelPropName());
   }
   formComponentRenderer(e) {
     var i;
-    const t = (i = c.presets.uiPresets[this.ui]) == null ? void 0 : i.adapter, s = b.adapters[this.ui];
+    const t = (i = f.presets.uiPresets[this.ui]) == null ? void 0 : i.adapter, s = b.adapters[this.ui];
     return (t == null ? void 0 : t.formComponentRenderer(e)) ?? (s == null ? void 0 : s.formComponentRenderer(e));
   }
   clearValidate(e) {
     var i;
-    const t = (i = c.presets.uiPresets[this.ui]) == null ? void 0 : i.adapter, s = b.adapters[this.ui];
+    const t = (i = f.presets.uiPresets[this.ui]) == null ? void 0 : i.adapter, s = b.adapters[this.ui];
     return (t == null ? void 0 : t.clearValidate(e)) ?? (s == null ? void 0 : s.clearValidate(e));
   }
 }
@@ -462,7 +462,7 @@ class he {
       list: this.runtimeListProcessor.bind(this)
     });
     a(this, "formRef", q(null));
-    a(this, "hydrateEffect", new U());
+    a(this, "hydrateEffect", new N());
     a(this, "native", ne({}));
     a(this, "grid", {});
     a(this, "runtime", {});
@@ -470,9 +470,9 @@ class he {
       props: {},
       slots: {}
     });
-    this.setup = e, this.processor = new ce(this);
+    this.setup = e, this.processor = new fe(this);
     const t = this.setup(this);
-    if (this.ui = t.ui ?? c.presets.ui, this.runtimeAdapter = new de(this.ui), x(t.schemas)) {
+    if (this.ui = t.ui ?? f.presets.ui, this.runtimeAdapter = new de(this.ui), x(t.schemas)) {
       const s = I(() => t.schemas, () => {
         this.processor.parseSchemas(t.schemas.value), w(() => {
           s();
@@ -480,7 +480,7 @@ class he {
       }, {
         deep: !0
       });
-    } else if (z(t.schemas)) {
+    } else if (k(t.schemas)) {
       const s = I(() => t.schemas, () => {
         this.processor.parseSchemas(t.schemas), w(() => {
           s();
@@ -498,16 +498,16 @@ class he {
     };
   }
   runtimeItemProcessor(e, t, s = this.model.value, i) {
-    var k, $, _, B, D, G, T, K, W, H, J, Q, X;
+    var z, $, _, B, D, G, T, K, W, H, J, Q, X;
     const o = E(e.component);
     if (!o)
       return;
-    m(this.globalNativeFormOverride.props, ($ = (k = e.native) == null ? void 0 : k.props) == null ? void 0 : $.Form), m(this.globalNativeFormOverride.slots, (B = (_ = e.native) == null ? void 0 : _.slots) == null ? void 0 : B.Form);
+    m(this.globalNativeFormOverride.props, ($ = (z = e.native) == null ? void 0 : z.props) == null ? void 0 : $.Form), m(this.globalNativeFormOverride.slots, (B = (_ = e.native) == null ? void 0 : _.slots) == null ? void 0 : B.Form);
     const n = m(g((G = (D = this.native) == null ? void 0 : D.slots) == null ? void 0 : G.FormItem) ?? {}, (K = (T = e.native) == null ? void 0 : T.slots) == null ? void 0 : K.FormItem), u = {
       display: "grid",
       gridColumn: "1 / -1",
       ...e.grid
-    }, f = m(g((H = (W = this.native) == null ? void 0 : W.props) == null ? void 0 : H.FormItem) ?? {}, (Q = (J = e.native) == null ? void 0 : J.props) == null ? void 0 : Q.FormItem), d = this.runtimeAdapter.getRuntimeField({
+    }, c = m(g((H = (W = this.native) == null ? void 0 : W.props) == null ? void 0 : H.FormItem) ?? {}, (Q = (J = e.native) == null ? void 0 : J.props) == null ? void 0 : Q.FormItem), d = this.runtimeAdapter.getRuntimeField({
       schema: e,
       parentSchema: i,
       index: t
@@ -516,12 +516,12 @@ class he {
     P === void 0 && (P = !0), P || delete s[e.field];
     let h = e.label;
     const V = (i == null ? void 0 : i.runtime) ?? this.runtime;
-    if (!l.isUndefined(t) && !l.isObjectEmpty(V) && (h = N((X = V == null ? void 0 : V.customizeItemLabel) == null ? void 0 : X.call(V, e.label ?? "", t + 1), "")), !v) {
-      let S = "请输入";
-      l.isUndefined(y) ? v = `${S}${h}` : /* @ts-expect-error */ C[y.toLowerCase()] ? (S = // @ts-expect-error
-      C[y.toLowerCase()], v = `${S}${h}`) : (Object.keys(C).forEach((Y) => {
-        y.toLowerCase().includes(Y.toLowerCase()) && (S = C[Y]);
-      }), v = `${S}${h}`);
+    if (!l.isUndefined(t) && !l.isObjectEmpty(V) && (h = U((X = V == null ? void 0 : V.customizeItemLabel) == null ? void 0 : X.call(V, e.label ?? "", t + 1), "")), !v) {
+      let R = "请输入";
+      l.isUndefined(y) ? v = `${R}${h}` : /* @ts-expect-error */ C[y.toLowerCase()] ? (R = // @ts-expect-error
+      C[y.toLowerCase()], v = `${R}${h}`) : (Object.keys(C).forEach((Y) => {
+        y.toLowerCase().includes(Y.toLowerCase()) && (R = C[Y]);
+      }), v = `${R}${h}`);
     }
     const ee = this.runtimeAdapter.getRuntimeRequired({
       ...e,
@@ -531,7 +531,7 @@ class he {
       style: u
     }, [p(te, null, {
       default() {
-        return Z(p(se, R(f, {
+        return Z(p(se, S(c, {
           label: `${h}:`
         }, d, ee), {
           default() {
@@ -591,13 +591,13 @@ class he {
       default() {
         return s.model.value[e.field].map((n, u) => p(o, null, {
           default() {
-            return e.children.map((f) => s.runtimeItemProcessor(f, u, n, e));
+            return e.children.map((c) => s.runtimeItemProcessor(c, u, n, e));
           },
           delete({
-            container: f
+            container: c
           } = {}) {
             var y;
-            let d = f ?? p("button", null, null);
+            let d = c ?? p("button", null, null);
             return Z(p(d, {
               onClick: () => s.deleteListItem(e, u)
             }, null), [[A, ((y = s.model.value[e.field]) == null ? void 0 : y.length) > 1]]);
@@ -618,14 +618,14 @@ class he {
     return e.map((t) => (t.type || (t.type = "item"), this.processorBySchemaType[t.type](t)));
   }
   exec() {
-    var u, f, d, y;
+    var u, c, d, y;
     const e = {
       display: "grid",
       gridColumn: "1 / -1",
       gridAutoColumns: "1fr",
       ...this.grid
-    }, t = this, s = m(g((f = (u = this.native) == null ? void 0 : u.props) == null ? void 0 : f.Form) ?? {}, this.globalNativeFormOverride.props), i = m(g((y = (d = this.native) == null ? void 0 : d.slots) == null ? void 0 : y.Form) ?? {}, this.globalNativeFormOverride.slots), o = F.getFormContainer(this), n = this.runtimeAdapter.getFormModelPropName();
-    return p(o, R(s, {
+    }, t = this, s = m(g((c = (u = this.native) == null ? void 0 : u.props) == null ? void 0 : c.Form) ?? {}, this.globalNativeFormOverride.props), i = m(g((y = (d = this.native) == null ? void 0 : d.slots) == null ? void 0 : y.Form) ?? {}, this.globalNativeFormOverride.slots), o = F.getFormContainer(this), n = this.runtimeAdapter.getFormModelPropName();
+    return p(o, S(s, {
       ref: this.formRef
     }, {
       [n]: this.model.value
@@ -639,9 +639,9 @@ class he {
     });
   }
 }
-class c {
+class f {
 }
-a(c, "presets");
+a(f, "presets");
 function M({
   parentSchema: r,
   schema: e,
@@ -686,7 +686,7 @@ const me = {
       placeholder: s,
       props: i
     }) {
-      return p(r, R({
+      return p(r, S({
         modelValue: e[t.field],
         "onUpdate:modelValue": (o) => e[t.field] = o,
         placeholder: s
@@ -738,7 +738,7 @@ const me = {
       placeholder: s,
       props: i
     }) {
-      return p(r, R({
+      return p(r, S({
         modelValue: e[t.field],
         "onUpdate:modelValue": (o) => e[t.field] = o,
         placeholder: s
@@ -795,7 +795,7 @@ const me = {
       placeholder: s,
       props: i
     }) {
-      return p(r, R({
+      return p(r, S({
         value: e[t.field],
         "onUpdate:value": (o) => e[t.field] = o,
         placeholder: s
@@ -875,7 +875,7 @@ const b = {
   adapters: {
     ...me
   }
-}, be = /* @__PURE__ */ ue({
+}, ve = /* @__PURE__ */ ue({
   props: {
     setup: {
       type: Function,
@@ -887,8 +887,8 @@ const b = {
     return () => e.exec();
   }
 });
-function ve(r) {
-  const e = new fe(r);
+function ge(r) {
+  const e = new ce(r);
   return [
     e.setup.bind(e),
     {
@@ -897,18 +897,22 @@ function ve(r) {
     }
   ];
 }
-function ge(r) {
-  c.presets = r;
+function Ce(r) {
+  f.presets = r;
 }
-function Ce(r, e) {
-  return e === "raw" && Object.defineProperty(r, "name", {
+function ye(r, e) {
+  return e === "native" && Object.defineProperty(r, "name", {
     value: `__proform_raw_${r.name}`,
     writable: !0
   }), r;
 }
+function Ie(r) {
+  return ye(r, "native");
+}
 export {
-  be as ProForm,
-  ve as useForm,
-  ge as useFormPresetConfigurer,
-  Ce as useModifiers
+  ve as ProForm,
+  Ie as markNativeFunction,
+  ge as useForm,
+  Ce as useFormPresetConfigurer,
+  ye as useModifiers
 };

package/dist/types/index.d.ts

@@ -2,4 +2,5 @@ export { default as ProForm } from "./src/form/index";
 export { useForm } from "./src/interactions/useForm";
 export { useFormPresetConfigurer } from "./src/interactions/useFormPresetConfigurer";
 export { useModifiers } from "./src/interactions/useModifiers";
+export { markNativeFunction } from "./src/interactions/useModifiers";
 export * from "./src/types/index";

package/dist/types/src/interactions/useModifiers.d.ts

@@ -1,8 +1,8 @@
 import { runtimeMeta } from "../types";
-type Modifier = "raw";
-export declare function useModifiers(functionRaw: (args: {
-    rawArgs: any[];
-} & runtimeMeta) => any, modifier: Modifier): (args: {
+type Modifier = "native";
+type FunctionNative = (args: {
     rawArgs: any[];
 } & runtimeMeta) => any;
+export declare function useModifiers(functionNative: FunctionNative, modifier: Modifier): FunctionNative;
+export declare function markNativeFunction(functionNative: FunctionNative): FunctionNative;
 export {};

package/package.json

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