dtable-statistic 5.0.48-alpha.14 → 5.0.48-alpha.16

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

@@ -9,9 +9,9 @@ exports.calcFormulaResultsWithWorker = calcFormulaResultsWithWorker;
 exports.calcViewRowsWithWorker = calcViewRowsWithWorker;
 var Comlink = _interopRequireWildcard(require("comlink"));
 var _calc = _interopRequireDefault(require("./calc.worker"));
-var _dtableStore = require("dtable-store");
 var _resultCacheManager = require("./result-cache-manager");
 var _threadManager = _interopRequireDefault(require("./thread-manager"));
+var _lodashEs = require("lodash-es");
 function uuid() {
   return Math.random().toString(36).slice(2, 9);
 }
@@ -21,6 +21,13 @@ async function calcViewRowsWithWorker(view, table, value, username, userId, user
   if (cachedRows) {
     return cachedRows;
   }
+  const clonedTable = (0, _lodashEs.cloneDeep)(table);
+  // Symbol can't passed to workers
+  clonedTable.columns = clonedTable.columns.map(c => {
+    delete c.editor;
+    delete c.formatter;
+    return c;
+  });
   const workerId = uuid();
   let worker;
   try {
@@ -29,9 +36,7 @@ async function calcViewRowsWithWorker(view, table, value, username, userId, user
     return [];
   }
   const calcWorker = Comlink.wrap(worker);
-  // const cb = () => Views.getViewRows(view, table, value, username, userId, userDepartmentIdsMap);
-  // const rows = await calcWorker(Comlink.proxy(cb));
-  const rows = await calcWorker.getViewRows(view, table, value, username, userId, userDepartmentIdsMap);
+  const rows = await calcWorker.getViewRows(view, clonedTable, value, username, userId, userDepartmentIdsMap);
   _resultCacheManager.viewRowsCacheManager.set(key, rows);
   _threadManager.default.removeThread(workerId);
   return rows;
@@ -42,6 +47,13 @@ async function calcFormulaResultsWithWorker(table, rows, value, formulaColumns,
   if (cachedResults) {
     return cachedResults;
   }
+  const clonedTable = (0, _lodashEs.cloneDeep)(table);
+  // Symbol can't passed to workers
+  clonedTable.columns = clonedTable.columns.map(c => {
+    delete c.editor;
+    delete c.formatter;
+    return c;
+  });
   const workerId = uuid();
   let worker;
   try {
@@ -50,9 +62,7 @@ async function calcFormulaResultsWithWorker(table, rows, value, formulaColumns,
     return [];
   }
   const calcWorker = Comlink.wrap(worker);
-  // const cb = () => Views.getTableFormulaResults(table, rows, value, formulaColumns, { username, userId, userDepartmentIdsMap });
-  // const results = await calcWorker(Comlink.proxy(cb));
-  const results = await calcWorker.getTableFormulaResults(table, rows, value, formulaColumns, username, userId, userDepartmentIdsMap);
+  const results = await calcWorker.getTableFormulaResults(clonedTable, rows, value, formulaColumns, username, userId, userDepartmentIdsMap);
   _resultCacheManager.formulaResultsCacheManager.set(key, results);
   _threadManager.default.removeThread(workerId);
   return results;

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

@@ -4,8 +4,10 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
 var Comlink = _interopRequireWildcard(require("comlink"));
 var _dtableStore = require("dtable-store");
 // async function calc(callback) {
-//   return callback();
+//   const res =  await callback();
+//   return res;
 // }
+// Comlink.expose(calc);
 const workerFunctions = {
   async getViewRows(view, table, value, username, userId, userDepartmentIdsMap) {
     return _dtableStore.Views.getViewRows(view, table, value, username, userId, userDepartmentIdsMap);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "5.0.48-alpha.14",
+  "version": "5.0.48-alpha.16",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",