mirror/naive-ui
2
0
Fork 0
mirror of https://github.com/tusen-ai/naive-ui.git synced 2025-02-17 13:20:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: fix all seperator to separator

Browse Source
This commit is contained in:
07akioni 2020-08-08 20:11:46 +08:00
parent 16cc49ea9e
commit 01ee562796
28 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/documentation/components/breadcrumb/enUS/index.md
View File

@ -9,7 +9,7 @@ basic
|Name|Type|Default|Description|
|-|-|-|-|
|theme|`'light' \| 'dark' \| null`|`null`||
|seperator|`string`|`'/'`||
|separator|`string`|`'/'`||
## Slots
### Breadcrumb Slots

2
demo/documentation/components/breadcrumb/zhCN/index.md
View File

@ -9,7 +9,7 @@ basic
|名称|类型|默认值|说明|
|-|-|-|-|
|theme|`'light' \| 'dark' \| null`|`null`||
|seperator|`string`|`'/'`||
|separator|`string`|`'/'`||
## Slots
### Breadcrumb Slots

2
demo/documentation/components/cascader/enUS/index.md
View File

@ -39,7 +39,7 @@ filter
|clearable|`boolean`|`false`||
|remote|`boolean`|`false`||
|on-load|`(option: CascaderOption, resolve: (children: Array<CascaderOption>) => void) => any`|`() => {}`|Callback when click at unloaded nodes. Pass resolved children to `resolve` function to set children of the node.|
|seperator|`string`|`'/'`||
|separator|`string`|`'/'`||
|filter|`(pattern: string, option: CascaderOption, path: Array<CascaderOption>) => boolean`|A string based filter.||
## Events

2
demo/documentation/components/cascader/zhCN/index.md
View File

@ -40,7 +40,7 @@ filter
|clearable|`boolean`|`false`||
|remote|`boolean`|`false`||
|on-load|`(option: CascaderOption, resolve: (children: Array<CascaderOption>) => void) => any`|`() => {}`|在点击未加载完成节点时的回调。把获得的子节点传入 `resolve` 函数来设定这个节点的子节点。|
|seperator|`string`|`'/'`||
|separator|`string`|`'/'`||
|filter|`(pattern: string, option: CascaderOption, path: Array<CascaderOption>) => boolean`|一个基于字符串的过滤算法||
## Events

4
demo/documentation/components/datePicker/enUS/index.md
View File

@ -55,7 +55,7 @@ format
|format|`string`|`'yyyy-MM-dd'`||
|is-date-disabled|`(current: number) => boolean`|`() => false`||
|is-time-disabled|`(current: number) => { isHourDisabled: boolean, isMinuteDisabled: boolean, isSecondDisabled: boolean }`|`() => ({ isHourDisabled: () => false, isMinuteDisabled: () => false, isSecondDisabled: () => false }})`||
|seperator|`string`|`'to'`||
|separator|`string`|`'to'`||
|start-placeholder|`string`|`'Start Date'`||
@ -67,7 +67,7 @@ format
|format|`string`|`'yyyy-MM-dd HH:mm:ss'`||
|is-date-disabled|`(current: number) => boolean`|`() => false`||
|is-time-disabled|`(current: number) => { isHourDisabled: boolean, isMinuteDisabled: boolean, isSecondDisabled: boolean }`|`() => ({ isHourDisabled: () => false, isMinuteDisabled: () => false, isSecondDisabled: () => false }})`||
|seperator|`string`|`'to'`||
|separator|`string`|`'to'`||
|start-placeholder|`string`|`'Start Date and Time'`||
## Events

4
demo/documentation/components/datePicker/zhCN/index.md
View File

@ -55,7 +55,7 @@ format
|format|`string`|`'yyyy-MM-dd'`||
|is-date-disabled|`(current: number) => boolean`|`() => false`||
|is-time-disabled|`(current: number) => { isHourDisabled: boolean, isMinuteDisabled: boolean, isSecondDisabled: boolean }`|`() => ({ isHourDisabled: () => false, isMinuteDisabled: () => false, isSecondDisabled: () => false }})`||
|seperator|`string`|`'至'`||
|separator|`string`|`'至'`||
|start-placeholder|`string`|`'Start Date'`||
@ -67,7 +67,7 @@ format
|format|`string`|`'yyyy-MM-dd HH:mm:ss'`||
|is-date-disabled|`(current: number) => boolean`|`() => false`||
|is-time-disabled|`(current: number) => { isHourDisabled: boolean, isMinuteDisabled: boolean, isSecondDisabled: boolean }`|`() => ({ isHourDisabled: () => false, isMinuteDisabled: () => false, isSecondDisabled: () => false }})`||
|seperator|`string`|`'to'`||
|separator|`string`|`'to'`||
|start-placeholder|`string`|`'Start Date and Time'`||

2
demo/documentation/components/input/enUS/disabled.md
View File

