cc1-form 1.2.26 → 1.2.28

package/dist/cc1-form.js

@@ -1,4 +1,4 @@
-import { ElMessage as Ie, ElLoading as Ke, ElFormItem as he, ElInput as se, ElSwitch as ie, ElSelect as oe, ElOption as X, ElRadioGroup as Ce, ElRadio as xe, ElTreeSelect as He, ElDatePicker as Se, ElForm as q, ElDialog as ye, ElButton as T, ElTableColumn as re, ElDropdown as Ge, ElDropdownMenu as Ne, ElDropdownItem as ge, ElPagination as we, ElTable as We } from "element-plus";
+import { ElMessage as Ie, ElLoading as Ke, ElFormItem as he, ElInput as se, ElSwitch as ie, ElSelect as oe, ElOption as X, ElRadioGroup as Ce, ElRadio as xe, ElTreeSelect as He, ElDatePicker as Se, ElForm as q, ElDialog as ye, ElButton as L, ElTableColumn as re, ElDropdown as Ge, ElDropdownMenu as Ne, ElDropdownItem as ge, ElPagination as we, ElTable as We } from "element-plus";
 import "vue-router";
 import { defineComponent as G, reactive as me, onMounted as Ve, resolveComponent as ae, openBlock as u, createElementBlock as p, renderSlot as k, createVNode as $, withCtx as y, createTextVNode as V, createCommentVNode as w, Fragment as F, renderList as j, createBlock as h, normalizeClass as I, normalizeStyle as de, unref as r, createElementVNode as O, mergeProps as C, toHandlers as E, createSlots as W, toDisplayString as D, resolveDynamicComponent as Y, computed as te, ref as Q, watch as Je, normalizeProps as be, guardReactiveProps as pe, getCurrentInstance as Qe, withModifiers as qe, resolveDirective as Xe, withDirectives as Ye } from "vue";
 import { Scope as ze } from "cc1-vue3";
@@ -1006,45 +1006,45 @@ const K = 12, ue = (e, n) => {
     const x = [];
     let z = 1;
     return t.forEach((U) => {
-      const L = ve(U.item), A = l;
+      const T = ve(U.item), A = l;
       x.push({
         ...U,
         span: A,
         colSpan: A,
-        rowSpan: L,
+        rowSpan: T,
         gridRow: z,
         gridColumn: 1,
         gridBand: ce({ gridRow: z })
-      }), z += L;
+      }), z += T;
     }), { cells: x, maxSpan: l };
   }
   const s = /* @__PURE__ */ new Set(), f = [];
   let d = 0, c = 0;
