diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml deleted file mode 100644 index 04d81a13a2f12cbed1b66c77451ebe14b5a2f96c..0000000000000000000000000000000000000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,34 +0,0 @@ -name-template: 'release-v$NEXT_PATCH_VERSION' -tag-template: 'release-v$NEXT_PATCH_VERSION' -categories: - - title: 'Features' - labels: - - 'feat' - - title: 'Bug Fixes' - labels: - - 'fix' - - 'bugfix' - - 'bug' - - title: 'Performance' - labels: - - 'chore' - - 'perf' - - 'style' - - 'refactor' - - 'revert' - - 'wip' - - title: 'Ci' - labels: - - 'ci' - - 'build' - - 'init' - - title: 'Docs' - labels: - - 'docs' - - 'build' - - 'init' - - 'workflow' -change-template: '- $TITLE (#$NUMBER) @$AUTHOR' -template: | - # What's Changed - $CHANGES diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml deleted file mode 100644 index 954c7f73cfb255ecc2d522d4477d8535f6b3ce62..0000000000000000000000000000000000000000 --- a/.github/workflows/release-drafter.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Release Drafter - -on: - push: - branches: - - main - -jobs: - draft_release: - name: Draft release - runs-on: ubuntu-latest - steps: - - uses: release-drafter/release-drafter@v5.11.0 - name: Draft - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000000000000000000000000000000000000..1297d449969c6cccbc9402f966a8f6499ba78740 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,15 @@ +name: Release + +on: + push: + tags: + - v* + +jobs: + release: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - run: npx conventional-github-releaser -p angular + env: + CONVENTIONAL_GITHUB_RELEASER_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.vscode/settings.json b/.vscode/settings.json index f28858fbea404b62cba1ba03700901d0da53a3e5..dbd5029183fc5900843592cc2f30adc3610e34d4 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -64,7 +64,14 @@ "**/.idea": true, "**/.vscode": false, "**/yarn.lock": true, - "**/tmp": true + "**/tmp": true, + "out": true, + "dist": true, + "node_modules": true, + "CHANGELOG.md": true, + "examples": true, + "res": true, + "screenshots": true }, "files.exclude": { "**/bower_components": true, @@ -157,7 +164,7 @@ "editor.defaultFormatter": "esbenp.prettier-vscode" }, "[json]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "vscode.json-language-features" }, "[jsonc]": { "editor.defaultFormatter": "vscode.json-language-features" @@ -186,9 +193,10 @@ "i18n-ally.keystyle": "nested", "i18n-ally.sortKeys": true, "i18n-ally.namespace": true, - "i18n-ally.pathMatcher":"{locale}/{namespaces}.{ext}", + "i18n-ally.pathMatcher": "{locale}/{namespaces}.{ext}", "i18n-ally.enabledParsers": [ "ts" ], - "i18n-ally.sourceLanguage": "zh" + "i18n-ally.sourceLanguage": "zh", + "i18n-ally.enabledFrameworks":["vue","react"] } \ No newline at end of file diff --git a/src/layouts/default/multitabs/index.less b/src/layouts/default/multitabs/index.less index ac26938fa236a3bd920d230493bcb5ebf18f66f5..98762990f3e56edbdf6ad3003d436fc7b75b66d1 100644 --- a/src/layouts/default/multitabs/index.less +++ b/src/layouts/default/multitabs/index.less @@ -115,15 +115,15 @@ } } } -} -.ant-tabs-extra-content { - margin-top: 2px; - line-height: @multiple-height !important; -} + .ant-tabs-extra-content { + margin-top: 2px; + line-height: @multiple-height !important; + } -.ant-dropdown-trigger { - display: inline-flex; + .ant-dropdown-trigger { + display: inline-flex; + } } .multiple-tabs-content {