@done-coding/admin-core 0.17.1-alpha.0 → 0.18.1-alpha.0

package/es/components/form/FormMain.vue2.mjs

@@ -1,13 +1,15 @@
-import { defineComponent as Y, shallowRef as H, provide as h, computed as s, ref as _, watch as b, openBlock as F, createBlock as V, unref as E, withCtx as v, createVNode as j, createElementBlock as U, Fragment as q, renderList as z, withDirectives as J, mergeProps as x, renderSlot as B, vShow as Q } from "vue";
-import { useFormLayoutByContainer as W } from "./use-layout-by-container.mjs";
-import { ElForm as X, ElRow as Z, ElCol as ee } from "element-plus";
-import te from "./FormItem.vue.mjs";
-import { FORM_ITEM_CHANGE_LOADING as ae, stringifyFormData as le, parseFormData as oe, generateFormData as re, resolveFormLayout as R } from "./utils.mjs";
-import { createNestFormExposeMap as se } from "./nest-registry.mjs";
-import { FORM_NEST_REGISTRY_KEY as ne, NEST_LAYOUT_SCALE_KEY as ie } from "../../inject/key.mjs";
-const Ee = /* @__PURE__ */ Y({
-  name: "FormMain",
-  inheritAttrs: !0,
+import { defineComponent, shallowRef, provide, computed, ref, watch, openBlock, createBlock, unref, withCtx, createVNode, createElementBlock, Fragment, renderList, withDirectives, mergeProps, renderSlot, vShow } from "vue";
+import { useFormLayoutByContainer } from "./use-layout-by-container.mjs";
+import { ElForm, ElRow, ElCol } from "element-plus";
+import FormItem from "./FormItem.vue.mjs";
+import { FORM_ITEM_CHANGE_LOADING, stringifyFormData, parseFormData, generateFormData, resolveFormLayout } from "./utils.mjs";
+import { createNestFormExposeMap } from "./nest-registry.mjs";
+import { FORM_NEST_REGISTRY_KEY, NEST_LAYOUT_SCALE_KEY } from "../../inject/key.mjs";
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{
+    name: "FormMain",
+    inheritAttrs: true
+  },
   __name: "FormMain",
   props: {
     list: {},
@@ -15,154 +17,239 @@ const Ee = /* @__PURE__ */ Y({
     layout: {},
     rowGutter: { default: 8 },
     layoutScale: { default: 1 },
-    layoutByContainer: { type: Boolean, default: !1 }
+    layoutByContainer: { type: Boolean, default: false }
   },
   emits: ["loadingChange", "visibleChange", "submit"],
-  setup(d, { expose: M, emit: K }) {
-    const o = d, y = K, r = H(), { resolveLayoutByContainer: N } = W({
-      enabled: () => o.layoutByContainer,
-      getForm: () => r.value
-    }), f = se();
-    h(ne, f);
-    const A = s(() => o.layoutScale ?? 1);
-    h(ie, A);
-    const i = _([]), n = _({}), C = s(() => !!i.value.length), g = s(() => Object.keys(n.value).filter(
-      (e) => n.value[e]
-    )), D = s(() => o.list.filter((e) => !g.value.includes(e.key))), G = s(() => D.value.length > 0), I = (e) => e;
-    M({
-      validate: async () => {
-        if (!r.value) return Promise.reject(new Error("实例化未完成"));
-        const e = new Promise((a, l) => {
-          var u;
-          (u = r.value) == null || u.validate((P, L) => {
-            if (P)
-              a();
-            else {
-              const m = { ...L || {} };
-              Object.keys(m).forEach((c) => {
-                var O;
-                g.value.includes(c) && (console.log(`当前${c}被隐藏，移除校验`, m[c]), delete m[c], (O = r.value) == null || O.clearValidate(c));
-              }), Object.keys(m).length === 0 ? a() : l(L);
-            }
-          });
-        }), t = Object.entries(f).filter(([a]) => !g.value.includes(a)).map(([, a]) => a.validate());
-        await Promise.all([e, ...t]);
-      },
-      resetFields: () => {
-        if (!r.value) return console.error("实例化未完成");
-        r.value.resetFields(), Object.values(f).forEach((e) => e.resetFields());
-      },
-      clearValidate: (e) => {
-        if (!r.value) return console.error("实例化未完成");
-        r.value.clearValidate(e), Object.values(f).forEach((t) => t.clearValidate());
-      },
-      generate: () => re(o.list),
-      parse: (e) => oe(e, o.list),
-      stringify: () => le(o.data, o.list)
+  setup(__props, { expose: __expose, emit: __emit }) {
+    const props = __props;
+    const emits = __emit;
+    const elForm = shallowRef();
+    const { resolveLayoutByContainer } = useFormLayoutByContainer({
+      enabled: () => props.layoutByContainer,
+      getForm: () => elForm.value
+    });
+    const nestExposeMap = createNestFormExposeMap();
+    provide(FORM_NEST_REGISTRY_KEY, nestExposeMap);
+    const layoutScale = computed(() => props.layoutScale ?? 1);
+    provide(NEST_LAYOUT_SCALE_KEY, layoutScale);
+    const loadingList = ref([]);
+    const itemViewHideStatus = ref({});
+    const loading = computed(() => {
+      return !!loadingList.value.length;
+    });
+    const hideKeyList = computed(() => {
+      return Object.keys(itemViewHideStatus.value).filter(
+        (key) => itemViewHideStatus.value[key]
+      );
     });
-    const p = s(() => o.list), w = s(() => p.value.reduce((e, t) => (t.rules && (typeof t.rules == "function" ? e[t.key] = t.rules({
-      data: o.data,
-      config: t
-    }) : e[t.key] = t.rules), e), {})), S = s(() => i.value.reduce(
-      (e, t) => (e[t.key] = [
-        {
-          validator: () => [new Error(`${t.label}${t.message}`)]
+    const visibleFormList = computed(() => {
+      return props.list.filter((item) => !hideKeyList.value.includes(item.key));
+    });
+    const haveVisibleForm = computed(() => {
+      return visibleFormList.value.length > 0;
+    });
+    const assertConfig = (config) => {
+      return config;
+    };
+    const validate = async () => {
+      if (!elForm.value) return Promise.reject(new Error(`实例化未完成`));
+      const selfValidate = new Promise((resolve, reject) => {
+        var _a;
+        (_a = elForm.value) == null ? void 0 : _a.validate((valid, error) => {
+          if (valid) {
+            resolve();
+          } else {
+            const errorClone = { ...error || {} };
+            Object.keys(errorClone).forEach((key) => {
+              var _a2;
+              if (hideKeyList.value.includes(key)) {
+                console.log(`当前${key}被隐藏，移除校验`, errorClone[key]);
+                delete errorClone[key];
+                (_a2 = elForm.value) == null ? void 0 : _a2.clearValidate(key);
+              }
+            });
+            if (Object.keys(errorClone).length === 0) {
+              resolve();
+            } else {
+              reject(error);
+            }
+          }
+        });
+      });
+      const childValidates = Object.entries(nestExposeMap).filter(([key]) => !hideKeyList.value.includes(key)).map(([, expose2]) => expose2.validate());
+      await Promise.all([selfValidate, ...childValidates]);
+    };
+    const resetFields = () => {
+      if (!elForm.value) return console.error(`实例化未完成`);
+      elForm.value.resetFields();
+      Object.values(nestExposeMap).forEach((expose2) => expose2.resetFields());
+    };
+    const clearValidate = (key) => {
+      if (!elForm.value) return console.error(`实例化未完成`);
+      elForm.value.clearValidate(key);
+      Object.values(nestExposeMap).forEach((expose2) => expose2.clearValidate());
+    };
+    const expose = {
+      validate,
+      resetFields,
+      clearValidate,
+      generate: () => generateFormData(props.list),
+      parse: (stringifyData) => parseFormData(stringifyData, props.list),
+      stringify: () => stringifyFormData(props.data, props.list)
+    };
+    __expose(expose);
+    const list = computed(() => props.list);
+    const defaultRules = computed(() => {
+      return list.value.reduce((prev, cur) => {
+        if (cur.rules) {
+          if (typeof cur.rules === "function") {
+            prev[cur.key] = cur.rules({
+              data: props.data,
+              config: cur
+            });
+          } else {
+            prev[cur.key] = cur.rules;
+          }
         }
-      ], e),
-      {}
-    )), T = s(() => {
-      const e = Object.keys(w.value), t = Object.keys(S.value);
-      return [...new Set(e.concat(t))].reduce((l, u) => (l[u] = [
-        ...w.value[u] || [],
-        ...S.value[u] || []
-      ], l), {});
+        return prev;
+      }, {});
+    });
+    const loadingRules = computed(() => {
+      return loadingList.value.reduce(
+        (prev, cur) => {
+          prev[cur.key] = [
+            {
+              validator: () => [new Error(`${cur.label}${cur.message}`)]
+            }
+          ];
+          return prev;
+        },
+        {}
+      );
     });
-    h(ae, ({ key: e, message: t }) => {
-      if (!e)
-        return console.error("更新状态未传入key, 此处忽略");
-      const a = i.value.findIndex((l) => l.key === e);
-      a === -1 ? t && i.value.push({
-        key: e,
-        message: t,
-        label: o.list.find((l) => l.key === e).label
-      }) : t ? i.value.splice(a, 1, {
-        key: e,
-        message: t,
-        label: o.list.find((l) => l.key === e).label
-      }) : i.value.splice(a, 1);
+    const rules = computed(() => {
+      const defaultKeys = Object.keys(defaultRules.value);
+      const loadingKeys = Object.keys(loadingRules.value);
+      const keys = [...new Set(defaultKeys.concat(loadingKeys))];
+      return keys.reduce((prev, cur) => {
+        prev[cur] = [
+          ...defaultRules.value[cur] || [],
+          ...loadingRules.value[cur] || []
+        ];
+        return prev;
+      }, {});
     });
-    const $ = ({
-      status: e,
-      config: { key: t }
+    const changeLoading = ({ key, message }) => {
+      if (!key) {
+        return console.error(`更新状态未传入key, 此处忽略`);
+      }
+      const index = loadingList.value.findIndex((item) => item.key === key);
+      if (index === -1) {
+        if (message) {
+          loadingList.value.push({
+            key,
+            message,
+            label: props.list.find((item) => item.key === key).label
+          });
+        }
+      } else {
+        if (message) {
+          loadingList.value.splice(index, 1, {
+            key,
+            message,
+            label: props.list.find((item) => item.key === key).label
+          });
+        } else {
+          loadingList.value.splice(index, 1);
+        }
+      }
+    };
+    provide(FORM_ITEM_CHANGE_LOADING, changeLoading);
+    const onViewHideChange = ({
+      status,
+      config: { key }
     }) => {
-      (n.value[t] || !1) !== e && (n.value[t] = e);
-    }, k = (e) => {
-      const t = o.layoutScale ?? 1, a = {
-        ...R(o.layout, t),
-        ...R(e, t)
+      const oldStatus = itemViewHideStatus.value[key] || false;
+      if (oldStatus === status) return;
+      itemViewHideStatus.value[key] = status;
+    };
+    const mergeLayout = (layout) => {
+      const scale = props.layoutScale ?? 1;
+      const merged = {
+        ...resolveFormLayout(props.layout, scale),
+        ...resolveFormLayout(layout, scale)
       };
-      return N(a);
+      return resolveLayoutByContainer(merged);
     };
-    return b(
-      p,
-      (e) => {
-        const t = e.map((a) => a.key);
-        Object.keys(n.value).forEach((a) => {
-          t.includes(a) || delete n.value[a];
+    watch(
+      list,
+      (newList) => {
+        const listKeys = newList.map((item) => item.key);
+        Object.keys(itemViewHideStatus.value).forEach((key) => {
+          if (!listKeys.includes(key)) {
+            delete itemViewHideStatus.value[key];
+          }
         });
       },
       {
-        immediate: !0
+        immediate: true
       }
-    ), b(C, () => {
-      y("loadingChange", C.value);
-    }), b(
-      G,
-      (e) => {
-        y("visibleChange", e);
+    );
+    watch(loading, () => {
+      emits("loadingChange", loading.value);
+    });
+    watch(
+      haveVisibleForm,
+      (n) => {
+        emits("visibleChange", n);
       },
       {
-        immediate: !0
+        immediate: true
       }
-    ), (e, t) => (F(), V(E(X), {
-      ref_key: "elForm",
-      ref: r,
-      class: "dc-form-main",
-      model: d.data,
-      rules: T.value
-    }, {
-      default: v(() => [
-        j(E(Z), { gutter: d.rowGutter }, {
-          default: v(() => [
-            (F(!0), U(q, null, z(p.value, (a) => J((F(), V(E(ee), x({
-              key: a.key
-            }, { ref_for: !0 }, k(a.layout)), {
-              default: v(() => [
-                j(te, {
-                  data: d.data,
-                  config: I(a),
-                  onViewHideChange: $,
-                  onSubmit: t[0] || (t[0] = (l) => y("submit", l))
-                }, {
-                  default: v((l) => [
-                    B(e.$slots, a.key, x({ ref_for: !0 }, l), void 0, !0)
+    );
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(unref(ElForm), {
+        ref_key: "elForm",
+        ref: elForm,
+        class: "dc-form-main",
+        model: __props.data,
+        rules: rules.value
+      }, {
+        default: withCtx(() => [
+          createVNode(unref(ElRow), { gutter: __props.rowGutter }, {
+            default: withCtx(() => [
+              (openBlock(true), createElementBlock(Fragment, null, renderList(list.value, (config) => {
+                return withDirectives((openBlock(), createBlock(unref(ElCol), mergeProps({
+                  key: config.key
+                }, { ref_for: true }, mergeLayout(config.layout)), {
+                  default: withCtx(() => [
+                    createVNode(FormItem, {
+                      data: __props.data,
+                      config: assertConfig(config),
+                      onViewHideChange,
+                      onSubmit: _cache[0] || (_cache[0] = ($event) => emits("submit", $event))
+                    }, {
+                      default: withCtx((scopeData) => [
+                        renderSlot(_ctx.$slots, config.key, mergeProps({ ref_for: true }, scopeData), void 0, true)
+                      ]),
+                      _: 2
+                    }, 1032, ["data", "config"])
                   ]),
                   _: 2
-                }, 1032, ["data", "config"])
-              ]),
-              _: 2
-            }, 1040)), [
-              [Q, !(n.value[a.key] ?? !1)]
-            ])), 128)),
-            B(e.$slots, "default", { mergeLayout: k }, void 0, !0)
-          ]),
-          _: 3
-        }, 8, ["gutter"])
-      ]),
-      _: 3
-    }, 8, ["model", "rules"]));
+                }, 1040)), [
+                  [vShow, !(itemViewHideStatus.value[config.key] ?? false)]
+                ]);
+              }), 128)),
+              renderSlot(_ctx.$slots, "default", { mergeLayout }, void 0, true)
+            ]),
+            _: 3
+          }, 8, ["gutter"])
+        ]),
+        _: 3
+      }, 8, ["model", "rules"]);
+    };
   }
 });
 export {
-  Ee as default
+  _sfc_main as default
 };

package/es/components/form/FormRadioGroup.vue.mjs

@@ -1,66 +1,81 @@
-import { defineComponent as k, useModel as h, computed as y, watch as V, openBlock as t, createBlock as d, unref as r, withCtx as n, createElementBlock as m, Fragment as v, renderList as c, createTextVNode as p, toDisplayString as f, createCommentVNode as B, mergeModels as R } from "vue";
-import { ElRadioGroup as g, ElRadioButton as x, ElRadio as E } from "element-plus";
-const N = /* @__PURE__ */ k({
-  name: "FormRadioGroup",
-  inheritAttrs: !0,
+import { defineComponent, useModel, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, Fragment, renderList, createTextVNode, toDisplayString, createCommentVNode, mergeModels } from "vue";
+import { ElRadioGroup, ElRadioButton, ElRadio } from "element-plus";
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  ...{
+    name: "FormRadioGroup",
+    inheritAttrs: true
+  },
   __name: "FormRadioGroup",
-  props: /* @__PURE__ */ R({
+  props: /* @__PURE__ */ mergeModels({
     options: {},
     mode: { default: "radio" },
-    notNull: { type: Boolean, default: !0 }
+    notNull: { type: Boolean, default: true }
   }, {
-    modelValue: {},
-    modelModifiers: {}
+    "modelValue": {},
+    "modelModifiers": {}
   }),
   emits: ["update:modelValue"],
-  setup(l) {
-    const u = l, a = h(l, "modelValue"), i = y(() => {
-      if (u.notNull && u.options.length > 0) {
-        const o = u.options.some(
-          (s) => s.value === a.value
+  setup(__props) {
+    const props = __props;
+    const modelValue = useModel(__props, "modelValue");
+    const calibratedModelValue = computed(() => {
+      if (props.notNull && props.options.length > 0) {
+        const inList = props.options.some(
+          (item) => item.value === modelValue.value
         );
-        if (a.value === void 0 || !o)
-          return u.options[0].value;
+        if (modelValue.value === void 0 || !inList) {
+          return props.options[0].value;
+        }
       }
-      return a.value;
-    }), b = (o) => {
-      a.value = o;
+      return modelValue.value;
+    });
+    const handleUpdate = (value) => {
+      modelValue.value = value;
     };
-    return V(
-      i,
-      (o) => {
-        o !== void 0 && o !== a.value && (a.value = o);
+    watch(
+      calibratedModelValue,
+      (newVal) => {
+        if (newVal !== void 0 && newVal !== modelValue.value) {
+          modelValue.value = newVal;
+        }
       },
-      { immediate: !0 }
-    ), (o, s) => (t(), d(r(g), {
-      "model-value": i.value,
-      "onUpdate:modelValue": b
-    }, {
-      default: n(() => [
-        l.mode === "buttonGroup" ? (t(!0), m(v, { key: 0 }, c(l.options, (e) => (t(), d(r(x), {
-          key: e.value,
-          value: e.value,
-          disabled: e.disabled
-        }, {
-          default: n(() => [
-            p(f(e.label), 1)
-          ]),
-          _: 2
-        }, 1032, ["value", "disabled"]))), 128)) : l.mode === "radio" ? (t(!0), m(v, { key: 1 }, c(l.options, (e) => (t(), d(r(E), {
-          key: e.value,
-          value: e.value,
-          disabled: e.disabled
-        }, {
-          default: n(() => [
-            p(f(e.label), 1)
-          ]),
-          _: 2
-        }, 1032, ["value", "disabled"]))), 128)) : B("", !0)
-      ]),
-      _: 1
-    }, 8, ["model-value"]));
+      { immediate: true }
+    );
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(unref(ElRadioGroup), {
+        "model-value": calibratedModelValue.value,
+        "onUpdate:modelValue": handleUpdate
+      }, {
+        default: withCtx(() => [
+          __props.mode === "buttonGroup" ? (openBlock(true), createElementBlock(Fragment, { key: 0 }, renderList(__props.options, (item) => {
+            return openBlock(), createBlock(unref(ElRadioButton), {
+              key: item.value,
+              value: item.value,
+              disabled: item.disabled
+            }, {
+              default: withCtx(() => [
+                createTextVNode(toDisplayString(item.label), 1)
+              ]),
+              _: 2
+            }, 1032, ["value", "disabled"]);
+          }), 128)) : __props.mode === "radio" ? (openBlock(true), createElementBlock(Fragment, { key: 1 }, renderList(__props.options, (item) => {
+            return openBlock(), createBlock(unref(ElRadio), {
+              key: item.value,
+              value: item.value,
+              disabled: item.disabled
+            }, {
+              default: withCtx(() => [
+                createTextVNode(toDisplayString(item.label), 1)
+              ]),
+              _: 2
+            }, 1032, ["value", "disabled"]);
+          }), 128)) : createCommentVNode("", true)
+        ]),
+        _: 1
+      }, 8, ["model-value"]);
+    };
   }
 });
 export {
-  N as default
+  _sfc_main as default
 };

package/es/components/form/FormRadioGroup.vue2.mjs

@@ -1,4 +1,4 @@
-import f from "./FormRadioGroup.vue.mjs";
+import _sfc_main from "./FormRadioGroup.vue.mjs";
 export {
-  f as default
+  _sfc_main as default
 };

package/es/components/form/FormSearch.vue.mjs

@@ -1,7 +1,7 @@
-import o from "./FormSearch.vue2.mjs";
+import _sfc_main from "./FormSearch.vue2.mjs";
 /* empty css                 */
-import r from "../../_virtual/_plugin-vue_export-helper.mjs";
-const e = /* @__PURE__ */ r(o, [["__scopeId", "data-v-b96e10f6"]]);
+import _export_sfc from "../../_virtual/_plugin-vue_export-helper.mjs";
+const FormSearch = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-b96e10f6"]]);
 export {
-  e as default
+  FormSearch as default
 };