From 08c21a332fd36046d593dd7302d3777694e8f6d0 Mon Sep 17 00:00:00 2001 From: 07akioni <07akioni2@gmail.com> Date: Mon, 10 Feb 2020 22:06:14 +0800 Subject: [PATCH] refactor(cascader): rename splitor prop to seperator --- demo/documentation/components/cascader/enUS/index.md | 4 ++-- demo/documentation/components/cascader/zhCN/index.md | 6 +++--- packages/common/Cascader/src/Cascader.vue | 7 +++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/demo/documentation/components/cascader/enUS/index.md b/demo/documentation/components/cascader/enUS/index.md index 4d223c806..95be5e035 100644 --- a/demo/documentation/components/cascader/enUS/index.md +++ b/demo/documentation/components/cascader/enUS/index.md @@ -27,7 +27,7 @@ filter |-|-|-|-| |options|`Array`|`null`|| |value|`string \| number`|`null`|| -|placeholder|`string`|`Please Select`|| +|placeholder|`string`|`'Please Select'`|| |multiple|`boolean`|`false`|| |size|`'small' \| 'medium' \| 'large'`|`'medium'`|| |filterable|`boolean`|`false`|Can't be `true` with `remote` prop at same time.| @@ -37,7 +37,7 @@ filter |clearable|`boolean`|`false`|| |remote|`boolean`|`false`|| |on-load|`(option: CascaderOption, resolve: (children: Array) => void) => any`|`() => {}`|Callback when click at unloaded nodes. Pass resolved children to `resolve` function to set children of the node.| -|splitor|`string`|`'/'`|| +|seperator|`string`|`'/'`|| |filter|`(pattern: string, option: CascaderOption, path: Array) => boolean`|A string based filter.|| ## Events diff --git a/demo/documentation/components/cascader/zhCN/index.md b/demo/documentation/components/cascader/zhCN/index.md index bcc28ac4f..edba9e091 100644 --- a/demo/documentation/components/cascader/zhCN/index.md +++ b/demo/documentation/components/cascader/zhCN/index.md @@ -28,17 +28,17 @@ filter |-|-|-|-| |options|`Array`|`null`|| |value|`string \| number`|`null`|| -|placeholder|`string`|`请选择`|| +|placeholder|`string`|`'请选择'`|| |multiple|`boolean`|`false`|| |size|`'small' \| 'medium' \| 'large'`|`'medium'`|| -|filterable|`boolean`|`false`|不能在和 `remote` prop 同时为 `true`| +|filterable|`boolean`|`false`|不能和 `remote` 同时为 `true`| |disabled|`boolean`|`false`|| |expand-trigger|`'click' \| 'hover'`|`'click'`|| |leaf-only|`boolean`|`true`|| |clearable|`boolean`|`false`|| |remote|`boolean`|`false`|| |on-load|`(option: CascaderOption, resolve: (children: Array) => void) => any`|`() => {}`|在点击未加载完成节点时的回调。把获得的子节点传入 `resolve` 函数来设定这个节点的子节点。| -|splitor|`string`|`'/'`|| +|seperator|`string`|`'/'`|| |filter|`(pattern: string, option: CascaderOption, path: Array) => boolean`|一个基于字符串的过滤算法|| ## Events diff --git a/packages/common/Cascader/src/Cascader.vue b/packages/common/Cascader/src/Cascader.vue index 59257f312..a4b093991 100644 --- a/packages/common/Cascader/src/Cascader.vue +++ b/packages/common/Cascader/src/Cascader.vue @@ -36,7 +36,6 @@ @delete-last-option="handleDeleteLastOption" @pattern-input="handlePatternInput" /> - {} }, - splitor: { + seperator: { type: String, default: ' / ' }, @@ -240,7 +239,7 @@ export default { if (values.has(option.value)) { options.push({ value: option.value, - label: path.slice(1, path.length).join(this.splitor) + label: path.slice(1, path.length).join(this.seperator) }) } }, () => { @@ -265,7 +264,7 @@ export default { if (option.value === this.value) { selectedOption = { value: option.value, - label: path.slice(1, path.length).join(this.splitor) + label: path.slice(1, path.length).join(this.seperator) } } }, () => {