From 61aabda58d2d83c1e684b5bba3c2b60cf6df248e Mon Sep 17 00:00:00 2001 From: Andrew Simachev Date: Tue, 9 Jan 2024 17:14:20 +0100 Subject: [PATCH] fix linter --- .eslintignore | 11 +- .eslintrc.js | 1 + package-lock.json | 196 +++++++++--------- package.json | 4 +- .../block/dataview/cell/checkbox.tsx | 2 +- src/ts/component/list/objectManager.tsx | 8 +- .../component/menu/dataview/filter/list.tsx | 2 +- src/ts/component/menu/search/object.tsx | 3 +- src/ts/component/page/head/controls.tsx | 2 +- src/ts/component/popup/confirm.tsx | 4 +- .../popup/page/settings/space/create.tsx | 2 +- src/ts/component/preview/object.tsx | 2 +- src/ts/component/util/iconObject.tsx | 2 +- src/ts/component/widget/index.tsx | 2 +- src/ts/component/widget/list/index.tsx | 2 +- src/ts/lib/analytics.ts | 2 +- src/ts/lib/api/dispatcher.ts | 5 +- src/ts/lib/relation.ts | 2 +- src/ts/lib/util/date.ts | 4 +- src/ts/store/auth.ts | 3 +- src/ts/store/menu.ts | 2 +- 21 files changed, 132 insertions(+), 129 deletions(-) diff --git a/.eslintignore b/.eslintignore index 985499105e..6c91b6dfc8 100644 --- a/.eslintignore +++ b/.eslintignore @@ -3,19 +3,18 @@ electron/env.json electron/about/* src/json/schema licenses.json -**/*.min.js +**/*.js # generated by update.sh *-arm64/ windows/ # ignore everything in dist + /dist/* + # except... + !/dist/css -!/dist/js/export.js !/dist/index.html -!/dist/index.web.html -!/dist/run.js -!/dist/workers/graph.js -!/dist/workers/lib/util.js \ No newline at end of file +!/dist/index.web.html \ No newline at end of file diff --git a/.eslintrc.js b/.eslintrc.js index 740b2ac889..3d6e49f4c3 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -37,6 +37,7 @@ module.exports = { 'no-case-declarations': 'off', 'no-console': 'off', 'no-var': 'warn', + 'no-extra-semi': 'off', // unused vars 'no-unused-vars': 'off', diff --git a/package-lock.json b/package-lock.json index 52f2375a58..b871a854b4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -79,8 +79,8 @@ "@types/react": "^16.14.31", "@types/react-dom": "^16.9.16", "@types/react-router-dom": "^4.3.5", - "@typescript-eslint/eslint-plugin": "^5.46.1", - "@typescript-eslint/parser": "^5.46.1", + "@typescript-eslint/eslint-plugin": "^6.18.1", + "@typescript-eslint/parser": "^6.18.1", "cross-env": "^7.0.2", "css-loader": "^3.6.0", "electron": "^28.1.2", @@ -1667,32 +1667,33 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", - "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", + "version": "6.18.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.18.1.tgz", + "integrity": "sha512-nISDRYnnIpk7VCFrGcu1rnZfM1Dh9LRHnfgdkjcbi/l7g16VYRri3TjXi9Ir4lOZSw5N/gnV/3H7jIPQ8Q4daA==", "dev": true, "dependencies": { - "@eslint-community/regexpp": "^4.4.0", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/type-utils": "5.62.0", - "@typescript-eslint/utils": "5.62.0", + "@eslint-community/regexpp": "^4.5.1", + "@typescript-eslint/scope-manager": "6.18.1", + "@typescript-eslint/type-utils": "6.18.1", + "@typescript-eslint/utils": "6.18.1", + "@typescript-eslint/visitor-keys": "6.18.1", "debug": "^4.3.4", "graphemer": "^1.4.0", - "ignore": "^5.2.0", - "natural-compare-lite": "^1.4.0", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "ignore": "^5.2.4", + "natural-compare": "^1.4.0", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^5.0.0", - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -1701,25 +1702,26 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", - "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", + "version": "6.18.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.18.1.tgz", + "integrity": "sha512-zct/MdJnVaRRNy9e84XnVtRv9Vf91/qqe+hZJtKanjojud4wAVy/7lXxJmMyX6X6J+xc6c//YEWvpeif8cAhWA==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", + "@typescript-eslint/scope-manager": "6.18.1", + "@typescript-eslint/types": "6.18.1", + "@typescript-eslint/typescript-estree": "6.18.1", + "@typescript-eslint/visitor-keys": "6.18.1", "debug": "^4.3.4" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -1728,16 +1730,16 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", - "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "version": "6.18.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.18.1.tgz", + "integrity": "sha512-BgdBwXPFmZzaZUuw6wKiHKIovms97a7eTImjkXCZE04TGHysG+0hDQPmygyvgtkoB/aOQwSM/nWv3LzrOIQOBw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0" + "@typescript-eslint/types": "6.18.1", + "@typescript-eslint/visitor-keys": "6.18.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -1745,25 +1747,25 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", - "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", + "version": "6.18.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.18.1.tgz", + "integrity": "sha512-wyOSKhuzHeU/5pcRDP2G2Ndci+4g653V43gXTpt4nbyoIOAASkGDA9JIAgbQCdCkcr1MvpSYWzxTz0olCn8+/Q==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "5.62.0", - "@typescript-eslint/utils": "5.62.0", + "@typescript-eslint/typescript-estree": "6.18.1", + "@typescript-eslint/utils": "6.18.1", "debug": "^4.3.4", - "tsutils": "^3.21.0" + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "*" + "eslint": "^7.0.0 || ^8.0.0" }, "peerDependenciesMeta": { "typescript": { @@ -1772,12 +1774,12 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", - "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "version": "6.18.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.18.1.tgz", + "integrity": "sha512-4TuMAe+tc5oA7wwfqMtB0Y5OrREPF1GeJBAjqwgZh1lEMH5PJQgWgHGfYufVB51LtjD+peZylmeyxUXPfENLCw==", "dev": true, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -1785,21 +1787,22 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", - "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "version": "6.18.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.18.1.tgz", + "integrity": "sha512-fv9B94UAhywPRhUeeV/v+3SBDvcPiLxRZJw/xZeeGgRLQZ6rLMG+8krrJUyIf6s1ecWTzlsbp0rlw7n9sjufHA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/visitor-keys": "5.62.0", + "@typescript-eslint/types": "6.18.1", + "@typescript-eslint/visitor-keys": "6.18.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", - "semver": "^7.3.7", - "tsutils": "^3.21.0" + "minimatch": "9.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -1811,43 +1814,57 @@ } } }, - "node_modules/@typescript-eslint/utils": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", - "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", + "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@types/json-schema": "^7.0.9", - "@types/semver": "^7.3.12", - "@typescript-eslint/scope-manager": "5.62.0", - "@typescript-eslint/types": "5.62.0", - "@typescript-eslint/typescript-estree": "5.62.0", - "eslint-scope": "^5.1.1", - "semver": "^7.3.7" + "brace-expansion": "^2.0.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "6.18.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.18.1.tgz", + "integrity": "sha512-zZmTuVZvD1wpoceHvoQpOiewmWu3uP9FuTWo8vqpy2ffsmfCE8mklRPi+vmnIYAIk9t/4kOThri2QCDgor+OpQ==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.18.1", + "@typescript-eslint/types": "6.18.1", + "@typescript-eslint/typescript-estree": "6.18.1", + "semver": "^7.5.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + "eslint": "^7.0.0 || ^8.0.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "5.62.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", - "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "version": "6.18.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.18.1.tgz", + "integrity": "sha512-/kvt0C5lRqGoCfsbmm7/CwMqoSkY3zzHLIjdhHZQW3VFrnz7ATecOHR7nb7V+xn4286MBxfnQfQhAmCI0u+bJA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "5.62.0", - "eslint-visitor-keys": "^3.3.0" + "@typescript-eslint/types": "6.18.1", + "eslint-visitor-keys": "^3.4.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^16.0.0 || >=18.0.0" }, "funding": { "type": "opencollective", @@ -9634,12 +9651,6 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true }, - "node_modules/natural-compare-lite": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", - "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", - "dev": true - }, "node_modules/negotiator": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", @@ -20914,6 +20925,18 @@ "utf8-byte-length": "^1.0.1" } }, + "node_modules/ts-api-utils": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz", + "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==", + "dev": true, + "engines": { + "node": ">=16.13.0" + }, + "peerDependencies": { + "typescript": ">=4.2.0" + } + }, "node_modules/ts-dedent": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/ts-dedent/-/ts-dedent-2.2.0.tgz", @@ -21021,27 +21044,6 @@ "node": ">=4" } }, - "node_modules/tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "node_modules/tsutils": { - "version": "3.21.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", - "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", - "dev": true, - "dependencies": { - "tslib": "^1.8.1" - }, - "engines": { - "node": ">= 6" - }, - "peerDependencies": { - "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" - } - }, "node_modules/tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", diff --git a/package.json b/package.json index 05da644fb7..9a704ef40c 100644 --- a/package.json +++ b/package.json @@ -55,8 +55,8 @@ "@types/react": "^16.14.31", "@types/react-dom": "^16.9.16", "@types/react-router-dom": "^4.3.5", - "@typescript-eslint/eslint-plugin": "^5.46.1", - "@typescript-eslint/parser": "^5.46.1", + "@typescript-eslint/eslint-plugin": "^6.18.1", + "@typescript-eslint/parser": "^6.18.1", "cross-env": "^7.0.2", "css-loader": "^3.6.0", "electron": "^28.1.2", diff --git a/src/ts/component/block/dataview/cell/checkbox.tsx b/src/ts/component/block/dataview/cell/checkbox.tsx index 26fe7089f5..232f4616e5 100644 --- a/src/ts/component/block/dataview/cell/checkbox.tsx +++ b/src/ts/component/block/dataview/cell/checkbox.tsx @@ -28,7 +28,7 @@ const CellCheckbox = observer(class CellCheckbox extends React.Component let label = ''; if (withLabel) { - label = UtilCommon.sprintf(translate(`relationCheckboxLabel${Number(value)}`), relation.name) + label = UtilCommon.sprintf(translate(`relationCheckboxLabel${Number(value)}`), relation.name); } else if (withName) { label = relation.name; diff --git a/src/ts/component/list/objectManager.tsx b/src/ts/component/list/objectManager.tsx index 08041d19f6..a063763bf3 100644 --- a/src/ts/component/list/objectManager.tsx +++ b/src/ts/component/list/objectManager.tsx @@ -389,11 +389,11 @@ const ListObjectManager = observer(class ListObjectManager extends React.Compone sources: sources || [], collectionId: collectionId || '' }, (message) => { - this.setState({ isLoading: false }); + this.setState({ isLoading: false }); - if (onAfterLoad) { - onAfterLoad(message); - }; + if (onAfterLoad) { + onAfterLoad(message); + }; }); }; diff --git a/src/ts/component/menu/dataview/filter/list.tsx b/src/ts/component/menu/dataview/filter/list.tsx index 8adc52c214..24298a9c24 100644 --- a/src/ts/component/menu/dataview/filter/list.tsx +++ b/src/ts/component/menu/dataview/filter/list.tsx @@ -142,7 +142,7 @@ const MenuFilterList = observer(class MenuFilterList extends React.Component { this.props.setHover(); }} > -
{translate("menuDataviewFilterNewFilter")}
+
{translate('menuDataviewFilterNewFilter')}
) : ''} diff --git a/src/ts/component/menu/search/object.tsx b/src/ts/component/menu/search/object.tsx index a92941955e..8d2a573221 100644 --- a/src/ts/component/menu/search/object.tsx +++ b/src/ts/component/menu/search/object.tsx @@ -237,8 +237,7 @@ const MenuSearchObject = observer(class MenuSearchObject extends React.Component const { data } = param; const { filter, label, canAdd, addParam } = data; const length = this.items.length; - - let items = [].concat(this.items); + const items = [].concat(this.items); if (label && length) { items.unshift({ isSection: true, name: label }); diff --git a/src/ts/component/page/head/controls.tsx b/src/ts/component/page/head/controls.tsx index b2046b1932..e97ffdfd7b 100644 --- a/src/ts/component/page/head/controls.tsx +++ b/src/ts/component/page/head/controls.tsx @@ -4,7 +4,7 @@ import { observer } from 'mobx-react'; import { Loader } from 'Component'; import { I, C, focus, UtilObject, Action } from 'Lib'; import { menuStore, blockStore, detailStore, commonStore } from 'Store'; -import ControlButtons from './controlButtons'; +import ControlButtons from './controlButtons'; import Constant from 'json/constant.json'; interface Props extends I.PageComponent { diff --git a/src/ts/component/popup/confirm.tsx b/src/ts/component/popup/confirm.tsx index 38c7944911..57a6d8d8b1 100644 --- a/src/ts/component/popup/confirm.tsx +++ b/src/ts/component/popup/confirm.tsx @@ -90,9 +90,9 @@ const PopupConfirm = observer(class PopupConfirm extends React.Component= buttons.length) { + if (this.n > buttons.length - 1) { this.n = 0; }; diff --git a/src/ts/component/popup/page/settings/space/create.tsx b/src/ts/component/popup/page/settings/space/create.tsx index 50055df2b6..8df927a213 100644 --- a/src/ts/component/popup/page/settings/space/create.tsx +++ b/src/ts/component/popup/page/settings/space/create.tsx @@ -204,7 +204,7 @@ const PopupSettingsSpaceIndex = observer(class PopupSettingsSpaceIndex extends R this.setState({ isLoading: false }); if (!message.error.code) { - analytics.event('CreateSpace', { usecase, middleTime: message.middleTime, }); + analytics.event('CreateSpace', { usecase, middleTime: message.middleTime }); analytics.event('SelectUsecase', { type: usecase }); if (onCreate) { diff --git a/src/ts/component/preview/object.tsx b/src/ts/component/preview/object.tsx index bb9eed9119..7131e44542 100644 --- a/src/ts/component/preview/object.tsx +++ b/src/ts/component/preview/object.tsx @@ -440,7 +440,7 @@ const PreviewObject = observer(class PreviewObject extends React.Component { const { targetBlockId } = child.content; const space = UtilObject.getSpaceview(); const templateType = dbStore.getTemplateType(); - const sorts = []; + const sorts = []; const filters: I.Filter[] = [ { operator: I.FilterOperator.And, relationKey: 'layout', condition: I.FilterCondition.NotIn, value: UtilObject.getFileAndSystemLayouts() }, { operator: I.FilterOperator.And, relationKey: 'type', condition: I.FilterCondition.NotEqual, value: templateType?.id }, diff --git a/src/ts/component/widget/list/index.tsx b/src/ts/component/widget/list/index.tsx index 24c5e8bc67..44fdfe6f7d 100644 --- a/src/ts/component/widget/list/index.tsx +++ b/src/ts/component/widget/list/index.tsx @@ -35,7 +35,7 @@ const WidgetList = observer(class WidgetList extends React.Component it.split('/')[0])) + return UtilCommon.arrayUnique((subIds || []).map(it => it.split('/')[0])); }; detailsUpdate (details: any, rootId: string, id: string, subIds: string[], clear: boolean) { @@ -1156,7 +1156,8 @@ class Dispatcher { return; }; - let t0 = performance.now(); + const t0 = performance.now(); + let t1 = 0; let t2 = 0; let d = null; diff --git a/src/ts/lib/relation.ts b/src/ts/lib/relation.ts index 04f79dade6..d3c0f4c4af 100644 --- a/src/ts/lib/relation.ts +++ b/src/ts/lib/relation.ts @@ -567,7 +567,7 @@ class Relation { flags.push(I.ObjectFlag.SelectType); }; - return { flags, details } + return { flags, details }; }; systemKeys () { diff --git a/src/ts/lib/util/date.ts b/src/ts/lib/util/date.ts index 4e6f2dac34..132f75a283 100644 --- a/src/ts/lib/util/date.ts +++ b/src/ts/lib/util/date.ts @@ -23,9 +23,9 @@ class UtilDate { if ((y >= 0) && (y < 1000)) { t = new Date(y + 1000, m, d, h, i, s, 0); - t.setUTCFullYear(t.getFullYear() - 1000); + t.setUTCFullYear(t.getFullYear() - 1000); } else { - t = new Date(y, m, d, h, i, s, 0) + t = new Date(y, m, d, h, i, s, 0); }; return Math.floor(t.getTime() / 1000); diff --git a/src/ts/store/auth.ts b/src/ts/store/auth.ts index 55ba38271a..b87794ff19 100644 --- a/src/ts/store/auth.ts +++ b/src/ts/store/auth.ts @@ -176,7 +176,8 @@ class AuthStore { logout (mainWindow: boolean, removeData: boolean) { if (mainWindow) { C.AccountStop(removeData, () => { - C.WalletCloseSession(this.token) + C.WalletCloseSession(this.token); + this.tokenSet(''); }); diff --git a/src/ts/store/menu.ts b/src/ts/store/menu.ts index d8eb55c2e7..51f3780130 100644 --- a/src/ts/store/menu.ts +++ b/src/ts/store/menu.ts @@ -78,7 +78,7 @@ class MenuStore { if (idx >= 0) { set(this.menuList[idx], { id: newId, param }); } else { - this.menuList.push({ id: newId, param }) + this.menuList.push({ id: newId, param }); }; };