Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
1006ae6a
U
uni-app
项目概览
DCloud
/
uni-app
29 天 前同步成功
通知
702
Star
38704
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,发现更多精彩内容 >>
提交
1006ae6a
编写于
1月 17, 2020
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' into alpha
上级
4a0789c1
4e05397c
变更
15
展开全部
隐藏空白更改
内联
并排
Showing
15 changed file
with
99 addition
and
76 deletion
+99
-76
packages/uni-app-plus/dist/index.js
packages/uni-app-plus/dist/index.js
+1
-1
packages/uni-app-plus/dist/service.runtime.esm.js
packages/uni-app-plus/dist/service.runtime.esm.js
+4
-2
packages/uni-mp-baidu/dist/index.js
packages/uni-mp-baidu/dist/index.js
+1
-1
packages/uni-mp-qq/dist/index.js
packages/uni-mp-qq/dist/index.js
+1
-1
packages/uni-mp-toutiao/dist/index.js
packages/uni-mp-toutiao/dist/index.js
+1
-1
packages/uni-mp-weixin/dist/index.js
packages/uni-mp-weixin/dist/index.js
+1
-1
packages/uni-template-compiler/__tests__/compiler-app-plus-extra.view.spec.js
...e-compiler/__tests__/compiler-app-plus-extra.view.spec.js
+7
-7
packages/uni-template-compiler/__tests__/compiler-app-plus.view.spec.js
...emplate-compiler/__tests__/compiler-app-plus.view.spec.js
+53
-53
packages/uni-template-compiler/lib/app/view.js
packages/uni-template-compiler/lib/app/view.js
+5
-5
packages/vue-cli-plugin-uni/lib/app-plus/index.js
packages/vue-cli-plugin-uni/lib/app-plus/index.js
+15
-0
packages/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js
packages/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js
+1
-1
packages/vue-cli-plugin-uni/packages/webpack-uni-app-loader/service/style.js
...ugin-uni/packages/webpack-uni-app-loader/service/style.js
+6
-0
packages/vue-cli-plugin-uni/packages/webpack-uni-app-loader/view/main.js
...i-plugin-uni/packages/webpack-uni-app-loader/view/main.js
+1
-1
src/core/view/bridge/subscribe/api/request-component-info.js
src/core/view/bridge/subscribe/api/request-component-info.js
+1
-1
src/platforms/mp-weixin/runtime/wrapper/component-base-parser.js
...tforms/mp-weixin/runtime/wrapper/component-base-parser.js
+1
-1
未找到文件。
packages/uni-app-plus/dist/index.js
浏览文件 @
1006ae6a
...
...
@@ -1359,7 +1359,7 @@ function parseBaseComponent (vueComponentOptions, {
}
},
detached
()
{
this
.
$vm
.
$destroy
();
this
.
$vm
&&
this
.
$vm
.
$destroy
();
}
},
pageLifetimes
:
{
...
...
packages/uni-app-plus/dist/service.runtime.esm.js
浏览文件 @
1006ae6a
...
...
@@ -5639,8 +5639,10 @@ function insertBefore() {
}
function
removeChild
()
{
function
removeChild
(
node
,
child
)
{
if
(
child
&&
child
.
_$vd
)
{
child
.
_$vd
.
removeElement
(
child
);
}
}
function
appendChild
()
{
...
...
packages/uni-mp-baidu/dist/index.js
浏览文件 @
1006ae6a
...
...
@@ -1493,7 +1493,7 @@ function parseBaseComponent (vueComponentOptions, {
}
},
detached
()
{
this
.
$vm
.
$destroy
();
this
.
$vm
&&
this
.
$vm
.
$destroy
();
}
},
pageLifetimes
:
{
...
...
packages/uni-mp-qq/dist/index.js
浏览文件 @
1006ae6a
...
...
@@ -1418,7 +1418,7 @@ function parseBaseComponent (vueComponentOptions, {
}
},
detached
()
{
this
.
$vm
.
$destroy
();
this
.
$vm
&&
this
.
$vm
.
$destroy
();
}
},
pageLifetimes
:
{
...
...
packages/uni-mp-toutiao/dist/index.js
浏览文件 @
1006ae6a
...
...
@@ -1583,7 +1583,7 @@ function parseBaseComponent (vueComponentOptions, {
}
},
detached
()
{
this
.
$vm
.
$destroy
();
this
.
$vm
&&
this
.
$vm
.
$destroy
();
}
},
pageLifetimes
:
{
...
...
packages/uni-mp-weixin/dist/index.js
浏览文件 @
1006ae6a
...
...
@@ -1371,7 +1371,7 @@ function parseBaseComponent (vueComponentOptions, {
}
},
detached
()
{
this
.
$vm
.
$destroy
();
this
.
$vm
&&
this
.
$vm
.
$destroy
();
}
},
pageLifetimes
:
{
...
...
packages/uni-template-compiler/__tests__/compiler-app-plus-extra.view.spec.js
浏览文件 @
1006ae6a
...
...
@@ -16,29 +16,29 @@ describe('codegen', () => {
it
(
'
generate directive
'
,
()
=>
{
assertCodegen
(
'
<p v-custom1:[arg1].modifier="value1" v-custom2></p>
'
,
`with(this){return _c('
v-uni-view
',{attrs:{"_i":0}})}`
`with(this){return _c('
p
',{attrs:{"_i":0}})}`
)
})
it
(
'
generate v-for directive
'
,
()
=>
{
assertCodegen
(
'
<div><template v-for="item in items"><div></div><div></div></template></div>
'
,
`with(this){return _c('
v-uni-view',{attrs:{"_i":0}},[_l((_$g(1,'f')),function(item,$10,$20,$30){return [_c('v-uni-view',{key:item['k0'],attrs:{"_i":("2-"+$30)}}),_c('v-uni-view
',{key:item['k1'],attrs:{"_i":("3-"+$30)}})]})],2)}`
`with(this){return _c('
div',{attrs:{"_i":0}},[_l((_$g(1,'f')),function(item,$10,$20,$30){return [_c('div',{key:item['k0'],attrs:{"_i":("2-"+$30)}}),_c('div
',{key:item['k1'],attrs:{"_i":("3-"+$30)}})]})],2)}`
)
assertCodegen
(
'
<div><template v-for="item in items"><span v-if="item.sub"></span></template></div>
'
,
`with(this){return _c('
v-uni-view',{attrs:{"_i":0}},[_l((_$g(1,'f')),function(item,$10,$20,$30){return [(_$g(("2-"+$30),'i'))?_c('v-uni-label
',{key:item['k0'],attrs:{"_i":("2-"+$30)}}):_e()]})],2)}`
`with(this){return _c('
div',{attrs:{"_i":0}},[_l((_$g(1,'f')),function(item,$10,$20,$30){return [(_$g(("2-"+$30),'i'))?_c('span
',{key:item['k0'],attrs:{"_i":("2-"+$30)}}):_e()]})],2)}`
)
})
it
(
'
generate events with multiple statements
'
,
()
=>
{
assertCodegen
(
'
<div>A{{ d | e | f }}B{{text}}C</div>
'
,
`with(this){return _c('
v-uni-view
',{attrs:{"_i":0}},[_v("A"+(_$g(0,'t0'))+"B"+(_$g(0,'t1'))+"C")])}`
`with(this){return _c('
div
',{attrs:{"_i":0}},[_v("A"+(_$g(0,'t0'))+"B"+(_$g(0,'t1'))+"C")])}`
)
})
it
(
'
generate slot fallback content
'
,
()
=>
{
assertCodegen
(
'
<div><slot><div>{{hi}}</div></slot></div>
'
,
`with(this){return _c('
v-uni-view',{attrs:{"_i":0}},[_t("default",[_c('v-uni-view
',{attrs:{"_i":2}},[_v((_$g(2,'t0')))])],{"_i":1})],2)}`
`with(this){return _c('
div',{attrs:{"_i":0}},[_t("default",[_c('div
',{attrs:{"_i":2}},[_v((_$g(2,'t0')))])],{"_i":1})],2)}`
)
})
it
(
'
generate v-slot
'
,
()
=>
{
...
...
@@ -60,14 +60,14 @@ describe('codegen', () => {
it
(
'
generate wxs props
'
,
()
=>
{
assertCodegen
(
'
<p :change:prop="swipe.sizeReady" :prop="pos" @touchstart="swipe.touchstart" @touchmove="swipe.touchmove" @touchend="swipe.touchend" @change="change"></p>
'
,
`with(this){return _c('
v-uni-view
',{wxsProps:{"change:prop":"pos"},attrs:{"change:prop":swipe.sizeReady,"prop":_$gc(0,'change:pos'),"_i":0},on:{"touchstart":function($event){$event = $handleWxsEvent($event);swipe.touchstart($event, $getComponentDescriptor())},"touchmove":function($event){$event = $handleWxsEvent($event);swipe.touchmove($event, $getComponentDescriptor())},"touchend":function($event){$event = $handleWxsEvent($event);swipe.touchend($event, $getComponentDescriptor())},"change":function($event){return $handleViewEvent($event)}}})}`
`with(this){return _c('
p
',{wxsProps:{"change:prop":"pos"},attrs:{"change:prop":swipe.sizeReady,"prop":_$gc(0,'change:pos'),"_i":0},on:{"touchstart":function($event){$event = $handleWxsEvent($event);swipe.touchstart($event, $getComponentDescriptor())},"touchmove":function($event){$event = $handleWxsEvent($event);swipe.touchmove($event, $getComponentDescriptor())},"touchend":function($event){$event = $handleWxsEvent($event);swipe.touchend($event, $getComponentDescriptor())},"change":function($event){return $handleViewEvent($event)}}})}`
)
})
// TODO 后续优化dataset
// it('generate dataset', () => {
// assertCodegen(
// '<view data-a="1" :data-b="b"></view>',
// `with(this){return _c('
v-uni-view
',{attrs:{"_i":0}})}`
// `with(this){return _c('
div
',{attrs:{"_i":0}})}`
// )
// })
it
(
'
generate dataset
'
,
()
=>
{
...
...
packages/uni-template-compiler/__tests__/compiler-app-plus.view.spec.js
浏览文件 @
1006ae6a
此差异已折叠。
点击以展开。
packages/uni-template-compiler/lib/app/view.js
浏览文件 @
1006ae6a
...
...
@@ -209,11 +209,11 @@ function handleViewEvents (events) {
function
genVModel
(
el
,
isScopedSlot
)
{
if
(
el
.
model
)
{
el
.
model
.
value
=
createGenVar
(
el
.
attrsMap
[
ID
],
isScopedSlot
)(
'
v-model
'
,
el
.
model
.
value
)
if
(
el
.
tag
===
'
v-uni-input
'
||
el
.
tag
===
'
v-uni-textarea
'
)
{
el
.
model
.
callback
=
`function($$v){$handleVModelEvent(
${
el
.
attrsMap
[
ID
]}
,$$v)}`
}
else
{
el
.
model
.
callback
=
`function(){}`
}
//
if (el.tag === 'v-uni-input' || el.tag === 'v-uni-textarea') {
//
el.model.callback = `function($$v){$handleVModelEvent(${el.attrsMap[ID]},$$v)}`
//
} else {
el
.
model
.
callback
=
`function(){}`
//
}
}
}
...
...
packages/vue-cli-plugin-uni/lib/app-plus/index.js
浏览文件 @
1006ae6a
...
...
@@ -110,6 +110,15 @@ const v3 = {
}]
})
if
(
isAppService
)
{
rules
.
push
({
test
:
[
/
\.
css$/
,
/
\.
p
(
ost
)?
css$/
,
/
\.
scss$/
,
/
\.
sass$/
,
/
\.
less$/
,
/
\.
styl
(
us
)?
$/
],
use
:
[{
loader
:
path
.
resolve
(
__dirname
,
'
../../packages/webpack-uni-app-loader/service/style.js
'
)
}]
})
}
const
entry
=
{}
if
(
isAppService
)
{
entry
[
'
app-service
'
]
=
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
getMainEntry
())
...
...
@@ -281,6 +290,12 @@ const v3 = {
}
}
if
(
isAppService
)
{
// service 层移除 css 相关
[
'
css
'
,
'
postcss
'
,
'
scss
'
,
'
sass
'
,
'
less
'
,
'
stylus
'
].
forEach
(
cssLang
=>
{
webpackConfig
.
module
.
rules
.
delete
(
cssLang
)
})
}
webpackConfig
.
plugins
.
delete
(
'
hmr
'
)
webpackConfig
.
plugins
.
delete
(
'
html
'
)
webpackConfig
.
plugins
.
delete
(
'
copy
'
)
...
...
packages/vue-cli-plugin-uni/packages/uni-cloud/dist/index.js
浏览文件 @
1006ae6a
此差异已折叠。
点击以展开。
packages/vue-cli-plugin-uni/packages/webpack-uni-app-loader/service/style.js
0 → 100644
浏览文件 @
1006ae6a
module
.
exports
=
function
(
source
,
map
)
{
console
.
warn
(
`App平台 v3 模式暂不支持在 js 文件中引用"
${
this
.
_module
&&
this
.
_module
.
rawRequest
||
this
.
resourcePath
}
"`
)
return
''
}
packages/vue-cli-plugin-uni/packages/webpack-uni-app-loader/view/main.js
浏览文件 @
1006ae6a
...
...
@@ -103,7 +103,7 @@ module.exports = function(source, map) {
import 'uni-pages?
${
JSON
.
stringify
({
type
:
'
view
'
})}
'
function initView(){
${
getStylesCode
(
this
)}
injectStyles()
typeof injectStyles ==='function' &&
injectStyles()
${
getDefineComponents
(
parseComponents
(
source
,
traverse
)).
join
(
'
\n
'
)}
UniViewJSBridge.publishHandler('webviewReady')
}
...
...
src/core/view/bridge/subscribe/api/request-component-info.js
浏览文件 @
1006ae6a
...
...
@@ -50,7 +50,7 @@ function getNodeInfo (el, fields) {
info
.
left
=
rect
.
left
info
.
right
=
rect
.
right
info
.
top
=
rect
.
top
-
top
info
.
bottom
=
rect
.
bottom
info
.
bottom
=
rect
.
bottom
-
top
}
if
(
fields
.
size
)
{
info
.
width
=
rect
.
width
...
...
src/platforms/mp-weixin/runtime/wrapper/component-base-parser.js
浏览文件 @
1006ae6a
...
...
@@ -77,7 +77,7 @@ export default function parseBaseComponent (vueComponentOptions, {
}
},
detached
()
{
this
.
$vm
.
$destroy
()
this
.
$vm
&&
this
.
$vm
.
$destroy
()
}
},
pageLifetimes
:
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录