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

package/es/index.js

@@ -76,6 +76,7 @@ class Statistic {
     if (!window.app) return;
     _resultCacheManager.viewRowsCacheManager.clear();
     _resultCacheManager.formulaResultsCacheManager.clear();
+    (0, _resultCacheManager.clearCachedBase)();
     window.app.unmountWidget({
       animation
     });

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

@@ -12,6 +12,7 @@ var _calc = _interopRequireDefault(require("./calc.worker"));
 var _resultCacheManager = require("./result-cache-manager");
 var _threadManager = _interopRequireDefault(require("./thread-manager"));
 var _lodashEs = require("lodash-es");
+var _hasReactElement = require("../hasReactElement");
 function uuid() {
   return Math.random().toString(36).slice(2, 9);
 }
@@ -21,6 +22,10 @@ async function calcViewRowsWithWorker(view, table, value, username, userId, user
   if (cachedRows) {
     return cachedRows;
   }
+  if (!_resultCacheManager.cachedBase) {
+    (0, _hasReactElement.containsReactElementSymbol)(value);
+    (0, _resultCacheManager.initCachedBase)(value);
+  }
   const clonedTable = (0, _lodashEs.cloneDeep)(table);
   // Symbol can't passed to workers
   clonedTable.columns = clonedTable.columns.map(c => {
@@ -36,7 +41,7 @@ async function calcViewRowsWithWorker(view, table, value, username, userId, user
     return [];
   }
   const calcWorker = Comlink.wrap(worker);
-  const rows = await calcWorker.getViewRows(view, clonedTable, value, username, userId, userDepartmentIdsMap);
+  const rows = await calcWorker.getViewRows(view, clonedTable, _resultCacheManager.cachedBase, username, userId, userDepartmentIdsMap);
   _resultCacheManager.viewRowsCacheManager.set(key, rows);
   _threadManager.default.removeThread(workerId);
   return rows;
@@ -47,6 +52,10 @@ async function calcFormulaResultsWithWorker(table, rows, value, formulaColumns,
   if (cachedResults) {
     return cachedResults;
   }
+  if (!_resultCacheManager.cachedBase) {
+    (0, _hasReactElement.containsReactElementSymbol)(value);
+    (0, _resultCacheManager.initCachedBase)(value);
+  }
   const clonedTable = (0, _lodashEs.cloneDeep)(table);
   // Symbol can't passed to workers
   clonedTable.columns = clonedTable.columns.map(c => {
@@ -62,7 +71,7 @@ async function calcFormulaResultsWithWorker(table, rows, value, formulaColumns,
     return [];
   }
   const calcWorker = Comlink.wrap(worker);
-  const results = await calcWorker.getTableFormulaResults(clonedTable, rows, value, formulaColumns, username, userId, userDepartmentIdsMap);
+  const results = await calcWorker.getTableFormulaResults(clonedTable, rows, _resultCacheManager.cachedBase, formulaColumns, username, userId, userDepartmentIdsMap);
   _resultCacheManager.formulaResultsCacheManager.set(key, results);
   _threadManager.default.removeThread(workerId);
   return results;

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

@@ -3,7 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.viewRowsCacheManager = exports.formulaResultsCacheManager = void 0;
+exports.cachedBase = void 0;
+exports.clearCachedBase = clearCachedBase;
+exports.formulaResultsCacheManager = void 0;
+exports.initCachedBase = initCachedBase;
+exports.viewRowsCacheManager = void 0;
+var _lodashEs = require("lodash-es");
 class ResultCacheManager {
   constructor() {
     this.cache = new Map();
@@ -19,4 +24,30 @@ class ResultCacheManager {
   }
 }
 const viewRowsCacheManager = exports.viewRowsCacheManager = new ResultCacheManager();
-const formulaResultsCacheManager = exports.formulaResultsCacheManager = new ResultCacheManager();
+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;
+  });
+  const clonedBase = (0, _lodashEs.cloneDeep)(value);
+  clonedBase.tables.forEach(t => {
+    // delete symbols
+    t.columns = t.columns.map(c => {
+      delete c.editor;
+      delete c.formatter;
+      return c;
+    });
+    t.rows = tableIdRowMap[t._id];
+  });
+  value.tables.forEach(t => {
+    t.rows = tableIdRowMap[t._id];
+  });
+  exports.cachedBase = cachedBase = clonedBase;
+}
+function clearCachedBase() {
+  exports.cachedBase = cachedBase = null;
+}

package/es/utils/hasReactElement.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.containsReactElementSymbol = containsReactElementSymbol;
+const REACT_ELEMENT_TYPE = Symbol.for('react.element');
+function containsReactElementSymbol(obj) {
+  let parent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  if (obj === null || typeof obj !== 'object') {
+    return false;
+  }
+
+  // Check if the current object is a React element
+  if (obj.$$typeof === REACT_ELEMENT_TYPE) {
+    console.log('Parent object containing Symbol(react.element):', parent);
+    return true;
+  }
+
+  // Recursively check all properties of the object
+  for (let key in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, key)) {
+      if (containsReactElementSymbol(obj[key], obj)) {
+        return true;
+      }
+    }
+  }
+
+  // Check symbol properties as well
+  const symbolProperties = Object.getOwnPropertySymbols(obj);
+  for (let symbol of symbolProperties) {
+    if (containsReactElementSymbol(obj[symbol], obj)) {
+      return true;
+    }
+  }
+  return false;
+}

package/es/utils/test.js

@@ -0,0 +1 @@
+"use strict";

package/package.json

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