From 749d74e21f64bd73764cc158f9d35aea372a436f Mon Sep 17 00:00:00 2001
From: tanjinzhou <415800467@qq.com>
Date: Fri, 20 Mar 2020 18:38:47 +0800
Subject: [PATCH 01/41] fix: table error when use template #1914
---
components/table/Table.jsx | 6 ++++--
components/vc-table/index.js | 7 +++++++
components/vc-table/src/TableHeaderRow.jsx | 6 ++++--
3 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/components/table/Table.jsx b/components/table/Table.jsx
index 4fa86790d..5b13508f1 100755
--- a/components/table/Table.jsx
+++ b/components/table/Table.jsx
@@ -490,13 +490,15 @@ export default {
return getPopupContainer;
}
// Use undefined to let rc component use default logic.
- return scroll && table ? () => table.tableNode : undefined;
+ return scroll && table ? () => table.getTableNode() : undefined;
},
scrollToFirstRow() {
const { scroll } = this.$props;
if (scroll && scroll.scrollToFirstRowOnChange !== false) {
scrollTo(0, {
- getContainer: () => this.$refs.vcTable.bodyTable,
+ getContainer: () => {
+ return this.$refs.vcTable.getBodyTable();
+ },
});
}
},
diff --git a/components/vc-table/index.js b/components/vc-table/index.js
index 614c47784..57a299952 100644
--- a/components/vc-table/index.js
+++ b/components/vc-table/index.js
@@ -20,6 +20,12 @@ const Table = {
ColumnGroup,
props: T.props,
methods: {
+ getTableNode() {
+ return this.$refs.table.tableNode;
+ },
+ getBodyTable() {
+ return this.$refs.table.ref_bodyTable;
+ },
normalize(elements = []) {
const columns = [];
elements.forEach(element => {
@@ -63,6 +69,7 @@ const Table = {
columns,
},
on: getListeners(this),
+ ref: 'table',
};
return ;
},
diff --git a/components/vc-table/src/TableHeaderRow.jsx b/components/vc-table/src/TableHeaderRow.jsx
index 107691b05..38c93f839 100644
--- a/components/vc-table/src/TableHeaderRow.jsx
+++ b/components/vc-table/src/TableHeaderRow.jsx
@@ -51,8 +51,10 @@ const TableHeaderRow = {
}
headerCellProps.class = classNames(
- customProps.class || customProps.className,
- column.class || column.className,
+ customProps.class,
+ customProps.className,
+ column.class,
+ column.className,
{
[`${prefixCls}-align-${column.align}`]: !!column.align,
[`${prefixCls}-row-cell-ellipsis`]: !!column.ellipsis,
From a87f5564ccbf3130461127f2ff38de4a85346bcc Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Sat, 21 Mar 2020 16:14:33 +0800
Subject: [PATCH 02/41] fix: weekpicker can not custom trigger picker #1915
---
components/date-picker/WeekPicker.jsx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/components/date-picker/WeekPicker.jsx b/components/date-picker/WeekPicker.jsx
index e1f1e7d5d..550f4e8cf 100644
--- a/components/date-picker/WeekPicker.jsx
+++ b/components/date-picker/WeekPicker.jsx
@@ -224,10 +224,11 @@ export default {
openChange: this.handleOpenChange,
},
style: popupStyle,
+ scopedSlots: { default: input, ...$scopedSlots },
};
return (
- {input}
+
);
},
From 36d95b18fddbfeb0c0716fce12a7117b39c6886b Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Sat, 21 Mar 2020 17:29:53 +0800
Subject: [PATCH 03/41] fix: input-search custom button not work #1916
---
components/input/Search.jsx | 5 +++--
components/input/__tests__/__snapshots__/demo.test.js.snap | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/components/input/Search.jsx b/components/input/Search.jsx
index 62b72fe1a..34d4ac6dd 100644
--- a/components/input/Search.jsx
+++ b/components/input/Search.jsx
@@ -5,8 +5,8 @@ import Icon from '../icon';
import inputProps from './inputProps';
import Button from '../button';
import { cloneElement } from '../_util/vnode';
-import { getOptionProps, getComponentFromProp, getListeners } from '../_util/props-util';
import PropTypes from '../_util/vue-types';
+import { getOptionProps, getComponentFromProp, getListeners } from '../_util/props-util';
import { ConfigConsumerProps } from '../config-provider';
export default {
@@ -18,7 +18,8 @@ export default {
},
props: {
...inputProps,
- enterButton: PropTypes.any.def(false),
+ // 不能设置默认值 https://github.com/vueComponent/ant-design-vue/issues/1916
+ enterButton: PropTypes.any,
},
inject: {
configProvider: { default: () => ConfigConsumerProps },
diff --git a/components/input/__tests__/__snapshots__/demo.test.js.snap b/components/input/__tests__/__snapshots__/demo.test.js.snap
index 6de4a46b2..958ab7a6f 100644
--- a/components/input/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/input/__tests__/__snapshots__/demo.test.js.snap
@@ -56,7 +56,7 @@ exports[`renders ./antdv-demo/docs/input/demo/password-input.md correctly 1`] =
exports[`renders ./antdv-demo/docs/input/demo/presuffix.md correctly 1`] = ``;
-exports[`renders ./antdv-demo/docs/input/demo/search-input.md correctly 1`] = ``;
+exports[`renders ./antdv-demo/docs/input/demo/search-input.md correctly 1`] = ``;
exports[`renders ./antdv-demo/docs/input/demo/search-input-loading.md correctly 1`] = ``;
From 60bb3ae50c06255a3d150afa7a13d84121c0d500 Mon Sep 17 00:00:00 2001
From: Amour1688 <31695475+Amour1688@users.noreply.github.com>
Date: Mon, 23 Mar 2020 11:00:24 +0800
Subject: [PATCH 04/41] chore: simple demo (#1918)
---
examples/App.vue | 26 ++++++++++++
examples/index.html | 81 +++++++++++++++++++++++++++++++++++
examples/index.js | 11 +++++
package.json | 8 +---
webpack.config.js | 100 ++++++++++++++++++++++++++++++++++++++++++++
5 files changed, 220 insertions(+), 6 deletions(-)
create mode 100644 examples/App.vue
create mode 100644 examples/index.html
create mode 100644 examples/index.js
create mode 100644 webpack.config.js
diff --git a/examples/App.vue b/examples/App.vue
new file mode 100644
index 000000000..b65964f0e
--- /dev/null
+++ b/examples/App.vue
@@ -0,0 +1,26 @@
+
+
+
+ Primary
+
+
Default
+
+ Dashed
+
+
+ Danger
+
+
+ 按钮
+
+
+ Link
+
+