From feddb657f78b1f359ccdad48a4bfa9b3acf720f3 Mon Sep 17 00:00:00 2001 From: joeyyyyyyyy <745559787@qq.com> Date: Sat, 2 Jul 2022 19:04:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?elementui=202.0=E7=89=88=E6=9C=AC=E7=9A=84v?= =?UTF-8?q?ue-plugin-hiprint@0.0.25-beat1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 6 +- public/index.html | 1 + src/demo/custom/index.vue | 173 +++++++++++++++++---------------- src/demo/design/index.vue | 199 ++++++++++++++++++++++---------------- src/demo/tasks/index.vue | 165 ++++++++++++++++--------------- src/main.js | 2 + src/plugins/elementui.js | 9 ++ 7 files changed, 303 insertions(+), 252 deletions(-) create mode 100644 src/plugins/elementui.js diff --git a/package.json b/package.json index d37242c..c5157c6 100644 --- a/package.json +++ b/package.json @@ -27,11 +27,12 @@ }, "dependencies": { "ant-design-vue": "^1.7.8", + "concurrent-tasks": "^1.0.7", "core-js": "^3.6.5", + "element-ui": "^2.15.9", "vue": "^2.5.11", - "concurrent-tasks": "^1.0.7", "vue-ls": "^4.0.0", - "vue-plugin-hiprint": "^0.0.17" + "vue-plugin-hiprint": "0.0.25-beta1" }, "browserslist": [ "> 1%", @@ -41,6 +42,7 @@ "devDependencies": { "@vue/cli-plugin-babel": "^4.5.15", "@vue/cli-service": "^4.5.15", + "babel-plugin-component": "^1.1.1", "less-loader": "^6.1.1", "uglifyjs-webpack-plugin": "^2.2.0", "vue-template-compiler": "^2.6.11", diff --git a/public/index.html b/public/index.html index 1ee85e0..cfe7933 100644 --- a/public/index.html +++ b/public/index.html @@ -8,6 +8,7 @@ <%= htmlWebpackPlugin.options.title %> + diff --git a/src/demo/custom/index.vue b/src/demo/custom/index.vue index b5b6d2d..cd7597d 100644 --- a/src/demo/custom/index.vue +++ b/src/demo/custom/index.vue @@ -1,83 +1,81 @@ diff --git a/src/main.js b/src/main.js index 9448439..ebc8371 100644 --- a/src/main.js +++ b/src/main.js @@ -5,6 +5,8 @@ import Antd from 'ant-design-vue'; import 'ant-design-vue/dist/antd.css'; Vue.use(Antd); +import '@/plugins/elementui' + import {hiPrintPlugin} from 'vue-plugin-hiprint' Vue.use(hiPrintPlugin); diff --git a/src/plugins/elementui.js b/src/plugins/elementui.js new file mode 100644 index 0000000..7b9b71b --- /dev/null +++ b/src/plugins/elementui.js @@ -0,0 +1,9 @@ +// 按需引入 elementui组件 +import Vue from 'vue' +import 'element-ui/lib/theme-chalk/index.css'; +import { Button, Loading, ButtonGroup,Input, + InputNumber,Card, Row, + Col, Select,Slider, + Option,Popover } from 'element-ui' +Vue.use(Button).use(Loading).use(ButtonGroup).use(InputNumber).use(Input) + .use(Card).use(Row).use(Col).use(Select).use(Option).use(Slider).use(Popover) -- Gitee From 92da1be0adf4d14851073daf35378f2f6c2d5bbb Mon Sep 17 00:00:00 2001 From: joeyyyyyyyy <745559787@qq.com> Date: Tue, 6 Sep 2022 12:49:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4ant=20design=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=BC=95=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 - src/App.vue | 32 +++++++++-------- src/demo/custom/index.vue | 70 ++++++++++++++++++------------------- src/demo/custom/preview.vue | 26 ++++++-------- src/demo/design/index.vue | 20 +++++------ src/demo/design/preview.vue | 18 ++++------ src/demo/tasks/index.vue | 4 +-- src/demo/tasks/preview.vue | 28 ++++++--------- src/main.js | 6 ++-- src/plugins/elementui.js | 4 +-- 10 files changed, 98 insertions(+), 111 deletions(-) diff --git a/package.json b/package.json index c5157c6..4bbc207 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ "build-demo": "vue-cli-service build" }, "dependencies": { - "ant-design-vue": "^1.7.8", "concurrent-tasks": "^1.0.7", "core-js": "^3.6.5", "element-ui": "^2.15.9", diff --git a/src/App.vue b/src/App.vue index e93ab0c..e2b3ffa 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,19 +1,21 @@