diff --git a/.eslintignore b/.eslintignore index 1014441b9..5484d7a9c 100644 --- a/.eslintignore +++ b/.eslintignore @@ -7,4 +7,3 @@ es/ lib/ _site/ dist/ -package.json diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml index 255326104..eb88ba6ff 100644 --- a/.github/FUNDING.yml +++ b/.github/FUNDING.yml @@ -9,4 +9,5 @@ custom: [ "https://www.paypal.me/tangjinzhou", "https://qn.antdv.com/alipay-and-wechat.png", + "https://www.buymeacoffee.com/antdv" ] diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md deleted file mode 100644 index 874e7754d..000000000 --- a/.github/ISSUE_TEMPLATE.md +++ /dev/null @@ -1,16 +0,0 @@ - - - diff --git a/.github/ISSUE_TEMPLATE/----please-use-new-issue-ant-design-vue---.md b/.github/ISSUE_TEMPLATE/----please-use-new-issue-ant-design-vue---.md deleted file mode 100644 index 235cefe3d..000000000 --- a/.github/ISSUE_TEMPLATE/----please-use-new-issue-ant-design-vue---.md +++ /dev/null @@ -1,11 +0,0 @@ ---- -name: '⚠️ Please use issue-helper ⚠️' -about: The issue which is not created via https://vuecomponent.github.io/issue-helper/ will be closed immediately. -labels: ---- - -The issue which is not created via https://vuecomponent.github.io/issue-helper/ will be closed immediately. - ---- - -注意：不是用 https://vuecomponent.github.io/issue-helper/ 或 http://ant-design-vue.gitee.io/issue-helper/ 创建的 issue 会被立即关闭。 diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..10110137a --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,17 @@ +blank_issues_enabled: false +contact_links: + - name: Create new issue + url: https://vuecomponent.github.io/issue-helper/ + about: Please use the following link to create a new issue. + - name: Patreon + url: https://www.patreon.com/tangjinzhou + about: Love Ant Design Vue? Please consider supporting us via Patreon. + - name: Open Collective + url: https://opencollective.com/ant-design-vue/donate + about: Love Ant Design Vue? Please consider supporting us via Open Collective. + - name: Paypal + url: https://www.paypal.me/tangjinzhou + about: Love Ant Design Vue? Please consider supporting us via Paypal. + - name: 支付宝/微信 赞助 + url: https://qn.antdv.com/alipay-and-wechat.png + about: Ant Design Vue 的健康持续发展需要您的支持，🙏 diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 6706e4c0c..135820499 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -50,6 +50,7 @@ jobs: repository: tangjinzhou/antdv-demo token: ${{ secrets.ACCESS_TOKEN }} path: antdv-demo + submodules: true - name: restore cache from package-lock.json uses: actions/cache@v1 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 8f53cdd1b..6c67b8bf2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -106,6 +106,7 @@ jobs: repository: tangjinzhou/antdv-demo token: ${{ secrets.ACCESS_TOKEN }} path: antdv-demo + submodules: true - name: restore cache from package-lock.json uses: actions/cache@v1 diff --git a/.prettierignore b/.prettierignore index c73a42d2e..e2f5232d5 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,5 +1,4 @@ **/*.svg -package.json lib/ es/ dist/ diff --git a/antdv-demo b/antdv-demo index 68d4ed26e..3506c191e 160000 --- a/antdv-demo +++ b/antdv-demo @@ -1 +1 @@ -Subproject commit 68d4ed26e381b03b4d90701184a724b892f213e2 +Subproject commit 3506c191e7e5aa2981d46a594c9997536fe12446 diff --git a/components/_util/responsiveObserve.js b/components/_util/responsiveObserve.js index 88a29c774..2d5fccd2e 100644 --- a/components/_util/responsiveObserve.js +++ b/components/_util/responsiveObserve.js @@ -84,7 +84,7 @@ const responsiveObserve = { }; this.dispatch(pointMap); }, - // Keep a empty destory to avoid triggering unmatch when unregister + // Keep a empty destroy to avoid triggering unmatch when unregister destroy() {}, }), ); diff --git a/components/_util/store/connect.jsx b/components/_util/store/connect.jsx index 2859edccc..0c155aaf1 100644 --- a/components/_util/store/connect.jsx +++ b/components/_util/store/connect.jsx @@ -10,7 +10,7 @@ function getDisplayName(WrappedComponent) { const defaultMapStateToProps = () => ({}); export default function connect(mapStateToProps) { const shouldSubscribe = !!mapStateToProps; - const finnalMapStateToProps = mapStateToProps || defaultMapStateToProps; + const finalMapStateToProps = mapStateToProps || defaultMapStateToProps; return function wrapWithConnect(WrappedComponent) { const tempProps = omit(WrappedComponent.props || {}, ['store']); const props = {}; @@ -31,11 +31,11 @@ export default function connect(mapStateToProps) { this.preProps = getOptionProps(this); watchEffect(() => { if (mapStateToProps && mapStateToProps.length === 2) { - this.subscribed = finnalMapStateToProps(this.store.getState(), this.$props); + this.subscribed = finalMapStateToProps(this.store.getState(), this.$props); } }); return { - subscribed: finnalMapStateToProps(this.store.getState(), this.$props), + subscribed: finalMapStateToProps(this.store.getState(), this.$props), }; }, mounted() { @@ -51,7 +51,7 @@ export default function connect(mapStateToProps) { return; } const props = getOptionProps(this); - const nextSubscribed = finnalMapStateToProps(this.store.getState(), props); + const nextSubscribed = finalMapStateToProps(this.store.getState(), props); if ( !shallowEqual(this.preProps, props) || !shallowEqual(toRaw(this.subscribed), nextSubscribed) diff --git a/components/_util/wave.jsx b/components/_util/wave.jsx index 7eed401bc..dcdd2a2c8 100644 --- a/components/_util/wave.jsx +++ b/components/_util/wave.jsx @@ -58,7 +58,7 @@ export default { const attributeName = this.getAttributeName(); node.removeAttribute(attributeName); node.setAttribute(attributeName, 'true'); - // Not white or transparnt or grey + // Not white or transparent or grey styleForPesudo = styleForPesudo || document.createElement('style'); if ( waveColor && diff --git a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap index e079ab6a8..ea1be58ae 100644 --- a/components/locale-provider/__tests__/__snapshots__/index.test.js.snap +++ b/components/locale-provider/__tests__/__snapshots__/index.test.js.snap @@ -20971,12 +20971,296 @@ exports[`Locale Provider should display the text as vi 1`] = `
2017
+
+
+
+
Thg 09
+
+
+
+
-
-
-
-
Th09
-
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
T2T3T4T5T6T7CN
+
+
28
+
+
+ 		+
+
29
+
+
+ 		+
+
30
+
+
+ 		+
+
31
+
+
+ 		+
+
01
+
+
+ 		+
+
02
+
+
+ 		+
+
03
+
+
+
+
+
04
+
+
+ 		+
+
05
+
+
+ 		+
+
06
+
+
+ 		+
+
07
+
+
+ 		+
+
08
+
+
+ 		+
+
09
+
+
+ 		+
+
10
+
+
+
+
+
11
+
+
+ 		+
+
12
+
+
+ 		+
+
13
+
+
+ 		+
+
14
+
+
+ 		+
+
15
+
+
+ 		+
+
16
+
+
+ 		+
+
17
+
+
+
+
+
18
+
+
+ 		+
+
19
+
+
+ 		+
+
20
+
+
+ 		+
+
21
+
+
+ 		+
+
22
+
+
+ 		+
+
23
+
+
+ 		+
+
24
+
+
+
+
+
25
+
+
+ 		+
+
26
+
+
+ 		+
+
27
+
+
+ 		+
+
28
+
+
+ 		+
+
29
+
+
+ 		+
+
30
+
+
+ 		+
+
01
+
+
+
+
+
02
+
+
+ 		+
+
03
+
+
+ 		+
+
04
+
+
+ 		+
+
05
+
+
+ 		+
+
06
+
+
+ 		+
+
07
+
+
+ 		+
+
08
+
+
+