From 6392b7f04839edf801f63a48cfe03461dbd160de Mon Sep 17 00:00:00 2001 From: vben Date: Mon, 18 Jan 2021 23:37:36 +0800 Subject: [PATCH] refactor: remove global import --- CHANGELOG.zh_CN.md | 2 + build/vite/plugin/style-import.ts | 15 +- package.json | 5 +- src/assets/images/sidebar/dark.png | Bin 25404 -> 0 bytes .../Application/src/search/AppSearchModal.vue | 3 +- .../Form/src/components/FormAction.vue | 3 +- src/components/Page/src/PageWrapper.vue | 14 +- src/components/registerGlobComp.ts | 140 +++++++++--------- src/design/ant/pagination.less | 4 +- .../default/header/components/Breadcrumb.vue | 6 +- .../header/components/notify/NoticeList.vue | 9 +- src/locales/useLocale.ts | 6 +- src/views/dashboard/analysis/index.vue | 4 +- src/views/dashboard/workbench/index.vue | 11 +- src/views/demo/comp/button/index.vue | 1 + src/views/demo/comp/loading/index.vue | 3 +- src/views/demo/comp/upload/index.vue | 3 +- src/views/demo/feat/copy/index.vue | 3 +- src/views/demo/feat/download/index.vue | 3 +- src/views/demo/feat/tabs/index.vue | 4 +- src/views/demo/form/CustomerForm.vue | 2 +- .../demo/page/account/center/Application.vue | 4 +- .../demo/page/account/center/Project.vue | 4 +- src/views/demo/page/account/center/index.vue | 4 +- .../demo/page/account/setting/BaseSetting.vue | 12 +- src/views/demo/page/desc/basic/index.vue | 3 +- src/views/demo/page/desc/high/index.vue | 16 +- src/views/demo/page/form/high/index.vue | 3 +- src/views/demo/page/form/step/Step1.vue | 10 +- src/views/demo/page/form/step/Step2.vue | 9 +- src/views/demo/page/form/step/Step3.vue | 8 +- src/views/demo/page/form/step/index.vue | 10 +- src/views/demo/page/list/basic/index.vue | 14 +- src/views/demo/page/list/card/index.vue | 11 +- src/views/demo/page/list/search/index.vue | 11 +- src/views/sys/login/Login.vue | 37 ++--- vite.config.ts | 3 +- yarn.lock | 18 +-- 38 files changed, 256 insertions(+), 162 deletions(-) delete mode 100644 src/assets/images/sidebar/dark.png diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index e606ee80..bf2a56f7 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -3,6 +3,7 @@ ### ✨ Refactor - 新增 `SimpleMenu`组件替代左侧菜单组件(顶部菜单没有替换,功能尽量做到简单不卡)。解决菜单卡顿问题。 +- `ant-design-vue`组件不再全局注册。以便于更好配合 css 按需引入。如果需要全局注册,需要自己加 ### ✨ Features @@ -13,6 +14,7 @@ - 修复 `TableAction`图标问题 - 修复菜单折叠按钮丢失问题 - 修复菜单相关问题 +- 修复 moment 多语言问题 ## 2.0.0-rc.16 (2020-01-12) diff --git a/build/vite/plugin/style-import.ts b/build/vite/plugin/style-import.ts index 03753a9e..a018c86a 100644 --- a/build/vite/plugin/style-import.ts +++ b/build/vite/plugin/style-import.ts @@ -5,20 +5,9 @@ export function configStyleImportConfig() { libs: [ { libraryName: 'ant-design-vue', + esModule: true, resolveStyle: (name) => { - // ! col row popconfirm These three components have no corresponding css files after packaging. Need special treatment - - if (['col', 'row'].includes(name)) { - return 'ant-design-vue/lib/grid/style/index.css'; - } - - if (['popconfirm'].includes(name)) { - return [ - 'ant-design-vue/lib/popover/style/index.css', - 'ant-design-vue/lib/button/style/index.css', - ]; - } - return `ant-design-vue/lib/${name}/style/index.css`; + return `ant-design-vue/es/${name}/style/css`; }, }, ], diff --git a/package.json b/package.json index 595c6f87..e1257470 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,6 @@ "echarts": "^4.9.0", "lodash-es": "^4.17.20", "mockjs": "^1.1.0", - "moment": "^2.29.1", "nprogress": "^0.2.0", "path-to-regexp": "^6.2.0", "qrcode": "^1.4.4", @@ -98,12 +97,12 @@ "stylelint-order": "^4.1.0", "ts-node": "^9.1.0", "typescript": "^4.1.3", - "vite": "^2.0.0-beta.30", + "vite": "^2.0.0-beta.31", "vite-plugin-html": "^2.0.0-beta.5", "vite-plugin-mock": "^2.0.0-beta.3", "vite-plugin-purge-icons": "^0.5.1", "vite-plugin-pwa": "^0.3.8", - "vite-plugin-style-import": "^0.2.1", + "vite-plugin-style-import": "^0.4.0", "vue-eslint-parser": "^7.3.0", "yargs": "^16.2.0" }, diff --git a/src/assets/images/sidebar/dark.png b/src/assets/images/sidebar/dark.png deleted file mode 100644 index c355797a03edc26089716c95dcebcc8276501fc7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 25404 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 diff --git a/src/components/Application/src/search/AppSearchModal.vue b/src/components/Application/src/search/AppSearchModal.vue index 8da0effa..909bfec9 100644 --- a/src/components/Application/src/search/AppSearchModal.vue +++ b/src/components/Application/src/search/AppSearchModal.vue @@ -63,10 +63,11 @@ import { useI18n } from '/@/hooks/web/useI18n'; import { useAppInject } from '/@/hooks/web/useAppInject'; import clickOutside from '/@/directives/clickOutside'; + import { Input } from 'ant-design-vue'; export default defineComponent({ name: 'AppSearchModal', - components: { SearchOutlined, AppSearchFooter }, + components: { SearchOutlined, AppSearchFooter, [Input.name]: Input }, emits: ['close'], props: { diff --git a/src/components/Form/src/components/FormAction.vue b/src/components/Form/src/components/FormAction.vue index b9fdc5fa..831753ef 100644 --- a/src/components/Form/src/components/FormAction.vue +++ b/src/components/Form/src/components/FormAction.vue @@ -42,7 +42,7 @@ import type { ButtonProps } from 'ant-design-vue/es/button/buttonTypes'; import { defineComponent, computed, PropType } from 'vue'; - import { Form } from 'ant-design-vue'; + import { Form, Col } from 'ant-design-vue'; import { Button } from '/@/components/Button'; import { BasicArrow } from '/@/components/Basic/index'; import { useFormContext } from '../hooks/useFormContext'; @@ -58,6 +58,7 @@ FormItem: Form.Item, Button, BasicArrow, + [Col.name]: Col, }, props: { showActionButtonGroup: propTypes.bool.def(true), diff --git a/src/components/Page/src/PageWrapper.vue b/src/components/Page/src/PageWrapper.vue index ef05f00c..e584f0e6 100644 --- a/src/components/Page/src/PageWrapper.vue +++ b/src/components/Page/src/PageWrapper.vue @@ -51,6 +51,7 @@ setup(props, { slots }) { const headerRef = ref(null); const footerRef = ref(null); + const footerHeight = ref(0); const { prefixCls } = useDesign('page-wrapper'); const { contentHeight, setPageHeight, pageHeight } = usePageContext(); @@ -80,30 +81,33 @@ ...bg, ...contentStyle, minHeight: `${unref(pageHeight)}px`, + paddingBottom: `${unref(footerHeight)}px`, }; } ); watch( - () => contentHeight?.value, - (height) => { + () => [contentHeight?.value, getShowFooter.value], + () => { if (!props.contentFullHeight) { return; } nextTick(() => { const footer = unref(footerRef); const header = unref(headerRef); - let footetHeight = 0; + footerHeight.value = 0; const footerEl = footer?.$el; + if (footerEl) { - footetHeight += footerEl?.offsetHeight ?? 0; + footerHeight.value += footerEl?.offsetHeight ?? 0; } let headerHeight = 0; const headerEl = header?.$el; if (headerEl) { headerHeight += headerEl?.offsetHeight ?? 0; } - setPageHeight?.(height - footetHeight - headerHeight); + + setPageHeight?.(unref(contentHeight) - unref(footerHeight) - headerHeight); }); }, { diff --git a/src/components/registerGlobComp.ts b/src/components/registerGlobComp.ts index 6268b659..00f95603 100644 --- a/src/components/registerGlobComp.ts +++ b/src/components/registerGlobComp.ts @@ -5,48 +5,46 @@ import { Button as AntButton, // Optional - Select, - Alert, - Checkbox, - DatePicker, - Radio, - Switch, - Card, - List, - Tabs, - Descriptions, - Tree, - Table, - Divider, - Modal, - Drawer, - Dropdown, - Tag, - Tooltip, - Badge, - Popover, - Upload, - Transfer, - Steps, - PageHeader, - Result, - Empty, - Avatar, - Menu, - Breadcrumb, - Form, - Input, - Row, - Col, - Spin, + // Select, + // Alert, + // Checkbox, + // DatePicker, + // Radio, + // Switch, + // Card, + // List, + // Tabs, + // Descriptions, + // Tree, + // Table, + // Divider, + // Modal, + // Drawer, + // Dropdown, + // Tag, + // Tooltip, + // Badge, + // Popover, + // Upload, + // Transfer, + // Steps, + // PageHeader, + // Result, + // Empty, + // Avatar, + // Menu, + // Breadcrumb, + // Form, + // Input, + // Row, + // Col, + // Spin, } from 'ant-design-vue'; -// import 'ant-design-vue/dist/antd.css'; import { App } from 'vue'; const compList = [Icon, Button, AntButton.Group]; -// Fix hmr multiple registered components export function registerGlobComp(app: App) { compList.forEach((comp: any) => { app.component(comp.name, comp); @@ -55,39 +53,39 @@ export function registerGlobComp(app: App) { // Optional // If you need to customize global components, you can write here // If you don’t need it, you can delete it - app - .use(Select) - .use(Alert) - .use(Breadcrumb) - .use(Checkbox) - .use(DatePicker) - .use(Radio) - .use(Switch) - .use(Card) - .use(List) - .use(Descriptions) - .use(Tree) - .use(Table) - .use(Divider) - .use(Modal) - .use(Drawer) - .use(Dropdown) - .use(Tag) - .use(Tooltip) - .use(Badge) - .use(Popover) - .use(Upload) - .use(Transfer) - .use(Steps) - .use(PageHeader) - .use(Result) - .use(Empty) - .use(Avatar) - .use(Menu) - .use(Tabs) - .use(Form) - .use(Input) - .use(Row) - .use(Col) - .use(Spin); + // app + // .use(Select) + // .use(Alert) + // .use(Breadcrumb) + // .use(Checkbox) + // .use(DatePicker) + // .use(Radio) + // .use(Switch) + // .use(Card) + // .use(List) + // .use(Descriptions) + // .use(Tree) + // .use(Table) + // .use(Divider) + // .use(Modal) + // .use(Drawer) + // .use(Dropdown) + // .use(Tag) + // .use(Tooltip) + // .use(Badge) + // .use(Popover) + // .use(Upload) + // .use(Transfer) + // .use(Steps) + // .use(PageHeader) + // .use(Result) + // .use(Empty) + // .use(Avatar) + // .use(Menu) + // .use(Tabs) + // .use(Form) + // .use(Input) + // .use(Row) + // .use(Col) + // .use(Spin); } diff --git a/src/design/ant/pagination.less b/src/design/ant/pagination.less index ac4d7587..9855a4b4 100644 --- a/src/design/ant/pagination.less +++ b/src/design/ant/pagination.less @@ -19,7 +19,7 @@ .ant-pagination-prev, .ant-pagination-next, .ant-pagination-item { - margin: 0 4px; + margin: 0 4px !important; background: #f4f4f5 !important; border: none; border-radius: none !important; @@ -61,6 +61,6 @@ } &-disabled { - display: none; + display: none !important; } } diff --git a/src/layouts/default/header/components/Breadcrumb.vue b/src/layouts/default/header/components/Breadcrumb.vue index 39ac71d2..f9d084ba 100644 --- a/src/layouts/default/header/components/Breadcrumb.vue +++ b/src/layouts/default/header/components/Breadcrumb.vue @@ -14,10 +14,12 @@