From 6fbf1d351462f35a5dd77c5bb891d1ef055c76dd Mon Sep 17 00:00:00 2001 From: zouzhibing Date: Thu, 10 Nov 2022 13:12:12 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.html | 138 +- package.json | 5 +- src/components/CodeMirror/index.vue | 121 + src/layout/Header/components/CollapseIcon.vue | 2 +- .../Header/components/globalComSize.vue | 4 +- src/plugins/vxeTable.ts | 13 - src/router/modules/other.ts | 6 + src/styles/common.scss | 1 + src/styles/element-dark.scss | 3 + src/views/other/clipboard/index.vue | 28 +- src/views/other/codeMirror/index.vue | 43 + src/views/other/count/index.scss | 14 + src/views/other/count/index.vue | 234 +- src/views/other/editor/index.vue | 3 - .../{fullScreen.vue => fullScreen/index.vue} | 0 src/views/other/share.vue | 0 src/views/other/splitpane.vue | 59 - src/views/other/upload/index.vue | 10 +- vite.config.ts | 2 +- yarn.lock | 6530 +++++++++-------- 20 files changed, 3747 insertions(+), 3469 deletions(-) create mode 100644 src/components/CodeMirror/index.vue delete mode 100644 src/plugins/vxeTable.ts create mode 100644 src/views/other/codeMirror/index.vue create mode 100644 src/views/other/count/index.scss rename src/views/other/{fullScreen.vue => fullScreen/index.vue} (100%) delete mode 100644 src/views/other/share.vue delete mode 100644 src/views/other/splitpane.vue diff --git a/index.html b/index.html index 70a38a2..4622d96 100644 --- a/index.html +++ b/index.html @@ -1,5 +1,5 @@ - + @@ -9,60 +9,116 @@
-
-
-
-
-
-
+
+
+
+ + + + + + +
+

vue-admin-perfect

+
diff --git a/package.json b/package.json index 20ab1dd..105aa57 100644 --- a/package.json +++ b/package.json @@ -21,12 +21,13 @@ "@wangeditor/editor-for-vue": "^5.1.12", "axios": "^0.27.2", "clipboard": "^2.0.10", + "codemirror": "^5.65.9", "core-js": "^3.6.5", "dayjs": "^1.11.4", "default-passive-events": "^2.0.0", "echarts": "^5.3.1", "echarts-liquidfill": "^3.1.0", - "element-plus": "^2.2.16", + "element-plus": "^2.2.20", "exceljs": "^4.3.0", "file-saver": "^2.0.5", "fuse.js": "^6.6.2", @@ -53,8 +54,6 @@ "vue-splitpane": "^1.0.6", "vuedraggable": "^4.1.0", "vuex": "^4.0.0-0", - "vxe-table": "^4.3.5", - "xe-utils": "^3.5.6", "xlsx": "^0.18.5" }, "devDependencies": { diff --git a/src/components/CodeMirror/index.vue b/src/components/CodeMirror/index.vue new file mode 100644 index 0000000..67dce27 --- /dev/null +++ b/src/components/CodeMirror/index.vue @@ -0,0 +1,121 @@ + + + + + + diff --git a/src/layout/Header/components/CollapseIcon.vue b/src/layout/Header/components/CollapseIcon.vue index 97dc9af..f9f5d56 100644 --- a/src/layout/Header/components/CollapseIcon.vue +++ b/src/layout/Header/components/CollapseIcon.vue @@ -6,7 +6,7 @@ + + diff --git a/src/views/other/count/index.scss b/src/views/other/count/index.scss new file mode 100644 index 0000000..7e953bc --- /dev/null +++ b/src/views/other/count/index.scss @@ -0,0 +1,14 @@ +.count-to { + display: block; + margin: 10px 0; + text-align: center; + font-size: 40px; + font-weight: 500; + color: $primaryColor; +} +.label { + color: #2f4f4f; + font-size: 16px; + display: inline-block; + margin: 15px 30px 15px 0; +} diff --git a/src/views/other/count/index.vue b/src/views/other/count/index.vue index 53330be..8190c66 100644 --- a/src/views/other/count/index.vue +++ b/src/views/other/count/index.vue @@ -1,91 +1,93 @@ diff --git a/src/views/other/editor/index.vue b/src/views/other/editor/index.vue index 05a7632..b63fad9 100644 --- a/src/views/other/editor/index.vue +++ b/src/views/other/editor/index.vue @@ -27,9 +27,6 @@ https://www.wangeditor.com/v5/for-frame.html - - - - - - 1 - - - 2 - 3 - 4 - - - 5 - - - - - - - diff --git a/src/views/other/upload/index.vue b/src/views/other/upload/index.vue index 7cf9b71..c48dad7 100644 --- a/src/views/other/upload/index.vue +++ b/src/views/other/upload/index.vue @@ -1,6 +1,5 @@