@ -17,7 +17,7 @@ Input can be disabled.
:disabled="!active"
round
/>
<n-input pair seperator="to" v-model="value" clearable :disabled="!active">
<n-input pair separator="to" v-model="value" clearable :disabled="!active">
<template v-slot:affix>
<n-icon><cash-outline /></n-icon>
</template>

2
demo/documentation/components/input/enUS/index.md
View File

@ -38,7 +38,7 @@ passively-activated
|clearable|`boolean`|`false`||
|autosize|`boolean \| { minRows?: number, maxRows?: number }`|`false`||
|readonly|`boolean`|`false`||
|seperator|`string`|`null`|The seperator bewteen pairwise inputs.|
|separator|`string`|`null`|The separator bewteen pairwise inputs.|
|placeholder|`string \| [string, string]`|`null`|Placeholder of input. When `pair` is `true`, placeholder is an array.|
|passively-activated|`boolean`|`false`||
|autofocus|`boolean`|`false`||

2
demo/documentation/components/input/enUS/pair.md
View File

@ -2,7 +2,7 @@
```html
<n-input
pair
seperator="-"
separator="-"
v-model="value"
:placeholder="placeholder"
clearable

2
demo/documentation/components/input/enUS/passivelyActivated.md
View File

@ -25,7 +25,7 @@ If you want to activate input by pressing enter after focused, use `passively-ac
/>
<n-input
pair
seperator="to"
separator="to"
v-model="pair"
@blur="handleBlur"
@focus="handleFocus"

2
demo/documentation/components/input/zhCN/disabled.md
View File

@ -17,7 +17,7 @@
:disabled="!active"
round
/>
<n-input pair seperator="to" v-model="value" clearable :disabled="!active">
<n-input pair separator="to" v-model="value" clearable :disabled="!active">
<template v-slot:affix>
<n-icon><cash-outline /></n-icon>
</template>

4
demo/documentation/components/input/zhCN/icon-debug.md
View File

@ -49,7 +49,7 @@
</n-icon>
</template>
</n-input>
<n-input v-model="value" placeholder="搜索" pair size="large" seperator="-" clearable>
<n-input v-model="value" placeholder="搜索" pair size="large" separator="-" clearable>
<template v-slot:suffix>
<n-icon>
<md-search/>
@ -61,7 +61,7 @@
</n-icon>
</template>
</n-input>
<n-input v-model="value" placeholder="搜索" pair size="small" seperator="-" clearable>
<n-input v-model="value" placeholder="搜索" pair size="small" separator="-" clearable>
<template v-slot:suffix>
<n-icon>
<md-search/>

2
demo/documentation/components/input/zhCN/index.md
View File

@ -38,7 +38,7 @@ passively-activated
|clearable|`boolean`|`false`||
|autosize|`boolean \| { minRows?: number, maxRows?: number }`|`false`||
|readonly|`boolean`|`false`||
|seperator|`string`|`null`|成对的值中间的分隔符|
|separator|`string`|`null`|成对的值中间的分隔符|
|placeholder|`string \| [string, string]`|`null`|文本输入的占位符。如果是 `pair` 是 `true`，`placeholder`是一个数组|
|passively-activated|`boolean`|`false`||
|autofocus|`boolean`|`false`||

2
demo/documentation/components/input/zhCN/pair.md
View File

