diff --git a/.eslintrc.js b/.eslintrc.js index abda4d347568049a143d374916862c823beb59ee..23f997c50ee5a63469a1cb802b007de955965020 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,18 +1,25 @@ module.exports = { + root: true, + env: { + browser: true, + node: true, + es6: true, + }, parser: 'vue-eslint-parser', parserOptions: { parser: '@typescript-eslint/parser', ecmaVersion: 2020, sourceType: 'module', + jsxPragma: 'React', ecmaFeatures: { jsx: true, + tsx: true, }, }, - extends: [ 'plugin:vue/vue3-recommended', 'plugin:@typescript-eslint/recommended', - 'prettier/@typescript-eslint', + 'prettier', 'plugin:prettier/recommended', ], rules: { diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1297d449969c6cccbc9402f966a8f6499ba78740..2a36a9a3c82744936f5375ef490f5befb1ee580a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Release +name: Create Release on: push: @@ -6,10 +6,19 @@ on: - v* jobs: - release: + build: + name: Create Release runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - run: npx conventional-github-releaser -p angular + - name: Checkout code + uses: actions/checkout@master + + - name: Create Release for Tag + id: release_tag + uses: yyx990803/release-tag@master env: - CONVENTIONAL_GITHUB_RELEASER_TOKEN: ${{secrets.GITHUB_TOKEN}} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + tag_name: ${{ github.ref }} + body: | + Please refer to [CHANGELOG.md](https://github.com/anncwb/vue-vben-admin/blob/main/CHANGELOG.md) for details. diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 7a82a00e559b41e20efab356caabf7c778d51d02..d5b9ad944775694cad4abfaf378ac48509633e1b 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -8,7 +8,6 @@ "antfu.i18n-ally", "antfu.iconify", "mikestead.dotenv", - "bradlc.vscode-tailwindcss", "heybourn.headwind" ] } diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md index c1ef86e5db06f1cca58454591ffc93941d6b57d3..00061adb17420e00871c6ca068f4b7fcba00afc0 100644 --- a/CHANGELOG.zh_CN.md +++ b/CHANGELOG.zh_CN.md @@ -1,3 +1,13 @@ +## Wip + +### ⚡ Performance Improvements + +- 登录界面动画优化 + +### 🐛 Bug Fixes + +- 修复验证码组件警告问题 + ## 2.0.1 (2021-02-21) ### ✨ Refactor diff --git a/build/vite/plugin/windicss.ts b/build/vite/plugin/windicss.ts index b8c99ed64d06f474fd8a32fa796c0ace8cd0fb1b..0ba949e50829e378849452c85cda36dced03193f 100644 --- a/build/vite/plugin/windicss.ts +++ b/build/vite/plugin/windicss.ts @@ -4,7 +4,7 @@ import type { Plugin } from 'vite'; export function configWindiCssPlugin(): Plugin[] { return windiCSS({ - safelist: 'shadow shadow-xl', + safelist: 'no-select', preflight: { enableAll: true, }, diff --git a/package.json b/package.json index 473f7b1e01c2cf992bd30e4fc3697a3f0d00e207..cc359828df0939f1aa419a7cce562531bba88f63 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "sortablejs": "^1.13.0", "vditor": "^3.8.1", "vue": "^3.0.5", - "vue-i18n": "9.0.0-rc.2", + "vue-i18n": "9.0.0-rc.7", "vue-router": "^4.0.4", "vue-types": "^3.0.2", "vuex": "^4.0.0", @@ -75,7 +75,7 @@ "cross-env": "^7.0.3", "dotenv": "^8.2.0", "eslint": "^7.20.0", - "eslint-config-prettier": "^7.2.0", + "eslint-config-prettier": "^8.0.0", "eslint-plugin-prettier": "^3.3.1", "eslint-plugin-vue": "^7.6.0", "esno": "^0.4.4", @@ -98,13 +98,13 @@ "vite": "2.0.1", "vite-plugin-compression": "^0.2.1", "vite-plugin-html": "^2.0.1", - "vite-plugin-imagemin": "^0.2.7", + "vite-plugin-imagemin": "^0.2.8", "vite-plugin-mock": "^2.1.4", "vite-plugin-purge-icons": "^0.7.0", "vite-plugin-pwa": "^0.5.3", "vite-plugin-style-import": "^0.7.3", - "vite-plugin-theme": "^0.4.3", - "vite-plugin-windicss": "0.4.4", + "vite-plugin-theme": "^0.4.8", + "vite-plugin-windicss": "0.4.7", "vue-eslint-parser": "^7.5.0", "yargs": "^16.2.0" }, diff --git a/src/components/Tree/src/BasicTree.tsx b/src/components/Tree/src/BasicTree.tsx index 9a508c8f2f5baaf14ca570df48b5c6a558e5e4f3..064e3088399d160ce11a35895e8e315ad265b52c 100644 --- a/src/components/Tree/src/BasicTree.tsx +++ b/src/components/Tree/src/BasicTree.tsx @@ -206,7 +206,7 @@ export default defineComponent({ return () => { return ( - + {{ switcherIcon: () => , default: () => renderTreeNode({ data: unref(getTreeData) }), diff --git a/src/views/sys/login/Login.vue b/src/views/sys/login/Login.vue index 08df359e8b515385f37942011bbeaff5e756882c..0c0dc6bf3539f68d48c59b10dad77df0a320f56a 100644 --- a/src/views/sys/login/Login.vue +++ b/src/views/sys/login/Login.vue @@ -9,7 +9,7 @@ -
+