dtable-statistic 5.0.48-alpha.10 → 5.0.48-alpha.3

package/es/index.js

@@ -41,7 +41,7 @@ class Statistic {
       userId = null,
       userDepartmentIdsMap = null
     } = dtableStore.dtableSettings;
-    const rows = await (0, _calcWithWorker.calcViewRowsWithWorker)(view, table, dtableStore.value, username, userId, userDepartmentIdsMap);
+    const rows = await (0, _calcWithWorker.calcViewRowsWithWorker)(view, table, this.dtableStore.value, username, userId, userDepartmentIdsMap);
     return rows;
   }
   static async getTableFormulaResults(table, rows) {
@@ -52,7 +52,7 @@ class Statistic {
       userDepartmentIdsMap = null
     } = dtableStore.dtableSettings;
     const formulaColumns = _dtableStore.Views.getFormulaColumnsContainLinks(table);
-    const res = await (0, _calcWithWorker.calcFormulaResultsWithWorker)(table, rows, dtableStore.value, formulaColumns, username, userId, userDepartmentIdsMap);
+    const res = await (0, _calcWithWorker.calcFormulaResultsWithWorker)(table, rows, this.dtableStore.value, formulaColumns, username, userId, userDepartmentIdsMap);
     return res;
   }
   static updateStatistics(dtableStore, statistics) {

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

@@ -1,32 +1,51 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.calcFormulaResultsWithWorker = calcFormulaResultsWithWorker;
 exports.calcViewRowsWithWorker = calcViewRowsWithWorker;
-var Comlink = _interopRequireWildcard(require("comlink"));
-var _calc = _interopRequireDefault(require("./calc.worker"));
-var _dtableStore = require("dtable-store");
-async function calcViewRowsWithWorker(view, table, value, username, userId, userDepartmentIdsMap) {
-  const worker = new _calc.default();
-  const calcWorker = Comlink.wrap(worker);
-  const cb = () => _dtableStore.Views.getViewRows(view, table, value, username, userId, userDepartmentIdsMap);
-  const rows = await calcWorker(Comlink.proxy(cb));
-  worker.terminate();
-  return rows;
+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();
+    };
+  });
 }
-async function calcFormulaResultsWithWorker(table, rows, value, formulaColumns, username, userId, userDepartmentIdsMap) {
-  const worker = new _calc.default();
-  const calcWorker = Comlink.wrap(worker);
-  const cb = () => _dtableStore.Views.getTableFormulaResults(table, rows, value, formulaColumns, {
-    username,
-    userId,
-    userDepartmentIdsMap
+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();
+    };
   });
-  const results = await calcWorker(Comlink.proxy(cb));
-  worker.terminate();
-  return results;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dtable-statistic",
-  "version": "5.0.48-alpha.10",
+  "version": "5.0.48-alpha.3",
   "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.95-alpha.4"
+    "sea-chart": "~0.0.94"
+    
   },
   "peerDependencies": {
     "dtable-ui-component": "~5.0.*",
@@ -52,7 +53,7 @@
     "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",

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

@@ -1,10 +0,0 @@
-"use strict";
-
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-var Comlink = _interopRequireWildcard(require("comlink"));
-async function calcFormulaResults(callback) {
-  // const res =  Views.getTableFormulaResults(table, rows, value, formulaColumns, { username, userId, userDepartmentIdsMap });
-  const res = await callback();
-  return res;
-}
-Comlink.expose(calcFormulaResults);

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

@@ -1,10 +0,0 @@
-"use strict";
-
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-var Comlink = _interopRequireWildcard(require("comlink"));
-async function calcViewRows(callback) {
-  // const rows = Views.getViewRows(view, table, value, username, userId, userDepartmentIdsMap);
-  const rows = await callback();
-  return rows;
-}
-Comlink.expose(calcViewRows);

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

@@ -1,8 +0,0 @@
-"use strict";
-
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-var Comlink = _interopRequireWildcard(require("comlink"));
-async function calc(callback) {
-  return callback();
-}
-Comlink.expose(calc);