dtable-statistic 5.1.18 → 5.1.20

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

@@ -224,11 +224,11 @@ const exportOneDimensionToTable = _ref => {
     type: _dtableUtils.CellType.NUMBER,
     name: _reactIntlUniversal.default.get('Total'),
     data: {
-      decimal: "dot",
+      decimal: 'dot',
       enable_precision: false,
-      format: "yuan",
+      format: 'yuan',
       precision: 2,
-      thousands: "no"
+      thousands: 'no'
     }
   };
   columnMap['total'] = totalColumn;

package/es/utils/formula-calc-worker/calc-with-worker.js

@@ -24,13 +24,21 @@ async function calcViewRowsWithWorker(view, table, value, username, userId, user
   if (!_resultCacheManager.cachedBase) {
     (0, _resultCacheManager.initCachedBase)(value);
   }
-  const clonedTable = (0, _lodashEs.cloneDeep)(table);
+  const tableRows = table.rows;
+  const idRowMap = table.id_row_map;
+  const clonedTable = (0, _lodashEs.cloneDeepWith)(table, (value, key) => {
+    if (key === 'rows' || key === 'id_row_map') {
+      return null;
+    }
+  });
   // Symbol can't passed to workers
   clonedTable.columns = clonedTable.columns.map(c => {
-    delete c.editor;
-    delete c.formatter;
+    c.editor = null;
+    c.formatter = null;
     return c;
   });
+  clonedTable.rows = tableRows;
+  clonedTable.id_row_map = idRowMap;
   const workerId = uuid();
   let worker;
   try {
@@ -38,7 +46,12 @@ async function calcViewRowsWithWorker(view, table, value, username, userId, user
   } catch (e) {
     return [];
   }
-  const calcWorker = Comlink.wrap(worker);
+  const getWorker = () => new Promise((resolve, reject) => {
+    requestAnimationFrame(() => {
+      resolve(Comlink.wrap(worker));
+    });
+  });
+  const calcWorker = await getWorker();
   const rows = await calcWorker.getViewRows(view, clonedTable, _resultCacheManager.cachedBase, username, userId, userDepartmentIdsMap);
   if (rows && Object.keys(rows).length) {
     _resultCacheManager.viewRowsCacheManager.set(key, rows);
@@ -55,17 +68,25 @@ async function calcFormulaResultsWithWorker(table, rows, value, formulaColumns,
   if (!_resultCacheManager.cachedBase) {
     (0, _resultCacheManager.initCachedBase)(value);
   }
-  const clonedTable = (0, _lodashEs.cloneDeep)(table);
+  const tableRows = table.rows;
+  const idRowMap = table.id_row_map;
+  const clonedTable = (0, _lodashEs.cloneDeepWith)(table, (value, key) => {
+    if (key === 'rows' || key === 'id_row_map') {
+      return null;
+    }
+  });
   // Symbol can't passed to workers
   clonedTable.columns = clonedTable.columns.map(c => {
-    delete c.editor;
-    delete c.formatter;
+    c.editor = null;
+    c.formatter = null;
     return c;
   });
+  clonedTable.rows = tableRows;
+  clonedTable.id_row_map = idRowMap;
   let clonedFormulaColumns = (0, _lodashEs.cloneDeep)(formulaColumns);
   clonedFormulaColumns = clonedFormulaColumns.map(c => {
-    delete c.editor;
-    delete c.formatter;
+    c.editor = null;
+    c.formatter = null;
     return c;
   });
   const workerId = uuid();
@@ -75,7 +96,12 @@ async function calcFormulaResultsWithWorker(table, rows, value, formulaColumns,
   } catch (e) {
     return [];
   }
-  const calcWorker = Comlink.wrap(worker);
+  const getWorker = () => new Promise((resolve, reject) => {
+    requestAnimationFrame(() => {
+      resolve(Comlink.wrap(worker));
+    });
+  });
+  const calcWorker = await getWorker();
   const results = await calcWorker.getTableFormulaResults(clonedTable, rows, _resultCacheManager.cachedBase, clonedFormulaColumns, username, userId, userDepartmentIdsMap);
   if (results && Object.keys(results).length) {
     _resultCacheManager.formulaResultsCacheManager.set(key, results);

package/es/utils/formula-calc-worker/result-cache-manager.js

@@ -27,24 +27,27 @@ const viewRowsCacheManager = exports.viewRowsCacheManager = new ResultCacheManag
 const formulaResultsCacheManager = exports.formulaResultsCacheManager = new ResultCacheManager();
 let cachedBase = exports.cachedBase = null;
 function initCachedBase(value) {
-  // don't clone rows cause they are really big
   const tableIdRowMap = {};
   value.tables.forEach(t => {
-    tableIdRowMap[t._id] = t === null || t === void 0 ? void 0 : t.rows;
-    t.rows && delete t.rows;
+    tableIdRowMap[t._id] = {
+      rows: t === null || t === void 0 ? void 0 : t.rows,
+      id_row_map: t === null || t === void 0 ? void 0 : t.id_row_map
+    };
+  });
+  // don't clone rows cause they are really big
+  const clonedBase = (0, _lodashEs.cloneDeepWith)(value, (v, k) => {
+    if (k === 'rows' || k === 'id_row_map') {
+      return null;
+    }
   });
-  const clonedBase = (0, _lodashEs.cloneDeep)(value);
   clonedBase.tables.forEach(t => {
-    // delete symbols
     t.columns = t.columns.map(c => {
-      delete c.editor;
-      delete c.formatter;
+      c.editor = null;
+      c.formatter = null;
       return c;
     });
-    t.rows = tableIdRowMap[t._id];
-  });
-  value.tables.forEach(t => {
-    t.rows = tableIdRowMap[t._id];
+    t.rows = tableIdRowMap[t._id].rows;
+    t.id_row_map = tableIdRowMap[t._id].id_row_map;
   });
   exports.cachedBase = cachedBase = clonedBase;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "5.1.18",
+  "version": "5.1.20",
   "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": "^1.1.22"
+    "sea-chart": "^1.1.25"
   },
   "peerDependencies": {
     "dtable-ui-component": "~5.1.*",