Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
菜鸟程序猿_c
uni-app
提交
c28e777b
U
uni-app
项目概览
菜鸟程序猿_c
/
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,发现更多精彩内容 >>
提交
c28e777b
编写于
8月 13, 2021
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: support multiple wxs
上级
d306225b
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
44 addition
and
38 deletion
+44
-38
packages/uni-h5/src/framework/components/layout/index.tsx
packages/uni-h5/src/framework/components/layout/index.tsx
+7
-7
packages/vite-plugin-uni/src/configResolved/plugins/preVue.ts
...ages/vite-plugin-uni/src/configResolved/plugins/preVue.ts
+37
-31
未找到文件。
packages/uni-h5/src/framework/components/layout/index.tsx
浏览文件 @
c28e777b
...
...
@@ -24,7 +24,7 @@ import { defineSystemComponent } from '@dcloudio/uni-components'
import
{
updateCssVar
}
from
'
@dcloudio/uni-core
'
import
{
useTabBar
}
from
'
../../setup/state
'
import
{
useKeepAliveRoute
}
from
'
../../setup/page
'
import
{
RESPONSIVE_MIN_WIDTH
}
from
'
@dcloudio/uni-shared
'
import
{
resolveOwnerEl
,
RESPONSIVE_MIN_WIDTH
}
from
'
@dcloudio/uni-shared
'
import
{
checkMinWidth
}
from
'
../../../helpers/dom
'
import
{
hasOwn
}
from
'
@vue/shared
'
...
...
@@ -388,8 +388,8 @@ function useTopWindow(layoutState: LayoutState): WindowComponentInfo {
const
{
component
,
style
}
=
__uniConfig
.
topWindow
!
const
windowRef
:
Ref
<
ComponentPublicInstance
|
null
>
=
ref
(
null
)
function
updateWindow
()
{
const
insta
l
ce
=
windowRef
.
value
as
ComponentPublicInstance
const
el
:
HTMLElement
=
instalce
.
$el
const
insta
n
ce
=
windowRef
.
value
as
ComponentPublicInstance
const
el
=
resolveOwnerEl
(
instance
.
$
)
as
HTMLElement
const
height
=
el
.
getBoundingClientRect
().
height
layoutState
.
topWindowHeight
=
height
}
...
...
@@ -408,8 +408,8 @@ function useLeftWindow(layoutState: LayoutState): WindowComponentInfo {
const
{
component
,
style
}
=
__uniConfig
.
leftWindow
!
const
windowRef
:
Ref
<
ComponentPublicInstance
|
null
>
=
ref
(
null
)
function
updateWindow
()
{
const
insta
l
ce
=
windowRef
.
value
as
ComponentPublicInstance
const
el
:
HTMLElement
=
instalce
.
$el
const
insta
n
ce
=
windowRef
.
value
as
ComponentPublicInstance
const
el
=
resolveOwnerEl
(
instance
.
$
)
as
HTMLElement
const
width
=
el
.
getBoundingClientRect
().
width
layoutState
.
leftWindowWidth
=
width
}
...
...
@@ -428,8 +428,8 @@ function useRightWindow(layoutState: LayoutState): WindowComponentInfo {
const
{
component
,
style
}
=
__uniConfig
.
rightWindow
!
const
windowRef
:
Ref
<
ComponentPublicInstance
|
null
>
=
ref
(
null
)
function
updateWindow
()
{
const
insta
l
ce
=
windowRef
.
value
as
ComponentPublicInstance
const
el
:
HTMLElement
=
instalce
.
$el
const
insta
n
ce
=
windowRef
.
value
as
ComponentPublicInstance
const
el
=
resolveOwnerEl
(
instance
.
$
)
as
HTMLElement
const
width
=
el
.
getBoundingClientRect
().
width
layoutState
.
rightWindowWidth
=
width
}
...
...
packages/vite-plugin-uni/src/configResolved/plugins/preVue.ts
浏览文件 @
c28e777b
...
...
@@ -113,7 +113,7 @@ function normalizeBlockNode(code: string, blocks: ElementNode[]) {
}
export
function
normalizeWxsCode
(
ast
:
RootNode
,
code
:
string
)
{
const
wxsNode
=
ast
.
children
.
find
(
const
wxsNode
s
=
ast
.
children
.
filter
(
(
node
)
=>
node
.
type
===
NodeTypes
.
ELEMENT
&&
node
.
tag
===
'
script
'
&&
...
...
@@ -125,8 +125,8 @@ export function normalizeWxsCode(ast: RootNode, code: string) {
WXS_ATTRS
.
includes
(
prop
.
value
.
content
)
)
)
if
(
wxsNode
)
{
code
=
normalizeWxsNode
(
code
,
wxsNode
as
ElementNode
)
if
(
wxsNode
s
.
length
)
{
code
=
normalizeWxsNode
(
code
,
wxsNode
s
as
ElementNode
[]
)
}
return
code
}
...
...
@@ -134,35 +134,41 @@ export function normalizeWxsCode(ast: RootNode, code: string) {
const
SCRIPT_END_LEN
=
'
</script>
'
.
length
const
SCRIPT_START_LEN
=
'
<script
'
.
length
function
normalizeWxsNode
(
code
:
string
,
{
loc
,
props
}:
ElementNode
)
{
function
normalizeWxsNode
(
code
:
string
,
nodes
:
ElementNode
[]
)
{
const
magicString
=
new
MagicString
(
code
)
const
langAttr
=
props
.
find
((
prop
)
=>
prop
.
name
===
'
lang
'
)
as
AttributeNode
const
moduleAttr
=
props
.
find
(
(
prop
)
=>
prop
.
name
===
'
module
'
)
as
AttributeNode
const
startOffset
=
loc
.
start
.
offset
const
endOffset
=
loc
.
end
.
offset
const
lang
=
langAttr
.
value
!
.
content
const
langStartOffset
=
langAttr
.
loc
.
start
.
offset
magicString
.
overwrite
(
startOffset
,
startOffset
+
SCRIPT_START_LEN
,
'
<
'
+
lang
)
// <renderjs or <wxs
magicString
.
overwrite
(
langStartOffset
,
langStartOffset
+
(
'
lang="
'
+
lang
+
'
"
'
).
length
,
''
)
// remove lang="renderjs" or lang="wxs"
magicString
.
overwrite
(
endOffset
-
SCRIPT_END_LEN
,
endOffset
,
'
</
'
+
lang
+
'
>
'
)
//</renderjs> or </wxs>
if
(
moduleAttr
)
{
const
moduleStartOffset
=
moduleAttr
.
loc
.
start
.
offset
nodes
.
forEach
(({
loc
,
props
})
=>
{
const
langAttr
=
props
.
find
((
prop
)
=>
prop
.
name
===
'
lang
'
)
as
AttributeNode
const
moduleAttr
=
props
.
find
(
(
prop
)
=>
prop
.
name
===
'
module
'
)
as
AttributeNode
const
startOffset
=
loc
.
start
.
offset
const
endOffset
=
loc
.
end
.
offset
const
lang
=
langAttr
.
value
!
.
content
const
langStartOffset
=
langAttr
.
loc
.
start
.
offset
magicString
.
overwrite
(
moduleStartOffset
,
moduleStartOffset
+
'
module
'
.
length
,
'
name
'
)
// module="echarts" => name="echarts"
}
startOffset
,
startOffset
+
SCRIPT_START_LEN
,
'
<
'
+
lang
)
// <renderjs or <wxs
magicString
.
overwrite
(
langStartOffset
,
langStartOffset
+
(
'
lang="
'
+
lang
+
'
"
'
).
length
,
''
)
// remove lang="renderjs" or lang="wxs"
magicString
.
overwrite
(
endOffset
-
SCRIPT_END_LEN
,
endOffset
,
'
</
'
+
lang
+
'
>
'
)
//</renderjs> or </wxs>
if
(
moduleAttr
)
{
const
moduleStartOffset
=
moduleAttr
.
loc
.
start
.
offset
magicString
.
overwrite
(
moduleStartOffset
,
moduleStartOffset
+
'
module
'
.
length
,
'
name
'
)
// module="echarts" => name="echarts"
}
})
return
magicString
.
toString
()
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录