From b4fe21139afd1793ac95390f5ec7e22adf5f73d7 Mon Sep 17 00:00:00 2001 From: tanjinzhou <415800467@qq.com> Date: Sun, 29 Sep 2019 17:04:19 +0800 Subject: [PATCH 1/4] fix: tooltip defaultVisible not work #1232 --- components/tooltip/Tooltip.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/tooltip/Tooltip.jsx b/components/tooltip/Tooltip.jsx index cb5372061..234dcfd91 100644 --- a/components/tooltip/Tooltip.jsx +++ b/components/tooltip/Tooltip.jsx @@ -38,7 +38,7 @@ export default { }, data() { return { - sVisible: !!this.$props.visible, + sVisible: !!this.$props.visible || !!this.$props.defaultVisible, }; }, watch: { From c89d19e6e145a9bbdec3ab2133562f36ebc2bd20 Mon Sep 17 00:00:00 2001 From: tanjinzhou <415800467@qq.com> Date: Sun, 29 Sep 2019 17:22:11 +0800 Subject: [PATCH 2/4] feat: Carousel support responsive #1230 --- components/carousel/index.jsx | 1 + components/vc-slick/src/default-props.js | 2 +- types/carousel.d.ts | 47 ++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/components/carousel/index.jsx b/components/carousel/index.jsx index 49a0369b0..edae6d6d4 100644 --- a/components/carousel/index.jsx +++ b/components/carousel/index.jsx @@ -64,6 +64,7 @@ export const CarouselProps = { variableWidth: PropTypes.bool, useCSS: PropTypes.bool, slickGoTo: PropTypes.number, + responsive: PropTypes.array.def(null), }; const Carousel = { diff --git a/components/vc-slick/src/default-props.js b/components/vc-slick/src/default-props.js index 080f2f846..590144cc0 100644 --- a/components/vc-slick/src/default-props.js +++ b/components/vc-slick/src/default-props.js @@ -31,7 +31,7 @@ const defaultProps = { pauseOnFocus: PropTypes.bool.def(false), // hover是否暂停 pauseOnHover: PropTypes.bool.def(true), - responsive: PropTypes.any.def(null), + responsive: PropTypes.array.def(null), rows: PropTypes.number.def(1), rtl: PropTypes.bool.def(false), slide: PropTypes.string.def('div'), diff --git a/types/carousel.d.ts b/types/carousel.d.ts index 287f83c0f..3b37e8307 100644 --- a/types/carousel.d.ts +++ b/types/carousel.d.ts @@ -4,6 +4,51 @@ import { AntdComponent } from './component'; +export interface Settings { + accessibility?: boolean; + adaptiveHeight?: boolean; + arrows?: boolean; + autoplaySpeed?: number; + autoplay?: boolean; + centerMode?: boolean; + centerPadding?: string; + className?: string; + cssEase?: string; + dotsClass?: string; + dots?: boolean; + draggable?: boolean; + easing?: string; + edgeFriction?: number; + fade?: boolean; + focusOnSelect?: boolean; + infinite?: boolean; + initialSlide?: number; + pauseOnDotsHover?: boolean; + pauseOnFocus?: boolean; + pauseOnHover?: boolean; + responsive?: ResponsiveObject[]; + rows?: number; + rtl?: boolean; + slide?: string; + slidesPerRow?: number; + slidesToScroll?: number; + slidesToShow?: number; + speed?: number; + swipeToSlide?: boolean; + swipe?: boolean; + touchMove?: boolean; + touchThreshold?: number; + useCSS?: boolean; + useTransform?: boolean; + variableWidth?: boolean; + vertical?: boolean; + verticalSwiping?: boolean; + waitForAnimate?: boolean; +} +export interface ResponsiveObject { + breakpoint: number; + settings: 'unslick' | Settings; +} export declare class Carousel extends AntdComponent { /** * Callback function called after the current index changes @@ -52,6 +97,8 @@ export declare class Carousel extends AntdComponent { */ vertical: boolean; + responsive: ResponsiveObject[]; + /** * Go to slide index, if dontAnimate=true, it happens without animation * @param slideNumber slide number to go From a678e3b55021bcfd3ac2da97f0113784b56aeee2 Mon Sep 17 00:00:00 2001 From: tanjinzhou <415800467@qq.com> Date: Sun, 29 Sep 2019 17:42:17 +0800 Subject: [PATCH 3/4] fix: add comment ts types --- types/ant-design-vue.d.ts | 1 + types/comment.d.ts | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 types/comment.d.ts diff --git a/types/ant-design-vue.d.ts b/types/ant-design-vue.d.ts index 61914d2a8..d1cd355b6 100644 --- a/types/ant-design-vue.d.ts +++ b/types/ant-design-vue.d.ts @@ -16,6 +16,7 @@ import { Button } from './button/button'; import { Calendar } from './calendar'; import { Card } from './card'; import { Collapse } from './collapse/collapse'; +import { Comment } from './comment'; import { Carousel } from './carousel'; import { Cascader } from './cascader'; import { Checkbox } from './checkbox/checkbox'; diff --git a/types/comment.d.ts b/types/comment.d.ts new file mode 100644 index 000000000..ad6c6b8de --- /dev/null +++ b/types/comment.d.ts @@ -0,0 +1,19 @@ +// Project: https://github.com/vueComponent/ant-design-vue +// Definitions: https://github.com/vueComponent/ant-design-vue/types + +import { AntdComponent } from './component'; + +export declare class Comment extends AntdComponent { + /** List of action items rendered below the comment content */ + actions?: Array<any>; + /** The element to display as the comment author. */ + author?: any; + /** The element to display as the comment avatar - generally an antd Avatar */ + avatar?: any; + /** The main content of the comment */ + content: any; + /** Comment prefix defaults to '.ant-comment' */ + prefixCls?: string; + /** A datetime element containing the time to be displayed */ + datetime?: any; +} From c897d32a00caf90fdb38538ee26ade3ba5a62def Mon Sep 17 00:00:00 2001 From: zkwolf <chenhao5866@gmail.com> Date: Sun, 29 Sep 2019 18:10:23 +0800 Subject: [PATCH 4/4] fix: time-picker bug (#1176) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当使用backspace删除所有字符后,输入第一个字符控制台报错,并无字符显示 --- components/vc-time-picker/Header.jsx | 6 ++---- components/vc-time-picker/Panel.jsx | 8 -------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/components/vc-time-picker/Header.jsx b/components/vc-time-picker/Header.jsx index e5045094b..4e2983a0b 100644 --- a/components/vc-time-picker/Header.jsx +++ b/components/vc-time-picker/Header.jsx @@ -28,7 +28,6 @@ const Header = { currentSelectPanel: PropTypes.string, focusOnOpen: PropTypes.bool, // onKeyDown: PropTypes.func, - showStr: PropTypes.bool.def(true), clearIcon: PropTypes.any, }, data() { @@ -70,7 +69,6 @@ const Header = { return; } - this.showStr = true; this.setState({ str, }); @@ -192,14 +190,14 @@ const Header = { }, getInput() { - const { prefixCls, placeholder, inputReadOnly, invalid, str, showStr } = this; + const { prefixCls, placeholder, inputReadOnly, invalid, str } = this; const invalidClass = invalid ? `${prefixCls}-input-invalid` : ''; return ( <input class={`${prefixCls}-input ${invalidClass}`} ref="input" onKeydown={this.onKeyDown} - value={showStr ? str : ''} + value={str} placeholder={placeholder} onInput={this.onInputChange} readOnly={!!inputReadOnly} diff --git a/components/vc-time-picker/Panel.jsx b/components/vc-time-picker/Panel.jsx index 116379501..a1cc04b80 100644 --- a/components/vc-time-picker/Panel.jsx +++ b/components/vc-time-picker/Panel.jsx @@ -57,7 +57,6 @@ const Panel = { sValue: this.value, selectionRange: [], currentSelectPanel: '', - showStr: true, }; }, watch: { @@ -65,11 +64,6 @@ const Panel = { if (val) { this.setState({ sValue: val, - showStr: true, - }); - } else { - this.setState({ - showStr: false, }); } }, @@ -132,7 +126,6 @@ const Panel = { inputReadOnly, sValue, currentSelectPanel, - showStr, $listeners = {}, } = this; const clearIcon = getComponentFromProp(this, 'clearIcon'); @@ -181,7 +174,6 @@ const Panel = { focusOnOpen={focusOnOpen} onKeydown={keydown} inputReadOnly={inputReadOnly} - showStr={showStr} clearIcon={clearIcon} /> <Combobox