Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
28abd0a5
U
uni-app
项目概览
DCloud
/
uni-app
2 个月 前同步成功
通知
718
Star
38705
Fork
3642
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
7
列表
看板
标记
里程碑
合并请求
1
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
7
Issue
7
列表
看板
标记
里程碑
合并请求
1
合并请求
1
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
28abd0a5
编写于
4月 20, 2019
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
build uni runtime (props.type [String]=>String, mp-baidu:[String,Boolean]=>Boolean)
上级
5badfe66
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
125 addition
and
19 deletion
+125
-19
packages/uni-app-plus/dist/index.js
packages/uni-app-plus/dist/index.js
+15
-3
packages/uni-app-plus/package.json
packages/uni-app-plus/package.json
+1
-1
packages/uni-mp-baidu/dist/index.js
packages/uni-mp-baidu/dist/index.js
+38
-3
packages/uni-mp-baidu/package.json
packages/uni-mp-baidu/package.json
+1
-1
packages/uni-mp-toutiao/dist/index.js
packages/uni-mp-toutiao/dist/index.js
+15
-3
packages/uni-mp-toutiao/package.json
packages/uni-mp-toutiao/package.json
+1
-1
packages/uni-mp-weixin/dist/index.js
packages/uni-mp-weixin/dist/index.js
+15
-3
packages/uni-mp-weixin/package.json
packages/uni-mp-weixin/package.json
+1
-1
src/core/runtime/wrapper/create-component.js
src/core/runtime/wrapper/create-component.js
+1
-1
src/core/runtime/wrapper/util.js
src/core/runtime/wrapper/util.js
+37
-2
未找到文件。
packages/uni-app-plus/dist/index.js
浏览文件 @
28abd0a5
...
@@ -393,7 +393,15 @@ function getBehaviors (vueExtends, vueMixins) {
...
@@ -393,7 +393,15 @@ function getBehaviors (vueExtends, vueMixins) {
return
behaviors
return
behaviors
}
}
function
getProperties
(
props
,
isBehavior
=
false
)
{
function
parsePropType
(
key
,
type
,
file
)
{
// [String]=>String
if
(
Array
.
isArray
(
type
)
&&
type
.
length
===
1
)
{
return
type
[
0
]
}
return
type
}
function
getProperties
(
props
,
isBehavior
=
false
,
file
=
''
)
{
const
properties
=
{};
const
properties
=
{};
if
(
!
isBehavior
)
{
if
(
!
isBehavior
)
{
properties
.
vueSlots
=
{
// 小程序不能直接定义 $slots 的 props,所以通过 vueSlots 转换到 $slots
properties
.
vueSlots
=
{
// 小程序不能直接定义 $slots 的 props,所以通过 vueSlots 转换到 $slots
...
@@ -425,14 +433,18 @@ function getProperties (props, isBehavior = false) {
...
@@ -425,14 +433,18 @@ function getProperties (props, isBehavior = false) {
if
(
isFn
(
value
))
{
if
(
isFn
(
value
))
{
value
=
value
();
value
=
value
();
}
}
opts
.
type
=
parsePropType
(
key
,
opts
.
type
,
file
);
properties
[
key
]
=
{
properties
[
key
]
=
{
type
:
PROP_TYPES
.
indexOf
(
opts
.
type
)
!==
-
1
?
opts
.
type
:
null
,
type
:
PROP_TYPES
.
indexOf
(
opts
.
type
)
!==
-
1
?
opts
.
type
:
null
,
value
,
value
,
observer
:
createObserver
(
key
)
observer
:
createObserver
(
key
)
};
};
}
else
{
// content:String
}
else
{
// content:String
const
type
=
parsePropType
(
key
,
opts
,
file
);
properties
[
key
]
=
{
properties
[
key
]
=
{
type
:
PROP_TYPES
.
indexOf
(
opts
)
!==
-
1
?
opts
:
null
,
type
:
PROP_TYPES
.
indexOf
(
type
)
!==
-
1
?
type
:
null
,
observer
:
createObserver
(
key
)
observer
:
createObserver
(
key
)
};
};
}
}
...
@@ -875,7 +887,7 @@ function initVm$2 (VueComponent) {
...
@@ -875,7 +887,7 @@ function initVm$2 (VueComponent) {
function
createComponent
(
vueOptions
)
{
function
createComponent
(
vueOptions
)
{
vueOptions
=
vueOptions
.
default
||
vueOptions
;
vueOptions
=
vueOptions
.
default
||
vueOptions
;
const
properties
=
getProperties
(
vueOptions
.
props
);
const
properties
=
getProperties
(
vueOptions
.
props
,
false
,
vueOptions
.
__file
);
const
behaviors
=
getBehaviors
(
vueOptions
[
'
extends
'
],
vueOptions
[
'
mixins
'
]);
const
behaviors
=
getBehaviors
(
vueOptions
[
'
extends
'
],
vueOptions
[
'
mixins
'
]);
...
...
packages/uni-app-plus/package.json
浏览文件 @
28abd0a5
{
{
"name"
:
"@dcloudio/uni-app-plus"
,
"name"
:
"@dcloudio/uni-app-plus"
,
"version"
:
"0.0.22
3
"
,
"version"
:
"0.0.22
4
"
,
"description"
:
"uni-app app-plus"
,
"description"
:
"uni-app app-plus"
,
"main"
:
"dist/index.js"
,
"main"
:
"dist/index.js"
,
"scripts"
:
{
"scripts"
:
{
...
...
packages/uni-mp-baidu/dist/index.js
浏览文件 @
28abd0a5
...
@@ -528,7 +528,38 @@ function getBehaviors (vueExtends, vueMixins) {
...
@@ -528,7 +528,38 @@ function getBehaviors (vueExtends, vueMixins) {
return
behaviors
return
behaviors
}
}
function
getProperties
(
props
,
isBehavior
=
false
)
{
function
parsePropType
(
key
,
type
,
file
)
{
// [String]=>String
if
(
Array
.
isArray
(
type
)
&&
type
.
length
===
1
)
{
return
type
[
0
]
}
{
if
(
Array
.
isArray
(
type
)
&&
type
.
length
===
2
&&
type
.
indexOf
(
String
)
!==
-
1
)
{
// [String,Boolean]=>Boolean
if
(
type
.
indexOf
(
Boolean
)
!==
-
1
)
{
if
(
file
)
{
console
.
warn
(
`props.
${
key
}
.type should use Boolean instead of [String,Boolean] . at
${
file
}
`
);
}
return
Boolean
}
else
if
(
type
.
indexOf
(
Number
)
!==
-
1
)
{
if
(
file
)
{
console
.
warn
(
`props.
${
key
}
.type should use String or Number instead of [String,Number]. at
${
file
}
`
);
}
return
String
}
}
}
return
type
}
function
getProperties
(
props
,
isBehavior
=
false
,
file
=
''
)
{
const
properties
=
{};
const
properties
=
{};
if
(
!
isBehavior
)
{
if
(
!
isBehavior
)
{
properties
.
vueSlots
=
{
// 小程序不能直接定义 $slots 的 props,所以通过 vueSlots 转换到 $slots
properties
.
vueSlots
=
{
// 小程序不能直接定义 $slots 的 props,所以通过 vueSlots 转换到 $slots
...
@@ -560,14 +591,18 @@ function getProperties (props, isBehavior = false) {
...
@@ -560,14 +591,18 @@ function getProperties (props, isBehavior = false) {
if
(
isFn
(
value
))
{
if
(
isFn
(
value
))
{
value
=
value
();
value
=
value
();
}
}
opts
.
type
=
parsePropType
(
key
,
opts
.
type
,
file
);
properties
[
key
]
=
{
properties
[
key
]
=
{
type
:
PROP_TYPES
.
indexOf
(
opts
.
type
)
!==
-
1
?
opts
.
type
:
null
,
type
:
PROP_TYPES
.
indexOf
(
opts
.
type
)
!==
-
1
?
opts
.
type
:
null
,
value
,
value
,
observer
:
createObserver
(
key
)
observer
:
createObserver
(
key
)
};
};
}
else
{
// content:String
}
else
{
// content:String
const
type
=
parsePropType
(
key
,
opts
,
file
);
properties
[
key
]
=
{
properties
[
key
]
=
{
type
:
PROP_TYPES
.
indexOf
(
opts
)
!==
-
1
?
opts
:
null
,
type
:
PROP_TYPES
.
indexOf
(
type
)
!==
-
1
?
type
:
null
,
observer
:
createObserver
(
key
)
observer
:
createObserver
(
key
)
};
};
}
}
...
@@ -1042,7 +1077,7 @@ function initVm$2 (VueComponent) {
...
@@ -1042,7 +1077,7 @@ function initVm$2 (VueComponent) {
function
createComponent
(
vueOptions
)
{
function
createComponent
(
vueOptions
)
{
vueOptions
=
vueOptions
.
default
||
vueOptions
;
vueOptions
=
vueOptions
.
default
||
vueOptions
;
const
properties
=
getProperties
(
vueOptions
.
props
);
const
properties
=
getProperties
(
vueOptions
.
props
,
false
,
vueOptions
.
__file
);
const
behaviors
=
getBehaviors
(
vueOptions
[
'
extends
'
],
vueOptions
[
'
mixins
'
]);
const
behaviors
=
getBehaviors
(
vueOptions
[
'
extends
'
],
vueOptions
[
'
mixins
'
]);
...
...
packages/uni-mp-baidu/package.json
浏览文件 @
28abd0a5
{
{
"name"
:
"@dcloudio/uni-mp-baidu"
,
"name"
:
"@dcloudio/uni-mp-baidu"
,
"version"
:
"0.0.8
18
"
,
"version"
:
"0.0.8
20
"
,
"description"
:
"uni-app mp-baidu"
,
"description"
:
"uni-app mp-baidu"
,
"main"
:
"dist/index.js"
,
"main"
:
"dist/index.js"
,
"scripts"
:
{
"scripts"
:
{
...
...
packages/uni-mp-toutiao/dist/index.js
浏览文件 @
28abd0a5
...
@@ -573,7 +573,15 @@ function getBehaviors (vueExtends, vueMixins) {
...
@@ -573,7 +573,15 @@ function getBehaviors (vueExtends, vueMixins) {
return
behaviors
return
behaviors
}
}
function
getProperties
(
props
,
isBehavior
=
false
)
{
function
parsePropType
(
key
,
type
,
file
)
{
// [String]=>String
if
(
Array
.
isArray
(
type
)
&&
type
.
length
===
1
)
{
return
type
[
0
]
}
return
type
}
function
getProperties
(
props
,
isBehavior
=
false
,
file
=
''
)
{
const
properties
=
{};
const
properties
=
{};
if
(
!
isBehavior
)
{
if
(
!
isBehavior
)
{
properties
.
vueSlots
=
{
// 小程序不能直接定义 $slots 的 props,所以通过 vueSlots 转换到 $slots
properties
.
vueSlots
=
{
// 小程序不能直接定义 $slots 的 props,所以通过 vueSlots 转换到 $slots
...
@@ -605,14 +613,18 @@ function getProperties (props, isBehavior = false) {
...
@@ -605,14 +613,18 @@ function getProperties (props, isBehavior = false) {
if
(
isFn
(
value
))
{
if
(
isFn
(
value
))
{
value
=
value
();
value
=
value
();
}
}
opts
.
type
=
parsePropType
(
key
,
opts
.
type
,
file
);
properties
[
key
]
=
{
properties
[
key
]
=
{
type
:
PROP_TYPES
.
indexOf
(
opts
.
type
)
!==
-
1
?
opts
.
type
:
null
,
type
:
PROP_TYPES
.
indexOf
(
opts
.
type
)
!==
-
1
?
opts
.
type
:
null
,
value
,
value
,
observer
:
createObserver
(
key
)
observer
:
createObserver
(
key
)
};
};
}
else
{
// content:String
}
else
{
// content:String
const
type
=
parsePropType
(
key
,
opts
,
file
);
properties
[
key
]
=
{
properties
[
key
]
=
{
type
:
PROP_TYPES
.
indexOf
(
opts
)
!==
-
1
?
opts
:
null
,
type
:
PROP_TYPES
.
indexOf
(
type
)
!==
-
1
?
type
:
null
,
observer
:
createObserver
(
key
)
observer
:
createObserver
(
key
)
};
};
}
}
...
@@ -1066,7 +1078,7 @@ function initVm$2 (VueComponent) {
...
@@ -1066,7 +1078,7 @@ function initVm$2 (VueComponent) {
function
createComponent
(
vueOptions
)
{
function
createComponent
(
vueOptions
)
{
vueOptions
=
vueOptions
.
default
||
vueOptions
;
vueOptions
=
vueOptions
.
default
||
vueOptions
;
const
properties
=
getProperties
(
vueOptions
.
props
);
const
properties
=
getProperties
(
vueOptions
.
props
,
false
,
vueOptions
.
__file
);
const
behaviors
=
getBehaviors
(
vueOptions
[
'
extends
'
],
vueOptions
[
'
mixins
'
]);
const
behaviors
=
getBehaviors
(
vueOptions
[
'
extends
'
],
vueOptions
[
'
mixins
'
]);
...
...
packages/uni-mp-toutiao/package.json
浏览文件 @
28abd0a5
{
{
"name"
:
"@dcloudio/uni-mp-toutiao"
,
"name"
:
"@dcloudio/uni-mp-toutiao"
,
"version"
:
"0.0.31
8
"
,
"version"
:
"0.0.31
9
"
,
"description"
:
"uni-app mp-toutiao"
,
"description"
:
"uni-app mp-toutiao"
,
"main"
:
"dist/index.js"
,
"main"
:
"dist/index.js"
,
"scripts"
:
{
"scripts"
:
{
...
...
packages/uni-mp-weixin/dist/index.js
浏览文件 @
28abd0a5
...
@@ -420,7 +420,15 @@ function getBehaviors (vueExtends, vueMixins) {
...
@@ -420,7 +420,15 @@ function getBehaviors (vueExtends, vueMixins) {
return
behaviors
return
behaviors
}
}
function
getProperties
(
props
,
isBehavior
=
false
)
{
function
parsePropType
(
key
,
type
,
file
)
{
// [String]=>String
if
(
Array
.
isArray
(
type
)
&&
type
.
length
===
1
)
{
return
type
[
0
]
}
return
type
}
function
getProperties
(
props
,
isBehavior
=
false
,
file
=
''
)
{
const
properties
=
{};
const
properties
=
{};
if
(
!
isBehavior
)
{
if
(
!
isBehavior
)
{
properties
.
vueSlots
=
{
// 小程序不能直接定义 $slots 的 props,所以通过 vueSlots 转换到 $slots
properties
.
vueSlots
=
{
// 小程序不能直接定义 $slots 的 props,所以通过 vueSlots 转换到 $slots
...
@@ -452,14 +460,18 @@ function getProperties (props, isBehavior = false) {
...
@@ -452,14 +460,18 @@ function getProperties (props, isBehavior = false) {
if
(
isFn
(
value
))
{
if
(
isFn
(
value
))
{
value
=
value
();
value
=
value
();
}
}
opts
.
type
=
parsePropType
(
key
,
opts
.
type
,
file
);
properties
[
key
]
=
{
properties
[
key
]
=
{
type
:
PROP_TYPES
.
indexOf
(
opts
.
type
)
!==
-
1
?
opts
.
type
:
null
,
type
:
PROP_TYPES
.
indexOf
(
opts
.
type
)
!==
-
1
?
opts
.
type
:
null
,
value
,
value
,
observer
:
createObserver
(
key
)
observer
:
createObserver
(
key
)
};
};
}
else
{
// content:String
}
else
{
// content:String
const
type
=
parsePropType
(
key
,
opts
,
file
);
properties
[
key
]
=
{
properties
[
key
]
=
{
type
:
PROP_TYPES
.
indexOf
(
opts
)
!==
-
1
?
opts
:
null
,
type
:
PROP_TYPES
.
indexOf
(
type
)
!==
-
1
?
type
:
null
,
observer
:
createObserver
(
key
)
observer
:
createObserver
(
key
)
};
};
}
}
...
@@ -895,7 +907,7 @@ function initVm$2 (VueComponent) {
...
@@ -895,7 +907,7 @@ function initVm$2 (VueComponent) {
function
createComponent
(
vueOptions
)
{
function
createComponent
(
vueOptions
)
{
vueOptions
=
vueOptions
.
default
||
vueOptions
;
vueOptions
=
vueOptions
.
default
||
vueOptions
;
const
properties
=
getProperties
(
vueOptions
.
props
);
const
properties
=
getProperties
(
vueOptions
.
props
,
false
,
vueOptions
.
__file
);
const
behaviors
=
getBehaviors
(
vueOptions
[
'
extends
'
],
vueOptions
[
'
mixins
'
]);
const
behaviors
=
getBehaviors
(
vueOptions
[
'
extends
'
],
vueOptions
[
'
mixins
'
]);
...
...
packages/uni-mp-weixin/package.json
浏览文件 @
28abd0a5
{
{
"name"
:
"@dcloudio/uni-mp-weixin"
,
"name"
:
"@dcloudio/uni-mp-weixin"
,
"version"
:
"0.0.94
2
"
,
"version"
:
"0.0.94
3
"
,
"description"
:
"uni-app mp-weixin"
,
"description"
:
"uni-app mp-weixin"
,
"main"
:
"dist/index.js"
,
"main"
:
"dist/index.js"
,
"scripts"
:
{
"scripts"
:
{
...
...
src/core/runtime/wrapper/create-component.js
浏览文件 @
28abd0a5
...
@@ -43,7 +43,7 @@ function initVm (VueComponent) {
...
@@ -43,7 +43,7 @@ function initVm (VueComponent) {
export
function
createComponent
(
vueOptions
)
{
export
function
createComponent
(
vueOptions
)
{
vueOptions
=
vueOptions
.
default
||
vueOptions
vueOptions
=
vueOptions
.
default
||
vueOptions
const
properties
=
getProperties
(
vueOptions
.
props
)
const
properties
=
getProperties
(
vueOptions
.
props
,
false
,
vueOptions
.
__file
)
const
behaviors
=
getBehaviors
(
vueOptions
[
'
extends
'
],
vueOptions
[
'
mixins
'
])
const
behaviors
=
getBehaviors
(
vueOptions
[
'
extends
'
],
vueOptions
[
'
mixins
'
])
...
...
src/core/runtime/wrapper/util.js
浏览文件 @
28abd0a5
...
@@ -89,7 +89,38 @@ export function getBehaviors (vueExtends, vueMixins) {
...
@@ -89,7 +89,38 @@ export function getBehaviors (vueExtends, vueMixins) {
return
behaviors
return
behaviors
}
}
export
function
getProperties
(
props
,
isBehavior
=
false
)
{
function
parsePropType
(
key
,
type
,
file
)
{
// [String]=>String
if
(
Array
.
isArray
(
type
)
&&
type
.
length
===
1
)
{
return
type
[
0
]
}
if
(
__PLATFORM__
===
'
mp-baidu
'
)
{
if
(
Array
.
isArray
(
type
)
&&
type
.
length
===
2
&&
type
.
indexOf
(
String
)
!==
-
1
)
{
// [String,Boolean]=>Boolean
if
(
type
.
indexOf
(
Boolean
)
!==
-
1
)
{
if
(
file
)
{
console
.
warn
(
`props.
${
key
}
.type should use Boolean instead of [String,Boolean] . at
${
file
}
`
)
}
return
Boolean
}
else
if
(
type
.
indexOf
(
Number
)
!==
-
1
)
{
if
(
file
)
{
console
.
warn
(
`props.
${
key
}
.type should use String or Number instead of [String,Number]. at
${
file
}
`
)
}
return
String
}
}
}
return
type
}
export
function
getProperties
(
props
,
isBehavior
=
false
,
file
=
''
)
{
const
properties
=
{}
const
properties
=
{}
if
(
!
isBehavior
)
{
if
(
!
isBehavior
)
{
properties
.
vueSlots
=
{
// 小程序不能直接定义 $slots 的 props,所以通过 vueSlots 转换到 $slots
properties
.
vueSlots
=
{
// 小程序不能直接定义 $slots 的 props,所以通过 vueSlots 转换到 $slots
...
@@ -121,14 +152,18 @@ export function getProperties (props, isBehavior = false) {
...
@@ -121,14 +152,18 @@ export function getProperties (props, isBehavior = false) {
if
(
isFn
(
value
))
{
if
(
isFn
(
value
))
{
value
=
value
()
value
=
value
()
}
}
opts
.
type
=
parsePropType
(
key
,
opts
.
type
,
file
)
properties
[
key
]
=
{
properties
[
key
]
=
{
type
:
PROP_TYPES
.
indexOf
(
opts
.
type
)
!==
-
1
?
opts
.
type
:
null
,
type
:
PROP_TYPES
.
indexOf
(
opts
.
type
)
!==
-
1
?
opts
.
type
:
null
,
value
,
value
,
observer
:
createObserver
(
key
)
observer
:
createObserver
(
key
)
}
}
}
else
{
// content:String
}
else
{
// content:String
const
type
=
parsePropType
(
key
,
opts
,
file
)
properties
[
key
]
=
{
properties
[
key
]
=
{
type
:
PROP_TYPES
.
indexOf
(
opts
)
!==
-
1
?
opts
:
null
,
type
:
PROP_TYPES
.
indexOf
(
type
)
!==
-
1
?
type
:
null
,
observer
:
createObserver
(
key
)
observer
:
createObserver
(
key
)
}
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录