Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
genary
uni-app
提交
bd6684fb
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,发现更多精彩内容 >>
提交
bd6684fb
编写于
4月 12, 2021
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactor: app => layout
上级
2d66c1c8
变更
23
展开全部
隐藏空白更改
内联
并排
Showing
23 changed file
with
4993 addition
and
5109 deletion
+4993
-5109
packages/uni-h5/dist/uni-h5.esm.js
packages/uni-h5/dist/uni-h5.esm.js
+4946
-4981
packages/uni-h5/src/framework/components/app/index.tsx
packages/uni-h5/src/framework/components/app/index.tsx
+0
-66
packages/uni-h5/src/framework/components/app/observable.js
packages/uni-h5/src/framework/components/app/observable.js
+0
-3
packages/uni-h5/src/framework/components/app/test.vue
packages/uni-h5/src/framework/components/app/test.vue
+0
-8
packages/uni-h5/src/framework/components/layout/customTabBar.vue
...s/uni-h5/src/framework/components/layout/customTabBar.vue
+0
-0
packages/uni-h5/src/framework/components/layout/index.tsx
packages/uni-h5/src/framework/components/layout/index.tsx
+45
-12
packages/uni-h5/src/framework/components/layout/popup/actionSheet.vue
...-h5/src/framework/components/layout/popup/actionSheet.vue
+0
-0
packages/uni-h5/src/framework/components/layout/popup/index.js
...ges/uni-h5/src/framework/components/layout/popup/index.js
+0
-0
packages/uni-h5/src/framework/components/layout/popup/mixins/action-sheet.js
.../framework/components/layout/popup/mixins/action-sheet.js
+0
-0
packages/uni-h5/src/framework/components/layout/popup/mixins/index.js
...-h5/src/framework/components/layout/popup/mixins/index.js
+0
-0
packages/uni-h5/src/framework/components/layout/popup/mixins/modal.js
...-h5/src/framework/components/layout/popup/mixins/modal.js
+0
-0
packages/uni-h5/src/framework/components/layout/popup/mixins/popup.js
...-h5/src/framework/components/layout/popup/mixins/popup.js
+0
-0
packages/uni-h5/src/framework/components/layout/popup/mixins/toast.js
...-h5/src/framework/components/layout/popup/mixins/toast.js
+0
-0
packages/uni-h5/src/framework/components/layout/popup/mixins/transition.js
...rc/framework/components/layout/popup/mixins/transition.js
+0
-0
packages/uni-h5/src/framework/components/layout/popup/modal.vue
...es/uni-h5/src/framework/components/layout/popup/modal.vue
+0
-0
packages/uni-h5/src/framework/components/layout/popup/toast.vue
...es/uni-h5/src/framework/components/layout/popup/toast.vue
+0
-0
packages/uni-h5/src/framework/components/layout/tabBar.tsx
packages/uni-h5/src/framework/components/layout/tabBar.tsx
+0
-0
packages/uni-h5/src/framework/plugin/components.ts
packages/uni-h5/src/framework/plugin/components.ts
+0
-12
packages/uni-h5/src/framework/plugin/index.ts
packages/uni-h5/src/framework/plugin/index.ts
+0
-2
packages/uni-h5/src/index.ts
packages/uni-h5/src/index.ts
+1
-0
packages/vite-plugin-uni/src/configResolved/plugins/appVue.ts
...ages/vite-plugin-uni/src/configResolved/plugins/appVue.ts
+0
-22
packages/vite-plugin-uni/src/configResolved/plugins/index.ts
packages/vite-plugin-uni/src/configResolved/plugins/index.ts
+0
-2
packages/vite-plugin-uni/src/configResolved/plugins/mainJs.ts
...ages/vite-plugin-uni/src/configResolved/plugins/mainJs.ts
+1
-1
未找到文件。
packages/uni-h5/dist/uni-h5.esm.js
浏览文件 @
bd6684fb
此差异已折叠。
点击以展开。
packages/uni-h5/src/framework/components/app/index.tsx
已删除
100644 → 0
浏览文件 @
2d66c1c8
import
{
ref
,
computed
,
onMounted
,
defineComponent
}
from
'
vue
'
import
Layout
from
'
./layout
'
import
{
updateCssVar
}
from
'
../../../helpers/dom
'
const
CSS_VARS
=
[
'
--status-bar-height
'
,
'
--top-window-height
'
,
'
--window-left
'
,
'
--window-right
'
,
'
--window-margin
'
,
]
export
default
defineComponent
({
name
:
'
App
'
,
setup
()
{
useCssVar
()
useAppLifecycle
()
const
{
clazz
,
onChange
}
=
useAppClass
()
return
()
=>
(
<
uni
-
app
class
=
{
clazz
.
value
}
>
<
Layout
onChange
=
{
onChange
}
/>
</
uni
-
app
>
)
},
})
function
useCssVar
()
{
CSS_VARS
.
forEach
((
name
)
=>
updateCssVar
(
name
,
'
0px
'
))
}
function
useAppLifecycle
()
{
onMounted
(()
=>
{
document
.
addEventListener
(
'
visibilitychange
'
,
function
()
{
if
(
document
.
visibilityState
===
'
visible
'
)
{
UniServiceJSBridge
.
emit
(
'
onAppEnterForeground
'
)
}
else
{
UniServiceJSBridge
.
emit
(
'
onAppEnterBackground
'
)
}
})
})
}
function
useAppClass
()
{
const
showTabBar
=
ref
(
false
)
const
showMaxWidth
=
ref
(
false
)
function
onChange
(
type
:
string
,
value
:
boolean
)
{
if
(
type
===
'
showTabBar
'
)
{
showTabBar
.
value
=
value
}
else
if
(
type
===
'
showMaxWidth
'
)
{
showMaxWidth
.
value
=
value
}
}
const
clazz
=
computed
(()
=>
{
return
{
'
uni-app--showtabbar
'
:
showTabBar
.
value
,
'
uni-app--maxwidth
'
:
showMaxWidth
.
value
,
}
})
return
{
clazz
,
onChange
,
}
}
packages/uni-h5/src/framework/components/app/observable.js
已删除
100644 → 0
浏览文件 @
2d66c1c8
import
Vue
from
'
vue
'
__uniConfig
.
tabBar
=
Vue
.
observable
(
__uniConfig
.
tabBar
||
{})
export
const
tabBar
=
__uniConfig
.
tabBar
packages/uni-h5/src/framework/components/app/test.vue
已删除
100644 → 0
浏览文件 @
2d66c1c8
<
template
>
<uni-page-wrapper>
<uni-page-body>
<slot
/>
</uni-page-body>
</uni-page-wrapper>
</
template
>
packages/uni-h5/src/framework/components/
app
/customTabBar.vue
→
packages/uni-h5/src/framework/components/
layout
/customTabBar.vue
浏览文件 @
bd6684fb
文件已移动
packages/uni-h5/src/framework/components/
app/
layout/index.tsx
→
packages/uni-h5/src/framework/components/layout/index.tsx
浏览文件 @
bd6684fb
...
...
@@ -12,24 +12,32 @@ import {
ConcreteComponent
,
resolveDynamicComponent
,
SetupContext
,
onMounted
,
ref
,
}
from
'
vue
'
import
{
RouterView
,
useRoute
}
from
'
vue-router
'
import
{
useTabBar
}
from
'
../../
../
plugin/state
'
import
{
useKeepAliveRoute
}
from
'
../../
../
plugin/page
'
import
{
useTabBar
}
from
'
../../plugin/state
'
import
{
useKeepAliveRoute
}
from
'
../../plugin/page
'
import
TabBar
from
'
.
.
/tabBar
'
import
TabBar
from
'
./tabBar
'
type
KeepAliveRoute
=
ReturnType
<
typeof
useKeepAliveRoute
>
const
CSS_VARS
=
[
'
--status-bar-height
'
,
'
--top-window-height
'
,
'
--window-left
'
,
'
--window-right
'
,
'
--window-margin
'
,
]
export
default
defineComponent
({
name
:
'
Layout
'
,
props
:
{
onChange
:
Function
,
},
emits
:
[
'
change
'
],
setup
(
props
,
{
emit
})
{
useCssVar
()
useAppLifecycle
()
const
keepAliveRoute
=
(
__UNI_FEATURE_PAGES__
&&
useKeepAliveRoute
())
as
KeepAliveRoute
const
topWindow
=
__UNI_FEATURE_TOPWINDOW__
&&
useTopWindow
()
...
...
@@ -37,6 +45,7 @@ export default defineComponent({
const
rightWindow
=
__UNI_FEATURE_RIGHTWINDOW__
&&
useRightWindow
()
const
showTabBar
=
(
__UNI_FEATURE_TABBAR__
&&
useShowTabBar
(
emit
))
as
ComputedRef
<
boolean
>
const
clazz
=
useAppClass
(
showTabBar
)
return
()
=>
{
const
layoutTsx
=
createLayoutTsx
(
keepAliveRoute
,
...
...
@@ -45,13 +54,37 @@ export default defineComponent({
rightWindow
)
const
tabBarTsx
=
__UNI_FEATURE_TABBAR__
&&
createTabBarTsx
(
showTabBar
)
if
(
!
tabBarTsx
)
{
return
layoutTsx
}
return
[
layoutTsx
,
tabBarTsx
]
return
<
uni
-
app
class
=
{
clazz
.
value
}
>
{
[
layoutTsx
,
tabBarTsx
]
}
</
uni
-
app
>
}
},
})
import
{
updateCssVar
}
from
'
../../../helpers/dom
'
function
useCssVar
()
{
CSS_VARS
.
forEach
((
name
)
=>
updateCssVar
(
name
,
'
0px
'
))
}
function
useAppLifecycle
()
{
onMounted
(()
=>
{
document
.
addEventListener
(
'
visibilitychange
'
,
function
()
{
if
(
document
.
visibilityState
===
'
visible
'
)
{
UniServiceJSBridge
.
emit
(
'
onAppEnterForeground
'
)
}
else
{
UniServiceJSBridge
.
emit
(
'
onAppEnterBackground
'
)
}
})
})
}
function
useAppClass
(
showTabBar
?:
ComputedRef
<
boolean
>
)
{
const
showMaxWidth
=
ref
(
false
)
return
computed
(()
=>
{
return
{
'
uni-app--showtabbar
'
:
showTabBar
&&
showTabBar
.
value
,
'
uni-app--maxwidth
'
:
showMaxWidth
.
value
,
}
})
}
function
createLayoutTsx
(
keepAliveRoute
:
KeepAliveRoute
,
...
...
@@ -87,7 +120,7 @@ function createLayoutTsx(
)
}
function
useShowTabBar
(
emit
:
SetupContext
[
'
emit
'
])
{
function
useShowTabBar
(
emit
:
SetupContext
<
[
'
change
'
]
>
[
'
emit
'
])
{
const
route
=
useRoute
()
const
tabBar
=
useTabBar
()
!
// TODO meida query
...
...
packages/uni-h5/src/framework/components/
app
/popup/actionSheet.vue
→
packages/uni-h5/src/framework/components/
layout
/popup/actionSheet.vue
浏览文件 @
bd6684fb
文件已移动
packages/uni-h5/src/framework/components/
app
/popup/index.js
→
packages/uni-h5/src/framework/components/
layout
/popup/index.js
浏览文件 @
bd6684fb
文件已移动
packages/uni-h5/src/framework/components/
app
/popup/mixins/action-sheet.js
→
packages/uni-h5/src/framework/components/
layout
/popup/mixins/action-sheet.js
浏览文件 @
bd6684fb
文件已移动
packages/uni-h5/src/framework/components/
app
/popup/mixins/index.js
→
packages/uni-h5/src/framework/components/
layout
/popup/mixins/index.js
浏览文件 @
bd6684fb
文件已移动
packages/uni-h5/src/framework/components/
app
/popup/mixins/modal.js
→
packages/uni-h5/src/framework/components/
layout
/popup/mixins/modal.js
浏览文件 @
bd6684fb
文件已移动
packages/uni-h5/src/framework/components/
app
/popup/mixins/popup.js
→
packages/uni-h5/src/framework/components/
layout
/popup/mixins/popup.js
浏览文件 @
bd6684fb
文件已移动
packages/uni-h5/src/framework/components/
app
/popup/mixins/toast.js
→
packages/uni-h5/src/framework/components/
layout
/popup/mixins/toast.js
浏览文件 @
bd6684fb
文件已移动
packages/uni-h5/src/framework/components/
app
/popup/mixins/transition.js
→
packages/uni-h5/src/framework/components/
layout
/popup/mixins/transition.js
浏览文件 @
bd6684fb
文件已移动
packages/uni-h5/src/framework/components/
app
/popup/modal.vue
→
packages/uni-h5/src/framework/components/
layout
/popup/modal.vue
浏览文件 @
bd6684fb
文件已移动
packages/uni-h5/src/framework/components/
app
/popup/toast.vue
→
packages/uni-h5/src/framework/components/
layout
/popup/toast.vue
浏览文件 @
bd6684fb
文件已移动
packages/uni-h5/src/framework/components/
app
/tabBar.tsx
→
packages/uni-h5/src/framework/components/
layout
/tabBar.tsx
浏览文件 @
bd6684fb
文件已移动
packages/uni-h5/src/framework/plugin/components.ts
已删除
100644 → 0
浏览文件 @
2d66c1c8
import
{
App
}
from
'
vue
'
import
{
COMPONENT_NAME_PREFIX
}
from
'
@dcloudio/uni-shared
'
import
AppComponent
from
'
../components/app/index
'
// import TestComponent from '../components/app/test.vue'
export
function
initSystemComponents
(
app
:
App
)
{
// @ts-ignore
AppComponent
.
name
=
COMPONENT_NAME_PREFIX
+
AppComponent
.
name
app
.
component
(
AppComponent
.
name
,
AppComponent
)
// app.component(TestComponent.name, TestComponent)
}
packages/uni-h5/src/framework/plugin/index.ts
浏览文件 @
bd6684fb
...
...
@@ -4,7 +4,6 @@ import { initApp } from '@dcloudio/uni-vue'
import
{
initView
,
initService
}
from
'
@dcloudio/uni-core
'
import
{
initRouter
}
from
'
./router
'
import
{
initSystemComponents
}
from
'
./components
'
import
{
initMixin
}
from
'
./mixin
'
export
default
{
...
...
@@ -12,7 +11,6 @@ export default {
initApp
(
app
)
initView
(
app
)
initService
(
app
)
initSystemComponents
(
app
)
initMixin
(
app
)
...
...
packages/uni-h5/src/index.ts
浏览文件 @
bd6684fb
...
...
@@ -22,6 +22,7 @@ export * from './service/bridge'
export
{
getApp
,
getCurrentPages
}
from
'
./framework
'
export
{
default
as
LayoutComponent
}
from
'
./framework/components/layout/index
'
export
{
default
as
PageComponent
}
from
'
./framework/components/page/index
'
export
{
default
as
AsyncErrorComponent
}
from
'
./framework/components/async-error/index.vue
'
export
{
default
as
AsyncLoadingComponent
}
from
'
./framework/components/async-loading/index.vue
'
packages/vite-plugin-uni/src/configResolved/plugins/appVue.ts
已删除
100644 → 0
浏览文件 @
2d66c1c8
import
path
from
'
path
'
import
slash
from
'
slash
'
import
{
Plugin
}
from
'
vite
'
import
{
parseVueRequest
}
from
'
@dcloudio/uni-cli-shared
'
import
{
VitePluginUniResolvedOptions
}
from
'
../..
'
export
function
uniAppVuePlugin
(
options
:
VitePluginUniResolvedOptions
):
Plugin
{
const
appVuePath
=
slash
(
path
.
resolve
(
options
.
inputDir
,
'
App.vue
'
))
return
{
name
:
'
vite:uni-app-vue
'
,
transform
(
code
,
id
)
{
const
{
filename
,
query
}
=
parseVueRequest
(
id
)
//App.vue main request
if
(
filename
===
appVuePath
&&
!
query
.
vue
)
{
return
{
code
:
`<template><VUniApp/></template>
${
code
}
`
,
map
:
this
.
getCombinedSourcemap
(),
}
}
},
}
}
packages/vite-plugin-uni/src/configResolved/plugins/index.ts
浏览文件 @
bd6684fb
...
...
@@ -8,7 +8,6 @@ import { uniPreCssPlugin } from './preCss'
import
{
uniEasycomPlugin
}
from
'
./easycom
'
import
{
InjectOptions
,
uniInjectPlugin
}
from
'
./inject
'
import
{
uniAppVuePlugin
}
from
'
./appVue
'
import
{
uniMainJsPlugin
}
from
'
./mainJs
'
import
{
uniPagesJsonPlugin
}
from
'
./pagesJson
'
import
{
uniManifestJsonPlugin
}
from
'
./manifestJson
'
...
...
@@ -86,7 +85,6 @@ export function resolvePlugins(
0
,
'
pre
'
)
addPlugin
(
plugins
,
uniAppVuePlugin
(
options
),
1
,
'
pre
'
)
addPlugin
(
plugins
,
uniMainJsPlugin
(
options
),
1
,
'
pre
'
)
addPlugin
(
plugins
,
uniPagesJsonPlugin
(
config
,
options
),
1
,
'
pre
'
)
addPlugin
(
plugins
,
uniManifestJsonPlugin
(
options
),
1
,
'
pre
'
)
...
...
packages/vite-plugin-uni/src/configResolved/plugins/mainJs.ts
浏览文件 @
bd6684fb
...
...
@@ -13,7 +13,7 @@ export function uniMainJsPlugin(options: VitePluginUniResolvedOptions): Plugin {
transform
(
code
,
id
)
{
if
(
id
===
mainJsPath
||
id
===
mainTsPath
)
{
return
{
code
:
`import {
plugin } from '@dcloudio/uni-h5';import '
${
pagesJsonJsPath
}
';function createApp(rootComponent,rootProps){rootComponent && (rootComponent.mpType = 'app'
);return createVueApp(rootComponent, rootProps).use(plugin)};
${
code
.
replace
(
code
:
`import {
openBlock, createBlock } from 'vue';import { plugin,LayoutComponent } from '@dcloudio/uni-h5';import '
${
pagesJsonJsPath
}
';function createApp(rootComponent,rootProps){rootComponent && (rootComponent.mpType = 'app',rootComponent.render = ()=>(openBlock(),createBlock(LayoutComponent))
);return createVueApp(rootComponent, rootProps).use(plugin)};
${
code
.
replace
(
'
createApp
'
,
'
createVueApp
'
)}
`
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录