@aplus-frontend/ui 7.10.1 → 7.10.3

package/es/src/ag-grid/editable/index.vue.mjs

@@ -1,18 +1,18 @@
-import { defineComponent as G, useSlots as U, ref as y, watch as W, unref as n, createBlock as M, openBlock as $, withCtx as d, createVNode as w, mergeProps as q, createSlots as J, renderList as Q, renderSlot as X, normalizeProps as Y, guardReactiveProps as Z } from "vue";
-import { isEqual as ee, isArray as g, omit as oe } from "lodash-unified";
-import { ApForm as u } from "../../ap-form/index.mjs";
+import { defineComponent as $, useSlots as q, ref as b, watch as J, unref as n, createBlock as Q, openBlock as X, withCtx as c, createVNode as R, mergeProps as Y, createSlots as Z, renderList as ee, renderSlot as oe, normalizeProps as ae, guardReactiveProps as te } from "vue";
+import { isEqual as ne, isArray as v, omit as le } from "lodash-unified";
+import { ApForm as f } from "../../ap-form/index.mjs";
 import "../../config-provider/index.mjs";
 import "../../hooks/index.mjs";
-import { useEditableApi as ae } from "../hooks/use-editable-api.mjs";
-import { useGetEditableColumns as te } from "../hooks/use-editable-columns.mjs";
+import { useEditableApi as re } from "../hooks/use-editable-api.mjs";
+import { useGetEditableColumns as se } from "../hooks/use-editable-columns.mjs";
 import "../index.vue2.mjs";