@ -2,7 +2,7 @@
```html
<n-input
pair
seperator="-"
separator="-"
v-model="value"
:placeholder="placeholder"
clearable

2
demo/documentation/components/input/zhCN/passivelyActivated.md
View File

@ -25,7 +25,7 @@
/>
<n-input
pair
seperator="to"
separator="to"
v-model="pair"
@blur="handleBlur"
@focus="handleFocus"

6
src/Cascader/src/Cascader.vue
View File

@ -178,7 +178,7 @@ export default {
type: Function,
default: () => {}
},
seperator: {
separator: {
type: String,
default: ' / '
},
@ -243,7 +243,7 @@ export default {
if (values.has(option.value)) {
options.push({
value: option.value,
label: path.slice(1, path.length).join(this.seperator)
label: path.slice(1, path.length).join(this.separator)
})
}
}, () => {
@ -268,7 +268,7 @@ export default {
if (option.value === this.value) {
selectedOption = {
value: option.value,
label: path.slice(1, path.length).join(this.seperator)
label: path.slice(1, path.length).join(this.separator)
}
}
}, () => {

8
src/DatePicker/src/DatePicker.vue
View File

@ -22,7 +22,7 @@
:value="[displayStartTime, displayEndTime]"
:placeholder="[localizedStartPlaceholder, localizedEndPlaceholder]"
:readonly="disabled ? 'disabled' : false"
:seperator="localizedSeperator"
:separator="localizedSeperator"
:force-focus="active"
:clearable="clearable"
pair
@ -232,7 +232,7 @@ export default {
},
default: 'date'
},
seperator: {
separator: {
type: String,
default: undefined
},
@ -281,8 +281,8 @@ export default {
return ['daterange', 'datetimerange'].includes(this.type)
},
localizedSeperator () {
if (this.sepearator !== undefined) return this.seperator
return this.localeNamespace.seperator
if (this.sepearator !== undefined) return this.separator
return this.localeNamespace.separator
},
localizedPlacehoder () {
if (this.placeholder === null) {

6
src/_styles/Breadcrumb.scss
View File

@ -24,12 +24,12 @@
// }
// color: map-get($--breadcrumb-link-text-color, 'default');
// }
// @include e(seperator) {
// @include e(separator) {
// @include once {
// transition: color .3s $--n-ease-in-out-cubic-bezier;
// margin: 0 4px;
// }
// color: map-get($--breadcrumb-seperator-text-color, 'default');
// color: map-get($--breadcrumb-separator-text-color, 'default');
// }
// &:hover {
// @include b(icon) {
@ -52,7 +52,7 @@
// stroke: map-get($--breadcrumb-link-text-color, 'active');
// }
// @include once {
// @include e(seperator) {
// @include e(separator) {
// display: none;
// }
// }

2
src/_styles/themes/dark/components/Breadcrumb.scss
View File

@ -4,7 +4,7 @@
'active': $--n-primary-text-overlay-color,
'hover': $--n-primary-color
) !global;
$--breadcrumb-seperator-text-color: (
$--breadcrumb-separator-text-color: (
'default': $--n-tertiary-text-overlay-color
) !global;
}

2
src/_styles/themes/light/components/Breadcrumb.scss
View File

@ -4,7 +4,7 @@
'active': $--n-primary-text-color,
'hover': $--n-primary-color
) !global;
$--breadcrumb-seperator-text-color: (
$--breadcrumb-separator-text-color: (
'default': $--n-tertiary-text-color
) !global;
}

2
src/breadcrumb/src/Breadcrumb.vue
View File

@ -24,7 +24,7 @@ export default {
}
},
props: {
seperator: {
separator: {
type: String,
default: '/'
}

8
src/breadcrumb/src/BreadcrumbItem.vue
View File

@ -3,8 +3,8 @@
<span class="n-breadcrumb-item__link" @click="handleClick">
<slot />
</span>
<span class="n-breadcrumb-item__seperator">
{{ seperator }}
<span class="n-breadcrumb-item__separator">
{{ separator }}
</span>
</span>
</template>
@ -18,8 +18,8 @@ export default {
}
},
computed: {
seperator () {
return this.NBreadcrumb.seperator
separator () {
return this.NBreadcrumb.separator
}
},
methods: {

8
src/breadcrumb/src/styles/themed-base.cssr.js
View File

@ -5,7 +5,7 @@ export default c([
const base = props.$base
const easeInOutCubicBezier = base.easeInOutCubicBezier
const {
seperatorColor,
separatorColor,
itemTextColor,
itemTextColorHover,
itemTextColorActive,
@ -35,9 +35,9 @@ export default c([
transition: `color .3s ${easeInOutCubicBezier}`,
color: itemTextColor
}),
cE('seperator', {
cE('separator', {
margin: '0 4px',
color: seperatorColor,
color: separatorColor,
transition: `color .3s ${easeInOutCubicBezier}`
}),
c('&:hover', [
@ -67,7 +67,7 @@ export default c([
fill: itemTextColorMatch,
stroke: itemTextColorMatch
}),
cE('seperator', {
cE('separator', {
display: 'none'
})
])

2
src/breadcrumb/styles/dark.js
View File

@ -9,7 +9,7 @@ export default create({
itemTextColorHover: derived.primaryHoverColor,
itemTextColorActive: derived.primaryActiveColor,
itemTextColorMatch: derived.secondaryTextOverlayColor,
seperatorColor: derived.tertiaryTextOverlayColor
separatorColor: derived.tertiaryTextOverlayColor
}
}
})

2
src/breadcrumb/styles/light.js
View File

@ -9,7 +9,7 @@ export default create({
itemTextColorHover: derived.primaryHoverColor,
itemTextColorActive: derived.primaryActiveColor,
itemTextColorMatch: derived.secondaryTextColor,
seperatorColor: derived.tertiaryTextColor
separatorColor: derived.tertiaryTextColor
}
}
})

4
src/input/src/Input.vue
View File

@ -89,7 +89,7 @@
v-if="pair"
class="n-input__splitor"
>
{{ seperator }}
{{ separator }}
</span>
<div v-if="pair" class="n-input-second-input">
<input
@ -236,7 +236,7 @@ export default {
type: Boolean,
default: false
},
seperator: {
separator: {
type: String,
default: null
},

2
src/locale/enUS.js
View File

@ -32,7 +32,7 @@ export default {
Thu: 'Thu',
Fri: 'Fri',
Sat: 'Sat',
seperator: 'to',
separator: 'to',
clear: 'Clear',
now: 'Now',
confirm: 'Confirm',

2
src/locale/zhCN.js
View File

@ -32,7 +32,7 @@ export default {
Thu: '四',
Fri: '五',
Sat: '六',
seperator: '至',
separator: '至',
clear: '清除',
now: '此刻',
confirm: '确认',