Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
genary
uni-app
提交
cd6fe4bb
U
uni-app
项目概览
genary
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cd6fe4bb
编写于
7月 25, 2021
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(h5): wxs
上级
9ec2a554
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
28 addition
and
21 deletion
+28
-21
packages/uni-core/src/view/plugin/componentWxs.ts
packages/uni-core/src/view/plugin/componentWxs.ts
+7
-8
packages/uni-h5-vue/dist/vue.runtime.cjs.js
packages/uni-h5-vue/dist/vue.runtime.cjs.js
+3
-2
packages/uni-h5-vue/dist/vue.runtime.compat.cjs.js
packages/uni-h5-vue/dist/vue.runtime.compat.cjs.js
+3
-2
packages/uni-h5-vue/dist/vue.runtime.compat.esm.js
packages/uni-h5-vue/dist/vue.runtime.compat.esm.js
+3
-2
packages/uni-h5-vue/dist/vue.runtime.esm.js
packages/uni-h5-vue/dist/vue.runtime.esm.js
+3
-2
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+6
-2
packages/vite-plugin-uni/src/configResolved/plugins/preVue.ts
...ages/vite-plugin-uni/src/configResolved/plugins/preVue.ts
+3
-3
未找到文件。
packages/uni-core/src/view/plugin/componentWxs.ts
浏览文件 @
cd6fe4bb
...
...
@@ -189,14 +189,13 @@ function createComponentDescriptor(
vm
:
ComponentPublicInstance
,
isOwnerInstance
=
true
)
{
if
(
isOwnerInstance
&&
vm
&&
vm
.
$options
.
name
&&
isBuiltInComponent
(
hyphenate
(
vm
.
$options
.
name
))
)
{
// ownerInstance 内置组件需要使用父 vm
vm
=
vm
.
$parent
!
if
(
isOwnerInstance
&&
vm
)
{
let
componentName
=
vm
.
$options
&&
vm
.
$options
.
name
while
(
componentName
&&
isBuiltInComponent
(
hyphenate
(
componentName
)))
{
// ownerInstance 内置组件需要使用父 vm
vm
=
vm
.
$parent
!
componentName
=
vm
.
$options
&&
vm
.
$options
.
name
}
}
if
(
vm
&&
vm
.
$el
)
{
if
(
!
vm
.
$el
.
__wxsComponentDescriptor
)
{
...
...
packages/uni-h5-vue/dist/vue.runtime.cjs.js
浏览文件 @
cd6fe4bb
...
...
@@ -9146,8 +9146,9 @@ function patchWxs(el, rawName, nextValue, instance = null) {
const
proxy
=
instance
.
proxy
;
const
name
=
rawName
.
split
(
'
:
'
)[
1
];
el
.
__wxsWatches
[
rawName
]
=
proxy
.
$watch
(()
=>
instance
.
attrs
[
name
],
(
value
,
oldValue
)
=>
{
// TODO ownerInstance,instance
nextValue
(
value
,
oldValue
,
proxy
.
$gcd
(
proxy
,
true
),
proxy
.
$gcd
(
proxy
,
true
));
nextTick
(()
=>
{
nextValue
(
value
,
oldValue
,
proxy
.
$gcd
(
proxy
,
true
),
proxy
.
$gcd
(
proxy
,
false
));
});
},
{
deep
:
true
});
...
...
packages/uni-h5-vue/dist/vue.runtime.compat.cjs.js
浏览文件 @
cd6fe4bb
...
...
@@ -11014,8 +11014,9 @@ function patchWxs(el, rawName, nextValue, instance = null) {
const
proxy
=
instance
.
proxy
;
const
name
=
rawName
.
split
(
'
:
'
)[
1
];
el
.
__wxsWatches
[
rawName
]
=
proxy
.
$watch
(()
=>
instance
.
attrs
[
name
],
(
value
,
oldValue
)
=>
{
// TODO ownerInstance,instance
nextValue
(
value
,
oldValue
,
proxy
.
$gcd
(
proxy
,
true
),
proxy
.
$gcd
(
proxy
,
true
));
nextTick
(()
=>
{
nextValue
(
value
,
oldValue
,
proxy
.
$gcd
(
proxy
,
true
),
proxy
.
$gcd
(
proxy
,
false
));
});
},
{
deep
:
true
});
...
...
packages/uni-h5-vue/dist/vue.runtime.compat.esm.js
浏览文件 @
cd6fe4bb
...
...
@@ -11070,8 +11070,9 @@ function patchWxs(el, rawName, nextValue, instance = null) {
const
proxy
=
instance
.
proxy
;
const
name
=
rawName
.
split
(
'
:
'
)[
1
];
el
.
__wxsWatches
[
rawName
]
=
proxy
.
$watch
(()
=>
instance
.
attrs
[
name
],
(
value
,
oldValue
)
=>
{
// TODO ownerInstance,instance
nextValue
(
value
,
oldValue
,
proxy
.
$gcd
(
proxy
,
true
),
proxy
.
$gcd
(
proxy
,
true
));
nextTick
(()
=>
{
nextValue
(
value
,
oldValue
,
proxy
.
$gcd
(
proxy
,
true
),
proxy
.
$gcd
(
proxy
,
false
));
});
},
{
deep
:
true
});
...
...
packages/uni-h5-vue/dist/vue.runtime.esm.js
浏览文件 @
cd6fe4bb
...
...
@@ -9198,8 +9198,9 @@ function patchWxs(el, rawName, nextValue, instance = null) {
const
proxy
=
instance
.
proxy
;
const
name
=
rawName
.
split
(
'
:
'
)[
1
];
el
.
__wxsWatches
[
rawName
]
=
proxy
.
$watch
(()
=>
instance
.
attrs
[
name
],
(
value
,
oldValue
)
=>
{
// TODO ownerInstance,instance
nextValue
(
value
,
oldValue
,
proxy
.
$gcd
(
proxy
,
true
),
proxy
.
$gcd
(
proxy
,
true
));
nextTick
(()
=>
{
nextValue
(
value
,
oldValue
,
proxy
.
$gcd
(
proxy
,
true
),
proxy
.
$gcd
(
proxy
,
false
));
});
},
{
deep
:
true
});
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
cd6fe4bb
...
...
@@ -1323,8 +1323,12 @@ class ComponentDescriptor {
}
}
function createComponentDescriptor(vm, isOwnerInstance = true) {
if (isOwnerInstance && vm && vm.$options.name && isBuiltInComponent(hyphenate(vm.$options.name))) {
vm = vm.$parent;
if (isOwnerInstance && vm) {
let componentName = vm.$options && vm.$options.name;
while (componentName && isBuiltInComponent(hyphenate(componentName))) {
vm = vm.$parent;
componentName = vm.$options && vm.$options.name;
}
}
if (vm && vm.$el) {
if (!vm.$el.__wxsComponentDescriptor) {
...
...
packages/vite-plugin-uni/src/configResolved/plugins/preVue.ts
浏览文件 @
cd6fe4bb
...
...
@@ -55,9 +55,9 @@ export function uniPreVuePlugin(): Plugin {
if
(
hasWxs
)
{
code
=
normalizeWxsCode
(
ast
,
code
)
}
if
(
errors
.
length
)
{
this
.
error
(
errors
.
join
(
'
\n
'
))
}
//
if (errors.length) {
//
this.error(errors.join('\n'))
//
}
sourceToSFC
.
set
(
sourceKey
,
code
)
return
code
// 暂不提供sourcemap,意义不大
},
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录