diff --git a/internal/eslint-config/package.json b/internal/eslint-config/package.json index 945b41a6b0e1f0682c2b91fa8add74386ec12d06..566485093f0bf8e60e81babd55f9792c6df8cd26 100644 --- a/internal/eslint-config/package.json +++ b/internal/eslint-config/package.json @@ -35,6 +35,7 @@ "@typescript-eslint/parser": "^5.57.1", "eslint": "^8.37.0", "eslint-config-prettier": "^8.8.0", + "eslint-plugin-import": "^2.27.5", "eslint-plugin-prettier": "^4.2.1", "eslint-plugin-vue": "^9.10.0", "vue-eslint-parser": "^9.1.1" diff --git a/internal/eslint-config/src/index.ts b/internal/eslint-config/src/index.ts index c2f74651ceafbbe3d404aace6b9ce4156b66331f..c80fd9d1bce1e455dce0d9be513c05702e7d1f28 100644 --- a/internal/eslint-config/src/index.ts +++ b/internal/eslint-config/src/index.ts @@ -17,7 +17,7 @@ export default { createDefaultProgram: false, extraFileExtensions: ['.vue'], }, - plugins: ['vue', '@typescript-eslint'], + plugins: ['vue', '@typescript-eslint', 'import'], extends: [ 'eslint:recommended', 'plugin:vue/vue3-recommended', @@ -25,16 +25,20 @@ export default { 'plugin:prettier/recommended', ], rules: { + 'no-unused-vars': 'off', 'no-case-declarations': 'off', - 'vue/script-setup-uses-vars': 'error', - 'vue/no-reserved-component-names': 'off', + 'no-use-before-define': 'off', + 'space-before-function-paren': 'off', + + 'import/first': 'error', + 'import/newline-after-import': 'error', + 'import/no-duplicates': 'error', + '@typescript-eslint/ban-ts-ignore': 'off', '@typescript-eslint/explicit-function-return-type': 'off', '@typescript-eslint/no-explicit-any': 'off', '@typescript-eslint/no-var-requires': 'off', '@typescript-eslint/no-empty-function': 'off', - 'vue/custom-event-name-casing': 'off', - 'no-use-before-define': 'off', '@typescript-eslint/no-use-before-define': 'off', '@typescript-eslint/ban-ts-comment': 'off', '@typescript-eslint/ban-types': 'off', @@ -47,15 +51,9 @@ export default { varsIgnorePattern: '^_', }, ], - 'no-unused-vars': [ - 'error', - { - argsIgnorePattern: '^_', - varsIgnorePattern: '^_', - }, - ], - 'space-before-function-paren': 'off', - + 'vue/script-setup-uses-vars': 'error', + 'vue/no-reserved-component-names': 'off', + 'vue/custom-event-name-casing': 'off', 'vue/attributes-order': 'off', 'vue/one-component-per-file': 'off', 'vue/html-closing-bracket-newline': 'off', @@ -78,5 +76,15 @@ export default { }, ], 'vue/multi-word-component-names': 'off', + // 'sort-imports': [ + // 'error', + // { + // ignoreCase: true, + // ignoreDeclarationSort: false, + // ignoreMemberSort: false, + // memberSyntaxSortOrder: ['none', 'all', 'multiple', 'single'], + // allowSeparatedGroups: false, + // }, + // ], }, }; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e4e0bd351e88a86483584943f80b35fa09050b94..a78e0637f39bfa4f37439401bde28717f1eb2bf2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -312,6 +312,9 @@ importers: eslint-config-prettier: specifier: ^8.8.0 version: 8.8.0(eslint@8.37.0) + eslint-plugin-import: + specifier: ^2.27.5 + version: 2.27.5(@typescript-eslint/parser@5.57.1)(eslint@8.37.0) eslint-plugin-prettier: specifier: ^4.2.1 version: 4.2.1(eslint-config-prettier@8.8.0)(eslint@8.37.0)(prettier@2.8.7) @@ -1918,6 +1921,10 @@ packages: resolution: {integrity: sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==} dev: true + /@types/json5@0.0.29: + resolution: {integrity: sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==} + dev: true + /@types/jsonfile@6.1.1: resolution: {integrity: sha512-GSgiRCVeapDN+3pqA35IkQwasaCh/0YFH5dEF6S88iDvEn901DjOeH3/QPY+XYP1DFzDZPvIvfeEgk+7br5png==} dependencies: @@ -2824,10 +2831,28 @@ packages: engines: {node: '>=0.10.0'} dev: true + /array-buffer-byte-length@1.0.0: + resolution: {integrity: sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==} + dependencies: + call-bind: 1.0.2 + is-array-buffer: 3.0.2 + dev: true + /array-ify@1.0.0: resolution: {integrity: sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==} dev: true + /array-includes@3.1.6: + resolution: {integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.21.2 + get-intrinsic: 1.2.0 + is-string: 1.0.7 + dev: true + /array-tree-filter@2.1.0: resolution: {integrity: sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw==} @@ -2841,6 +2866,26 @@ packages: engines: {node: '>=0.10.0'} dev: true + /array.prototype.flat@1.3.1: + resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.21.2 + es-shim-unscopables: 1.0.0 + dev: true + + /array.prototype.flatmap@1.3.1: + resolution: {integrity: sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.21.2 + es-shim-unscopables: 1.0.0 + dev: true + /arrify@1.0.1: resolution: {integrity: sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==} engines: {node: '>=0.10.0'} @@ -2897,6 +2942,11 @@ packages: hasBin: true dev: true + /available-typed-arrays@1.0.5: + resolution: {integrity: sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==} + engines: {node: '>= 0.4'} + dev: true + /axios@0.21.4(debug@4.3.4): resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==} dependencies: @@ -3120,7 +3170,6 @@ packages: dependencies: function-bind: 1.1.1 get-intrinsic: 1.2.0 - dev: false /callsites@3.1.0: resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==} @@ -3795,6 +3844,14 @@ packages: engines: {node: '>=8'} dev: true + /define-properties@1.2.0: + resolution: {integrity: sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==} + engines: {node: '>= 0.4'} + dependencies: + has-property-descriptors: 1.0.0 + object-keys: 1.1.1 + dev: true + /define-property@0.2.5: resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==} engines: {node: '>=0.10.0'} @@ -3899,6 +3956,13 @@ packages: resolution: {integrity: sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==} dev: true + /doctrine@2.1.0: + resolution: {integrity: sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==} + engines: {node: '>=0.10.0'} + dependencies: + esutils: 2.0.3 + dev: true + /doctrine@3.0.0: resolution: {integrity: sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==} engines: {node: '>=6.0.0'} @@ -4122,6 +4186,70 @@ packages: is-arrayish: 0.2.1 dev: true + /es-abstract@1.21.2: + resolution: {integrity: sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==} + engines: {node: '>= 0.4'} + dependencies: + array-buffer-byte-length: 1.0.0 + available-typed-arrays: 1.0.5 + call-bind: 1.0.2 + es-set-tostringtag: 2.0.1 + es-to-primitive: 1.2.1 + function.prototype.name: 1.1.5 + get-intrinsic: 1.2.0 + get-symbol-description: 1.0.0 + globalthis: 1.0.3 + gopd: 1.0.1 + has: 1.0.3 + has-property-descriptors: 1.0.0 + has-proto: 1.0.1 + has-symbols: 1.0.3 + internal-slot: 1.0.5 + is-array-buffer: 3.0.2 + is-callable: 1.2.7 + is-negative-zero: 2.0.2 + is-regex: 1.1.4 + is-shared-array-buffer: 1.0.2 + is-string: 1.0.7 + is-typed-array: 1.1.10 + is-weakref: 1.0.2 + object-inspect: 1.12.3 + object-keys: 1.1.1 + object.assign: 4.1.4 + regexp.prototype.flags: 1.4.3 + safe-regex-test: 1.0.0 + string.prototype.trim: 1.2.7 + string.prototype.trimend: 1.0.6 + string.prototype.trimstart: 1.0.6 + typed-array-length: 1.0.4 + unbox-primitive: 1.0.2 + which-typed-array: 1.1.9 + dev: true + + /es-set-tostringtag@2.0.1: + resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==} + engines: {node: '>= 0.4'} + dependencies: + get-intrinsic: 1.2.0 + has: 1.0.3 + has-tostringtag: 1.0.0 + dev: true + + /es-shim-unscopables@1.0.0: + resolution: {integrity: sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==} + dependencies: + has: 1.0.3 + dev: true + + /es-to-primitive@1.2.1: + resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==} + engines: {node: '>= 0.4'} + dependencies: + is-callable: 1.2.7 + is-date-object: 1.0.5 + is-symbol: 1.0.4 + dev: true + /esbuild@0.11.3: resolution: {integrity: sha512-BzVRHcCtFepjS9WcqRjqoIxLqgpK21a8J4Zi4msSGxDxiXVO1IbcqT1KjhdDDnJxKfe7bvzZrvMEX+bVO0Elcw==} hasBin: true @@ -4197,6 +4325,78 @@ packages: eslint: 8.37.0 dev: true + /eslint-import-resolver-node@0.3.7: + resolution: {integrity: sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==} + dependencies: + debug: 3.2.7(supports-color@5.5.0) + is-core-module: 2.11.0 + resolve: 1.22.1 + transitivePeerDependencies: + - supports-color + dev: true + + /eslint-module-utils@2.7.4(@typescript-eslint/parser@5.57.1)(eslint-import-resolver-node@0.3.7)(eslint@8.37.0): + resolution: {integrity: sha512-j4GT+rqzCoRKHwURX7pddtIPGySnX9Si/cgMI5ztrcqOPtk5dDEeZ34CQVPphnqkJytlc97Vuk05Um2mJ3gEQA==} + engines: {node: '>=4'} + peerDependencies: + '@typescript-eslint/parser': '*' + eslint: '*' + eslint-import-resolver-node: '*' + eslint-import-resolver-typescript: '*' + eslint-import-resolver-webpack: '*' + peerDependenciesMeta: + '@typescript-eslint/parser': + optional: true + eslint: + optional: true + eslint-import-resolver-node: + optional: true + eslint-import-resolver-typescript: + optional: true + eslint-import-resolver-webpack: + optional: true + dependencies: + '@typescript-eslint/parser': 5.57.1(eslint@8.37.0)(typescript@5.0.3) + debug: 3.2.7(supports-color@5.5.0) + eslint: 8.37.0 + eslint-import-resolver-node: 0.3.7 + transitivePeerDependencies: + - supports-color + dev: true + + /eslint-plugin-import@2.27.5(@typescript-eslint/parser@5.57.1)(eslint@8.37.0): + resolution: {integrity: sha512-LmEt3GVofgiGuiE+ORpnvP+kAm3h6MLZJ4Q5HCyHADofsb4VzXFsRiWj3c0OFiV+3DWFh0qg3v9gcPlfc3zRow==} + engines: {node: '>=4'} + peerDependencies: + '@typescript-eslint/parser': '*' + eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 + peerDependenciesMeta: + '@typescript-eslint/parser': + optional: true + dependencies: + '@typescript-eslint/parser': 5.57.1(eslint@8.37.0)(typescript@5.0.3) + array-includes: 3.1.6 + array.prototype.flat: 1.3.1 + array.prototype.flatmap: 1.3.1 + debug: 3.2.7(supports-color@5.5.0) + doctrine: 2.1.0 + eslint: 8.37.0 + eslint-import-resolver-node: 0.3.7 + eslint-module-utils: 2.7.4(@typescript-eslint/parser@5.57.1)(eslint-import-resolver-node@0.3.7)(eslint@8.37.0) + has: 1.0.3 + is-core-module: 2.11.0 + is-glob: 4.0.3 + minimatch: 3.1.2 + object.values: 1.1.6 + resolve: 1.22.1 + semver: 6.3.0 + tsconfig-paths: 3.14.2 + transitivePeerDependencies: + - eslint-import-resolver-typescript + - eslint-import-resolver-webpack + - supports-color + dev: true + /eslint-plugin-prettier@4.2.1(eslint-config-prettier@8.8.0)(eslint@8.37.0)(prettier@2.8.7): resolution: {integrity: sha512-f/0rXLXUt0oFYs8ra4w49wYZBG5GKZpAYsJSm6rnYL5uVDjd+zowwMwVZHnAjf4edNrKpCDYfXDgmRE/Ak7QyQ==} engines: {node: '>=12.0.0'} @@ -4601,6 +4801,12 @@ packages: dependencies: debug: 4.3.4 + /for-each@0.3.3: + resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==} + dependencies: + is-callable: 1.2.7 + dev: true + /for-in@1.0.2: resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==} engines: {node: '>=0.10.0'} @@ -4711,6 +4917,20 @@ packages: /function-bind@1.1.1: resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==} + /function.prototype.name@1.1.5: + resolution: {integrity: sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.21.2 + functions-have-names: 1.2.3 + dev: true + + /functions-have-names@1.2.3: + resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==} + dev: true + /gensync@1.0.0-beta.2: resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} engines: {node: '>=6.9.0'} @@ -4726,13 +4946,20 @@ packages: function-bind: 1.1.1 has: 1.0.3 has-symbols: 1.0.3 - dev: false /get-stream@6.0.1: resolution: {integrity: sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==} engines: {node: '>=10'} dev: true + /get-symbol-description@1.0.0: + resolution: {integrity: sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + get-intrinsic: 1.2.0 + dev: true + /get-uri@3.0.2: resolution: {integrity: sha512-+5s0SJbGoyiJTZZ2JTpFPLMPSch72KEqGOTvQsBqg0RBWvwhWUSYZFAtz3TPW0GXJuLBJPts1E241iHg+VRfhg==} engines: {node: '>= 6'} @@ -4873,6 +5100,13 @@ packages: type-fest: 0.20.2 dev: true + /globalthis@1.0.3: + resolution: {integrity: sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==} + engines: {node: '>= 0.4'} + dependencies: + define-properties: 1.2.0 + dev: true + /globalyzer@0.1.0: resolution: {integrity: sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==} dev: true @@ -4908,6 +5142,12 @@ packages: resolution: {integrity: sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==} dev: true + /gopd@1.0.1: + resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==} + dependencies: + get-intrinsic: 1.2.0 + dev: true + /graceful-fs@4.2.11: resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==} @@ -4934,6 +5174,10 @@ packages: ansi-regex: 2.1.1 dev: true + /has-bigints@1.0.2: + resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==} + dev: true + /has-flag@1.0.0: resolution: {integrity: sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==} engines: {node: '>=0.10.0'} @@ -4948,17 +5192,26 @@ packages: engines: {node: '>=8'} dev: true + /has-property-descriptors@1.0.0: + resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==} + dependencies: + get-intrinsic: 1.2.0 + dev: true + + /has-proto@1.0.1: + resolution: {integrity: sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==} + engines: {node: '>= 0.4'} + dev: true + /has-symbols@1.0.3: resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==} engines: {node: '>= 0.4'} - dev: false /has-tostringtag@1.0.0: resolution: {integrity: sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==} engines: {node: '>= 0.4'} dependencies: has-symbols: 1.0.3 - dev: false /has-value@0.3.1: resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==} @@ -5224,6 +5477,15 @@ packages: resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==} dev: true + /internal-slot@1.0.5: + resolution: {integrity: sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==} + engines: {node: '>= 0.4'} + dependencies: + get-intrinsic: 1.2.0 + has: 1.0.3 + side-channel: 1.0.4 + dev: true + /intro.js@7.0.1: resolution: {integrity: sha512-1oqz6aOz9cGQ3CrtVYhCSo6AkjnXUn302kcIWLaZ3TI4kKssRXDwDSz4VRoGcfC1jN+WfaSJXRBrITz+QVEBzg==} dev: false @@ -5250,16 +5512,38 @@ packages: kind-of: 6.0.3 dev: true + /is-array-buffer@3.0.2: + resolution: {integrity: sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==} + dependencies: + call-bind: 1.0.2 + get-intrinsic: 1.2.0 + is-typed-array: 1.1.10 + dev: true + /is-arrayish@0.2.1: resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==} dev: true + /is-bigint@1.0.4: + resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==} + dependencies: + has-bigints: 1.0.2 + dev: true + /is-binary-path@2.1.0: resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==} engines: {node: '>=8'} dependencies: binary-extensions: 2.2.0 + /is-boolean-object@1.1.2: + resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + has-tostringtag: 1.0.0 + dev: true + /is-buffer@1.1.6: resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==} dev: true @@ -5271,6 +5555,11 @@ packages: builtin-modules: 3.3.0 dev: true + /is-callable@1.2.7: + resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==} + engines: {node: '>= 0.4'} + dev: true + /is-core-module@2.11.0: resolution: {integrity: sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==} dependencies: @@ -5290,6 +5579,13 @@ packages: kind-of: 6.0.3 dev: true + /is-date-object@1.0.5: + resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==} + engines: {node: '>= 0.4'} + dependencies: + has-tostringtag: 1.0.0 + dev: true + /is-descriptor@0.1.6: resolution: {integrity: sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==} engines: {node: '>=0.10.0'} @@ -5356,6 +5652,18 @@ packages: resolution: {integrity: sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==} dev: true + /is-negative-zero@2.0.2: + resolution: {integrity: sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==} + engines: {node: '>= 0.4'} + dev: true + + /is-number-object@1.0.7: + resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==} + engines: {node: '>= 0.4'} + dependencies: + has-tostringtag: 1.0.0 + dev: true + /is-number@3.0.0: resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==} engines: {node: '>=0.10.0'} @@ -5408,6 +5716,20 @@ packages: '@types/estree': 1.0.0 dev: true + /is-regex@1.1.4: + resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + has-tostringtag: 1.0.0 + dev: true + + /is-shared-array-buffer@1.0.2: + resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==} + dependencies: + call-bind: 1.0.2 + dev: true + /is-stream@2.0.1: resolution: {integrity: sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==} engines: {node: '>=8'} @@ -5418,6 +5740,20 @@ packages: engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} dev: true + /is-string@1.0.7: + resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==} + engines: {node: '>= 0.4'} + dependencies: + has-tostringtag: 1.0.0 + dev: true + + /is-symbol@1.0.4: + resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==} + engines: {node: '>= 0.4'} + dependencies: + has-symbols: 1.0.3 + dev: true + /is-text-path@1.0.1: resolution: {integrity: sha512-xFuJpne9oFz5qDaodwmmG08e3CawH/2ZV8Qqza1Ko7Sk8POWbkRdwIoAWVhqvq0XeUzANEhKo2n0IXUGBm7A/w==} engines: {node: '>=0.10.0'} @@ -5425,6 +5761,23 @@ packages: text-extensions: 1.9.0 dev: true + /is-typed-array@1.1.10: + resolution: {integrity: sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==} + engines: {node: '>= 0.4'} + dependencies: + available-typed-arrays: 1.0.5 + call-bind: 1.0.2 + for-each: 0.3.3 + gopd: 1.0.1 + has-tostringtag: 1.0.0 + dev: true + + /is-weakref@1.0.2: + resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==} + dependencies: + call-bind: 1.0.2 + dev: true + /is-what@3.14.1: resolution: {integrity: sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==} @@ -6596,6 +6949,11 @@ packages: /object-inspect@1.12.3: resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==} + /object-keys@1.1.1: + resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==} + engines: {node: '>= 0.4'} + dev: true + /object-visit@1.0.1: resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==} engines: {node: '>=0.10.0'} @@ -6603,6 +6961,16 @@ packages: isobject: 3.0.1 dev: true + /object.assign@4.1.4: + resolution: {integrity: sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + has-symbols: 1.0.3 + object-keys: 1.1.1 + dev: true + /object.pick@1.3.0: resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==} engines: {node: '>=0.10.0'} @@ -6610,6 +6978,15 @@ packages: isobject: 3.0.1 dev: true + /object.values@1.1.6: + resolution: {integrity: sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.21.2 + dev: true + /ofetch@1.0.1: resolution: {integrity: sha512-icBz2JYfEpt+wZz1FRoGcrMigjNKjzvufE26m9+yUiacRQRHwnNlGRPiDnW4op7WX/MR6aniwS8xw8jyVelF2g==} dependencies: @@ -7404,6 +7781,15 @@ packages: safe-regex: 1.1.0 dev: true + /regexp.prototype.flags@1.4.3: + resolution: {integrity: sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + functions-have-names: 1.2.3 + dev: true + /relateurl@0.2.7: resolution: {integrity: sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==} engines: {node: '>= 0.10'} @@ -7614,6 +8000,14 @@ packages: /safe-buffer@5.2.1: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} + /safe-regex-test@1.0.0: + resolution: {integrity: sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==} + dependencies: + call-bind: 1.0.2 + get-intrinsic: 1.2.0 + is-regex: 1.1.4 + dev: true + /safe-regex@1.1.0: resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==} dependencies: @@ -7736,7 +8130,6 @@ packages: call-bind: 1.0.2 get-intrinsic: 1.2.0 object-inspect: 1.12.3 - dev: false /sigmund@1.0.1: resolution: {integrity: sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==} @@ -8028,6 +8421,31 @@ packages: strip-ansi: 7.0.1 dev: true + /string.prototype.trim@1.2.7: + resolution: {integrity: sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==} + engines: {node: '>= 0.4'} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.21.2 + dev: true + + /string.prototype.trimend@1.0.6: + resolution: {integrity: sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.21.2 + dev: true + + /string.prototype.trimstart@1.0.6: + resolution: {integrity: sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==} + dependencies: + call-bind: 1.0.2 + define-properties: 1.2.0 + es-abstract: 1.21.2 + dev: true + /string_decoder@0.10.31: resolution: {integrity: sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==} dev: true @@ -8588,6 +9006,15 @@ packages: yn: 3.1.1 dev: true + /tsconfig-paths@3.14.2: + resolution: {integrity: sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==} + dependencies: + '@types/json5': 0.0.29 + json5: 1.0.2 + minimist: 1.2.8 + strip-bom: 3.0.0 + dev: true + /tsconfig-paths@4.2.0: resolution: {integrity: sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==} engines: {node: '>=6'} @@ -8783,6 +9210,14 @@ packages: mime-types: 2.1.35 dev: false + /typed-array-length@1.0.4: + resolution: {integrity: sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==} + dependencies: + call-bind: 1.0.2 + for-each: 0.3.3 + is-typed-array: 1.1.10 + dev: true + /typescript@4.8.4: resolution: {integrity: sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==} engines: {node: '>=4.2.0'} @@ -8798,6 +9233,15 @@ packages: resolution: {integrity: sha512-MvlCc4GHrmZdAllBc0iUDowff36Q9Ndw/UzqmEKyrfSzokTd9ZCy1i+IIk5hrYKkjoYVQyNbrw7/F8XJ2rEwTg==} dev: true + /unbox-primitive@1.0.2: + resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==} + dependencies: + call-bind: 1.0.2 + has-bigints: 1.0.2 + has-symbols: 1.0.3 + which-boxed-primitive: 1.0.2 + dev: true + /unbuild@1.2.0: resolution: {integrity: sha512-GcolNMBatav7FbRdLDR8BMbnYWMoKfxXdJIHibpBtx3GERN4GbbUD5h4RfGIFi+mjWPz4AphSz5gIg9FWNWw3Q==} hasBin: true @@ -9349,10 +9793,32 @@ packages: webidl-conversions: 4.0.2 dev: true + /which-boxed-primitive@1.0.2: + resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==} + dependencies: + is-bigint: 1.0.4 + is-boolean-object: 1.1.2 + is-number-object: 1.0.7 + is-string: 1.0.7 + is-symbol: 1.0.4 + dev: true + /which-module@2.0.0: resolution: {integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==} dev: false + /which-typed-array@1.1.9: + resolution: {integrity: sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==} + engines: {node: '>= 0.4'} + dependencies: + available-typed-arrays: 1.0.5 + call-bind: 1.0.2 + for-each: 0.3.3 + gopd: 1.0.1 + has-tostringtag: 1.0.0 + is-typed-array: 1.1.10 + dev: true + /which@1.3.1: resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==} hasBin: true diff --git a/src/api/demo/select.ts b/src/api/demo/select.ts index 54c4ef5ec7c54bc352bc22ab02d2e0af69b1ddaf..e21e1e6d76802a435c0e7f7dde0e6d6fc0dbd176 100644 --- a/src/api/demo/select.ts +++ b/src/api/demo/select.ts @@ -1,5 +1,6 @@ import { defHttp } from '/@/utils/http/axios'; import { DemoOptionsItem, selectParams } from './model/optionsModel'; + enum Api { OPTIONS_LIST = '/select/getDemoOptions', } diff --git a/src/api/sys/model/menuModel.ts b/src/api/sys/model/menuModel.ts index 8d19eeabacf80f6598ec3354efb717089f866bf4..c2064a1d4b7f1c719cd7345e7db13a4934b09cb3 100644 --- a/src/api/sys/model/menuModel.ts +++ b/src/api/sys/model/menuModel.ts @@ -1,4 +1,5 @@ import type { RouteMeta } from 'vue-router'; + export interface RouteItem { path: string; component: any; diff --git a/src/components/Drawer/src/props.ts b/src/components/Drawer/src/props.ts index 0a7ca8cdfe88d5f311628313c3c8fd6167920926..e82d998e30afd6d1edbe79a2da9dddb08ea93e99 100644 --- a/src/components/Drawer/src/props.ts +++ b/src/components/Drawer/src/props.ts @@ -1,6 +1,7 @@ import type { PropType } from 'vue'; import { useI18n } from '/@/hooks/web/useI18n'; + const { t } = useI18n(); export const footerProps = { diff --git a/src/components/Form/src/hooks/useAdvanced.ts b/src/components/Form/src/hooks/useAdvanced.ts index 9bd2d9de1914864bb76a3f8f61bafc02dd56fdf8..96dacb202ac3c0a80b27b5a3a22f88791ca5493f 100644 --- a/src/components/Form/src/hooks/useAdvanced.ts +++ b/src/components/Form/src/hooks/useAdvanced.ts @@ -1,8 +1,7 @@ import type { ColEx } from '../types'; import type { AdvanceState } from '../types/hooks'; -import { ComputedRef, getCurrentInstance, Ref, shallowReactive } from 'vue'; +import { ComputedRef, getCurrentInstance, Ref, shallowReactive, computed, unref, watch } from 'vue'; import type { FormProps, FormSchema } from '../types/form'; -import { computed, unref, watch } from 'vue'; import { isBoolean, isFunction, isNumber, isObject } from '/@/utils/is'; import { useBreakpoint } from '/@/hooks/event/useBreakpoint'; import { useDebounceFn } from '@vueuse/core'; diff --git a/src/components/Form/src/types/form.ts b/src/components/Form/src/types/form.ts index 8425e68d91e541899b14de6a730bfc45a4565e01..dd3ae961d67c88ee08e31d75678f6eb418d2ad0a 100644 --- a/src/components/Form/src/types/form.ts +++ b/src/components/Form/src/types/form.ts @@ -1,10 +1,9 @@ import type { NamePath, RuleObject } from 'ant-design-vue/lib/form/interface'; -import type { VNode } from 'vue'; +import type { VNode, CSSProperties } from 'vue'; import type { ButtonProps as AntdButtonProps } from '/@/components/Button'; import type { FormItem } from './formItem'; import type { ColEx, ComponentType } from './index'; import type { TableActionType } from '/@/components/Table/src/types/table'; -import type { CSSProperties } from 'vue'; import type { RowProps } from 'ant-design-vue/lib/grid/Row'; export type FieldMapToTime = [string, [string, string], (string | [string, string])?][]; diff --git a/src/components/Loading/src/createLoading.ts b/src/components/Loading/src/createLoading.ts index 966ca53bf98948f1bc9f06caa822c264dd175c1f..b91db1fd40d1dc90e71499ead699c93568117b49 100644 --- a/src/components/Loading/src/createLoading.ts +++ b/src/components/Loading/src/createLoading.ts @@ -1,7 +1,6 @@ -import { VNode, defineComponent } from 'vue'; +import { VNode, defineComponent, createVNode, render, reactive, h } from 'vue'; import type { LoadingProps } from './typing'; -import { createVNode, render, reactive, h } from 'vue'; import Loading from './Loading.vue'; export function createLoading(props?: Partial, target?: HTMLElement, wait = false) { diff --git a/src/components/Markdown/src/typing.ts b/src/components/Markdown/src/typing.ts index b4bb465822d723aff7b7c61b7fba0947a17a3d16..92e4a0a4b95502dbd9f6c208895a5f7388781c9c 100644 --- a/src/components/Markdown/src/typing.ts +++ b/src/components/Markdown/src/typing.ts @@ -1,4 +1,5 @@ import Vditor from 'vditor'; + export interface MarkDownActionType { getVditor: () => Vditor; } diff --git a/src/components/Menu/src/props.ts b/src/components/Menu/src/props.ts index 5ad0dc03d3994f6ca91566d41f8f006c69aeb8c5..480297dba3ecf1d54ba689cb2312fa99ee4fb58f 100644 --- a/src/components/Menu/src/props.ts +++ b/src/components/Menu/src/props.ts @@ -6,6 +6,7 @@ import { ThemeEnum } from '/@/enums/appEnum'; import { propTypes } from '/@/utils/propTypes'; import type { MenuTheme } from 'ant-design-vue'; import type { MenuMode } from 'ant-design-vue/lib/menu/src/interface'; + export const basicProps = { items: { type: Array as PropType, diff --git a/src/components/Menu/src/useOpenKeys.ts b/src/components/Menu/src/useOpenKeys.ts index 841dab51b43bb325b4ca469afd3406b644ca0a76..598d281cfbaae8682422eb554c26d684e1592e17 100644 --- a/src/components/Menu/src/useOpenKeys.ts +++ b/src/components/Menu/src/useOpenKeys.ts @@ -2,9 +2,8 @@ import { MenuModeEnum } from '/@/enums/menuEnum'; import type { Menu as MenuType } from '/@/router/types'; import type { MenuState } from './types'; -import { computed, Ref, toRaw } from 'vue'; +import { computed, Ref, toRaw, unref } from 'vue'; -import { unref } from 'vue'; import { uniq } from 'lodash-es'; import { useMenuSetting } from '/@/hooks/setting/useMenuSetting'; import { getAllParentPath } from '/@/router/helper/menuHelper'; diff --git a/src/components/Modal/src/hooks/useModal.ts b/src/components/Modal/src/hooks/useModal.ts index fac82b77c59ea17f12ff4da215a393e41963845a..c4cade229475ea9eb388f136ebd8a8bf848ed210 100644 --- a/src/components/Modal/src/hooks/useModal.ts +++ b/src/components/Modal/src/hooks/useModal.ts @@ -14,13 +14,13 @@ import { watchEffect, nextTick, toRaw, + computed, } from 'vue'; import { isProdMode } from '/@/utils/env'; import { isFunction } from '/@/utils/is'; import { isEqual } from 'lodash-es'; import { tryOnUnmounted } from '@vueuse/core'; import { error } from '/@/utils/log'; -import { computed } from 'vue'; const dataTransfer = reactive({}); diff --git a/src/components/Qrcode/src/drawLogo.ts b/src/components/Qrcode/src/drawLogo.ts index 85a160f20e637d22c5b324778f2380387f1e486d..82df2781920d497d5283a6381ef0551702ff0bc7 100644 --- a/src/components/Qrcode/src/drawLogo.ts +++ b/src/components/Qrcode/src/drawLogo.ts @@ -1,5 +1,6 @@ import { isString } from '/@/utils/is'; import { RenderQrCodeParams, LogoType } from './typing'; + export const drawLogo = ({ canvas, logo }: RenderQrCodeParams) => { if (!logo) { return new Promise((resolve) => { diff --git a/src/components/Qrcode/src/qrcodePlus.ts b/src/components/Qrcode/src/qrcodePlus.ts index 64398617951ae622a942986696dbbc104b99dc01..ddf611663841f8417e81a2828c2033a3b33f97c3 100644 --- a/src/components/Qrcode/src/qrcodePlus.ts +++ b/src/components/Qrcode/src/qrcodePlus.ts @@ -1,4 +1,5 @@ // 参考 qr-code-with-logo 进行ts版本修改 import { toCanvas } from './toCanvas'; + export * from './typing'; export { toCanvas }; diff --git a/src/components/Qrcode/src/toCanvas.ts b/src/components/Qrcode/src/toCanvas.ts index f74d59682de6344bef8d130ac6f2bcd241432942..0a9799fba178ea20f6bd6b86cc5d58d2a6b71070 100644 --- a/src/components/Qrcode/src/toCanvas.ts +++ b/src/components/Qrcode/src/toCanvas.ts @@ -1,6 +1,7 @@ import { renderQrCode } from './drawCanvas'; import { drawLogo } from './drawLogo'; import { RenderQrCodeParams } from './typing'; + export const toCanvas = (options: RenderQrCodeParams) => { return renderQrCode(options) .then(() => { diff --git a/src/components/Scrollbar/src/util.ts b/src/components/Scrollbar/src/util.ts index b7c4845c3dc21fcd3a59e21e27824543b2b40b00..77694a9089ed822f1aa689c1838e285c590218a7 100644 --- a/src/components/Scrollbar/src/util.ts +++ b/src/components/Scrollbar/src/util.ts @@ -1,4 +1,5 @@ import type { BarMap } from './types'; + export const BAR_MAP: BarMap = { vertical: { offset: 'offsetHeight', diff --git a/src/components/SimpleMenu/src/useOpenKeys.ts b/src/components/SimpleMenu/src/useOpenKeys.ts index 1b3cf7b1707898014d968151b5ad8e4712472452..b67eba7eccff1aa018a7d2668972e20e6bd12a5c 100644 --- a/src/components/SimpleMenu/src/useOpenKeys.ts +++ b/src/components/SimpleMenu/src/useOpenKeys.ts @@ -1,9 +1,8 @@ import type { Menu as MenuType } from '/@/router/types'; import type { MenuState } from './types'; -import { computed, Ref, toRaw } from 'vue'; +import { computed, Ref, toRaw, unref } from 'vue'; -import { unref } from 'vue'; import { uniq } from 'lodash-es'; import { getAllParentPath } from '/@/router/helper/menuHelper'; diff --git a/src/components/Table/src/hooks/useTableScroll.ts b/src/components/Table/src/hooks/useTableScroll.ts index 3b45b5ab96c3c5a911b4437cd095d654d1aae33d..c4ecf1e1498539b4788f90b93b0a297133b0a391 100644 --- a/src/components/Table/src/hooks/useTableScroll.ts +++ b/src/components/Table/src/hooks/useTableScroll.ts @@ -1,6 +1,5 @@ import type { BasicTableProps, TableRowSelection, BasicColumn } from '../types/table'; -import { Ref, ComputedRef, ref } from 'vue'; -import { computed, unref, nextTick, watch } from 'vue'; +import { Ref, ComputedRef, ref, computed, unref, nextTick, watch } from 'vue'; import { getViewportOffset } from '/@/utils/domUtils'; import { isBoolean } from '/@/utils/is'; import { useWindowSizeFn } from '/@/hooks/event/useWindowSizeFn'; diff --git a/src/components/Table/src/types/tableAction.ts b/src/components/Table/src/types/tableAction.ts index 028cf80cb48954566847385270585275758e190c..d8477076251eea52fe5d05ac571c7bb37da3d2ed 100644 --- a/src/components/Table/src/types/tableAction.ts +++ b/src/components/Table/src/types/tableAction.ts @@ -1,6 +1,7 @@ import { ButtonProps } from 'ant-design-vue/es/button/buttonTypes'; import { TooltipProps } from 'ant-design-vue/es/tooltip/Tooltip'; import { RoleEnum } from '/@/enums/roleEnum'; + export interface ActionItem extends ButtonProps { onClick?: Fn; label?: string; diff --git a/src/components/Upload/src/useUpload.ts b/src/components/Upload/src/useUpload.ts index 694cc2757b49e80826ef7109b8cf0073de4d1504..fb178d0364671bd77f644cc716ae2137b47da7f4 100644 --- a/src/components/Upload/src/useUpload.ts +++ b/src/components/Upload/src/useUpload.ts @@ -1,5 +1,6 @@ import { Ref, unref, computed } from 'vue'; import { useI18n } from '/@/hooks/web/useI18n'; + const { t } = useI18n(); export function useUploadType({ acceptRef, diff --git a/src/components/VxeTable/src/VxeBasicTable.tsx b/src/components/VxeTable/src/VxeBasicTable.tsx index a1e0c4034f90503cbf0126889efd87c02e0116ec..8133142a45e22b6550abff6c6fd026f57089810c 100644 --- a/src/components/VxeTable/src/VxeBasicTable.tsx +++ b/src/components/VxeTable/src/VxeBasicTable.tsx @@ -1,5 +1,4 @@ -import { defineComponent } from 'vue'; -import { computed, ref } from 'vue'; +import { defineComponent, computed, ref } from 'vue'; import { BasicTableProps } from './types'; import { basicProps } from './props'; import { ignorePropKeys } from './const'; diff --git a/src/directives/ripple/index.ts b/src/directives/ripple/index.ts index 85a80e8f3ebc4dc8bdae1322c1dc3233b7bed820..3da8014e4c0423a2c5689134a958217a0bbd2bc5 100644 --- a/src/directives/ripple/index.ts +++ b/src/directives/ripple/index.ts @@ -1,5 +1,6 @@ import type { Directive } from 'vue'; import './index.less'; + export interface RippleOptions { event: string; transition: number; diff --git a/src/hooks/core/useAttrs.ts b/src/hooks/core/useAttrs.ts index a7c5bd74c60204d6c5d636288a5570fd05393462..ea965758e17aa5dfc3c3a99d863f0094c5841b2c 100644 --- a/src/hooks/core/useAttrs.ts +++ b/src/hooks/core/useAttrs.ts @@ -1,5 +1,6 @@ import { getCurrentInstance, reactive, shallowRef, watchEffect } from 'vue'; import type { Ref } from 'vue'; + interface Params { excludeListeners?: boolean; excludeKeys?: string[]; diff --git a/src/hooks/web/useContextMenu.ts b/src/hooks/web/useContextMenu.ts index d3c53ce68a7e1ac102c51ba21c616a587a66cb95..3237d35c6f80c0a4aec90a03edfa19d8d6073bbe 100644 --- a/src/hooks/web/useContextMenu.ts +++ b/src/hooks/web/useContextMenu.ts @@ -1,6 +1,7 @@ import { onUnmounted, getCurrentInstance } from 'vue'; import { createContextMenu, destroyContextMenu } from '/@/components/ContextMenu'; import type { ContextMenuItem } from '/@/components/ContextMenu'; + export type { ContextMenuItem }; export function useContextMenu(authRemove = true) { if (getCurrentInstance() && authRemove) { diff --git a/src/hooks/web/useCopyToClipboard.ts b/src/hooks/web/useCopyToClipboard.ts index 69abf26d8657fa2b9a9ff5a17b1e0b3f4c028caa..5072f9cd5cd11dc00803d652ea358927721034ac 100644 --- a/src/hooks/web/useCopyToClipboard.ts +++ b/src/hooks/web/useCopyToClipboard.ts @@ -1,6 +1,7 @@ import { ref, watch } from 'vue'; import { isDef } from '/@/utils/is'; + interface Options { target?: HTMLElement; } diff --git a/src/hooks/web/useECharts.ts b/src/hooks/web/useECharts.ts index 1c020036f03a910041edb6b1ccdfca93a32db9a9..2f65a7df23dbef0ef72a27c91c7172b43565df0a 100644 --- a/src/hooks/web/useECharts.ts +++ b/src/hooks/web/useECharts.ts @@ -1,9 +1,8 @@ import type { EChartsOption } from 'echarts'; import type { Ref } from 'vue'; import { useTimeoutFn } from '/@/hooks/core/useTimeout'; -import { tryOnUnmounted } from '@vueuse/core'; +import { tryOnUnmounted, useDebounceFn } from '@vueuse/core'; import { unref, nextTick, watch, computed, ref } from 'vue'; -import { useDebounceFn } from '@vueuse/core'; import { useEventListener } from '/@/hooks/event/useEventListener'; import { useBreakpoint } from '/@/hooks/event/useBreakpoint'; import echarts from '/@/utils/lib/echarts'; diff --git a/src/router/routes/modules/demo/iframe.ts b/src/router/routes/modules/demo/iframe.ts index 663c24714744235a0d6f855258d37f0fa5be8692..9a3eaa88465c9adedbd23f7196e9a2638afcfa33 100644 --- a/src/router/routes/modules/demo/iframe.ts +++ b/src/router/routes/modules/demo/iframe.ts @@ -1,9 +1,10 @@ import type { AppRouteModule } from '/@/router/types'; import { LAYOUT } from '/@/router/constant'; -const IFrame = () => import('/@/views/sys/iframe/FrameBlank.vue'); import { t } from '/@/hooks/web/useI18n'; +const IFrame = () => import('/@/views/sys/iframe/FrameBlank.vue'); + const iframe: AppRouteModule = { path: '/frame', name: 'Frame', diff --git a/src/settings/projectSetting.ts b/src/settings/projectSetting.ts index 33e41585d6efe1e0f8d0826b445153306d19ae05..a6f258426687d2d9bc06353d00e89783bf33d8ae 100644 --- a/src/settings/projectSetting.ts +++ b/src/settings/projectSetting.ts @@ -10,6 +10,7 @@ import { SessionTimeoutProcessingEnum, } from '/@/enums/appEnum'; import { SIDE_BAR_BG_COLOR_LIST, HEADER_PRESET_BG_COLOR_LIST } from './designSetting'; + const primaryColor = '#0960bd'; // ! You need to clear the browser cache after the change diff --git a/src/utils/auth/index.ts b/src/utils/auth/index.ts index fdec83621b122b06fbb04ce19b9f22e0c27c93e6..9459a9e81dcc4a96bf6973088e2c1176b0e81ecc 100644 --- a/src/utils/auth/index.ts +++ b/src/utils/auth/index.ts @@ -1,7 +1,6 @@ import { Persistent, BasicKeys } from '/@/utils/cache/persistent'; -import { CacheTypeEnum } from '/@/enums/cacheEnum'; +import { CacheTypeEnum, TOKEN_KEY } from '/@/enums/cacheEnum'; import projectSetting from '/@/settings/projectSetting'; -import { TOKEN_KEY } from '/@/enums/cacheEnum'; const { permissionCacheType } = projectSetting; const isLocal = permissionCacheType === CacheTypeEnum.LOCAL; diff --git a/src/utils/cache/index.ts b/src/utils/cache/index.ts index 2004c66395b0a41156786572cc94803f644bb249..01a11f54e85620fc0094910d6073921fca888d2b 100644 --- a/src/utils/cache/index.ts +++ b/src/utils/cache/index.ts @@ -1,7 +1,6 @@ import { getStorageShortName } from '/@/utils/env'; import { createStorage as create, CreateStorageParams } from './storageCache'; -import { enableStorageEncryption } from '/@/settings/encryptionSetting'; -import { DEFAULT_CACHE_TIME } from '/@/settings/encryptionSetting'; +import { enableStorageEncryption, DEFAULT_CACHE_TIME } from '/@/settings/encryptionSetting'; export type Options = Partial; diff --git a/src/utils/cipher.ts b/src/utils/cipher.ts index 9a8a89a91d2633e563fd9a966bcfafb39da31a42..7a02cfc35db6db7b08e81af8a26409a555c21906 100644 --- a/src/utils/cipher.ts +++ b/src/utils/cipher.ts @@ -1,9 +1,8 @@ import { encrypt, decrypt } from 'crypto-js/aes'; -import { parse } from 'crypto-js/enc-utf8'; +import UTF8, { parse } from 'crypto-js/enc-utf8'; import pkcs7 from 'crypto-js/pad-pkcs7'; import ECB from 'crypto-js/mode-ecb'; import md5 from 'crypto-js/md5'; -import UTF8 from 'crypto-js/enc-utf8'; import Base64 from 'crypto-js/enc-base64'; export interface EncryptionParams { diff --git a/src/utils/http/axios/Axios.ts b/src/utils/http/axios/Axios.ts index 49eff0308eb00b814514b06496d53f3e5d22f52e..62730cc2ac403a9ad2708afb698a32707a3fdead 100644 --- a/src/utils/http/axios/Axios.ts +++ b/src/utils/http/axios/Axios.ts @@ -6,8 +6,7 @@ import qs from 'qs'; import { AxiosCanceler } from './axiosCancel'; import { isFunction } from '/@/utils/is'; import { cloneDeep } from 'lodash-es'; -import { ContentTypeEnum } from '/@/enums/httpEnum'; -import { RequestEnum } from '/@/enums/httpEnum'; +import { ContentTypeEnum, RequestEnum } from '/@/enums/httpEnum'; export * from './axiosTransform'; diff --git a/src/views/demo/page/form/basic/data.ts b/src/views/demo/page/form/basic/data.ts index f1f8e6766c19af9ddc5c3236f6ed4bd06b0f44d8..f660b55aa3289e9822a2b5d6d197289612755080 100644 --- a/src/views/demo/page/form/basic/data.ts +++ b/src/views/demo/page/form/basic/data.ts @@ -1,4 +1,5 @@ import { FormSchema } from '/@/components/Form'; + const colProps = { span: 8, }; diff --git a/src/views/demo/system/account/account.data.ts b/src/views/demo/system/account/account.data.ts index ade68c100f0dd9eeb04b1006a5432ff0ea7adc67..c45284b30f0aa9400c6fe163a30eab8780fbcce3 100644 --- a/src/views/demo/system/account/account.data.ts +++ b/src/views/demo/system/account/account.data.ts @@ -1,6 +1,5 @@ import { getAllRoleList, isAccountExist } from '/@/api/demo/system'; -import { BasicColumn } from '/@/components/Table'; -import { FormSchema } from '/@/components/Table'; +import { BasicColumn, FormSchema } from '/@/components/Table'; export const columns: BasicColumn[] = [ { diff --git a/src/views/demo/system/dept/dept.data.ts b/src/views/demo/system/dept/dept.data.ts index 2a3a4139017169a1950d5f837430bd7900a01e08..74e1b2aed477ced559a61b9360127ebe77168bf3 100644 --- a/src/views/demo/system/dept/dept.data.ts +++ b/src/views/demo/system/dept/dept.data.ts @@ -1,5 +1,4 @@ -import { BasicColumn } from '/@/components/Table'; -import { FormSchema } from '/@/components/Table'; +import { BasicColumn, FormSchema } from '/@/components/Table'; import { h } from 'vue'; import { Tag } from 'ant-design-vue'; diff --git a/src/views/demo/system/menu/menu.data.ts b/src/views/demo/system/menu/menu.data.ts index a7e04612a193f8c575a6bfcd7efd6e8c40785150..dfa30ac019709195c6ef504a6672d081186dd88d 100644 --- a/src/views/demo/system/menu/menu.data.ts +++ b/src/views/demo/system/menu/menu.data.ts @@ -1,5 +1,4 @@ -import { BasicColumn } from '/@/components/Table'; -import { FormSchema } from '/@/components/Table'; +import { BasicColumn, FormSchema } from '/@/components/Table'; import { h } from 'vue'; import { Tag } from 'ant-design-vue'; import { Icon } from '/@/components/Icon'; diff --git a/src/views/demo/system/role/role.data.ts b/src/views/demo/system/role/role.data.ts index f7854277aec19c165939ffae3881caed617f3d2c..c177f105eb431d258fb58a2d2824d0b76bfd7f3b 100644 --- a/src/views/demo/system/role/role.data.ts +++ b/src/views/demo/system/role/role.data.ts @@ -1,5 +1,4 @@ -import { BasicColumn } from '/@/components/Table'; -import { FormSchema } from '/@/components/Table'; +import { BasicColumn, FormSchema } from '/@/components/Table'; import { h } from 'vue'; import { Switch } from 'ant-design-vue'; import { setRoleStatus } from '/@/api/demo/system'; diff --git a/src/views/form-design/hooks/useFormInstanceMethods.ts b/src/views/form-design/hooks/useFormInstanceMethods.ts index b29eb7909917ae3bc1abe3d4dbdba18ee774193c..b9cc288be25f2e02677b4ee4544ec2a730ae468b 100644 --- a/src/views/form-design/hooks/useFormInstanceMethods.ts +++ b/src/views/form-design/hooks/useFormInstanceMethods.ts @@ -1,10 +1,8 @@ import { IAnyObject } from '../typings/base-type'; -import { Ref, SetupContext } from 'vue'; +import { Ref, SetupContext, getCurrentInstance, toRaw } from 'vue'; import { cloneDeep, forOwn, isFunction } from 'lodash-es'; import { AForm, IVFormComponent } from '../typings/v-form-component'; -import { getCurrentInstance } from 'vue'; import { Form } from 'ant-design-vue'; -import { toRaw } from 'vue'; export function useFormInstanceMethods( props: IAnyObject, diff --git a/src/views/form-design/typings/v-form-component.ts b/src/views/form-design/typings/v-form-component.ts index af632aa04036002c940b7498648e2e3faf84e0d8..fb6e751a1a851af045cebd050058e8e62f0557e5 100644 --- a/src/views/form-design/typings/v-form-component.ts +++ b/src/views/form-design/typings/v-form-component.ts @@ -8,6 +8,7 @@ import { SelectValue } from 'ant-design-vue/lib/select'; import { validateOptions } from 'ant-design-vue/lib/form/useForm'; import { RuleError } from 'ant-design-vue/lib/form/interface'; import { FormItem } from '/@/components/Form'; + type LayoutType = 'horizontal' | 'vertical' | 'inline'; type labelLayout = 'flex' | 'Grid'; export type PropsTabKey = 1 | 2 | 3; diff --git a/src/views/form-design/utils/message.ts b/src/views/form-design/utils/message.ts index f072acfa0a4110248ab757c10a7f19d004cc398b..97b9c836da2016fb941a588dd4b6a04cbb3fcf70 100644 --- a/src/views/form-design/utils/message.ts +++ b/src/views/form-design/utils/message.ts @@ -1,4 +1,5 @@ import { useMessage } from '/@/hooks/web/useMessage'; + const { createMessage } = useMessage(); const message = Object.assign({ success: (msg: string) => { diff --git a/types/module.d.ts b/types/module.d.ts index 96152061abb5b9e8d3b1b2628bce870a16f51653..61a0c34e5dd4acb1722830cf2dfae5a3b9ba2d44 100644 --- a/types/module.d.ts +++ b/types/module.d.ts @@ -1,11 +1,13 @@ declare module '*.vue' { import { DefineComponent } from 'vue'; + const Component: DefineComponent<{}, {}, any>; export default Component; } declare module 'ant-design-vue/es/locale/*' { import { Locale } from 'ant-design-vue/types/locale-provider'; + const locale: Locale & ReadonlyRecordable; export default locale as Locale & ReadonlyRecordable; }