diff --git a/TEMPLATE-CHANGELOG.md b/TEMPLATE-CHANGELOG.md index 64d132e2..9aacf311 100644 --- a/TEMPLATE-CHANGELOG.md +++ b/TEMPLATE-CHANGELOG.md @@ -1,5 +1,30 @@ +## [1.1.8](https://github.com/meadmin-cn/meadmin-template/compare/template-1.1.7...template-1.1.8) (2023-01-09) + + +### 其他[chore] + +* 移除meKeepAlive 需要的define常量 (从vue自动获取) ([b5ee3ea](https://github.com/meadmin-cn/meadmin-template/commit/b5ee3ea2e52613fa7a62f65bc08e875b9a22004c)) + + +### 重构[refactor] + +* 禁用autoImport ts类型自动生成(已放到git中无需再次生成) ([31f3566](https://github.com/meadmin-cn/meadmin-template/commit/31f3566858fddf4cf41ca300e1bbf8f617981547)) + + +### CI发版[ci] + +* eslint name 校验规则更宽松 ([c7341a7](https://github.com/meadmin-cn/meadmin-template/commit/c7341a736d169ac6df9036407d485e4268d85721)) +* husky校验 esint 设置为自动修复 ([ba826aa](https://github.com/meadmin-cn/meadmin-template/commit/ba826aa478cf40934c960058fc212e61fa53e96d)) + + +### 新功能[feat] + +* 加上全局滚动条样式 ([365e065](https://github.com/meadmin-cn/meadmin-template/commit/365e065aca58e9a4a6bafe410a56d802506824ac)) +* 请求函数加上数组query 转换 ([39fa3f9](https://github.com/meadmin-cn/meadmin-template/commit/39fa3f91374019d7349159fef79636cf1fad5439)) +* reqest query参数 删除null值 ([26a989c](https://github.com/meadmin-cn/meadmin-template/commit/26a989c6d237263c8356f47a51278b5d5f92b2ec)) + ## [1.1.7](https://github.com/meadmin-cn/meadmin-template/compare/template-1.1.6...template-1.1.7) (2023-01-06) diff --git a/package.json b/package.json index ffb97517..dd0520d3 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "meadmin-template", "private": true, - "version": "1.1.7", + "version": "1.1.8", "type": "module", "author": { "name": "meadmin-cn", diff --git a/src/styles/index.scss b/src/styles/index.scss index e31b84b2..ecf15a6a 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -1,5 +1,6 @@ @import './element-plus.scss'; @import './transition.scss'; + html { body { margin: 0; @@ -72,7 +73,39 @@ a { -webkit-box-orient: vertical; -webkit-line-clamp: 3; } + .popover-scrollbar-y { margin: 0 -12px; padding: 0 12px; } + +::-webkit-scrollbar { + width: 6px; +} + +::-webkit-scrollbar:horizontal { + height: 6px; +} + +::-webkit-scrollbar-track { + border-radius: 10px; +} + +::-webkit-scrollbar-thumb { + background-color: #0003; + border-radius: 10px; + transition: all 0.2s ease-in-out; +} + +::-webkit-scrollbar-thumb:hover { + cursor: pointer; + background-color: #0000004d; +} + +.dark ::-webkit-scrollbar-thumb { + background-color: #fff3; +} + +.dark ::-webkit-scrollbar-thumb:hover { + background-color: #fff6; +} diff --git a/src/utils/request.ts b/src/utils/request.ts index 2a713b64..e932b6c7 100644 --- a/src/utils/request.ts +++ b/src/utils/request.ts @@ -9,7 +9,7 @@ const t = (...args: [string | number]) => useGlobalStore().i18n.t(...args); const service = axios.create({ baseURL: '/api/', // url = base url + request url timeout: 10000, // request timeout - paramsSerializer: (params) => qs.stringify(params, { arrayFormat: 'repeat' }), // 数组query参数转换为repeat a=1&a=2 + paramsSerializer: (params) => qs.stringify(params, { arrayFormat: 'repeat', skipNulls: true }), // 数组query参数转换为repeat a=1&a=2,null值会被删除 }); // 请求拦截器 service.interceptors.request.use(