From b689fabfdda556f847c0a6170f113a17793e9505 Mon Sep 17 00:00:00 2001 From: Ah jung <735878602@qq.com> Date: Mon, 19 Jul 2021 16:42:11 +0800 Subject: [PATCH] fix Bug Features CHANGELOG.ms --- .env.development | 3 + .env.production | 3 + CHANGELOG.md | 13 + README.md | 4 +- package.json | 1 + src/App.vue | 10 +- src/api/dashboard/console.ts | 12 +- src/api/system/menu.ts | 28 +- src/api/system/user.ts | 77 +- src/api/table/list.ts | 14 +- src/assets/icons/login.svg | 244 ++--- src/assets/icons/logo.svg | 114 +-- src/assets/images/Business.svg | 900 +++++++++--------- src/assets/images/Error.svg | 142 +-- src/assets/images/analysis.svg | 306 +++--- src/assets/images/exception/403.svg | 101 +- src/assets/images/exception/404.svg | 116 ++- src/assets/images/exception/500.svg | 112 ++- src/assets/images/exception/developing.svg | 134 ++- src/assets/images/exception/load-error.svg | 179 +++- src/assets/images/exception/nodata.svg | 107 ++- src/assets/images/header-theme-dark.svg | 86 +- src/assets/images/login.svg | 244 ++--- src/assets/images/nav-theme-dark.svg | 86 +- src/assets/images/nav-theme-light.svg | 86 +- src/components/Lockscreen/Lockscreen.vue | 24 +- src/components/ProTable/index.ts | 1 - .../ProTable/src/hooks/useColumns.ts | 95 -- .../ProTable/src/hooks/useDataSource.ts | 141 --- .../ProTable/src/hooks/useLoading.ts | 21 - .../ProTable/src/hooks/usePagination.ts | 48 - src/components/ProTable/src/props.ts | 45 - .../ProTable/src/types/pagination.ts | 11 - src/components/ProTable/src/types/table.ts | 22 - src/components/{ProTable => Table}/README.md | 14 +- src/components/Table/index.ts | 1 + .../src/ProTable.vue => Table/src/Table.vue} | 23 +- .../src/components/settings/ColumnSetting.vue | 38 +- .../{ProTable => Table}/src/const.ts | 0 src/components/Table/src/hooks/useColumns.ts | 95 ++ .../Table/src/hooks/useDataSource.ts | 141 +++ src/components/Table/src/hooks/useLoading.ts | 21 + .../Table/src/hooks/usePagination.ts | 48 + .../src/hooks/useTableContext.ts | 10 +- src/components/Table/src/props.ts | 45 + src/components/Table/src/types/pagination.ts | 11 + src/components/Table/src/types/table.ts | 22 + src/components/Upload/index.ts | 1 + src/components/Upload/src/BasicUpload.vue | 313 ++++++ src/components/Upload/src/props.ts | 34 + src/components/Upload/src/type/index.ts | 7 + src/directives/permission.ts | 26 +- src/enums/breakpointEnum.ts | 24 +- src/enums/httpEnum.ts | 34 +- src/enums/pageEnum.ts | 18 +- src/enums/roleEnum.ts | 8 +- src/hooks/core/useTimeout.ts | 62 +- src/hooks/event/useBreakpoint.ts | 132 +-- src/hooks/event/useEventListener.ts | 92 +- src/hooks/setting/index.ts | 51 +- src/hooks/setting/useDesignSetting.ts | 18 +- src/hooks/setting/useProjectSetting.ts | 38 +- src/hooks/use-async.ts | 14 +- src/hooks/useBattery.ts | 146 +-- src/hooks/useDomWidth.ts | 22 +- src/hooks/useOnline.ts | 34 +- src/hooks/useTime.ts | 84 +- src/hooks/web/useECharts.ts | 180 ++-- src/hooks/web/usePermission.ts | 86 +- src/layout/components/Footer/index.vue | 2 +- .../components/Header/ProjectSetting.vue | 8 +- src/layout/components/Header/components.ts | 52 +- src/layout/components/Header/index.vue | 124 +-- src/layout/components/Logo/index.vue | 3 +- src/layout/components/TagsView/components.ts | 36 +- src/layout/components/TagsView/index.vue | 8 +- src/layout/index.vue | 22 +- src/main.ts | 4 + src/plugins/customComponents.ts | 2 +- src/plugins/directives.ts | 4 +- src/plugins/naive.ts | 136 +-- src/router/base.ts | 60 +- src/router/constantRouterComponents.ts | 10 +- src/router/generator-routers.ts | 84 +- src/router/index.ts | 46 +- src/router/modules/comp.ts | 49 +- src/router/modules/dashboard.ts | 80 +- src/router/modules/form.ts | 70 +- src/router/modules/result.ts | 2 +- src/router/types.ts | 50 +- src/settings/componentSetting.ts | 43 +- src/settings/designSetting.ts | 32 +- src/settings/projectSetting.ts | 84 +- src/store/index.ts | 2 +- src/store/modules/asyncRoute.ts | 188 ++-- src/store/modules/designSetting.ts | 48 +- src/store/modules/index.ts | 12 +- src/store/modules/lockscreen.ts | 32 +- src/store/modules/projectSetting.ts | 112 +-- src/store/modules/tabsView.ts | 92 +- src/store/modules/user.ts | 182 ++-- src/store/types.ts | 10 +- src/styles/common.less | 4 +- src/utils/Storage.ts | 208 ++-- src/utils/browser-type.ts | 256 ++--- src/utils/downloadFile.ts | 120 +-- src/utils/env.ts | 68 +- src/utils/http/axios/Axios.ts | 278 +++--- src/utils/http/axios/axiosCancel.ts | 94 +- src/utils/http/axios/axiosTransform.ts | 58 +- src/utils/http/axios/checkStatus.ts | 92 +- src/utils/http/axios/helper.ts | 58 +- src/utils/http/axios/index.ts | 385 ++++---- src/utils/http/axios/types.ts | 64 +- src/utils/index.ts | 51 +- src/utils/is/index.ts | 36 +- src/utils/lib/echarts.ts | 78 +- src/utils/log.ts | 4 +- src/utils/propTypes.ts | 38 +- src/utils/urlUtils.ts | 24 +- src/views/comp/table/columns.ts | 130 +-- src/views/comp/table/list.vue | 22 +- src/views/comp/upload/index.vue | 128 +++ .../dashboard/console/components/Icons.ts | 40 +- .../dashboard/console/components/VisiTab.vue | 8 +- .../dashboard/console/components/props.ts | 20 +- src/views/dashboard/console/console.vue | 8 +- src/views/dashboard/workplace/workplace.vue | 42 +- src/views/exception/403.vue | 11 +- src/views/exception/404.vue | 11 +- src/views/exception/500.vue | 11 +- src/views/form/basicForm/index.vue | 173 ++-- src/views/form/detail/index.vue | 18 +- src/views/form/stepForm/Step1.vue | 26 +- src/views/form/stepForm/Step2.vue | 12 +- src/views/form/stepForm/stepForm.vue | 12 +- src/views/list/basicList/columns.ts | 130 +-- src/views/list/basicList/index.vue | 8 +- src/views/login/index.vue | 41 +- src/views/result/fail.vue | 9 +- src/views/result/info.vue | 9 +- src/views/result/success.vue | 3 +- src/views/setting/system/RevealSetting.vue | 2 +- tsconfig.json | 5 +- types/config.d.ts | 51 +- types/global.d.ts | 2 + vite.config.ts | 4 +- yarn.lock | 133 +++ 148 files changed, 5829 insertions(+), 4268 deletions(-) delete mode 100644 src/components/ProTable/index.ts delete mode 100644 src/components/ProTable/src/hooks/useColumns.ts delete mode 100644 src/components/ProTable/src/hooks/useDataSource.ts delete mode 100644 src/components/ProTable/src/hooks/useLoading.ts delete mode 100644 src/components/ProTable/src/hooks/usePagination.ts delete mode 100644 src/components/ProTable/src/props.ts delete mode 100644 src/components/ProTable/src/types/pagination.ts delete mode 100644 src/components/ProTable/src/types/table.ts rename src/components/{ProTable => Table}/README.md (80%) create mode 100644 src/components/Table/index.ts rename src/components/{ProTable/src/ProTable.vue => Table/src/Table.vue} (95%) rename src/components/{ProTable => Table}/src/components/settings/ColumnSetting.vue (91%) rename src/components/{ProTable => Table}/src/const.ts (100%) create mode 100644 src/components/Table/src/hooks/useColumns.ts create mode 100644 src/components/Table/src/hooks/useDataSource.ts create mode 100644 src/components/Table/src/hooks/useLoading.ts create mode 100644 src/components/Table/src/hooks/usePagination.ts rename src/components/{ProTable => Table}/src/hooks/useTableContext.ts (66%) create mode 100644 src/components/Table/src/props.ts create mode 100644 src/components/Table/src/types/pagination.ts create mode 100644 src/components/Table/src/types/table.ts create mode 100644 src/components/Upload/index.ts create mode 100644 src/components/Upload/src/BasicUpload.vue create mode 100644 src/components/Upload/src/props.ts create mode 100644 src/components/Upload/src/type/index.ts create mode 100644 src/views/comp/upload/index.vue diff --git a/.env.development b/.env.development index 14bfcb0..3db56fe 100644 --- a/.env.development +++ b/.env.development @@ -19,5 +19,8 @@ VITE_APP_API_URL = / # 图片上传地址 VITE_GLOB_UPLOAD_URL= / +# 图片前缀地址 +VITE_GLOB_IMG_URL= / + # 接口前缀 VITE_GLOB_API_URL_PREFIX = /api diff --git a/.env.production b/.env.production index 04dcc34..295f78a 100644 --- a/.env.production +++ b/.env.production @@ -16,5 +16,8 @@ VITE_APP_API_URL = / # 图片上传地址 VITE_GLOB_UPLOAD_URL= / +# 图片前缀地址 +VITE_GLOB_IMG_URL= / + # 接口前缀 VITE_GLOB_API_URL_PREFIX = /api diff --git a/CHANGELOG.md b/CHANGELOG.md index 57fdfb4..602d69c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# 1.3 (2021-07-19) +### 🐛 Bug Fixes +- 修复多标签页左右切换按钮自适应展示 +- 修复登录页面出现多标签页 + +- ### ✨ Features +- 新增 `Upload` 组件及配置 +- 新增 `VITE_GLOB_IMG_URL` 图片前缀地址,配合Upload +- 新增 `滑块验证码` 组件 +- 新增 `登录页面-滑块验证码` 示例 +- 持续更新更多实用组件及示例,感谢Star + + # 1.2 (2021-07-16) ### 🐛 Bug Fixes - 修复面包屑显示登录页面 diff --git a/README.md b/README.md index 64f5e92..e3b2215 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,9 @@ Naive Ui Admin 是一个免费开源的中后台模版,使用了最新的`vue3 ### 页面组件 #### ProTable -- [x] 表格 +- [x] 基础表格 +- [x] 上传图片 +- [x] 滑块验证码 - 持续开发中... ## 在线预览 diff --git a/package.json b/package.json index 9132f69..84cfe34 100644 --- a/package.json +++ b/package.json @@ -31,6 +31,7 @@ "element-resize-detector": "^1.2.3", "lodash": "^4.17.21", "lodash-es": "^4.17.21", + "makeit-captcha": "^1.2.5", "mitt": "^2.1.0", "mockjs": "^1.1.0", "naive-ui": "^2.15.5", diff --git a/src/App.vue b/src/App.vue index c1587c6..04c182b 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,10 +1,10 @@