From 60a2bf7f4f273f8de66a82ac9c01e03439a3468f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Mon, 14 Nov 2022 10:00:30 +0800 Subject: [PATCH 01/13] =?UTF-8?q?docs:=20=E4=BC=98=E5=8C=96=E8=AF=B4?= =?UTF-8?q?=E6=98=8E=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.md b/README.md index 452a007d..c664b7c0 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ ## 总览 -![logo](readme/logo-t-y.png) - **`master-fetch` 分支是带有后端接口请求的分支** **后端项目地址：[https://gitee.com/MTrun/go-view-serve](https://gitee.com/MTrun/go-view-serve)** @@ -14,12 +12,6 @@ 接口地址修改：`.env` -### 🤯 后端项目 - -后端项目gitee地址：[https://gitee.com/MTrun/go-view-serve](https://gitee.com/MTrun/go-view-serve) - -接口说明地址：[https://docs.apipost.cn/preview/5aa85d10a59d66ce/ddb813732007ad2b?target_id=84dbc5b0-158f-4bcb-8f74-793ac604ada3#3e053622-1e76-43f9-a039-756aee822dbb](https://docs.apipost.cn/preview/5aa85d10a59d66ce/ddb813732007ad2b?target_id=84dbc5b0-158f-4bcb-8f74-793ac604ada3#3e053622-1e76-43f9-a039-756aee822dbb) - ```shell # port VITE_DEV_PORT = '8080' From 7b327df38e8cde9b612db599412285a1c62eab51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Sat, 19 Nov 2022 21:05:32 +0800 Subject: [PATCH 02/13] =?UTF-8?q?build:=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=88=B0=202.1.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6d025073..4b137ec6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "go-view", - "version": "2.1.1", + "version": "2.1.2", "scripts": { "dev": "vite --host", "build": "vue-tsc --noEmit && vite build", From 0609b95a28e6e824958ad4afe102fce7b4157689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=AA?= Date: Tue, 29 Nov 2022 11:47:54 +0800 Subject: [PATCH 03/13] =?UTF-8?q?fix:=E5=9B=BE=E7=89=87hash=E4=BC=9A?= =?UTF-8?q?=E5=87=BA=E7=8E=B0404=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/constant.ts | 8 ++- yarn.lock | 175 +++++++++++++++++++++++++++++----------------- 2 files changed, 118 insertions(+), 65 deletions(-) diff --git a/build/constant.ts b/build/constant.ts index 38ff0454..6b607674 100644 --- a/build/constant.ts +++ b/build/constant.ts @@ -1,3 +1,4 @@ +import path from 'path' export const OUTPUT_DIR = 'dist' // monaco-editor 路径 @@ -14,7 +15,12 @@ export const rollupOptions = { output: { chunkFileNames: 'static/js/[name]-[hash].js', entryFileNames: 'static/js/[name]-[hash].js', - assetFileNames: 'static/[ext]/[name]-[hash].[ext]', + assetFileNames: (chunkInfo) => { + if(['.png', '.jpg', '.jpeg'].includes(path.extname(chunkInfo.name))) { + return `static/png/[name].[ext]` + } + return `static/[ext]/[name]-[hash].[ext]` + }, manualChunks: { jsonWorker: [`${prefix}/language/json/json.worker`], cssWorker: [`${prefix}/language/css/css.worker`], diff --git a/yarn.lock b/yarn.lock index 8d49caec..727e4353 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,16 @@ # yarn lockfile v1 +"@amap/amap-jsapi-loader@^1.0.1": + version "1.0.1" + resolved "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz#9ec4b4d5d2467eac451f6c852e35db69e9f9f0c0" + integrity sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw== + +"@amap/amap-jsapi-types@^0.0.8": + version "0.0.8" + resolved "https://registry.npmmirror.com/@amap/amap-jsapi-types/-/amap-jsapi-types-0.0.8.tgz#5a807e27f33fe409be4c8ecbde73b8c35c1cb650" + integrity sha512-q0FyZDIJcXjsMLGc3oS9rjfJsErOvt9rcp6AgzY4k14vo7bBhdq4eKwoSdVp/pYjR/rfaKBns5v10ycZOFwf/A== + "@ampproject/remapping@^2.1.0": version "2.2.0" resolved "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" @@ -509,61 +519,61 @@ resolved "https://registry.npmmirror.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== -"@intlify/core-base@9.1.9": - version "9.1.9" - resolved "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.1.9.tgz#e4e8c951010728e4af3a0d13d74cf3f9e7add7f6" - integrity sha512-x5T0p/Ja0S8hs5xs+ImKyYckVkL4CzcEXykVYYV6rcbXxJTe2o58IquSqX9bdncVKbRZP7GlBU1EcRaQEEJ+vw== +"@intlify/core-base@9.1.10": + version "9.1.10" + resolved "https://registry.npmmirror.com/@intlify/core-base/-/core-base-9.1.10.tgz#cbd3099f375c789a1b974f3ea79b6efb8bb148fa" + integrity sha512-So9CNUavB/IsZ+zBmk2Cv6McQp6vc2wbGi1S0XQmJ8Vz+UFcNn9MFXAe9gY67PreIHrbLsLxDD0cwo1qsxM1Nw== dependencies: - "@intlify/devtools-if" "9.1.9" - "@intlify/message-compiler" "9.1.9" - "@intlify/message-resolver" "9.1.9" - "@intlify/runtime" "9.1.9" - "@intlify/shared" "9.1.9" - "@intlify/vue-devtools" "9.1.9" + "@intlify/devtools-if" "9.1.10" + "@intlify/message-compiler" "9.1.10" + "@intlify/message-resolver" "9.1.10" + "@intlify/runtime" "9.1.10" + "@intlify/shared" "9.1.10" + "@intlify/vue-devtools" "9.1.10" -"@intlify/devtools-if@9.1.9": - version "9.1.9" - resolved "https://registry.npmmirror.com/@intlify/devtools-if/-/devtools-if-9.1.9.tgz#a30e1dd1256ff2c5c98d8d75d075384fba898e5d" - integrity sha512-oKSMKjttG3Ut/1UGEZjSdghuP3fwA15zpDPcjkf/1FjlOIm6uIBGMNS5jXzsZy593u+P/YcnrZD6cD3IVFz9vQ== +"@intlify/devtools-if@9.1.10": + version "9.1.10" + resolved "https://registry.npmmirror.com/@intlify/devtools-if/-/devtools-if-9.1.10.tgz#8704852a4fa547df43df71a16b1cc4b27e758aa3" + integrity sha512-SHaKoYu6sog3+Q8js1y3oXLywuogbH1sKuc7NSYkN3GElvXSBaMoCzW+we0ZSFqj/6c7vTNLg9nQ6rxhKqYwnQ== dependencies: - "@intlify/shared" "9.1.9" + "@intlify/shared" "9.1.10" -"@intlify/message-compiler@9.1.9": - version "9.1.9" - resolved "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-9.1.9.tgz#1193cbd224a71c2fb981455b8534a3c766d2948d" - integrity sha512-6YgCMF46Xd0IH2hMRLCssZI3gFG4aywidoWQ3QP4RGYQXQYYfFC54DxhSgfIPpVoPLQ+4AD29eoYmhiHZ+qLFQ== +"@intlify/message-compiler@9.1.10": + version "9.1.10" + resolved "https://registry.npmmirror.com/@intlify/message-compiler/-/message-compiler-9.1.10.tgz#271f5e1cb65f3cec4b1fb243e50615747613f4be" + integrity sha512-+JiJpXff/XTb0EadYwdxOyRTB0hXNd4n1HaJ/a4yuV960uRmPXaklJsedW0LNdcptd/hYUZtCkI7Lc9J5C1gxg== dependencies: - "@intlify/message-resolver" "9.1.9" - "@intlify/shared" "9.1.9" + "@intlify/message-resolver" "9.1.10" + "@intlify/shared" "9.1.10" source-map "0.6.1" -"@intlify/message-resolver@9.1.9": - version "9.1.9" - resolved "https://registry.npmmirror.com/@intlify/message-resolver/-/message-resolver-9.1.9.tgz#3155ccd2f5e6d0dc16cad8b7f1d8e97fcda05bfc" - integrity sha512-Lx/DBpigeK0sz2BBbzv5mu9/dAlt98HxwbG7xLawC3O2xMF9MNWU5FtOziwYG6TDIjNq0O/3ZbOJAxwITIWXEA== +"@intlify/message-resolver@9.1.10": + version "9.1.10" + resolved "https://registry.npmmirror.com/@intlify/message-resolver/-/message-resolver-9.1.10.tgz#fb1dabdec2e29942df26f47e19444278a6e2f070" + integrity sha512-5YixMG/M05m0cn9+gOzd4EZQTFRUu8RGhzxJbR1DWN21x/Z3bJ8QpDYj6hC4FwBj5uKsRfKpJQ3Xqg98KWoA+w== -"@intlify/runtime@9.1.9": - version "9.1.9" - resolved "https://registry.npmmirror.com/@intlify/runtime/-/runtime-9.1.9.tgz#2c12ce29518a075629efed0a8ed293ee740cb285" - integrity sha512-XgPw8+UlHCiie3fI41HPVa/VDJb3/aSH7bLhY1hJvlvNV713PFtb4p4Jo+rlE0gAoMsMCGcsiT982fImolSltg== +"@intlify/runtime@9.1.10": + version "9.1.10" + resolved "https://registry.npmmirror.com/@intlify/runtime/-/runtime-9.1.10.tgz#70582a16810f68953d1cbf7183c8107a9137b580" + integrity sha512-7QsuByNzpe3Gfmhwq6hzgXcMPpxz8Zxb/XFI6s9lQdPLPe5Lgw4U1ovRPZTOs6Y2hwitR3j/HD8BJNGWpJnOFA== dependencies: - "@intlify/message-compiler" "9.1.9" - "@intlify/message-resolver" "9.1.9" - "@intlify/shared" "9.1.9" + "@intlify/message-compiler" "9.1.10" + "@intlify/message-resolver" "9.1.10" + "@intlify/shared" "9.1.10" -"@intlify/shared@9.1.9": - version "9.1.9" - resolved "https://registry.npmmirror.com/@intlify/shared/-/shared-9.1.9.tgz#0baaf96128b85560666bec784ffb01f6623cc17a" - integrity sha512-xKGM1d0EAxdDFCWedcYXOm6V5Pfw/TMudd6/qCdEb4tv0hk9EKeg7lwQF1azE0dP2phvx0yXxrt7UQK+IZjNdw== +"@intlify/shared@9.1.10": + version "9.1.10" + resolved "https://registry.npmmirror.com/@intlify/shared/-/shared-9.1.10.tgz#9e2527276b43ae3f354c4015eb04f855d9d7a707" + integrity sha512-Om54xJeo1Vw+K1+wHYyXngE8cAbrxZHpWjYzMR9wCkqbhGtRV5VLhVc214Ze2YatPrWlS2WSMOWXR8JktX/IgA== -"@intlify/vue-devtools@9.1.9": - version "9.1.9" - resolved "https://registry.npmmirror.com/@intlify/vue-devtools/-/vue-devtools-9.1.9.tgz#2be8f4dbe7f7ed4115676eb32348141d411e426b" - integrity sha512-YPehH9uL4vZcGXky4Ev5qQIITnHKIvsD2GKGXgqf+05osMUI6WSEQHaN9USRa318Rs8RyyPCiDfmA0hRu3k7og== +"@intlify/vue-devtools@9.1.10": + version "9.1.10" + resolved "https://registry.npmmirror.com/@intlify/vue-devtools/-/vue-devtools-9.1.10.tgz#c62535d86742bcd16593806a4fcae49f6fc8ae6d" + integrity sha512-5l3qYARVbkWAkagLu1XbDUWRJSL8br1Dj60wgMaKB0+HswVsrR6LloYZTg7ozyvM621V6+zsmwzbQxbVQyrytQ== dependencies: - "@intlify/message-resolver" "9.1.9" - "@intlify/runtime" "9.1.9" - "@intlify/shared" "9.1.9" + "@intlify/message-resolver" "9.1.10" + "@intlify/runtime" "9.1.10" + "@intlify/shared" "9.1.10" "@jridgewell/gen-mapping@^0.1.0": version "0.1.1" @@ -811,6 +821,13 @@ dependencies: "@types/node" "*" +"@types/three@^0.144.0": + version "0.144.0" + resolved "https://registry.npmmirror.com/@types/three/-/three-0.144.0.tgz#a154f40122dbc3668c5424a5373f3965c6564557" + integrity sha512-psvEs6q5rLN50jUYZ3D4pZMfxTbdt3A243blt0my7/NcL6chaCZpHe2csbCtx0SOD9fI/XnF3wnVUAYZGqCSYg== + dependencies: + "@types/webxr" "*" + "@types/through@*": version "0.0.30" resolved "https://registry.npmmirror.com/@types/through/-/through-0.0.30.tgz#e0e42ce77e897bd6aead6f6ea62aeb135b8a3895" @@ -818,6 +835,11 @@ dependencies: "@types/node" "*" +"@types/webxr@*": + version "0.5.0" + resolved "https://registry.npmmirror.com/@types/webxr/-/webxr-0.5.0.tgz#aae1cef3210d88fd4204f8c33385a0bbc4da07c9" + integrity sha512-IUMDPSXnYIbEO2IereEFcgcqfDREOgmbGqtrMpVPpACTU6pltYLwHgVkrnYv0XhWEcjio9sYEfIEzgn3c7nDqA== + "@typescript-eslint/eslint-plugin@^5.18.0": version "5.36.2" resolved "https://registry.npmmirror.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.36.2.tgz#6df092a20e0f9ec748b27f293a12cb39d0c1fe4d" @@ -1947,6 +1969,16 @@ echarts-liquidfill@^3.1.0: resolved "https://registry.npmmirror.com/echarts-liquidfill/-/echarts-liquidfill-3.1.0.tgz#4ec70f3697382d0404c95fff9f3e8dd85c8377da" integrity sha512-5Dlqs/jTsdTUAsd+K5LPLLTgrbbNORUSBQyk8PSy1Mg2zgHDWm83FmvA4s0ooNepCJojFYRITTQ4GU1UUSKYLw== +echarts-stat@^1.2.0: + version "1.2.0" + resolved "https://registry.npmmirror.com/echarts-stat/-/echarts-stat-1.2.0.tgz#d1e7a05d1827724c5cde81f76ee1d75a901746a2" + integrity sha512-zLd7Kgs+tuTSeaK0VQEMNmnMivEkhvHIk1gpBtLzpRerfcIQ+Bd5XudOMmtwpaTc1WDZbA7d1V//iiBccR46Qg== + +echarts-wordcloud@^2.0.0: + version "2.1.0" + resolved "https://registry.npmmirror.com/echarts-wordcloud/-/echarts-wordcloud-2.1.0.tgz#c3de6fe267044f6c3343e4ff0e05eedb01c05096" + integrity sha512-Kt1JmbcROgb+3IMI48KZECK2AP5lG6bSsOEs+AsuwaWJxQom31RTNd6NFYI01E/YaI1PFZeueaupjlmzSQasjQ== + echarts@^5.3.2: version "5.3.3" resolved "https://registry.npmmirror.com/echarts/-/echarts-5.3.3.tgz#df97b09c4c0e2ffcdfb44acf518d50c50e0b838e" @@ -2381,7 +2413,7 @@ esutils@^2.0.2: resolved "https://registry.npmmirror.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== -evtd@^0.2.2, evtd@^0.2.3, evtd@^0.2.4: +evtd@^0.2.2, evtd@^0.2.4: version "0.2.4" resolved "https://registry.npmmirror.com/evtd/-/evtd-0.2.4.tgz#0aac39ba44d6926e6668948ac27618e0795b9d07" integrity sha512-qaeGN5bx63s/AXgQo8gj6fBkxge+OoLddLniox5qtLAEY5HSnuSlISXVPxnSae1dWblvTh4/HoMIB+mbMsvZzw== @@ -2760,6 +2792,11 @@ grapheme-splitter@^1.0.4: resolved "https://registry.npmmirror.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== +gsap@^3.11.3: + version "3.11.3" + resolved "https://registry.npmmirror.com/gsap/-/gsap-3.11.3.tgz#ca5be827f56fe8d5720e08343390f74fb89a05f3" + integrity sha512-xc/iIJy+LWiMbRa4IdMtdnnKa/7PXEK6NNzV71gdOYUVeTZN7UWnLU0fB7Hi1iwiz4ZZoYkBZPPYGg+2+zzFHA== + handlebars@^4.4.3: version "4.7.7" resolved "https://registry.npmmirror.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" @@ -3567,10 +3604,10 @@ mute-stream@0.0.8: resolved "https://registry.npmmirror.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== -naive-ui@2.30.3: - version "2.30.3" - resolved "https://registry.npmmirror.com/naive-ui/-/naive-ui-2.30.3.tgz#4a3d8463705e95494e0ae38ea6276edade5da9cd" - integrity sha512-s6iphodOfLklhgAGtzhzoE0oPi6eY72UufUDRySBbfV+r+64vw9omYUOqk3Z1M/t/Mh8KwqW6z+ex8bYftFKPA== +naive-ui@2.33.4: + version "2.33.4" + resolved "https://registry.npmmirror.com/naive-ui/-/naive-ui-2.33.4.tgz#ef4eaa7c0a3b8aa55ec6c7a852c65b289cff65c1" + integrity sha512-4tK2lWx3v8sbEeTLG/tL5Ur9VvZyUxSnC0VcTO6NO1rM/D15JXg8jVwQCRFYnEp7mp3gfD5B3i8kN4JisTeiFA== dependencies: "@css-render/plugin-bem" "^0.15.10" "@css-render/vue3-ssr" "^0.15.10" @@ -3580,15 +3617,15 @@ naive-ui@2.30.3: css-render "^0.15.10" date-fns "^2.28.0" date-fns-tz "^1.3.3" - evtd "^0.2.3" + evtd "^0.2.4" highlight.js "^11.5.0" lodash "^4.17.21" lodash-es "^4.17.21" - seemly "^0.3.4" + seemly "^0.3.6" treemate "^0.3.11" vdirs "^0.1.8" vooks "^0.2.12" - vueuc "^0.4.39" + vueuc "^0.4.47" nanoid@^3.3.4: version "3.3.4" @@ -4350,7 +4387,7 @@ screenfull@^6.0.1: resolved "https://registry.npmmirror.com/screenfull/-/screenfull-6.0.2.tgz#3dbe4b8c4f8f49fb8e33caa8f69d0bca730ab238" integrity sha512-AQdy8s4WhNvUZ6P8F6PB21tSPIYKniic+Ogx0AacBMjKP1GUHN2E9URxQHtCusiwxudnCKkdy4GrHXPPJSkCCw== -seemly@^0.3.4, seemly@^0.3.6: +seemly@^0.3.6: version "0.3.6" resolved "https://registry.npmmirror.com/seemly/-/seemly-0.3.6.tgz#7ef97e8083dea00804965e2662f572a5df9cb18e" integrity sha512-lEV5VB8BUKTo/AfktXJcy+JeXns26ylbMkIUco8CYREsQijuz4mrXres2Q+vMLdwkuLxJdIPQ8IlCIxLYm71Yw== @@ -4601,6 +4638,11 @@ text-table@^0.2.0: resolved "https://registry.npmmirror.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw== +three@^0.145.0: + version "0.145.0" + resolved "https://registry.npmmirror.com/three/-/three-0.145.0.tgz#a613d71e75effc2aed88be630027ca01e2b6502e" + integrity sha512-EKoHQEtEJ4CB6b2BGMBgLZrfwLjXcSUfoI/MiIXUuRpeYsfK5aPWbYhdtIVWOH+x6X0TouldHKHBuc/LAiFzAw== + through2@^4.0.0: version "4.0.2" resolved "https://registry.npmmirror.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764" @@ -4737,7 +4779,12 @@ type-fest@^0.8.1: resolved "https://registry.npmmirror.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== -typescript@^4.6.3, typescript@^4.6.4: +typescript@4.6.3: + version "4.6.3" + resolved "https://registry.npmmirror.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c" + integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw== + +typescript@^4.6.4: version "4.8.2" resolved "https://registry.npmmirror.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790" integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw== @@ -5060,14 +5107,14 @@ vue-eslint-parser@^8.0.1: lodash "^4.17.21" semver "^7.3.5" -vue-i18n@9.1.9: - version "9.1.9" - resolved "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-9.1.9.tgz#cb53e06ab5cc5b7eed59332f151caf48d47be9bb" - integrity sha512-JeRdNVxS2OGp1E+pye5XB6+M6BBkHwAv9C80Q7+kzoMdUDGRna06tjC0vCB/jDX9aWrl5swxOMFcyAr7or8XTA== +vue-i18n@9.1.10: + version "9.1.10" + resolved "https://registry.npmmirror.com/vue-i18n/-/vue-i18n-9.1.10.tgz#7ad516b89ba28debb90fc4181c9a2faec9ad97f9" + integrity sha512-jpr7gV5KPk4n+sSPdpZT8Qx3XzTcNDWffRlHV/cT2NUyEf+sEgTTmLvnBAibjOFJ0zsUyZlVTAWH5DDnYep+1g== dependencies: - "@intlify/core-base" "9.1.9" - "@intlify/shared" "9.1.9" - "@intlify/vue-devtools" "9.1.9" + "@intlify/core-base" "9.1.10" + "@intlify/shared" "9.1.10" + "@intlify/vue-devtools" "9.1.10" "@vue/devtools-api" "^6.0.0-beta.7" vue-router@4.0.12: @@ -5113,10 +5160,10 @@ vuedraggable@^4.1.0: dependencies: sortablejs "1.14.0" -vueuc@^0.4.39: - version "0.4.48" - resolved "https://registry.npmmirror.com/vueuc/-/vueuc-0.4.48.tgz#892994f3c773ca03ed9a3b07192e074bd2e3da48" - integrity sha512-dQTBLxCzfaPuzD3c4/dIxAULtnyY+xwdotCRFUDgf0DJiwuR3tI+txJ9K8uJKmaHwc1JDUVqhRAj9Jd/pvInWg== +vueuc@^0.4.47: + version "0.4.49" + resolved "https://registry.npmmirror.com/vueuc/-/vueuc-0.4.49.tgz#913e6fd629bdfd5bbed79bf108aec605720af2db" + integrity sha512-WarAC44a/Yx78CxkAgROYLq+LkAeCGA/6wHidVoFmHLbzyF3SiP2nzRNGD/8zJeJInXv18EnWK6A//eGgMMq8w== dependencies: "@css-render/vue3-ssr" "^0.15.10" "@juggle/resize-observer" "^3.3.1" From 5aac8c0546039dafb3c08642ed09df954f25702a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=BD=AA?= Date: Tue, 29 Nov 2022 11:56:37 +0800 Subject: [PATCH 04/13] =?UTF-8?q?fix:=E5=9B=BE=E7=89=87hash=E4=BC=9A?= =?UTF-8?q?=E5=87=BA=E7=8E=B0404=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/constant.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/constant.ts b/build/constant.ts index 6b607674..9d6ca339 100644 --- a/build/constant.ts +++ b/build/constant.ts @@ -7,7 +7,7 @@ export const prefix = `monaco-editor/esm/vs` // chunk 警告大小 export const chunkSizeWarningLimit = 2000 -// 禁用 brotli 压缩大小报告 +// 禁用 brotli 压缩大小报告A export const brotliSize = false // 分包 @@ -17,7 +17,7 @@ export const rollupOptions = { entryFileNames: 'static/js/[name]-[hash].js', assetFileNames: (chunkInfo) => { if(['.png', '.jpg', '.jpeg'].includes(path.extname(chunkInfo.name))) { - return `static/png/[name].[ext]` + return `static/[ext]/[name].[ext]` } return `static/[ext]/[name]-[hash].[ext]` }, From dafdbeca4bec1492d36f75381c3d962406880bb1 Mon Sep 17 00:00:00 2001 From: slxb <835969743@qq.com> Date: Tue, 13 Dec 2022 19:07:47 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E9=A5=BC=E7=8A=B6=E5=9B=BE=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=8A=9F=E8=83=BD=20=E6=98=BE=E7=A4=BA=E6=A0=87?= =?UTF-8?q?=E7=AD=BE,=E6=A0=87=E7=AD=BE=E6=98=BE=E7=A4=BA=E5=86=85?= =?UTF-8?q?=E5=AE=B9,=E5=BC=95=E5=AF=BC=E7=BA=BF=E6=98=BE=E7=A4=BA,?= =?UTF-8?q?=E9=A5=BC=E7=8A=B6=E5=9B=BE=E5=9C=86=E8=A7=92=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Charts/Pies/PieCommon/config.ts | 4 +- .../Charts/Pies/PieCommon/config.vue | 46 +++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/src/packages/components/Charts/Pies/PieCommon/config.ts b/src/packages/components/Charts/Pies/PieCommon/config.ts index 068450b6..73505883 100644 --- a/src/packages/components/Charts/Pies/PieCommon/config.ts +++ b/src/packages/components/Charts/Pies/PieCommon/config.ts @@ -43,7 +43,9 @@ const option = { }, label: { show: false, - position: 'center' + position: 'center', + formatter: '{b}', + fontSize:12 }, emphasis: { label: { diff --git a/src/packages/components/Charts/Pies/PieCommon/config.vue b/src/packages/components/Charts/Pies/PieCommon/config.vue index 55aa8de5..ee6b40f4 100644 --- a/src/packages/components/Charts/Pies/PieCommon/config.vue +++ b/src/packages/components/Charts/Pies/PieCommon/config.vue @@ -7,6 +7,52 @@ + + + + + 展示标签 + + + + + + + + + + + + + + + + 展示引导线 + + + + + + + + 圆角大小 + + + + + + 线条宽度 + + + From ab22db62f792d84bc73fbc30d0b5df4945edde87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Fri, 16 Dec 2022 14:02:09 +0800 Subject: [PATCH 06/13] =?UTF-8?q?build:=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=88=B02.1.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4b137ec6..24af96f2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "go-view", - "version": "2.1.2", + "version": "2.1.3", "scripts": { "dev": "vite --host", "build": "vue-tsc --noEmit && vite build", From f04864ed7f930751aa66fd18bc16eb3ee657f419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Fri, 13 Jan 2023 16:53:12 +0800 Subject: [PATCH 07/13] =?UTF-8?q?build:=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=88=B0=202.1.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6308efe4..12adbbfd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "go-view", - "version": "2.1.5", + "version": "2.1.6", "engines": { "node": ">=16.14 <18.0.0" }, From 1922213f8b9dc7ad53206d1ce2e211c3243e80c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E5=AD=94=E6=B3=89?= Date: Fri, 3 Mar 2023 11:03:05 +0800 Subject: [PATCH 08/13] =?UTF-8?q?fix:=20=E5=8A=A8=E6=80=81=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E4=B8=AD=EF=BC=8Cbody=E7=9A=84json=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BD=BF=E7=94=A8javasctipt=E6=8B=BC=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/http.ts | 4 +++- src/utils/utils.ts | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/api/http.ts b/src/api/http.ts index a122d603..33950baa 100644 --- a/src/api/http.ts +++ b/src/api/http.ts @@ -172,7 +172,9 @@ export const customizeHttp = (targetParams: RequestConfigType, globalParams: Req case RequestBodyEnum.JSON: headers['Content-Type'] = ContentTypeEnum.JSON - data = translateStr(JSON.parse(targetRequestParams.Body['json'])) + //json对象也能使用'javasctipt:'来动态拼接参数 + data = translateStr(targetRequestParams.Body['json']) + if(typeof data === 'string') data = JSON.parse(data) // json 赋值给 data break diff --git a/src/utils/utils.ts b/src/utils/utils.ts index 95203154..31f23b06 100644 --- a/src/utils/utils.ts +++ b/src/utils/utils.ts @@ -298,6 +298,10 @@ export const JSONStringify = (data: T) => { export const JSONParse = (data: string) => { return JSON.parse(data, (k, v) => { if (excludeParseEventKeyList.includes(k)) return v + if(typeof v === 'string' && v.indexOf('javascript:') > -1){ + //动态请求json中'javascript:'内容会影响模板content解析，直接返回 + return v + } if (typeof v === 'string' && v.indexOf && (v.indexOf('function') > -1 || v.indexOf('=>') > -1)) { return eval(`(function(){return ${v}})()`) } else if (typeof v === 'string' && v.indexOf && (v.indexOf('return ') > -1)) { From dd0170eecc841db6512aa945e43d4caf32d62ace Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Sat, 4 Mar 2023 08:01:54 +0000 Subject: [PATCH 09/13] =?UTF-8?q?!133=20=E8=A7=A3=E5=86=B3adcode=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=8D=E6=AD=A3=E7=A1=AE=E5=8F=AF=E8=83=BD=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E9=97=AE=E9=A2=98=20Merge=20pull=20request?= =?UTF-8?q?=20!133=20from=20wallellen/master-fetch-dev?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/packages/components/Charts/Maps/MapBase/index.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/packages/components/Charts/Maps/MapBase/index.vue b/src/packages/components/Charts/Maps/MapBase/index.vue index 7a66753d..0b3baee4 100644 --- a/src/packages/components/Charts/Maps/MapBase/index.vue +++ b/src/packages/components/Charts/Maps/MapBase/index.vue @@ -59,13 +59,14 @@ const getGeojson = (regionId: string) => { } //异步时先注册空的 保证初始化不报错 -registerMap(props.chartConfig.option.mapRegion.adcode, { geoJSON: {} as any, specialAreas: {} }) +registerMap(`${props.chartConfig.option.mapRegion.adcode}`, { geoJSON: {} as any, specialAreas: {} }) // 进行更换初始化地图 如果为china 单独处理 const registerMapInitAsync = async () => { await nextTick() - if (props.chartConfig.option.mapRegion.adcode != 'china') { - await getGeojson(props.chartConfig.option.mapRegion.adcode) + const adCode = `${props.chartConfig.option.mapRegion.adcode}`; + if (adCode !== 'china') { + await getGeojson(adCode) } else { await hainanLandsHandle(props.chartConfig.option.mapRegion.showHainanIsLands) } @@ -127,7 +128,7 @@ watch( //监听地图展示区域发生变化 watch( - () => props.chartConfig.option.mapRegion.adcode, + () => `${props.chartConfig.option.mapRegion.adcode}`, async newData => { try { await getGeojson(newData) From 7836332a97b57eb2a3e2ffac520342cff9c41420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A5=94=E8=B7=91=E7=9A=84=E9=9D=A2=E6=9D=A1?= <1262327911@qq.com> Date: Thu, 16 Mar 2023 21:00:13 +0800 Subject: [PATCH 10/13] =?UTF-8?q?build:=20=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=88=B0=202.2.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index af4087b5..e6b791d8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "go-view", - "version": "2.1.9", + "version": "2.2.0", "engines": { "node": ">=12.0" }, From 475fca7ed64217977dc2b107a59346ed0084c2f8 Mon Sep 17 00:00:00 2001 From: luoyp <2456821174@qq.com> Date: Mon, 24 Jul 2023 09:20:03 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E6=96=B0=E5=A2=9Einput=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8E=A7=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Informations/Inputs/InputsInput/config.ts | 24 +++++++ .../Inputs/InputsInput/config.vue | 18 ++++++ .../Informations/Inputs/InputsInput/index.ts | 14 ++++ .../Informations/Inputs/InputsInput/index.vue | 64 +++++++++++++++++++ .../Inputs/InputsInput/interact.ts | 27 ++++++++ .../components/Informations/Inputs/index.ts | 3 +- 6 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 src/packages/components/Informations/Inputs/InputsInput/config.ts create mode 100644 src/packages/components/Informations/Inputs/InputsInput/config.vue create mode 100644 src/packages/components/Informations/Inputs/InputsInput/index.ts create mode 100644 src/packages/components/Informations/Inputs/InputsInput/index.vue create mode 100644 src/packages/components/Informations/Inputs/InputsInput/interact.ts diff --git a/src/packages/components/Informations/Inputs/InputsInput/config.ts b/src/packages/components/Informations/Inputs/InputsInput/config.ts new file mode 100644 index 00000000..f99c35d7 --- /dev/null +++ b/src/packages/components/Informations/Inputs/InputsInput/config.ts @@ -0,0 +1,24 @@ +import cloneDeep from 'lodash/cloneDeep' +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { chartInitConfig } from '@/settings/designSetting' +import { COMPONENT_INTERACT_EVENT_KET } from '@/enums/eventEnum' +import { interactActions, ComponentInteractEventEnum } from './interact' +import {InputsInputConfig} from "./index"; + +export const option = { + // 时间组件展示类型，必须和 interactActions 中定义的数据一致 + [COMPONENT_INTERACT_EVENT_KET]: ComponentInteractEventEnum.DATA, + // 默认值 + inputValue: "0", + // 暴露配置内容给用户 + dataset: "" +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = InputsInputConfig.key + public attr = { ...chartInitConfig, w: 260, h: 32, zIndex: -1 } + public chartConfig = cloneDeep(InputsInputConfig) + public interactActions = interactActions + public option = cloneDeep(option) +} \ No newline at end of file diff --git a/src/packages/components/Informations/Inputs/InputsInput/config.vue b/src/packages/components/Informations/Inputs/InputsInput/config.vue new file mode 100644 index 00000000..1c7900ee --- /dev/null +++ b/src/packages/components/Informations/Inputs/InputsInput/config.vue @@ -0,0 +1,18 @@ + + \ No newline at end of file diff --git a/src/packages/components/Informations/Inputs/InputsInput/index.ts b/src/packages/components/Informations/Inputs/InputsInput/index.ts new file mode 100644 index 00000000..0828ea35 --- /dev/null +++ b/src/packages/components/Informations/Inputs/InputsInput/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const InputsInputConfig: ConfigType = { + key: 'InputsInput', + chartKey: 'VInputsInput', + conKey: 'VCInputsInput', + title: '输入框', + category: ChatCategoryEnum.INPUTS, + categoryName: ChatCategoryEnumName.INPUTS, + package: PackagesCategoryEnum.INFORMATIONS, + chartFrame: ChartFrameEnum.STATIC, + image: 'inputs_select.png' +} \ No newline at end of file diff --git a/src/packages/components/Informations/Inputs/InputsInput/index.vue b/src/packages/components/Informations/Inputs/InputsInput/index.vue new file mode 100644 index 00000000..31031c8d --- /dev/null +++ b/src/packages/components/Informations/Inputs/InputsInput/index.vue @@ -0,0 +1,64 @@ + + + + + + + + diff --git a/src/packages/components/Informations/Inputs/InputsInput/interact.ts b/src/packages/components/Informations/Inputs/InputsInput/interact.ts new file mode 100644 index 00000000..d6c070f4 --- /dev/null +++ b/src/packages/components/Informations/Inputs/InputsInput/interact.ts @@ -0,0 +1,27 @@ +import { InteractEventOn, InteractActionsType } from '@/enums/eventEnum' + +// 时间组件类型 +export enum ComponentInteractEventEnum { + DATA = 'data' +} + +// 联动参数 +export enum ComponentInteractParamsEnum { + DATA = 'data' +} + +// 定义组件触发回调事件 +export const interactActions: InteractActionsType[] = [ + { + interactType: InteractEventOn.CHANGE, + interactName: '选择完成', + componentEmitEvents: { + [ComponentInteractEventEnum.DATA]: [ + { + value: ComponentInteractParamsEnum.DATA, + label: '选择项' + } + ] + } + } +] diff --git a/src/packages/components/Informations/Inputs/index.ts b/src/packages/components/Informations/Inputs/index.ts index 1f4f22a7..08a84416 100644 --- a/src/packages/components/Informations/Inputs/index.ts +++ b/src/packages/components/Informations/Inputs/index.ts @@ -1,5 +1,6 @@ import { InputsDateConfig } from './InputsDate/index' import { InputsSelectConfig } from './InputsSelect/index' import { InputsTabConfig } from './InputsTab/index' +import { InputsInputConfig } from './InputsInput/index' -export default [InputsDateConfig, InputsSelectConfig, InputsTabConfig] +export default [InputsDateConfig, InputsSelectConfig, InputsTabConfig,InputsInputConfig] From e2d5c2932549606621abf5226917d10a8a0ae80e Mon Sep 17 00:00:00 2001 From: luoyp <2456821174@qq.com> Date: Mon, 24 Jul 2023 09:23:31 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E8=81=94=E5=8A=A8=E6=8E=A7=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Inputs/InputsPagination/config.ts | 26 ++++++++ .../Inputs/InputsPagination/config.vue | 35 ++++++++++ .../Inputs/InputsPagination/index.ts | 14 ++++ .../Inputs/InputsPagination/index.vue | 66 +++++++++++++++++++ .../Inputs/InputsPagination/interact.ts | 32 +++++++++ .../components/Informations/Inputs/index.ts | 3 +- 6 files changed, 175 insertions(+), 1 deletion(-) create mode 100644 src/packages/components/Informations/Inputs/InputsPagination/config.ts create mode 100644 src/packages/components/Informations/Inputs/InputsPagination/config.vue create mode 100644 src/packages/components/Informations/Inputs/InputsPagination/index.ts create mode 100644 src/packages/components/Informations/Inputs/InputsPagination/index.vue create mode 100644 src/packages/components/Informations/Inputs/InputsPagination/interact.ts diff --git a/src/packages/components/Informations/Inputs/InputsPagination/config.ts b/src/packages/components/Informations/Inputs/InputsPagination/config.ts new file mode 100644 index 00000000..7d73e5a1 --- /dev/null +++ b/src/packages/components/Informations/Inputs/InputsPagination/config.ts @@ -0,0 +1,26 @@ +import cloneDeep from 'lodash/cloneDeep' +import { PublicConfigClass } from '@/packages/public' +import { CreateComponentType } from '@/packages/index.d' +import { chartInitConfig } from '@/settings/designSetting' +import { COMPONENT_INTERACT_EVENT_KET } from '@/enums/eventEnum' +import { interactActions, ComponentInteractEventEnum } from './interact' +import {InputsPaginationConfig} from "./index"; + +export const option = { + // 时间组件展示类型，必须和 interactActions 中定义的数据一致 + [COMPONENT_INTERACT_EVENT_KET]: ComponentInteractEventEnum.DATA, + // 默认值 + pageValue:1, + sizeValue:[2,4,8,10,20], + pageSize:4, + // 暴露配置内容给用户 + dataset: 10 +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = InputsPaginationConfig.key + public attr = { ...chartInitConfig, w: 395, h: 32, zIndex: -1 } + public chartConfig = cloneDeep(InputsPaginationConfig) + public interactActions = interactActions + public option = cloneDeep(option) +} \ No newline at end of file diff --git a/src/packages/components/Informations/Inputs/InputsPagination/config.vue b/src/packages/components/Informations/Inputs/InputsPagination/config.vue new file mode 100644 index 00000000..3599781d --- /dev/null +++ b/src/packages/components/Informations/Inputs/InputsPagination/config.vue @@ -0,0 +1,35 @@ + + \ No newline at end of file diff --git a/src/packages/components/Informations/Inputs/InputsPagination/index.ts b/src/packages/components/Informations/Inputs/InputsPagination/index.ts new file mode 100644 index 00000000..cfc3b912 --- /dev/null +++ b/src/packages/components/Informations/Inputs/InputsPagination/index.ts @@ -0,0 +1,14 @@ +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +import { ChatCategoryEnum, ChatCategoryEnumName } from '../../index.d' + +export const InputsPaginationConfig: ConfigType = { + key: 'InputsPagination', + chartKey: 'VInputsPagination', + conKey: 'VCInputsPagination', + title: '分页', + category: ChatCategoryEnum.INPUTS, + categoryName: ChatCategoryEnumName.INPUTS, + package: PackagesCategoryEnum.INFORMATIONS, + chartFrame: ChartFrameEnum.STATIC, + image: 'inputs_select.png' +} \ No newline at end of file diff --git a/src/packages/components/Informations/Inputs/InputsPagination/index.vue b/src/packages/components/Informations/Inputs/InputsPagination/index.vue new file mode 100644 index 00000000..2dc81c75 --- /dev/null +++ b/src/packages/components/Informations/Inputs/InputsPagination/index.vue @@ -0,0 +1,66 @@ + + + \ No newline at end of file diff --git a/src/packages/components/Informations/Inputs/InputsPagination/interact.ts b/src/packages/components/Informations/Inputs/InputsPagination/interact.ts new file mode 100644 index 00000000..acc1453f --- /dev/null +++ b/src/packages/components/Informations/Inputs/InputsPagination/interact.ts @@ -0,0 +1,32 @@ +import { InteractEventOn, InteractActionsType } from '@/enums/eventEnum' + +// 时间组件类型 +export enum ComponentInteractEventEnum { + DATA = 'data' +} + +// 联动参数 +export enum ComponentInteractParamsEnum { + DATA = 'data', + DATA2 = 'data2' +} + +// 定义组件触发回调事件 +export const interactActions: InteractActionsType[] = [ + { + interactType: InteractEventOn.CHANGE, + interactName: '选择完成', + componentEmitEvents: { + [ComponentInteractEventEnum.DATA]: [ + { + value: ComponentInteractParamsEnum.DATA, + label: '页数' + }, + { + value: ComponentInteractParamsEnum.DATA2, + label: '每页条数' + } + ] + } + } +] \ No newline at end of file diff --git a/src/packages/components/Informations/Inputs/index.ts b/src/packages/components/Informations/Inputs/index.ts index 08a84416..8be8e56c 100644 --- a/src/packages/components/Informations/Inputs/index.ts +++ b/src/packages/components/Informations/Inputs/index.ts @@ -2,5 +2,6 @@ import { InputsDateConfig } from './InputsDate/index' import { InputsSelectConfig } from './InputsSelect/index' import { InputsTabConfig } from './InputsTab/index' import { InputsInputConfig } from './InputsInput/index' +import { InputsPaginationConfig } from "./InputsPagination/index"; -export default [InputsDateConfig, InputsSelectConfig, InputsTabConfig,InputsInputConfig] +export default [InputsDateConfig, InputsSelectConfig, InputsTabConfig,InputsInputConfig,InputsPaginationConfig] From 1e6717fde3651c284f30cbb6956772522f4733bb Mon Sep 17 00:00:00 2001 From: luoyp <2456821174@qq.com> Date: Mon, 24 Jul 2023 09:26:02 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BB=84=E5=90=88?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8(=E6=8A=98=E7=BA=BF+=E6=9F=B1=E7=8A=B6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Charts/COMBINATIONS/BarLine/config.ts | 76 ++++++++++++++++ .../Charts/COMBINATIONS/BarLine/config.vue | 89 +++++++++++++++++++ .../Charts/COMBINATIONS/BarLine/data.json | 40 +++++++++ .../Charts/COMBINATIONS/BarLine/index.ts | 16 ++++ .../Charts/COMBINATIONS/BarLine/index.vue | 68 ++++++++++++++ .../components/Charts/COMBINATIONS/index.ts | 3 + src/packages/components/Charts/index.ts | 3 +- 7 files changed, 294 insertions(+), 1 deletion(-) create mode 100644 src/packages/components/Charts/COMBINATIONS/BarLine/config.ts create mode 100644 src/packages/components/Charts/COMBINATIONS/BarLine/config.vue create mode 100644 src/packages/components/Charts/COMBINATIONS/BarLine/data.json create mode 100644 src/packages/components/Charts/COMBINATIONS/BarLine/index.ts create mode 100644 src/packages/components/Charts/COMBINATIONS/BarLine/index.vue create mode 100644 src/packages/components/Charts/COMBINATIONS/index.ts diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/config.ts b/src/packages/components/Charts/COMBINATIONS/BarLine/config.ts new file mode 100644 index 00000000..b62c4bab --- /dev/null +++ b/src/packages/components/Charts/COMBINATIONS/BarLine/config.ts @@ -0,0 +1,76 @@ +import { echartOptionProfixHandle, PublicConfigClass } from '@/packages/public' +import { BarLineConfig } from './index' +import { CreateComponentType } from '@/packages/index.d' +import cloneDeep from 'lodash/cloneDeep' +import dataJson from './data.json' + + +export const includes = ['legend', 'xAxis', 'yAxis', 'grid'] +// 柱状折线组合图 分别定义series +// 写死name可以定义legend显示的名称 +export const barSeriesItem = { + type: 'bar', + barWidth: 15, + label: { + show: true, + position: 'top', + color: '#fff', + fontSize: 12 + }, + itemStyle: { + color: null, + borderRadius: 2 + } +} + +export const lineSeriesItem = { + type: 'line', + symbol: "circle", + label: { + show: true, + position: 'top', + color: '#fff', + fontSize: 12 + }, + symbolSize: 5, //设定实心点的大小 + itemStyle: { + color: '#FFE47A', + borderWidth: 1 + }, + lineStyle: { + type: 'solid', + width: 3, + color: null + } +} + +export const option = { + tooltip: { + show: true, + trigger: 'axis', + axisPointer: { + show: true, + type: 'shadow' + } + }, + legend: { + data:null + }, + xAxis: { + show: true, + type: 'category' + }, + yAxis: { + show: true, + type: 'value' + }, + dataset: { ...dataJson }, + series: [barSeriesItem, lineSeriesItem] +} + +export default class Config extends PublicConfigClass implements CreateComponentType { + public key = BarLineConfig.key + public chartConfig = cloneDeep(BarLineConfig) + // 图表配置项 + public option = echartOptionProfixHandle(option, includes) +} \ No newline at end of file diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/config.vue b/src/packages/components/Charts/COMBINATIONS/BarLine/config.vue new file mode 100644 index 00000000..f6cd2b28 --- /dev/null +++ b/src/packages/components/Charts/COMBINATIONS/BarLine/config.vue @@ -0,0 +1,89 @@ + + + \ No newline at end of file diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/data.json b/src/packages/components/Charts/COMBINATIONS/BarLine/data.json new file mode 100644 index 00000000..0bd2f36e --- /dev/null +++ b/src/packages/components/Charts/COMBINATIONS/BarLine/data.json @@ -0,0 +1,40 @@ +{ + "dimensions": ["product", "data1", "data2"], + "source": [ + { + "product": "1月", + "data1": 104, + "data2": 30 + }, + { + "product": "2月", + "data1": 56, + "data2": 56 + }, + { + "product": "3月", + "data1": 136, + "data2": 36 + }, + { + "product": "4月", + "data1": 86, + "data2": 6 + }, + { + "product": "5月", + "data1": 98, + "data2": 10 + }, + { + "product": "6月", + "data1": 86, + "data2": 70 + }, + { + "product": "7月", + "data1": 77, + "data2": 57 + } + ] +} \ No newline at end of file diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/index.ts b/src/packages/components/Charts/COMBINATIONS/BarLine/index.ts new file mode 100644 index 00000000..73e37e66 --- /dev/null +++ b/src/packages/components/Charts/COMBINATIONS/BarLine/index.ts @@ -0,0 +1,16 @@ +// 公共类型声明 +import { ConfigType, PackagesCategoryEnum, ChartFrameEnum } from '@/packages/index.d' +// 当前[信息模块]分类声明 +import { ChatCategoryEnum,ChatCategoryEnumName } from '../../index.d' + +export const BarLineConfig: ConfigType = { + key: 'BarLine', + chartKey: 'VBarLine', + conKey: 'VCBarLine', + title: '柱状加折线图', + category: ChatCategoryEnum.COMBINATION, + categoryName: ChatCategoryEnumName.COMBINATION, + package: PackagesCategoryEnum.CHARTS, + chartFrame: ChartFrameEnum.ECHARTS, + image: 'bar_x.png' +} \ No newline at end of file diff --git a/src/packages/components/Charts/COMBINATIONS/BarLine/index.vue b/src/packages/components/Charts/COMBINATIONS/BarLine/index.vue new file mode 100644 index 00000000..87a9d848 --- /dev/null +++ b/src/packages/components/Charts/COMBINATIONS/BarLine/index.vue @@ -0,0 +1,68 @@ + + + \ No newline at end of file diff --git a/src/packages/components/Charts/COMBINATIONS/index.ts b/src/packages/components/Charts/COMBINATIONS/index.ts new file mode 100644 index 00000000..3a131a97 --- /dev/null +++ b/src/packages/components/Charts/COMBINATIONS/index.ts @@ -0,0 +1,3 @@ +import { BarLineConfig } from './BarLine/index' + +export default [BarLineConfig] \ No newline at end of file diff --git a/src/packages/components/Charts/index.ts b/src/packages/components/Charts/index.ts index 20ffcc66..c1d090e3 100644 --- a/src/packages/components/Charts/index.ts +++ b/src/packages/components/Charts/index.ts @@ -3,6 +3,7 @@ import Pies from './Pies' import Lines from './Lines' import Scatters from './Scatters' import Mores from './Mores' +import COMBINATIONS from './COMBINATIONS' import Maps from './Maps' -export const ChartList = [...Bars, ...Lines, ...Pies, ...Scatters, ...Maps, ...Mores] +export const ChartList = [...Bars, ...Lines, ...Pies, ...Scatters, ...Maps,...COMBINATIONS, ...Mores]