es-grid-template 1.9.33 → 1.9.37

package/es/ali-table/InternalTable.js

@@ -5,7 +5,7 @@ import { useLocale } from "rc-master-ui/es/locale";
 import { faker } from "@faker-js/faker";
 import React from "react";
 import "./base-table/styles.scss";
-import { addRowIdArray, filterDataByColumns,
+import { addRowIdArray, filterDataByColumns, flatColumns2,
 // getInvisibleColumns, 
 getVisibleFields, groupArrayByColumns, isTreeArray, revertConvertFilters, sortByType, sumFields } from "../table-component/hook/utils";
 import { CustomProvider, ConfigProvider } from 'rc-master-ui';
@@ -106,7 +106,8 @@ const InternalTable = props => {
     if (footerDataSource) {
       return footerDataSource;
     }
-    const a = sumFields(columns, dataSource, childrenKey);
+    const flatColumns = flatColumns2(columns);
+    const a = sumFields(flatColumns, dataSource, childrenKey);
     return [a];
   }, [columns, dataSource, footerDataSource, summary]);
   const expandAllKeys = React.useMemo(() => {
@@ -228,7 +229,21 @@ const InternalTable = props => {
   // }
 
   return /*#__PURE__*/React.createElement(ConfigProvider, {
-    locale: language
+    locale: language,
+    theme: {
+      token: {
+        // colorPrimary: '#eb4619',
+        // colorLink: '#eb4619',
+      },
+      components: {
+        Dropdown: {
+          zIndexPopup: 1158
+        },
+        Popover: {
+          zIndexPopup: 1158
+        }
+      }
+    }
   }, /*#__PURE__*/React.createElement(CustomProvider, {
     locale: languages
   }, /*#__PURE__*/React.createElement(TableContext.Provider, {

package/es/ali-table/base-table/html-table.js

@@ -196,7 +196,7 @@ export function HtmlTable({
       // },
     };
     if (tbodyHtmlTag === 'tfoot') {
-      if (!nonActionColumn.includes(column.field)) {
+      if (!nonActionColumn.includes(column.field) && column.isSummary !== false) {
         return /*#__PURE__*/React.createElement("td", _extends({
           key: colIndex
         }, tdProps));

package/es/ali-table/interfaces.d.ts

@@ -35,6 +35,7 @@ export interface ArtColumnStaticPart {
      * @since 1.7.25
      */
     sorter?: boolean;
+    isSummary?: boolean;
     /** Whether sorting is allowed */
     allowSortering?: boolean;
     /** Filter operator */

package/es/ali-table/utils/convertColumnsChoose.d.ts

@@ -1,5 +1,5 @@
-import type { TreeDataNode } from "antd";
-import type { ColumnTable } from "../../grid-component";
+import { TreeDataNode } from "antd";
+import { ColumnTable } from "../../grid-component";
 export declare function convertColumnsToTreeData(columns: ColumnTable[], groupColumns?: string[], t?: any): TreeDataNode[];
 export declare function filterColumnsByField(columns: ColumnTable[], fieldList: string[]): ColumnTable[];
 export declare function filterVisibleColumns(columns: ColumnTable[]): ColumnTable[];

package/lib/ali-table/InternalTable.js

@@ -113,7 +113,8 @@ const InternalTable = props => {
     if (footerDataSource) {
       return footerDataSource;
     }
-    const a = (0, _utils.sumFields)(columns, dataSource, childrenKey);
+    const flatColumns = (0, _utils.flatColumns2)(columns);
+    const a = (0, _utils.sumFields)(flatColumns, dataSource, childrenKey);
     return [a];
   }, [columns, dataSource, footerDataSource, summary]);
   const expandAllKeys = _react.default.useMemo(() => {
@@ -235,7 +236,21 @@ const InternalTable = props => {
   // }
 
   return /*#__PURE__*/_react.default.createElement(_rcMasterUi.ConfigProvider, {
-    locale: language
+    locale: language,
+    theme: {
+      token: {
+        // colorPrimary: '#eb4619',
+        // colorLink: '#eb4619',
+      },
+      components: {
+        Dropdown: {
+          zIndexPopup: 1158
+        },
+        Popover: {
+          zIndexPopup: 1158
+        }
+      }
+    }
   }, /*#__PURE__*/_react.default.createElement(_rcMasterUi.CustomProvider, {
     locale: languages
   }, /*#__PURE__*/_react.default.createElement(_useContext.TableContext.Provider, {

package/lib/ali-table/base-table/html-table.js

@@ -203,7 +203,7 @@ function HtmlTable({
       // },
     };
     if (tbodyHtmlTag === 'tfoot') {
-      if (!_hooks.nonActionColumn.includes(column.field)) {
+      if (!_hooks.nonActionColumn.includes(column.field) && column.isSummary !== false) {
         return /*#__PURE__*/_react.default.createElement("td", (0, _extends2.default)({
           key: colIndex
         }, tdProps));

package/lib/ali-table/interfaces.d.ts

@@ -35,6 +35,7 @@ export interface ArtColumnStaticPart {
      * @since 1.7.25
      */
     sorter?: boolean;
+    isSummary?: boolean;
     /** Whether sorting is allowed */
     allowSortering?: boolean;
     /** Filter operator */

package/lib/ali-table/utils/convertColumnsChoose.d.ts

@@ -1,5 +1,5 @@
-import type { TreeDataNode } from "antd";
-import type { ColumnTable } from "../../grid-component";
+import { TreeDataNode } from "antd";
+import { ColumnTable } from "../../grid-component";
 export declare function convertColumnsToTreeData(columns: ColumnTable[], groupColumns?: string[], t?: any): TreeDataNode[];
 export declare function filterColumnsByField(columns: ColumnTable[], fieldList: string[]): ColumnTable[];
 export declare function filterVisibleColumns(columns: ColumnTable[]): ColumnTable[];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "es-grid-template",
-  "version": "1.9.33",
+  "version": "1.9.37",
   "description": "es-grid-template",
   "keywords": [
     "react",
@@ -67,7 +67,6 @@
     "rc-checkbox": "3.5.0",
     "rc-dropdown": "4.2.1",
     "rc-field-form": "2.6.0",
-    "rc-master-ui": "1.1.59",
     "rc-select": "14.16.3",
     "rc-tooltip": "6.3.0",
     "rc-tree": "5.10.1",
@@ -109,14 +108,16 @@
     "gh-pages": "3.1.0",
     "less": "4.1.1",
     "np": "7.1.0",
+    "rc-master-ui": "1.1.59",
     "rc-test": "7.0.9",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "typescript": "4.0.5"
   },
   "peerDependencies": {
-    "react": ">=16.9.0",
-    "react-dom": ">=16.9.0"
+    "rc-master-ui": "1.1.59",
+    "react": ">=18",
+    "react-dom": ">=18"
   },
   "umi": {
     "configFile": "config.ts"