-  const v = (x) => Math.floor(x / K) * K, m = (x, z) => `${x},${z}`, g = (x, z, U, L) => {
+  const v = (x) => Math.floor(x / K) * K, m = (x, z) => `${x},${z}`, g = (x, z, U, T) => {
     if (z + U > l) return !1;
-    for (let A = 0; A < L; A++)
+    for (let A = 0; A < T; A++)
       for (let R = 0; R < U; R++)
         if (s.has(m(x + A, z + R))) return !1;
     return !0;
-  }, B = (x, z, U, L) => {
-    for (let A = 0; A < L; A++)
+  }, B = (x, z, U, T) => {
+    for (let A = 0; A < T; A++)
       for (let R = 0; R < U; R++)
         s.add(m(x + A, z + R));
-  }, H = (x, z, U, L) => {
+  }, H = (x, z, U, T) => {
     for (let R = v(x); R < 500 * K; R += K) {
-      const Le = R + K, je = R === v(x) ? Math.max(R, x) : R;
-      for (let ee = je; ee < Le; ee++) {
+      const Te = R + K, je = R === v(x) ? Math.max(R, x) : R;
+      for (let ee = je; ee < Te; ee++) {
         const Pe = ee === x ? z : 0;
         for (let ne = Pe; ne <= l - U; ne++)
-          if (g(ee, ne, U, L))
+          if (g(ee, ne, U, T))
             return { tr: ee, tc: ne };
       }
     }
     return { tr: x, tc: z };
-  }, _ = (x, z, U, L) => {
+  }, _ = (x, z, U, T) => {
     const A = v(x);
-    if (L < K && x + L < A + K) {
-      d = x + L, c = z;
+    if (T < K && x + T < A + K) {
+      d = x + T, c = z;
       return;
     }
     const R = z + U;
@@ -1057,9 +1057,9 @@ const K = 12, ue = (e, n) => {
   for (const x of t) {
     const z = x.span === 0 ? l : x.span, U = ve(x.item);
     x.item.form?.rowBreak && f.length && (c = 0, d = v(d) + K);
-    let { tr: L, tc: A } = g(d, c, z, U) ? { tr: d, tc: c } : H(d, c, z, U);
-    g(L, A, z, U) || ({ tr: L, tc: A } = H(0, 0, z, U)), B(L, A, z, U);
-    const R = L + 1;
+    let { tr: T, tc: A } = g(d, c, z, U) ? { tr: d, tc: c } : H(d, c, z, U);
+    g(T, A, z, U) || ({ tr: T, tc: A } = H(0, 0, z, U)), B(T, A, z, U);
+    const R = T + 1;
     f.push({
       ...x,
       span: z,
@@ -1068,7 +1068,7 @@ const K = 12, ue = (e, n) => {
       gridRow: R,
       gridColumn: A + 1,
       gridBand: ce({ gridRow: R })
-    }), _(L, A, z, U);
+    }), _(T, A, z, U);
   }
   return { cells: f, maxSpan: l };
 }, ft = (e) => e.map((n) => n.item?.show?.form), mt = (e, n, l) => {
@@ -1124,7 +1124,7 @@ const K = 12, ue = (e, n) => {
     }
   };
   e.forEach(i);
-}, yt = { class: "curd-form-cell-inner" }, Te = /* @__PURE__ */ G({
+}, yt = { class: "curd-form-cell-inner" }, Le = /* @__PURE__ */ G({
   __name: "layout",
   props: {
     formGrid: {},
@@ -1290,7 +1290,7 @@ const fe = (e) => {
         s.formDefault = d.formDefault, s.rules = d.rules, s.formGrid = d.formGrid, s.formMaxSpan = d.formMaxSpan, s.formColumn = d.formColumn, s.type === l.Add ? f.isExternal() ? f.merge(JSONUtil.cp(s.formDefault)) : f.set(JSONUtil.cp(s.formDefault)) : !f.isExternal() && i.form && f.set(JSONUtil.cp(i.form));
       }
     });
-    return s.initColumnForm(), Je(
+    return i.option.form?.initStart?.(s), s.initColumnForm(), i.option.form?.initEnd?.(s), Je(
       () => i.form,
       (f) => {
         o = fe(f), s.initColumnForm();
@@ -1302,7 +1302,7 @@ const fe = (e) => {
       rules: s.rules
     }, {
       default: y(() => [
-        s.show ? (u(), h(Te, {
+        s.show ? (u(), h(Le, {
           key: 0,
           "form-grid": s.formGrid,
           "max-span": s.formMaxSpan,
@@ -1689,10 +1689,11 @@ const xt = (e, n) => ({
         }
       },
       view: {},
-      open: (i, o) => {
+      openLoading: !1,
+      open: async (i, o) => {
         const t = e();
-        t.update.showContent || FunUtil.throttle(async () => {
-          S.loading(!0);
+        if (!(t.update.showContent || t.update.openLoading)) {
+          S.loading(!0), t.update.openLoading = !0;
           try {
             t.update.type = i;
             const s = i === le.Add;
@@ -1702,9 +1703,9 @@ const xt = (e, n) => ({
           } catch (s) {
             console.error(s);
           } finally {
-            S.loading(!1);
+            S.loading(!1), t.update.openLoading = !1;
           }
-        });
+        }
       },
       validate: async () => {
         const i = e();
@@ -1719,36 +1720,34 @@ const xt = (e, n) => ({
           S.fail(b.tCurd("checkFormData"));
         }
       },
-      submit: () => {
-        FunUtil.throttle(async () => {
-          const i = e();
-          if (!await i.update.validate()) return;
-          i.update.loading = !0;
-          const t = i.update.type === le.Add ? n.option.api.create : n.option.api.update;
-          try {
-            await n.option.form?.submitBefore?.(i.update.form, i.update);
-          } catch {
-            i.update.loading = !1;
-            return;
-          }
-          let s = ObjectUtil.deepMerge(i.update.form, {});
-          delete s.children;
-          const f = new Set(n.option.column.filter((d) => d.type === "datetime").map((d) => d.key));
-          Object.keys(s).forEach((d) => {
-            if (f.has(d) && s[d] != null) {
-              const c = new Date(s[d]).getTime();
-              isNaN(c) || (s[d] = c);
-            }
-          });
-          try {
-            if (!t) return;
-            await t({ ...s }), i.update.close(), await i.table.getList(), n.option.form?.submitAfter?.(s, i.update);
-          } catch (d) {
-            console.error(d);
-          } finally {
-            i.update.loading = !1;
+      submit: async () => {
+        const i = e();
+        if (!await i.update.validate() || i.update.loading) return;
+        i.update.loading = !0;
+        const t = i.update.type === le.Add ? n.option.api.create : n.option.api.update;
+        try {
+          await n.option.form?.submitBefore?.(i.update.form, i.update);
+        } catch {
+          i.update.loading = !1;
+          return;
+        }
+        let s = ObjectUtil.deepMerge(i.update.form, {});
+        delete s.children;
+        const f = new Set(n.option.column.filter((d) => d.type === "datetime").map((d) => d.key));
+        Object.keys(s).forEach((d) => {
+          if (f.has(d) && s[d] != null) {
+            const c = new Date(s[d]).getTime();
+            isNaN(c) || (s[d] = c);
           }
         });
+        try {
+          if (!t) return;
+          await t({ ...s }), i.update.close(), await i.table.getList(), n.option.form?.submitAfter?.(s, i.update);
+        } catch (d) {
+          console.error(d);
+        } finally {
+          i.update.loading = !1;
+        }
       },
       close: () => {
         const i = e();
@@ -1932,22 +1931,21 @@ const xt = (e, n) => ({
     J.setValue(a.search.form, v, !0);
   }
 }), $t = (e) => {
-  const n = Q(), l = Q(), a = Q(), i = { switchConfirmRef: n, ruleFormRef: l, tableRef: a };
-  let o;
-  const t = () => o;
-  return o = me({
+  const n = Q(), l = Q(), a = Q(), i = { switchConfirmRef: n, ruleFormRef: l, tableRef: a }, o = () => t;
+  let t = me({
     ...pt(),
     option: e.option,
-    ...wt(t, e),
-    ...vt(t, e),
-    ...kt(t, e, i),
-    ...xt(t, e),
-    ...St(t, e, i),
-    ...Vt(t, e),
-    ...zt(t, e, i)
-  }), o.init(), Ve(() => {
-    e.option.init !== !1 && o.table.getList();
-  }), ze.setConf(o), { conf: o, switchConfirmRef: n, ruleFormRef: l, tableRef: a };
+    ...wt(o, e),
+    ...vt(o, e),
+    ...kt(o, e, i),
+    ...xt(o, e),
+    ...St(o, e, i),
+    ...Vt(o, e),
+    ...zt(o, e, i)
+  });
+  return t.init(), Ve(() => {
+    e.option.init !== !1 && t.table.getList();
+  }), ze.setConf(t), { conf: t, switchConfirmRef: n, ruleFormRef: l, tableRef: a };
 }, Et = { class: "dialog-footer" }, Dt = /* @__PURE__ */ G({
   __name: "switchConfirm",
   props: {
@@ -1978,13 +1976,13 @@ const xt = (e, n) => ({
           $(m, { size: e.size }, {
             default: y(() => [
               O("span", Et, [
-                $(r(T), { onClick: d }, {
+                $(r(L), { onClick: d }, {
                   default: y(() => [...v[1] || (v[1] = [
                     V("取消", -1)
                   ])]),
                   _: 1
                 }),
-                $(r(T), {
+                $(r(L), {
                   type: "primary",
                   onClick: f
                 }, {
@@ -2124,19 +2122,19 @@ function At(e, n) {
     }, null, -1)
   ])]);
 }
-const Rt = /* @__PURE__ */ Z(Ft, [["render", At]]), Bt = {}, Tt = {
+const Rt = /* @__PURE__ */ Z(Ft, [["render", At]]), Bt = {}, Lt = {
   xmlns: "http://www.w3.org/2000/svg",
   viewBox: "64 64 896 896"
 };
-function Lt(e, n) {
-  return u(), p("svg", Tt, [...n[0] || (n[0] = [
+function Tt(e, n) {
+  return u(), p("svg", Lt, [...n[0] || (n[0] = [
     O("path", {
       fill: "currentColor",
       d: "M180 176h-60c-4.4 0-8 3.6-8 8v656c0 4.4 3.6 8 8 8h60c4.4 0 8-3.6 8-8V184c0-4.4-3.6-8-8-8zm724 0h-60c-4.4 0-8 3.6-8 8v656c0 4.4 3.6 8 8 8h60c4.4 0 8-3.6 8-8V184c0-4.4-3.6-8-8-8zM785.3 504.3L657.7 403.6a7.23 7.23 0 00-11.7 5.7V476H378v-62.8c0-6-7-9.4-11.7-5.7L238.7 508.3a7.14 7.14 0 000 11.3l127.5 100.8c4.7 3.7 11.7.4 11.7-5.7V548h268v62.8c0 6 7 9.4 11.7 5.7l127.5-100.8c3.8-2.9 3.8-8.5.2-11.4z"
     }, null, -1)
   ])]);
 }
-const jt = /* @__PURE__ */ Z(Bt, [["render", Lt]]), Pt = {}, It = {
+const jt = /* @__PURE__ */ Z(Bt, [["render", Tt]]), Pt = {}, It = {
   xmlns: "http://www.w3.org/2000/svg",
   viewBox: "0 0 1024 1024"
 };
@@ -2487,7 +2485,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
                   }),
                   e.option.tools?.search || e.option.tools?.reset ? (u(), h(r(he), { key: 0 }, {
                     default: y(() => [
-                      e.option.tools?.search ? (u(), h(r(T), {
+                      e.option.tools?.search ? (u(), h(r(L), {
                         key: 0,
                         type: "primary",
                         onClick: r(o).search.submit
@@ -2497,7 +2495,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
                         ]),
                         _: 1
                       }, 8, ["onClick"])) : w("", !0),
-                      e.option.tools?.reset ? (u(), h(r(T), {
+                      e.option.tools?.reset ? (u(), h(r(L), {
                         key: 1,
                         onClick: r(o).search.reset
                       }, {
@@ -2519,7 +2517,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
             O("div", co, [
               O("div", fo, [
                 r(i)(e.option.tools?.add) ? (u(), p("div", mo, [
-                  $(r(T), {
+                  $(r(L), {
                     type: "primary",
                     onClick: c[0] || (c[0] = (g) => r(o).update.open(r(l).Add)),
                     size: e.option.size?.search
@@ -2531,7 +2529,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
                   }, 8, ["size"])
                 ])) : w("", !0),
                 e.option.table?.selectable && r(i)(e.option.tools?.delete) ? (u(), p("div", go, [
-                  $(r(T), {
+                  $(r(L), {
                     type: "danger",
                     onClick: c[1] || (c[1] = (g) => r(o).remove.open(r(o).table.selection.list)),
                     size: e.option.size?.search
@@ -2543,7 +2541,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
                   }, 8, ["size"])
                 ])) : w("", !0),
                 e.option.tools?.expand ? (u(), p("div", ho, [
-                  $(r(T), {
+                  $(r(L), {
                     type: "warning",
                     onClick: c[2] || (c[2] = (g) => r(o).table.expand.all()),
                     size: e.option.size?.search
@@ -2597,7 +2595,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
                     ]),
                     default: y(() => [
                       O("div", yo, [
-                        $(r(T), {
+                        $(r(L), {
                           type: "warning",
                           loading: r(o).export.loading,
                           size: e.option.size?.search
@@ -2611,7 +2609,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
                     ]),
                     _: 1
                   }, 8, ["onCommand"])) : (u(), p("div", bo, [
-                    $(r(T), {
+                    $(r(L), {
                       type: "warning",
                       loading: r(o).export.loading,
                       size: e.option.size?.search,
@@ -2738,7 +2736,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
                           default: y(() => [
                             k(d.$slots, "table-op-left", { row: g }),
                             r(o).update.type === r(l).Update && e.option.table?.inlineEdit && r(o).update.form[a.option.table?.rowKey] === g[a.option.table?.rowKey] ? (u(), p(F, { key: 0 }, [
-                              $(r(T), {
+                              $(r(L), {
                                 link: "",
                                 type: "info",
                                 onClick: r(o).update.close
@@ -2748,7 +2746,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
                                 ]),
                                 _: 1
                               }, 8, ["onClick"]),
-                              $(r(T), {
+                              $(r(L), {
                                 link: "",
                                 type: "primary",
                                 onClick: r(o).update.submit,
@@ -2761,7 +2759,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
                               }, 8, ["onClick", "loading"]),
                               k(d.$slots, "table-op-edit-right", { row: g })
                             ], 64)) : (u(), p(F, { key: 1 }, [
-                              r(i)(e.option.table?.add, g) ? (u(), h(r(T), {
+                              r(i)(e.option.table?.add, g) ? (u(), h(r(L), {
                                 key: 0,
                                 link: "",
                                 type: "primary",
@@ -2772,7 +2770,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
                                 ]),
                                 _: 1
                               }, 8, ["onClick"])) : w("", !0),
-                              r(i)(e.option.table?.view, g) ? (u(), h(r(T), {
+                              r(i)(e.option.table?.view, g) ? (u(), h(r(L), {
                                 key: 1,
                                 link: "",
                                 type: "primary",
@@ -2783,7 +2781,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
                                 ]),
                                 _: 1
                               }, 8, ["onClick"])) : w("", !0),
-                              r(i)(e.option.table?.update, g) ? (u(), h(r(T), {
+                              r(i)(e.option.table?.update, g) ? (u(), h(r(L), {
                                 key: 2,
                                 link: "",
                                 type: "warning",
@@ -2794,7 +2792,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
                                 ]),
                                 _: 1
                               }, 8, ["onClick"])) : w("", !0),
-                              r(i)(e.option.table?.delete, g) ? (u(), h(r(T), {
+                              r(i)(e.option.table?.delete, g) ? (u(), h(r(L), {
                                 key: 3,
                                 link: "",
                                 type: "danger",
@@ -2855,7 +2853,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
                   k(d.$slots, "dialog-footer", {
                     row: r(o).update
                   }, () => [
-                    $(r(T), {
+                    $(r(L), {
                       onClick: r(o).update.close
                     }, {
                       default: y(() => [
@@ -2863,7 +2861,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
                       ]),
                       _: 1
                     }, 8, ["onClick"]),
-                    r(o).update.type !== r(l).View ? (u(), h(r(T), {
+                    r(o).update.type !== r(l).View ? (u(), h(r(L), {
                       key: 0,
                       type: "primary",
                       onClick: r(o).update.submit,
@@ -2893,7 +2891,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
               class: "update-dialog-form"
             }, {
               default: y(() => [
-                r(o).update.showContent ? (u(), h(Te, {
+                r(o).update.showContent ? (u(), h(Le, {
                   key: 0,
                   "form-grid": r(o).update.formGrid,
                   "max-span": r(o).update.formMaxSpan,
@@ -2934,7 +2932,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
                 size: e.option.size?.form
               }, {
                 default: y(() => [
-                  $(r(T), {
+                  $(r(L), {
                     onClick: r(o).remove.close
                   }, {
                     default: y(() => [
@@ -2942,7 +2940,7 @@ const to = /* @__PURE__ */ Z(Zt, [["render", eo]]), oo = { class: "row flex-cent
                     ]),
                     _: 1
                   }, 8, ["onClick"]),
-                  $(r(T), {
+                  $(r(L), {
                     type: "danger",
                     onClick: r(o).remove.submit,
                     loading: r(o).remove.loading
@@ -3040,6 +3038,7 @@ export {
   M as TFormConfig,
   b as TFormI18n,
   $e as TFormList,
+  J as TObj,
   S as TSys,
   Mo as default,
   Vo as install