From 7f0354cd6389f134412765a58ec2ae588c04c514 Mon Sep 17 00:00:00 2001 From: xiaoxian521 <1923740402@qq.com> Date: Tue, 29 Nov 2022 11:08:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A6=96=E9=A1=B5=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0=E6=97=A5=E5=BF=97=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 + pnpm-lock.yaml | 201 +++++++++++++++++++++- src/views/able/timeline.vue | 7 +- src/views/welcome/components/Bar.vue | 10 +- src/views/welcome/components/Infinite.vue | 133 -------------- src/views/welcome/components/Line.vue | 14 +- src/views/welcome/components/Pie.vue | 11 +- src/views/welcome/components/columns.tsx | 14 +- src/views/welcome/index.vue | 105 ++++++++--- 9 files changed, 322 insertions(+), 175 deletions(-) delete mode 100644 src/views/welcome/components/Infinite.vue diff --git a/package.json b/package.json index 1da37785c..f61c1a65b 100644 --- a/package.json +++ b/package.json @@ -76,6 +76,7 @@ "vue-types": "^4.2.1", "vue-virtual-scroller": "^2.0.0-alpha.1", "vue3-danmaku": "^1.0.0", + "vue3-markdown-it": "^1.0.10", "vuedraggable": "^4.1.0", "vxe-table": "^4.3.6", "xe-utils": "^3.5.7", @@ -102,6 +103,7 @@ "@types/js-cookie": "^3.0.1", "@types/lodash": "^4.14.180", "@types/lodash-es": "^4.17.6", + "@types/markdown-it": "^12.2.3", "@types/mockjs": "^1.0.7", "@types/node": "^18.11.9", "@types/nprogress": "0.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 1165e0ebb..4ea83d593 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -28,6 +28,7 @@ specifiers: "@types/js-cookie": ^3.0.1 "@types/lodash": ^4.14.180 "@types/lodash-es": ^4.17.6 + "@types/markdown-it": ^12.2.3 "@types/mockjs": ^1.0.7 "@types/node": ^18.11.9 "@types/nprogress": 0.2.0 @@ -118,6 +119,7 @@ specifiers: vue-types: ^4.2.1 vue-virtual-scroller: ^2.0.0-alpha.1 vue3-danmaku: ^1.0.0 + vue3-markdown-it: ^1.0.10 vuedraggable: ^4.1.0 vxe-table: ^4.3.6 xe-utils: ^3.5.7 @@ -172,6 +174,7 @@ dependencies: vue-types: 4.2.1_vue@3.2.45 vue-virtual-scroller: 2.0.0-beta.3_vue@3.2.45 vue3-danmaku: 1.0.0_vue@3.2.45 + vue3-markdown-it: 1.0.10_@types+markdown-it@12.2.3 vuedraggable: 4.1.0_vue@3.2.45 vxe-table: 4.3.6_vue@3.2.45+xe-utils@3.5.7 xe-utils: 3.5.7 @@ -198,6 +201,7 @@ devDependencies: "@types/js-cookie": 3.0.2 "@types/lodash": 4.14.190 "@types/lodash-es": 4.17.6 + "@types/markdown-it": 12.2.3 "@types/mockjs": 1.0.7 "@types/node": 18.11.9 "@types/nprogress": 0.2.0 @@ -1504,6 +1508,12 @@ packages: } dev: true + /@types/linkify-it/3.0.2: + resolution: + { + integrity: sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA== + } + /@types/lodash-es/4.17.6: resolution: { @@ -1518,6 +1528,21 @@ packages: integrity: sha512-5iJ3FBJBvQHQ8sFhEhJfjUP+G+LalhavTkYyrAYqz5MEJG+erSv0k9KJLb6q7++17Lafk1scaTIFXcMJlwK8Mw== } + /@types/markdown-it/12.2.3: + resolution: + { + integrity: sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ== + } + dependencies: + "@types/linkify-it": 3.0.2 + "@types/mdurl": 1.0.2 + + /@types/mdurl/1.0.2: + resolution: + { + integrity: sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA== + } + /@types/minimatch/3.0.5: resolution: { @@ -2644,7 +2669,6 @@ packages: { integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== } - dev: true /array-differ/3.0.0: resolution: @@ -3911,6 +3935,13 @@ packages: ansi-colors: 4.1.3 dev: true + /entities/2.1.0: + resolution: + { + integrity: sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== + } + dev: false + /entities/2.2.0: resolution: { @@ -5128,6 +5159,14 @@ packages: } dev: false + /highlight.js/11.7.0: + resolution: + { + integrity: sha512-1rRqesRFhMO/PRF+G86evnyJkCgaZFOI+Z6kdj15TA18funfoqJXvgPCLSf0SWq3SRfg1j3HlDs8o4s3EGq1oQ== + } + engines: { node: ">=12.0.0" } + dev: false + /hosted-git-info/2.8.9: resolution: { @@ -5697,6 +5736,15 @@ packages: } dev: true + /linkify-it/3.0.3: + resolution: + { + integrity: sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ== + } + dependencies: + uc.micro: 1.0.6 + dev: false + /lint-staged/11.1.2: resolution: { @@ -5807,6 +5855,13 @@ packages: } dev: false + /lodash.flow/3.5.0: + resolution: + { + integrity: sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw== + } + dev: false + /lodash.foreach/4.5.0: resolution: { @@ -5951,6 +6006,113 @@ packages: engines: { node: ">=8" } dev: true + /markdown-it-abbr/1.0.4: + resolution: + { + integrity: sha512-ZeA4Z4SaBbYysZap5iZcxKmlPL6bYA8grqhzJIHB1ikn7njnzaP8uwbtuXc4YXD5LicI4/2Xmc0VwmSiFV04gg== + } + dev: false + + /markdown-it-anchor/8.6.5_2zb4u3vubltivolgu556vv4aom: + resolution: + { + integrity: sha512-PI1qEHHkTNWT+X6Ip9w+paonfIQ+QZP9sCeMYi47oqhH+EsW8CrJ8J7CzV19QVOj6il8ATGbK2nTECj22ZHGvQ== + } + peerDependencies: + "@types/markdown-it": "*" + markdown-it: "*" + dependencies: + "@types/markdown-it": 12.2.3 + markdown-it: 12.3.2 + dev: false + + /markdown-it-deflist/2.1.0: + resolution: + { + integrity: sha512-3OuqoRUlSxJiuQYu0cWTLHNhhq2xtoSFqsZK8plANg91+RJQU1ziQ6lA2LzmFAEes18uPBsHZpcX6We5l76Nzg== + } + dev: false + + /markdown-it-emoji/2.0.2: + resolution: + { + integrity: sha512-zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ== + } + dev: false + + /markdown-it-footnote/3.0.3: + resolution: + { + integrity: sha512-YZMSuCGVZAjzKMn+xqIco9d1cLGxbELHZ9do/TSYVzraooV8ypsppKNmUJ0fVH5ljkCInQAtFpm8Rb3eXSrt5w== + } + dev: false + + /markdown-it-highlightjs/3.6.0: + resolution: + { + integrity: sha512-ex+Lq3cVkprh0GpGwFyc53A/rqY6GGzopPCG1xMsf8Ya3XtGC8Uw9tChN1rWbpyDae7tBBhVHVcMM29h4Btamw== + } + dependencies: + highlight.js: 11.7.0 + lodash.flow: 3.5.0 + dev: false + + /markdown-it-ins/3.0.1: + resolution: + { + integrity: sha512-32SSfZqSzqyAmmQ4SHvhxbFqSzPDqsZgMHDwxqPzp+v+t8RsmqsBZRG+RfRQskJko9PfKC2/oxyOs4Yg/CfiRw== + } + dev: false + + /markdown-it-mark/3.0.1: + resolution: + { + integrity: sha512-HyxjAu6BRsdt6Xcv6TKVQnkz/E70TdGXEFHRYBGLncRE9lBFwDNLVtFojKxjJWgJ+5XxUwLaHXy+2sGBbDn+4A== + } + dev: false + + /markdown-it-sub/1.0.0: + resolution: + { + integrity: sha512-z2Rm/LzEE1wzwTSDrI+FlPEveAAbgdAdPhdWarq/ZGJrGW/uCQbKAnhoCsE4hAbc3SEym26+W2z/VQB0cQiA9Q== + } + dev: false + + /markdown-it-sup/1.0.0: + resolution: + { + integrity: sha512-E32m0nV9iyhRR7CrhnzL5msqic7rL1juWre6TQNxsnApg7Uf+F97JOKxUijg5YwXz86lZ0mqfOnutoryyNdntQ== + } + dev: false + + /markdown-it-task-lists/2.1.1: + resolution: + { + integrity: sha512-TxFAc76Jnhb2OUu+n3yz9RMu4CwGfaT788br6HhEDlvWfdeJcLUsxk1Hgw2yJio0OXsxv7pyIPmvECY7bMbluA== + } + dev: false + + /markdown-it-toc-done-right/4.2.0: + resolution: + { + integrity: sha512-UB/IbzjWazwTlNAX0pvWNlJS8NKsOQ4syrXZQ/C72j+jirrsjVRT627lCaylrKJFBQWfRsPmIVQie8x38DEhAQ== + } + dev: false + + /markdown-it/12.3.2: + resolution: + { + integrity: sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg== + } + hasBin: true + dependencies: + argparse: 2.0.1 + entities: 2.1.0 + linkify-it: 3.0.3 + mdurl: 1.0.1 + uc.micro: 1.0.6 + dev: false + /mathml-tag-names/2.1.3: resolution: { @@ -5972,6 +6134,13 @@ packages: } dev: true + /mdurl/1.0.1: + resolution: + { + integrity: sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g== + } + dev: false + /memoize-one/6.0.0: resolution: { @@ -8490,6 +8659,13 @@ packages: engines: { node: ">=4.2.0" } hasBin: true + /uc.micro/1.0.6: + resolution: + { + integrity: sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA== + } + dev: false + /unidragger/2.4.0: resolution: { @@ -8928,6 +9104,29 @@ packages: vue: 3.2.45 dev: false + /vue3-markdown-it/1.0.10_@types+markdown-it@12.2.3: + resolution: + { + integrity: sha512-mTvHu0zl7jrh7ojgaZ+tTpCLiS4CVg4bTgTu4KGhw/cRRY5YgIG8QgFAPu6kCzSW6Znc9a52Beb6hFvF4hSMkQ== + } + dependencies: + markdown-it: 12.3.2 + markdown-it-abbr: 1.0.4 + markdown-it-anchor: 8.6.5_2zb4u3vubltivolgu556vv4aom + markdown-it-deflist: 2.1.0 + markdown-it-emoji: 2.0.2 + markdown-it-footnote: 3.0.3 + markdown-it-highlightjs: 3.6.0 + markdown-it-ins: 3.0.1 + markdown-it-mark: 3.0.1 + markdown-it-sub: 1.0.0 + markdown-it-sup: 1.0.0 + markdown-it-task-lists: 2.1.1 + markdown-it-toc-done-right: 4.2.0 + transitivePeerDependencies: + - "@types/markdown-it" + dev: false + /vuedraggable/4.1.0_vue@3.2.45: resolution: { diff --git a/src/views/able/timeline.vue b/src/views/able/timeline.vue index 4ed83ad95..5d8e7e6fd 100644 --- a/src/views/able/timeline.vue +++ b/src/views/able/timeline.vue @@ -1,6 +1,7 @@ - - - - diff --git a/src/views/welcome/components/Line.vue b/src/views/welcome/components/Line.vue index 869c6a71d..72b1f508b 100644 --- a/src/views/welcome/components/Line.vue +++ b/src/views/welcome/components/Line.vue @@ -15,14 +15,16 @@ const { setOptions } = useECharts(lineChartRef as Ref, { setOptions( { - grid: { - bottom: "20%", - height: "68%", - containLabel: true - }, tooltip: { trigger: "item" }, + grid: { + containLabel: true, + top: "10px", + bottom: "0", + left: "0", + right: "0" + }, xAxis: { type: "category", axisLabel: { @@ -35,7 +37,7 @@ setOptions( }, series: [ { - data: [3, 204, 1079, 1079], + data: [1000, 10000, 20000, 66666], type: "line", areaStyle: {} } diff --git a/src/views/welcome/components/Pie.vue b/src/views/welcome/components/Pie.vue index fa1941077..25d8bcaa1 100644 --- a/src/views/welcome/components/Pie.vue +++ b/src/views/welcome/components/Pie.vue @@ -27,13 +27,14 @@ setOptions( { name: "Github信息", type: "pie", - radius: "60%", + top: "20%", + radius: "80%", center: ["40%", "50%"], data: [ - { value: 1079, name: "watchers" }, - { value: 1079, name: "star" }, - { value: 204, name: "forks" }, - { value: 3, name: "open_issues" } + { value: 20000, name: "watchers" }, + { value: 66666, name: "star" }, + { value: 10000, name: "forks" }, + { value: 1000, name: "open_issues" } ], emphasis: { itemStyle: { diff --git a/src/views/welcome/components/columns.tsx b/src/views/welcome/components/columns.tsx index 5b8a14f2b..c0cb5f368 100644 --- a/src/views/welcome/components/columns.tsx +++ b/src/views/welcome/components/columns.tsx @@ -1,4 +1,5 @@ import { IconifyIconOffline } from "@/components/ReIcon"; +import TypeIt from "@/components/ReTypeit"; export function useColumns() { const lists = [ @@ -41,7 +42,7 @@ export function useColumns() { 居住地 ), - value: "上海" + value: "杭州" } ]; @@ -74,7 +75,7 @@ export function useColumns() { 联系地址 ), - value: "上海市徐汇区" + value: "杭州市西湖区" } ]; @@ -88,7 +89,14 @@ export function useColumns() { 好好学习，天天向上 ), - value: "上海市徐汇区" + cellRenderer: () => ( + + ) } ]; diff --git a/src/views/welcome/index.vue b/src/views/welcome/index.vue index 78dfc20b7..e425ebdf0 100644 --- a/src/views/welcome/index.vue +++ b/src/views/welcome/index.vue @@ -1,18 +1,25 @@