dtable-statistic 5.3.33 → 5.3.35

package/es/utils/export-table-utils.js

@@ -10,7 +10,6 @@ var _reactIntlUniversal = _interopRequireDefault(require("react-intl-universal")
 var _dtableUtils = require("dtable-utils");
 var _cellValue = require("./cell-value");
 var _constants = require("../constants");
-var _pivotTable = require("./pivot-table");
 const isEmptyName = title => {
   return title === null || title === '';
 };
@@ -403,14 +402,11 @@ const getTwoDimensionWithSummaryColumns = _ref3 => {
   const {
     pivot_rows,
     pivot_columns,
-    pivot_summary_multiple_columns,
-    formulaRows,
-    isSqlQuery
+    summary_columns
   } = pivotResult;
-  const summaryColumns = pivot_summary_multiple_columns.filter(Boolean);
-  if (!groupbyColumn || summaryColumns.length === 0 || !Array.isArray(pivot_columns) || pivot_columns.length === 0 || !Array.isArray(pivot_rows) || pivot_rows.length === 0) return {};
+  if (!groupbyColumn || summary_columns.length === 0 || !Array.isArray(pivot_columns) || pivot_columns.length === 0 || !Array.isArray(pivot_rows) || pivot_rows.length === 0) return {};
   const groupbyColumnName = groupbyColumn.name;
-  const firstSummaryColumn = summaryColumns[0];
+  const firstSummaryColumn = summary_columns[0];
   let columns = [{
     // name column
     key: '0000',
@@ -425,16 +421,12 @@ const getTwoDimensionWithSummaryColumns = _ref3 => {
       original_key
     } = pivotColumn;
     const pivotColumnColumnName = isEmptyName(original_key) ? _reactIntlUniversal.default.get(_constants.EMPTY_NAME) : pivotColumnKey;
-    summaryColumns.forEach(summaryColumn => {
+    summary_columns.forEach(summaryColumn => {
       const {
-        key,
-        type,
-        sqlKey,
-        column_name,
-        data,
-        method
+        name,
+        data
       } = summaryColumn;
-      const newColumnName = `${pivotColumnColumnName}-${column_name}`;
+      const newColumnName = `${name}（${pivotColumnColumnName}）`;
       columns.push({
         // just support number column
         type: _dtableUtils.CellType.NUMBER,
@@ -443,11 +435,8 @@ const getTwoDimensionWithSummaryColumns = _ref3 => {
       });
       tmpColumns.push({
         name: newColumnName,
-        pivotColumnKey,
-        key,
-        type,
-        sqlKey,
-        method
+        summaryName: name,
+        pivotColumnKey
       });
     });
   });
@@ -472,22 +461,25 @@ const getTwoDimensionWithSummaryColumns = _ref3 => {
     let total = 0;
     tmpColumns.forEach(tmpColumn => {
       const {
-        name,
         pivotColumnKey,
-        key,
-        type,
-        sqlKey,
-        method
+        name: columnName,
+        summaryName
       } = tmpColumn;
       const cell = cells && cells[pivotColumnKey];
-      const cellRows = cell && cell.rows;
-      if (!Array.isArray(cellRows) || cellRows.length === 0) {
-        newRow[name] = 0;
+      if (!cell) return;
+      const cellTotal = cell && cell.total;
+
+      // cellTotal： [[summaryName, value， summaryColumnKey], ...]
+      let value = '';
+      if (Array.isArray(cellTotal)) {
+        const pair = cellTotal.find(item => Array.isArray(item) && item[0] === summaryName);
+        value = pair ? pair[1] : '';
       } else {
-        const cellValue = (0, _pivotTable.getPivotTableSummaryTotal)(type, key, sqlKey, _constants.STATISTICS_COUNT_TYPE.ADVANCED, method, cellRows, formulaRows, isSqlQuery);
-        newRow[name] = cellValue;
-        total += cellValue;
+        value = '';
       }
+      newRow[columnName] = value;
+      const num = Number(value);
+      if (!isNaN(num)) total += num;
     });
     newRow[_reactIntlUniversal.default.get('Total')] = total;
     rows.push(newRow);
@@ -921,13 +913,13 @@ const exportStatisticToTable = _ref8 => {
   } = statisticalResult;
   const {
     pivot_columns,
-    pivot_summary_multiple_columns
+    summary_columns
   } = pivotResult;
   if (!groupbyColumn) return {};
 
   // two dimension table
   if (columnGroupbyColumn) {
-    if (Array.isArray(pivot_summary_multiple_columns) && pivot_summary_multiple_columns.length > 0) {
+    if (Array.isArray(summary_columns) && summary_columns.length > 0) {
       return exportTwoDimensionWithSummaryColumnsToTable({
         statisticalResult
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "5.3.33",
+  "version": "5.3.35",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",
@@ -18,7 +18,7 @@
     "react-grid-layout": "^1.2.5",
     "react-intl-universal": "^2.4.8",
     "reactstrap": "9.2.3",
-    "sea-chart": "^1.1.105"
+    "sea-chart": "^1.1.106"
   },
   "peerDependencies": {
     "dtable-ui-component": "~6.0.*",
@@ -52,8 +52,8 @@
     "css-minimizer-webpack-plugin": "^3.2.0",
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
-    "dtable-store": "6.0.3",
-    "dtable-ui-component": "^6.0.53",
+    "dtable-store": "6.0.11",
+    "dtable-ui-component": "^6.0.98",
     "dtable-utils": "^5.0.23",
     "eslint": "^8.3.0",
     "eslint-config-react-app": "^7.0.1",