@aplus-frontend/ui 0.6.0-beta.7 → 0.6.0-beta.9

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

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

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

@@ -1,5 +1,5 @@
-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 { 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";
 import "../../../ap-form/ap-form.vue.mjs";
@@ -11,45 +11,50 @@ 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({
+import w from "../../../ap-form/ap-form.vue2.mjs";
+import F from "../../../ap-button/ap-button.vue.mjs";
+const re = /* @__PURE__ */ z({
   __name: "main-button-content",
   props: {
     maxViewNum: {}
   },
   setup(b) {
-    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);
+    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(s, (m) => {
+    Y(c, (p) => {
       var i;
-      m && ((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 k = async (m) => {
-      var y, g;
-      const { viewName: i, isDefault: d } = m, C = P(), z = {
+    const C = async (p) => {
+      var g, x;
+      const { viewName: i, isDefault: m } = p, h = P(), T = {
         searchForm: R(
-          (y = n == null ? void 0 : n.getSearchFormValues) == null ? void 0 : y.call(
+          (g = n == null ? void 0 : n.getSearchFormValues) == null ? void 0 : g.call(
             n,
             !!(n != null && n.searchFormTransform)
           )
         )
       };
-      await ((g = V.addView) == null ? void 0 : g.call(V, {
-        tableKey: F,
-        viewKey: C,
+      await ((x = _.addView) == null ? void 0 : x.call(_, {
+        tableKey: k,
+        viewKey: h,
         viewName: i,
-        isDefault: d,
-        viewConfig: z
-      })), s.value = !1;
+        isDefault: m,
+        viewConfig: T
+      })), c.value = !1;
     };
-    return (m, i) => (K(), E(e(q), {
-      open: h.value,
-      "onUpdate:open": i[1] || (i[1] = (d) => h.value = d),
+    return (p, i) => (E(), D(e(j), {
+      open: y.value,
+      "onUpdate:open": i[1] || (i[1] = (m) => y.value = m),
       placement: "bottom",
       trigger: "click",
       arrow: !1,
@@ -58,34 +63,33 @@ const pe = /* @__PURE__ */ T({
       }
     }, {
       content: t(() => [
-        c("div", {
+        f("div", {
           class: r([e(l)("main-content-popover")])
         }, [
-          a(v, {
+          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: k
+            onFinish: C
           }, {
             default: t(() => [
-              c("div", {
+              f("div", {
                 class: r([e(l)("main-content-popover-title-content")])
               }, [
-                c("div", {
+                f("div", {
                   class: r([e(l)("main-content-popover-title-content-title")])
-                }, p(e(o)("ap.apView.saveNewView")), 3),
-                a(v.FormItem, {
+                }, s(e(o)("ap.apView.saveNewView")), 3),
+                a(w.FormItem, {
                   name: "isDefault",
                   "value-prop-name": "checked"
                 }, {
                   default: t(() => [
-                    a(e(D), null, {
+                    a(e(B), null, {
                       default: t(() => [
-                        w(p(e(o)("ap.apView.setDefault")), 1)
+                        v(s(e(o)("ap.apView.setDefault")), 1)
                       ]),
                       _: 1
                     })
@@ -93,7 +97,7 @@ const pe = /* @__PURE__ */ T({
                   _: 1
                 })
               ], 2),
-              a(v.FormItem, {
+              a(w.FormItem, {
                 label: e(o)("ap.apView.viewName"),
                 name: "viewName",
                 rules: [{ required: !0, message: e(o)("ap.apView.notEmpty") }]
@@ -107,28 +111,28 @@ const pe = /* @__PURE__ */ T({
                 ]),
                 _: 1
               }, 8, ["label", "rules"]),
-              a(v.FormItem, {
+              a(w.FormItem, {
                 class: r([e(l)("main-content-popover-btn")])
               }, {
                 default: t(() => [
-                  a(e(x), { size: 8 }, {
+                  a(e(N), { size: 8 }, {
                     default: t(() => [
-                      a(e(N), {
+                      a(e(F), {
                         size: "small",
-                        onClick: i[0] || (i[0] = (d) => s.value = !1)
+                        onClick: i[0] || (i[0] = (m) => c.value = !1)
                       }, {
                         default: t(() => [
-                          w(p(e(o)("ap.apView.cancel")), 1)
+                          v(s(e(o)("ap.apView.cancel")), 1)
                         ]),
                         _: 1
                       }),
-                      a(e(N), {
+                      a(e(F), {
                         type: "primary",
                         size: "small",
                         "html-type": "submit"
                       }, {
                         default: t(() => [
-                          w(p(e(o)("ap.apView.save")), 1)
+                          v(s(e(o)("ap.apView.save")), 1)
                         ]),
                         _: 1
                       })
@@ -144,30 +148,30 @@ const pe = /* @__PURE__ */ T({
         ], 2)
       ]),
       default: t(() => [
-        c("div", {
+        f("div", {
           class: r({
             [e(l)("main-content")]: !0,
-            [e(l)("main-content-disabled")]: e(f).length >= u.maxViewNum + 1
+            [e(l)("main-content-disabled")]: e(u).length >= d.maxViewNum + 1
           })
         }, [
-          a(e(B), { placement: "bottom" }, j({
+          a(e(q), { placement: "bottom" }, K({
             default: t(() => [
-              a(e(x), { size: 4 }, {
+              a(e(N), { size: 4 }, {
                 default: t(() => [
                   a(L, {
                     class: r([e(l)("icon")])
                   }, null, 8, ["class"]),
-                  c("div", null, p(e(o)("ap.apView.saveView")), 1)
+                  f("div", null, s(e(o)("ap.apView.saveView")), 1)
                 ]),
                 _: 1
               })
             ]),
             _: 2
           }, [
-            e(f).length >= u.maxViewNum + 1 ? {
+            e(u).length >= d.maxViewNum + 1 ? {
               name: "title",
               fn: t(() => [
-                w(p(e(o)("ap.apView.maxTip")), 1)
+                v(s(e(o)("ap.apView.maxTip")), 1)
               ]),
               key: "0"
             } : void 0
@@ -179,5 +183,5 @@ const pe = /* @__PURE__ */ T({
   }
 });
 export {
-  pe as default
+  re as default
 };

package/es/src/business/hooks/usePageListApGrid.mjs

@@ -45,7 +45,7 @@ function z(s) {
       } : void 0,
       rowSelection: c ? {
         fixed: "left",
-        columnWidth: 50
+        columnWidth: 34
       } : void 0,
       ref(e) {
         o.value = e;

package/lib/src/ap-form/interface.d.ts

@@ -183,6 +183,10 @@ export type ApFormSearchFormPopoverSorterProps = {
      * @returns
      */
     onClickConfirm: (sortedChildren: VNode[]) => void;
+    /**
+     * 当前的children是否已经排序过了
+     */
+    sorted?: boolean;
 };
 export type ApFormSearchFormExpose = {
     apForm: ApFormExpose;