sea-chart 2.0.56 → 2.0.58-alpha.1

package/dist/view/index.js

@@ -146,7 +146,10 @@ class View extends _react.default.PureComponent {
       isCalculateByView,
       autoRefresh,
       refreshInterval,
-      pageId
+      pageId,
+      hasUnSaved,
+      chart,
+      tables
     } = this.props;
     this.unsubscribeReFreshChart = _eventBus.default.subscribe(_commonConstants.CommonEventTypes.REFRESH_CHARTS, this.refreshChart);
 
@@ -167,10 +170,7 @@ class View extends _react.default.PureComponent {
         this.calculateStatistic();
       }, refreshInterval * 60000);
     }
-    const {
-      hasUnSaved
-    } = this.props;
-    if (!hasUnSaved) {
+    if (!hasUnSaved || !_chartUtils.BaseUtils.isValidExistChart(tables, chart)) {
       this.calculateStatistic();
     }
   }
@@ -178,20 +178,20 @@ class View extends _react.default.PureComponent {
     this.unsubscribeReFreshChart();
     this.refreshTimer && clearInterval(this.refreshTimer);
   }
-  componentDidUpdate(nextProps) {
-    const {
-      chart: oldChart,
-      hasUnSaved,
-      version
-    } = this.props;
+  componentDidUpdate(prevProps) {
     const {
       chart,
-      hasUnSaved: nextUnSaved,
-      version: nextVersion,
+      hasUnSaved,
+      version,
       autoRefresh,
       refreshInterval,
       pageId
-    } = nextProps;
+    } = this.props;
+    const {
+      chart: oldChart,
+      hasUnSaved: prevHasUnSaved,
+      version: prevVersion
+    } = prevProps;
     const {
       data
     } = this.state;
@@ -216,32 +216,32 @@ class View extends _react.default.PureComponent {
 
     // universal-apps will not trigger calculation of the chart before the chart config saved
     // after saving, hasUnSaved was set to false, then start calculation
-    const needCalc = hasUnSaved === true && nextUnSaved === false;
+    const needCalc = prevHasUnSaved === true && hasUnSaved === false;
     if (needCalc && !data) {
       this.calculateStatistic();
       return;
     }
 
     // version was used to dectect table change in big screen plugin
-    if ((0, _shallowequal.default)(chart, oldChart) && version === nextVersion) return;
+    if ((0, _shallowequal.default)(chart, oldChart) && version === prevVersion) return;
     this.setState({
       isCalculated: false
     }, () => {
-      if (_chartUtils.BaseUtils.isChartTypeChange(chart, oldChart)) {
+      if (_chartUtils.BaseUtils.isChartTypeChange(oldChart, chart)) {
         this.calculateStatistic();
         return;
       }
-      if (_chartUtils.BaseUtils.isChartViewChange(chart, oldChart)) {
+      if (_chartUtils.BaseUtils.isChartViewChange(oldChart, chart)) {
         this.calculateStatistic();
         return;
       }
-      if (_chartUtils.BaseUtils.isChartStyleChange(chart, oldChart)) {
+      if (_chartUtils.BaseUtils.isChartStyleChange(oldChart, chart)) {
         this.setState({
           isCalculated: true
         });
         return;
       }
-      if (_chartUtils.BaseUtils.isChartSortChange(chart, oldChart)) {
+      if (_chartUtils.BaseUtils.isChartSortChange(oldChart, chart)) {
         this.calculateStatistic(false);
         return;
       }
@@ -365,6 +365,11 @@ const propTypes = exports.propTypes = {
   departments: _propTypes.default.array,
   dtableStoreValue: _propTypes.default.object,
   isCalculateByView: _propTypes.default.bool,
+  hasUnSaved: _propTypes.default.bool,
+  pageId: _propTypes.default.string,
+  version: _propTypes.default.oneOfType([_propTypes.default.string, _propTypes.default.number]),
+  autoRefresh: _propTypes.default.bool,
+  refreshInterval: _propTypes.default.number,
   // event
   integratedEventTypes: _propTypes.default.object,
   integratedEventBus: _propTypes.default.object,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "2.0.56",
+  "version": "2.0.58-alpha.1",
   "main": "./dist/index.js",
   "dependencies": {
     "@dnd-kit/core": "^6.1.0",
@@ -9,7 +9,7 @@
     "@dnd-kit/utilities": "^3.2.2",
     "@seafile/seafile-calendar": "^1.0.8",
     "@seafile/seafile-editor": "^3.0.26",
-    "axios": "~1.16.*",
+    "axios": "^1.19.0",
     "classnames": "^2.3.2",
     "d3": "~7.9.0",
     "dayjs": "1.10.7",
@@ -36,12 +36,11 @@
     "start.bak": "node scripts/start.js",
     "build": "node scripts/build.js",
     "pub:dist": "cross-env BABEL_ENV=production ./node_modules/.bin/babel src --out-dir dist --copy-files",
-    "eslint": "eslint --ext .jsx,.js src --max-warnings=0",
+    "eslint": "cross-env BABEL_ENV=development NODE_ENV=development eslint --ext .jsx,.js src --max-warnings=0",
     "lint": "lint-staged",
     "pub:optimized": "rimraf dist/config.js",
     "prepare": "husky install",
     "prepublishOnly": "npm run clean && npm run pub:dist",
-    "release": "release-it",
     "start": "cross-env NODE_ENV=development LOG_ENV=rc NODE_OPTIONS=--openssl-legacy-provider node dev-server.js",
     "translate": "node scripts/translate.js",
     "push-translate": "tx push -s",
@@ -75,7 +74,8 @@
   },
   "devDependencies": {
     "@babel/cli": "7.22.10",
-    "@babel/core": "7.22.11",
+    "@babel/core": "7.29.7",
+    "@babel/eslint-parser": "7.25.9",
     "@babel/plugin-proposal-object-rest-spread": "^7.9.6",
     "@babel/plugin-proposal-private-property-in-object": "7.21.11",
     "@babel/plugin-transform-runtime": "^7.23.9",
@@ -84,9 +84,8 @@
     "@gatsbyjs/reach-router": "^1.3.9",
     "@svgr/webpack": "6.5.1",
     "@types/jest": "29.0.0",
-    "@typescript-eslint/eslint-plugin": "^2.2.0",
-    "@typescript-eslint/parser": "^2.2.0",
-    "babel-eslint": "10.0.3",
+    "@typescript-eslint/eslint-plugin": "5.62.0",
+    "@typescript-eslint/parser": "5.62.0",
     "babel-jest": "26.6.3",
     "babel-loader": "8.0.6",
     "babel-plugin-import": "^1.13.8",
@@ -99,19 +98,19 @@
     "core-js": "^3.35.1",
     "cross-env": "^7.0.3",
     "css-loader": "^6.5.1",
-    "css-minimizer-webpack-plugin": "5.0.1",
+    "css-minimizer-webpack-plugin": "8.0.0",
     "dotenv": "6.2.0",
     "dotenv-expand": "5.1.0",
     "dtable-store": "~6.0.11",
     "dtable-ui-component": "7.0.7",
     "ejs": "3.1.10",
-    "eslint": "^6.8.0",
-    "eslint-config-react-app": "^5.0.2",
-    "eslint-loader": "4.0.2",
-    "eslint-plugin-flowtype": "3.13.0",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jsx-a11y": "6.2.3",
-    "eslint-plugin-react": "~7.37.4",
+    "eslint": "8.57.1",
+    "eslint-config-react-app": "7.0.1",
+    "eslint-plugin-flowtype": "8.0.3",
+    "eslint-plugin-import": "2.32.0",
+    "eslint-plugin-jsx-a11y": "6.10.2",
+    "eslint-plugin-react": "7.37.5",
+    "eslint-webpack-plugin": "4.2.0",
     "file-loader": "6.2.0",
     "fs-extra": "^10.1.0",
     "html-webpack-plugin": "^5.6.0",
@@ -119,7 +118,7 @@
     "identity-obj-proxy": "3.0.0",
     "is-wsl": "^1.1.0",
     "jest": "26.6.3",
-    "koa": "2.16.1",
+    "koa": "2.16.4",
     "koa-router": "7.3.0",
     "koa-send": "5.0.1",
     "koa2-cors": "2.0.6",
@@ -129,7 +128,7 @@
     "nodemon": "^3.1.0",
     "object-assign": "4.1.1",
     "pnp-webpack-plugin": "1.5.0",
-    "postcss": "8.4.31",
+    "postcss": "8.5.26",
     "postcss-flexbugs-fixes": "^5.0.2",
     "postcss-loader": "^6.2.1",
     "postcss-normalize": "^10.0.1",
@@ -138,33 +137,26 @@
     "raf": "3.4.0",
     "react": "~18.3.1",
     "react-app-polyfill": "~3.0.0",
-    "react-cookies": "0.1.1",
     "react-dev-utils": "^12.0.1",
     "react-dom": "~18.3.1",
     "react-i18next": "12.1.4",
     "regenerator-runtime": "^0.14.1",
-    "release-it": "16.2.1",
     "resolve": "1.12.0",
     "resolve-url-loader": "5.0.0",
     "rimraf": "^5.0.7",
     "sass-loader": "13.3.2",
     "style-loader": "^1.0.1",
     "svgo-loader": "^3.0.0",
-    "terser-webpack-plugin": "4.2.3",
+    "terser-webpack-plugin": "5.6.1",
     "ts-pnp": "1.1.4",
     "url-loader": "4.1.1",
-    "webpack": "5.88.2",
-    "webpack-dev-server": "5.2.0",
+    "webpack": "5.91.0",
+    "webpack-dev-server": "5.2.6",
     "webpack-manifest-plugin": "5.0.0",
     "webpack-merge": "5.8.0",
-    "workbox-webpack-plugin": "7.0.0"
+    "workbox-webpack-plugin": "7.4.1"
   },
   "publishConfig": {
     "access": "public"
-  },
-  "release-it": {
-    "npm": {
-      "tag": "next"
-    }
   }
 }