Merge branch 'vue3' of github.com:07akioni/naive-ui into vue3

This commit is contained in:
07akioni 2021-03-05 00:44:14 +08:00
commit 6630da1f14
5 changed files with 15 additions and 6 deletions

View File

@ -1,6 +1,6 @@
{
"name": "naive-ui",
"version": "2.0.0-rc.4",
"version": "2.0.0-rc.6",
"description": "A Vue UI Framework. Caring About Styles, Themed, Batteries Included, Not Rather Slow.",
"main": "lib/index.js",
"module": "es/index.js",
@ -117,7 +117,7 @@
"treemate": "^0.2.4",
"vdirs": "^0.0.3",
"vfonts": "^0.0.1",
"vooks": "^0.1.2",
"vooks": "^0.1.3",
"vue": "^3.0.7",
"vue-router": "^4.0.3",
"vueuc": "^0.2.6"

View File

@ -46,7 +46,10 @@ export default defineComponent({
type: Boolean,
default: false
},
size: String as PropType<Size>,
size: {
type: String as PropType<Size | undefined>,
default: undefined
},
rows: {
type: [Number, String] as PropType<number | string>,
default: 3

View File

@ -104,7 +104,10 @@ export default defineComponent({
type: [String, Number] as PropType<string | number | null>,
default: null
},
size: String as PropType<'small' | 'medium' | 'large'>,
size: {
type: String as PropType<'small' | 'medium' | 'large' | undefined>,
default: undefined
},
disabled: {
type: Boolean,
default: false

View File

@ -71,7 +71,10 @@ export default defineComponent({
.indexOf(('' + pattern).toLowerCase())
}
},
size: String as PropType<'small' | 'medium' | 'large'>,
size: {
type: String as PropType<'small' | 'medium' | 'large' | undefined>,
default: undefined
},
// eslint-disable-next-line vue/prop-name-casing
'onUpdate:value': [Function, Array] as PropType<MaybeArray<OnUpdateValue>>,
onUpdateValue: [Function, Array] as PropType<MaybeArray<OnUpdateValue>>,

View File

@ -1 +1 @@
export default '2.0.0-rc.4'
export default '2.0.0-rc.5'