@aplus-frontend/ui 7.15.7 → 7.16.0

package/es/src/ag-grid/interface.d.ts

@@ -1,6 +1,6 @@
 import { TableProps } from '@aplus-frontend/antdv';
 import { SortOrder, TableRowSelection } from '@aplus-frontend/antdv/es/table/interface';
-import { ColDef, GridApi, ICellRendererParams, IRowNode, IsFullWidthRowParams, RedrawRowsParams, RefreshCellsParams, RowClassRules, RowHeightParams, RowPinnedType, ScrollDirection, ThemeDefaultParams } from 'ag-grid-community';
+import { AgColumn, ColDef, GridApi, ICellRendererParams, IRowNode, IsFullWidthRowParams, RedrawRowsParams, RefreshCellsParams, RowClassRules, RowHeightParams, RowPinnedType, ScrollDirection, ThemeDefaultParams } from 'ag-grid-community';
 import { ComputedRef, CSSProperties, VNode } from 'vue';
 import { ApFormSearchFormPopoverSorterItem, ApFormSearchFormProps } from '../ap-form/interface';
 import { InternalPagingType } from '../ap-table/hooks/use-table-paging-ng';
@@ -89,6 +89,10 @@ export type AgGridColumnType<RecordType = any, ExtraValueType = 'text', ValueTyp
     width?: number;
     minWidth?: number;
     maxWidth?: number;
+    /**
+     * @since 7.16.0
+     */
+    flex?: number;
     colSpan?: ColDef<RecordType>['colSpan'];
     spanRows?: ColDef<RecordType>['spanRows'];
     /**
@@ -122,6 +126,17 @@ export type AgGridColumnType<RecordType = any, ExtraValueType = 'text', ValueTyp
      * @private 仅限内部使用，请勿传递
      */
     _path?: (string | number)[];
