From d60e6effa195d7ab515e2c50b8ae5467444279c6 Mon Sep 17 00:00:00 2001 From: mtrun <1262327911@qq.com> Date: Mon, 28 Mar 2022 15:44:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=B0=E5=A2=9E=E6=B0=B4=E7=90=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + pnpm-lock.yaml | 443 +++++++++--------- src/hooks/useChartDataFetch.hook.ts | 2 +- .../Charts/Mores/WaterPolo/config.ts | 62 ++- .../Charts/Mores/WaterPolo/index.vue | 43 +- 5 files changed, 327 insertions(+), 224 deletions(-) diff --git a/package.json b/package.json index 4395d4d3..d36362f1 100644 --- a/package.json +++ b/package.json @@ -13,6 +13,7 @@ "axios": "0.23.0", "color": "^4.2.1", "crypto-ts": "^1.0.2", + "echarts-liquidfill": "3", "highlight.js": "^11.5.0", "naive-ui": "^2.25.2", "pinia": "^2.0.6", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7503c719..9ba6e4f1 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,6 +17,7 @@ specifiers: crypto-ts: ^1.0.2 default-passive-events: ^2.0.0 echarts: ^5.3.0 + echarts-liquidfill: '3' eslint: ^8.4.1 eslint-config-prettier: ^8.3.0 eslint-plugin-import: ^2.25.3 @@ -52,6 +53,7 @@ dependencies: axios: rg.cnpmjs.org/axios/0.23.0 color: registry.npmjs.org/color/4.2.1 crypto-ts: r2.cnpmjs.org/crypto-ts/1.0.2 + echarts-liquidfill: r2.cnpmjs.org/echarts-liquidfill/3.1.0_echarts@5.3.0 highlight.js: registry.npmjs.org/highlight.js/11.5.0 naive-ui: registry.npmjs.org/naive-ui/2.25.2_vue@3.2.24 pinia: rg.cnpmjs.org/pinia/2.0.6_typescript@4.5.2+vue@3.2.24 @@ -133,6 +135,14 @@ packages: tslib: registry.npmjs.org/tslib/2.3.1 dev: true + /uglify-js/3.15.1: + resolution: {integrity: sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==} + engines: {node: '>=0.8.0'} + hasBin: true + requiresBuild: true + dev: true + optional: true + /vfonts/0.0.3: resolution: {integrity: sha512-nguyw8L6Un8eelg1vQ31vIU2ESxqid7EYmy8V+MDeMaHBqaRSkg3dTBToC1PR00D89UzS/SLkfYPnx0Wf23IQQ==} dev: false @@ -567,12 +577,193 @@ packages: tslib: registry.npmjs.org/tslib/2.3.1 dev: true + r2.cnpmjs.org/echarts-liquidfill/3.1.0_echarts@5.3.0: + resolution: {integrity: sha512-5Dlqs/jTsdTUAsd+K5LPLLTgrbbNORUSBQyk8PSy1Mg2zgHDWm83FmvA4s0ooNepCJojFYRITTQ4GU1UUSKYLw==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/echarts-liquidfill/-/echarts-liquidfill-3.1.0.tgz} + id: r2.cnpmjs.org/echarts-liquidfill/3.1.0 + name: echarts-liquidfill + version: 3.1.0 + peerDependencies: + echarts: ^5.0.1 + dependencies: + echarts: registry.npmjs.org/echarts/5.3.0 + dev: false + r2.cnpmjs.org/emoji-regex/8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==, registry: http://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz} name: emoji-regex version: 8.0.0 dev: true + r2.cnpmjs.org/esbuild-android-arm64/0.13.15: + resolution: {integrity: sha512-m602nft/XXeO8YQPUDVoHfjyRVPdPgjyyXOxZ44MK/agewFFkPa8tUo6lAzSWh5Ui5PB4KR9UIFTSBKh/RrCmg==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.13.15.tgz} + name: esbuild-android-arm64 + version: 0.13.15 + cpu: [arm64] + os: [android] + requiresBuild: true + dev: true + optional: true + + r2.cnpmjs.org/esbuild-darwin-64/0.13.15: + resolution: {integrity: sha512-ihOQRGs2yyp7t5bArCwnvn2Atr6X4axqPpEdCFPVp7iUj4cVSdisgvEKdNR7yH3JDjW6aQDw40iQFoTqejqxvQ==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.13.15.tgz} + name: esbuild-darwin-64 + version: 0.13.15 + cpu: [x64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + r2.cnpmjs.org/esbuild-darwin-arm64/0.13.15: + resolution: {integrity: sha512-i1FZssTVxUqNlJ6cBTj5YQj4imWy3m49RZRnHhLpefFIh0To05ow9DTrXROTE1urGTQCloFUXTX8QfGJy1P8dQ==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.15.tgz} + name: esbuild-darwin-arm64 + version: 0.13.15 + cpu: [arm64] + os: [darwin] + requiresBuild: true + dev: true + optional: true + + r2.cnpmjs.org/esbuild-freebsd-64/0.13.15: + resolution: {integrity: sha512-G3dLBXUI6lC6Z09/x+WtXBXbOYQZ0E8TDBqvn7aMaOCzryJs8LyVXKY4CPnHFXZAbSwkCbqiPuSQ1+HhrNk7EA==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.15.tgz} + name: esbuild-freebsd-64 + version: 0.13.15 + cpu: [x64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + r2.cnpmjs.org/esbuild-freebsd-arm64/0.13.15: + resolution: {integrity: sha512-KJx0fzEDf1uhNOZQStV4ujg30WlnwqUASaGSFPhznLM/bbheu9HhqZ6mJJZM32lkyfGJikw0jg7v3S0oAvtvQQ==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.15.tgz} + name: esbuild-freebsd-arm64 + version: 0.13.15 + cpu: [arm64] + os: [freebsd] + requiresBuild: true + dev: true + optional: true + + r2.cnpmjs.org/esbuild-linux-32/0.13.15: + resolution: {integrity: sha512-ZvTBPk0YWCLMCXiFmD5EUtB30zIPvC5Itxz0mdTu/xZBbbHJftQgLWY49wEPSn2T/TxahYCRDWun5smRa0Tu+g==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.13.15.tgz} + name: esbuild-linux-32 + version: 0.13.15 + cpu: [ia32] + os: [linux] + requiresBuild: true + dev: true + optional: true + + r2.cnpmjs.org/esbuild-linux-64/0.13.15: + resolution: {integrity: sha512-eCKzkNSLywNeQTRBxJRQ0jxRCl2YWdMB3+PkWFo2BBQYC5mISLIVIjThNtn6HUNqua1pnvgP5xX0nHbZbPj5oA==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.13.15.tgz} + name: esbuild-linux-64 + version: 0.13.15 + cpu: [x64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + r2.cnpmjs.org/esbuild-linux-arm/0.13.15: + resolution: {integrity: sha512-wUHttDi/ol0tD8ZgUMDH8Ef7IbDX+/UsWJOXaAyTdkT7Yy9ZBqPg8bgB/Dn3CZ9SBpNieozrPRHm0BGww7W/jA==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.13.15.tgz} + name: esbuild-linux-arm + version: 0.13.15 + cpu: [arm] + os: [linux] + requiresBuild: true + dev: true + optional: true + + r2.cnpmjs.org/esbuild-linux-arm64/0.13.15: + resolution: {integrity: sha512-bYpuUlN6qYU9slzr/ltyLTR9YTBS7qUDymO8SV7kjeNext61OdmqFAzuVZom+OLW1HPHseBfJ/JfdSlx8oTUoA==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.15.tgz} + name: esbuild-linux-arm64 + version: 0.13.15 + cpu: [arm64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + r2.cnpmjs.org/esbuild-linux-mips64le/0.13.15: + resolution: {integrity: sha512-KlVjIG828uFPyJkO/8gKwy9RbXhCEUeFsCGOJBepUlpa7G8/SeZgncUEz/tOOUJTcWMTmFMtdd3GElGyAtbSWg==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.15.tgz} + name: esbuild-linux-mips64le + version: 0.13.15 + cpu: [mips64el] + os: [linux] + requiresBuild: true + dev: true + optional: true + + r2.cnpmjs.org/esbuild-linux-ppc64le/0.13.15: + resolution: {integrity: sha512-h6gYF+OsaqEuBjeesTBtUPw0bmiDu7eAeuc2OEH9S6mV9/jPhPdhOWzdeshb0BskRZxPhxPOjqZ+/OqLcxQwEQ==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.15.tgz} + name: esbuild-linux-ppc64le + version: 0.13.15 + cpu: [ppc64] + os: [linux] + requiresBuild: true + dev: true + optional: true + + r2.cnpmjs.org/esbuild-netbsd-64/0.13.15: + resolution: {integrity: sha512-3+yE9emwoevLMyvu+iR3rsa+Xwhie7ZEHMGDQ6dkqP/ndFzRHkobHUKTe+NCApSqG5ce2z4rFu+NX/UHnxlh3w==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.15.tgz} + name: esbuild-netbsd-64 + version: 0.13.15 + cpu: [x64] + os: [netbsd] + requiresBuild: true + dev: true + optional: true + + r2.cnpmjs.org/esbuild-openbsd-64/0.13.15: + resolution: {integrity: sha512-wTfvtwYJYAFL1fSs8yHIdf5GEE4NkbtbXtjLWjM3Cw8mmQKqsg8kTiqJ9NJQe5NX/5Qlo7Xd9r1yKMMkHllp5g==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.15.tgz} + name: esbuild-openbsd-64 + version: 0.13.15 + cpu: [x64] + os: [openbsd] + requiresBuild: true + dev: true + optional: true + + r2.cnpmjs.org/esbuild-sunos-64/0.13.15: + resolution: {integrity: sha512-lbivT9Bx3t1iWWrSnGyBP9ODriEvWDRiweAs69vI+miJoeKwHWOComSRukttbuzjZ8r1q0mQJ8Z7yUsDJ3hKdw==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.13.15.tgz} + name: esbuild-sunos-64 + version: 0.13.15 + cpu: [x64] + os: [sunos] + requiresBuild: true + dev: true + optional: true + + r2.cnpmjs.org/esbuild-windows-32/0.13.15: + resolution: {integrity: sha512-fDMEf2g3SsJ599MBr50cY5ve5lP1wyVwTe6aLJsM01KtxyKkB4UT+fc5MXQFn3RLrAIAZOG+tHC+yXObpSn7Nw==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.13.15.tgz} + name: esbuild-windows-32 + version: 0.13.15 + cpu: [ia32] + os: [win32] + requiresBuild: true + dev: true + optional: true + + r2.cnpmjs.org/esbuild-windows-64/0.13.15: + resolution: {integrity: sha512-9aMsPRGDWCd3bGjUIKG/ZOJPKsiztlxl/Q3C1XDswO6eNX/Jtwu4M+jb6YDH9hRSUflQWX0XKAfWzgy5Wk54JQ==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.13.15.tgz} + name: esbuild-windows-64 + version: 0.13.15 + cpu: [x64] + os: [win32] + requiresBuild: true + dev: true + optional: true + + r2.cnpmjs.org/esbuild-windows-arm64/0.13.15: + resolution: {integrity: sha512-zzvyCVVpbwQQATaf3IG8mu1IwGEiDxKkYUdA4FpoCHi1KtPa13jeScYDjlW0Qh+ebWzpKfR2ZwvqAQkSWNcKjA==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.15.tgz} + name: esbuild-windows-arm64 + version: 0.13.15 + cpu: [arm64] + os: [win32] + requiresBuild: true + dev: true + optional: true + r2.cnpmjs.org/escape-string-regexp/1.0.5: resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==, registry: http://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz} name: escape-string-regexp @@ -705,6 +896,16 @@ packages: version: 1.0.0 dev: true + r2.cnpmjs.org/fsevents/2.3.2: + resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/fsevents/-/fsevents-2.3.2.tgz} + name: fsevents + version: 2.3.2 + engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} + os: [darwin] + requiresBuild: true + dev: true + optional: true + r2.cnpmjs.org/function-bind/1.1.1: resolution: {integrity: sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==, registry: http://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/function-bind/-/function-bind-1.1.1.tgz} name: function-bind @@ -771,6 +972,14 @@ packages: slash: r2.cnpmjs.org/slash/3.0.0 dev: true + r2.cnpmjs.org/graceful-fs/4.2.8: + resolution: {integrity: sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==, registry: https://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz} + name: graceful-fs + version: 4.2.8 + requiresBuild: true + dev: true + optional: true + r2.cnpmjs.org/handlebars/4.7.7: resolution: {integrity: sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==, registry: http://r.cnpmjs.org/, tarball: https://r2.cnpmjs.org/handlebars/-/handlebars-4.7.7.tgz} name: handlebars @@ -783,7 +992,7 @@ packages: source-map: r2.cnpmjs.org/source-map/0.6.1 wordwrap: r2.cnpmjs.org/wordwrap/1.0.0 optionalDependencies: - uglify-js: registry.npmjs.org/uglify-js/3.15.1 + uglify-js: 3.15.1 dev: true r2.cnpmjs.org/has/1.0.3: @@ -1984,176 +2193,6 @@ packages: zrender: registry.npmjs.org/zrender/5.3.0 dev: true - registry.npmjs.org/esbuild-android-arm64/0.13.15: - resolution: {integrity: sha512-m602nft/XXeO8YQPUDVoHfjyRVPdPgjyyXOxZ44MK/agewFFkPa8tUo6lAzSWh5Ui5PB4KR9UIFTSBKh/RrCmg==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.13.15.tgz} - name: esbuild-android-arm64 - version: 0.13.15 - cpu: [arm64] - os: [android] - requiresBuild: true - dev: true - optional: true - - registry.npmjs.org/esbuild-darwin-64/0.13.15: - resolution: {integrity: sha512-ihOQRGs2yyp7t5bArCwnvn2Atr6X4axqPpEdCFPVp7iUj4cVSdisgvEKdNR7yH3JDjW6aQDw40iQFoTqejqxvQ==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.13.15.tgz} - name: esbuild-darwin-64 - version: 0.13.15 - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - registry.npmjs.org/esbuild-darwin-arm64/0.13.15: - resolution: {integrity: sha512-i1FZssTVxUqNlJ6cBTj5YQj4imWy3m49RZRnHhLpefFIh0To05ow9DTrXROTE1urGTQCloFUXTX8QfGJy1P8dQ==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.15.tgz} - name: esbuild-darwin-arm64 - version: 0.13.15 - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - registry.npmjs.org/esbuild-freebsd-64/0.13.15: - resolution: {integrity: sha512-G3dLBXUI6lC6Z09/x+WtXBXbOYQZ0E8TDBqvn7aMaOCzryJs8LyVXKY4CPnHFXZAbSwkCbqiPuSQ1+HhrNk7EA==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.15.tgz} - name: esbuild-freebsd-64 - version: 0.13.15 - cpu: [x64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - - registry.npmjs.org/esbuild-freebsd-arm64/0.13.15: - resolution: {integrity: sha512-KJx0fzEDf1uhNOZQStV4ujg30WlnwqUASaGSFPhznLM/bbheu9HhqZ6mJJZM32lkyfGJikw0jg7v3S0oAvtvQQ==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.15.tgz} - name: esbuild-freebsd-arm64 - version: 0.13.15 - cpu: [arm64] - os: [freebsd] - requiresBuild: true - dev: true - optional: true - - registry.npmjs.org/esbuild-linux-32/0.13.15: - resolution: {integrity: sha512-ZvTBPk0YWCLMCXiFmD5EUtB30zIPvC5Itxz0mdTu/xZBbbHJftQgLWY49wEPSn2T/TxahYCRDWun5smRa0Tu+g==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.13.15.tgz} - name: esbuild-linux-32 - version: 0.13.15 - cpu: [ia32] - os: [linux] - requiresBuild: true - dev: true - optional: true - - registry.npmjs.org/esbuild-linux-64/0.13.15: - resolution: {integrity: sha512-eCKzkNSLywNeQTRBxJRQ0jxRCl2YWdMB3+PkWFo2BBQYC5mISLIVIjThNtn6HUNqua1pnvgP5xX0nHbZbPj5oA==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.13.15.tgz} - name: esbuild-linux-64 - version: 0.13.15 - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - registry.npmjs.org/esbuild-linux-arm/0.13.15: - resolution: {integrity: sha512-wUHttDi/ol0tD8ZgUMDH8Ef7IbDX+/UsWJOXaAyTdkT7Yy9ZBqPg8bgB/Dn3CZ9SBpNieozrPRHm0BGww7W/jA==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.13.15.tgz} - name: esbuild-linux-arm - version: 0.13.15 - cpu: [arm] - os: [linux] - requiresBuild: true - dev: true - optional: true - - registry.npmjs.org/esbuild-linux-arm64/0.13.15: - resolution: {integrity: sha512-bYpuUlN6qYU9slzr/ltyLTR9YTBS7qUDymO8SV7kjeNext61OdmqFAzuVZom+OLW1HPHseBfJ/JfdSlx8oTUoA==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.15.tgz} - name: esbuild-linux-arm64 - version: 0.13.15 - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - registry.npmjs.org/esbuild-linux-mips64le/0.13.15: - resolution: {integrity: sha512-KlVjIG828uFPyJkO/8gKwy9RbXhCEUeFsCGOJBepUlpa7G8/SeZgncUEz/tOOUJTcWMTmFMtdd3GElGyAtbSWg==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.15.tgz} - name: esbuild-linux-mips64le - version: 0.13.15 - cpu: [mips64el] - os: [linux] - requiresBuild: true - dev: true - optional: true - - registry.npmjs.org/esbuild-linux-ppc64le/0.13.15: - resolution: {integrity: sha512-h6gYF+OsaqEuBjeesTBtUPw0bmiDu7eAeuc2OEH9S6mV9/jPhPdhOWzdeshb0BskRZxPhxPOjqZ+/OqLcxQwEQ==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.15.tgz} - name: esbuild-linux-ppc64le - version: 0.13.15 - cpu: [ppc64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - registry.npmjs.org/esbuild-netbsd-64/0.13.15: - resolution: {integrity: sha512-3+yE9emwoevLMyvu+iR3rsa+Xwhie7ZEHMGDQ6dkqP/ndFzRHkobHUKTe+NCApSqG5ce2z4rFu+NX/UHnxlh3w==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.15.tgz} - name: esbuild-netbsd-64 - version: 0.13.15 - cpu: [x64] - os: [netbsd] - requiresBuild: true - dev: true - optional: true - - registry.npmjs.org/esbuild-openbsd-64/0.13.15: - resolution: {integrity: sha512-wTfvtwYJYAFL1fSs8yHIdf5GEE4NkbtbXtjLWjM3Cw8mmQKqsg8kTiqJ9NJQe5NX/5Qlo7Xd9r1yKMMkHllp5g==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.15.tgz} - name: esbuild-openbsd-64 - version: 0.13.15 - cpu: [x64] - os: [openbsd] - requiresBuild: true - dev: true - optional: true - - registry.npmjs.org/esbuild-sunos-64/0.13.15: - resolution: {integrity: sha512-lbivT9Bx3t1iWWrSnGyBP9ODriEvWDRiweAs69vI+miJoeKwHWOComSRukttbuzjZ8r1q0mQJ8Z7yUsDJ3hKdw==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.13.15.tgz} - name: esbuild-sunos-64 - version: 0.13.15 - cpu: [x64] - os: [sunos] - requiresBuild: true - dev: true - optional: true - - registry.npmjs.org/esbuild-windows-32/0.13.15: - resolution: {integrity: sha512-fDMEf2g3SsJ599MBr50cY5ve5lP1wyVwTe6aLJsM01KtxyKkB4UT+fc5MXQFn3RLrAIAZOG+tHC+yXObpSn7Nw==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.13.15.tgz} - name: esbuild-windows-32 - version: 0.13.15 - cpu: [ia32] - os: [win32] - requiresBuild: true - dev: true - optional: true - - registry.npmjs.org/esbuild-windows-64/0.13.15: - resolution: {integrity: sha512-9aMsPRGDWCd3bGjUIKG/ZOJPKsiztlxl/Q3C1XDswO6eNX/Jtwu4M+jb6YDH9hRSUflQWX0XKAfWzgy5Wk54JQ==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.13.15.tgz} - name: esbuild-windows-64 - version: 0.13.15 - cpu: [x64] - os: [win32] - requiresBuild: true - dev: true - optional: true - - registry.npmjs.org/esbuild-windows-arm64/0.13.15: - resolution: {integrity: sha512-zzvyCVVpbwQQATaf3IG8mu1IwGEiDxKkYUdA4FpoCHi1KtPa13jeScYDjlW0Qh+ebWzpKfR2ZwvqAQkSWNcKjA==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.15.tgz} - name: esbuild-windows-arm64 - version: 0.13.15 - cpu: [arm64] - os: [win32] - requiresBuild: true - dev: true - optional: true - registry.npmjs.org/evtd/0.2.3: resolution: {integrity: sha512-tmiT1YUVqFjTY+BSBOAskL83xNx41iUfpvKP6Gcd/xMHjg3mnER98jXGXJyKnxCG19uPc6EhZiUC+MUyvoqCtw==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/evtd/-/evtd-0.2.3.tgz} name: evtd @@ -2171,16 +2210,6 @@ packages: universalify: registry.npmjs.org/universalify/2.0.0 dev: true - registry.npmjs.org/fsevents/2.3.2: - resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz} - name: fsevents - version: 2.3.2 - engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} - os: [darwin] - requiresBuild: true - dev: true - optional: true - registry.npmjs.org/graceful-fs/4.2.8: resolution: {integrity: sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz} name: graceful-fs @@ -2240,7 +2269,7 @@ packages: dependencies: universalify: registry.npmjs.org/universalify/2.0.0 optionalDependencies: - graceful-fs: registry.npmjs.org/graceful-fs/4.2.8 + graceful-fs: r2.cnpmjs.org/graceful-fs/4.2.8 dev: true registry.npmjs.org/mockjs/1.1.0: @@ -2372,16 +2401,6 @@ packages: version: 2.3.1 dev: true - registry.npmjs.org/uglify-js/3.15.1: - resolution: {integrity: sha512-FAGKF12fWdkpvNJZENacOH0e/83eG6JyVQyanIJaBXCN1J11TUQv1T1/z8S+Z0CG0ZPk1nPcreF/c7lrTd0TEQ==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.1.tgz} - name: uglify-js - version: 3.15.1 - engines: {node: '>=0.8.0'} - hasBin: true - requiresBuild: true - dev: true - optional: true - registry.npmjs.org/universalify/2.0.0: resolution: {integrity: sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==, registry: https://skimdb.npmjs.com/registry/, tarball: https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz} name: universalify @@ -3761,7 +3780,7 @@ packages: normalize-path: rg.cnpmjs.org/normalize-path/3.0.0 readdirp: rg.cnpmjs.org/readdirp/3.6.0 optionalDependencies: - fsevents: registry.npmjs.org/fsevents/2.3.2 + fsevents: r2.cnpmjs.org/fsevents/2.3.2 dev: true rg.cnpmjs.org/concat-map/0.0.1: @@ -4081,23 +4100,23 @@ packages: hasBin: true requiresBuild: true optionalDependencies: - esbuild-android-arm64: registry.npmjs.org/esbuild-android-arm64/0.13.15 - esbuild-darwin-64: registry.npmjs.org/esbuild-darwin-64/0.13.15 - esbuild-darwin-arm64: registry.npmjs.org/esbuild-darwin-arm64/0.13.15 - esbuild-freebsd-64: registry.npmjs.org/esbuild-freebsd-64/0.13.15 - esbuild-freebsd-arm64: registry.npmjs.org/esbuild-freebsd-arm64/0.13.15 - esbuild-linux-32: registry.npmjs.org/esbuild-linux-32/0.13.15 - esbuild-linux-64: registry.npmjs.org/esbuild-linux-64/0.13.15 - esbuild-linux-arm: registry.npmjs.org/esbuild-linux-arm/0.13.15 - esbuild-linux-arm64: registry.npmjs.org/esbuild-linux-arm64/0.13.15 - esbuild-linux-mips64le: registry.npmjs.org/esbuild-linux-mips64le/0.13.15 - esbuild-linux-ppc64le: registry.npmjs.org/esbuild-linux-ppc64le/0.13.15 - esbuild-netbsd-64: registry.npmjs.org/esbuild-netbsd-64/0.13.15 - esbuild-openbsd-64: registry.npmjs.org/esbuild-openbsd-64/0.13.15 - esbuild-sunos-64: registry.npmjs.org/esbuild-sunos-64/0.13.15 - esbuild-windows-32: registry.npmjs.org/esbuild-windows-32/0.13.15 - esbuild-windows-64: registry.npmjs.org/esbuild-windows-64/0.13.15 - esbuild-windows-arm64: registry.npmjs.org/esbuild-windows-arm64/0.13.15 + esbuild-android-arm64: r2.cnpmjs.org/esbuild-android-arm64/0.13.15 + esbuild-darwin-64: r2.cnpmjs.org/esbuild-darwin-64/0.13.15 + esbuild-darwin-arm64: r2.cnpmjs.org/esbuild-darwin-arm64/0.13.15 + esbuild-freebsd-64: r2.cnpmjs.org/esbuild-freebsd-64/0.13.15 + esbuild-freebsd-arm64: r2.cnpmjs.org/esbuild-freebsd-arm64/0.13.15 + esbuild-linux-32: r2.cnpmjs.org/esbuild-linux-32/0.13.15 + esbuild-linux-64: r2.cnpmjs.org/esbuild-linux-64/0.13.15 + esbuild-linux-arm: r2.cnpmjs.org/esbuild-linux-arm/0.13.15 + esbuild-linux-arm64: r2.cnpmjs.org/esbuild-linux-arm64/0.13.15 + esbuild-linux-mips64le: r2.cnpmjs.org/esbuild-linux-mips64le/0.13.15 + esbuild-linux-ppc64le: r2.cnpmjs.org/esbuild-linux-ppc64le/0.13.15 + esbuild-netbsd-64: r2.cnpmjs.org/esbuild-netbsd-64/0.13.15 + esbuild-openbsd-64: r2.cnpmjs.org/esbuild-openbsd-64/0.13.15 + esbuild-sunos-64: r2.cnpmjs.org/esbuild-sunos-64/0.13.15 + esbuild-windows-32: r2.cnpmjs.org/esbuild-windows-32/0.13.15 + esbuild-windows-64: r2.cnpmjs.org/esbuild-windows-64/0.13.15 + esbuild-windows-arm64: r2.cnpmjs.org/esbuild-windows-arm64/0.13.15 dev: true rg.cnpmjs.org/escalade/3.1.1: @@ -5614,7 +5633,7 @@ packages: engines: {node: '>=10.0.0'} hasBin: true optionalDependencies: - fsevents: registry.npmjs.org/fsevents/2.3.2 + fsevents: r2.cnpmjs.org/fsevents/2.3.2 dev: true rg.cnpmjs.org/run-parallel/1.2.0: @@ -6054,7 +6073,7 @@ packages: rollup: rg.cnpmjs.org/rollup/2.60.2 sass: rg.cnpmjs.org/sass/1.44.0 optionalDependencies: - fsevents: registry.npmjs.org/fsevents/2.3.2 + fsevents: r2.cnpmjs.org/fsevents/2.3.2 dev: true rg.cnpmjs.org/void-elements/3.1.0: diff --git a/src/hooks/useChartDataFetch.hook.ts b/src/hooks/useChartDataFetch.hook.ts index a45d240c..d336fe7b 100644 --- a/src/hooks/useChartDataFetch.hook.ts +++ b/src/hooks/useChartDataFetch.hook.ts @@ -9,7 +9,7 @@ import { isPreview } from '@/utils' type ChartEditStoreType = typeof useChartEditStore /** - * 图表的 setdata 数据监听与更改 + * 图表针对 setdata 数据监听与更改 * @param chartConfig */ export const useChartDataFetch = (chartConfig: CreateComponentType, useChartEditStore: ChartEditStoreType) => { diff --git a/src/packages/components/Charts/Mores/WaterPolo/config.ts b/src/packages/components/Charts/Mores/WaterPolo/config.ts index 1a701428..cf3908d6 100644 --- a/src/packages/components/Charts/Mores/WaterPolo/config.ts +++ b/src/packages/components/Charts/Mores/WaterPolo/config.ts @@ -1,14 +1,66 @@ -import { publicConfig } from '@/packages/public' +import { echartOptionProfixHandle, publicConfig } from '@/packages/public' import { CreateComponentType } from '@/packages/index.d' import { WaterPoloConfig } from './index' import cloneDeep from 'lodash/cloneDeep' - + +export const includes = [] + export const option = { - colors: ['#4fd2dd', '#235fa7'], + series: [ + { + type: 'liquidFill', + radius: '90%', + data: [0.5], + center: ['50%', '50%'], + color: [ + { + type: 'linear', + x: 0, + y: 0, + x2: 0, + y2: 1, + colorStops: [ + { + offset: 0, + color: '#446bf5', + }, + { + offset: 1, + color: '#2ca3e2', + }, + ], + globalCoord: false, + }, + ], + backgroundStyle: { + borderWidth: 1, + color: 'RGBA(51, 66, 127, 0.7)', + }, + label: { + normal: { + textStyle: { + fontSize: 50, + color: '#fff', + }, + }, + }, + outline: { + show: false, + borderDistance: 10, + itemStyle: { + borderWidth: 2, + borderColor: '#112165', + }, + }, + }, + ], } -export default class Config extends publicConfig implements CreateComponentType { +export default class Config + extends publicConfig + implements CreateComponentType +{ public key = WaterPoloConfig.key public chartConfig = cloneDeep(WaterPoloConfig) - public option = option + public option = echartOptionProfixHandle(option, includes) } diff --git a/src/packages/components/Charts/Mores/WaterPolo/index.vue b/src/packages/components/Charts/Mores/WaterPolo/index.vue index 31fe77be..4715f5d0 100644 --- a/src/packages/components/Charts/Mores/WaterPolo/index.vue +++ b/src/packages/components/Charts/Mores/WaterPolo/index.vue @@ -1,13 +1,44 @@ - \ No newline at end of file +