dtable-statistic 5.0.46 → 5.0.48-alpha.0

package/es/index.js

@@ -40,7 +40,7 @@ class Statistic {
       userId = null,
       userDepartmentIdsMap = null
     } = dtableStore.dtableSettings;
-    return _dtableStore.Views.getViewRows(view, table, dtableStore.value, username, userId, userDepartmentIdsMap);
+    return _dtableStore.Views.optimizedGetViewRows(view, table, dtableStore.value, username, userId, userDepartmentIdsMap);
   }
   static getTableFormulaResults(table, rows) {
     const dtableStore = window.app.dtableStore || {};
@@ -50,7 +50,7 @@ class Statistic {
       userDepartmentIdsMap = null
     } = dtableStore.dtableSettings;
     const formulaColumns = _dtableStore.Views.getFormulaColumnsContainLinks(table);
-    return _dtableStore.Views.getTableFormulaResults(table, rows, dtableStore.value, formulaColumns, {
+    return _dtableStore.Views.getTableFormulaResultsWithWroker(table, rows, dtableStore.value, formulaColumns, {
       username,
       userId,
       userDepartmentIdsMap

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

@@ -0,0 +1,21 @@
+"use strict";
+
+var _dtableStore = require("dtable-store");
+/* eslint-disable no-restricted-globals */
+self.onmessage = function (e) {
+  const {
+    table,
+    rows,
+    value,
+    formulaColumns,
+    username,
+    userId,
+    userDepartmentIdsMap
+  } = e.data;
+  const res = _dtableStore.Views.getTableFormulaResults(table, rows, value, formulaColumns, {
+    username,
+    userId,
+    userDepartmentIdsMap
+  });
+  self.postMessage(res);
+};

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

@@ -0,0 +1,16 @@
+"use strict";
+
+var _dtableStore = require("dtable-store");
+/* eslint-disable no-restricted-globals */
+self.onmessage = function (e) {
+  const {
+    view,
+    table,
+    value,
+    username,
+    userId,
+    userDepartmentIdsMap
+  } = e.data;
+  const rows = _dtableStore.Views.getViewRows(view, table, value, username, userId, userDepartmentIdsMap);
+  self.postMessage(rows);
+};

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

@@ -0,0 +1,74 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.calcFormulaResultsWithWorker = calcFormulaResultsWithWorker;
+exports.calcViewRowsWithWorker = calcViewRowsWithWorker;
+function calcViewRowsWithWorker(view, table, value) {
+  return new Promise((resolve, reject) => {
+    const worker = new Worker(new URL('./calc-view-rows-worker.js', import.meta.url), {
+      type: 'module'
+    });
+    worker.postMessage({
+      view,
+      table,
+      value
+    });
+    worker.onmessage = function (e) {
+      resolve(e.data);
+      worker.terminate();
+    };
+    worker.onerror = function (e) {
+      reject(e);
+      worker.terminate();
+    };
+  });
+}
+function calcFormulaResultsWithWorker(table, rows, value, formulaColumns, username, userId, userDepartmentIdsMap) {
+  return new Promise((resolve, reject) => {
+    const worker = new Worker(new URL('./calc-formula-result-worker.js', import.meta.url), {
+      type: 'module'
+    });
+    worker.postMessage({
+      table,
+      rows,
+      value,
+      formulaColumns,
+      username,
+      userId,
+      userDepartmentIdsMap
+    });
+    worker.onmessage = function (e) {
+      resolve(e.data);
+      worker.terminate();
+    };
+    worker.onerror = function (e) {
+      reject(e);
+      worker.terminate();
+    };
+  });
+}
+
+// export async function calcWithWorker(view, table, value) {
+//   let res = [];
+//   // set worker to 2
+//   const maxWorkers = 2;
+//   const numWorkers = Math.min(rows.length, maxWorkers);
+//   const sliceLength = Math.ceil(rows.length / numWorkers);
+
+//   let tasks = [];
+//   for (let i = 0; i < numWorkers; i++) {
+//     const start = i * sliceLength;
+//     const end = Math.min(start + sliceLength, rows.length);
+//     tasks.push(createWorker(columns, key_column_map, rows.slice(start, end), updatedFormulaRows, formulaCalculatorParams));
+//   }
+
+//   try {
+//     res = await Promise.all(tasks);
+//   } catch (error) {
+//     console.error('Error occurred', error);
+//   }
+
+//   return res;
+// }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "5.0.46",
+  "version": "5.0.48-alpha.0",
   "description": "statistics",
   "main": "dist/dtable-statistic.js",
   "author": "seafile",
@@ -18,7 +18,8 @@
     "react-grid-layout": "^1.2.5",
     "react-intl-universal": "^2.4.8",
     "reactstrap": "8.9.0",
-    "sea-chart": "~0.0.92"
+    "sea-chart": "~0.0.94"
+    
   },
   "peerDependencies": {
     "dtable-ui-component": "~5.0.*",
@@ -52,9 +53,10 @@
     "css-minimizer-webpack-plugin": "^3.2.0",
     "dotenv": "^10.0.0",
     "dotenv-expand": "^5.1.0",
-    "dtable-store": "4.3.6",
+    "dtable-store": "5.0.8",
     "dtable-ui-component": "~5.0.11",
     "dtable-utils": "5.0.0",
+    "dtable-web-api": "^5.0.3",
     "eslint": "^8.3.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-webpack-plugin": "^3.1.1",