+    /**
+     * 作为子列时的显示策略
+     * open: 仅展开时显示
+     * closed: 仅关闭时显示
+     * null,undefined: 总是显示
+     */
+    columnGroupShow?: 'open' | 'closed';
+    /**
+     * 是否锁定固定（设置后不可以通过表格设置修改其固定属性）
+     */
+    lockFixed?: boolean;
 } : null;
 export type AgGridRowSelection<RecordType> = Pick<TableRowSelection<RecordType>, 'type' | 'fixed' | 'columnWidth' | 'defaultSelectedRowKeys'> & {
     /**
@@ -500,4 +515,8 @@ export type AgGridSlots<RecordType> = {
         shownColumns: AgGridColumnType<RecordType>[];
         clearAll: () => void;
     }) => any;
+    headerCell?: (props: {
+        title: any;
+        column: Omit<AgColumn, keyof AgGridColumnType> & AgGridColumnType;
+    }) => void;
 };

package/es/src/ag-grid/style/custom-header.mjs

@@ -1,8 +1,8 @@
 import { genComponentStyleHook as o } from "../../utils/cssinjs/index.mjs";
-const t = (e) => {
-  const { componentCls: r } = e;
+const n = (r) => {
+  const { componentCls: e } = r;
   return {
-    [r]: {
+    [e]: {
       display: "flex",
       flexDirection: "row",
       flexWrap: "nowrap",
@@ -17,31 +17,40 @@ const t = (e) => {
       "&.align-right": {
         justifyContent: "end"
       },
-      [`${r}__sort-wrapper`]: {
+      [`${e}__sort-wrapper`]: {
         display: "inline-flex",
         flexDirection: "column",
         alignItems: "center",
         color: "rgba(0, 0, 0, 0.3)",
-        marginInlineStart: e.spaceXS,
+        marginInlineStart: r.spaceXS,
         "&:hover": {
           color: "rgba(0, 0, 0, 0.6)"
         }
       },
-      [`${r}__sorter-up.active`]: {
-        color: e.colorPrimary
+      [`${e}__expand-wrapper`]: {
+        padding: r.spaceXS,
+        cursor: "pointer",
+        display: "flex",
+        borderRadius: r.borderRadiusXS,
+        "&:hover": {
+          background: r.colorBg1
+        }
+      },
+      [`${e}__sorter-up.active`]: {
+        color: r.colorPrimary
       },
-      [`${r}__sorter-down`]: {
+      [`${e}__sorter-down`]: {
         marginTop: "-0.3em",
         "&.active": {
-          color: e.colorPrimary
+          color: r.colorPrimary
         }
       }
     }
   };
-}, l = o("AgGrid.CustomHeader", (e) => [
-  t(e)
+}, a = o("AgGrid.CustomHeader", (r) => [
+  n(r)
 ]);
 export {
-  l as default,
-  t as genAgGridCustomHeaderCellStyle
+  a as default,
+  n as genAgGridCustomHeaderCellStyle
 };

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

@@ -1,14 +1,15 @@
-import { defineComponent as B, createElementBlock as v, openBlock as n, normalizeClass as t, unref as e, createElementVNode as p, createVNode as s, createCommentVNode as c, createBlock as r, resolveDynamicComponent as E, withCtx as u } from "vue";
-import { HolderOutlined as I, VerticalAlignTopOutlined as g, VerticalAlignMiddleOutlined as O, DeleteOutlined as D } from "@ant-design/icons-vue";
-import { Space as z, Tooltip as f } from "@aplus-frontend/antdv";
+import { defineComponent as E, computed as O, createElementBlock as k, openBlock as s, normalizeClass as a, unref as e, createElementVNode as f, createVNode as r, createCommentVNode as u, createBlock as d, resolveDynamicComponent as A, withCtx as p } from "vue";
+import { HolderOutlined as D, VerticalAlignTopOutlined as b, VerticalAlignMiddleOutlined as j, DeleteOutlined as z } from "@ant-design/icons-vue";
+import { Space as M, Tooltip as m } from "@aplus-frontend/antdv";
+import { useInjectApTable as S } from "../../../context.mjs";
 import "../../../../config-provider/index.mjs";
-import A from "../images/icon_carst_down.svg.mjs";
-import M from "../images/icon_fill_right.svg.mjs";
-import { useInjectSorterMethods as S } from "../sorter/context.mjs";
-import { getLabelRenderNode as U } from "../utils.mjs";
-import { useNamespace as j } from "../../../../config-provider/hooks/use-namespace.mjs";
-import { useLocale as H } from "../../../../config-provider/hooks/use-locale.mjs";
-const q = ["src"], ee = /* @__PURE__ */ B({
+import U from "../images/icon_carst_down.svg.mjs";
+import H from "../images/icon_fill_right.svg.mjs";
+import { useInjectSorterMethods as q } from "../sorter/context.mjs";
+import { getLabelRenderNode as G } from "../utils.mjs";
+import { useNamespace as J } from "../../../../config-provider/hooks/use-namespace.mjs";
+import { useLocale as K } from "../../../../config-provider/hooks/use-locale.mjs";
+const P = ["src"], ne = /* @__PURE__ */ E({
   __name: "item",
   props: {
     value: {},
@@ -17,107 +18,127 @@ const q = ["src"], ee = /* @__PURE__ */ B({
     open: { type: Boolean }
   },
   emits: ["update:open", "update:value"],
-  setup(k, { emit: b }) {
-    const o = k, x = b, { b: a, be: m, is: C } = j("ap-column-setting-sortable-item-meta"), { fixedToLeft: T, fixedToRight: w, unFixed: V } = S(), { t: d } = H();
+  setup(g, { emit: x }) {
+    const o = g, T = x, { b: t, be: v, is: y } = J("ap-column-setting-sortable-item-meta"), { fixedToLeft: C, fixedToRight: w, unFixed: F } = q(), { columnsBackup: V } = S(), { t: c } = K(), n = O(() => {
+      const l = V?.value.find(
+        (i) => o.value.key === i.key
+      );
+      return l ? l.lockFixed ?? !1 : !1;
+    });
     function h(l) {
       const i = o.value;
       return i.fixed = l, i.children?.forEach((N) => N.fixed = l), i;
     }
-    function y() {
+    function _() {
+      if (n.value)
+        return;
       const l = h("left");
-      T(l);
+      C(l);
     }
-    function _() {
+    function L() {
+      if (n.value)
+        return;
       const l = h("right");
       w(l);
     }
     function R() {
+      if (n.value)
+        return;
       const l = h(void 0);
-      V(l);
+      F(l);
     }
-    function F() {
-      x("update:open", !o.open);
+    function B() {
+      T("update:open", !o.open);
     }
-    function L() {
+    function I() {
       const l = o.value;
       l.show = !1, l.children?.forEach((i) => i.show = !1);
     }
-    return (l, i) => (n(), v("div", {
-      class: t(e(a)())
+    return (l, i) => (s(), k("div", {
+      class: a(e(t)())
     }, [
-      p("span", {
-        class: t(e(a)("left"))
+      f("span", {
+        class: a(e(t)("left"))
       }, [
-        s(e(I), {
-          class: t(e(m)("left", "holder")),
+        r(e(D), {
+          class: a(e(v)("left", "holder")),
           style: { "font-size": "16px", color: "#abb7cc" }
         }, null, 8, ["class"]),
-        p("span", {
-          class: t(e(m)("left", "indicator")),
-          onClick: F
+        f("span", {
+          class: a(e(v)("left", "indicator")),
+          onClick: B
         }, [
-          l.value.children?.length ? (n(), v("img", {
+          l.value.children?.length ? (s(), k("img", {
             key: 0,
-            src: o.open ? e(M) : e(A)
-          }, null, 8, q)) : c("", !0)
+            src: o.open ? e(H) : e(U)
+          }, null, 8, P)) : u("", !0)
         ], 2),
-        p("span", {
-          class: t([e(m)("left", "label-wrapper"), e(C)("level2", o.level === 2)])
+        f("span", {
+          class: a([e(v)("left", "label-wrapper"), e(y)("level2", o.level === 2)])
         }, [
-          (n(), r(E(e(U)(l.value.label))))
+          (s(), d(A(e(G)(l.value.label))))
         ], 2)
       ], 2),
-      p("span", {
-        class: t(e(a)("right"))
+      f("span", {
+        class: a(e(t)("right"))
       }, [
-        s(e(z), null, {
-          default: u(() => [
-            o.level !== 2 && l.value.fixed !== "left" ? (n(), r(e(f), {
+        r(e(M), null, {
+          default: p(() => [
+            o.level !== 2 && l.value.fixed !== "left" ? (s(), d(e(m), {
               key: 0,
-              title: e(d)("ap.apTable.setting.fixToLeft")
+              title: n.value ? e(c)("ap.apTable.setting.lockFixed") : e(c)("ap.apTable.setting.fixToLeft")
             }, {
-              default: u(() => [
-                s(e(g), {
+              default: p(() => [
+                r(e(b), {
                   rotate: 270,
-                  class: t(e(a)("action-icon")),
-                  onClick: y
+                  class: a([
+                    e(t)("action-icon"),
+                    { [e(t)("action-icon-disabled")]: n.value }
+                  ]),
+                  onClick: _
                 }, null, 8, ["class"])
               ]),
               _: 1
-            }, 8, ["title"])) : c("", !0),
-            o.level !== 2 && l.value.fixed ? (n(), r(e(f), {
+            }, 8, ["title"])) : u("", !0),
+            o.level !== 2 && l.value.fixed ? (s(), d(e(m), {
               key: 1,
-              title: e(d)("ap.apTable.setting.unFixed")
+              title: n.value ? e(c)("ap.apTable.setting.lockFixed") : e(c)("ap.apTable.setting.unFixed")
             }, {
-              default: u(() => [
-                s(e(O), {
-                  class: t(e(a)("action-icon")),
+              default: p(() => [
+                r(e(j), {
+                  class: a([
+                    e(t)("action-icon"),
+                    { [e(t)("action-icon-disabled")]: n.value }
+                  ]),
                   onClick: R
                 }, null, 8, ["class"])
               ]),
               _: 1
-            }, 8, ["title"])) : c("", !0),
-            o.level !== 2 && l.value.fixed !== "right" ? (n(), r(e(f), {
+            }, 8, ["title"])) : u("", !0),
+            o.level !== 2 && l.value.fixed !== "right" ? (s(), d(e(m), {
               key: 2,
-              title: e(d)("ap.apTable.setting.fixToRight")
+              title: n.value ? e(c)("ap.apTable.setting.lockFixed") : e(c)("ap.apTable.setting.fixToRight")
             }, {
-              default: u(() => [
-                s(e(g), {
+              default: p(() => [
+                r(e(b), {
                   rotate: 90,
-                  class: t(e(a)("action-icon")),
-                  onClick: _
+                  class: a([
+                    e(t)("action-icon"),
+                    { [e(t)("action-icon-disabled")]: n.value }
+                  ]),
+                  onClick: L
                 }, null, 8, ["class"])
               ]),
               _: 1
-            }, 8, ["title"])) : c("", !0),
-            l.value.disabled ? c("", !0) : (n(), r(e(f), {
+            }, 8, ["title"])) : u("", !0),
+            l.value.disabled ? u("", !0) : (s(), d(e(m), {
               key: 3,
-              title: e(d)("ap.apTable.setting.delete")
+              title: e(c)("ap.apTable.setting.delete")
             }, {
-              default: u(() => [
-                s(e(D), {
-                  class: t(e(a)("action-icon")),
-                  onClick: L
+              default: p(() => [
+                r(e(z), {
+                  class: a(e(t)("action-icon")),
+                  onClick: I
                 }, null, 8, ["class"])
               ]),
               _: 1
@@ -130,5 +151,5 @@ const q = ["src"], ee = /* @__PURE__ */ B({
   }
 });
 export {
-  ee as default
+  ne as default
 };

package/es/src/ap-table/style/setting.mjs

@@ -1,7 +1,7 @@
-import { singleRow as a, resetComponent as r } from "../../style/index.mjs";
-import { genComponentStyleHook as t } from "../../utils/cssinjs/index.mjs";
-import { defaultValue as n } from "./index.mjs";
-const o = (e) => {
+import { singleRow as a, resetComponent as t } from "../../style/index.mjs";
+import { genComponentStyleHook as n } from "../../utils/cssinjs/index.mjs";
+import { defaultValue as o } from "./index.mjs";
+const p = (e) => {
   const { componentCls: l, namespace: i } = e;
   return {
     [l]: {
@@ -90,7 +90,7 @@ const o = (e) => {
       }
     }
   };
-}, p = (e) => {
+}, c = (e) => {
   const { componentCls: l } = e;
   return {
     [l]: {
@@ -107,8 +107,8 @@ const o = (e) => {
       }
     }
   };
-}, c = (e) => {
-  const { componentCls: l } = e, i = `${l}-sortable-item-meta`;
+}, d = (e) => {
+  const { componentCls: l } = e, i = `${l}-sortable-item-meta`, r = `${i}-action-icon`;
   return {
     [l]: {
       [i]: {
@@ -158,15 +158,18 @@ const o = (e) => {
         ".is-level2": {
           marginInlineStart: e.spaceXL
         },
-        "&-action-item": {
-          "&:hover": {
+        [r]: {
+          [`&:not(${r}-disabled):hover`]: {
             color: e.colorPrimary
           }
+        },
+        [`${r}-disabled`]: {
+          color: e.antdv.colorTextDisabled
         }
       }
     }
   };
-}, d = (e) => {
+}, s = (e) => {
   const { componentCls: l } = e;
   return {
     [l]: {
@@ -177,7 +180,7 @@ const o = (e) => {
       }
     }
   };
-}, s = (e) => {
+}, g = (e) => {
   const { componentCls: l } = e;
   return {
     [l]: {
@@ -197,7 +200,7 @@ const o = (e) => {
           paddingInline: "20px",
           paddingBlock: e.spaceXL,
           "&-title": {
-            ...r(e),
+            ...t(e),
             fontWeight: "bold",
             color: e.textColor1
           }
@@ -213,7 +216,7 @@ const o = (e) => {
       }
     }
   };
-}, g = (e) => {
+}, m = (e) => {
   const { componentCls: l } = e;
   return {
     [l]: {
@@ -233,7 +236,7 @@ const o = (e) => {
       }
     }
   };
-}, m = (e) => {
+}, f = (e) => {
   const { componentCls: l } = e, i = `${e.componentCls}-template-item`;
   return {
     [l]: {
@@ -279,26 +282,26 @@ const o = (e) => {
       }
     }
   };
-}, S = t(
+}, S = n(
   "ApTable.Setting",
   (e) => [
-    o(e),
     p(e),
-    d(e),
     c(e),
     s(e),
-    m(e),
-    g(e)
+    d(e),
+    g(e),
+    f(e),
+    m(e)
   ],
-  n
+  o
 );
 export {
   S as default,
-  p as genTableSettingSelectGroupStyle,
-  c as genTableSettingSortableItemMetaStyle,
-  d as genTableSettingSortableItemStyle,
-  s as genTableSettingSorterStyle,
-  o as genTableSettingStyle,
-  m as genTableSettingTemplateItemStyle,
-  g as genTableSettingTemplateListStyle
+  c as genTableSettingSelectGroupStyle,
+  d as genTableSettingSortableItemMetaStyle,
+  s as genTableSettingSortableItemStyle,
+  g as genTableSettingSorterStyle,
+  p as genTableSettingStyle,
+  f as genTableSettingTemplateItemStyle,
+  m as genTableSettingTemplateListStyle
 };

package/es/src/business/ag-grid-modal/interface.d.ts

@@ -127,7 +127,9 @@ export interface ModalLayoutProps {
 /** modal-layout配置 */
 export interface ModalLayoutConfig<T = any> extends ModalLayoutProps {
     /** 右侧标题插槽 */
-    rightTitle?: (selectedCount: number) => any;
+    rightTitle?: (config: {
+        count: number;
+    }) => any;
     /** 右侧底部插槽 */
     rightBottom?: (props: {
         records: T[];

package/es/src/business/ag-grid-modal/utils.d.ts

@@ -27,7 +27,9 @@ export declare function getModalLayoutConfig(props?: ModalLayoutConfig): {
                 deleteCurrent: () => void;
             };
         }) => any) | undefined;
-        rightTitle: ((selectedCount: number) => any) | undefined;
+        rightTitle: ((config: {
+            count: number;
+        }) => any) | undefined;
         rightBottom: ((props: {
             records: any[];
             actions: {