@aplus-frontend/ui 0.6.0-beta.0 → 0.6.0-beta.10

package/es/src/business/ap-view/ap-view.vue2.mjs

@@ -1,18 +1,20 @@
-import { defineComponent as M, computed as N, ref as p, createVNode as g, watch as S, onMounted as Y, createBlock as $, openBlock as j, unref as w, normalizeClass as x, withCtx as z, createElementVNode as W } from "vue";
+import { defineComponent as Y, computed as E, ref as d, createVNode as _, watch as z, createBlock as M, openBlock as W, unref as v, mergeProps as h, withCtx as q, createElementVNode as H, normalizeClass as J } from "vue";
 import "../../config-provider/index.mjs";
-import q from "./icons/line-down.vue.mjs";
-import { ApBatchActionGroup as H } from "../ap-batch-action-group/index.mjs";
+import Q from "./icons/line-down.vue.mjs";
+import { ApBatchActionGroup as X } from "../ap-batch-action-group/index.mjs";
 import "./components/main-button-content.vue.mjs";
 import "./components/menu-list-content.vue.mjs";
-import { useViewProvide as J } from "./hooks/use-view-provide.mjs";
-import { useInjectApTable as Q } from "../../ap-table/context.mjs";
+import { useViewProvide as Z } from "./hooks/use-view-provide.mjs";
+import { useInjectApTable as U } from "../../ap-table/context.mjs";
 import { SYSTEM_VIEW_KEY as y } from "./utils/enum.mjs";