-import ne from "../style/editable.mjs";
-import { arrayToObject as p } from "./utils.mjs";
-import { useNamespace as le } from "../../config-provider/hooks/use-namespace.mjs";
-import { useControllableValue as re } from "../../hooks/useControllableValue.mjs";
-import { useGlobalConfig as se } from "../../config-provider/hooks/use-global-config.mjs";
-import ie from "../index.vue.mjs";
-const xe = /* @__PURE__ */ G({
+import ie from "../style/editable.mjs";
+import { arrayToObject as y, getRowKey as de } from "./utils.mjs";
+import { useNamespace as ue } from "../../config-provider/hooks/use-namespace.mjs";
+import { useControllableValue as pe } from "../../hooks/useControllableValue.mjs";
+import { useGlobalConfig as me } from "../../config-provider/hooks/use-global-config.mjs";
+import ce from "../index.vue.mjs";
+const Fe = /* @__PURE__ */ $({
   name: "EditableGrid",
   __name: "index",
   props: {
@@ -131,107 +131,113 @@ const xe = /* @__PURE__ */ G({
     onFieldChange: {}
   },
   emits: ["update:value"],
-  setup(h, {
-    expose: b,
-    emit: v
+  setup(C, {
+    expose: x,
+    emit: B
   }) {
-    const C = U(), o = h, {
-      b: R
-    } = le("editable-aggrid"), x = ne("editable-aggrid"), B = v, s = y(), {
+    const S = q(), o = C, {
+      b: T
+    } = ue("editable-aggrid"), _ = ie("editable-aggrid"), F = B, d = b(), {
       value: r,
-      updateValue: m
-    } = re(o, B), l = y(), S = u.useWatch(o.name, l);
-    W(r, (e) => {
-      const a = p(e, o.rowKey);
-      ee(a, n(S)) || l.value?.setFieldValue(o.name, a);
+      updateValue: w
+    } = pe(o, F), l = b(), E = f.useWatch(o.name, l);
+    J(r, (e) => {
+      const a = y(e, o.rowKey);
+      ne(a, n(E)) || l.value?.setFieldValue(o.name, a);
     }, {
       deep: !0
     });
-    const T = se("valueTypeMap"), _ = te(o, T), {
-      add: F,
-      addMultiple: E,
-      remove: N,
-      removeByKey: A,
-      getRowData: V,
-      getRowsData: j,
-      setRowData: k,
-      clear: D,
-      refreshRowIds: i
-    } = ae(o, l, r, m);
-    function K() {
-      const e = s.value?._internalGridApi;
-      if (!i.value?.length || !e)
+    const K = me("valueTypeMap"), k = se(o, K), {
+      add: N,
+      addMultiple: j,
+      remove: A,
+      removeByKey: D,
+      getRowData: I,
+      getRowsData: V,
+      setRowData: H,
+      clear: O,
+      refreshRowIds: p
+    } = re(o, l, r, w);
+    function z() {
+      const e = d.value?._internalGridApi;
+      if (!p.value?.length || !e)
         return;
-      const a = i.value.map((t) => e.getRowNode(t)).filter((t) => !!t);
+      const a = p.value.map((t) => e.getRowNode(t)).filter((t) => !!t);
       e.refreshCells({
         rowNodes: a,
         force: !0
-      }), i.value = [];
+      }), p.value = [];
     }
-    function H() {
+    function L() {
       l.value?.resetFields();
     }
-    function I(e) {
-      return e ? (g(e) ? e : [e]).map((t) => g(t) ? [o.name, ...t] : [o.name, t]) : void 0;
+    function P(e) {
+      return e ? (v(e) ? e : [e]).map((t) => v(t) ? [o.name, ...t] : [o.name, t]) : void 0;
     }
-    async function z(e, a) {
-      return (await l.value?.validateFields(I(e), a))?.[o.name];
+    async function G(e, a) {
+      const s = (await l.value?.validateFields(P(e), a))?.[o.name];
+      try {
+        const u = Object.keys(s), h = r.value.map((i) => de(i, void 0, o.rowKey));
+        return u.sort((i, M) => h.findIndex((m) => String(m) === i) - h.findIndex((m) => String(m) === M)), u.map((i) => s[i]);
+      } catch {
+        return s;
+      }
     }
-    function L(e) {
-      m(e);
-      const a = p(e, o.rowKey);
+    function U(e) {
+      w(e);
+      const a = y(e, o.rowKey);
       l.value?.setFieldValue(o.name, a);
     }
-    function c(e, a) {
+    function g(e, a) {
       const t = e === "end" ? r.value.length - 1 : e;
-      s.value?.scrollToRow(t, a);
+      d.value?.scrollToRow(t, a);
     }
-    function O(e, a) {
-      s.value?.scrollToColumn(e, a);
+    function W(e, a) {
+      d.value?.scrollToColumn(e, a);
     }
-    return b({
-      resetFields: H,
-      validateFields: z,
-      add: F,
-      addMultiple: E,
-      remove: N,
-      removeByKey: A,
-      getRowData: V,
-      getRowsData: j,
-      setRowData: k,
-      clear: D,
-      setTableData: L,
-      scrollTo: c,
-      scrollToRow: c,
-      scrollToColumn: O
-    }), (e, a) => ($(), M(n(u), {
+    return x({
+      resetFields: L,
+      validateFields: G,
+      add: N,
+      addMultiple: j,
+      remove: A,
+      removeByKey: D,
+      getRowData: I,
+      getRowsData: V,
+      setRowData: H,
+      clear: O,
+      setTableData: U,
+      scrollTo: g,
+      scrollToRow: g,
+      scrollToColumn: W
+    }), (e, a) => (X(), Q(n(f), {
       ref_key: "formRef",
       ref: l,
       "initial-values": {
-        [o.name]: n(p)(n(r), o.rowKey)
+        [o.name]: n(y)(n(r), o.rowKey)
       },
       style: {
         height: "100%"
       }
     }, {
-      default: d(() => [w(n(u).FormItem, {
+      default: c(() => [R(n(f).FormItem, {
         name: e.name,
         "no-style": ""
       }, {
-        default: d(() => [w(ie, q(n(oe)(o, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue"]), {
+        default: c(() => [R(ce, Y(n(le)(o, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue"]), {
           ref_key: "tableRef",
-          ref: s,
-          class: [n(R)(), n(x)],
+          ref: d,
+          class: [n(T)(), n(_)],
           size: "mini",
-          columns: n(_),
+          columns: n(k),
           "data-source": n(r),
           "search-form": !1,
-          onUpdate: K
-        }), J({
+          onUpdate: z
+        }), Z({
           _: 2
-        }, [Q(C, (t, f) => ({
-          name: f,
-          fn: d((P) => [X(e.$slots, f, Y(Z(P || {})))])
+        }, [ee(S, (t, s) => ({
+          name: s,
+          fn: c((u) => [oe(e.$slots, s, ae(te(u || {})))])
         }))]), 1040, ["class", "columns", "data-source"])]),
         _: 3
       }, 8, ["name"])]),
@@ -240,5 +246,5 @@ const xe = /* @__PURE__ */ G({
   }
 });
 export {
-  xe as default
+  Fe as default
 };

package/es/src/ap-action/item-dropdown/index.vue.mjs

@@ -1,17 +1,17 @@
-import { defineComponent as w, ref as B, computed as A, createBlock as n, openBlock as t, unref as o, normalizeClass as s, withCtx as l, createElementVNode as c, createVNode as d, normalizeProps as b, guardReactiveProps as C, renderSlot as I, resolveDynamicComponent as h, createCommentVNode as D, createElementBlock as P, Fragment as N, renderList as $, mergeProps as p } from "vue";
-import { Dropdown as L, Menu as V, MenuItem as x } from "@aplus-frontend/antdv";
-import { IconApAdLineDown as z } from "@aplus-frontend/icon";
-import { isUndefined as E, omit as F } from "lodash-unified";
+import { defineComponent as C, ref as w, computed as A, createBlock as r, openBlock as t, unref as o, normalizeClass as s, withCtx as a, createElementVNode as u, createVNode as d, normalizeProps as B, guardReactiveProps as b, renderSlot as I, resolveDynamicComponent as D, createCommentVNode as P, createElementBlock as N, Fragment as $, renderList as L, mergeProps as m } from "vue";
+import { Dropdown as V, Menu as z, MenuItem as E } from "@aplus-frontend/antdv";
+import { IconApAdLineDown as F } from "@aplus-frontend/icon";
+import { isUndefined as M, omit as S } from "lodash-unified";
 import "../../config-provider/index.mjs";
 import "../item/index.vue.mjs";
 import "../item-modal/index.vue2.mjs";
 import "../item-popconfirm/index.vue2.mjs";
-import M from "../style/dropdown-item.mjs";
-import { useNamespace as S } from "../../config-provider/hooks/use-namespace.mjs";
-import y from "../item/index.vue2.mjs";
-import U from "../item-modal/index.vue.mjs";
-import R from "../item-popconfirm/index.vue.mjs";
-const ee = /* @__PURE__ */ w({
+import x from "../style/dropdown-item.mjs";
+import { useNamespace as O } from "../../config-provider/hooks/use-namespace.mjs";
+import g from "../item/index.vue2.mjs";
+import R from "../item-modal/index.vue.mjs";
+import U from "../item-popconfirm/index.vue.mjs";
+const oe = /* @__PURE__ */ C({
   name: "ApActionItemDropDown",
   __name: "index",
   props: {
@@ -29,42 +29,47 @@ const ee = /* @__PURE__ */ w({
     iconFirst: { type: Boolean },
     tooltip: {}
   },
-  setup(g) {
-    const m = g, i = B(!1), { e: f, b: _ } = S("action-item-dropdown"), u = M("action-item-dropdown"), v = A(() => m.actions.filter((e) => e.visible || E(e.visible)).map((e) => ({
+  setup(y) {
+    const p = y, i = w(!1), { e: c, b: _ } = O("action-item-dropdown"), f = x("action-item-dropdown"), v = (e, n) => {
+      (n.source === "trigger" || e) && (i.value = e);
+    }, k = A(() => p.actions.filter((e) => e.visible || M(e.visible)).map((e) => ({
       ...e,
-      onAction: async (a) => {
+      onClick: (n) => {
+        e.onClick?.(n), !e.onAction && (i.value = !1);
+      },
+      onAction: e.onAction ? async (n) => {
         try {
-          await e.onAction?.(a);
+          await e.onAction?.(n);
         } finally {
           i.value = !1;
         }
-      }
+      } : void 0
     })));
-    return (e, a) => (t(), n(o(L), {
+    return (e, n) => (t(), r(o(V), {
       open: i.value,
-      "onUpdate:open": a[0] || (a[0] = (r) => i.value = r),
       trigger: e.trigger,
       placement: e.placement,
-      class: s(o(u))
+      class: s(o(f)),
+      onOpenChange: v
     }, {
-      overlay: l(() => [
-        d(o(V), null, {
-          default: l(() => [
-            (t(!0), P(N, null, $(v.value, (r, k) => (t(), n(o(x), {
-              key: k,
-              class: s([o(u), o(f)("item")])
+      overlay: a(() => [
+        d(o(z), null, {
+          default: a(() => [
+            (t(!0), N($, null, L(k.value, (l, h) => (t(), r(o(E), {
+              key: h,
+              class: s([o(f), o(c)("item")])
             }, {
-              default: l(() => [
-                r.modalProps ? (t(), n(U, p({
+              default: a(() => [
+                l.modalProps ? (t(), r(R, m({
                   key: 0,
                   ref_for: !0
-                }, r), null, 16)) : r.popconfirmProps ? (t(), n(R, p({
+                }, l), null, 16)) : l.popconfirmProps ? (t(), r(U, m({
                   key: 1,
                   ref_for: !0
-                }, r), null, 16)) : (t(), n(y, p({
+                }, l), null, 16)) : (t(), r(g, m({
                   key: 2,
                   ref_for: !0
-                }, r), null, 16))
+                }, l), null, 16))
               ]),
               _: 2
             }, 1032, ["class"]))), 128))
@@ -72,19 +77,19 @@ const ee = /* @__PURE__ */ w({
           _: 1
         })
       ]),
-      default: l(() => [
-        c("span", {
+      default: a(() => [
+        u("span", {
           class: s(o(_)())
         }, [
-          d(y, b(C(o(F)(m, ["actions", "trigger", "placement", "text"]))), {
-            default: l(() => [
+          d(g, B(b(o(S)(p, ["actions", "trigger", "placement", "text"]))), {
+            default: a(() => [
               I(e.$slots, "default", {}, () => [
-                (t(), n(h(() => e.text)))
+                (t(), r(D(() => e.text)))
               ]),
-              c("span", {
-                class: s(o(f)("icon"))
+              u("span", {
+                class: s(o(c)("icon"))
               }, [
-                e.showIcon ? (t(), n(o(z), { key: 0 })) : D("", !0)
+                e.showIcon ? (t(), r(o(F), { key: 0 })) : P("", !0)
               ], 2)
             ]),
             _: 3
@@ -96,5 +101,5 @@ const ee = /* @__PURE__ */ w({
   }
 });
 export {
-  ee as default
+  oe as default
 };

package/es/src/ap-action/style/dropdown-item.mjs

@@ -1,27 +1,33 @@
-import { genComponentStyleHook as i } from "../../utils/cssinjs/index.mjs";
-const l = (e) => {
-  const { componentCls: n, namespace: t } = e, o = `.${t}-action-item`;
+import { genComponentStyleHook as t } from "../../utils/cssinjs/index.mjs";
+const l = (n) => {
+  const { componentCls: e, namespace: o } = n, i = `.${o}-action-item`;
   return {
-    [n]: {
+    [e]: {
       display: "inline-flex",
       flexDirection: "row",
       alignItems: "center",
       // dropdown menu item
       "&__item": {
-        [o]: {
-          width: "100%"
+        padding: "0px !important",
+        [i]: {
+          width: "100%",
+          paddingInline: "12px",
+          paddingBlock: "6px"
+        },
+        [`${i}--loading`]: {
+          marginInlineEnd: n.calc(n.spaceXS).mul(-3).equal()
         }
       },
-      [`${n}__icon`]: {
-        fontSize: e.fontSize,
+      [`${e}__icon`]: {
+        fontSize: n.fontSize,
         display: "inline-flex"
       }
     }
   };
-}, s = i("ApAction.Dropdown", (e) => [
-  l(e)
+}, p = t("ApAction.Dropdown", (n) => [
+  l(n)
 ]);
 export {
-  s as default,
+  p as default,
   l as genActionDropdownItemStyle
 };

package/es/src/ap-action/style/index.mjs

@@ -2,11 +2,11 @@ import { resetComponent as t } from "../../style/index.mjs";
 import { genComponentStyleHook as s } from "../../utils/cssinjs/index.mjs";
 const d = (o) => {
   const {
-    loadingOpacity: n,
-    colorLink: r,
+    loadingOpacity: r,
+    colorLink: n,
     colorSuccess: a,
-    colorError: l,
-    colorWarn: c,
+    colorError: c,
+    colorWarn: l,
     componentCls: i
   } = o;
   return {
@@ -23,7 +23,7 @@ const d = (o) => {
         opacity: 0.7
       },
       "&--primary": {
-        color: r,
+        color: n,
         [`&${i}--disabled`]: {
           color: o.colorLinkDisabled
         }
@@ -35,19 +35,19 @@ const d = (o) => {
         }
       },
       "&--error": {
-        color: l,
+        color: c,
         [`&${i}--disabled`]: {
           color: o.colorErrorDisabled
         }
       },
       "&--warn": {
-        color: c,
+        color: l,
         [`&${i}--disabled`]: {
           color: o.colorWarnDisabled
         }
       },
       "&--loading": {
-        opacity: n,
+        opacity: r,
         transition: `opacity ${o.motionDurationMid}`,
         cursor: "default",
         [`&${i}--disabled`]: {
@@ -65,7 +65,6 @@ const d = (o) => {
       },
       [`${i}-loading-icon`]: {
         display: "inline-block",
-        lineHeight: 0,
         transition: ["width", "opacity", "margin"].map(
           (e) => `${e} ${o.motionDurationSlow} ${o.apActionLoadingIconEase}`
         ).join(",")

package/es/src/ap-form/style/item.mjs

@@ -1,6 +1,6 @@
-import { genComponentStyleHook as r } from "../../utils/cssinjs/index.mjs";
-const o = (n) => {
-  const { componentCls: e, namespace: a } = n, i = `${e}--disabled`, t = n.calc(n.controlHeight).sub(n.calc(n.lineWidth).mul(2)).equal();
+import { genComponentStyleHook as o } from "../../utils/cssinjs/index.mjs";
+const l = (n) => {
+  const { componentCls: e, namespace: t, antdv: i } = n, r = `${e}--disabled`, a = n.calc(n.controlHeight).sub(n.calc(n.lineWidth).mul(2)).equal();
   return {
     [e]: {
       // bordered
@@ -12,7 +12,7 @@ const o = (n) => {
         ".ant-input-affix-wrapper": {
           padding: 0
         },
-        [`&:has(.${a}-batch-input-group):has(.ant-select)`]: {
+        [`&:has(.${t}-batch-input-group):has(.ant-select)`]: {
           ".ant-input-affix-wrapper": {
             paddingInlineEnd: n.space
           }
@@ -23,7 +23,7 @@ const o = (n) => {
             paddingInlineStart: 0
           }
         },
-        [`&:has(div.${a}-batch-input-group .ant-input)`]: {
+        [`&:has(div.${t}-batch-input-group .ant-input)`]: {
           paddingInlineEnd: n.space,
           ".ant-input": {
             paddingInlineStart: 0
@@ -52,7 +52,7 @@ const o = (n) => {
           background: "unset !important"
         },
         ".ant-select-single .ant-select-selector": {
-          height: `${t} !important`
+          height: `${a} !important`
         },
         "input.ant-input-number-input": {
           paddingInlineStart: 0
@@ -72,25 +72,25 @@ const o = (n) => {
         },
         ".ant-form-item-label > label": {
           paddingRight: n.spaceLG,
-          height: t,
+          height: a,
           "&::after": {
             margin: 0
           }
         },
         ".ant-form-item-control-input": {
-          minHeight: t,
+          minHeight: a,
           ".ant-select-single": {
             height: "unset"
           }
         },
-        [`&:hover:not(${i})`]: {
+        [`&:hover:not(${r})`]: {
           borderColor: n.hoverColorBase
         },
         "&:focus": {
           borderColor: n.activeColorBase,
-          boxShadow: "0 0 0 2px rgba(5, 155, 255, 0.1)"
+          boxShadow: `0 0 0 2px ${n.calc(i.controlOutline).colorMix(10)}`
         },
-        [`.${a}-batch-input-group-popover-input__popover`]: {
+        [`.${t}-batch-input-group-popover-input__popover`]: {
           width: "calc(100% + 12px)"
         }
       },
@@ -105,7 +105,7 @@ const o = (n) => {
       // focus
       "&--focused": {
         borderColor: n.activeColorBase,
-        boxShadow: "0 0 0 2px rgba(5, 155, 255, 0.1)"
+        boxShadow: `0 0 0 2px ${n.calc(i.controlOutline).colorMix(10)}`
       },
       // other
       ".ant-form-show-help": {
@@ -132,8 +132,8 @@ const o = (n) => {
       }
     }
   };
-}, p = r("ApForm", (n) => [o(n)]);
+}, d = o("ApForm", (n) => [l(n)]);
 export {
-  p as default,
-  o as genApFormItemStyle
+  d as default,
+  l as genApFormItemStyle
 };

package/es/src/config-provider/config-provider-props.d.ts

@@ -166,6 +166,18 @@ export declare const configProviderProps: () => {
     apTitle: {
         type: PropType<ApTitleConfig>;
     };
+    searchForm: {
+        type: PropType<SearchFormGlobalConfig>;
+        default: () => {};
+    };
+    apUpload: {
+        type: PropType<ApUploadConfig>;
+        default: () => {};
+    };
+    apDescriptions: {
+        type: PropType<ApDescriptionsConfig>;
+        default: () => {};
+    };
     /**
      * @description aplus-ui的locale
      */
@@ -191,14 +203,6 @@ export declare const configProviderProps: () => {
     uiMode: {
         type: PropType<UiModeType>;
     };
-    apUpload: {
-        type: PropType<ApUploadConfig>;
-        default: () => {};
-    };
-    apDescriptions: {
-        type: PropType<ApDescriptionsConfig>;
-        default: () => {};
-    };
     valueTypeMap: {
         type: PropType<Record<string, ValueTypeRenderConfig>>;
         default: () => {};
@@ -218,10 +222,6 @@ export declare const configProviderProps: () => {
         type: PropType<ViewCacheOption>;
         default: () => {};
     };
-    searchForm: {
-        type: PropType<SearchFormGlobalConfig>;
-        default: () => {};
-    };
 };
 export type ConfigProviderProps = Partial<ExtractPropTypes<ReturnType<typeof configProviderProps>>>;
 export {};

package/es/src/config-provider/config-provider-props.mjs

@@ -14,6 +14,18 @@ const t = () => ({
   },
   apTitle: {
     type: Object
+  },
+  searchForm: {
+    type: Object,
+    default: () => ({})
+  },
+  apUpload: {
+    type: Object,
+    default: () => ({})
+  },
+  apDescriptions: {
+    type: Object,
+    default: () => ({})
   }
 }), o = () => ({
   /**
@@ -41,14 +53,6 @@ const t = () => ({
   uiMode: {
     type: String
   },
-  apUpload: {
-    type: Object,
-    default: () => ({})
-  },
-  apDescriptions: {
-    type: Object,
-    default: () => ({})
-  },
   valueTypeMap: {
     type: Object,
     default: () => ({})
@@ -68,10 +72,6 @@ const t = () => ({
     type: Object,
     default: () => ({})
   },
-  searchForm: {
-    type: Object,
-    default: () => ({})
-  },
   ...t(),
   ...e()
 });