diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index b9d07009c43087861ea0ed3bab3c13c449eac5e3..a332270e4cd5c59990a097205706e2b366c5ef44 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -55,7 +55,7 @@ jobs: # ARGS: --delete --verbose --parallel=80 push-to-gh-pages: - if: "contains(github.event.head_commit.message, '[deploy]')" + if: "contains(github.event.head_commit.message, '[release]')" runs-on: ubuntu-latest steps: - name: Checkout diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index 272eda3c84747c3912c9d0c03bf649b1593a8c7e..6990792db2a6845133bfa40c1bed8129a9c6f5f1 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -4,6 +4,11 @@ - `BasicTree` 新增`clickRowToExpand`,用于单击树节点展开 +### ⚡ Performance Improvements + +- 表格关闭分页时不再携带分页参数 +- 登录页监听回车事件进行登录 + ### 🐛 Bug Fixes - 修复`Description`已知问题 diff --git a/package.json b/package.json index f09ef5bc04f2606a2fe570e3fe73e53bf6cc8678..1d4e374f1325a500cc506e1df267bc1ffcdc07e1 100644 --- a/package.json +++ b/package.json @@ -91,6 +91,7 @@ "is-ci": "^3.0.0", "less": "^4.1.1", "lint-staged": "^10.5.4", + "postcss": "^8.2.7", "prettier": "^2.2.1", "pretty-quick": "^3.1.0", "rimraf": "^3.0.2", @@ -116,7 +117,9 @@ }, "resolutions": { "//": "Used to install imagemin dependencies, because imagemin may not be installed in China.If it is abroad, you can delete it", - "bin-wrapper": "npm:bin-wrapper-china" + "bin-wrapper": "npm:bin-wrapper-china", + "esbuild": "0.8.55", + "rollup": "2.40.0" }, "repository": { "type": "git", diff --git a/src/components/Application/src/search/useMenuSearch.ts b/src/components/Application/src/search/useMenuSearch.ts index 82e53118c84bea17a814cfe7eb186365ff939550..6a6fde228f7cafdf924a5b6b630351dc091d0cd4 100644 --- a/src/components/Application/src/search/useMenuSearch.ts +++ b/src/components/Application/src/search/useMenuSearch.ts @@ -3,6 +3,7 @@ import type { Menu } from '/@/router/types'; import { ref, onBeforeMount, unref, Ref, nextTick } from 'vue'; import { getMenus } from '/@/router/menus'; +import { KeyCodeEnum } from '/@/enums/keyCodeEnum'; import { cloneDeep } from 'lodash-es'; import { filter, forEach } from '/@/utils/helper/treeHelper'; @@ -19,13 +20,6 @@ export interface SearchResult { icon?: string; } -const enum KeyCodeEnum { - UP = 38, - DOWN = 40, - ENTER = 13, - ESC = 27, -} - // Translate special characters function transform(c: string) { const code: string[] = ['$', '(', ')', '*', '+', '.', '[', ']', '?', '\\', '^', '{', '}', '|']; diff --git a/src/components/Container/src/collapse/CollapseContainer.vue b/src/components/Container/src/collapse/CollapseContainer.vue index 136701e9265bc8948aedaf18ecce56481ad58547..007e36d6dd2ebb9fb02705adb8a04af80df67b73 100644 --- a/src/components/Container/src/collapse/CollapseContainer.vue +++ b/src/components/Container/src/collapse/CollapseContainer.vue @@ -5,6 +5,7 @@ :prefixCls="prefixCls" :show="show" @expand="handleExpand" + :class="show ? 'mb-3' : ''" >