-import { useGlobalConfig as X } from "../../config-provider/hooks/use-global-config.mjs";
-import { useNamespace as Z } from "../../config-provider/hooks/use-namespace.mjs";
-import { useLocale as U } from "../../config-provider/hooks/use-locale.mjs";
-import h from "./components/main-button-content.vue2.mjs";
-import R from "./components/menu-list-content.vue2.mjs";
-const fe = /* @__PURE__ */ M({
+import { isValid as R } from "@aplus-frontend/utils";
+import { useGlobalConfig as C } from "../../config-provider/hooks/use-global-config.mjs";
+import { useNamespace as O } from "../../config-provider/hooks/use-namespace.mjs";
+import { useLocale as S } from "../../config-provider/hooks/use-locale.mjs";
+import D from "./components/main-button-content.vue2.mjs";
+import ee from "./components/menu-list-content.vue2.mjs";
+const Ve = /* @__PURE__ */ Y({
+  name: "ApView",
   __name: "ap-view",
   props: {
     tableKey: {},
@@ -20,152 +22,169 @@ const fe = /* @__PURE__ */ M({
     viewCacheOption: {},
     maxViewNum: {
       default: 20
+    },
+    isDefaultSystemView: {
+      type: Boolean,
+      default: !1
     }
   },
-  setup(E) {
-    const c = E, L = X("viewCacheOption"), {
-      b: d
-    } = Z("ap-view"), {
-      t: T
-    } = U(), V = N(() => ({
+  setup(F) {
+    const f = F, k = C("viewCacheOption"), {
+      b: K
+    } = O("ap-view"), {
+      t: A
+    } = S(), b = E(() => ({
       viewKey: y,
-      viewName: T("ap.apView.systemView")
+      viewName: A("ap.apView.systemView")
     })), {
-      getSearchFormValues: k,
-      setSearchFormValues: A,
-      submit: B,
-      reset: F
-    } = Q(), G = p(!1), K = p(!1), r = p("system"), P = {
+      getSearchFormValues: B,
+      setSearchFormValues: L,
+      submit: P,
+      reset: T
+    } = U(), j = d(!1), g = d(!1), V = d("");
+    let N = !1;
+    const G = {
       dropdownType: "dropdown",
-      content: g(h, {
-        maxViewNum: c.maxViewNum
+      content: _(D, {
+        maxViewNum: f.maxViewNum
       }, null)
-    }, o = p([V.value]), D = N(() => o.value.map((t) => ({
+    }, o = d([b.value]), $ = E(() => o.value.map((t) => ({
       id: t.viewKey,
-      content: g(R, {
+      content: _(ee, {
         view: t
       }, null)
-    }))), n = {
-      getSearchFormValues: k,
-      setSearchFormValues: A,
-      submit: B,
-      reset: F,
-      ...c.saveDataSource
-    }, e = {
-      ...L.value,
-      ...c.viewCacheOption
-    }, _ = () => {
-      const t = o.value.find((s) => s.isDefault);
+    }))), e = {
+      getSearchFormValues: B,
+      setSearchFormValues: L,
+      submit: P,
+      reset: T,
+      ...f.saveDataSource
+    }, i = {
+      ...k.value,
+      ...f.viewCacheOption
+    }, x = () => {
+      if (f.isDefaultSystemView)
+        return y;
+      const t = o.value.find((l) => l.isDefault);
       return (t == null ? void 0 : t.viewKey) ?? y;
-    }, m = {
+    }, p = (t) => {
+      V.value = t;
+      const l = o.value.find((s) => s.viewKey === V.value);
+      l && setTimeout(() => {
+        var s, n, m, a, r, u;
+        l.viewKey === y ? N ? (s = e == null ? void 0 : e.submit) == null || s.call(e) : (n = e == null ? void 0 : e.reset) == null || n.call(e) : ((r = e == null ? void 0 : e.setSearchFormValues) == null || r.call(e, {
+          ...Object.fromEntries(Object.keys(((m = e == null ? void 0 : e.getSearchFormValues) == null ? void 0 : m.call(e)) ?? {}).map((w) => [w, void 0])) ?? {},
+          ...((a = l.viewConfig) == null ? void 0 : a.searchForm) ?? {}
+        }), (u = e == null ? void 0 : e.submit) == null || u.call(e)), N = !1;
+      });
+    }, c = {
       getViewList: async (t) => {
-        var s;
+        var l;
         try {
           const {
-            tableKey: a
-          } = t, l = await ((s = e == null ? void 0 : e.getViewList) == null ? void 0 : s.call(e, {
-            tableKey: a
+            tableKey: s
+          } = t, n = await ((l = i == null ? void 0 : i.getViewList) == null ? void 0 : l.call(i, {
+            tableKey: s
           }));
-          return o.value = [V.value, ...l ?? []], r.value = _(), o.value;
+          return o.value = [b.value, ...n ?? []], p(x()), o.value;
         } catch {
-          return o.value = [V.value], r.value = y, o.value;
+          return o.value = [b.value], p(y), o.value;
         }
       },
       addView: async (t) => {
-        var u;
+        var r;
         const {
-          tableKey: s,
-          viewKey: a,
-          viewName: l,
-          isDefault: i,
-          viewConfig: f
+          tableKey: l,
+          viewKey: s,
+          viewName: n,
+          isDefault: m,
+          viewConfig: a
         } = t;
-        await ((u = e == null ? void 0 : e.addView) == null ? void 0 : u.call(e, {
-          tableKey: s,
-          viewKey: a,
-          viewName: l,
-          isDefault: i,
-          viewConfig: f
-        })), i && (o.value = o.value.map((v) => ({
-          ...v,
+        await ((r = i == null ? void 0 : i.addView) == null ? void 0 : r.call(i, {
+          tableKey: l,
+          viewKey: s,
+          viewName: n,
+          isDefault: m,
+          viewConfig: a
+        })), m && (o.value = o.value.map((u) => ({
+          ...u,
           isDefault: !1
         }))), o.value = [...o.value, {
-          viewKey: a,
-          viewName: l,
-          isDefault: i,
-          viewConfig: f
-        }], r.value = a;
+          viewKey: s,
+          viewName: n,
+          isDefault: m,
+          viewConfig: a
+        }], p(s);
       },
       changeView: async (t) => {
-        var v;
+        var u;
         const {
-          tableKey: s,
-          viewKey: a,
-          viewName: l,
-          isDefault: i,
-          viewConfig: f
+          tableKey: l,
+          viewKey: s,
+          viewName: n,
+          isDefault: m,
+          viewConfig: a
         } = t;
-        await ((v = e == null ? void 0 : e.changeView) == null ? void 0 : v.call(e, {
-          tableKey: s,
-          viewKey: a,
-          viewName: l,
-          isDefault: i,
-          viewConfig: f
-        })), i && (o.value = o.value.map((b) => ({
-          ...b,
+        await ((u = i == null ? void 0 : i.changeView) == null ? void 0 : u.call(i, {
+          tableKey: l,
+          viewKey: s,
+          viewName: n,
+          isDefault: m,
+          viewConfig: a
+        })), m && (o.value = o.value.map((w) => ({
+          ...w,
           isDefault: !1
         })));
-        const u = o.value.find((b) => b.viewKey === a);
-        u && (u.viewName = l, u.isDefault = i, u.viewConfig = f), r.value = a;
+        const r = o.value.find((w) => w.viewKey === s);
+        r && (r.viewName = n, r.isDefault = m, r.viewConfig = a), p(s);
       },
       removeView: async (t) => {
-        var l;
+        var n;
         const {
-          tableKey: s,
-          viewKey: a
+          tableKey: l,
+          viewKey: s
         } = t;
-        await ((l = e == null ? void 0 : e.removeView) == null ? void 0 : l.call(e, {
-          tableKey: s,
-          viewKey: a
-        })), o.value = o.value.filter((i) => i.viewKey !== a), a === r.value && (r.value = _());
+        await ((n = i == null ? void 0 : i.removeView) == null ? void 0 : n.call(i, {
+          tableKey: l,
+          viewKey: s
+        })), o.value = o.value.filter((m) => m.viewKey !== s), s === V.value && p(x());
       }
     }, I = {
-      tableKey: c.tableKey,
-      currentViewKey: r,
-      popoverOpen: G,
-      menuOpen: K,
+      tableKey: f.tableKey,
+      currentViewKey: V,
+      changeCurrentViewKey: p,
+      popoverOpen: j,
+      menuOpen: g,
       viewList: o,
-      viewListCRUD: m,
-      saveDataSource: n
+      viewListCRUD: c,
+      saveDataSource: e
     };
-    return S(r, (t) => {
-      const s = o.value.find((a) => a.viewKey === t);
-      s && setTimeout(() => {
-        var a, l, i;
-        s.viewKey === y ? (a = n.reset) == null || a.call(n) : ((l = n.setSearchFormValues) == null || l.call(n, s.viewConfig ?? {}), (i = n.submit) == null || i.call(n));
-      });
-    }), J(I), Y(() => {
-      var t;
-      (t = m == null ? void 0 : m.getViewList) == null || t.call(m, {
-        tableKey: c.tableKey
-      });
-    }), (t, s) => (j(), $(w(H), {
-      open: K.value,
-      "onUpdate:open": s[0] || (s[0] = (a) => K.value = a),
-      class: x([w(d)()]),
-      "button-props": P,
-      "menu-list": D.value,
-      "overlay-class-name": [w(d)("overlay")],
+    return Z(I), z(() => f.tableKey, (t) => {
+      var l;
+      R(t) && (N = !0, (l = c == null ? void 0 : c.getViewList) == null || l.call(c, {
+        tableKey: t
+      }));
+    }, {
+      immediate: !0
+    }), (t, l) => (W(), M(v(X), h({
+      ...t.$attrs
+    }, {
+      open: g.value,
+      "onUpdate:open": l[0] || (l[0] = (s) => g.value = s),
+      class: [v(K)()],
+      "button-props": G,
+      "menu-list": $.value,
+      "overlay-class-name": [v(K)("overlay")],
       trigger: "click",
       placement: "bottom"
-    }, {
-      icon: z(() => [W("div", {
-        class: x([w(d)("icon")])
-      }, [g(q)], 2)]),
+    }), {
+      icon: q(() => [H("div", {
+        class: J([v(K)("icon")])
+      }, [_(Q)], 2)]),
       _: 1
-    }, 8, ["open", "class", "menu-list", "overlay-class-name"]));
+    }, 16, ["open", "class", "menu-list", "overlay-class-name"]));
   }
 });
 export {
-  fe as default
+  Ve as default
 };

package/es/src/business/ap-view/components/main-button-content.vue2.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as $, ref as I, computed as T, watch as Y, createBlock as D, openBlock as E, unref as e, withCtx as t, createElementVNode as u, normalizeClass as m, createVNode as a, createSlots as K, toDisplayString as p, createTextVNode as v } from "vue";
+import { defineComponent as z, ref as $, computed as I, watch as Y, createBlock as D, openBlock as E, unref as e, withCtx as t, createElementVNode as f, normalizeClass as r, createVNode as a, createSlots as K, toDisplayString as s, createTextVNode as v } from "vue";
 import { Popover as j, Tooltip as q, Space as N, Checkbox as B } from "@aplus-frontend/antdv";
 import "../../../config-provider/index.mjs";
 import L from "../icons/line-eye.vue.mjs";
@@ -6,42 +6,55 @@ import "../../../ap-form/ap-form.vue.mjs";
 import { ApField as M } from "../../../ap-field/index.mjs";
 import "../../../ap-button/index.mjs";
 import O from "dayjs";
-import { useViewInject as S } from "../hooks/use-view-provide.mjs";
-import { generateUniqueKey as A } from "../utils/uuid.mjs";
-import { useLocale as P } from "../../../config-provider/hooks/use-locale.mjs";
-import { useNamespace as R } from "../../../config-provider/hooks/use-namespace.mjs";
+import { useViewInject as A } from "../hooks/use-view-provide.mjs";
+import { generateUniqueKey as P } from "../utils/uuid.mjs";
+import { cloneDeep as R } from "lodash-unified";
+import { useLocale as U } from "../../../config-provider/hooks/use-locale.mjs";
+import { useNamespace as G } from "../../../config-provider/hooks/use-namespace.mjs";
 import w from "../../../ap-form/ap-form.vue2.mjs";
-import h from "../../../ap-button/ap-button.vue.mjs";
-const le = /* @__PURE__ */ $({
+import F from "../../../ap-button/ap-button.vue.mjs";
+const re = /* @__PURE__ */ z({
   __name: "main-button-content",
   props: {
     maxViewNum: {}
   },
   setup(b) {
-    const c = b, { t: o } = P(), { b: n } = R("ap-view"), _ = I(), { tableKey: k, popoverOpen: r, viewList: f, saveDataSource: s, viewListCRUD: V } = S(), y = T({
-      get: () => r.value && f.value.length < c.maxViewNum + 1,
-      set: (l) => {
-        f.value.length < c.maxViewNum + 1 && (r.value = l);
+    const d = b, { t: o } = U(), { b: l } = G("ap-view"), V = $(), { tableKey: k, popoverOpen: c, viewList: u, saveDataSource: n, viewListCRUD: _ } = A(), y = I({
+      get: () => c.value && u.value.length < d.maxViewNum + 1,
+      set: (p) => {
+        u.value.length < d.maxViewNum + 1 && (c.value = p);
       }
     });
-    Y(r, (l) => {
+    Y(c, (p) => {
       var i;
-      l && ((i = _.value) == null || i.resetFields());
+      p && ((i = V.value) == null || i.resetFields(), setTimeout(() => {
+        var m;
+        (m = V.value) == null || m.setFieldsValue({
+          isDefault: !u.value.some((h) => h.isDefault)
+        });
+      }));
     });
-    const F = async (l) => {
+    const C = async (p) => {
       var g, x;
-      const { viewName: i, isDefault: d } = l, C = A(), z = ((g = s == null ? void 0 : s.getSearchFormValues) == null ? void 0 : g.call(s, !0)) ?? {};
-      await ((x = V.addView) == null ? void 0 : x.call(V, {
+      const { viewName: i, isDefault: m } = p, h = P(), T = {
+        searchForm: R(
+          (g = n == null ? void 0 : n.getSearchFormValues) == null ? void 0 : g.call(
+            n,
+            !!(n != null && n.searchFormTransform)
+          )
+        )
+      };
+      await ((x = _.addView) == null ? void 0 : x.call(_, {
         tableKey: k,
-        viewKey: C,
+        viewKey: h,
         viewName: i,
-        isDefault: d,
-        viewConfig: z
-      })), r.value = !1;
+        isDefault: m,
+        viewConfig: T
+      })), c.value = !1;
     };
-    return (l, i) => (E(), D(e(j), {
+    return (p, i) => (E(), D(e(j), {
       open: y.value,
-      "onUpdate:open": i[1] || (i[1] = (d) => y.value = d),
+      "onUpdate:open": i[1] || (i[1] = (m) => y.value = m),
       placement: "bottom",
       trigger: "click",
       arrow: !1,
@@ -50,26 +63,25 @@ const le = /* @__PURE__ */ $({
       }
     }, {
       content: t(() => [
-        u("div", {
-          class: m([e(n)("main-content-popover")])
+        f("div", {
+          class: r([e(l)("main-content-popover")])
         }, [
           a(w, {
             ref_key: "formRef",
-            ref: _,
+            ref: V,
             layout: "vertical",
             "initial-values": {
-              isDefault: !0,
               viewName: `${e(o)("ap.apView.newView")} ${e(O)().format("YYYY-MM-DD").toString()}`
             },
-            onFinish: F
+            onFinish: C
           }, {
             default: t(() => [
-              u("div", {
-                class: m([e(n)("main-content-popover-title-content")])
+              f("div", {
+                class: r([e(l)("main-content-popover-title-content")])
               }, [
-                u("div", {
-                  class: m([e(n)("main-content-popover-title-content-title")])
-                }, p(e(o)("ap.apView.saveNewView")), 3),
+                f("div", {
+                  class: r([e(l)("main-content-popover-title-content-title")])
+                }, s(e(o)("ap.apView.saveNewView")), 3),
                 a(w.FormItem, {
                   name: "isDefault",
                   "value-prop-name": "checked"
@@ -77,7 +89,7 @@ const le = /* @__PURE__ */ $({
                   default: t(() => [
                     a(e(B), null, {
                       default: t(() => [
-                        v(p(e(o)("ap.apView.setDefault")), 1)
+                        v(s(e(o)("ap.apView.setDefault")), 1)
                       ]),
                       _: 1
                     })
@@ -100,27 +112,27 @@ const le = /* @__PURE__ */ $({
                 _: 1
               }, 8, ["label", "rules"]),
               a(w.FormItem, {
-                class: m([e(n)("main-content-popover-btn")])
+                class: r([e(l)("main-content-popover-btn")])
               }, {
                 default: t(() => [
                   a(e(N), { size: 8 }, {
                     default: t(() => [
-                      a(e(h), {
+                      a(e(F), {
                         size: "small",
-                        onClick: i[0] || (i[0] = (d) => r.value = !1)
+                        onClick: i[0] || (i[0] = (m) => c.value = !1)
                       }, {
                         default: t(() => [
-                          v(p(e(o)("ap.apView.cancel")), 1)
+                          v(s(e(o)("ap.apView.cancel")), 1)
                         ]),
                         _: 1
                       }),
-                      a(e(h), {
+                      a(e(F), {
                         type: "primary",
                         size: "small",
                         "html-type": "submit"
                       }, {
                         default: t(() => [
-                          v(p(e(o)("ap.apView.save")), 1)
+                          v(s(e(o)("ap.apView.save")), 1)
                         ]),
                         _: 1
                       })
@@ -136,10 +148,10 @@ const le = /* @__PURE__ */ $({
         ], 2)
       ]),
       default: t(() => [
-        u("div", {
-          class: m({
-            [e(n)("main-content")]: !0,
-            [e(n)("main-content-disabled")]: e(f).length >= c.maxViewNum + 1
+        f("div", {
+          class: r({
+            [e(l)("main-content")]: !0,
+            [e(l)("main-content-disabled")]: e(u).length >= d.maxViewNum + 1
           })
         }, [
           a(e(q), { placement: "bottom" }, K({
@@ -147,19 +159,19 @@ const le = /* @__PURE__ */ $({
               a(e(N), { size: 4 }, {
                 default: t(() => [
                   a(L, {
-                    class: m([e(n)("icon")])
+                    class: r([e(l)("icon")])
                   }, null, 8, ["class"]),
-                  u("div", null, p(e(o)("ap.apView.saveView")), 1)
+                  f("div", null, s(e(o)("ap.apView.saveView")), 1)
                 ]),
                 _: 1
               })
             ]),
             _: 2
           }, [
-            e(f).length >= c.maxViewNum + 1 ? {
+            e(u).length >= d.maxViewNum + 1 ? {
               name: "title",
               fn: t(() => [
-                v(p(e(o)("ap.apView.maxTip")), 1)
+                v(s(e(o)("ap.apView.maxTip")), 1)
               ]),
               key: "0"
             } : void 0
@@ -171,5 +183,5 @@ const le = /* @__PURE__ */ $({
   }
 });
 export {
-  le as default
+  re as default
 };