From 76022f581f9e24c500a3078ada065a75c55ebb6e Mon Sep 17 00:00:00 2001 From: Archer <32283845+kailong321200875@users.noreply.github.com> Date: Sun, 6 Aug 2023 11:15:29 +0800 Subject: [PATCH 1/3] chore(master): release 1.10.0 --- CHANGELOG.md | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++ package.json | 2 +- 2 files changed, 87 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 40a9be4..56fcaa6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,92 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [1.10.0](https://github.com/kailong321200875/vue-element-plus-admin/compare/v1.9.9...v1.10.0) (2023-08-06) + + +### Types + +* Form类型调整 ([a0f4aeb](https://github.com/kailong321200875/vue-element-plus-admin/commit/a0f4aebc5a685366cd56b1a7bb39fa614976e3bb)) +* Form类型调整 ([674d760](https://github.com/kailong321200875/vue-element-plus-admin/commit/674d760029b451c0c6fc23a2aeac5c83992a0b27)) +* 修改类型 ([c3ac191](https://github.com/kailong321200875/vue-element-plus-admin/commit/c3ac1915045d4d59bca09ec6d19151bc5da342f1)) +* 修改类型 ([7d0476f](https://github.com/kailong321200875/vue-element-plus-admin/commit/7d0476f47c5858019db871cff2bdd19f0210f0d4)) +* 类型优化 ([283bc58](https://github.com/kailong321200875/vue-element-plus-admin/commit/283bc58d46151a8954bb81ee6bf8f499177b15fc)) +* 调整类型 ([24c8af9](https://github.com/kailong321200875/vue-element-plus-admin/commit/24c8af91835fb2c8c00e7c2673fff01f098c9944)) +* 迁移types ([ccbec86](https://github.com/kailong321200875/vue-element-plus-admin/commit/ccbec865568b1c9b3c3321d7071c164fdc350a0f)) +* 迁移types ([46b35e4](https://github.com/kailong321200875/vue-element-plus-admin/commit/46b35e48b3e7876c74159625b5149ef663396f5c)) + + +### Features + +* axios 改造 ([3238140](https://github.com/kailong321200875/vue-element-plus-admin/commit/32381408bbe418eeaca2a975305bac80ddaa03f5)) +* axios 改造 ([5807db1](https://github.com/kailong321200875/vue-element-plus-admin/commit/5807db1dc12a7ff2dbf66801a742a78974ad8f9c)) +* Descriptions组件重构 ([49e415d](https://github.com/kailong321200875/vue-element-plus-admin/commit/49e415d27788cb468c96f2a828f1df7ae65b7a3c)) +* Dialog组件重构 ([3701a04](https://github.com/kailong321200875/vue-element-plus-admin/commit/3701a04231af02ec7f7ef73533f3a22e707380fb)) +* Form useForm 完成 ([3e4e27c](https://github.com/kailong321200875/vue-element-plus-admin/commit/3e4e27c21fd59c944229856bee929f005d2ee140)) +* Form改造 ([9c724dc](https://github.com/kailong321200875/vue-element-plus-admin/commit/9c724dc9aad18397d5ecd00e53c3c24e142a34b5)) +* Icon改版 ([882f162](https://github.com/kailong321200875/vue-element-plus-admin/commit/882f162ff21c74239b638f284f52161e5791722d)) +* Radio改造 ([deeee73](https://github.com/kailong321200875/vue-element-plus-admin/commit/deeee73bcb3ad912844fddee62b1155d95d4b42b)) +* Radio改造 ([83513d5](https://github.com/kailong321200875/vue-element-plus-admin/commit/83513d519d4b6b8fbfd48db266b9bd7b3a998d63)) +* Search组件重构 ([a7f3702](https://github.com/kailong321200875/vue-element-plus-admin/commit/a7f370214481577ab82bf2871191dda717c7978a)) +* SelectV2改造完成 ([4d04734](https://github.com/kailong321200875/vue-element-plus-admin/commit/4d04734e13f6926c16aeee421feecb0d339534f0)) +* Table重构 ([94800b0](https://github.com/kailong321200875/vue-element-plus-admin/commit/94800b0120ee05ca7d534dda3e59653f38d7fda0)) +* 完善search组件demo ([cdf44a4](https://github.com/kailong321200875/vue-element-plus-admin/commit/cdf44a43a05010dbcba3a3ec0cb7c8251f16fce3)) +* 拖拽表格 ([b69b8ed](https://github.com/kailong321200875/vue-element-plus-admin/commit/b69b8ed1bde36100fc86e51fcc63805d4ea21210)) +* 新增TreeSelect表单项 ([de0cb43](https://github.com/kailong321200875/vue-element-plus-admin/commit/de0cb43566b9065250abbc71548ffeca4c8e8bf1)) +* 新增Uload ([c181887](https://github.com/kailong321200875/vue-element-plus-admin/commit/c181887f7f0c5eecc9584edfe99e9065440bdc56)) +* 新增useStorage ([dfea91c](https://github.com/kailong321200875/vue-element-plus-admin/commit/dfea91c7e1d18fa299067c62557cac61723ea861)) +* 新增权限测试页 ([3fe40ba](https://github.com/kailong321200875/vue-element-plus-admin/commit/3fe40ba62df29c2ffea9adfd65fc559489481e24)) +* 新增锁屏功能 ([e2fd349](https://github.com/kailong321200875/vue-element-plus-admin/commit/e2fd349070147c57f9400fa9a413260b7707bda2)) +* 用户列表重构 ([755cea0](https://github.com/kailong321200875/vue-element-plus-admin/commit/755cea0990d9e3b64c936f29c02e4053393a1a19)) +* 登录页改造 ([5312951](https://github.com/kailong321200875/vue-element-plus-admin/commit/5312951359b5d919b6c1a03783aa6bbaf8ec0044)) +* 综合示例重构 ([9a0259d](https://github.com/kailong321200875/vue-element-plus-admin/commit/9a0259de5c47970502db95f4dda24998ad5d9efe)) +* 菜单管理 ([c72b3a3](https://github.com/kailong321200875/vue-element-plus-admin/commit/c72b3a33aab7d3605770a64d23b8a84ef4ad68d2)) +* 角色管理 ([47016a5](https://github.com/kailong321200875/vue-element-plus-admin/commit/47016a535f2b7a22ab498bee197bc30a983f507d)) +* 部门管理 ([28d0785](https://github.com/kailong321200875/vue-element-plus-admin/commit/28d0785be842022cae7808c23e1f19eaab5fb996)) +* 重构Dialog组件示例 ([9a78ac9](https://github.com/kailong321200875/vue-element-plus-admin/commit/9a78ac977eb0cfb3bd6c2a9b96e69d9f010017f4)) + + +### Bug Fixes + +* mock数据 ([8bdac71](https://github.com/kailong321200875/vue-element-plus-admin/commit/8bdac7152f463cd98c50c9893a46bb6c111fd428)) +* 修复Form已知问题 ([097b32e](https://github.com/kailong321200875/vue-element-plus-admin/commit/097b32e1a9d92a609a66179d68b3dabe12f96b66)) +* 修复Table组件已知问题 ([b1a83f6](https://github.com/kailong321200875/vue-element-plus-admin/commit/b1a83f601838cb82fb29c036654a4cdc729997cd)) +* 修复类型错误 ([26dc886](https://github.com/kailong321200875/vue-element-plus-admin/commit/26dc886f8ccb5cf1ffc10e1d9601c827a1f960c2)) +* 样式问题修复 ([cdc7c76](https://github.com/kailong321200875/vue-element-plus-admin/commit/cdc7c76eb5ac3ccb79f5f55ff5b7ce6b8c4955e1)) +* 解决类型检测报错 ([9d93496](https://github.com/kailong321200875/vue-element-plus-admin/commit/9d9349600b3d2008e4216d49c9fa1c1b9995fa79)) +* 解决类型检测报错 ([513108c](https://github.com/kailong321200875/vue-element-plus-admin/commit/513108c00e622812e2e70dfe833435f6b5462d6e)) +* 解决类型检测报错 ([28bf8be](https://github.com/kailong321200875/vue-element-plus-admin/commit/28bf8bee45e3cc8575a356623abdbe56e30991f8)) + + +### Styling + +* Table样式修改 ([5fc57bd](https://github.com/kailong321200875/vue-element-plus-admin/commit/5fc57bdb08488f6898eafd6f28289b0567d6d9e2)) +* Table样式修改 ([411c0f7](https://github.com/kailong321200875/vue-element-plus-admin/commit/411c0f792ae8359c49e81974d8193f049120985b)) +* Table样式修改 ([d487c6a](https://github.com/kailong321200875/vue-element-plus-admin/commit/d487c6a93ec0281d76a3938e6e23ea2a4a7940c1)) +* Table样式修改 ([c7d21e3](https://github.com/kailong321200875/vue-element-plus-admin/commit/c7d21e36d012377ba863ac848d77abb5db4f475a)) +* Table样式修改 ([7f5078a](https://github.com/kailong321200875/vue-element-plus-admin/commit/7f5078a436c4d5abcaf7a420df35d2be9b3680c5)) +* 修改Dialog样式 ([e451bfc](https://github.com/kailong321200875/vue-element-plus-admin/commit/e451bfcde6e5a47d4b3022e240ffcc0576ebb9a8)) +* 修改样式 ([207c5b3](https://github.com/kailong321200875/vue-element-plus-admin/commit/207c5b3fc4e52bb06baa36cd4b659e14893785ba)) +* 完善角色管理 ([c4576bd](https://github.com/kailong321200875/vue-element-plus-admin/commit/c4576bd57bcf504733f20188202ea7d33ab1c184)) +* 布局样式优化 ([962689a](https://github.com/kailong321200875/vue-element-plus-admin/commit/962689a8bd0ed5eb17d946b8a21dec4a197f13a7)) +* 样式布局调整完成 ([7193176](https://github.com/kailong321200875/vue-element-plus-admin/commit/719317694f71e22692256bb557070343f034ffe5)) +* 用户管理样式修改 ([57a5fa7](https://github.com/kailong321200875/vue-element-plus-admin/commit/57a5fa7b82ae9f3d7a1f8ec5391f14b1d1cd32e8)) +* 移除不必要样式 ([7ef1d1e](https://github.com/kailong321200875/vue-element-plus-admin/commit/7ef1d1e3013cc5bf7fc574e67c2004f50792e66d)) +* 移除不必要样式 ([366db45](https://github.com/kailong321200875/vue-element-plus-admin/commit/366db4528254d18659e6a922817702b5b92a57b0)) +* 调整Icon悬停样式 ([64c7e48](https://github.com/kailong321200875/vue-element-plus-admin/commit/64c7e48bd18ba83e605daccbc4c2f4cc6b58695d)) +* 调整工作台样式错乱 ([cc18f29](https://github.com/kailong321200875/vue-element-plus-admin/commit/cc18f297ef50655d5773d01fcfddabc365dc53e7)) + + +### Performance Improvements + +* Dialog默认高度修改 ([0e04fce](https://github.com/kailong321200875/vue-element-plus-admin/commit/0e04fce4367d6829e8de97a249318b0309e06fd5)) +* Form Table Search Descriptions 支持嵌套赋值 ([46ddf62](https://github.com/kailong321200875/vue-element-plus-admin/commit/46ddf62d2d4ce1a653f47695cb0bb3475aa16bd8)) +* ImageViewer组件优化 ([3b9c3d8](https://github.com/kailong321200875/vue-element-plus-admin/commit/3b9c3d8b757646eaf74625403112a969bfd15e55)) +* 优化Form事件传递 ([69cafb3](https://github.com/kailong321200875/vue-element-plus-admin/commit/69cafb3b7b2ce7ecbd9f2e8ef09e250817e9a55c)) +* 优化Search组件 ([e548668](https://github.com/kailong321200875/vue-element-plus-admin/commit/e548668ccef8c41d9ac7d9fe39ffe66471d160d2)) +* 优化表单组件 ([77a3866](https://github.com/kailong321200875/vue-element-plus-admin/commit/77a38662488ab9ff4cbe5ff3cf9b65eea34abca1)) +* 优化锁屏组件 ([4f8330a](https://github.com/kailong321200875/vue-element-plus-admin/commit/4f8330a4faf6cc98a9bac17bd3e1719ae1b30c81)) + ## [1.9.9](https://github.com/kailong321200875/vue-element-plus-admin/compare/v1.9.8...v1.9.9) (2023-04-13) diff --git a/package.json b/package.json index bc28bcc..365f775 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-element-plus-admin", - "version": "2.0。0", + "version": "1.10.0", "description": "一套基于vue3、element-plus、typesScript、vite4的后台集成方案。", "author": "Archer <502431556@qq.com>", "private": false, From 5d55597cca6c9d2bc6cb6211a01c161fa5f086ba Mon Sep 17 00:00:00 2001 From: kailong321200875 <321200875@qq.com> Date: Sun, 6 Aug 2023 11:33:00 +0800 Subject: [PATCH 2/3] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.ts | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/router/index.ts b/src/router/index.ts index f947495..36716fb 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -567,25 +567,6 @@ export const asyncRouterMap: AppRouteRecordRaw[] = [ } } ] - }, - { - path: '/dynamic', - component: Layout, - redirect: '/404', - name: 'Dynamic', - meta: { - hidden: true - }, - children: [ - { - path: 'tab/:id', - component: () => import('@/components/Dynamic/src/Dynamic.vue'), - name: 'Dynamic', - meta: { - title: '详情页' - } - } - ] } ] From 85f8cda19d8cafb951f211b845aad970a661dd1e Mon Sep 17 00:00:00 2001 From: kailong321200875 <321200875@qq.com> Date: Sun, 6 Aug 2023 11:34:07 +0800 Subject: [PATCH 3/3] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/auto-merge.yml | 232 +++++++++++++++---------------- package.json | 2 +- 2 files changed, 117 insertions(+), 117 deletions(-) diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index 5727846..b805d97 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -1,131 +1,131 @@ -name: Automerge +# name: Automerge -on: - pull_request: - types: - - labeled - - unlabeled - - synchronize - - opened - - edited - - ready_for_review - - reopened - - unlocked - pull_request_review: - types: - - submitted - status: {} +# on: +# pull_request: +# types: +# - labeled +# - unlabeled +# - synchronize +# - opened +# - edited +# - ready_for_review +# - reopened +# - unlocked +# pull_request_review: +# types: +# - submitted +# status: {} -jobs: - # 合并发布版本的 pr 到 master - auto-merge: - runs-on: ubuntu-latest - steps: - - name: Automerge - uses: 'pascalgn/automerge-action@v0.14.3' - env: - BASE_BRANCHES: 'release' - GITHUB_TOKEN: '${{ secrets.TOKEN }}' - MERGE_LABELS: '' - MERGE_FILTER_AUTHOR: 'kailong321200875' +# jobs: +# # 合并发布版本的 pr 到 master +# auto-merge: +# runs-on: ubuntu-latest +# steps: +# - name: Automerge +# uses: 'pascalgn/automerge-action@v0.14.3' +# env: +# BASE_BRANCHES: 'release' +# GITHUB_TOKEN: '${{ secrets.TOKEN }}' +# MERGE_LABELS: '' +# MERGE_FILTER_AUTHOR: 'kailong321200875' - push-to-gh-pages: - needs: [auto-merge] - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 +# push-to-gh-pages: +# needs: [auto-merge] +# runs-on: ubuntu-latest +# steps: +# - name: Checkout +# uses: actions/checkout@v2 - - name: Setup Pnpm - uses: pnpm/action-setup@v2 - with: - version: latest +# - name: Setup Pnpm +# uses: pnpm/action-setup@v2 +# with: +# version: latest - - name: use Node.js 16 - uses: actions/setup-node@v2.1.2 - with: - node-version: '16.x' +# - name: use Node.js 16 +# uses: actions/setup-node@v2.1.2 +# with: +# node-version: '16.x' - - name: Set SSH Environment - env: - DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }} - run: | - mkdir -p ~/.ssh/ - echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - ssh-keyscan github.com > ~/.ssh/known_hosts - chmod 700 ~/.ssh && chmod 600 ~/.ssh/* - git config --local user.email "321200875@qq.com" - git config --local user.name "kailong321200875" +# - name: Set SSH Environment +# env: +# DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }} +# run: | +# mkdir -p ~/.ssh/ +# echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa +# chmod 600 ~/.ssh/id_rsa +# ssh-keyscan github.com > ~/.ssh/known_hosts +# chmod 700 ~/.ssh && chmod 600 ~/.ssh/* +# git config --local user.email "321200875@qq.com" +# git config --local user.name "kailong321200875" - # 发布到 github - - name: Build Github - run: | - pnpm install --no-frozen-lockfile - pnpm run build:pro +# # 发布到 github +# - name: Build Github +# run: | +# pnpm install --no-frozen-lockfile +# pnpm run build:pro - - name: Deploy Github - uses: peaceiris/actions-gh-pages@v3 - with: - deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}} - publish_branch: gh-pages - publish_dir: ./dist-pro - force_orphan: true - cname: element-plus-admin.cn +# - name: Deploy Github +# uses: peaceiris/actions-gh-pages@v3 +# with: +# deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}} +# publish_branch: gh-pages +# publish_dir: ./dist-pro +# force_orphan: true +# cname: element-plus-admin.cn - push-to-gh-pages-gitee: - needs: [auto-merge] - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 +# push-to-gh-pages-gitee: +# needs: [auto-merge] +# runs-on: ubuntu-latest +# steps: +# - name: Checkout +# uses: actions/checkout@v2 - - name: Setup Pnpm - uses: pnpm/action-setup@v2 - with: - version: latest +# - name: Setup Pnpm +# uses: pnpm/action-setup@v2 +# with: +# version: latest - - name: use Node.js 16 - uses: actions/setup-node@v2.1.2 - with: - node-version: '16.x' +# - name: use Node.js 16 +# uses: actions/setup-node@v2.1.2 +# with: +# node-version: '16.x' - - name: Set SSH Environment - env: - DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }} - run: | - mkdir -p ~/.ssh/ - echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa - chmod 600 ~/.ssh/id_rsa - ssh-keyscan github.com > ~/.ssh/known_hosts - chmod 700 ~/.ssh && chmod 600 ~/.ssh/* - git config --local user.email "321200875@qq.com" - git config --local user.name "kailong321200875" +# - name: Set SSH Environment +# env: +# DOCS_DEPLOY_KEY: ${{ secrets.ACTIONS_DEPLOY_KEY }} +# run: | +# mkdir -p ~/.ssh/ +# echo "$ACTIONS_DEPLOY_KEY" > ~/.ssh/id_rsa +# chmod 600 ~/.ssh/id_rsa +# ssh-keyscan github.com > ~/.ssh/known_hosts +# chmod 700 ~/.ssh && chmod 600 ~/.ssh/* +# git config --local user.email "321200875@qq.com" +# git config --local user.name "kailong321200875" - - name: Build Gitee - run: | - pnpm install --no-frozen-lockfile - pnpm run build:gitee +# - name: Build Gitee +# run: | +# pnpm install --no-frozen-lockfile +# pnpm run build:gitee - # 发布到 gitee - - name: Deploy Gitee - uses: peaceiris/actions-gh-pages@v3 - with: - deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}} - publish_branch: gh-pages-gitee - publish_dir: ./dist-pro - force_orphan: true +# # 发布到 gitee +# - name: Deploy Gitee +# uses: peaceiris/actions-gh-pages@v3 +# with: +# deploy_key: ${{secrets.ACTIONS_DEPLOY_KEY}} +# publish_branch: gh-pages-gitee +# publish_dir: ./dist-pro +# force_orphan: true - - name: Sync Github Repos To Gitee # 名字随便起 - uses: Yikun/hub-mirror-action@v1.1 # 使用Yikun/hub-mirror-action - with: - src: github/kailong321200875 # 源端账户名(github) - dst: gitee/kailong110120130 # 目的端账户名(gitee) - dst_key: ${{ secrets.ACTIONS_DEPLOY_KEY }} # SSH密钥对中的私钥 - dst_token: ${{ secrets.GITEE_TOKEN }} # Gitee账户的私人令牌 - account_type: user # 账户类型 - clone_style: 'https' # 使用https方式进行clone，也可以使用ssh - debug: true # 启用后会显示所有执行命令 - force_update: true # 启用后，强制同步，即强制覆盖目的端仓库 - static_list: 'vue-element-plus-admin' # 静态同步列表，在此填写需要同步的仓库名称，可填写多个 - timeout: '600s' # git超时设置，超时后会自动重试git操作 +# - name: Sync Github Repos To Gitee # 名字随便起 +# uses: Yikun/hub-mirror-action@v1.1 # 使用Yikun/hub-mirror-action +# with: +# src: github/kailong321200875 # 源端账户名(github) +# dst: gitee/kailong110120130 # 目的端账户名(gitee) +# dst_key: ${{ secrets.ACTIONS_DEPLOY_KEY }} # SSH密钥对中的私钥 +# dst_token: ${{ secrets.GITEE_TOKEN }} # Gitee账户的私人令牌 +# account_type: user # 账户类型 +# clone_style: 'https' # 使用https方式进行clone，也可以使用ssh +# debug: true # 启用后会显示所有执行命令 +# force_update: true # 启用后，强制同步，即强制覆盖目的端仓库 +# static_list: 'vue-element-plus-admin' # 静态同步列表，在此填写需要同步的仓库名称，可填写多个 +# timeout: '600s' # git超时设置，超时后会自动重试git操作 diff --git a/package.json b/package.json index bc28bcc..843c13d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-element-plus-admin", - "version": "2.0。0", + "version": "1.9.9", "description": "一套基于vue3、element-plus、typesScript、vite4的后台集成方案。", "author": "Archer <502431556@qq.com>", "private": false,