@aplus-frontend/ui 6.28.0 → 6.28.1

package/es/src/ag-grid/hooks/use-pinned-row.mjs

@@ -1,7 +1,7 @@
-import { computed as w } from "vue";
+import { computed as s } from "vue";
 import { isFunction as l } from "lodash-unified";
-const C = (r) => {
-  const d = w(() => {
+const P = (r) => {
+  const d = s(() => {
     const o = r.value;
     if (!o)
       return {};
@@ -9,9 +9,9 @@ const C = (r) => {
     return {
       pinnedTopRowData: t,
       pinnedBottomRowData: e,
-      getRowClass({ node: i, data: s, rowIndex: u }) {
+      getRowClass({ node: i, data: w, rowIndex: u }) {
         if (!(!i.rowPinned || !n))
-          return l(n) ? n(s, u, i.rowPinned) : n;
+          return l(n) ? n(w, u, i.rowPinned) : n;
       }
     };
   });
@@ -21,12 +21,17 @@ const C = (r) => {
       const { cellClassName: e } = r.value || {};
       return !n.node.rowPinned || !e ? t = [o(n)] : t = [
         o(n),
-        l(e) ? e(n.data, n.colDef, n.node.rowPinned) : e
+        l(e) ? e(
+          n.data,
+          n.colDef,
+          n.node.rowPinned,
+          n.rowIndex
+        ) : e
       ], t.flat().filter(Boolean);
     },
     rowPinnedGridConfig: d
   };
 };
 export {
-  C as usePinnedRow
+  P as usePinnedRow
 };

package/es/src/ag-grid/hooks/use-selection-col-def.mjs

@@ -1,34 +1,35 @@
 import { computed as m } from "vue";
 import { isFunction as s } from "lodash-unified";
 import "../../ap-grid/index.mjs";
-import { ROW_SELECTION_FIELD as f } from "../../ap-grid/constants.mjs";
+import { ROW_SELECTION_FIELD as a } from "../../ap-grid/constants.mjs";
 function d(e) {
   return e?.bottom?.length || e?.top?.length;
 }
-const x = (e, c) => m(() => {
+const C = (e, l) => m(() => {
   if (!e.rowSelection)
     return;
-  const l = e.rowSelection === !0 ? {} : e.rowSelection, o = {
+  const i = e.rowSelection === !0 ? {} : e.rowSelection, o = {
     sortable: !1,
     resizable: !1,
-    width: l.columnWidth || 60
+    width: i.columnWidth || 60
   };
-  let n = l.fixed;
-  if (n === void 0 && (n = c.value.some(
+  let n = i.fixed;
+  if (n === void 0 && (n = l.value.some(
     (t) => t.fixed === "left" || t.fixed === !0
   ) ? "left" : void 0), o.pinned = n, d(e.summary)) {
     const { cellClassName: t } = e.summary;
     o.cellClass = ({
       node: r,
-      data: u,
-      colDef: i
+      data: f,
+      colDef: c,
+      rowIndex: u
     }) => {
       if (!(!r.rowPinned || !t))
-        return i.field = f, console.log(i), s(t) ? t(u, i, r.rowPinned) : t;
-    }, o.cellRenderer = ({ data: r }) => r?.[f];
+        return s(t) ? t(f, c, r.rowPinned, u) : t;
+    }, o.cellRenderer = ({ data: r }) => r?.[a];
   }
   return o;
 });
 export {
-  x as default
+  C as default
 };

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

@@ -114,7 +114,7 @@ export type AgGridVirtualConfig = {
 export type AgGridSummaryType<RecordType = any> = {
     top?: RecordType[];
     bottom?: RecordType[];
-    cellClassName?: string | string[] | ((data: RecordType, column: ColDef<RecordType>, pinned: RowPinnedType) => string | string[]);
+    cellClassName?: string | string[] | ((data: RecordType, column: ColDef<RecordType>, pinned: RowPinnedType, rowIndex: number) => string | string[]);
     rowClassName?: string | string[] | ((data: RecordType, rowIndex: number, pinned: RowPinnedType) => string | string[]);
 };
 export type AgGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<RecordType>, 'columns' | 'pagination' | 'dataSource' | 'size' | 'rowSelection' | 'rowClassName' | 'footer' | 'loading' | 'sticky'> & {

package/es/src/ag-grid/theme.mjs

@@ -1,15 +1,15 @@
-import { useToken as c } from "@aplus-frontend/antdv/es/theme/internal";
+import { useToken as d } from "@aplus-frontend/antdv/es/theme/internal";
 import { themeQuartz as n } from "ag-grid-community";
-import { computed as d } from "vue";
-const m = (r, e) => {
-  const [, a] = c();
-  return d(() => {
-    const t = r.value === "mini", o = a.value;
+import { computed as c } from "vue";
+const p = (e, r) => {
+  const [, a] = d();
+  return c(() => {
+    const t = e.value === "mini", o = a.value;
     return n.withParams({
       headerHeight: "36px",
       headerFontSize: "12px",
       dataFontSize: "12px",
-      rowHeight: e.value,
+      rowHeight: r.value,
       spacing: t ? "5px" : "6.5px",
       foregroundColor: o.colorTextBase,
       wrapperBorder: !1,
@@ -18,10 +18,12 @@ const m = (r, e) => {
       selectedRowBackgroundColor: o.controlItemBgActive,
       checkboxCheckedBackgroundColor: o.colorPrimary,
       rowHoverColor: "var(--ap-color-bg-2)",
-      headerBackgroundColor: "var(--ap-table-header-bg)"
+      headerBackgroundColor: "var(--ap-table-header-bg)",
+      headerColumnResizeHandleHeight: "50%",
+      headerColumnResizeHandleWidth: "1px"
     });
   });
 };
 export {
-  m as useTheme
+  p as useTheme
 };

package/es/src/business/ap-summary/interface.d.ts

@@ -2,7 +2,8 @@ import { ColumnsType } from '@aplus-frontend/antdv/es/table';
 import { AlignType, DataIndex, Key } from '@aplus-frontend/antdv/es/vc-table/interface';
 import { ApColumnType } from '../../ap-table';
 import { ApGridColumnType } from '../../ap-grid';
-export type SummaryColumnType = ApColumnType[] | ApGridColumnType[] | ColumnsType | any[];
+import { AgGridColumnType } from '../../ag-grid';
+export type SummaryColumnType = ApColumnType[] | ApGridColumnType[] | AgGridColumnType[] | ColumnsType | any[];
 export type ValueType = {
     [key in string]: any;
 };
@@ -40,4 +41,5 @@ export interface ComputedRecordParams<T> {
      * 排出 在 columns 和 configList中相同key 的配置项
      */
     exclude?: Key[];
+    valueTypeExtension?: string[];
 }

package/es/src/business/ap-summary/utils.mjs

@@ -1,30 +1,33 @@
-import { flatten as f, uniqBy as k, isNil as b, get as s, set as x } from "lodash-unified";
-import { toThousand as C, toFixed as L, addNumber as N } from "@aplus-frontend/utils";
+import { flatten as f, uniqBy as x, isNil as b, get as s, set as C } from "lodash-unified";
+import { toThousand as L, toFixed as N, addNumber as T } from "@aplus-frontend/utils";
 const m = (t) => t?.children && t?.children?.length > 0 ? f(t.children?.map((e) => m(e))) : [t], j = (t) => f(
   t?.map((e) => m(e))
-), l = (t) => Object.prototype.toString.call(t) === "[object Array]" ? t.map((e) => String(e)).join(".") : t ?? "", T = (t, e, c) => c ? C(t, e) : L(t, e);
+), l = (t) => Object.prototype.toString.call(t) === "[object Array]" ? t.map((e) => String(e)).join(".") : t ?? "", S = (t, e, u) => u ? L(t, e) : N(t, e);
 function q(t) {
-  const { records: e, columns: c, configList: u, exclude: a } = t;
+  const { records: e, columns: u, configList: c, exclude: a, valueTypeExtension: y } = t;
   if (!e || e?.length === 0)
     return {};
-  let r = j(c)?.filter((n) => n.valueType === "number")?.map((n) => ({
+  let r = j(u)?.filter(
+    (n) => n.valueType === "number" || // 兼容自定义valueType的情况
+    y?.includes(n.valueType)
+  )?.map((n) => ({
     key: n.key || "",
     dataIndex: n.dataIndex
   }));
-  u && u?.length > 0 && (r = k(r?.concat(u), "key")), a && a.length > 0 && (r = r.filter(
+  c && c?.length > 0 && (r = x(r?.concat(c), "key")), a && a.length > 0 && (r = r.filter(
     (n) => !a.includes(n.key)
   ));
-  const y = {};
+  const p = {};
   return e?.reduce((n, d) => (r.forEach((o) => {
     if (!b(s(d, l(o.dataIndex || o.key)))) {
-      const i = o.dataIndex || o.key, g = s(n, l(i)) || 0, h = s(d, l(i)) || 0, p = N(g, h)?.toNumber();
-      x(n, i, +p);
+      const i = o.dataIndex || o.key, g = s(n, l(i)) || 0, h = s(d, l(i)) || 0, k = T(g, h)?.toNumber();
+      C(n, i, +k);
     }
-  }), n), y);
+  }), n), p);
 }
 export {
   q as computedRecords,
   j as flattenColumns,
   l as formatDataIndex,
-  T as formatNumber
+  S as formatNumber
 };

package/es/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.28.0";
+declare const _default: "6.28.1";
 export default _default;

package/es/src/version.mjs

@@ -1,4 +1,4 @@
-const e = "6.28.0";
+const e = "6.28.1";
 export {
   e as default
 };

package/lib/src/ag-grid/hooks/use-pinned-row.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("vue"),l=require("lodash-unified"),w=i=>{const u=c.computed(()=>{const o=i.value;if(!o)return{};const{rowClassName:e,top:t,bottom:n}=o;return{pinnedTopRowData:t,pinnedBottomRowData:n,getRowClass({node:r,data:s,rowIndex:d}){if(!(!r.rowPinned||!e))return l.isFunction(e)?e(s,d,r.rowPinned):e}}});return{getRowPinnedCellClass:o=>e=>{let t;const{cellClassName:n}=i.value||{};return!e.node.rowPinned||!n?t=[o(e)]:t=[o(e),l.isFunction(n)?n(e.data,e.colDef,e.node.rowPinned):n],t.flat().filter(Boolean)},rowPinnedGridConfig:u}};exports.usePinnedRow=w;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("vue"),l=require("lodash-unified"),w=i=>{const u=c.computed(()=>{const o=i.value;if(!o)return{};const{rowClassName:e,top:t,bottom:n}=o;return{pinnedTopRowData:t,pinnedBottomRowData:n,getRowClass({node:r,data:d,rowIndex:s}){if(!(!r.rowPinned||!e))return l.isFunction(e)?e(d,s,r.rowPinned):e}}});return{getRowPinnedCellClass:o=>e=>{let t;const{cellClassName:n}=i.value||{};return!e.node.rowPinned||!n?t=[o(e)]:t=[o(e),l.isFunction(n)?n(e.data,e.colDef,e.node.rowPinned,e.rowIndex):n],t.flat().filter(Boolean)},rowPinnedGridConfig:u}};exports.usePinnedRow=w;

package/lib/src/ag-grid/hooks/use-selection-col-def.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const d=require("vue"),f=require("lodash-unified");require("../../ap-grid/index.js");const u=require("../../ap-grid/constants.js");function a(e){return e?.bottom?.length||e?.top?.length}const m=(e,c)=>d.computed(()=>{if(!e.rowSelection)return;const l=e.rowSelection===!0?{}:e.rowSelection,n={sortable:!1,resizable:!1,width:l.columnWidth||60};let i=l.fixed;if(i===void 0&&(i=c.value.some(t=>t.fixed==="left"||t.fixed===!0)?"left":void 0),n.pinned=i,a(e.summary)){const{cellClassName:t}=e.summary;n.cellClass=({node:r,data:s,colDef:o})=>{if(!(!r.rowPinned||!t))return o.field=u.ROW_SELECTION_FIELD,console.log(o),f.isFunction(t)?t(s,o,r.rowPinned):t},n.cellRenderer=({data:r})=>r?.[u.ROW_SELECTION_FIELD]}return n});exports.default=m;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const f=require("vue"),d=require("lodash-unified");require("../../ap-grid/index.js");const a=require("../../ap-grid/constants.js");function m(e){return e?.bottom?.length||e?.top?.length}const S=(e,l)=>f.computed(()=>{if(!e.rowSelection)return;const o=e.rowSelection===!0?{}:e.rowSelection,n={sortable:!1,resizable:!1,width:o.columnWidth||60};let i=o.fixed;if(i===void 0&&(i=l.value.some(t=>t.fixed==="left"||t.fixed===!0)?"left":void 0),n.pinned=i,m(e.summary)){const{cellClassName:t}=e.summary;n.cellClass=({node:r,data:u,colDef:c,rowIndex:s})=>{if(!(!r.rowPinned||!t))return d.isFunction(t)?t(u,c,r.rowPinned,s):t},n.cellRenderer=({data:r})=>r?.[a.ROW_SELECTION_FIELD]}return n});exports.default=S;

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

@@ -114,7 +114,7 @@ export type AgGridVirtualConfig = {
 export type AgGridSummaryType<RecordType = any> = {
     top?: RecordType[];
     bottom?: RecordType[];
-    cellClassName?: string | string[] | ((data: RecordType, column: ColDef<RecordType>, pinned: RowPinnedType) => string | string[]);
+    cellClassName?: string | string[] | ((data: RecordType, column: ColDef<RecordType>, pinned: RowPinnedType, rowIndex: number) => string | string[]);
     rowClassName?: string | string[] | ((data: RecordType, rowIndex: number, pinned: RowPinnedType) => string | string[]);
 };
 export type AgGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<RecordType>, 'columns' | 'pagination' | 'dataSource' | 'size' | 'rowSelection' | 'rowClassName' | 'footer' | 'loading' | 'sticky'> & {

package/lib/src/ag-grid/theme.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const c=require("@aplus-frontend/antdv/es/theme/internal"),n=require("ag-grid-community"),d=require("vue"),l=(o,r)=>{const[,t]=c.useToken();return d.computed(()=>{const a=o.value==="mini",e=t.value;return n.themeQuartz.withParams({headerHeight:"36px",headerFontSize:"12px",dataFontSize:"12px",rowHeight:r.value,spacing:a?"5px":"6.5px",foregroundColor:e.colorTextBase,wrapperBorder:!1,rowBorder:{color:e.colorBorderSecondary},headerRowBorder:{color:e.colorBorderSecondary},selectedRowBackgroundColor:e.controlItemBgActive,checkboxCheckedBackgroundColor:e.colorPrimary,rowHoverColor:"var(--ap-color-bg-2)",headerBackgroundColor:"var(--ap-table-header-bg)"})})};exports.useTheme=l;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("@aplus-frontend/antdv/es/theme/internal"),c=require("ag-grid-community"),d=require("vue"),l=(o,r)=>{const[,a]=n.useToken();return d.computed(()=>{const t=o.value==="mini",e=a.value;return c.themeQuartz.withParams({headerHeight:"36px",headerFontSize:"12px",dataFontSize:"12px",rowHeight:r.value,spacing:t?"5px":"6.5px",foregroundColor:e.colorTextBase,wrapperBorder:!1,rowBorder:{color:e.colorBorderSecondary},headerRowBorder:{color:e.colorBorderSecondary},selectedRowBackgroundColor:e.controlItemBgActive,checkboxCheckedBackgroundColor:e.colorPrimary,rowHoverColor:"var(--ap-color-bg-2)",headerBackgroundColor:"var(--ap-table-header-bg)",headerColumnResizeHandleHeight:"50%",headerColumnResizeHandleWidth:"1px"})})};exports.useTheme=l;

package/lib/src/business/ap-summary/interface.d.ts

@@ -2,7 +2,8 @@ import { ColumnsType } from '@aplus-frontend/antdv/es/table';
 import { AlignType, DataIndex, Key } from '@aplus-frontend/antdv/es/vc-table/interface';
 import { ApColumnType } from '../../ap-table';
 import { ApGridColumnType } from '../../ap-grid';
-export type SummaryColumnType = ApColumnType[] | ApGridColumnType[] | ColumnsType | any[];
+import { AgGridColumnType } from '../../ag-grid';
+export type SummaryColumnType = ApColumnType[] | ApGridColumnType[] | AgGridColumnType[] | ColumnsType | any[];
 export type ValueType = {
     [key in string]: any;
 };
@@ -40,4 +41,5 @@ export interface ComputedRecordParams<T> {
      * 排出 在 columns 和 configList中相同key 的配置项
      */
     exclude?: Key[];
+    valueTypeExtension?: string[];
 }

package/lib/src/business/ap-summary/utils.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("lodash-unified"),d=require("@aplus-frontend/utils"),m=t=>t?.children&&t?.children?.length>0?r.flatten(t.children?.map(e=>m(e))):[t],g=t=>r.flatten(t?.map(e=>m(e))),a=t=>Object.prototype.toString.call(t)==="[object Array]"?t.map(e=>String(e)).join("."):t??"",k=(t,e,c)=>c?d.toThousand(t,e):d.toFixed(t,e);function x(t){const{records:e,columns:c,configList:s,exclude:i}=t;if(!e||e?.length===0)return{};let o=g(c)?.filter(n=>n.valueType==="number")?.map(n=>({key:n.key||"",dataIndex:n.dataIndex}));s&&s?.length>0&&(o=r.uniqBy(o?.concat(s),"key")),i&&i.length>0&&(o=o.filter(n=>!i.includes(n.key)));const y={};return e?.reduce((n,f)=>(o.forEach(u=>{if(!r.isNil(r.get(f,a(u.dataIndex||u.key)))){const l=u.dataIndex||u.key,h=r.get(n,a(l))||0,b=r.get(f,a(l))||0,p=d.addNumber(h,b)?.toNumber();r.set(n,l,+p)}}),n),y)}exports.computedRecords=x;exports.flattenColumns=g;exports.formatDataIndex=a;exports.formatNumber=k;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("lodash-unified"),d=require("@aplus-frontend/utils"),m=t=>t?.children&&t?.children?.length>0?r.flatten(t.children?.map(e=>m(e))):[t],y=t=>r.flatten(t?.map(e=>m(e))),a=t=>Object.prototype.toString.call(t)==="[object Array]"?t.map(e=>String(e)).join("."):t??"",x=(t,e,c)=>c?d.toThousand(t,e):d.toFixed(t,e);function C(t){const{records:e,columns:c,configList:s,exclude:i,valueTypeExtension:g}=t;if(!e||e?.length===0)return{};let o=y(c)?.filter(n=>n.valueType==="number"||g?.includes(n.valueType))?.map(n=>({key:n.key||"",dataIndex:n.dataIndex}));s&&s?.length>0&&(o=r.uniqBy(o?.concat(s),"key")),i&&i.length>0&&(o=o.filter(n=>!i.includes(n.key)));const h={};return e?.reduce((n,f)=>(o.forEach(u=>{if(!r.isNil(r.get(f,a(u.dataIndex||u.key)))){const l=u.dataIndex||u.key,p=r.get(n,a(l))||0,b=r.get(f,a(l))||0,k=d.addNumber(p,b)?.toNumber();r.set(n,l,+k)}}),n),h)}exports.computedRecords=C;exports.flattenColumns=y;exports.formatDataIndex=a;exports.formatNumber=x;

package/lib/src/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "6.28.0";
+declare const _default: "6.28.1";
 export default _default;

package/lib/src/version.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.28.0";exports.default=e;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e="6.28.1";exports.default=e;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "6.28.0",
+  "version": "6.28.1",
   "main": "./lib/index.js",
   "type": "module",
   "files": [

package/theme/ap-value-select-card/index.css

@@ -161,3 +161,6 @@
 .aplus-ap-value-select-card--admin .aplus-ap-value-select-card-title {
   color: #666;
 }
+.aplus-ap-value-select-card--admin .aplus-ap-value-select-card-title-icon {
+  color: #BFBFBF;
+}

package/theme/ap-value-select-card/index.less

@@ -151,6 +151,9 @@
       }
       &-title {
         color: #666;
+        &-icon {
+          color: #BFBFBF;
+        }
       }
     }
   }

package/theme/index.css

@@ -4500,6 +4500,9 @@ div.aplus-ap-info-layout-admin__header-shadow.aplus-ap-info-layout-admin__sticky
 .aplus-ap-value-select-card--admin .aplus-ap-value-select-card-title {
   color: #666;
 }
+.aplus-ap-value-select-card--admin .aplus-ap-value-select-card-title-icon {
+  color: #BFBFBF;
+}
 .aplus-pro-card {
   position: relative;
   display: flex;