dynamicformdjx 0.3.0 → 0.3.2

package/dist/naiveUi/index.mjs

@@ -1,5 +1,5 @@
-import { defineComponent as V, ref as R, watch as O, toRaw as S, createVNode as r, createTextVNode as C, Fragment as F, nextTick as M, isVNode as U, computed as I, mergeProps as L, h as p } from "vue";
-import { NInput as N, NButton as b, NForm as $, NGrid as G, NFormItemGridItem as B, NFormItem as H, NSelect as q, NPopselect as _, NTreeSelect as E, NRadioGroup as z, NRadio as K, NRadioButton as J, NCheckboxGroup as Q, NSpace as W, NCheckbox as X, NSwitch as Y, NDatePicker as Z, NTimePicker as ee } from "naive-ui";
+import { defineComponent as V, ref as R, watch as O, toRaw as S, createVNode as r, createTextVNode as C, Fragment as F, nextTick as $, isVNode as D, computed as I, mergeProps as M, h as p } from "vue";
+import { NInput as N, NButton as b, NForm as U, NGrid as G, NFormItemGridItem as B, NFormItem as H, NSelect as q, NPopselect as _, NTreeSelect as E, NRadioGroup as z, NRadio as K, NRadioButton as J, NCheckboxGroup as Q, NSpace as W, NCheckbox as X, NSwitch as Y, NDatePicker as Z, NTimePicker as ee } from "naive-ui";
 import { t as A, r as j, f as P, p as le, s as te } from "../index-BqKRE4oH.js";
 const oe = /* @__PURE__ */ V({
   name: "NaiDynamicInput",
@@ -38,7 +38,7 @@ const oe = /* @__PURE__ */ V({
   },
   setup(e, {
     emit: o,
-    expose: i
+    expose: d
   }) {
     const t = {
       resetTxt: "重置",
@@ -51,30 +51,30 @@ const oe = /* @__PURE__ */ V({
       autoScroll: !0,
       allowFilter: !0,
       ...e.configs
-    }, d = {
+    }, c = {
       arraySplitSymbol: ",",
       ...e.dyListConfigs
-    }, y = e.size, c = R(A(e.modelValue, e.randomFun, d.arraySplitSymbol)), m = R(null);
-    return O(c, (u) => {
+    }, y = e.size, i = R(A(e.modelValue, e.randomFun, c.arraySplitSymbol)), m = R(null);
+    return O(i, (u) => {
       if (!e.isController) return;
-      const v = j(u, d.arraySplitSymbol);
-      o("update:modelValue", v), o("onMerge", v, S(c.value));
+      const v = j(u, c.arraySplitSymbol);
+      o("update:modelValue", v), o("onMerge", v, S(i.value));
     }, {
       deep: !0
-    }), i({
+    }), d({
       onSet: (u) => {
-        c.value = A(u ?? e.modelValue, e.randomFun, d.arraySplitSymbol);
+        i.value = A(u ?? e.modelValue, e.randomFun, c.arraySplitSymbol);
       },
-      getResult: (u = "res") => u === "ori" ? S(c.value) : j(c.value, d.arraySplitSymbol)
+      getResult: (u = "res") => u === "ori" ? S(i.value) : j(i.value, c.arraySplitSymbol)
     }), () => r("div", {
       class: e.dyCls ?? `dynamicForm ${y}`
     }, [r("div", {
-      class: "dyFormList",
+      class: `dyFormList ${i.value.length ? "" : "noList"}`,
       ref: m,
       style: {
         maxHeight: s.maxHeight
       }
-    }, [c.value.map((u, v, l) => r("div", {
+    }, [i.value.map((u, v, l) => r("div", {
       class: "dItem",
       key: u.rId
     }, [r("div", {
@@ -91,7 +91,7 @@ const oe = /* @__PURE__ */ V({
       value: u.value,
       class: "value",
       onInput: (a) => {
-        s.allowFilter && u.isNumber ? u.value = P(a, u.isArray, d.arraySplitSymbol) : u.value = a;
+        s.allowFilter && u.isNumber ? u.value = P(a, u.isArray, c.arraySplitSymbol) : u.value = a;
       }
     }, {
       prefix: () => r(F, null, [r(b, {
@@ -118,11 +118,11 @@ const oe = /* @__PURE__ */ V({
       size: y,
       disabled: v !== l.length - 1,
       onClick: () => {
-        c.value.push({
+        i.value.push({
           rId: e.randomFun(),
           key: "",
           value: ""
-        }), s.autoScroll && M(() => {
+        }), s.autoScroll && $(() => {
           const a = m.value;
           a?.scrollTo({
             top: a.scrollHeight,
@@ -136,17 +136,17 @@ const oe = /* @__PURE__ */ V({
       size: y,
       type: "error",
       onClick: () => {
-        c.value = c.value.filter((a) => a.rId !== u.rId);
+        i.value = i.value.filter((a) => a.rId !== u.rId);
       }
     }, {
       default: () => [C("-")]
     })])]))]), r("div", {
-      class: "control"
-    }, [!c.value.length && r(b, {
+      class: `control ${i.value.length ? "" : "noList"}`
+    }, [!i.value.length && r(b, {
       size: y,
       type: "success",
       onClick: () => {
-        c.value.push({
+        i.value.push({
           rId: e.randomFun(),
           key: "",
           value: ""
@@ -158,7 +158,7 @@ const oe = /* @__PURE__ */ V({
       size: y,
       type: "default",
       onClick: () => {
-        c.value = A(e.modelValue, e.randomFun, d.arraySplitSymbol), o("onReset");
+        i.value = A(e.modelValue, e.randomFun, c.arraySplitSymbol), o("onReset");
       }
     }, {
       default: () => [t.resetTxt]
@@ -166,9 +166,9 @@ const oe = /* @__PURE__ */ V({
       size: y,
       type: "info",
       onClick: () => {
-        c.value.sort((v, l) => +v.rId - +l.rId);
-        const u = j(c.value, d.arraySplitSymbol);
-        o("update:modelValue", u), o("onMerge", u, S(c.value)), c.value = A(u, e.randomFun, d.arraySplitSymbol);
+        i.value.sort((v, l) => +v.rId - +l.rId);
+        const u = j(i.value, c.arraySplitSymbol);
+        o("update:modelValue", u), o("onMerge", u, S(i.value)), i.value = A(u, e.randomFun, c.arraySplitSymbol);
       }
     }, {
       default: () => [t.mergeTxt]
@@ -176,7 +176,7 @@ const oe = /* @__PURE__ */ V({
   }
 });
 function ae(e) {
-  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !U(e);
+  return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !D(e);
 }
 const se = /* @__PURE__ */ V({
   name: "NaiveUiDynamicCascadeInput",
@@ -221,7 +221,7 @@ const se = /* @__PURE__ */ V({
   },
   setup(e, {
     emit: o,
-    expose: i
+    expose: d
   }) {
     const t = {
       resetTxt: "重置",
@@ -237,23 +237,23 @@ const se = /* @__PURE__ */ V({
       retractLen: 0,
       borderColors: [],
       ...e.configs
-    }, d = {
+    }, c = {
       arraySplitSymbol: ",",
       ...e.dyListConfigs
-    }, y = (l) => ["string", "number"].includes(l), c = (l) => Object.keys(l).map((a, f) => {
+    }, y = (l) => ["string", "number"].includes(l), i = (l) => Object.keys(l).map((a, f) => {
       let n = l[a];
       const h = Array.isArray(n), T = h ? n.every((x) => typeof x == "number") : typeof n == "number", k = n === null;
       return y(typeof n) && (n = l[a]), k && (n = ""), {
         rId: e.randomFun(f),
         key: a,
-        value: Object.prototype.toString.call(n) === "[object Object]" ? c(l[a]) : h ? n.join(d.arraySplitSymbol) : n,
+        value: Object.prototype.toString.call(n) === "[object Object]" ? i(l[a]) : h ? n.join(c.arraySplitSymbol) : n,
         isArray: h || void 0,
         isNumber: T || void 0
       };
     }), m = (l) => l.reduce((a, f) => {
       const n = f.value;
-      return f.key.trim().length && (a[f.key] = Array.isArray(n) ? m(n) : le(f.value, f.isArray, f.isNumber, d.arraySplitSymbol)), a;
-    }, {}), u = R(c(e.modelValue)), v = (l, a = 1, f) => r("div", {
+      return f.key.trim().length && (a[f.key] = Array.isArray(n) ? m(n) : le(f.value, f.isArray, f.isNumber, c.arraySplitSymbol)), a;
+    }, {}), u = R(i(e.modelValue)), v = (l, a = 1, f) => r("div", {
       class: [`depth-${a}`, s.showBorder ? "" : "no-border", s.showPad ? "" : "no-pad"],
       style: {
         "--depth": a,
@@ -281,7 +281,7 @@ const se = /* @__PURE__ */ V({
             n.key = g;
             return;
           }
-          s.allowFilter && n.isNumber ? n.value = P(g, n.isArray, d.arraySplitSymbol) : n.value = g;
+          s.allowFilter && n.isNumber ? n.value = P(g, n.isArray, c.arraySplitSymbol) : n.value = g;
         }
       }, {
         prefix: Array.isArray(n.value) ? void 0 : () => r(F, null, [r(b, {
@@ -336,7 +336,7 @@ const se = /* @__PURE__ */ V({
         onClick: () => {
           if (l.splice(h, 1), l.length < 1) {
             if (f === void 0) return m([]);
-            const g = u.value.findIndex((D) => D.rId === f?.rId);
+            const g = u.value.findIndex((L) => L.rId === f?.rId);
             a < 1 ? u.value.splice(g, 1, {
               ...f,
               value: ""
@@ -353,9 +353,9 @@ const se = /* @__PURE__ */ V({
       o("update:modelValue", a), o("onMerge", a, S(u.value));
     }, {
       deep: !0
-    }), i({
+    }), d({
       onSet: (l) => {
-        u.value = c(l ?? e.modelValue);
+        u.value = i(l ?? e.modelValue);
       },
       getResult: (l = "res") => l === "ori" ? S(u.value) : m(u.value)
     }), () => r("div", {
@@ -381,7 +381,7 @@ const se = /* @__PURE__ */ V({
     }), !e.isController && r(F, null, [!s.hideReset && r(b, {
       type: "default",
       onClick: () => {
-        u.value = c(e.modelValue), o("onReset");
+        u.value = i(e.modelValue), o("onReset");
       }
     }, {
       default: () => [t.resetTxt]
@@ -389,7 +389,7 @@ const se = /* @__PURE__ */ V({
       type: "info",
       onClick: () => {
         const l = m(u.value);
-        o("update:modelValue", l), o("onMerge", l, S(u.value)), u.value = c(l);
+        o("update:modelValue", l), o("onMerge", l, S(u.value)), u.value = i(l);
       }
     }, {
       default: () => [t.mergeTxt]
@@ -428,9 +428,9 @@ const se = /* @__PURE__ */ V({
   },
   setup(e, {
     emit: o,
-    expose: i
+    expose: d
   }) {
-    const t = R(null), s = I(() => (e.items ?? []).filter((v) => !v.hidden)), d = I(() => s.value ? s.value.reduce((v, l) => (v[l.key] = l.value.value, v), {}) : {}), y = I(() => ({
+    const t = R(null), s = I(() => (e.items ?? []).filter((v) => !v.hidden)), c = I(() => s.value ? s.value.reduce((v, l) => (v[l.key] = l.value.value, v), {}) : {}), y = I(() => ({
       ...s.value?.reduce((l, a) => {
         let f = a.rule;
         return a.required && !a.rule && (f = {
@@ -440,7 +440,7 @@ const se = /* @__PURE__ */ V({
         }), l[a.key] = f, l;
       }, {}),
       ...e.rules
-    })), c = I(() => [...s.value].sort((l, a) => {
+    })), i = I(() => [...s.value].sort((l, a) => {
       const f = l.sort ?? 1 / 0, n = a.sort ?? 1 / 0;
       return Number(f) - Number(n);
     }));
@@ -452,25 +452,25 @@ const se = /* @__PURE__ */ V({
     function u() {
       return new Promise((v, l) => {
         t.value?.validate((a) => {
-          a ? l(a) : v(d.value);
+          a ? l(a) : v(c.value);
         });
       });
     }
-    if (i({
+    if (d({
       reset: m,
       validator: u,
-      getResult: (v = "res") => v === "ori" ? s.value : d.value
+      getResult: (v = "res") => v === "ori" ? s.value : c.value
     }), !e.items) throw new Error("prop items must be not null");
     return () => r("div", {
       class: "naiDynamicForm"
-    }, [r($, L({
+    }, [r(U, M({
       ref: t
     }, e.formConfig, {
-      model: d.value,
+      model: c.value,
       rules: y.value
     }), {
       default() {
-        const v = c.value;
+        const v = i.value;
         return e.preset === "grid" ? p(G, {
           ...e.gridConfig
         }, {
@@ -495,17 +495,17 @@ function w(e) {
     return e.render2 ? e.render2(e) : null;
   };
 }
-function de(e, o = {}, i) {
+function de(e, o = {}, d) {
   return p(N, {
-    ...i,
+    ...d,
     value: e.value,
     onUpdateValue: (t) => {
-      e.value = t, i?.onChange?.(t, i);
+      e.value = t, d?.onChange?.(t, d);
     },
     ...o
   });
 }
-function ce(e, o, i = {}, t) {
+function ce(e, o, d = {}, t) {
   return p(q, {
     ...t,
     value: e.value,
@@ -513,11 +513,11 @@ function ce(e, o, i = {}, t) {
     onUpdateValue: (s) => {
       e.value = s, t?.onChange?.(s, t, o);
     },
-    ...i
+    ...d
   });
 }
-function ye(e, o, i = {}, t, s) {
-  const { value: d, labelField: y, valueField: c, ...m } = t, u = y ?? "label", v = c ?? "value", l = m.options ?? o;
+function ye(e, o, d = {}, t, s) {
+  const { value: c, labelField: y, valueField: i, ...m } = t, u = y ?? "label", v = i ?? "value", l = m.options ?? o;
   return r(
     _,
     {
@@ -527,7 +527,7 @@ function ye(e, o, i = {}, t, s) {
         e.value = a, t?.onChange?.(a, t, l);
       },
       options: l.map((a) => ({ ...a, label: a[u], value: a[v] })),
-      ...i
+      ...d
     },
     {
       default: () => s ?? r(b, null, {
@@ -536,20 +536,20 @@ function ye(e, o, i = {}, t, s) {
     }
   );
 }
-function ve(e, o, i = {}, t) {
-  const { valueField: s = "value", ...d } = t;
+function ve(e, o, d = {}, t) {
+  const { valueField: s = "value", ...c } = t;
   return p(E, {
-    ...d,
+    ...c,
     value: e.value,
     options: o,
     onUpdateValue: (y) => {
       e.value = y, t?.onChange?.(y, t, o);
     },
     keyField: s,
-    ...i
+    ...d
   });
 }
-function me(e, o, i = {}, t) {
+function me(e, o, d = {}, t) {
   return p(
     z,
     {
@@ -558,27 +558,27 @@ function me(e, o, i = {}, t) {
       onUpdateValue: (s) => {
         e.value = s, t?.onChange?.(s, t, o);
       },
-      ...i
+      ...d
     },
     {
-      default: () => (t?.options ?? o).map((d) => {
-        const y = t, c = d[y?.labelField ?? "label"], m = d[y?.valueField ?? "value"];
+      default: () => (t?.options ?? o).map((c) => {
+        const y = t, i = c[y?.labelField ?? "label"], m = c[y?.valueField ?? "value"];
         return p(
           K,
           {
-            ...d,
-            label: c,
+            ...c,
+            label: i,
             value: m
           },
           {
-            default: () => d.label
+            default: () => c.label
           }
         );
       })
     }
   );
 }
-function fe(e, o, i = {}, t) {
+function fe(e, o, d = {}, t) {
   return r(
     z,
     {
@@ -587,27 +587,27 @@ function fe(e, o, i = {}, t) {
       onUpdateValue: (s) => {
         e.value = s, t?.onChange?.(s, t, o);
       },
-      ...i
+      ...d
     },
     {
-      default: () => (t?.options ?? o).map((d) => {
-        const y = t, c = d[y?.labelField ?? "label"], m = d[y?.valueField ?? "value"];
+      default: () => (t?.options ?? o).map((c) => {
+        const y = t, i = c[y?.labelField ?? "label"], m = c[y?.valueField ?? "value"];
         return r(
           J,
           {
-            ...d,
-            label: c,
+            ...c,
+            label: i,
             value: m
           },
           {
-            default: () => d.label
+            default: () => c.label
           }
         );
       })
     }
   );
 }
-function be(e, o, i = {}, t) {
+function be(e, o, d = {}, t) {
   return p(
     Q,
     {
@@ -616,7 +616,7 @@ function be(e, o, i = {}, t) {
       onUpdateValue: (s) => {
         e.value = s, t?.onChange?.(s, t, o);
       },
-      ...i
+      ...d
     },
     {
       default: () => p(
@@ -625,11 +625,11 @@ function be(e, o, i = {}, t) {
           itemStyle: "display: flex"
         },
         {
-          default: () => (t?.options ?? o).map((d) => {
-            const y = t, c = d[y?.labelField ?? "label"], m = d[y?.valueField ?? "value"];
+          default: () => (t?.options ?? o).map((c) => {
+            const y = t, i = c[y?.labelField ?? "label"], m = c[y?.valueField ?? "value"];
             return p(X, {
               value: m,
-              label: c
+              label: i
             });
           })
         }
@@ -637,32 +637,32 @@ function be(e, o, i = {}, t) {
     }
   );
 }
-function pe(e, o = {}, i) {
+function pe(e, o = {}, d) {
   return p(Y, {
-    ...i,
+    ...d,
     value: e.value,
     onUpdateValue: (t) => {
-      e.value = t, i?.onChange?.(t, i);
+      e.value = t, d?.onChange?.(t, d);
     },
     ...o
   });
 }
-function ge(e, o = {}, i) {
+function ge(e, o = {}, d) {
   return p(Z, {
-    ...i,
+    ...d,
     value: e.value,
     onUpdateValue: (t) => {
-      e.value = t, i?.onChange?.(t, i);
+      e.value = t, d?.onChange?.(t, d);
     },
     ...o
   });
 }
-function Ce(e, o = {}, i) {
+function Ce(e, o = {}, d) {
   return p(ee, {
-    ...i,
+    ...d,
     value: e.value,
     onUpdateValue: (t) => {
-      e.value = t, i?.onChange?.(t, i);
+      e.value = t, d?.onChange?.(t, d);
     },
     ...o
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dynamicformdjx",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "type": "module",
   "author": "xczcdjx",
   "license": "MIT",