From 90090411e528f9bc5111231aee9449cfb72f228c Mon Sep 17 00:00:00 2001 From: pipipi-pikachu Date: Thu, 5 Aug 2021 22:21:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20antd=E6=A0=B7=E5=BC=8F=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 27 ++++++++++++----------- package.json | 4 ++-- src/main.ts | 53 ++++++++++++++++++++++++++++++++++++++++----- src/plugins/antd.ts | 48 ---------------------------------------- 4 files changed, 63 insertions(+), 69 deletions(-) delete mode 100644 src/plugins/antd.ts diff --git a/package-lock.json b/package-lock.json index f164846b..11962640 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1444,9 +1444,9 @@ } }, "@icon-park/vue-next": { - "version": "1.3.1", - "resolved": "https://registry.npm.taobao.org/@icon-park/vue-next/download/@icon-park/vue-next-1.3.1.tgz", - "integrity": "sha1-irAZM35Dh/diu5XNszRnKPtBF2o=" + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/@icon-park/vue-next/-/vue-next-1.3.5.tgz", + "integrity": "sha512-alB051w2HKBcSo4hzKgWwLLoPCZIUwiaHEW5d2QmMUNefamKPIAt1JZ7heiJahRs5KN+1/Dkj+L9e8/2ccZsGw==" }, "@intervolga/optimize-cssnano-plugin": { "version": "1.0.6", @@ -1910,9 +1910,9 @@ }, "dependencies": { "core-js": { - "version": "3.15.2", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.15.2.tgz", - "integrity": "sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q==" + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.0.tgz", + "integrity": "sha512-5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g==" } } }, @@ -2244,9 +2244,9 @@ "dev": true }, "@types/lodash": { - "version": "4.14.171", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.171.tgz", - "integrity": "sha512-7eQ2xYLLI/LsicL2nejW9Wyko3lcpN6O/z0ZLHrEQsg280zIdCv1t/0m6UtBjUHokCGBQ3gYTbHzDkZ1xOBwwg==" + "version": "4.14.172", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.172.tgz", + "integrity": "sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==" }, "@types/mdast": { "version": "3.0.3", @@ -2482,7 +2482,8 @@ "@types/svg-arc-to-cubic-bezier": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/@types/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz", - "integrity": "sha512-3h04sJhF2rjOq8zUhyomORyKdr0RUts7FAz/JajBKGpTF0JSXjaj9fjWtAqj+pU1fwsGsHzcm3Neew3t/McUXA==" + "integrity": "sha512-3h04sJhF2rjOq8zUhyomORyKdr0RUts7FAz/JajBKGpTF0JSXjaj9fjWtAqj+pU1fwsGsHzcm3Neew3t/McUXA==", + "dev": true }, "@types/tapable": { "version": "1.0.7", @@ -4073,9 +4074,9 @@ } }, "ant-design-vue": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-2.2.1.tgz", - "integrity": "sha512-pxcvVhxQ39JkWl8uLq+W51FIho4kJQve3BhnnlSTz8rcg6yctz6kH+ieOA20AWhkau+/Gk0X2rug2bjBpiA0hw==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-2.2.2.tgz", + "integrity": "sha512-Gmed9dVw4oqYmuO3ubkXbRBadldE82XSt6Gqq3F2grvORKXYoJF/3CaMwfyRN81UaoRhWVTHmLeGLzuVpwJepw==", "requires": { "@ant-design/icons-vue": "^6.0.0", "@babel/runtime": "^7.10.5", diff --git a/package.json b/package.json index e1f245cf..c84f7ab2 100644 --- a/package.json +++ b/package.json @@ -9,9 +9,9 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "@icon-park/vue-next": "^1.2.6", + "@icon-park/vue-next": "^1.3.5", "animate.css": "^4.1.1", - "ant-design-vue": "^2.2.1", + "ant-design-vue": "^2.2.2", "chartist": "^0.11.4", "clipboard": "^2.0.6", "core-js": "^3.6.5", diff --git a/src/main.ts b/src/main.ts index 510daad0..96f01540 100644 --- a/src/main.ts +++ b/src/main.ts @@ -6,20 +6,61 @@ import '@icon-park/vue-next/styles/index.css' import 'prosemirror-view/style/prosemirror.css' import 'animate.css' -import Icon from '@/plugins/icon' -import Antd from '@/plugins/antd' -import Component from '@/plugins/component' -import Directive from '@/plugins/directive' - import '@/assets/styles/prosemirror.scss' import '@/assets/styles/global.scss' import '@/assets/styles/antd.scss' import '@/assets/styles/font.scss' +import Icon from '@/plugins/icon' +import Component from '@/plugins/component' +import Directive from '@/plugins/directive' + +import { + InputNumber, + Divider, + Button, + Tooltip, + Popover, + Slider, + Select, + Switch, + Radio, + Input, + Modal, + Dropdown, + Menu, + Checkbox, + Drawer, + Spin, +} from 'ant-design-vue' + const app = createApp(App) +app.component('InputNumber', InputNumber) +app.component('Divider', Divider) +app.component('Button', Button) +app.component('ButtonGroup', Button.Group) +app.component('Tooltip', Tooltip) +app.component('Popover', Popover) +app.component('Slider', Slider) +app.component('Select', Select) +app.component('SelectOption', Select.Option) +app.component('SelectOptGroup', Select.OptGroup) +app.component('Switch', Switch) +app.component('Radio', Radio) +app.component('RadioGroup', Radio.Group) +app.component('RadioButton', Radio.Button) +app.component('Input', Input) +app.component('InputGroup', Input.Group) +app.component('Modal', Modal) +app.component('Dropdown', Dropdown) +app.component('Menu', Menu) +app.component('MenuItem', Menu.Item) +app.component('Checkbox', Checkbox) +app.component('Drawer', Drawer) +app.component('Spin', Spin) + app.use(Icon) -app.use(Antd) app.use(Component) app.use(Directive) diff --git a/src/plugins/antd.ts b/src/plugins/antd.ts deleted file mode 100644 index 26fd72e6..00000000 --- a/src/plugins/antd.ts +++ /dev/null @@ -1,48 +0,0 @@ -import { App } from 'vue' - -import { - InputNumber, - Divider, - Button, - Tooltip, - Popover, - Slider, - Select, - Switch, - Radio, - Input, - Modal, - Dropdown, - Menu, - Checkbox, - Drawer, - Spin, -} from 'ant-design-vue' - -export default { - install(app: App) { - app.component('InputNumber', InputNumber) - app.component('Divider', Divider) - app.component('Button', Button) - app.component('ButtonGroup', Button.Group) - app.component('Tooltip', Tooltip) - app.component('Popover', Popover) - app.component('Slider', Slider) - app.component('Select', Select) - app.component('SelectOption', Select.Option) - app.component('SelectOptGroup', Select.OptGroup) - app.component('Switch', Switch) - app.component('Radio', Radio) - app.component('RadioGroup', Radio.Group) - app.component('RadioButton', Radio.Button) - app.component('Input', Input) - app.component('InputGroup', Input.Group) - app.component('Modal', Modal) - app.component('Dropdown', Dropdown) - app.component('Menu', Menu) - app.component('MenuItem', Menu.Item) - app.component('Checkbox', Checkbox) - app.component('Drawer', Drawer) - app.component('Spin', Spin) - } -}