+
+`;
+
+exports[`renders ./components/comment/demo/editor.md correctly 1`] = `
+
+ 
+
+
+
+
+
+
+ We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and efficiently.
+-
+
- + 0 + +
- +
- + 0 + +
- +
- Reply to +
+
+
+`;
+
+exports[`renders ./components/comment/demo/list.md correctly 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+`;
diff --git a/components/comment/__tests__/demo.test.js b/components/comment/__tests__/demo.test.js
new file mode 100755
index 000000000..83f648004
--- /dev/null
+++ b/components/comment/__tests__/demo.test.js
@@ -0,0 +1,3 @@
+import demoTest from '../../../tests/shared/demoTest'
+
+demoTest('comment')
diff --git a/components/comment/demo/basic.md b/components/comment/demo/basic.md
new file mode 100644
index 000000000..d851d211f
--- /dev/null
+++ b/components/comment/demo/basic.md
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+ We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
+-
+
- Reply to +
+
+
+
+
+
+
+
+
+
+
+
+ We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
+-
+
- Reply to +
+
+
+
+
+
+
+
+
+
+
+
+ We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
+-
+
- Reply to +
+
+
+
+
+
+
+
+
+
+ We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
+-
+
- Reply to +
We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and efficiently.
+
+
+
+
+
+
+
+
+
+
+
+
+```
diff --git a/components/comment/demo/index.vue b/components/comment/demo/index.vue
new file mode 100644
index 000000000..4dde88949
--- /dev/null
+++ b/components/comment/demo/index.vue
@@ -0,0 +1,52 @@
+
diff --git a/components/comment/demo/list.md b/components/comment/demo/list.md
new file mode 100644
index 000000000..0fe00d454
--- /dev/null
+++ b/components/comment/demo/list.md
@@ -0,0 +1,61 @@
+
+
+
+
+
+ Add Comment
+
+
+
+ {{item.content}}
+We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
+We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
+We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
+We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
+{children}
+ },
+ },
+
+ render () {
+ const {
+ prefixCls,
+ } = this.$props
+
+ const actions = this.$props.actions || getComponentFromProp(this, 'actions')
+ const author = this.$props.author || getComponentFromProp(this, 'author')
+ const avatar = this.$props.avatar || getComponentFromProp(this, 'avatar')
+ const content = this.$props.content || getComponentFromProp(this, 'content')
+ const datetime = this.$props.datetime || getComponentFromProp(this, 'datetime')
+
+ const avatarDom = (
+
+ {typeof avatar === 'string' ? 
: avatar}
+
+ )
+
+ const actionDom =
+ actions && actions.length ? (
+ - {this.getAction(actions)}
+ {authorContent}
+
+ )
+
+ const comment = (
+ {content}
+ {actionDom}
+
+ {avatarDom}
+ {contentDom}
+
+ )
+ const children = this.$slots.default
+ return (
+
+ {comment}
+ {children ? this.renderNested(children) : null}
+
+ )
+ },
+}
+
+/* istanbul ignore next */
+Comment.install = function (Vue) {
+ Vue.component(Comment.name, Comment)
+}
+export default Comment
diff --git a/components/comment/index.zh-CN.md b/components/comment/index.zh-CN.md
new file mode 100644
index 000000000..115fb79c9
--- /dev/null
+++ b/components/comment/index.zh-CN.md
@@ -0,0 +1,24 @@
+---
+category: Components
+type: 数据展示
+title: Comment
+subtitle: 评论
+cols: 1
+---
+
+对网站内容的反馈、评价和讨论。
+
+## 何时使用
+
+评论组件可用于对事物的讨论，例如页面、博客文章、问题等等。
+
+## API
+
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| actions | 在评论内容下面呈现的操作项列表 | Array|slot | - |
+| author | 要显示为注释作者的元素 | string\|slot | - |
+| avatar | 要显示为评论头像的元素 - 通常是 antd `Avatar` 或者src | string\|slot | - |
+| children | 嵌套注释应作为注释的子项提供 | slot | - |
+| content | 评论的主要内容 | string\|slot | - |
+| datetime | 展示时间描述 | string\|slot | - |
diff --git a/components/comment/style/index.js b/components/comment/style/index.js
new file mode 100644
index 000000000..cf31ed80f
--- /dev/null
+++ b/components/comment/style/index.js
@@ -0,0 +1,2 @@
+import '../../style/index.less'
+import './index.less'
diff --git a/components/comment/style/index.less b/components/comment/style/index.less
new file mode 100644
index 000000000..891ea4209
--- /dev/null
+++ b/components/comment/style/index.less
@@ -0,0 +1,93 @@
+@import '../../style/themes/default';
+@import '../../style/mixins/index';
+
+@comment-prefix-cls: ~'@{ant-prefix}-comment';
+
+.@{comment-prefix-cls} {
+ position: relative;
+
+ &-inner {
+ padding: @comment-padding-base;
+ display: flex;
+ }
+
+ &-avatar {
+ flex-shrink: 0;
+ position: relative;
+ margin-right: 12px;
+ cursor: pointer;
+ img {
+ width: 32px;
+ height: 32px;
+ border-radius: 50%;
+ }
+ }
+
+ &-content {
+ position: relative;
+ font-size: 14px;
+ flex: 1 1 auto;
+ min-width: 1px;
+ word-wrap: break-word;
+
+ &-author {
+ margin-bottom: 4px;
+ font-size: 14px;
+ display: flex;
+ justify-content: flex-start;
+ & > a,
+ & > span {
+ height: 18px;
+ font-size: 12px;
+ line-height: 18px;
+ padding-right: 8px;
+ }
+
+ &-name {
+ transition: color 0.3s;
+ font-size: 14px;
+ color: @comment-author-name-color;
+ > * {
+ color: @comment-author-name-color;
+ &:hover {
+ color: @comment-author-name-color;
+ }
+ }
+ }
+
+ &-time {
+ cursor: auto;
+ color: @comment-author-time-color;
+ white-space: nowrap;
+ }
+ }
+
+ &-detail p {
+ white-space: pre-wrap;
+ }
+ }
+
+ &-actions {
+ margin-top: 12px;
+ padding-left: 0;
+ > li {
+ display: inline-block;
+ color: @comment-action-color;
+ > span {
+ padding-right: 10px;
+ transition: color 0.3s;
+ font-size: 12px;
+ color: @comment-action-color;
+ cursor: pointer;
+ user-select: none;
+ &:hover {
+ color: @comment-action-hover-color;
+ }
+ }
+ }
+ }
+
+ &-nested {
+ margin-left: @comment-nest-indent;
+ }
+}
diff --git a/components/index.js b/components/index.js
index 79d18c6c5..9d70e0f7e 100644
--- a/components/index.js
+++ b/components/index.js
@@ -124,6 +124,8 @@ import { default as Drawer } from './drawer'
import { default as Skeleton } from './skeleton'
+import { default as Comment } from './comment'
+
const components = [
Affix,
Anchor,
@@ -177,6 +179,7 @@ const components = [
Upload,
Drawer,
Skeleton,
+ Comment,
]
const install = function (Vue) {
@@ -255,6 +258,7 @@ export {
Upload,
Drawer,
Skeleton,
+ Comment,
}
export default {
diff --git a/components/style.js b/components/style.js
index 4b4bbda16..25cf8b5b7 100644
--- a/components/style.js
+++ b/components/style.js
@@ -51,3 +51,4 @@ import './carousel/style'
import './tree-select/style'
import './drawer/style'
import './skeleton/style'
+import './comment/style'
diff --git a/components/style/themes/default.less b/components/style/themes/default.less
index a5a6fc9e8..db5d8bcf1 100644
--- a/components/style/themes/default.less
+++ b/components/style/themes/default.less
@@ -402,6 +402,15 @@
@card-actions-background: @background-color-light;
@card-shadow: 0 2px 8px rgba(0, 0, 0, .09);
+// Comment
+// ---
+@comment-padding-base: 16px 0;
+@comment-nest-indent: 44px;
+@comment-author-name-color: @text-color-secondary;
+@comment-author-time-color: #ccc;
+@comment-action-color: @text-color-secondary;
+@comment-action-hover-color: #595959;
+
// Tabs
// ---
@tabs-card-head-background: @background-color-light;
diff --git a/site/components.js b/site/components.js
index 54b59717e..ad20b73bf 100644
--- a/site/components.js
+++ b/site/components.js
@@ -56,6 +56,7 @@ import {
// version,
Drawer,
Skeleton,
+ Comment,
} from 'ant-design-vue'
Vue.prototype.$message = message
@@ -119,6 +120,7 @@ Vue.use(Timeline)
Vue.use(Tooltip)
Vue.use(Upload)
Vue.use(Skeleton)
+Vue.use(Comment)
/* v1.1.2 registration methods */
// Vue.component(Affix.name, Affix) // a-affix
diff --git a/site/demo.js b/site/demo.js
index 5bd8906cf..7f9a07cec 100644
--- a/site/demo.js
+++ b/site/demo.js
@@ -11,6 +11,12 @@ export default {
type: 'Data Display',
title: 'Badge',
},
+ comment: {
+ category: 'Components',
+ subtitle: '评论',
+ type: 'Data Display',
+ title: 'Comment',
+ },
breadcrumb: {
category: 'Components',
subtitle: '面包屑',
diff --git a/site/demoRoutes.js b/site/demoRoutes.js
index 3177842a6..64ee6f647 100644
--- a/site/demoRoutes.js
+++ b/site/demoRoutes.js
@@ -423,4 +423,12 @@ export default [
path: 'skeleton-cn',
component: () => import('../components/skeleton/demo/index.vue'),
},
+ {
+ path: 'comment',
+ component: () => import('../components/comment/demo/index.vue'),
+ },
+ {
+ path: 'comment-cn',
+ component: () => import('../components/comment/demo/index.vue'),
+ },
]
From 13b78b9543092a7976a3f2365e19f5a13afdc108 Mon Sep 17 00:00:00 2001
From: wangxueliang
@@ -56,7 +56,7 @@ export default {
handler={false}
open={this.openChild}
onMaskClick={this.onChildClick}
- wrapperClassName='drawer2'
+ class='drawer2'
level='.drawer1'
placement='right'
levelMove={100}
diff --git a/components/vc-drawer/demo/placement.jsx b/components/vc-drawer/demo/placement.jsx
index 52a9745ad..22d4df48f 100644
--- a/components/vc-drawer/demo/placement.jsx
+++ b/components/vc-drawer/demo/placement.jsx
@@ -35,7 +35,7 @@ export default {
return (
)
@@ -484,7 +489,7 @@ const Drawer = {
return this.open !== undefined ? this.open : this.sOpen
},
getTouchParentScroll (root, currentTarget, differX, differY) {
- if (!currentTarget) {
+ if (!currentTarget || currentTarget === document) {
return false
}
// root 为 drawer-content 设定了 overflow, 判断为 root 的 parent 时结束滚动；
@@ -506,20 +511,27 @@ const Drawer = {
*/
const t = currentTarget.scrollTop
const l = currentTarget.scrollLeft
- currentTarget.scrollTo(currentTarget.scrollLeft + 1, currentTarget.scrollTop + 1)
+ if (currentTarget.scrollTo) {
+ currentTarget.scrollTo(currentTarget.scrollLeft + 1, currentTarget.scrollTop + 1)
+ }
const currentT = currentTarget.scrollTop
const currentL = currentTarget.scrollLeft
- currentTarget.scrollTo(currentTarget.scrollLeft - 1, currentTarget.scrollTop - 1)
-
+ if (currentTarget.scrollTo) {
+ currentTarget.scrollTo(currentTarget.scrollLeft - 1, currentTarget.scrollTop - 1)
+ }
if (
- isY && (!scrollY || !(currentT - t) ||
- (scrollY && (currentTarget.scrollTop >= scrollY && differY < 0 ||
- currentTarget.scrollTop <= 0 && differY > 0))
- ) ||
- isX && (!scrollX || !(currentL - l) ||
- (scrollX && (currentTarget.scrollLeft >= scrollX && differX < 0 ||
- currentTarget.scrollLeft <= 0 && differX > 0))
- )
+ (isY &&
+ (!scrollY ||
+ !(currentT - t) ||
+ (scrollY &&
+ ((currentTarget.scrollTop >= scrollY && differY < 0) ||
+ (currentTarget.scrollTop <= 0 && differY > 0))))) ||
+ (isX &&
+ (!scrollX ||
+ !(currentL - l) ||
+ (scrollX &&
+ ((currentTarget.scrollLeft >= scrollX && differX < 0) ||
+ (currentTarget.scrollLeft <= 0 && differX > 0)))))
) {
return this.getTouchParentScroll(root, currentTarget.parentNode, differX, differY)
}
@@ -544,8 +556,8 @@ const Drawer = {
if (
currentTarget === this.maskDom ||
currentTarget === this.handlerdom ||
- currentTarget === this.contentDom &&
- this.getTouchParentScroll(currentTarget, e.target, differX, differY)
+ (currentTarget === this.contentDom &&
+ this.getTouchParentScroll(currentTarget, e.target, differX, differY))
) {
e.preventDefault()
}
@@ -588,7 +600,7 @@ const Drawer = {
)
}
- if (!this.container || !open && !this.sFirstEnter) {
+ if (!this.container || (!open && !this.sFirstEnter)) {
return null
}
return (
diff --git a/components/vc-drawer/src/drawerProps.js b/components/vc-drawer/src/drawerProps.js
index 25fe11705..d8088b53a 100644
--- a/components/vc-drawer/src/drawerProps.js
+++ b/components/vc-drawer/src/drawerProps.js
@@ -1,7 +1,7 @@
import PropTypes from '../../_util/vue-types'
export default {
- wrapClassName: PropTypes.string,
+ wrapperClassName: PropTypes.string,
width: PropTypes.any,
height: PropTypes.any,
defaultOpen: PropTypes.bool,
diff --git a/components/vc-drawer/src/index.js b/components/vc-drawer/src/index.js
index 304065c9d..9b38dd851 100644
--- a/components/vc-drawer/src/index.js
+++ b/components/vc-drawer/src/index.js
@@ -1,4 +1,4 @@
-// base in 1.7.6
+// base in 1.7.7
// export this package's api
import Drawer from './Drawer'
diff --git a/components/vc-drawer/src/utils.js b/components/vc-drawer/src/utils.js
index e773d4a33..581885ed7 100644
--- a/components/vc-drawer/src/utils.js
+++ b/components/vc-drawer/src/utils.js
@@ -4,20 +4,20 @@ export function dataToArray (vars) {
}
return [vars]
}
-const trnasitionEndObject = {
+const transitionEndObject = {
transition: 'transitionend',
WebkitTransition: 'webkitTransitionEnd',
MozTransition: 'transitionend',
OTransition: 'oTransitionEnd otransitionend',
}
-export const trnasitionStr = Object.keys(trnasitionEndObject).filter(key => {
+export const transitionStr = Object.keys(transitionEndObject).filter(key => {
if (typeof document === 'undefined') {
return false
}
const html = document.getElementsByTagName('html')[0]
return key in (html ? html.style : {})
})[0]
-export const transitionEnd = trnasitionEndObject[trnasitionStr]
+export const transitionEnd = transitionEndObject[transitionStr]
export function addEventListener (target, eventType, callback, options) {
if (target.addEventListener) {
@@ -51,6 +51,6 @@ export function transformArguments (arg, cb) {
return [result]
}
-export const isNumeric = (value) => {
+export const isNumeric = value => {
return !isNaN(parseFloat(value)) && isFinite(value);// eslint-disable-line
}
diff --git a/components/vc-form/demo/promise-validate.js b/components/vc-form/demo/promise-validate.js
new file mode 100644
index 000000000..11fdd640c
--- /dev/null
+++ b/components/vc-form/demo/promise-validate.js
@@ -0,0 +1,29 @@
+import { createForm } from '../index'
+const Form = {
+
+ methods: {
+ handleSubmit (e) {
+ e.preventDefault()
+ const { validateFields } = this.form
+ validateFields()
+ .then(console.log)
+ .catch(console.error)
+ },
+ },
+
+ render () {
+ const { getFieldDecorator } = this.form
+ return (
+
+ )
+ },
+}
+
+export default createForm()(Form)
diff --git a/components/vc-form/src/createBaseForm.jsx b/components/vc-form/src/createBaseForm.jsx
index 44a7b58da..df140e89a 100644
--- a/components/vc-form/src/createBaseForm.jsx
+++ b/components/vc-form/src/createBaseForm.jsx
@@ -34,6 +34,7 @@ function createBaseForm (option = {}, mixins = []) {
fieldMetaProp,
fieldDataProp,
formPropName = 'form',
+ name: formName,
props = {},
templateContext,
} = option
@@ -267,7 +268,7 @@ function createBaseForm (option = {}, mixins = []) {
const inputListeners = {}
const inputAttrs = {}
if (fieldNameProp) {
- inputProps[fieldNameProp] = name
+ inputProps[fieldNameProp] = formName ? `${formName}_${name}` : name
}
const validateRules = normalizeValidateRules(validate, rules, validateTrigger)
@@ -375,12 +376,15 @@ function createBaseForm (option = {}, mixins = []) {
saveRef (name, _, component) {
if (!component) {
+ const fieldMeta = this.fieldsStore.getFieldMeta(name)
+ if (!fieldMeta.preserve) {
// after destroy, delete data
- this.clearedFieldMetaCache[name] = {
- field: this.fieldsStore.getField(name),
- meta: this.fieldsStore.getFieldMeta(name),
+ this.clearedFieldMetaCache[name] = {
+ field: this.fieldsStore.getField(name),
+ meta: fieldMeta,
+ }
+ this.clearField(name)
}
- this.clearField(name)
delete this.domFields[name]
return
}
@@ -401,9 +405,10 @@ function createBaseForm (option = {}, mixins = []) {
cleanUpUselessFields () {
const fieldList = this.fieldsStore.getAllFieldsName()
- const removedList = fieldList.filter(field => (
- !this.renderFields[field] && !this.domFields[field]
- ))
+ const removedList = fieldList.filter(field => {
+ const fieldMeta = this.fieldsStore.getFieldMeta(field)
+ return (!this.renderFields[field] && !this.domFields[field] && !fieldMeta.preserve)
+ })
if (removedList.length) {
removedList.forEach(this.clearField)
}
@@ -536,35 +541,52 @@ function createBaseForm (option = {}, mixins = []) {
},
validateFields (ns, opt, cb) {
- const { names, callback, options } = getParams(ns, opt, cb)
- const fieldNames = names
- ? this.fieldsStore.getValidFieldsFullName(names)
- : this.fieldsStore.getValidFieldsName()
- const fields = fieldNames
- .filter(name => {
- const fieldMeta = this.fieldsStore.getFieldMeta(name)
- return hasRules(fieldMeta.validate)
- }).map((name) => {
- const field = this.fieldsStore.getField(name)
- field.value = this.fieldsStore.getFieldValue(name)
- return field
- })
- if (!fields.length) {
- if (callback) {
- callback(null, this.fieldsStore.getFieldsValue(fieldNames))
+ const pending = new Promise((resolve, reject) => {
+ const { names, options } = getParams(ns, opt, cb)
+ let { callback } = getParams(ns, opt, cb)
+ if (!callback || typeof callback === 'function') {
+ const oldCb = callback
+ callback = (errors, values) => {
+ if (oldCb) {
+ oldCb(errors, values)
+ } else if (errors) {
+ reject({ errors, values })
+ } else {
+ resolve(values)
+ }
+ }
}
- return
- }
- if (!('firstFields' in options)) {
- options.firstFields = fieldNames.filter((name) => {
- const fieldMeta = this.fieldsStore.getFieldMeta(name)
- return !!fieldMeta.validateFirst
- })
- }
- this.validateFieldsInternal(fields, {
- fieldNames,
- options,
- }, callback)
+ const fieldNames = names
+ ? this.fieldsStore.getValidFieldsFullName(names)
+ : this.fieldsStore.getValidFieldsName()
+ const fields = fieldNames
+ .filter(name => {
+ const fieldMeta = this.fieldsStore.getFieldMeta(name)
+ return hasRules(fieldMeta.validate)
+ }).map((name) => {
+ const field = this.fieldsStore.getField(name)
+ field.value = this.fieldsStore.getFieldValue(name)
+ return field
+ })
+ if (!fields.length) {
+ if (callback) {
+ callback(null, this.fieldsStore.getFieldsValue(fieldNames))
+ }
+ return
+ }
+ if (!('firstFields' in options)) {
+ options.firstFields = fieldNames.filter((name) => {
+ const fieldMeta = this.fieldsStore.getFieldMeta(name)
+ return !!fieldMeta.validateFirst
+ })
+ }
+ this.validateFieldsInternal(fields, {
+ fieldNames,
+ options,
+ }, callback)
+ })
+ pending.catch((e) => e)
+ return pending
},
isSubmitting () {
diff --git a/components/vc-form/src/createFieldsStore.jsx b/components/vc-form/src/createFieldsStore.jsx
index b3511a383..58d3e06ce 100644
--- a/components/vc-form/src/createFieldsStore.jsx
+++ b/components/vc-form/src/createFieldsStore.jsx
@@ -159,7 +159,8 @@ class FieldsStore {
}
getNotCollectedFields () {
- return this.getValidFieldsName()
+ const fieldsName = this.getValidFieldsName()
+ return fieldsName
.filter(name => !this.fields[name])
.map(name => ({
name,
From 0aa764df51fa4f152ef42bebd662a39db888b94b Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Tue, 1 Jan 2019 16:44:48 +0800
Subject: [PATCH 06/63] feat: update form ts
---
types/form/form.d.ts | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/types/form/form.d.ts b/types/form/form.d.ts
index 522299521..956cd2a64 100644
--- a/types/form/form.d.ts
+++ b/types/form/form.d.ts
@@ -177,6 +177,13 @@ declare interface FieldDecoratorOptions {
* @type string
*/
valuePropName?: string;
+
+ /**
+ * Whether to keep the information of the child node all the time.
+ * @default false
+ * @type boolean
+ */
+ preserve?: boolean;
}
export interface WrappedFormUtils {
From 639547953cae32e2cad945abb72fd1dea9106f70 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Tue, 1 Jan 2019 21:19:50 +0800
Subject: [PATCH 07/63] feat: update vc-notification vc-pagination
---
components/vc-form/index.js | 2 +-
components/vc-input-number/src/index.js | 17 ++-
components/vc-menu/index.js | 2 +-
components/vc-notification/Notice.jsx | 11 +-
components/vc-notification/Notification.jsx | 4 +
components/vc-notification/demo/simple.jsx | 3 +
components/vc-notification/index.js | 2 +-
components/vc-pagination/Pager.jsx | 4 +
components/vc-pagination/Pagination.jsx | 136 ++++++++++++--------
components/vc-pagination/assets/index.less | 64 ++++++++-
components/vc-pagination/index.js | 2 +-
components/vc-pagination/locale/hi_IN.js | 15 +++
components/vc-pagination/locale/kn_IN.js | 15 +++
components/vc-pagination/locale/ro_RO.js | 15 +++
14 files changed, 221 insertions(+), 71 deletions(-)
create mode 100644 components/vc-pagination/locale/hi_IN.js
create mode 100644 components/vc-pagination/locale/kn_IN.js
create mode 100644 components/vc-pagination/locale/ro_RO.js
diff --git a/components/vc-form/index.js b/components/vc-form/index.js
index 160f2c58b..dda23d5a4 100644
--- a/components/vc-form/index.js
+++ b/components/vc-form/index.js
@@ -1,3 +1,3 @@
-// based on rc-form 2.2.6
+// based on rc-form 2.4.0
import { createForm, createFormField } from './src/'
export { createForm, createFormField }
diff --git a/components/vc-input-number/src/index.js b/components/vc-input-number/src/index.js
index e4ffdcb35..524e5be28 100755
--- a/components/vc-input-number/src/index.js
+++ b/components/vc-input-number/src/index.js
@@ -1,4 +1,4 @@
-// based on rc-input-number 4.3.1
+// based on rc-input-number 4.3.7
import PropTypes from '../../_util/vue-types'
import BaseMixin from '../../_util/BaseMixin'
import { initDefaultProps, hasProp, getOptionProps } from '../../_util/props-util'
@@ -73,6 +73,8 @@ const inputNumberProps = {
required: PropTypes.bool,
pattern: PropTypes.string,
decimalSeparator: PropTypes.string,
+ autoComplete: PropTypes.string,
+ title: PropTypes.string,
}
export default {
@@ -90,6 +92,7 @@ export default {
step: 1,
parser: defaultParser,
required: false,
+ autoComplete: 'off',
}),
data () {
let value
@@ -274,7 +277,7 @@ export default {
let val = value
if (val === '') {
val = ''
- } else if (!this.isNotCompleteNumber(val)) {
+ } else if (!this.isNotCompleteNumber(parseFloat(val, 10))) {
val = this.getValidValue(val)
} else {
val = this.sValue
@@ -583,7 +586,8 @@ export default {
},
},
render () {
- const { prefixCls, disabled, readOnly, useTouch } = this.$props
+ const { prefixCls, disabled, readOnly, useTouch, autoComplete,
+ upHandler, downHandler } = this.$props
const classes = classNames({
[prefixCls]: true,
[`${prefixCls}-disabled`]: disabled,
@@ -657,6 +661,7 @@ export default {
const contentProps = {
on: { mouseenter, mouseleave, mouseover, mouseout },
class: classes,
+ attrs: { title: this.$props.title },
}
const upHandlerProps = {
props: {
@@ -697,7 +702,7 @@ export default {
{this.childShow && (
-
+
{$slots.default}
{closable
diff --git a/components/vc-notification/Notification.jsx b/components/vc-notification/Notification.jsx
index 6352044bd..bfffeed93 100644
--- a/components/vc-notification/Notification.jsx
+++ b/components/vc-notification/Notification.jsx
@@ -7,6 +7,9 @@ import createChainedFunction from '../_util/createChainedFunction'
import getTransitionProps from '../_util/getTransitionProps'
import Notice from './Notice'
+function noop () {
+}
+
let seed = 0
const now = Date.now()
@@ -91,6 +94,7 @@ const Notification = {
},
on: {
close,
+ click: notice.onClick || noop,
},
style,
class: className,
diff --git a/components/vc-notification/demo/simple.jsx b/components/vc-notification/demo/simple.jsx
index 0f3036fd0..9f64ba175 100644
--- a/components/vc-notification/demo/simple.jsx
+++ b/components/vc-notification/demo/simple.jsx
@@ -35,6 +35,9 @@ function closableFn () {
onClose () {
console.log('closable close')
},
+ onClick () {
+ console.log('clicked!!!')
+ },
closable: true,
})
}
diff --git a/components/vc-notification/index.js b/components/vc-notification/index.js
index a30798b2a..c90aca1bd 100644
--- a/components/vc-notification/index.js
+++ b/components/vc-notification/index.js
@@ -1,3 +1,3 @@
-// based on rc-notification 3.2.0
+// based on rc-notification 3.3.0
import Notification from './Notification'
export default Notification
diff --git a/components/vc-pagination/Pager.jsx b/components/vc-pagination/Pager.jsx
index e8903871b..bda79157f 100644
--- a/components/vc-pagination/Pager.jsx
+++ b/components/vc-pagination/Pager.jsx
@@ -42,6 +42,10 @@ export default {
cls = `${cls} ${prefixCls}-active`
}
+ if (!page) {
+ cls = `${cls} ${prefixCls}-disabled`
+ }
+
return (
-
Date: Tue, 1 Jan 2019 22:30:06 +0800
Subject: [PATCH 08/63] feat: update vc-table vc-upload
---
components/_util/Dom/addEventListener.js | 4 ++--
components/upload/Upload.jsx | 2 ++
components/vc-table/index.js | 2 +-
components/vc-table/src/ExpandableTable.jsx | 18 ++++++++++++++-
components/vc-table/src/utils.js | 25 +++++++++++++++------
components/vc-upload/src/AjaxUploader.jsx | 8 +++++--
components/vc-upload/src/Upload.jsx | 2 ++
7 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/components/_util/Dom/addEventListener.js b/components/_util/Dom/addEventListener.js
index 2c4c3eec3..4ea8998c8 100644
--- a/components/_util/Dom/addEventListener.js
+++ b/components/_util/Dom/addEventListener.js
@@ -1,5 +1,5 @@
import addDOMEventListener from 'add-dom-event-listener'
-export default function addEventListenerWrap (target, eventType, cb) {
- return addDOMEventListener(target, eventType, cb)
+export default function addEventListenerWrap (target, eventType, cb, option) {
+ return addDOMEventListener(target, eventType, cb, option)
}
diff --git a/components/upload/Upload.jsx b/components/upload/Upload.jsx
index 9bbba11c3..28951e0e3 100644
--- a/components/upload/Upload.jsx
+++ b/components/upload/Upload.jsx
@@ -14,6 +14,7 @@ import { T, fileToObject, genPercentAdd, getFileItem, removeFileItem } from './u
export { UploadProps }
export default {
+ inheritAttrs: false,
name: 'AUpload',
Dragger: Dragger,
mixins: [BaseMixin],
@@ -231,6 +232,7 @@ export default {
},
ref: 'uploadRef',
class: `${prefixCls}-btn`,
+ attrs: this.$attrs,
}
const uploadList = showUploadList ? (
diff --git a/components/vc-table/index.js b/components/vc-table/index.js
index 4c63ad528..05a2a08dc 100644
--- a/components/vc-table/index.js
+++ b/components/vc-table/index.js
@@ -1,4 +1,4 @@
-// base rc-table 6.4.0
+// base rc-table 6.4.2
import T from './src/Table'
import Column from './src/Column'
import ColumnGroup from './src/ColumnGroup'
diff --git a/components/vc-table/src/ExpandableTable.jsx b/components/vc-table/src/ExpandableTable.jsx
index 45a53374b..4947ee494 100644
--- a/components/vc-table/src/ExpandableTable.jsx
+++ b/components/vc-table/src/ExpandableTable.jsx
@@ -1,6 +1,7 @@
import PropTypes from '../../_util/vue-types'
import BaseMixin from '../../_util/BaseMixin'
import { connect } from '../../_util/store'
+import shallowEqual from 'shallowequal'
import TableRow from './TableRow'
import { remove } from './utils'
import { initDefaultProps, getOptionProps } from '../../_util/props-util'
@@ -71,6 +72,12 @@ const ExpandableTable = {
})
return {}
},
+ mounted () {
+ this.handleUpdated()
+ },
+ updated () {
+ this.handleUpdated()
+ },
watch: {
expandedRowKeys (val) {
this.$nextTick(() => {
@@ -81,6 +88,10 @@ const ExpandableTable = {
},
},
methods: {
+ handleUpdated () {
+ // We should record latest expanded rows to avoid multiple rows remove cause `onExpandedRowsChange` trigger many times
+ this.latestExpandedRows = null
+ },
handleExpandChange (expanded, record, event, rowKey, destroy = false) {
if (event) {
event.preventDefault()
@@ -103,7 +114,12 @@ const ExpandableTable = {
if (!this.expandedRowKeys) {
this.store.setState({ expandedRowKeys })
}
- this.__emit('expandedRowsChange', expandedRowKeys)
+ // De-dup of repeat call
+ if (!this.latestExpandedRows || !shallowEqual(this.latestExpandedRows, expandedRowKeys)) {
+ this.latestExpandedRows = expandedRowKeys
+ this.__emit('expandedRowsChange', expandedRowKeys)
+ }
+
if (!destroy) {
this.__emit('expand', expanded, record)
}
diff --git a/components/vc-table/src/utils.js b/components/vc-table/src/utils.js
index 8263c7eb6..98e0d4a04 100644
--- a/components/vc-table/src/utils.js
+++ b/components/vc-table/src/utils.js
@@ -1,6 +1,7 @@
import warning from 'warning'
-let scrollbarSize
+let scrollbarVerticalSize
+let scrollbarHorizontalSize
// Measure scrollbar width for padding body during modal show/hide
const scrollbarMeasure = {
@@ -15,24 +16,34 @@ export function measureScrollbar (direction = 'vertical') {
if (typeof document === 'undefined' || typeof window === 'undefined') {
return 0
}
- if (scrollbarSize) {
- return scrollbarSize
+ const isVertical = direction === 'vertical'
+ if (isVertical && scrollbarVerticalSize) {
+ return scrollbarVerticalSize
+ } else if (!isVertical && scrollbarHorizontalSize) {
+ return scrollbarHorizontalSize
}
const scrollDiv = document.createElement('div')
Object.keys(scrollbarMeasure).forEach(scrollProp => {
scrollDiv.style[scrollProp] = scrollbarMeasure[scrollProp]
})
+ // Append related overflow style
+ if (isVertical) {
+ scrollDiv.style.overflowY = 'scroll'
+ } else {
+ scrollDiv.style.overflowX = 'scroll'
+ }
document.body.appendChild(scrollDiv)
let size = 0
- if (direction === 'vertical') {
+ if (isVertical) {
size = scrollDiv.offsetWidth - scrollDiv.clientWidth
- } else if (direction === 'horizontal') {
+ scrollbarVerticalSize = size
+ } else if (!isVertical) {
size = scrollDiv.offsetHeight - scrollDiv.clientHeight
+ scrollbarHorizontalSize = size
}
document.body.removeChild(scrollDiv)
- scrollbarSize = size
- return scrollbarSize
+ return size
}
export function debounce (func, wait, immediate) {
diff --git a/components/vc-upload/src/AjaxUploader.jsx b/components/vc-upload/src/AjaxUploader.jsx
index 991df58d3..bdc7c6802 100644
--- a/components/vc-upload/src/AjaxUploader.jsx
+++ b/components/vc-upload/src/AjaxUploader.jsx
@@ -35,6 +35,7 @@ const upLoadPropTypes = {
}
const AjaxUploader = {
+ inheritAttrs: false,
name: 'ajaxUploader',
mixins: [BaseMixin],
props: upLoadPropTypes,
@@ -184,9 +185,11 @@ const AjaxUploader = {
this.abort()
},
render () {
+ const { $props, $attrs } = this
const {
- componentTag: Tag, prefixCls, disabled, multiple, accept, directory, openFileDialogOnClick,
- } = this.$props
+ componentTag: Tag, prefixCls, disabled,
+ multiple, accept, directory, openFileDialogOnClick,
+ } = $props
const cls = classNames({
[prefixCls]: true,
[`${prefixCls}-disabled`]: disabled,
@@ -213,6 +216,7 @@ const AjaxUploader = {
{...tagProps}
>
Date: Wed, 2 Jan 2019 11:03:46 +0800
Subject: [PATCH 09/63] feat: update comment
---
.../__tests__/__snapshots__/demo.test.js.snap | 4 +-
components/comment/demo/basic.md | 4 +-
components/comment/demo/editor.md | 2 +-
components/comment/demo/list.md | 2 +-
components/comment/demo/nested.md | 68 +++++++------------
components/comment/index.en-US.md | 3 +-
components/comment/index.jsx | 14 ++--
components/comment/index.zh-CN.md | 3 +-
8 files changed, 39 insertions(+), 61 deletions(-)
diff --git a/components/comment/__tests__/__snapshots__/demo.test.js.snap b/components/comment/__tests__/__snapshots__/demo.test.js.snap
index 6ebcdcd34..038341bed 100644
--- a/components/comment/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/comment/__tests__/__snapshots__/demo.test.js.snap
@@ -68,7 +68,7 @@ exports[`renders ./components/comment/demo/list.md correctly 1`] = `
-
+
@@ -86,7 +86,7 @@ exports[`renders ./components/comment/demo/list.md correctly 1`] = `
+
`;
@@ -7502,7 +9674,39 @@ exports[`Locale Provider should display the text as ku-iq 1`] = `
We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and efficiently.
-
+
diff --git a/components/comment/demo/basic.md b/components/comment/demo/basic.md
index d851d211f..455f774da 100644
--- a/components/comment/demo/basic.md
+++ b/components/comment/demo/basic.md
@@ -20,7 +20,7 @@ A basic comment with author, avatar, time and actions.
@click="like"
/>
-
+
{{likes}}
@@ -32,7 +32,7 @@ A basic comment with author, avatar, time and actions.
@click="dislike"
/>
-
+
{{dislikes}}
diff --git a/components/comment/demo/editor.md b/components/comment/demo/editor.md
index 6fd229342..d2855251d 100644
--- a/components/comment/demo/editor.md
+++ b/components/comment/demo/editor.md
@@ -35,7 +35,7 @@ Comment can be used as editor, user can customize the editor component.
/>
-
{{action}}
+
{{item.datetime.fromNow()}}
diff --git a/components/comment/demo/nested.md b/components/comment/demo/nested.md
index 4f28249e5..d8544d8b7 100644
--- a/components/comment/demo/nested.md
+++ b/components/comment/demo/nested.md
@@ -11,61 +11,41 @@ Comments can be nested.
```html
-
- Reply to
-
-
- Han Solo
-
-
+ Reply to
+ Han Solo
+
+ Reply to
+ Han Solo
-
-
- Reply to
-
-
- Han Solo
-
-
+
+ Reply to
+ Han Solo
-
-
- Reply to
-
-
- Han Solo
-
-
-
-
- Reply to
-
-
- Han Solo
-
-
-
diff --git a/components/comment/index.en-US.md b/components/comment/index.en-US.md
index 6c66ecbb9..ecde03e86 100644
--- a/components/comment/index.en-US.md
+++ b/components/comment/index.en-US.md
@@ -2,9 +2,8 @@
| Property | Description | Type | Default |
| -------- | ----------- | ---- | ------- |
-| actions | List of action items rendered below the comment content | Array | slot | - |
+| actions | List of action items rendered below the comment content | Array \| slot | - |
| author | The element to display as the comment author | string\|slot | - |
| avatar | The element to display as the comment avatar - generally an antd `Avatar` or src | string\|slot | - |
-| children | Nested comments should be provided as children of the Comment | slot | - |
| content | The main content of the comment | string\|slot | - |
| datetime | A datetime element containing the time to be displayed | string\|slot | - |
diff --git a/components/comment/index.jsx b/components/comment/index.jsx
index 0d9ffd1ff..5e19f27be 100644
--- a/components/comment/index.jsx
+++ b/components/comment/index.jsx
@@ -32,7 +32,7 @@ const Comment = {
renderNested (children) {
const { prefixCls } = this.$props
- return
- We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and efficiently.
{{item.content}}
-We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
+We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
-We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
+We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
-We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure).
{children}
+ return {children}
},
},
@@ -41,11 +41,11 @@ const Comment = {
prefixCls,
} = this.$props
- const actions = this.$props.actions || getComponentFromProp(this, 'actions')
- const author = this.$props.author || getComponentFromProp(this, 'author')
- const avatar = this.$props.avatar || getComponentFromProp(this, 'avatar')
- const content = this.$props.content || getComponentFromProp(this, 'content')
- const datetime = this.$props.datetime || getComponentFromProp(this, 'datetime')
+ const actions = getComponentFromProp(this, 'actions')
+ const author = getComponentFromProp(this, 'author')
+ const avatar = getComponentFromProp(this, 'avatar')
+ const content = getComponentFromProp(this, 'content')
+ const datetime = getComponentFromProp(this, 'datetime')
const avatarDom = (
@@ -81,7 +81,7 @@ const Comment = {
)
const children = this.$slots.default
return (
-
+
+
`;
@@ -7135,7 +9275,39 @@ exports[`Locale Provider should display the text as ko 1`] = `
{comment}
{children ? this.renderNested(children) : null}
diff --git a/components/comment/index.zh-CN.md b/components/comment/index.zh-CN.md
index c6f3e8efe..b7455b5b0 100644
--- a/components/comment/index.zh-CN.md
+++ b/components/comment/index.zh-CN.md
@@ -2,9 +2,8 @@
| Property | Description | Type | Default |
| -------- | ----------- | ---- | ------- |
-| actions | 在评论内容下面呈现的操作项列表 | Array|slot | - |
+| actions | 在评论内容下面呈现的操作项列表 | Array\|slot | - |
| author | 要显示为注释作者的元素 | string\|slot | - |
| avatar | 要显示为评论头像的元素 - 通常是 antd `Avatar` 或者src | string\|slot | - |
-| children | 嵌套注释应作为注释的子项提供 | slot | - |
| content | 评论的主要内容 | string\|slot | - |
| datetime | 展示时间描述 | string\|slot | - |
From 1ba0b84cddb75b814f8b190fa409a8b5b8d4652a Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Wed, 2 Jan 2019 11:04:38 +0800
Subject: [PATCH 10/63] fix: drawer class
---
.../__snapshots__/Drawer.test.js.snap | 12 ++++++------
.../__snapshots__/DrawerEvent.test.js.snap | 2 +-
components/drawer/index.jsx | 18 +++++++-----------
.../__tests__/__snapshots__/demo.test.js.snap | 2 +-
components/vc-drawer/src/Drawer.js | 4 +++-
components/vc-drawer/src/drawerProps.js | 1 +
tests/__snapshots__/index.test.js.snap | 1 +
7 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/components/drawer/__tests__/__snapshots__/Drawer.test.js.snap b/components/drawer/__tests__/__snapshots__/Drawer.test.js.snap
index 688d5207a..4bbd01d5d 100644
--- a/components/drawer/__tests__/__snapshots__/Drawer.test.js.snap
+++ b/components/drawer/__tests__/__snapshots__/Drawer.test.js.snap
@@ -1,7 +1,7 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP
exports[`Drawer class is test_drawer 1`] = `
-
+
-
@@ -16,7 +16,7 @@ exports[`Drawer class is test_drawer 1`] = `
`;
exports[`Drawer closable is false 1`] = `
-
+
`;
@@ -6768,7 +8876,39 @@ exports[`Locale Provider should display the text as ja 1`] = `
+
-
@@ -31,7 +31,7 @@ exports[`Drawer closable is false 1`] = `
`;
exports[`Drawer destroyOnClose is true 1`] = `
-
+
`;
@@ -6401,7 +8477,39 @@ exports[`Locale Provider should display the text as it 1`] = `
+
-
@@ -46,7 +46,7 @@ exports[`Drawer destroyOnClose is true 1`] = `
`;
exports[`Drawer have a title 1`] = `
-
+
+`;
+
+exports[`Locale Provider should display the text as he 1`] = `
+
+
-
@@ -64,7 +64,7 @@ exports[`Drawer have a title 1`] = `
`;
exports[`Drawer render correctly 1`] = `
-
+
`;
@@ -5667,7 +6482,1236 @@ exports[`Locale Provider should display the text as fr 2`] = `
+
-
@@ -79,7 +79,7 @@ exports[`Drawer render correctly 1`] = `
`;
exports[`Drawer render top drawer 1`] = `
-
+
`;
@@ -5300,7 +6083,39 @@ exports[`Locale Provider should display the text as fr 1`] = `
+
-
diff --git a/components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap b/components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap
index efd6a7c4e..7b7a6091f 100644
--- a/components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap
+++ b/components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap
@@ -2,7 +2,7 @@
exports[`Drawer render correctly 1`] = `
+
`;
@@ -4933,7 +5684,39 @@ exports[`Locale Provider should display the text as fi 1`] = `
-
-
+
~
`;
exports[`renders ./components/date-picker/demo/time.md correctly 1`] = `
diff --git a/components/date-picker/createPicker.js b/components/date-picker/createPicker.js
index d74f49fd2..8a3ed7efc 100644
--- a/components/date-picker/createPicker.js
+++ b/components/date-picker/createPicker.js
@@ -92,7 +92,6 @@ export default function createPicker (TheCalendar, props) {
})
}
this.$emit('change', value, (value && value.format(this.format)) || '')
- this.focus()
},
handleCalendarChange (value) {
@@ -104,6 +103,9 @@ export default function createPicker (TheCalendar, props) {
this.setState({ _open: open })
}
this.$emit('openChange', open)
+ if (!open) {
+ this.focus()
+ }
},
focus () {
this.$refs.input.focus()
diff --git a/components/date-picker/index.en-US.md b/components/date-picker/index.en-US.md
index 03c19035a..290c69eb9 100644
--- a/components/date-picker/index.en-US.md
+++ b/components/date-picker/index.en-US.md
@@ -80,7 +80,7 @@ The following APIs are shared by DatePicker, MonthPicker, RangePicker, WeekPicke
| -------- | ----------- | ---- | ------- |
| defaultValue | to set default date | [moment](http://momentjs.com/) | - |
| defaultPickerValue | to set default picker date | [moment](http://momentjs.com/) | - |
-| format | to set the date format, refer to [moment.js](http://momentjs.com/) | string | "YYYY-MM" |
+| format | to set the date format. When an array is provided, all values are used for parsing and first value for display. refer to [moment.js](http://momentjs.com/) | string \| string[] | "YYYY-MM" |
| monthCellContentRender | Custom month cell content render method by setting a scoped slot | slot="monthCellContentRender" slot-scope="date, locale" | - |
| renderExtraFooter | render extra footer in panel by setting a scoped slot | slot="renderExtraFooter" | - |
| value(v-model) | to set date | [moment](http://momentjs.com/) | - |
@@ -110,18 +110,18 @@ The following APIs are shared by DatePicker, MonthPicker, RangePicker, WeekPicke
| -------- | ----------- | ---- | ------- |
| defaultValue | to set default date | [moment](http://momentjs.com/)\[] | - |
| defaultPickerValue | to set default picker date | [moment](http://momentjs.com/)\[] | - |
-| disabledTime | to specify the time that cannot be selected | function(dates: [moment, moment], partial: `'start'|'end'`) | - |
+| disabledTime | to specify the time that cannot be selected | function(dates: \[moment, moment\], partial: `'start'|'end'`) | - |
| format | to set the date format | string | "YYYY-MM-DD HH:mm:ss" |
| ranges | preseted ranges for quick selection | { \[range: string]: [moment](http://momentjs.com/)\[] } \| { \[range: string]: () => [moment](http://momentjs.com/)\[] } | - |
| renderExtraFooter | render extra footer in panel by setting a scoped slot| slot="renderExtraFooter" | - |
| showTime | to provide an additional time selection | object\|boolean | [TimePicker Options](/ant-design-vue/components/time-picker/#API) |
-| showTime.defaultValue | to set default time of selected date, [demo](https://ant.design/components/date-picker/#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/)\[] | [moment(), moment()] |
+| showTime.defaultValue | to set default time of selected date, [demo](https://ant.design/components/date-picker/#components-date-picker-demo-disabled-date) | [moment](http://momentjs.com/)\[] | \[moment(), moment()] |
| value(v-model) | to set date | \[[moment](http://momentjs.com/), [moment](http://momentjs.com/)] | - |
### RangePicker Events
| Events Name | Description | Arguments |
| --- | --- | --- |
-| calendarChange | a callback function, can be executed when the start time or the end time of the range is changing | function(dates: [moment, moment], dateStrings: [string, string]) |
+| calendarChange | a callback function, can be executed when the start time or the end time of the range is changing | function(dates: \[moment, moment], dateStrings: \[string, string]) |
| change | a callback function, can be executed when the selected time is changing | function(dates: [moment, moment], dateStrings: [string, string]) |
-| ok | callback when click ok button | function() |
+| ok | callback when click ok button | function(dates: [moment](http://momentjs.com/)\[]) |
diff --git a/components/date-picker/index.zh-CN.md b/components/date-picker/index.zh-CN.md
index 0df00d03c..a1cd98787 100644
--- a/components/date-picker/index.zh-CN.md
+++ b/components/date-picker/index.zh-CN.md
@@ -60,7 +60,7 @@ moment.locale('zh-cn');
| defaultValue | 默认日期 | [moment](http://momentjs.com/) | 无 |
| defaultPickerValue | 默认面板日期 | [moment](http://momentjs.com/) | 无 |
| disabledTime | 不可选择的时间 | function(date) | 无 |
-| format | 展示的日期格式，配置参考 [moment.js](http://momentjs.com/) | string | "YYYY-MM-DD" |
+| format | 设置日期格式，为数组时支持多格式匹配，展示以第一个为准。配置参考 [moment.js](http://momentjs.com/) | string \| string[] | "YYYY-MM-DD" |
| renderExtraFooter | 在面板中添加额外的页脚 | slot="renderExtraFooter" | - |
| showTime | 增加时间选择功能 | Object\|boolean | [TimePicker Options](/ant-design-vue/components/time-picker-cn/#API) |
| showTime.defaultValue | 设置用户选择日期时默认的时分秒 | [moment](http://momentjs.com/) | moment() |
@@ -112,19 +112,19 @@ moment.locale('zh-cn');
| --- | --- | --- | --- |
| defaultValue | 默认日期 | [moment](http://momentjs.com/)\[] | 无 |
| defaultPickerValue | 默认面板日期 | [moment](http://momentjs.com/)\[] | 无 |
-| disabledTime | 不可选择的时间 | function(dates: [moment, moment], partial: `'start'|'end'`) | 无 |
+| disabledTime | 不可选择的时间 | function(dates: \[moment, moment\], partial: `'start'|'end'`) | 无 |
| format | 展示的日期格式 | string | "YYYY-MM-DD HH:mm:ss" |
| ranges | 预设时间范围快捷选择 | { \[range: string]: [moment](http://momentjs.com/)\[] } \| { \[range: string]: () => [moment](http://momentjs.com/)\[] } | 无 |
| renderExtraFooter | 在面板中添加额外的页脚 | slot="renderExtraFooter" | - |
| showTime | 增加时间选择功能 | Object\|boolean | [TimePicker Options](/ant-design-vue/components/time-picker-cn/#API) |
-| showTime.defaultValue | 设置用户选择日期时默认的时分秒 | [moment](http://momentjs.com/)\[] | [moment(), moment()] |
+| showTime.defaultValue | 设置用户选择日期时默认的时分秒 | [moment](http://momentjs.com/)\[] | \[moment(), moment()] |
| value(v-model) | 日期 | [moment](http://momentjs.com/)\[] | 无 |
### RangePicker事件
| 事件名称 | 说明 | 回调参数 |
| --- | --- | --- |
-| calendarChange | 待选日期发生变化的回调 | function(dates: [moment, moment], dateStrings: [string, string]) |
-| change | 日期范围发生变化的回调 | function(dates: [moment, moment], dateStrings: [string, string]) | 无 |
-| ok | 点击确定按钮的回调 | function() |
+| calendarChange | 待选日期发生变化的回调 | function(dates: \[moment, moment\], dateStrings: \[string, string\]) |
+| change | 日期范围发生变化的回调 | function(dates: \[moment, moment\], dateStrings: \[string, string\]) | 无 |
+| ok | 点击确定按钮的回调 | function(dates: [moment](http://momentjs.com/)\[]) |
diff --git a/components/date-picker/interface.js b/components/date-picker/interface.js
index 42b1a37c2..b759a6b63 100644
--- a/components/date-picker/interface.js
+++ b/components/date-picker/interface.js
@@ -13,7 +13,7 @@ export const PickerProps = () => ({
transitionName: PropTypes.string,
prefixCls: PropTypes.string,
inputPrefixCls: PropTypes.string,
- format: PropTypes.string,
+ format: PropTypes.oneOfType([PropTypes.string, PropTypes.array]),
disabled: PropTypes.bool,
allowClear: PropTypes.bool,
suffixIcon: PropTypes.any,
diff --git a/components/date-picker/locale/da_DK.js b/components/date-picker/locale/da_DK.js
new file mode 100644
index 000000000..ce506b97f
--- /dev/null
+++ b/components/date-picker/locale/da_DK.js
@@ -0,0 +1,19 @@
+import CalendarLocale from '../../vc-calendar/src/locale/da_DK'
+import TimePickerLocale from '../../time-picker/locale/da_DK'
+
+// Merge into a locale object
+const locale = {
+ lang: {
+ placeholder: 'Vælg dato',
+ rangePlaceholder: ['Startdato', 'Slutdato'],
+ ...CalendarLocale,
+ },
+ timePickerLocale: {
+ ...TimePickerLocale,
+ },
+}
+
+// All settings at:
+// https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json
+
+export default locale
diff --git a/components/date-picker/locale/he_IL.js b/components/date-picker/locale/he_IL.js
new file mode 100644
index 000000000..d0df808d8
--- /dev/null
+++ b/components/date-picker/locale/he_IL.js
@@ -0,0 +1,19 @@
+import CalendarLocale from '../../vc-calendar/src/locale/he_IL'
+import TimePickerLocale from '../../time-picker/locale/he_IL'
+
+// Merge into a locale object
+const locale = {
+ lang: {
+ placeholder: 'בחר תאריך',
+ rangePlaceholder: ['תאריך התחלה', 'תאריך סיום'],
+ ...CalendarLocale,
+ },
+ timePickerLocale: {
+ ...TimePickerLocale,
+ },
+}
+
+// All settings at:
+// https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json
+
+export default locale
diff --git a/components/date-picker/locale/hu_HU.js b/components/date-picker/locale/hu_HU.js
new file mode 100644
index 000000000..189819675
--- /dev/null
+++ b/components/date-picker/locale/hu_HU.js
@@ -0,0 +1,19 @@
+import CalendarLocale from '../../vc-calendar/src/locale/hu_HU'
+import TimePickerLocale from '../../time-picker/locale/hu_HU'
+
+// Merge into a locale object
+const locale = {
+ lang: {
+ placeholder: 'Válasszon dátumot',
+ rangePlaceholder: ['Kezdő dátum', 'Befejezés dátuma'],
+ ...CalendarLocale,
+ },
+ timePickerLocale: {
+ ...TimePickerLocale,
+ },
+}
+
+// All settings at:
+// https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json
+
+export default locale
diff --git a/components/date-picker/locale/id_ID.js b/components/date-picker/locale/id_ID.js
new file mode 100644
index 000000000..46c76de7c
--- /dev/null
+++ b/components/date-picker/locale/id_ID.js
@@ -0,0 +1,19 @@
+import CalendarLocale from '../../vc-calendar/src/locale/id_ID'
+import TimePickerLocale from '../../time-picker/locale/id_ID'
+
+// Merge into a locale object
+const locale = {
+ lang: {
+ placeholder: 'Pilih tanggal',
+ rangePlaceholder: ['Mulai tanggal', 'Tanggal akhir'],
+ ...CalendarLocale,
+ },
+ timePickerLocale: {
+ ...TimePickerLocale,
+ },
+}
+
+// All settings at:
+// https://github.com/ant-design/ant-design/blob/master/components/date-picker/locale/example.json
+
+export default locale
From 9ecc5e1855a46895c6ab62367eb53caf3222ff12 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Wed, 2 Jan 2019 20:21:01 +0800
Subject: [PATCH 15/63] feat: checkbox group support custom label
---
components/checkbox/Group.jsx | 8 ++++++--
components/checkbox/demo/group.md | 6 ++++--
components/checkbox/index.en-US.md | 2 +-
components/checkbox/index.zh-CN.md | 2 +-
4 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/components/checkbox/Group.jsx b/components/checkbox/Group.jsx
index 4e2e8c989..fe993ef01 100644
--- a/components/checkbox/Group.jsx
+++ b/components/checkbox/Group.jsx
@@ -44,7 +44,7 @@ export default {
},
methods: {
getOptions () {
- const { options } = this.$props
+ const { options, $scopedSlots } = this
return options.map(option => {
if (typeof option === 'string') {
return {
@@ -52,7 +52,11 @@ export default {
value: option,
}
}
- return option
+ let label = option.label
+ if (label === undefined && $scopedSlots.label) {
+ label = $scopedSlots.label(option)
+ }
+ return { ...option, label }
})
},
toggleOption (option) {
diff --git a/components/checkbox/demo/group.md b/components/checkbox/demo/group.md
index eb6c696af..19b3b5498 100644
--- a/components/checkbox/demo/group.md
+++ b/components/checkbox/demo/group.md
@@ -17,7 +17,9 @@ Generate a group of checkboxes from an array
-
+ {{value}}
+
+```
diff --git a/components/drawer/demo/index.vue b/components/drawer/demo/index.vue
index 15c24c5ea..c1db9a4a6 100644
--- a/components/drawer/demo/index.vue
+++ b/components/drawer/demo/index.vue
@@ -3,7 +3,7 @@ import BasicRight from './basic-right'
import Placement from './placement'
import UserProfile from './user-profile'
import MultiLevelDrawer from './multi-level-drawer'
-import FromDrawer from './from-drawer'
+import FormInDrawer from './form-in-drawer'
// import CustomPaging from './customPaging'
// import CustomArrows from './customArrows'
@@ -50,7 +50,7 @@ export default {
diff --git a/components/drawer/index.en-US.md b/components/drawer/index.en-US.md
index dfb85c722..8a62179ec 100644
--- a/components/drawer/index.en-US.md
+++ b/components/drawer/index.en-US.md
@@ -5,16 +5,16 @@
| --- | --- | --- | --- |
| closable | Whether a close (x) button is visible on top right of the Drawer dialog or not. | boolean | true |
| destroyOnClose | Whether to unmount child components on closing drawer or not. | boolean | false |
-| getContainer | Return the mounted node for Drawer. | HTMLElement \| `() => HTMLElement` \| selectors | 'body' |
+| getContainer | Return the mounted node for Drawer. | HTMLElement \| `() => HTMLElement` \| Selectors | 'body' |
| mask | Whether to show mask or not. | Boolean | true |
| maskClosable | Clicking on the mask (area outside the Drawer) to close the Drawer or not. | boolean | true |
| maskStyle | Style for Drawer's mask element. | object | {} |
| title | The title for Drawer. | string\|slot | - |
| visible | Whether the Drawer dialog is visible or not. | boolean | false |
| wrapClassName | The class name of the container of the Drawer dialog. | string | - |
+| wrapStyle | The style of the container of the Drawer dialog. | object | - |
| width | Width of the Drawer dialog. | string\|number | 256 |
| height | placement is `top` or `bottom`, height of the Drawer dialog. | string\|number | - |
-| className | The class name of the container of the Drawer dialog. | string | - |
| zIndex | The `z-index` of the Drawer. | Number | 1000 |
| placement | The placement of the Drawer. | 'top' \| 'right' \| 'bottom' \| 'left' | 'right' |
diff --git a/components/drawer/index.zh-CN.md b/components/drawer/index.zh-CN.md
index cc92a0d09..c0885d2fc 100644
--- a/components/drawer/index.zh-CN.md
+++ b/components/drawer/index.zh-CN.md
@@ -4,13 +4,14 @@
| --- | --- | --- | --- |
| closable | 是否显示右上角的关闭按钮 | boolean | true |
| destroyOnClose | 关闭时销毁 Drawer 里的子元素 | boolean | false |
-| getContainer | 指定 Drawer 挂载的 HTML 节点 | HTMLElement \| `() => HTMLElement` \| selectors | 'body' |
+| getContainer | 指定 Drawer 挂载的 HTML 节点 | HTMLElement \| `() => HTMLElement` \| Selectors | 'body' |
| maskClosable | 点击蒙层是否允许关闭 | boolean | true |
| mask | 是否展示遮罩 | Boolean | true |
| maskStyle | 遮罩样式 | object | {} |
| title | 标题 | string \| slot | - |
| visible | Drawer 是否可见 | boolean | - |
| wrapClassName | 对话框外层容器的类名 | string | - |
+| wrapStyle | 对话框外层容器的`style` | object | - |
| width | 宽度 | string \| number | 256 |
| height | 高度, 在 `placement` 为 `top` 或 `bottom` 时使用 | string \| number | 256 |
| zIndex | 设置 Drawer 的 `z-index` | Number | 1000 |
From 5cd17e0388075bd7f7b3eb484b41c606649db30d Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Wed, 2 Jan 2019 20:22:45 +0800
Subject: [PATCH 17/63] feat: update ts
---
types/avatar.d.ts | 6 ++++++
types/checkbox/checkbox-group.d.ts | 2 +-
types/date-picker/month-picker.d.ts | 6 +++---
types/drawer.d.ts | 12 ++++++------
types/dropdown/dropdown.d.ts | 12 ++++++++++++
5 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/types/avatar.d.ts b/types/avatar.d.ts
index b9c33fe34..2c5ca5bf5 100644
--- a/types/avatar.d.ts
+++ b/types/avatar.d.ts
@@ -31,6 +31,12 @@ export declare class Avatar extends AntdComponent {
*/
src: string;
+ /**
+ * a list of sources to use for different screen resolutions
+ * @type string
+ */
+ srcSet: string;
+
/**
* This attribute defines the alternative text describing the image
* @type string
diff --git a/types/checkbox/checkbox-group.d.ts b/types/checkbox/checkbox-group.d.ts
index d5ac504b1..601ca9d01 100644
--- a/types/checkbox/checkbox-group.d.ts
+++ b/types/checkbox/checkbox-group.d.ts
@@ -19,7 +19,7 @@ export declare class CheckboxGroup extends AntdComponent {
disabled: boolean;
/**
- * Specifies options
+ * Specifies options, you can customize `label` with slot = "label" slot-scope = "option"
* @type Array
*/
options: Array<
diff --git a/types/date-picker/month-picker.d.ts b/types/date-picker/month-picker.d.ts
index 0f84540ab..0b2b18cbd 100644
--- a/types/date-picker/month-picker.d.ts
+++ b/types/date-picker/month-picker.d.ts
@@ -19,12 +19,12 @@ export declare class MonthPicker extends DatepickerCommon {
defaultPickerValue: Moment;
/**
- * to set the date format, refer to moment.js
+ * to set the date format, When an array is provided, all values are used for parsing and first value for display. refer to moment.js
* @default 'YYYY-MM'
- * @type string
+ * @type string | string[]
* @see http://momentjs.com
*/
- format: string;
+ format: string | string[];
/**
* Custom month cell content render method by setting a scoped slot
diff --git a/types/drawer.d.ts b/types/drawer.d.ts
index f752ed2a1..223bf96e5 100644
--- a/types/drawer.d.ts
+++ b/types/drawer.d.ts
@@ -66,6 +66,12 @@ export declare class Drawer extends AntdComponent {
*/
wrapClassName: string;
+ /**
+ * The style of the container of the Drawer dialog.
+ * @type object
+ */
+ wrapStyle: object;
+
/**
* Width of the Drawer dialog.
* @default 256
@@ -79,12 +85,6 @@ export declare class Drawer extends AntdComponent {
*/
height: string | number;
- /**
- * The class name of the container of the Drawer dialog.
- * @type string
- */
- className: string;
-
/**
* The z-index of the Drawer.
* @default 1000
diff --git a/types/dropdown/dropdown.d.ts b/types/dropdown/dropdown.d.ts
index db7c4a1fb..3872c902d 100644
--- a/types/dropdown/dropdown.d.ts
+++ b/types/dropdown/dropdown.d.ts
@@ -22,6 +22,18 @@ export declare class Dropdown extends AntdComponent {
*/
overlay: Menu;
+ /**
+ * Class name of the dropdown root element
+ * @type string
+ */
+ overlayClassName: string;
+
+ /**
+ * Style of the dropdown root element
+ * @type object
+ */
+ overlayStyle: object;
+
/**
* whether the dropdown menu is visible
* @type boolean
From 9252b652c9c2837d15ac7238bffc4123844d6c93 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Wed, 2 Jan 2019 20:23:28 +0800
Subject: [PATCH 18/63] feat: calendar add da_DK he_IL hu_HU id_ID
---
components/calendar/locale/da_DK.js | 2 ++
components/calendar/locale/he_IL.js | 2 ++
components/calendar/locale/hu_HU.js | 2 ++
components/calendar/locale/id_ID.js | 2 ++
4 files changed, 8 insertions(+)
create mode 100644 components/calendar/locale/da_DK.js
create mode 100644 components/calendar/locale/he_IL.js
create mode 100644 components/calendar/locale/hu_HU.js
create mode 100644 components/calendar/locale/id_ID.js
diff --git a/components/calendar/locale/da_DK.js b/components/calendar/locale/da_DK.js
new file mode 100644
index 000000000..01f9b5333
--- /dev/null
+++ b/components/calendar/locale/da_DK.js
@@ -0,0 +1,2 @@
+import da_DK from '../../date-picker/locale/da_DK'
+export default da_DK
diff --git a/components/calendar/locale/he_IL.js b/components/calendar/locale/he_IL.js
new file mode 100644
index 000000000..b04226dcc
--- /dev/null
+++ b/components/calendar/locale/he_IL.js
@@ -0,0 +1,2 @@
+import he_IL from '../../date-picker/locale/he_IL'
+export default he_IL
diff --git a/components/calendar/locale/hu_HU.js b/components/calendar/locale/hu_HU.js
new file mode 100644
index 000000000..12326461c
--- /dev/null
+++ b/components/calendar/locale/hu_HU.js
@@ -0,0 +1,2 @@
+import hu_HU from '../../date-picker/locale/hu_HU'
+export default hu_HU
diff --git a/components/calendar/locale/id_ID.js b/components/calendar/locale/id_ID.js
new file mode 100644
index 000000000..39887f343
--- /dev/null
+++ b/components/calendar/locale/id_ID.js
@@ -0,0 +1,2 @@
+import id_ID from '../../date-picker/locale/id_ID'
+export default id_ID
From 8eaf6da73a4ee6c957e4daa0799b4761ada1ca54 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Wed, 2 Jan 2019 20:33:06 +0800
Subject: [PATCH 19/63] feat: dropdown add overlayClassName overlayStyle,
---
.../__tests__/__snapshots__/demo.test.js.snap | 2 +-
.../dropdown/__tests__/dropdown-button.test.js | 13 ++++++++++++-
components/dropdown/dropdown-button.jsx | 7 +++++--
components/dropdown/dropdown.jsx | 16 ++++++++++++++--
components/dropdown/getDropdownProps.js | 4 ++++
components/dropdown/index.en-US.md | 2 ++
components/dropdown/index.zh-CN.md | 2 ++
7 files changed, 40 insertions(+), 6 deletions(-)
diff --git a/components/dropdown/__tests__/__snapshots__/demo.test.js.snap b/components/dropdown/__tests__/__snapshots__/demo.test.js.snap
index e1a1adcbb..0e4efc93f 100644
--- a/components/dropdown/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/dropdown/__tests__/__snapshots__/demo.test.js.snap
@@ -14,7 +14,7 @@ exports[`renders ./components/dropdown/demo/dropdown-button.md correctly 1`] = `
-
diff --git a/components/drawer/index.jsx b/components/drawer/index.jsx
index 9a6054d12..dd6f83b9b 100644
--- a/components/drawer/index.jsx
+++ b/components/drawer/index.jsx
@@ -1,9 +1,10 @@
import warning from 'warning'
+import classnames from 'classnames'
import VcDrawer from '../vc-drawer/src'
import PropTypes from '../_util/vue-types'
import BaseMixin from '../_util/BaseMixin'
import Icon from '../icon'
-import { getComponentFromProp, getOptionProps, getClass } from '../_util/props-util'
+import { getComponentFromProp, getOptionProps } from '../_util/props-util'
const Drawer = {
name: 'ADrawer',
@@ -22,14 +23,10 @@ const Drawer = {
prefixCls: PropTypes.string.def('ant-drawer'),
placement: PropTypes.oneOf(['top', 'right', 'bottom', 'left']).def('right'),
level: PropTypes.any.def(null),
- wrapClassName: PropTypes.string,
+ wrapClassName: PropTypes.string, // not use class like react, vue will add class to root dom
},
mixins: [BaseMixin],
data () {
- warning(
- this.wrapClassName === undefined,
- 'wrapClassName is deprecated, please use className instead.',
- )
this.destoryClose = false
this.preVisible = this.$props.visible
return {
@@ -199,17 +196,16 @@ const Drawer = {
open: visible,
showMask: props.mask,
placement,
+ className: classnames({
+ [wrapClassName]: !!wrapClassName,
+ [haveMask]: !!haveMask,
+ }),
},
on: {
maskClick: this.onMaskClick,
...this.$listeners,
},
style: this.getRcDrawerStyle(),
- class: {
- [wrapClassName]: !!wrapClassName,
- ...getClass(this),
- [haveMask]: !!haveMask,
- },
}
return (
~
+
`;
@@ -67,7 +67,7 @@ exports[`renders ./components/date-picker/demo/start-end.md correctly 1`] = `
~
~
+
-
+
`;
exports[`renders ./components/date-picker/demo/disabled.md correctly 1`] = `
@@ -58,7 +58,7 @@ exports[`renders ./components/date-picker/demo/size.md correctly 1`] = `
+
diff --git a/components/vc-drawer/src/Drawer.js b/components/vc-drawer/src/Drawer.js
index 6e7c2f6c7..dc6f9f983 100644
--- a/components/vc-drawer/src/Drawer.js
+++ b/components/vc-drawer/src/Drawer.js
@@ -41,6 +41,7 @@ const Drawer = {
handler: true,
maskStyle: {},
wrapperClassName: '',
+ className: '',
}),
data () {
this.levelDom = []
@@ -367,6 +368,7 @@ const Drawer = {
},
getChildToRender (open) {
const {
+ className,
prefixCls,
placement,
handler,
@@ -379,7 +381,7 @@ const Drawer = {
const wrapperClassname = classnames(prefixCls, {
[`${prefixCls}-${placement}`]: true,
[`${prefixCls}-open`]: open,
- ...getClass(this),
+ [className]: !!className,
})
const isOpenChange = this.isOpenChange
const isHorizontal = placement === 'left' || placement === 'right'
diff --git a/components/vc-drawer/src/drawerProps.js b/components/vc-drawer/src/drawerProps.js
index d8088b53a..fabfb4555 100644
--- a/components/vc-drawer/src/drawerProps.js
+++ b/components/vc-drawer/src/drawerProps.js
@@ -17,4 +17,5 @@ export default {
handler: PropTypes.any,
showMask: PropTypes.bool,
maskStyle: PropTypes.object,
+ className: PropTypes.string,
}
diff --git a/tests/__snapshots__/index.test.js.snap b/tests/__snapshots__/index.test.js.snap
index 630b490cd..517bff8a6 100644
--- a/tests/__snapshots__/index.test.js.snap
+++ b/tests/__snapshots__/index.test.js.snap
@@ -58,6 +58,7 @@ Array [
"Upload",
"Drawer",
"Skeleton",
+ "Comment",
"default",
]
`;
From 05deb537f6c566f5f9a0bda1c741ae5a71b40a6e Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Wed, 2 Jan 2019 11:47:35 +0800
Subject: [PATCH 11/63] test: update datepicker test
---
components/date-picker/__tests__/showTime.test.js | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/components/date-picker/__tests__/showTime.test.js b/components/date-picker/__tests__/showTime.test.js
index 1c72997f6..6e364d972 100644
--- a/components/date-picker/__tests__/showTime.test.js
+++ b/components/date-picker/__tests__/showTime.test.js
@@ -1,5 +1,6 @@
import { mount } from '@vue/test-utils'
import { asyncExpect } from '@/tests/utils'
+import moment from 'moment'
import DatePicker from '../'
const { RangePicker } = DatePicker
@@ -34,7 +35,14 @@ describe('DatePicker with showTime', () => {
const onChangeFn = jest.fn()
const wrapper = mount({
render () {
- return
+
+````
+
+## API
+
+| Property | Description | Type | Default |
+| -------- | ----------- | ---- | ------- |
+| getPopupContainer | to set the container of the popup element. The default is to create a `div` element in `body`. | Function(triggerNode) | `() => document.body` |
diff --git a/components/config-provider/index.jsx b/components/config-provider/index.jsx
new file mode 100644
index 000000000..289f47327
--- /dev/null
+++ b/components/config-provider/index.jsx
@@ -0,0 +1,25 @@
+
+import PropTypes from '../_util/vue-types'
+
+const ConfigProvider = {
+ name: 'AConfigProvider',
+ props: {
+ getPopupContainer: PropTypes.func,
+ },
+ provide () {
+ return {
+ configProvider: this.$props,
+ }
+ },
+ render () {
+ return this.$slots.default ? this.$slots.default[0] : null
+ },
+}
+
+/* istanbul ignore next */
+ConfigProvider.install = function (Vue) {
+ Vue.component(ConfigProvider.name, ConfigProvider)
+}
+
+export default ConfigProvider
+
diff --git a/components/config-provider/index.zh-CN.md b/components/config-provider/index.zh-CN.md
new file mode 100644
index 000000000..5beed7964
--- /dev/null
+++ b/components/config-provider/index.zh-CN.md
@@ -0,0 +1,15 @@
+## 使用
+
+ConfigProvider 使用 Vue 的 [provide / inject](https://vuejs.org/v2/api/#provide-inject) 特性，只需在应用外围包裹一次即可全局生效。
+
+````html
+
+
+````
+
+## API
+
+| 参数 | 说明 | 类型 | 默认值 |
+| --- | --- | --- | --- |
+| getPopupContainer | 弹出框（Select, Tooltip, Menu 等等）渲染父节点，默认渲染到 body 上。 | Function(triggerNode) | () => document.body |
diff --git a/components/config-provider/style/index.js b/components/config-provider/style/index.js
new file mode 100644
index 000000000..d74e52ee9
--- /dev/null
+++ b/components/config-provider/style/index.js
@@ -0,0 +1 @@
+import './index.less';
diff --git a/components/config-provider/style/index.less b/components/config-provider/style/index.less
new file mode 100644
index 000000000..df1dee5e0
--- /dev/null
+++ b/components/config-provider/style/index.less
@@ -0,0 +1,2 @@
+// placeholder
+@import '../../style/themes/default';
diff --git a/components/index.js b/components/index.js
index 9d70e0f7e..122e1a1b7 100644
--- a/components/index.js
+++ b/components/index.js
@@ -126,6 +126,8 @@ import { default as Skeleton } from './skeleton'
import { default as Comment } from './comment'
+import { default as ConfigProvider } from './config-provider'
+
const components = [
Affix,
Anchor,
@@ -180,6 +182,7 @@ const components = [
Drawer,
Skeleton,
Comment,
+ ConfigProvider,
]
const install = function (Vue) {
@@ -259,6 +262,7 @@ export {
Drawer,
Skeleton,
Comment,
+ ConfigProvider,
}
export default {
diff --git a/components/style.js b/components/style.js
index 25cf8b5b7..41a18a4c6 100644
--- a/components/style.js
+++ b/components/style.js
@@ -52,3 +52,4 @@ import './tree-select/style'
import './drawer/style'
import './skeleton/style'
import './comment/style'
+import './config-provider/style'
diff --git a/site/components.js b/site/components.js
index ad20b73bf..8877b500d 100644
--- a/site/components.js
+++ b/site/components.js
@@ -57,6 +57,7 @@ import {
Drawer,
Skeleton,
Comment,
+ ConfigProvider,
} from 'ant-design-vue'
Vue.prototype.$message = message
@@ -121,6 +122,7 @@ Vue.use(Tooltip)
Vue.use(Upload)
Vue.use(Skeleton)
Vue.use(Comment)
+Vue.use(ConfigProvider)
/* v1.1.2 registration methods */
// Vue.component(Affix.name, Affix) // a-affix
From 7422026674458028eebb3838e122be9ef122525e Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Wed, 2 Jan 2019 20:18:13 +0800
Subject: [PATCH 13/63] fix: button Fixed the issue that when the href property
is undefined, the Button will also be rendered as a anchor. Fixed the issue
that Edge throws an error when setting the loading property.
---
.../__tests__/__snapshots__/index.test.js.snap | 4 +++-
components/button/__tests__/index.test.js | 11 +++++++++++
components/button/button.jsx | 17 ++++++++---------
3 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/components/button/__tests__/__snapshots__/index.test.js.snap b/components/button/__tests__/__snapshots__/index.test.js.snap
index 834e92354..afc77ac46 100644
--- a/components/button/__tests__/__snapshots__/index.test.js.snap
+++ b/components/button/__tests__/__snapshots__/index.test.js.snap
@@ -38,4 +38,6 @@ exports[`Button renders Chinese characters correctly 5`] = `
exports[`Button renders correctly 1`] = ``;
-exports[`Button should support link button 1`] = `link button`;
+exports[`Button should not render as link button when href is undefined 1`] = ``;
+
+exports[`Button should support link button 1`] = `link button`;
diff --git a/components/button/__tests__/index.test.js b/components/button/__tests__/index.test.js
index ca29d4395..5f0ec9bdd 100644
--- a/components/button/__tests__/index.test.js
+++ b/components/button/__tests__/index.test.js
@@ -173,4 +173,15 @@ describe('Button', () => {
})
expect(wrapper2.html()).toMatchSnapshot()
})
+
+ it('should not render as link button when href is undefined', async () => {
+ const wrapper = mount({
+ render () {
+ return (
+
+ )
+ },
+ })
+ expect(wrapper.html()).toMatchSnapshot()
+ })
})
diff --git a/components/button/button.jsx b/components/button/button.jsx
index b22228b40..7284573df 100644
--- a/components/button/button.jsx
+++ b/components/button/button.jsx
@@ -3,13 +3,13 @@ import Icon from '../icon'
const rxTwoCNChar = /^[\u4e00-\u9fa5]{2}$/
const isTwoCNChar = rxTwoCNChar.test.bind(rxTwoCNChar)
import buttonTypes from './buttonTypes'
+import { filterEmpty } from '../_util/props-util'
const props = buttonTypes()
export default {
+ inheritAttrs: false,
name: 'AButton',
__ANT_BUTTON: true,
- props: {
- ...props,
- },
+ props,
data () {
return {
sizeMap: {
@@ -48,13 +48,15 @@ export default {
computed: {
classes () {
const { prefixCls, type, shape, size, hasTwoCNChar,
- sLoading, ghost, block, sizeMap } = this
+ sLoading, ghost, block, sizeMap, icon, $slots } = this
const sizeCls = sizeMap[size] || ''
+ const children = filterEmpty($slots.default)
return {
[`${prefixCls}`]: true,
[`${prefixCls}-${type}`]: type,
[`${prefixCls}-${shape}`]: shape,
[`${prefixCls}-${sizeCls}`]: sizeCls,
+ [`${prefixCls}-icon-only`]: !children && children !== 0 && icon,
[`${prefixCls}-loading`]: sLoading,
[`${prefixCls}-background-ghost`]: ghost || type === 'ghost',
[`${prefixCls}-two-chinese-chars`]: hasTwoCNChar,
@@ -106,11 +108,8 @@ export default {
disabled, handleClick,
sLoading, $slots, $attrs, $listeners } = this
const buttonProps = {
- props: {
- },
attrs: {
...$attrs,
- type: htmlType,
disabled,
},
class: classes,
@@ -123,7 +122,7 @@ export default {
const iconNode = iconType ?
-
From e13f4c566e76c9e855ef614229f7b477a23fd430 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Wed, 2 Jan 2019 20:20:02 +0800
Subject: [PATCH 14/63] fix: DatePicker Fixed the issue where the component
lost focus after selecting the date. Fixed the issue that cause Safari to
unresponsive. Fixed the issue where WeekPicker's date selection box was not
aligned with the input box. add da_DK he_IL hu_HU id_ID
---
components/date-picker/RangePicker.jsx | 34 +++++++++++--------
components/date-picker/WeekPicker.jsx | 32 ++++++++++++-----
.../__snapshots__/WeekPicker.test.js.snap | 2 +-
.../__tests__/__snapshots__/demo.test.js.snap | 8 ++---
components/date-picker/createPicker.js | 4 ++-
components/date-picker/index.en-US.md | 10 +++---
components/date-picker/index.zh-CN.md | 12 +++----
components/date-picker/interface.js | 2 +-
components/date-picker/locale/da_DK.js | 19 +++++++++++
components/date-picker/locale/he_IL.js | 19 +++++++++++
components/date-picker/locale/hu_HU.js | 19 +++++++++++
components/date-picker/locale/id_ID.js | 19 +++++++++++
12 files changed, 140 insertions(+), 40 deletions(-)
create mode 100644 components/date-picker/locale/da_DK.js
create mode 100644 components/date-picker/locale/he_IL.js
create mode 100644 components/date-picker/locale/hu_HU.js
create mode 100644 components/date-picker/locale/id_ID.js
diff --git a/components/date-picker/RangePicker.jsx b/components/date-picker/RangePicker.jsx
index e62240197..20af18d8c 100644
--- a/components/date-picker/RangePicker.jsx
+++ b/components/date-picker/RangePicker.jsx
@@ -50,11 +50,12 @@ function fixLocale (value, localeCode) {
if (!value || value.length === 0) {
return
}
- if (value[0]) {
- value[0].locale(localeCode)
+ const [start, end] = value
+ if (start) {
+ start.locale(localeCode)
}
- if (value[1]) {
- value[1].locale(localeCode)
+ if (end) {
+ end.locale(localeCode)
}
}
@@ -73,9 +74,10 @@ export default {
},
data () {
const value = this.value || this.defaultValue || []
+ const [start, end] = value
if (
- value[0] && !interopDefault(moment).isMoment(value[0]) ||
- value[1] && !interopDefault(moment).isMoment(value[1])
+ start && !interopDefault(moment).isMoment(start) ||
+ end && !interopDefault(moment).isMoment(end)
) {
throw new Error(
'The value/defaultValue of RangePicker must be a moment object array after `antd@2.0`, ' +
@@ -127,11 +129,11 @@ export default {
sShowDate: getShowDateFromValue(value) || sShowDate,
}))
}
+ const [start, end] = value
this.$emit('change', value, [
- formatValue(value[0], this.format),
- formatValue(value[1], this.format),
+ formatValue(start, this.format),
+ formatValue(end, this.format),
])
- this.focus()
},
handleOpenChange (open) {
@@ -143,6 +145,10 @@ export default {
this.clearHoverValue()
}
this.$emit('openChange', open)
+
+ if (!open) {
+ this.focus()
+ }
},
handleShowDateChange (showDate) {
@@ -160,7 +166,8 @@ export default {
},
handleCalendarInputSelect (value) {
- if (!value[0]) {
+ const [start] = value
+ if (!start) {
return
}
this.setState(({ sShowDate }) => ({
@@ -317,8 +324,8 @@ export default {
if (props.showTime) {
pickerStyle.width = '350px'
}
-
- const clearIcon = (!props.disabled && props.allowClear && value && (value[0] || value[1])) ? (
+ const [startValue, endValue] = value
+ const clearIcon = (!props.disabled && props.allowClear && value && (startValue || endValue)) ? (
{
- const start = inputValue[0]
- const end = inputValue[1]
+ const [start, end] = inputValue
return (
)
- const clearIcon = (!disabled && allowClear && this.sValue) ? (
+ const clearIcon = (!disabled && allowClear && $data._value) ? (
{
return (
-
+
`;
+exports[`WeekPicker should support style prop 1`] = ``;
diff --git a/components/date-picker/__tests__/__snapshots__/demo.test.js.snap b/components/date-picker/__tests__/__snapshots__/demo.test.js.snap
index 6c1e5f529..ab062d217 100644
--- a/components/date-picker/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/date-picker/__tests__/__snapshots__/demo.test.js.snap
@@ -3,13 +3,13 @@
exports[`renders ./components/date-picker/demo/basic.md correctly 1`] = `
~
+
`;
exports[`renders ./components/date-picker/demo/date-render.md correctly 1`] = `
longgggggggggggggggggggggggggggggggggg
~
~
~
+
~
~
~
-
Name | Age |
|---|
دادهای موجود نیست
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
دادهای موجود نیست
+ Name | Age |
|---|
Ei kohteita
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Ei kohteita
+ Name | Age |
|---|
Aucune donnée
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Aucune donnée
+ Name | Age |
|---|
Aucune donnée
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Aucune donnée
+
+
+
+`;
+
+exports[`Locale Provider should display the text as hu 1`] = `
+
+
+
+
+
+
+ ~ Click to confirm
+
+
+
+
+
+ 0 פריט
+
+
+
+
+
+
לא נמצא
+
+
+ 0 פריט
+
+
+
+
+
+
לא נמצא
+
+
+
+
+
+
+
+
+
+
+ 2017
+
+
+
+
+
+
+
+ ספט׳
+
+
+
+
+
+
+
+ | א | +ב | +ג | +ד | +ה | +ו | +ש | +
|---|---|---|---|---|---|---|
|
+
+
+ 27
+
+ |
+
+
+
+ 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
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
אין מידע
+
+
+
+`;
+
+exports[`Locale Provider should display the text as id 1`] = `
+
+
+
+
+
+
+ ~ Click to confirm
+
+
+
+
+
+ 0 elem
+
+
+
+
+
+
Nem található
+
+
+ 0 elem
+
+
+
+
+
+
Nem található
+
+
+
+
+
+
+
+
+
+
+ 2017
+
+
+
+
+
+
+
+ szept
+
+
+
+
+
+
+
+ | h | +k | +sze | +cs | +p | +szo | +v | +
|---|---|---|---|---|---|---|
|
+
+
+ 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
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Nincs adat
+
+
+
`;
@@ -6034,7 +8078,39 @@ exports[`Locale Provider should display the text as is 1`] = `
+
+
+
+
+
+ ~ Click to confirm
+
+
+
+
+
+ 0 barang
+
+
+
+
+
+
Tidak ditemukan
+
+
+ 0 barang
+
+
+
+
+
+
Tidak ditemukan
+
+
+
+
+
+
+
+
+
+
+ 2017
+
+
+
+
+
+
+
+ Sep
+
+
+
+
+
+
+
+ | Sn | +Sl | +Rb | +Km | +Jm | +Sb | +Mg | +
|---|---|---|---|---|---|---|
|
+
+
+ 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
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Tidak ada data
+ Name | Age |
|---|
Engin gögn
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Engin gögn
+ Name | Age |
|---|
Nessun dato
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Nessun dato
+ Name | Age |
|---|
データがありません
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
データがありません
+ Name | Age |
|---|
데이터 없음
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
데이터 없음
+ Name | Age |
|---|
Agahî tune
+
`;
@@ -7869,7 +10073,39 @@ exports[`Locale Provider should display the text as mn-mn 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Agahî tune
+ Name | Age |
|---|
Мэдээлэл байхгүй байна
+
`;
@@ -8236,7 +10472,438 @@ exports[`Locale Provider should display the text as nb 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Мэдээлэл байхгүй байна
+ Name | Age |
|---|
Ingen data
+
+
+
+`;
+
+exports[`Locale Provider should display the text as ne-np 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Ingen data
+
+
+
`;
@@ -8603,7 +11270,39 @@ exports[`Locale Provider should display the text as nl 1`] = `
-
+
+
+
+
+
+ ~ Click to confirm
+
+
+
+
+
+ 0 वस्तु
+
+
+
+
+
+
भेट्टिएन
+
+
+ 0 वस्तु
+
+
+
+
+
+
भेट्टिएन
+
+
+
+
+
+
+
+
+
+
+ 2017
+
+
+
+
+
+
+
+ सेप्ट.
+
+
+
+
+
+
+
+ | आ. | +सो. | +मं. | +बु. | +बि. | +शु. | +श. | +
|---|---|---|---|---|---|---|
|
+
+
+ 27
+
+ |
+
+
+
+ 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
+
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
डाटा छैन
+ Name | Age |
|---|
Geen gegevens
+
`;
@@ -8970,7 +11669,39 @@ exports[`Locale Provider should display the text as nl-be 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Geen gegevens
+ Name | Age |
|---|
Geen gegevens
+
`;
@@ -9337,7 +12068,39 @@ exports[`Locale Provider should display the text as pl 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Geen gegevens
+ Name | Age |
|---|
Brak danych
+
`;
@@ -9704,7 +12467,39 @@ exports[`Locale Provider should display the text as pt 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Brak danych
+ Name | Age |
|---|
Sem resultados
+
`;
@@ -10071,7 +12866,39 @@ exports[`Locale Provider should display the text as pt-br 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Sem resultados
+ Name | Age |
|---|
Não há dados
+
`;
@@ -10438,7 +13265,39 @@ exports[`Locale Provider should display the text as ru 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Não há dados
+ Name | Age |
|---|
Нет данных
+
`;
@@ -10805,7 +13664,39 @@ exports[`Locale Provider should display the text as sk 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Нет данных
+ Name | Age |
|---|
Žiadne dáta
+
`;
@@ -11172,7 +14063,39 @@ exports[`Locale Provider should display the text as sl 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Žiadne dáta
+ Name | Age |
|---|
Ni podatkov
+
`;
@@ -11539,7 +14462,39 @@ exports[`Locale Provider should display the text as sr 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Ni podatkov
+ Name | Age |
|---|
Nema podataka
+
`;
@@ -11906,7 +14861,39 @@ exports[`Locale Provider should display the text as sv 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Nema podataka
+ Name | Age |
|---|
Ingen information
+
`;
@@ -12273,7 +15260,39 @@ exports[`Locale Provider should display the text as th 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Ingen information
+ Name | Age |
|---|
ไม่มีข้อมูล
+
`;
@@ -12640,7 +15659,39 @@ exports[`Locale Provider should display the text as tr 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
ไม่มีข้อมูล
+ Name | Age |
|---|
Veri Yok
+
`;
@@ -13007,7 +16058,39 @@ exports[`Locale Provider should display the text as uk 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Veri Yok
+ Name | Age |
|---|
Даних немає
+
`;
@@ -13374,7 +16457,39 @@ exports[`Locale Provider should display the text as vi 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Даних немає
+ Name | Age |
|---|
Trống
+
`;
@@ -13741,7 +16856,39 @@ exports[`Locale Provider should display the text as zh-cn 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
Trống
+ Name | Age |
|---|
暂无数据
+
`;
@@ -14108,7 +17255,39 @@ exports[`Locale Provider should display the text as zh-tw 1`] = `
-
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
暂无数据
+ Name | Age |
|---|
目前尚無資料
+
`;
diff --git a/components/locale-provider/__tests__/index.test.js b/components/locale-provider/__tests__/index.test.js
index f59baf29d..ac432f152 100644
--- a/components/locale-provider/__tests__/index.test.js
+++ b/components/locale-provider/__tests__/index.test.js
@@ -5,45 +5,93 @@ import moment from 'moment'
import MockDate from 'mockdate'
import { LocaleProvider, Pagination, DatePicker, TimePicker, Calendar,
Popconfirm, Table, Modal, Select, Transfer } from '../..'
+import arEG from '../ar_EG'
+import bgBG from '../bg_BG'
+import caES from '../ca_ES'
+import csCZ from '../cs_CZ'
+import daDK from '../da_DK'
+import deDE from '../de_DE'
+import elGR from '../el_GR'
import enGB from '../en_GB'
-import frFR from '../fr_FR'
-import nlBE from '../nl_BE'
-import itIT from '../it_IT'
import enUS from '../en_US'
+import esES from '../es_ES'
+import etEE from '../et_EE'
+import faIR from '../fa_IR'
+import fiFI from '../fi_FI'
+import frBE from '../fr_BE'
+import frFR from '../fr_FR'
+import heIL from '../he_IL'
+import huHU from '../hu_HU'
+import isIS from '../is_IS'
+import itIT from '../it_IT'
+import jaJP from '../ja_JP'
+import koKR from '../ko_KR'
+import kuIQ from '../ku_IQ'
+import mnMN from '../mn_MN'
+import nbNO from '../nb_NO'
+import neNP from '../ne-NP'
+import nlBE from '../nl_BE'
+import nlNL from '../nl_NL'
+import plPL from '../pl_PL'
import ptBR from '../pt_BR'
import ptPT from '../pt_PT'
import ruRU from '../ru_RU'
-import esES from '../es_ES'
-import svSE from '../sv_SE'
-import frBE from '../fr_BE'
-import deDE from '../de_DE'
-import nlNL from '../nl_NL'
-import caES from '../ca_ES'
-import csCZ from '../cs_CZ'
-import koKR from '../ko_KR'
-import etEE from '../et_EE'
import skSK from '../sk_SK'
-import jaJP from '../ja_JP'
-import trTR from '../tr_TR'
-import zhTW from '../zh_TW'
-import fiFI from '../fi_FI'
-import plPL from '../pl_PL'
-import bgBG from '../bg_BG'
-import viVN from '../vi_VN'
-import thTH from '../th_TH'
-import faIR from '../fa_IR'
-import elGR from '../el_GR'
-import nbNO from '../nb_NO'
-import srRS from '../sr_RS'
import slSI from '../sl_SI'
-import isIS from '../is_IS'
-import arEG from '../ar_EG'
+import srRS from '../sr_RS'
+import svSE from '../sv_SE'
+import thTH from '../th_TH'
+import trTR from '../tr_TR'
import ukUA from '../uk_UA'
+import viVN from '../vi_VN'
+import idID from '../id_ID'
import zhCN from '../zh_CN'
-import kuIQ from '../ku_IQ'
-import mnMN from '../mn_MN'
+import zhTW from '../zh_TW'
-const locales = [enUS, ptBR, ptPT, ruRU, esES, svSE, frBE, deDE, nlNL, caES, csCZ, koKR, etEE, skSK, jaJP, trTR, zhTW, fiFI, plPL, bgBG, enGB, frFR, nlBE, itIT, viVN, thTH, faIR, elGR, nbNO, srRS, slSI, isIS, arEG, ukUA, zhCN, kuIQ, mnMN]
+const locales = [
+ arEG,
+ bgBG,
+ caES,
+ csCZ,
+ daDK,
+ deDE,
+ elGR,
+ enGB,
+ enUS,
+ esES,
+ etEE,
+ faIR,
+ fiFI,
+ frBE,
+ frFR,
+ heIL,
+ huHU,
+ isIS,
+ itIT,
+ jaJP,
+ koKR,
+ kuIQ,
+ mnMN,
+ nbNO,
+ neNP,
+ nlBE,
+ nlNL,
+ plPL,
+ ptBR,
+ ptPT,
+ ruRU,
+ skSK,
+ slSI,
+ srRS,
+ svSE,
+ thTH,
+ trTR,
+ ukUA,
+ viVN,
+ idID,
+ zhCN,
+ zhTW,
+]
const { Option } = Select
const { RangePicker } = DatePicker
diff --git a/components/locale-provider/da_DK.js b/components/locale-provider/da_DK.js
new file mode 100644
index 000000000..ea7540a53
--- /dev/null
+++ b/components/locale-provider/da_DK.js
@@ -0,0 +1,44 @@
+import Pagination from '../vc-pagination/locale/da_DK'
+import DatePicker from '../date-picker/locale/da_DK'
+import TimePicker from '../time-picker/locale/da_DK'
+import Calendar from '../calendar/locale/da_DK'
+
+export default {
+ locale: 'da',
+ DatePicker,
+ TimePicker,
+ Calendar,
+ Pagination,
+ Table: {
+ filterTitle: 'Filtermenu',
+ filterConfirm: 'OK',
+ filterReset: 'Nulstil',
+ emptyText: 'Ingen data',
+ selectAll: 'Vælg alle',
+ selectInvert: 'Inverter valg',
+ },
+ Modal: {
+ okText: 'OK',
+ cancelText: 'Afbryd',
+ justOkText: 'OK',
+ },
+ Popconfirm: {
+ okText: 'OK',
+ cancelText: 'Afbryd',
+ },
+ Transfer: {
+ notFoundContent: 'Intet fundet',
+ searchPlaceholder: 'Søg her',
+ itemUnit: 'element',
+ itemsUnit: 'elementer',
+ },
+ Select: {
+ notFoundContent: 'Intet fundet',
+ },
+ Upload: {
+ uploading: 'Uploader...',
+ removeFile: 'Fjern fil',
+ uploadError: 'Fejl ved upload',
+ previewFile: 'Forhåndsvisning',
+ },
+}
diff --git a/components/locale-provider/default.js b/components/locale-provider/default.js
index b11a453e8..3c6bca897 100644
--- a/components/locale-provider/default.js
+++ b/components/locale-provider/default.js
@@ -9,6 +9,10 @@ export default {
DatePicker,
TimePicker,
Calendar,
+ // locales for all comoponents
+ global: {
+ placeholder: 'Please select',
+ },
Table: {
filterTitle: 'Filter menu',
filterConfirm: 'OK',
diff --git a/components/locale-provider/fi_FI.js b/components/locale-provider/fi_FI.js
index 9bbfb6033..2b3279de0 100644
--- a/components/locale-provider/fi_FI.js
+++ b/components/locale-provider/fi_FI.js
@@ -16,6 +16,7 @@ export default {
emptyText: 'Ei kohteita',
selectAll: 'Valitse kaikki',
selectInvert: 'Valitse päinvastoin',
+ sortTitle: 'Lajittele',
},
Modal: {
okText: 'OK',
diff --git a/components/locale-provider/he_IL.js b/components/locale-provider/he_IL.js
new file mode 100644
index 000000000..a90ad4dd6
--- /dev/null
+++ b/components/locale-provider/he_IL.js
@@ -0,0 +1,44 @@
+import Pagination from '../vc-pagination/locale/he_IL'
+import DatePicker from '../date-picker/locale/he_IL'
+import TimePicker from '../time-picker/locale/he_IL'
+import Calendar from '../calendar/locale/he_IL'
+
+export default {
+ locale: 'he',
+ Pagination,
+ DatePicker,
+ TimePicker,
+ Calendar,
+ Table: {
+ filterTitle: 'תפריט סינון',
+ filterConfirm: 'אישור',
+ filterReset: 'איפוס',
+ emptyText: 'אין מידע',
+ selectAll: 'בחר הכל',
+ selectInvert: 'הפוך בחירה',
+ },
+ Modal: {
+ okText: 'אישור',
+ cancelText: 'ביטול',
+ justOkText: 'אישור',
+ },
+ Popconfirm: {
+ okText: 'אישור',
+ cancelText: 'ביטול',
+ },
+ Transfer: {
+ notFoundContent: 'לא נמצא',
+ searchPlaceholder: 'חפש כאן',
+ itemUnit: 'פריט',
+ itemsUnit: 'פריטים',
+ },
+ Select: {
+ notFoundContent: 'לא נמצא',
+ },
+ Upload: {
+ uploading: 'מעלה...',
+ removeFile: 'הסר קובץ',
+ uploadError: 'שגיאת העלאה',
+ previewFile: 'הצג קובץ',
+ },
+}
diff --git a/components/locale-provider/hu_HU.js b/components/locale-provider/hu_HU.js
new file mode 100644
index 000000000..b9c387529
--- /dev/null
+++ b/components/locale-provider/hu_HU.js
@@ -0,0 +1,45 @@
+import Pagination from '../vc-pagination/locale/hu_HU'
+import DatePicker from '../date-picker/locale/hu_HU'
+import TimePicker from '../time-picker/locale/hu_HU'
+import Calendar from '../calendar/locale/hu_HU'
+
+export default {
+ locale: 'hu',
+ Pagination,
+ DatePicker,
+ TimePicker,
+ Calendar,
+ Table: {
+ filterTitle: 'Szűrők',
+ filterConfirm: 'Alkalmazás',
+ filterReset: 'Visszaállítás',
+ emptyText: 'Nincs adat',
+ selectAll: 'Jelenlegi oldal kiválasztása',
+ selectInvert: 'Jelenlegi oldal inverze',
+ sortTitle: 'Rendezés',
+ },
+ Modal: {
+ okText: 'Alkalmazás',
+ cancelText: 'Visszavonás',
+ justOkText: 'Alkalmazás',
+ },
+ Popconfirm: {
+ okText: 'Alkalmazás',
+ cancelText: 'Visszavonás',
+ },
+ Transfer: {
+ notFoundContent: 'Nem található',
+ searchPlaceholder: 'Keresés',
+ itemUnit: 'elem',
+ itemsUnit: 'elemek',
+ },
+ Select: {
+ notFoundContent: 'Nem található',
+ },
+ Upload: {
+ uploading: 'Feltöltés...',
+ removeFile: 'Fájl eltávolítása',
+ uploadError: 'Feltöltési hiba',
+ previewFile: 'Fájl előnézet',
+ },
+}
diff --git a/components/locale-provider/id_ID.js b/components/locale-provider/id_ID.js
new file mode 100644
index 000000000..1bc4d2d7a
--- /dev/null
+++ b/components/locale-provider/id_ID.js
@@ -0,0 +1,46 @@
+import Pagination from '../vc-pagination/locale/id_ID'
+import DatePicker from '../date-picker/locale/id_ID'
+import TimePicker from '../time-picker/locale/id_ID'
+import Calendar from '../calendar/locale/id_ID'
+
+export default {
+ locale: 'id',
+ Pagination,
+ DatePicker,
+ TimePicker,
+ Calendar,
+ Table: {
+ filterTitle: 'Menu filter',
+ filterConfirm: 'baik',
+ filterReset: 'Setel ulang',
+ emptyText: 'Tidak ada data',
+ selectAll: 'Pilih halaman saat ini',
+ selectInvert: 'Balikkan halaman saat ini',
+ sortTitle: 'Menyortir',
+ },
+ Modal: {
+ okText: 'baik',
+ cancelText: 'Membatalkan',
+ justOkText: 'baik',
+ },
+ Popconfirm: {
+ okText: 'baik',
+ cancelText: 'Membatalkan',
+ },
+ Transfer: {
+ titles: ['', ''],
+ notFoundContent: 'Tidak ditemukan',
+ searchPlaceholder: 'Cari di sini',
+ itemUnit: 'barang',
+ itemsUnit: 'item',
+ },
+ Select: {
+ notFoundContent: 'Tidak ditemukan',
+ },
+ Upload: {
+ uploading: 'Mengunggah...',
+ removeFile: 'Hapus file',
+ uploadError: 'Kesalahan pengunggahan',
+ previewFile: 'File pratinjau',
+ },
+}
diff --git a/components/locale-provider/index.en-US.md b/components/locale-provider/index.en-US.md
index a958034e1..049a64fff 100644
--- a/components/locale-provider/index.en-US.md
+++ b/components/locale-provider/index.en-US.md
@@ -15,7 +15,10 @@
-```
\ No newline at end of file
+```
diff --git a/components/menu/index.en-US.md b/components/menu/index.en-US.md
index 4179e30f6..9b2d18b9e 100644
--- a/components/menu/index.en-US.md
+++ b/components/menu/index.en-US.md
@@ -46,6 +46,7 @@
| ----- | ----------- | ---- | ------------- |
| disabled | whether menu item is disabled or not | boolean | false |
| key | unique id of the menu item | string | |
+| title | set display title for collapsed item | string | |
### Menu.SubMenu
diff --git a/components/menu/index.jsx b/components/menu/index.jsx
index bcbb0d2cc..447a9ad26 100644
--- a/components/menu/index.jsx
+++ b/components/menu/index.jsx
@@ -45,6 +45,7 @@ const Menu = {
mixins: [BaseMixin],
inject: {
layoutSiderContext: { default: {}},
+ configProvider: { default: {}},
},
model: {
prop: 'selectedKeys',
@@ -176,26 +177,19 @@ const Menu = {
const { openAnimation, openTransitionName } = this.$props
let menuOpenAnimation = openAnimation || openTransitionName
if (openAnimation === undefined && openTransitionName === undefined) {
- switch (menuMode) {
- case 'horizontal':
- menuOpenAnimation = 'slide-up'
- break
- case 'vertical':
- case 'vertical-left':
- case 'vertical-right':
+ if (menuMode === 'horizontal') {
+ menuOpenAnimation = 'slide-up'
+ } else if (menuMode === 'inline') {
+ menuOpenAnimation = { on: animation }
+ } else {
// When mode switch from inline
// submenu should hide without animation
- if (this.switchingModeFromInline) {
- menuOpenAnimation = ''
- this.switchingModeFromInline = false
- } else {
- menuOpenAnimation = 'zoom-big'
- }
- break
- case 'inline':
- menuOpenAnimation = { on: animation }
- break
- default:
+ if (this.switchingModeFromInline) {
+ menuOpenAnimation = ''
+ this.switchingModeFromInline = false
+ } else {
+ menuOpenAnimation = 'zoom-big'
+ }
}
}
return menuOpenAnimation
@@ -204,7 +198,8 @@ const Menu = {
render () {
const { layoutSiderContext, $slots, $listeners } = this
const { collapsedWidth } = layoutSiderContext
- const { prefixCls, theme } = this.$props
+ const { getPopupContainer: getContextPopupContainer } = this.configProvider
+ const { prefixCls, theme, getPopupContainer } = this.$props
const menuMode = this.getRealMenuMode()
const menuOpenAnimation = this.getMenuOpenAnimation(menuMode)
@@ -216,6 +211,7 @@ const Menu = {
const menuProps = {
props: {
...omit(this.$props, ['inlineCollapsed']),
+ getPopupContainer: getPopupContainer || getContextPopupContainer,
openKeys: this.sOpenKeys,
mode: menuMode,
},
diff --git a/components/menu/index.zh-CN.md b/components/menu/index.zh-CN.md
index c4c4604ee..aa19701f4 100644
--- a/components/menu/index.zh-CN.md
+++ b/components/menu/index.zh-CN.md
@@ -44,6 +44,7 @@
| --- | --- | --- | --- |
| disabled | 是否禁用 | boolean | false |
| key | item 的唯一标志 | string | |
+| title | 设置收缩时展示的悬浮标题 | string | |
### Menu.SubMenu
From 0d49773553cc4cf0903c2a76145e480c777f410b Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Sat, 5 Jan 2019 10:55:03 +0800
Subject: [PATCH 38/63] feat: notification add onClick
---
components/notification/__tests__/index.test.js | 8 ++++++++
components/notification/__tests__/placement.test.js | 5 ++---
components/notification/demo/basic.md | 3 +++
components/notification/index.en-US.md | 1 +
components/notification/index.js | 1 +
components/notification/index.zh-CN.md | 1 +
6 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/components/notification/__tests__/index.test.js b/components/notification/__tests__/index.test.js
index 47238e463..04e800931 100644
--- a/components/notification/__tests__/index.test.js
+++ b/components/notification/__tests__/index.test.js
@@ -82,4 +82,12 @@ describe('notification', () => {
})
done()
})
+
+ it('trigger onClick', () => {
+ notification.open({
+ message: 'Notification Title',
+ duration: 0,
+ })
+ expect(document.querySelectorAll('.ant-notification').length).toBe(1)
+ })
})
diff --git a/components/notification/__tests__/placement.test.js b/components/notification/__tests__/placement.test.js
index d8bb7263d..3df336d93 100644
--- a/components/notification/__tests__/placement.test.js
+++ b/components/notification/__tests__/placement.test.js
@@ -8,9 +8,8 @@ describe('Notification.placement', () => {
return document.body.querySelectorAll(className)
}
- function getStyle (el, prop, getComputedStyle, style) {
- getComputedStyle = getComputedStyle || window.getComputedStyle
- style = getComputedStyle ? getComputedStyle(el) : el.currentStyle
+ function getStyle (el, prop) {
+ const style = window.getComputedStyle ? window.getComputedStyle(el) : el.currentStyle
// If a css property's value is `auto`, it will return an empty string.
return prop ? style[prop] : style
diff --git a/components/notification/demo/basic.md b/components/notification/demo/basic.md
index d34fffc6c..609f2ebe3 100644
--- a/components/notification/demo/basic.md
+++ b/components/notification/demo/basic.md
@@ -20,6 +20,9 @@ The simplest usage that close the notification box after 4.5s.
this.$notification.open({
message: 'Notification Title',
description: 'This is the content of the notification. This is the content of the notification. This is the content of the notification.',
+ onClick: () => {
+ console.log('Notification Clicked!');
+ },
});
},
}
diff --git a/components/notification/index.en-US.md b/components/notification/index.en-US.md
index 57e89b79b..f08ccc07d 100644
--- a/components/notification/index.en-US.md
+++ b/components/notification/index.en-US.md
@@ -23,6 +23,7 @@ The properties of config are as follows:
| placement | Position of Notification, can be one of `topLeft` `topRight` `bottomLeft` `bottomRight` | string | `topRight` |
| style | Customized inline style | Object \| string | - |
| onClose | Specify a function that will be called when the close button is clicked | Function | - |
+| onClick | Specify a function that will be called when the notification is clicked | Function | - |
`notification` also provides a global `config()` method that can be used for specifying the default options. Once this method is used, all the notification boxes will take into account these globally defined options when displaying.
diff --git a/components/notification/index.js b/components/notification/index.js
index 5bb551415..5819ac5b5 100644
--- a/components/notification/index.js
+++ b/components/notification/index.js
@@ -157,6 +157,7 @@ function notice (args) {
duration,
closable: true,
onClose: args.onClose,
+ onClick: args.onClick,
key: args.key,
style: args.style || {},
class: args.class,
diff --git a/components/notification/index.zh-CN.md b/components/notification/index.zh-CN.md
index ae8f0ef6c..f596c815a 100644
--- a/components/notification/index.zh-CN.md
+++ b/components/notification/index.zh-CN.md
@@ -31,6 +31,7 @@ config 参数如下：
| placement | 弹出位置，可选 `topLeft` `topRight` `bottomLeft` `bottomRight` | string | topRight |
| style | 自定义内联样式 | Object \| string | - |
| onClose | 点击默认关闭按钮时触发的回调函数 | Function | - |
+| onClick | 点击通知时触发的回调函数 | Function | - |
还提供了一个全局配置方法，在调用前提前配置，全局一次生效。
From 032655f097c22cc77665eb696efc585f284404ee Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Sat, 5 Jan 2019 11:22:53 +0800
Subject: [PATCH 39/63] feat: slider add tooltipVisible and optimize experience
---
.../__tests__/__snapshots__/demo.test.js.snap | 46 +++++++++++--------
components/slider/__tests__/demo.test.js | 2 +-
components/slider/demo/basic.md | 2 +-
components/slider/demo/index.vue | 10 +---
components/slider/demo/show-tooltip.md | 15 ++++++
components/slider/index.en-US.md | 1 +
components/slider/index.jsx | 15 +++---
components/slider/index.zh-CN.md | 1 +
8 files changed, 57 insertions(+), 35 deletions(-)
create mode 100644 components/slider/demo/show-tooltip.md
diff --git a/components/slider/__tests__/__snapshots__/demo.test.js.snap b/components/slider/__tests__/__snapshots__/demo.test.js.snap
index ba8b04785..370f919f3 100644
--- a/components/slider/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/slider/__tests__/__snapshots__/demo.test.js.snap
@@ -2,14 +2,14 @@
exports[`renders ./components/slider/demo/basic.md correctly 1`] = `
+
+
+
+
+
+
+
+
+
+
+
+
+ |
+ Name
+ |
+
+ Age
+ |
+
|---|
目前尚無資料
+
-
We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and efficiently.
++- Reply to
+
+We supply a series of design principles, practical patterns and high quality design resources (Sketch and Axure), to help people create their product prototypes beautifully and efficiently.
++- Reply to
+
+