sea-chart 2.0.37 → 2.0.39

package/dist/view/wrapper/table-element/index.js

@@ -29,8 +29,9 @@ class TableElement extends _react.default.Component {
       };
     };
     this.queryUsers = emails => {
+      const currentEmails = _context.default.getCollaboratorsFromCache().map(user => user.email);
       let queryEmails = emails.filter(email => {
-        return !this.relatedUserEmailMap[email];
+        return !currentEmails.includes(email);
       });
       if (queryEmails.length === 0) return;
       if (this.isQuerying) {
@@ -38,32 +39,26 @@ class TableElement extends _react.default.Component {
         return;
       }
       this.isQuerying = true;
-      _context.default.queryUsers(queryEmails, this.updateRelatedUser);
-    };
-    this.queryPendingUsers = () => {
-      if (this.pendingUserList.length === 0) {
-        this.isQuerying = false;
-        return;
-      }
-      let queryEmails = [...new Set(this.pendingUserList)];
-      this.pendingUserList = [];
-      _context.default.queryUsers(queryEmails, this.updateRelatedUser);
+      setTimeout(() => {
+        _context.default.queryUsers(queryEmails, this.updateRelatedUser);
+      }, 500);
     };
     this.updateRelatedUser = emailUserMap => {
-      let newUsers = [...this.state.relatedUserList];
+      this.isQuerying = false;
+      const currentEmails = _context.default.getCollaboratorsFromCache().map(user => user.email);
       for (let email in emailUserMap) {
-        if (!this.relatedUserEmailMap[email]) {
-          this.relatedUserEmailMap[email] = true;
+        if (!currentEmails.includes(email)) {
           _context.default.updateCollaboratorsCache(email, emailUserMap[email]);
-          newUsers.push(emailUserMap[email]);
         }
       }
-      if (this.state.relatedUserList.length !== newUsers.length) {
-        this.setState({
-          relatedUserList: newUsers
-        });
-      }
-      this.queryPendingUsers();
+      const newUsers = _context.default.getCollaboratorsFromCache();
+      this.relatedUserEmailMap = {};
+      newUsers.forEach(u => {
+        this.relatedUserEmailMap[u.email] = true;
+      });
+      this.setState({
+        relatedUserList: newUsers
+      });
     };
     const {
       chart,

package/dist/view/wrapper/trend.js

@@ -14,6 +14,24 @@ var _constants = require("../../constants");
 class Trend extends _react.Component {
   constructor() {
     super(...arguments);
+    this.handleClickNumber = () => {
+      const {
+        toggleRecords,
+        result
+      } = this.props;
+      if (!toggleRecords) return;
+      if (typeof result === 'object' && result !== null && result.rows) {
+        // isCalculateByView = true: use rows of current period
+        toggleRecords({
+          rows: result.rows
+        });
+      } else {
+        // isCalculateByView = false: use rows of sql query
+        toggleRecords({
+          isQueryBySql: true
+        });
+      }
+    };
     this.formatData = data => {
       if (!data && data !== 0) return _intl.default.get(_constants.EMPTY_NAME);
       const {
@@ -213,7 +231,12 @@ class Trend extends _react.Component {
         fontWeight: "".concat(num_font_weight),
         color: "".concat(num_font_color)
       }
-    }, content), /*#__PURE__*/_react.default.createElement("p", {
+    }, /*#__PURE__*/_react.default.createElement("span", {
+      onClick: this.handleClickNumber,
+      style: {
+        cursor: 'pointer'
+      }
+    }, content)), /*#__PURE__*/_react.default.createElement("p", {
       className: "label-content",
       style: {
         position: 'absolute',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "2.0.37",
+  "version": "2.0.39",
   "main": "./dist/index.js",
   "dependencies": {
     "@dnd-kit/core": "^6.1.0",
@@ -9,23 +9,27 @@
     "@dnd-kit/utilities": "^3.2.2",
     "@seafile/seafile-calendar": "^1.0.8",
     "@seafile/seafile-editor": "^3.0.26",
+    "axios": "~1.15.*",
     "classnames": "^2.3.2",
     "d3": "~7.9.0",
     "dayjs": "1.10.7",
     "is-hotkey": "0.2.0",
     "lodash-es": "^4.17.21",
     "rc-slider": "^10.5.0",
-    "reactstrap": "~9.2.3",
+    "react-i18next": "^14.1.2",
+    "reactstrap": "9.2.3",
     "shallowequal": "^1.1.0",
     "slugid": "~5.0.1",
     "topojson": "^3.0.2"
   },
   "peerDependencies": {
-    "dtable-ui-component": "~6.0.110",
+    "@antv/scale": "0.3.14",
+    "d3-composite-projections": "~1.4.*",
+    "dtable-ui-component": "~6.0.*",
     "dtable-utils": "~5.0.*",
     "prop-types": "15.8.1",
-    "react": "18.3.1",
-    "react-dom": "18.3.1"
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1"
   },
   "scripts": {
     "clean": "rimraf dist && mkdirp dist",
@@ -81,7 +85,6 @@
     "@types/jest": "29.0.0",
     "@typescript-eslint/eslint-plugin": "^2.2.0",
     "@typescript-eslint/parser": "^2.2.0",
-    "axios": "^1.6.0",
     "babel-eslint": "10.0.3",
     "babel-jest": "26.6.3",
     "babel-loader": "8.0.6",
@@ -98,7 +101,8 @@
     "css-minimizer-webpack-plugin": "5.0.1",
     "dotenv": "6.2.0",
     "dotenv-expand": "5.1.0",
-    "dtable-store": "~4.3.18",
+    "dtable-store": "~6.0.11",
+    "dtable-ui-component": "6.0.110",
     "ejs": "3.1.10",
     "eslint": "^6.8.0",
     "eslint-config-react-app": "^5.0.2",
@@ -114,7 +118,7 @@
     "identity-obj-proxy": "3.0.0",
     "is-wsl": "^1.1.0",
     "jest": "26.6.3",
-    "koa": "2.16.0",
+    "koa": "2.16.1",
     "koa-router": "7.3.0",
     "koa-send": "5.0.1",
     "koa2-cors": "2.0.6",
@@ -144,13 +148,12 @@
     "rimraf": "^5.0.7",
     "sass-loader": "13.3.2",
     "style-loader": "^1.0.1",
-    "svg-sprite-loader": "~6.0.11",
-    "svgo-loader": "~3.0.0",
+    "svgo-loader": "^3.0.0",
     "terser-webpack-plugin": "4.2.3",
     "ts-pnp": "1.1.4",
     "url-loader": "4.1.1",
     "webpack": "5.88.2",
-    "webpack-dev-server": "4.15.1",
+    "webpack-dev-server": "5.2.0",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-merge": "5.8.0",
     "workbox-webpack-plugin": "7.0.0"
@@ -158,4 +161,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}