@aplus-frontend/ui 7.13.8 → 7.13.10

package/es/src/ap-table/components/setting/template/edit-form.vue2.mjs

@@ -1,65 +1,66 @@
-import { defineComponent as f, ref as u, createElementBlock as d, openBlock as y, createVNode as t, unref as e, withCtx as l, createTextVNode as r, toDisplayString as m } from "vue";
-import { Flex as x, Button as c } from "@aplus-frontend/antdv";
-import { ApForm as C } from "../../../../ap-form/index.mjs";
+import { defineComponent as f, ref as u, createElementBlock as d, openBlock as y, createVNode as l, unref as e, withCtx as o, createTextVNode as i, toDisplayString as r } from "vue";
+import { Flex as C, Button as p } from "@aplus-frontend/antdv";
+import { ApForm as b } from "../../../../ap-form/index.mjs";
 import "../../../../config-provider/index.mjs";
-import { useLocale as h } from "../../../../config-provider/hooks/use-locale.mjs";
-import { ApFormItemText as b } from "../../../../ap-form/items/text/index.mjs";
-const V = /* @__PURE__ */ f({
+import { useLocale as g } from "../../../../config-provider/hooks/use-locale.mjs";
+import { ApFormItemText as h } from "../../../../ap-form/items/text/index.mjs";
+const B = /* @__PURE__ */ f({
   __name: "edit-form",
   props: {
     onConfirm: { type: Function },
     onCancel: { type: Function },
-    initialValues: {}
+    initialValues: {},
+    isEdit: { type: Boolean }
   },
-  setup(o) {
-    const p = o, { t: a } = h(), n = u();
-    async function s() {
-      const i = await n.value?.validateFields();
-      p.onConfirm(i?.label);
+  setup(m) {
+    const s = m, { t } = g(), n = u();
+    async function c() {
+      const a = await n.value?.validateFields();
+      s.onConfirm(a?.label);
     }
-    return (i, g) => (y(), d("div", null, [
-      t(e(C), {
+    return (a, T) => (y(), d("div", null, [
+      l(e(b), {
         ref_key: "formRef",
         ref: n,
         colon: !1,
         "label-col": { span: 24 },
-        "initial-values": o.initialValues
+        "initial-values": a.initialValues
       }, {
-        default: l(() => [
-          t(e(b), {
+        default: o(() => [
+          l(e(h), {
             rules: [
               {
                 required: !0,
-                message: e(a)("ap.apTable.setting.templateNamePlaceholder")
+                message: e(t)("ap.apTable.setting.templateNamePlaceholder")
               }
             ],
             name: "label",
-            label: e(a)("ap.apTable.setting.templateName")
+            label: a.isEdit ? e(t)("ap.apTable.setting.templateName") : e(t)("ap.apTable.setting.newTemplateName")
           }, null, 8, ["rules", "label"])
         ]),
         _: 1
       }, 8, ["initial-values"]),
-      t(e(x), {
+      l(e(C), {
         justify: "end",
         gap: 8
       }, {
-        default: l(() => [
-          t(e(c), {
+        default: o(() => [
+          l(e(p), {
             style: { height: "24px" },
-            onClick: o.onCancel
+            onClick: a.onCancel
           }, {
-            default: l(() => [
-              r(m(e(a)("ap.common.cancelText")), 1)
+            default: o(() => [
+              i(r(e(t)("ap.common.cancelText")), 1)
             ]),
             _: 1
           }, 8, ["onClick"]),
-          t(e(c), {
+          l(e(p), {
             style: { height: "24px" },
             type: "primary",
-            onClick: s
+            onClick: c
           }, {
-            default: l(() => [
-              r(m(e(a)("ap.common.save")), 1)
+            default: o(() => [
+              i(r(e(t)("ap.common.save")), 1)
             ]),
             _: 1
           })
@@ -70,5 +71,5 @@ const V = /* @__PURE__ */ f({
   }
 });
 export {
-  V as default
+  B as default
 };

package/es/src/ap-table/components/setting/template/index.vue2.mjs

@@ -1,44 +1,44 @@
-import { defineComponent as d, createBlock as r, openBlock as a, unref as e, normalizeClass as l, withCtx as f, createElementVNode as c, createVNode as y, toDisplayString as g, createElementBlock as k, Fragment as h, renderList as C } from "vue";
-import { Flex as _, Divider as x } from "@aplus-frontend/antdv";
+import { defineComponent as v, createBlock as l, openBlock as a, unref as e, normalizeClass as s, withCtx as d, createElementVNode as r, createVNode as f, toDisplayString as y, createElementBlock as g, Fragment as k, renderList as _ } from "vue";
+import { Flex as h, Divider as C } from "@aplus-frontend/antdv";
 import "../../../../config-provider/index.mjs";
 import { useInjectApColumnSetting as L } from "../context.mjs";
 import "./item.vue.mjs";
-import { useLocale as z } from "../../../../config-provider/hooks/use-locale.mjs";
-import { useNamespace as A } from "../../../../config-provider/hooks/use-namespace.mjs";
-import B from "./item.vue2.mjs";
-const j = /* @__PURE__ */ d({
+import { useLocale as x } from "../../../../config-provider/hooks/use-locale.mjs";
+import { useNamespace as z } from "../../../../config-provider/hooks/use-namespace.mjs";
+import A from "./item.vue2.mjs";
+const j = /* @__PURE__ */ v({
   __name: "index",
   props: {
     customizeTemplateList: {},
     persistenceKey: {},
     onActiveChange: { type: Function }
   },
-  setup(s, { expose: m }) {
-    const { t: p } = z(), { b: n } = A("ap-column-setting-template-list"), { activeKey: o } = L();
-    function u(t) {
-      o.value = t;
+  setup(B, { expose: c }) {
+    const { t: m } = x(), { b: o } = z("ap-column-setting-template-list"), { activeKey: n } = L();
+    function p(t) {
+      n.value = t;
     }
-    function v(t) {
-      o.value = t;
+    function u(t) {
+      n.value = t;
     }
-    return m({ updateActiveKey: v }), (t, F) => (a(), r(e(_), {
+    return c({ updateActiveKey: u }), (t, F) => (a(), l(e(h), {
       vertical: "",
-      class: l(e(n)())
+      class: s(e(o)())
     }, {
-      default: f(() => [
-        c("div", {
-          class: l(e(n)("title"))
-        }, g(e(p)("ap.apTable.setting.templateSetting")), 3),
-        y(e(x), { style: { margin: "0" } }),
-        c("div", {
-          class: l(e(n)("content"))
+      default: d(() => [
+        r("div", {
+          class: s(e(o)("title"))
+        }, y(e(m)("ap.apTable.setting.templateSetting")), 3),
+        f(e(C), { style: { margin: "0" } }),
+        r("div", {
+          class: s(e(o)("content"))
         }, [
-          (a(!0), k(h, null, C(s.customizeTemplateList, (i) => (a(), r(B, {
+          (a(!0), g(k, null, _(t.customizeTemplateList, (i) => (a(), l(A, {
             key: i.key,
             value: i,
-            "is-active": e(o) === i.key,
-            "should-remove": s.customizeTemplateList.length > 1,
-            onClick: () => u(i.key)
+            "is-active": e(n) === i.key,
+            "should-remove": t.customizeTemplateList.length > 1,
+            onClick: () => p(i.key)
           }, null, 8, ["value", "is-active", "should-remove", "onClick"]))), 128))
         ], 2)
       ]),

package/es/src/ap-table/components/setting/template/item.vue2.mjs

@@ -1,12 +1,12 @@
-import { defineComponent as b, ref as g, createElementBlock as p, openBlock as r, normalizeClass as n, unref as e, createElementVNode as f, createBlock as w, createCommentVNode as v, toDisplayString as B, withCtx as m, createVNode as s, withModifiers as d } from "vue";
-import { EditOutlined as x, DeleteOutlined as N } from "@ant-design/icons-vue";
-import { Flex as A, Popover as D } from "@aplus-frontend/antdv";
+import { defineComponent as b, ref as g, createElementBlock as u, openBlock as s, normalizeClass as n, unref as e, createElementVNode as c, createBlock as w, createCommentVNode as f, toDisplayString as B, withCtx as r, createVNode as i, withModifiers as v } from "vue";
+import { EditOutlined as N, DeleteOutlined as A } from "@ant-design/icons-vue";
+import { Flex as D, Popover as E } from "@aplus-frontend/antdv";
 import "../../../../config-provider/index.mjs";
-import { useInjectApColumnSetting as E } from "../context.mjs";
+import { useInjectApColumnSetting as V } from "../context.mjs";
 import "./edit-form.vue.mjs";
-import { useNamespace as V } from "../../../../config-provider/hooks/use-namespace.mjs";
-import F from "./edit-form.vue2.mjs";
-const K = /* @__PURE__ */ b({
+import { useNamespace as F } from "../../../../config-provider/hooks/use-namespace.mjs";
+import O from "./edit-form.vue2.mjs";
+const M = /* @__PURE__ */ b({
   __name: "item",
   props: {
     value: {},
@@ -14,65 +14,66 @@ const K = /* @__PURE__ */ b({
     onClick: { type: Function },
     shouldRemove: { type: Boolean }
   },
-  setup(l) {
-    const c = l, { b: o } = V("ap-column-setting-template-item"), a = g(!1), { deleteTemplate: C, cacheConfig: k } = E();
-    function y(i) {
-      if (!i || i === c.value.label)
+  setup(d) {
+    const p = d, { b: l } = F("ap-column-setting-template-item"), a = g(!1), { deleteTemplate: C, cacheConfig: k } = V();
+    function y(t) {
+      if (!t || t === p.value.label)
         return;
-      const t = c.value;
-      t.label = i, a.value = !1;
+      const o = p.value;
+      o.label = t, a.value = !1;
     }
-    return (i, t) => (r(), p("div", {
-      class: n([e(o)(), { [e(o)("active")]: l.isActive }]),
-      onClick: t[3] || (t[3] = //@ts-ignore
-      (...u) => l.onClick && l.onClick(...u))
+    return (t, o) => (s(), u("div", {
+      class: n([e(l)(), { [e(l)("active")]: t.isActive }]),
+      onClick: o[3] || (o[3] = //@ts-ignore
+      (...m) => t.onClick && t.onClick(...m))
     }, [
-      f("span", {
-        class: n(e(o)("label"))
-      }, B(l.value.label), 3),
-      e(k).persistenceKey ? (r(), w(e(A), {
+      c("span", {
+        class: n(e(l)("label"))
+      }, B(t.value.label), 3),
+      e(k).persistenceKey ? (s(), w(e(D), {
         key: 0,
         gap: 8,
-        class: n(e(o)("action-wrapper"))
+        class: n(e(l)("action-wrapper"))
       }, {
-        default: m(() => [
-          s(e(D), {
+        default: r(() => [
+          i(e(E), {
             open: a.value,
             trigger: "click",
             arrow: !1,
             placement: "bottom",
             "destroy-tooltip-on-hide": ""
           }, {
-            content: m(() => [
-              s(F, {
-                "initial-values": { label: l.value.label },
+            content: r(() => [
+              i(O, {
+                "is-edit": "",
+                "initial-values": { label: t.value.label },
                 onConfirm: y,
-                onCancel: t[1] || (t[1] = () => a.value = !1)
+                onCancel: o[1] || (o[1] = () => a.value = !1)
               }, null, 8, ["initial-values"])
             ]),
-            default: m(() => [
-              f("span", {
-                class: n(e(o)("icon-wrapper")),
-                onClick: t[0] || (t[0] = d((u) => a.value = !0, ["stop"]))
+            default: r(() => [
+              c("span", {
+                class: n(e(l)("icon-wrapper")),
+                onClick: o[0] || (o[0] = v((m) => a.value = !0, ["stop"]))
               }, [
-                s(e(x))
+                i(e(N))
               ], 2)
             ]),
             _: 1
           }, 8, ["open"]),
-          l.shouldRemove ? (r(), p("span", {
+          t.shouldRemove ? (s(), u("span", {
             key: 0,
-            class: n(e(o)("icon-wrapper")),
-            onClick: t[2] || (t[2] = d(() => e(C)(l.value.key), ["stop"]))
+            class: n(e(l)("icon-wrapper")),
+            onClick: o[2] || (o[2] = v(() => e(C)(t.value.key), ["stop"]))
           }, [
-            s(e(N))
-          ], 2)) : v("", !0)
+            i(e(A))
+          ], 2)) : f("", !0)
         ]),
         _: 1
-      }, 8, ["class"])) : v("", !0)
+      }, 8, ["class"])) : f("", !0)
     ], 2));
   }
 });
 export {
-  K as default
+  M as default
 };

package/es/src/ap-table/components/setting/tree-select/index.vue2.mjs

@@ -1,5 +1,5 @@
-import { defineComponent as v, computed as w, unref as r, createElementBlock as u, createCommentVNode as b, openBlock as o, createVNode as c, withCtx as l, Fragment as m, renderList as x, createBlock as d, mergeProps as B, resolveDynamicComponent as V } from "vue";
-import { Row as N, Col as h, Checkbox as I } from "@aplus-frontend/antdv";
+import { defineComponent as v, computed as w, unref as r, createElementBlock as u, createCommentVNode as b, openBlock as o, createVNode as c, withCtx as l, Fragment as f, renderList as x, createBlock as d, mergeProps as B, resolveDynamicComponent as V } from "vue";
+import { Row as N, Col as m, Checkbox as I } from "@aplus-frontend/antdv";
 import { useInjectApTable as L } from "../../../context.mjs";
 import "../select-group/index.vue.mjs";
 import { getLabelNode as P } from "../utils.mjs";
@@ -9,41 +9,41 @@ const U = { key: 0 }, T = /* @__PURE__ */ v({
   props: {
     value: {}
   },
-  setup(s) {
-    const i = s, { columnsBackup: p, renderConfig: k } = L(), g = w(() => [...r(p) || []].sort((e, t) => e.children?.length && !t.children?.length ? 1 : !e.children?.length && t.children?.length ? -1 : 0));
-    function f(n) {
-      return i.value.find((e) => e.key === n.key);
+  setup(h) {
+    const s = h, { columnsBackup: p, renderConfig: k } = L(), g = w(() => [...r(p) || []].sort((e, t) => e.children?.length && !t.children?.length ? 1 : !e.children?.length && t.children?.length ? -1 : 0));
+    function i(n) {
+      return s.value.find((e) => e.key === n.key);
     }
     function C(n) {
-      const e = f(n);
+      const e = i(n);
       return {
         checked: e?.show,
         disabled: e?.disabled
       };
     }
     function _(n, e) {
-      const a = i.value?.find((y) => y.key === n);
+      const a = s.value?.find((y) => y.key === n);
       a && (a.show = e);
     }
-    return (n, e) => s.value?.length ? (o(), u("div", U, [
+    return (n, e) => n.value?.length ? (o(), u("div", U, [
       c(r(N), { gutter: [24, 12] }, {
         default: l(() => [
-          (o(!0), u(m, null, x(g.value, (t) => (o(), u(m, {
+          (o(!0), u(f, null, x(g.value, (t) => (o(), u(f, {
             key: t.key
           }, [
-            t.children?.length ? (o(), d(r(h), {
+            t.children?.length ? (o(), d(r(m), {
               key: 1,
               span: 24
             }, {
               default: l(() => [
                 c(S, {
-                  value: f(t)
+                  value: i(t)
                 }, null, 8, ["value"])
               ]),
               _: 2
-            }, 1024)) : (o(), d(r(h), {
+            }, 1024)) : (o(), d(r(m), {
               key: 0,
-              span: 8
+              span: 12
             }, {
               default: l(() => [
                 c(r(I), B({ ref_for: !0 }, C(t), {

package/es/src/ap-table/hooks/use-sorted-filtered.d.ts

@@ -1,12 +1,28 @@
 import { Recordable } from '../../type';
 import { ApColumnType } from '../interface';
 import { Ref } from 'vue';
-export declare const useTableSortedAndFiltered: () => {
+export type DefaultSortOrderType = {
+    colKey: string | number;
+    field: string;
+    order: 'descend' | 'ascend';
+    [key: string]: any;
+};
+export declare const useTableSortedAndFiltered: (defaultSorterInfo?: DefaultSortOrderType) => {
     getColumnSFConfig: (column: ApColumnType, append?: boolean) => Recordable;
     setSF: (filters: any, sorter: any) => void;
     clearSorter: () => void;
     clearFilters: () => void;
     clearAll: () => void;
-    sortedInfo: Ref<any, any>;
+    sortedInfo: Ref<{
+        [x: string]: any;
+        colKey: string | number;
+        field: string;
+        order: "descend" | "ascend";
+    } | null | undefined, DefaultSortOrderType | {
+        [x: string]: any;
+        colKey: string | number;
+        field: string;
+        order: "descend" | "ascend";
+    } | null | undefined>;
     filteredInfo: Ref<any, any>;
 };

package/es/src/ap-table/hooks/use-sorted-filtered.mjs

@@ -1,11 +1,13 @@
 import { ref as i, unref as s } from "vue";
-const S = () => {
-  const r = i(), t = i();
-  function c(e, n = !1) {
-    const v = s(t) || {}, u = s(r) || {}, l = n ? e : {};
-    return e.filters && (l.filteredValue = v[e.key] || null), e.sorter && (l.sortOrder = u.columnKey === e.key ? u.order : null), l;
+const p = (c) => {
+  const r = i(
+    c
+  ), t = i();
+  function a(e, n = !1) {
+    const F = s(t) || {}, u = s(r) || {}, l = n ? e : {};
+    return e.filters && (l.filteredValue = F[e.key] || null), e.sorter && (l.sortOrder = u.columnKey === e.key ? u.order : null), l;
   }
-  function a(e, n) {
+  function d(e, n) {
     t.value = e, r.value = n;
   }
   function o() {
@@ -14,19 +16,19 @@ const S = () => {
   function f() {
     t.value = null;
   }
-  function d() {
+  function v() {
     o(), f();
   }
   return {
-    getColumnSFConfig: c,
-    setSF: a,
+    getColumnSFConfig: a,
+    setSF: d,
     clearSorter: o,
     clearFilters: f,
-    clearAll: d,
+    clearAll: v,
     sortedInfo: r,
     filteredInfo: t
   };
 };
 export {
-  S as useTableSortedAndFiltered
+  p as useTableSortedAndFiltered
 };

package/es/src/ap-table/hooks/use-table-paging-ng.d.ts

@@ -3,6 +3,7 @@ import { Ref, ComputedRef } from 'vue';
 import { ApFormSearchFormExpose } from '../../ap-form';
 import { Recordable } from '../../type';
 import { ApTablePaginationConfig, RequestData } from '../interface';
+import { DefaultSortOrderType } from './use-sorted-filtered';
 import { TablePaginationConfig } from '@aplus-frontend/antdv';
 import { FilterValue, SorterResult, TableCurrentDataSource } from '@aplus-frontend/antdv/es/table/interface';
 import { ApColumnType } from '..';
@@ -63,6 +64,10 @@ export type UseTablePagingParams<DataType, ParamsType> = {
      * @returns
      */
     onAfterRequest?: (records: DataType[]) => void;
+    /**
+     * 默认排序规则（只允许单字段）
+     */
+    defaultSortOrder?: DefaultSortOrderType;
 };
 export type TablePagingRequestOptions = {
     /**
@@ -86,7 +91,7 @@ type InternalDataType<DataType = Recordable> = {
 export declare const DEFAULT_CURRENT = 1;
 export declare const DEFAULT_PAGE_SIZE = 20;
 export type OptionalOnTableChange<T extends (...args: any[]) => any> = (...args: Partial<Parameters<T>>) => ReturnType<T>;
-export declare const useTablePaging: <DataType = any, ParamsType = Record<string, any>>({ manual, request, params, defaultData, formatParams, paramsValueTypeMap, resetFieldsIgnores, filterFields, sortFields, namespace, pagination, onClickReset, onAfterRequest }: UseTablePagingParams<DataType, ParamsType>) => {
+export declare const useTablePaging: <DataType = any, ParamsType = Record<string, any>>({ manual, request, params, defaultData, formatParams, paramsValueTypeMap, resetFieldsIgnores, filterFields, sortFields, namespace, pagination, onClickReset, onAfterRequest, defaultSortOrder }: UseTablePagingParams<DataType, ParamsType>) => {
     formRef: Ref<ApFormSearchFormExpose | undefined, ApFormSearchFormExpose | undefined>;
     submit: () => void;
     reset: () => void;
@@ -114,7 +119,17 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
     dataSource: ComputedRef<DataType[]>;
     setDataSource: (dataSource?: DataType[]) => void;
     getColumnSFConfig: (column: ApColumnType, append?: boolean) => Recordable;
-    sortedInfo: Ref<any, any>;
+    sortedInfo: Ref<{
+        [x: string]: any;
+        colKey: string | number;
+        field: string;
+        order: "descend" | "ascend";
+    } | null | undefined, DefaultSortOrderType | {
+        [x: string]: any;
+        colKey: string | number;
+        field: string;
+        order: "descend" | "ascend";
+    } | null | undefined>;
     filteredInfo: Ref<any, any>;
     getPaging: () => {
         current?: number | undefined;