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

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

@@ -1,4 +1,4 @@
-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 I, computed as _, ref as p, createVNode as g, watch as x, createBlock as S, openBlock as Y, unref as w, mergeProps as j, withCtx as z, createElementVNode as M, normalizeClass as W } 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";
@@ -7,12 +7,14 @@ 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 { 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 { isValid as X } from "@aplus-frontend/utils";
+import { useGlobalConfig as Z } from "../../config-provider/hooks/use-global-config.mjs";
+import { useNamespace as h } 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 R from "./components/main-button-content.vue2.mjs";
+import C from "./components/menu-list-content.vue2.mjs";
+const pe = /* @__PURE__ */ I({
+  name: "ApView",
   __name: "ap-view",
   props: {
     tableKey: {},
@@ -22,150 +24,154 @@ const fe = /* @__PURE__ */ M({
       default: 20
     }
   },
-  setup(E) {
-    const c = E, L = X("viewCacheOption"), {
-      b: d
-    } = Z("ap-view"), {
-      t: T
-    } = U(), V = N(() => ({
+  setup(A) {
+    const f = A, E = Z("viewCacheOption"), {
+      b: V
+    } = h("ap-view"), {
+      t: F
+    } = U(), d = _(() => ({
       viewKey: y,
-      viewName: T("ap.apView.systemView")
+      viewName: F("ap.apView.systemView")
     })), {
-      getSearchFormValues: k,
-      setSearchFormValues: A,
-      submit: B,
-      reset: F
-    } = Q(), G = p(!1), K = p(!1), r = p("system"), P = {
+      getSearchFormValues: L,
+      setSearchFormValues: P,
+      submit: T,
+      reset: k
+    } = Q(), B = p(!1), K = p(!1), r = p("system"), G = {
       dropdownType: "dropdown",
-      content: g(h, {
-        maxViewNum: c.maxViewNum
-      }, null)
-    }, o = p([V.value]), D = N(() => o.value.map((t) => ({
-      id: t.viewKey,
       content: g(R, {
-        view: t
+        maxViewNum: f.maxViewNum
+      }, null)
+    }, s = p([d.value]), $ = _(() => s.value.map((e) => ({
+      id: e.viewKey,
+      content: g(C, {
+        view: e
       }, 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);
-      return (t == null ? void 0 : t.viewKey) ?? y;
-    }, m = {
-      getViewList: async (t) => {
-        var s;
+      getSearchFormValues: L,
+      setSearchFormValues: P,
+      submit: T,
+      reset: k,
+      ...f.saveDataSource
+    }, t = {
+      ...E.value,
+      ...f.viewCacheOption
+    }, N = () => {
+      const e = s.value.find((a) => a.isDefault);
+      return (e == null ? void 0 : e.viewKey) ?? y;
+    }, c = {
+      getViewList: async (e) => {
+        var a;
         try {
           const {
-            tableKey: a
-          } = t, l = await ((s = e == null ? void 0 : e.getViewList) == null ? void 0 : s.call(e, {
-            tableKey: a
+            tableKey: o
+          } = e, i = await ((a = t == null ? void 0 : t.getViewList) == null ? void 0 : a.call(t, {
+            tableKey: o
           }));
-          return o.value = [V.value, ...l ?? []], r.value = _(), o.value;
+          return s.value = [d.value, ...i ?? []], r.value = N(), s.value;
         } catch {
-          return o.value = [V.value], r.value = y, o.value;
+          return s.value = [d.value], r.value = y, s.value;
         }
       },
-      addView: async (t) => {
+      addView: async (e) => {
         var u;
         const {
-          tableKey: s,
-          viewKey: a,
-          viewName: l,
-          isDefault: i,
-          viewConfig: f
-        } = 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) => ({
+          tableKey: a,
+          viewKey: o,
+          viewName: i,
+          isDefault: l,
+          viewConfig: m
+        } = e;
+        await ((u = t == null ? void 0 : t.addView) == null ? void 0 : u.call(t, {
+          tableKey: a,
+          viewKey: o,
+          viewName: i,
+          isDefault: l,
+          viewConfig: m
+        })), l && (s.value = s.value.map((v) => ({
           ...v,
           isDefault: !1
-        }))), o.value = [...o.value, {
-          viewKey: a,
-          viewName: l,
-          isDefault: i,
-          viewConfig: f
-        }], r.value = a;
+        }))), s.value = [...s.value, {
+          viewKey: o,
+          viewName: i,
+          isDefault: l,
+          viewConfig: m
+        }], r.value = o;
       },
-      changeView: async (t) => {
+      changeView: async (e) => {
         var v;
         const {
-          tableKey: s,
-          viewKey: a,
-          viewName: l,
-          isDefault: i,
-          viewConfig: f
-        } = 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) => ({
+          tableKey: a,
+          viewKey: o,
+          viewName: i,
+          isDefault: l,
+          viewConfig: m
+        } = e;
+        await ((v = t == null ? void 0 : t.changeView) == null ? void 0 : v.call(t, {
+          tableKey: a,
+          viewKey: o,
+          viewName: i,
+          isDefault: l,
+          viewConfig: m
+        })), l && (s.value = s.value.map((b) => ({
           ...b,
           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 u = s.value.find((b) => b.viewKey === o);
+        u && (u.viewName = i, u.isDefault = l, u.viewConfig = m), r.value = o;
       },
-      removeView: async (t) => {
-        var l;
+      removeView: async (e) => {
+        var i;
         const {
-          tableKey: s,
-          viewKey: a
-        } = 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 = _());
+          tableKey: a,
+          viewKey: o
+        } = e;
+        await ((i = t == null ? void 0 : t.removeView) == null ? void 0 : i.call(t, {
+          tableKey: a,
+          viewKey: o
+        })), s.value = s.value.filter((l) => l.viewKey !== o), o === r.value && (r.value = N());
       }
-    }, I = {
-      tableKey: c.tableKey,
+    }, D = {
+      tableKey: f.tableKey,
       currentViewKey: r,
-      popoverOpen: G,
+      popoverOpen: B,
       menuOpen: K,
-      viewList: o,
-      viewListCRUD: m,
+      viewList: s,
+      viewListCRUD: c,
       saveDataSource: n
     };
-    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
+    return x(r, (e) => {
+      const a = s.value.find((o) => o.viewKey === e);
+      a && setTimeout(() => {
+        var o, i, l, m;
+        a.viewKey === y ? (o = n.reset) == null || o.call(n) : ((l = n.setSearchFormValues) == null || l.call(n, ((i = a.viewConfig) == null ? void 0 : i.searchForm) ?? {}), (m = n.submit) == null || m.call(n));
       });
-    }), (t, s) => (j(), $(w(H), {
+    }), J(D), x(() => f.tableKey, (e) => {
+      var a;
+      X(e) && ((a = c == null ? void 0 : c.getViewList) == null || a.call(c, {
+        tableKey: e
+      }));
+    }, {
+      immediate: !0
+    }), (e, a) => (Y(), S(w(H), j({
+      ...e.$attrs
+    }, {
       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")],
+      "onUpdate:open": a[0] || (a[0] = (o) => K.value = o),
+      class: [w(V)()],
+      "button-props": G,
+      "menu-list": $.value,
+      "overlay-class-name": [w(V)("overlay")],
       trigger: "click",
       placement: "bottom"
-    }, {
-      icon: z(() => [W("div", {
-        class: x([w(d)("icon")])
+    }), {
+      icon: z(() => [M("div", {
+        class: W([w(V)("icon")])
       }, [g(q)], 2)]),
       _: 1
-    }, 8, ["open", "class", "menu-list", "overlay-class-name"]));
+    }, 16, ["open", "class", "menu-list", "overlay-class-name"]));
   }
 });
 export {
-  fe as default
+  pe as default
 };

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

@@ -1,47 +1,55 @@
-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 { Popover as j, Tooltip as q, Space as N, Checkbox as B } from "@aplus-frontend/antdv";
+import { defineComponent as T, ref as $, computed as I, watch as Y, createBlock as E, openBlock as K, unref as e, withCtx as t, createElementVNode as c, normalizeClass as r, createVNode as a, createSlots as j, toDisplayString as p, createTextVNode as w } from "vue";
+import { Popover as q, Tooltip as B, Space as x, Checkbox as D } from "@aplus-frontend/antdv";
 import "../../../config-provider/index.mjs";
 import L from "../icons/line-eye.vue.mjs";
 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 w from "../../../ap-form/ap-form.vue2.mjs";
-import h from "../../../ap-button/ap-button.vue.mjs";
-const le = /* @__PURE__ */ $({
+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 v from "../../../ap-form/ap-form.vue2.mjs";
+import N from "../../../ap-button/ap-button.vue.mjs";
+const pe = /* @__PURE__ */ T({
   __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 u = b, { t: o } = U(), { b: l } = G("ap-view"), _ = $(), { tableKey: F, popoverOpen: s, viewList: f, saveDataSource: n, viewListCRUD: V } = A(), h = I({
+      get: () => s.value && f.value.length < u.maxViewNum + 1,
+      set: (m) => {
+        f.value.length < u.maxViewNum + 1 && (s.value = m);
       }
     });
-    Y(r, (l) => {
+    Y(s, (m) => {
       var i;
-      l && ((i = _.value) == null || i.resetFields());
+      m && ((i = _.value) == null || i.resetFields());
     });
-    const F = async (l) => {
-      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, {
-        tableKey: k,
+    const k = async (m) => {
+      var y, g;
+      const { viewName: i, isDefault: d } = m, C = P(), z = {
+        searchForm: R(
+          (y = n == null ? void 0 : n.getSearchFormValues) == null ? void 0 : y.call(
+            n,
+            !!(n != null && n.searchFormTransform)
+          )
+        )
+      };
+      await ((g = V.addView) == null ? void 0 : g.call(V, {
+        tableKey: F,
         viewKey: C,
         viewName: i,
         isDefault: d,
         viewConfig: z
-      })), r.value = !1;
+      })), s.value = !1;
     };
-    return (l, i) => (E(), D(e(j), {
-      open: y.value,
-      "onUpdate:open": i[1] || (i[1] = (d) => y.value = d),
+    return (m, i) => (K(), E(e(q), {
+      open: h.value,
+      "onUpdate:open": i[1] || (i[1] = (d) => h.value = d),
       placement: "bottom",
       trigger: "click",
       arrow: !1,
@@ -50,10 +58,10 @@ const le = /* @__PURE__ */ $({
       }
     }, {
       content: t(() => [
-        u("div", {
-          class: m([e(n)("main-content-popover")])
+        c("div", {
+          class: r([e(l)("main-content-popover")])
         }, [
-          a(w, {
+          a(v, {
             ref_key: "formRef",
             ref: _,
             layout: "vertical",
@@ -61,23 +69,23 @@ const le = /* @__PURE__ */ $({
               isDefault: !0,
               viewName: `${e(o)("ap.apView.newView")} ${e(O)().format("YYYY-MM-DD").toString()}`
             },
-            onFinish: F
+            onFinish: k
           }, {
             default: t(() => [
-              u("div", {
-                class: m([e(n)("main-content-popover-title-content")])
+              c("div", {
+                class: r([e(l)("main-content-popover-title-content")])
               }, [
-                u("div", {
-                  class: m([e(n)("main-content-popover-title-content-title")])
+                c("div", {
+                  class: r([e(l)("main-content-popover-title-content-title")])
                 }, p(e(o)("ap.apView.saveNewView")), 3),
-                a(w.FormItem, {
+                a(v.FormItem, {
                   name: "isDefault",
                   "value-prop-name": "checked"
                 }, {
                   default: t(() => [
-                    a(e(B), null, {
+                    a(e(D), null, {
                       default: t(() => [
-                        v(p(e(o)("ap.apView.setDefault")), 1)
+                        w(p(e(o)("ap.apView.setDefault")), 1)
                       ]),
                       _: 1
                     })
@@ -85,7 +93,7 @@ const le = /* @__PURE__ */ $({
                   _: 1
                 })
               ], 2),
-              a(w.FormItem, {
+              a(v.FormItem, {
                 label: e(o)("ap.apView.viewName"),
                 name: "viewName",
                 rules: [{ required: !0, message: e(o)("ap.apView.notEmpty") }]
@@ -99,28 +107,28 @@ const le = /* @__PURE__ */ $({
                 ]),
                 _: 1
               }, 8, ["label", "rules"]),
-              a(w.FormItem, {
-                class: m([e(n)("main-content-popover-btn")])
+              a(v.FormItem, {
+                class: r([e(l)("main-content-popover-btn")])
               }, {
                 default: t(() => [
-                  a(e(N), { size: 8 }, {
+                  a(e(x), { size: 8 }, {
                     default: t(() => [
-                      a(e(h), {
+                      a(e(N), {
                         size: "small",
-                        onClick: i[0] || (i[0] = (d) => r.value = !1)
+                        onClick: i[0] || (i[0] = (d) => s.value = !1)
                       }, {
                         default: t(() => [
-                          v(p(e(o)("ap.apView.cancel")), 1)
+                          w(p(e(o)("ap.apView.cancel")), 1)
                         ]),
                         _: 1
                       }),
-                      a(e(h), {
+                      a(e(N), {
                         type: "primary",
                         size: "small",
                         "html-type": "submit"
                       }, {
                         default: t(() => [
-                          v(p(e(o)("ap.apView.save")), 1)
+                          w(p(e(o)("ap.apView.save")), 1)
                         ]),
                         _: 1
                       })
@@ -136,30 +144,30 @@ 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
+        c("div", {
+          class: r({
+            [e(l)("main-content")]: !0,
+            [e(l)("main-content-disabled")]: e(f).length >= u.maxViewNum + 1
           })
         }, [
-          a(e(q), { placement: "bottom" }, K({
+          a(e(B), { placement: "bottom" }, j({
             default: t(() => [
-              a(e(N), { size: 4 }, {
+              a(e(x), { 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)
+                  c("div", null, p(e(o)("ap.apView.saveView")), 1)
                 ]),
                 _: 1
               })
             ]),
             _: 2
           }, [
-            e(f).length >= c.maxViewNum + 1 ? {
+            e(f).length >= u.maxViewNum + 1 ? {
               name: "title",
               fn: t(() => [
-                v(p(e(o)("ap.apView.maxTip")), 1)
+                w(p(e(o)("ap.apView.maxTip")), 1)
               ]),
               key: "0"
             } : void 0
@@ -171,5 +179,5 @@ const le = /* @__PURE__ */ $({
   }
 });
 export {
-  le as default
+  pe as default
 };