Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

D2M #9791

Merged
merged 70 commits into from
Sep 16, 2022
Merged

D2M #9791

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
27d37ec
chore: update doc footer (#9605)
iamkun Sep 3, 2022
b6bec16
fix(components): [select-v2] support empty string value (#9609)
chenxch Sep 3, 2022
9be30f9
docs: [tree] fix node-click parameter description (#9614)
chenxch Sep 3, 2022
adc468c
fix(components): [tree-node-content] slot inherit styles (#9613)
chenxch Sep 3, 2022
fda97e2
fix(hooks): [useLockscreen] close shake (#9610)
chenxch Sep 3, 2022
ebc1e96
fix(components): [button] type text deprecated (#9611)
chenxch Sep 3, 2022
86538e4
fix(components): [upload] always display upload trigger (#9607)
holazz Sep 3, 2022
1e6dbd8
refactor(components): [calendar] rename slot dateCell to date-cell (#…
tolking Sep 3, 2022
beae9db
fix: ElPopover components dts (#9569)
hackycy Sep 3, 2022
97380c5
docs(components): fix popper-options to provide working example (#8793)
amaury-hanser Sep 3, 2022
e0a73c8
chore: fix footer dark (#9617)
iamkun Sep 4, 2022
262bb78
docs(components): adjust the type of focus event (#9620)
chenxch Sep 4, 2022
058cd07
fix(components): [form-item] don't add required rule repeatedly (#9618)
sxzz Sep 4, 2022
dc331de
fix(components): [popper] default flip feature (#9584)
YornQiu Sep 4, 2022
2a1cdbd
feat(components): [select] add placement (#9621)
chenxch Sep 4, 2022
320b28b
feat(components): [select-v2] add placement (#9622)
chenxch Sep 4, 2022
acc7092
feat(components): [el-steps] support custom icon when status is error…
z-ao Sep 4, 2022
6eded0b
feat(components): [message-box] allow pass function to `message` opti…
holazz Sep 4, 2022
d0dbd19
fix(components): [table] typed column's min-width not effect (#9540)…
wiidede Sep 4, 2022
ec0b842
perf(components): [message] prefer function slots (#9625)
holazz Sep 5, 2022
675b059
fix(components): [tree-select] fix typo (#9635)
Tsong-LC Sep 5, 2022
401a275
fix(components): [table] selection column don't create table placehol…
Tsong-LC Sep 5, 2022
549b2eb
fix(theme-chalk): [select] missing the is-small style (#9639)
humorHan Sep 5, 2022
328cb57
fix(components): [select] fix content overflow (#9633)
Tsong-LC Sep 5, 2022
6def14d
fix(components): [table] fix namespace (#9654)
holazz Sep 6, 2022
390f5bd
fix(components): [tree] repeat trigger change event on the same node …
holazz Sep 6, 2022
dee98ed
fix(components): [select] keep hover after clearing (#9644)
chenxch Sep 6, 2022
69caee0
fix(components): [loading] remove `el-loading-parent--relative` corre…
wiidede Sep 6, 2022
51a3c45
fix(hooks): [use-popper-container] fix namespace (#9655)
holazz Sep 6, 2022
3dca453
fix(components): [rate] fast move mouseLeave not triggered (#9608)
chenxch Sep 6, 2022
678fc5c
docs(components): [slider] update size attributes (#8795)
hddhyq Sep 6, 2022
e8817aa
feat(components): [select] enhanced suffix (#9619)
chenxch Sep 6, 2022
c4d0c6f
refactor(components): [tabs] improve types (#9561)
tolking Sep 6, 2022
691873c
refactor(components): [cascader] use JSX in Unit test (#9674)
Tsong-LC Sep 7, 2022
2dc3079
fix(components): [select-v2] Tags content overflow wrap (#9677)
Tsong-LC Sep 7, 2022
6218e4d
fix(components): [table] throw error when no matching column (#9682)
qq282126990 Sep 7, 2022
0fbbc65
chore: move eslint ignore (#9694)
sxzz Sep 7, 2022
e008e92
fix(components): [table-v2] cell and header-cell slots parmas (#9665)
xiaochenchen-igg-com Sep 7, 2022
99bb2b0
refactor(build): use pnpm `shell-emulator` instead of `cross-env` (#9…
sxzz Sep 8, 2022
206ffbe
fix(components): [select-v2] fix placeholder style (#9707)
holazz Sep 8, 2022
d38e8b8
fix(components): [select-v2] respect `--el-component-size` (#9706)
holazz Sep 8, 2022
f6d4574
fix(components): [time-picker] fix end-time can't be callback (#9669)
konata33 Sep 8, 2022
daefb75
fix(components): [tree] setCurrentKey() type error (#9709)
zhiyuanzmj Sep 8, 2022
e1f8d7e
fix(components): [cascader] fix large interval when multiple checkbox…
Tsong-LC Sep 8, 2022
e9666db
docs(components): [date-picker] attribute type description (#9357)
pany-ang Sep 8, 2022
cc8805e
chore(deps): update dependency puppeteer to v17 (#9623)
renovate[bot] Sep 8, 2022
9453b41
chore: update readme2 (#9712)
iamkun Sep 8, 2022
3b264a1
refactor(components): [cascader-panel] use JSX in Unit test (#9710)
Tsong-LC Sep 8, 2022
0296ba2
refactor(components): [image-viewer] use JSX in Unit test (#9717)
holazz Sep 9, 2022
838001a
fix(components): [select] fix select hover flicker (#9521)
Yueyanc Sep 9, 2022
189c379
chore: add attribute enum autosuggestion for WebStorm (#9663)
tolking Sep 10, 2022
c64ea61
fix(components): [select] fix option-group get wrong visible (#9726)
init-qy Sep 10, 2022
3f71897
refactor(docs): simplify imports (#9724)
jack-pearson Sep 10, 2022
e3e0038
Update tree.md (#9729)
lequangdongg Sep 10, 2022
d215fee
docs: update table v2 doc (#8203)
iamkun Sep 10, 2022
3fb5f1d
docs: move translation guide to docs (#9730)
sxzz Sep 11, 2022
43858db
fix(components): [loading] fix invalid position sticky (#9720)
Tsong-LC Sep 11, 2022
d6acdc8
docs: move documentations to docs (#9733)
sxzz Sep 11, 2022
b296dd0
fix(components): [el-input] center in vertical direction (#9732)
btea Sep 12, 2022
a4fb762
chore: add linter and formatter cache (#9738)
sxzz Sep 12, 2022
a517dba
fix(components): [checkbox] fix only child element style border-radiu…
Tsong-LC Sep 13, 2022
569d30f
feat(components): [select-v2][tree-v2] add virtual-list style depende…
muuyao Sep 13, 2022
f7d4354
fix(components): [popper] add missing id (#9632)
plehnen Sep 13, 2022
69f823f
ci: simplify workflows (#9737)
sxzz Sep 14, 2022
1c94256
refactor(utils): refactor `flattedChildren` (#9748)
Tsong-LC Sep 14, 2022
df642f4
fix(components): [cascader-panel] fix type error (#9753)
Tsong-LC Sep 14, 2022
f90d3aa
docs(form): fix hide-required-asterisk desc (#9763)
YunYouJun Sep 14, 2022
4d1cb2d
fix: [alert] description value in title's class (#9771)
baiwusanyu-c Sep 15, 2022
5bcccfd
fix(components): [virtual-list] fix type error (#9780)
Tsong-LC Sep 15, 2022
99f08de
chore: update changelog 2.2.17 (#9792)
element-bot Sep 16, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ node_modules
dist
pnpm-lock.yaml
CHANGELOG.en-US.md
!.*
docs/components.d.ts
coverage
play
ssr-testing/cases/*
docs/.vitepress/i18n/*
docs/.vitepress/crowdin/*
!docs/.vitepress/crowdin/en-US
!.*
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: 📮 Post lint commit message
name: 📮 Lint Commit Message Post

on:
workflow_run:
workflows: ['Lint commit message']
workflows: ['Lint Commit Message']
types: [completed]

jobs:
Expand Down Expand Up @@ -81,9 +81,9 @@ jobs:
${{ steps.read.outputs.content }}
```

Please refer to [Commit Example](https://github.com/element-plus/element-plus/blob/dev/commit-example.md) for fixing it.
Please refer to [Commit Example](https://element-plus.org/en-US/guide/commit-examples.html) for fixing it.

请参考 [提交示例](https://github.com/element-plus/element-plus/blob/dev/commit-example.md) 来修改你的提交消息。
请参考 [提交示例](https://element-plus.org/en-US/guide/commit-examples.html) 来修改你的提交消息。

Note that all your commits will be squashed into one for being linted, so you might need to revision your commits.
If you do not know how to do so, please refer to [Keeping git commit history clean](https://about.gitlab.com/blog/2018/06/07/keeping-git-commit-history-clean/) to update your commit message.
Expand Down
22 changes: 10 additions & 12 deletions .github/workflows/lint-commit-message.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Lint commit message
name: Lint Commit Message

on:
pull_request:
Expand All @@ -8,30 +8,21 @@ jobs:
lint:
runs-on: ubuntu-latest
continue-on-error: true
strategy:
matrix:
node-version: ['16']
include:
- node-version: '16'
node-name: 'Latest'
outputs:
failed: ${{ steps.lint_commit.outputs.failed == 'true' }}
env:
PULL_REQUEST_NUMBER: ${{ github.event.number }}

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Add dev branch
run: git branch dev origin/dev

- name: Setup pnpm
uses: pnpm/action-setup@v2

- name: Setup node
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
node-version: 16

- name: Cache ~/.pnpm-store
uses: actions/cache@v3
Expand All @@ -47,25 +38,32 @@ jobs:

- name: Install dependencies
run: pnpm i --frozen-lockfile

- name: Lint commit
id: lint_commit
run: pnpm lint:commit || echo "::set-output name=failed::true"

- name: Set success result
if: ${{ steps.lint_commit.outputs.failed != 'true' }}
run: echo 'true' > ./lint-result.txt

- name: Set failed result
if: ${{ steps.lint_commit.outputs.failed == 'true' }}
run: echo 'false' > ./lint-result.txt

- name: Set PR number
run: echo $PULL_REQUEST_NUMBER > pr.txt

- uses: actions/upload-artifact@v3
with:
name: commit-lint-report
path: ./commit-lint.txt

- uses: actions/upload-artifact@v3
with:
name: commit-lint-result
path: ./lint-result.txt

- uses: actions/upload-artifact@v3
with:
name: pr-number
Expand Down
15 changes: 6 additions & 9 deletions .github/workflows/test-ssr.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
# This workflow runs on target, so there is no need to worry about secrets

name: 🧪 Test SSR

on: pull_request

concurrency:
group: ${{ github.workflow }}-${{ github.event.number || github.sha }}
cancel-in-progress: true

jobs:
# Build successfully, start deployment
test:
name: SSR rendering test
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]

steps:
- uses: actions/checkout@v3
with:
Expand All @@ -26,7 +23,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
node-version: 16
cache: 'pnpm'

- name: Install dependencies
Expand All @@ -37,5 +34,5 @@ jobs:
env:
NODE_OPTIONS: --max-old-space-size=4096

- name: Do test
- name: Test
run: pnpm test:ssr
39 changes: 28 additions & 11 deletions .github/workflows/test-unit.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
# Unit Test

name: 🧪 Unit Test

on: pull_request
Expand All @@ -9,15 +7,9 @@ concurrency:
cancel-in-progress: true

jobs:
build:
name: Unit Test (${{ matrix.node-name }})
lint:
name: Lint
runs-on: ubuntu-latest
strategy:
matrix:
node-version: ['16']
include:
- node-version: '16'
node-name: 'Latest'

steps:
- uses: actions/checkout@v3
Expand All @@ -33,7 +25,7 @@ jobs:
- name: Setup node
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
node-version: 16
cache: 'pnpm'

- name: Install dependencies
Expand All @@ -45,5 +37,30 @@ jobs:
- name: Type Check
run: pnpm typecheck

build:
name: Unit Test (${{ matrix.node-name }})
runs-on: ubuntu-latest
strategy:
matrix:
node-version: ['16']
include:
- node-version: '16'
node-name: 'Latest'

steps:
- uses: actions/checkout@v3

- name: Setup pnpm
uses: pnpm/action-setup@v2

- name: Setup node
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'pnpm'

- name: Install dependencies
run: pnpm i --frozen-lockfile

- name: Test
run: pnpm test
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ packages/element-plus/version.ts

# local env files
*.local
.eslintcache
cypress/screenshots/*
cypress/videos/*
tmp
1 change: 0 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@
. "$(dirname "$0")/_/husky.sh"

pnpm exec lint-staged
pnpm exec pretty-quick --staged
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
shamefully-hoist=true
strict-peer-dependencies=false
shell-emulator=true
64 changes: 64 additions & 0 deletions CHANGELOG.en-US.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,69 @@
## Changelog

### 2.2.17

_2022-09-16_

#### Features

- Components [select] add placement (#9621 by @chenxch)
- Components [select-v2] add placement (#9622 by @chenxch)
- Components [el-steps] support custom icon when status is error (#9603 by @z-ao)
- Components [message-box] allow pass function to `message` option (#9405 by @holazz)
- Components [select] enhanced suffix (#9619 by @chenxch)
- Components [select-v2][tree-v2] add virtual-list style dependency (#7129 by @muuyao)

#### Bug fixes

- Components [select-v2] support empty string value (#9609 by @chenxch)
- Components [tree-node-content] slot inherit styles (#9613 by @chenxch)
- Hooks [useLockscreen] close shake (#9610 by @chenxch)
- Components [button] type text deprecated (#9611 by @chenxch)
- Components [upload] always display upload trigger (#9607 by @holazz)
- ElPopover components dts (#9569 by @hackycy)
- Components [form-item] don't add required rule repeatedly (#9618 by @sxzz)
- Components [popper] default flip feature (#9584 by @YornQiu)
- Components [table] typed column's min-width not effect (#9540 by @wiidede) (#9593)
- Components [tree-select] fix typo (#9635 by @Tsong-LC)
- Components [table] selection column don't create table placeholder (#9637 by @Tsong-LC)
- Theme-chalk [select] missing the is-small style (#9639 by @humorHan)
- Components [select] fix content overflow (#9633 by @Tsong-LC)
- Components [table] fix namespace (#9654 by @holazz)
- Components [tree] repeat trigger change event on the same node (#9645 by @holazz)
- Components [select] keep hover after clearing (#9644 by @chenxch)
- Components [loading] remove `el-loading-parent--relative` correctly (#9630 by @wiidede)
- Hooks [use-popper-container] fix namespace (#9655 by @holazz)
- Components [rate] fast move mouseLeave not triggered (#9608 by @chenxch)
- Components [select-v2] Tags content overflow wrap (#9677 by @Tsong-LC)
- Components [table] throw error when no matching column (#9682 by @qq282126990)
- Components [table-v2] cell and header-cell slots parmas (#9665 by @chenxch)
- Components [select-v2] fix placeholder style (#9707 by @holazz)
- Components [select-v2] respect `--el-component-size` (#9706 by @holazz)
- Components [time-picker] fix end-time can't be callback (#9669 by @MrCat33)
- Components [tree] setCurrentKey() type error (#9709 by @zhiyuanzmj)
- Components [cascader] fix large interval when multiple checkboxes (#9428 by @Tsong-LC)
- Components [select] fix select hover flicker (#9521 by @ChenAdien)
- Components [select] fix option-group get wrong visible (#9726 by @init-qy)
- Components [loading] fix invalid position sticky (#9720 by @Tsong-LC)
- Components [el-input] center in vertical direction (#9732 by @btea)
- Components [checkbox] fix only child element style border-radius (#9746 by @Tsong-LC)
- Components [popper] add missing id (#9632 by @plehnen)
- Components [cascader-panel] fix type error (#9753 by @Tsong-LC)
- [alert] description value in title's class (#9771 by @baiwusanyu-c)
- Components [virtual-list] fix type error (#9780 by @Tsong-LC)

#### Refactors

- Components [calendar] rename slot dateCell to date-cell (#9590 by @tolking)
- Components [tabs] improve types (#9561 by @tolking)
- Components [cascader] use JSX in Unit test (#9674 by @Tsong-LC)
- Build use pnpm `shell-emulator` instead of `cross-env` (#9693 by @sxzz)
- Components [cascader-panel] use JSX in Unit test (#9710 by @Tsong-LC)
- Components [image-viewer] use JSX in Unit test (#9717 by @holazz)
- Docs simplify imports (#9724 by @jack-pearson)
- Utils refactor `flattedChildren` (#9748 by @Tsong-LC)
- Perf(components): [message] prefer function slots (#9625 by @holazz)

### 2.2.16

_2022-09-02_
Expand Down
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ touch play/src/App.vue # Adding an entry for the play to run.
pnpm run dev
```

You can follow the [LOCAL DEVELOPMENT GUIDE](https://github.com/element-plus/element-plus/blob/dev/LOCAL_DEV.md) to do development more quickly.
You can follow the [LOCAL DEVELOPMENT GUIDE](https://element-plus.org/en-US/guide/dev-guide.html) to do development more quickly.

### Compile the source code

Expand Down Expand Up @@ -110,7 +110,7 @@ pnpm cz
2. You can also write the commit message by hand, but make sure your
commit message follows the rules.

We have a [commit template](https://github.com/element-plus/element-plus/blob/dev/commit-example.md)
We have a [commit template](https://element-plus.org/en-US/guide/commit-examples.html)

NOTE:
**PRs with unformatted commit message WILL NOT BE ACCEPTED**
Expand Down
33 changes: 0 additions & 33 deletions HELP_TRANSLATING_ZH.md

This file was deleted.

7 changes: 1 addition & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,6 @@ You can also try Element Plus out with the components built-in playground.
<img width="150px" src="https://user-images.githubusercontent.com/17680888/160634485-df0d00af-8633-4ab8-9a72-aac2b65d1d36.png">
</a>
</td>
<td align="center" valign="middle">
<a href="https://hooray.gitee.io/fantastic-admin/?from=element-plus" target="_blank">
<img width="150px" src="https://user-images.githubusercontent.com/82012629/167299102-e2e66150-2248-4f03-bbf2-84c622e7d165.png">
</a>
</td>
</tr>
</tbody>
</table>
Expand Down Expand Up @@ -113,7 +108,7 @@ above and leave a message if you want to help translating Element Plus into your

### How to help translating

See how to help translating in [Translating Element Plus](./HELP_TRANSLATING.md).
See how to help translating in [Translating Element Plus](https://element-plus.org/en-US/guide/translation.html).

## Stay tuned :eyes:

Expand Down
3 changes: 0 additions & 3 deletions docs/.eslintignore

This file was deleted.

6 changes: 1 addition & 5 deletions docs/.vitepress/config.mts
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@ import consola from 'consola'
import { REPO_BRANCH, REPO_PATH } from '@element-plus/build-constants'
import { docsDirName } from '@element-plus/build-utils'
import { languages } from './utils/lang'
import { head } from './config/head'
import { sidebars } from './config/sidebars'
import { nav } from './config/nav'
import { mdPlugin } from './config/plugins'
import { features } from './config/features'
import { features, head, mdPlugin, nav, sidebars } from './config'
import type { UserConfig } from 'vitepress'

const buildTransformers = () => {
Expand Down
7 changes: 7 additions & 0 deletions docs/.vitepress/config/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export * from './analytics'
export * from './features'
export * from './head'
export * from './nav'
export * from './plugins'
export * from './sidebars'
export * from './sponsors'