dtable-statistic 5.0.37 → 5.0.38-alpha.1

package/es/index.js

@@ -3,9 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _react = _interopRequireDefault(require("react"));
 var _dtableStore = require("dtable-store");
-var _seaChart = require("sea-chart");
 var _dashboard = _interopRequireDefault(require("./dashboard"));
-var _converStatItem = require("./model/conver-statItem");
 class Statistic {
   static getInitProps() {
     if (!window || !window.app) {
@@ -24,9 +22,8 @@ class Statistic {
     const collaboratorsCacheList = Object.values(collaboratorsCache) || [];
     if (!value.collaborators) value.collaborators = [];
     value.collaborators = value.collaborators.concat(collaboratorsCacheList);
-    const convertedValue = this.convertStatistics(value);
     return {
-      value: convertedValue,
+      value,
       eventBus: dtableStore.eventBus,
       activeTableIdx: selectedTableIdx,
       activeViewId: selectedViewId,
@@ -36,91 +33,6 @@ class Statistic {
       deletePluginSettings: this.deletePluginSettings.bind(this, dtableStore)
     };
   }
-
-  // Compatible with old statistics
-  static convertStatistics(value) {
-    value.statistics.forEach(dashboard => {
-      const new_stat_items = dashboard.stat_items.map(item => {
-        var _item$config, _item$config2, _item$config3;
-        if (!item.config) {
-          const newItem = {
-            config: {
-              ...item,
-              ...(0, _converStatItem.convertByType)(item)
-            },
-            layout: item.layout,
-            style_config: {
-              border: {},
-              title: {
-                text: item.name
-              }
-            }
-          };
-          return newItem;
-        }
-        const {
-          summary_columns
-        } = item.config || {};
-        if ((item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.type) === _seaChart.CHART_TYPE.TABLE && Array.isArray(summary_columns) && (summary_columns === null || summary_columns === void 0 ? void 0 : summary_columns.length) !== 0) {
-          const new_summary_columns = [];
-          summary_columns.forEach(item => {
-            if (Object.keys(item).length !== 0) {
-              new_summary_columns.push({
-                column_key: (item === null || item === void 0 ? void 0 : item.column_key) || (item === null || item === void 0 ? void 0 : item.key),
-                summary_method: (item === null || item === void 0 ? void 0 : item.summary_method) || (item === null || item === void 0 ? void 0 : item.method)
-              });
-            }
-          });
-          item.config.summary_columns = [...new_summary_columns];
-        }
-        if ((item === null || item === void 0 ? void 0 : (_item$config2 = item.config) === null || _item$config2 === void 0 ? void 0 : _item$config2.type) === _seaChart.CHART_TYPE.BASIC_NUMBER_CARD) {
-          const {
-            font_size,
-            font_weight,
-            font_color,
-            text_align,
-            card_label_font_size,
-            label_font_color,
-            label_font_weight,
-            label_text_align
-          } = item.config || {};
-          if (!font_size && !font_weight && !font_color && !text_align && !card_label_font_size && !label_font_color && !label_font_weight && !label_text_align) {
-            item.config = {
-              ...item.config,
-              font_size: 34,
-              font_weight: 700,
-              card_label_font_size: 14,
-              label_font_weight: 400
-            };
-          }
-        }
-        if ((item === null || item === void 0 ? void 0 : (_item$config3 = item.config) === null || _item$config3 === void 0 ? void 0 : _item$config3.type) === _seaChart.CHART_TYPE.TREND) {
-          const {
-            num_font_size,
-            num_font_weight,
-            num_font_color,
-            num_text_align,
-            card_label_font_size,
-            label_font_color,
-            label_font_weight,
-            label_text_align
-          } = item.config || {};
-          if (!num_font_size && !num_font_weight && !num_font_color && !num_text_align && !card_label_font_size && !label_font_color && !label_font_weight && !label_text_align) {
-            item.config = {
-              ...item.config,
-              num_font_size: 34,
-              num_font_weight: 700,
-              card_label_font_size: 14,
-              label_font_weight: 400
-            };
-          }
-        }
-        return item;
-      });
-      dashboard.stat_items = new_stat_items;
-    });
-    return value;
-  }
   static getViewRows(view, table) {
     const dtableStore = window.app.dtableStore || {};
     const {

package/es/service/dashboard-service.js

@@ -9,6 +9,7 @@ var _seaChart = require("sea-chart");
 var _statisticDashboard = _interopRequireDefault(require("../model/statistic-dashboard"));
 var _utils = require("../utils");
 var _commonUtils = require("../utils/common-utils");
+var _converStatItem = require("../model/conver-statItem");
 var _constants = require("../constants");
 const ADVANCED_STATISTICS_NAME = 'advanced-statistics';
 class DashBoardService {
@@ -52,6 +53,9 @@ class DashBoardService {
     if (hasAdvancedStatistics) {
       this.mergeAdvancedStatistics(advancedStatistics, deletePluginSettings);
     }
+
+    // convert to sea-chart
+    this.convertSeaChart();
     if (this.needSave) {
       this.needSave = false;
       updateStatistics(this.statistics);
@@ -94,6 +98,89 @@ class DashBoardService {
       name: this.defaultDashboardName
     })];
   }
+  convertSeaChart() {
+    this.statistics.forEach(dashboard => {
+      var _dashboard$stat_items;
+      const new_stat_items = dashboard === null || dashboard === void 0 ? void 0 : (_dashboard$stat_items = dashboard.stat_items) === null || _dashboard$stat_items === void 0 ? void 0 : _dashboard$stat_items.map(item => {
+        var _item$config, _item$config2, _item$config3;
+        if (!item.config) {
+          const newItem = {
+            config: {
+              ...item,
+              ...(0, _converStatItem.convertByType)(item)
+            },
+            layout: item.layout,
+            style_config: {
+              border: {},
+              title: {
+                text: item.name
+              }
+            }
+          };
+          return newItem;
+        }
+        const {
+          summary_columns
+        } = item.config || {};
+        if ((item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.type) === _seaChart.CHART_TYPE.TABLE && Array.isArray(summary_columns) && (summary_columns === null || summary_columns === void 0 ? void 0 : summary_columns.length) !== 0) {
+          const new_summary_columns = [];
+          summary_columns.forEach(item => {
+            if (Object.keys(item).length !== 0) {
+              new_summary_columns.push({
+                column_key: (item === null || item === void 0 ? void 0 : item.column_key) || (item === null || item === void 0 ? void 0 : item.key),
+                summary_method: (item === null || item === void 0 ? void 0 : item.summary_method) || (item === null || item === void 0 ? void 0 : item.method)
+              });
+            }
+          });
+          item.config.summary_columns = [...new_summary_columns];
+        }
+        if ((item === null || item === void 0 ? void 0 : (_item$config2 = item.config) === null || _item$config2 === void 0 ? void 0 : _item$config2.type) === _seaChart.CHART_TYPE.BASIC_NUMBER_CARD) {
+          const {
+            font_size,
+            font_weight,
+            font_color,
+            text_align,
+            card_label_font_size,
+            label_font_color,
+            label_font_weight,
+            label_text_align
+          } = item.config || {};
+          if (!font_size && !font_weight && !font_color && !text_align && !card_label_font_size && !label_font_color && !label_font_weight && !label_text_align) {
+            item.config = {
+              ...item.config,
+              font_size: 34,
+              font_weight: 700,
+              card_label_font_size: 14,
+              label_font_weight: 400
+            };
+          }
+        }
+        if ((item === null || item === void 0 ? void 0 : (_item$config3 = item.config) === null || _item$config3 === void 0 ? void 0 : _item$config3.type) === _seaChart.CHART_TYPE.TREND) {
+          const {
+            num_font_size,
+            num_font_weight,
+            num_font_color,
+            num_text_align,
+            card_label_font_size,
+            label_font_color,
+            label_font_weight,
+            label_text_align
+          } = item.config || {};
+          if (!num_font_size && !num_font_weight && !num_font_color && !num_text_align && !card_label_font_size && !label_font_color && !label_font_weight && !label_text_align) {
+            item.config = {
+              ...item.config,
+              num_font_size: 34,
+              num_font_weight: 700,
+              card_label_font_size: 14,
+              label_font_weight: 400
+            };
+          }
+        }
+        return item;
+      });
+      dashboard.stat_items = [...new_stat_items];
+    });
+  }
   convertPivotTable(chart) {
     const {
       summary_type,

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

@@ -606,6 +606,7 @@ const updateTwoDimensionToTable = _ref6 => {
     updateTable,
     statisticalResult
   } = _ref6;
+  console.log('updateTwoDimensionToTable');
   const {
     pivotResult,
     groupbyColumn
@@ -660,16 +661,20 @@ const updateTwoDimensionToTable = _ref6 => {
     const totalColumn = columnMap['total'];
     if (row) {
       // update old row
+      console.log(11);
       const rowId = row._id;
       let updatedRow = {};
       let oldRow = {}; // op used
       const validTotalCellValue = getValidValueForColumn(totalColumn, total);
+      console.log('22validTotalCellValue', validTotalCellValue);
       if (totalColumn && (0, _cellValue.isCellValueChanged)(row[totalColumn.key], validTotalCellValue, totalColumn.type)) {
+        console.log('33', validTotalCellValue);
         updatedRow[totalColumn.key] = validTotalCellValue;
         oldRow[totalColumn.key] = row[totalColumn.key];
       }
       const keys = Object.keys(cells);
       if (keys.length === 0) {
+        console.log('44', updateColumns);
         updateColumns.forEach(column => {
           const {
             key,
@@ -682,6 +687,7 @@ const updateTwoDimensionToTable = _ref6 => {
           }
         });
       } else {
+        console.log('55', cells);
         keys.forEach(key => {
           const columnName = isEmptyName(key) ? _reactIntlUniversal.default.get(_constants.EMPTY_NAME) : key;
           const column = columnMap[columnName];
@@ -728,6 +734,7 @@ const updateTwoDimensionWithSummaryColumnsToTable = _ref7 => {
     updateTable,
     statisticalResult
   } = _ref7;
+  console.log('updateTwoDimensionWithSummaryColumnsToTable');
   const {
     groupbyColumn
   } = statisticalResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "5.0.37",
+  "version": "5.0.38-alpha.1",
   "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": "8.9.0",
-    "sea-chart": "~0.0.83"
+    "sea-chart": "~0.0.84"
   },
   "peerDependencies": {
     "dtable-ui-component": "~5.0.*",