Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
MuGuiLin
uni-app
提交
e01fe2d7
U
uni-app
项目概览
MuGuiLin
/
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,发现更多精彩内容 >>
提交
e01fe2d7
编写于
3月 21, 2022
作者:
fxy060608
浏览文件
操作
浏览文件
下载
差异文件
chore: merge
上级
22996ca3
d3480960
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
40 addition
and
29 deletion
+40
-29
packages/shims-uni-app.d.ts
packages/shims-uni-app.d.ts
+1
-0
packages/uni-app-plus/dist/uni-app-view.umd.js
packages/uni-app-plus/dist/uni-app-view.umd.js
+1
-1
packages/uni-app-plus/dist/uni.runtime.esm.js
packages/uni-app-plus/dist/uni.runtime.esm.js
+1
-4
packages/uni-components/dist/components.js
packages/uni-components/dist/components.js
+1
-1
packages/uni-core/src/helpers/showPage.ts
packages/uni-core/src/helpers/showPage.ts
+1
-6
packages/uni-h5-vite/src/plugins/manifestJson.ts
packages/uni-h5-vite/src/plugins/manifestJson.ts
+4
-0
packages/uni-h5/dist/uni-h5.cjs.js
packages/uni-h5/dist/uni-h5.cjs.js
+6
-3
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+6
-3
packages/uni-h5/src/platform/dom.ts
packages/uni-h5/src/platform/dom.ts
+9
-3
packages/uni-mp-vue/dist/vue.runtime.esm.js
packages/uni-mp-vue/dist/vue.runtime.esm.js
+5
-4
packages/uni-mp-vue/src/helpers/vOn.ts
packages/uni-mp-vue/src/helpers/vOn.ts
+5
-4
未找到文件。
packages/shims-uni-app.d.ts
浏览文件 @
e01fe2d7
...
...
@@ -38,6 +38,7 @@ declare namespace UniApp {
router
?:
{
strict
:
boolean
base
:
string
assets
:
string
}
nvue
?:
{
'
flex-direction
'
:
'
column
'
|
'
row
'
...
...
packages/uni-app-plus/dist/uni-app-view.umd.js
浏览文件 @
e01fe2d7
...
...
@@ -6676,7 +6676,7 @@
animationType: "pop-in",
animationDuration: 200,
uniNView: {
path: "
".concat(typeof process === "object" && process.env && {}.VUE_APP_TEMPLATE_PATH || "", "/")
.concat(url, ".js"),
path: "
/"
.concat(url, ".js"),
defaultFontSize: 16,
viewport: plus_.screen.resolutionWidth
}
...
...
packages/uni-app-plus/dist/uni.runtime.esm.js
浏览文件 @
e01fe2d7
...
...
@@ -1733,10 +1733,7 @@ function showPage({ context = {}, url, data = {}, style = {}, onMessage, onClose
animationType: 'pop-in',
animationDuration: 200,
uniNView: {
path: `${(typeof process === 'object' &&
process.env &&
process.env.VUE_APP_TEMPLATE_PATH) ||
''}/${url}.js`,
path: `/${url}.js`,
defaultFontSize: 16,
viewport: plus_.screen.resolutionWidth,
},
...
...
packages/uni-components/dist/components.js
浏览文件 @
e01fe2d7
...
...
@@ -219,7 +219,7 @@ function showPage({
animationType
:
"
pop-in
"
,
animationDuration
:
200
,
uniNView
:
{
path
:
`
${
typeof
process
===
"
object
"
&&
process
.
env
&&
{}.
VUE_APP_TEMPLATE_PATH
||
""
}
/
${
url
}
.js`
,
path
:
`/
${
url
}
.js`
,
defaultFontSize
:
16
,
viewport
:
plus_
.
screen
.
resolutionWidth
}
...
...
packages/uni-core/src/helpers/showPage.ts
浏览文件 @
e01fe2d7
...
...
@@ -141,12 +141,7 @@ export function showPage({
animationType
:
'
pop-in
'
,
animationDuration
:
200
,
uniNView
:
{
path
:
`
${
(
typeof
process
===
'
object
'
&&
process
.
env
&&
process
.
env
.
VUE_APP_TEMPLATE_PATH
)
||
''
}
/
${
url
}
.js`
,
path
:
`/
${
url
}
.js`
,
defaultFontSize
:
16
,
viewport
:
plus_
.
screen
.
resolutionWidth
,
},
...
...
packages/uni-h5-vite/src/plugins/manifestJson.ts
浏览文件 @
e01fe2d7
...
...
@@ -10,6 +10,7 @@ import {
const
defaultRouter
=
{
mode
:
'
hash
'
,
base
:
'
/
'
,
assets
:
'
assets
'
,
}
const
defaultAsync
=
{
...
...
@@ -25,6 +26,9 @@ export function uniManifestJsonPlugin(): Plugin {
return
{
name
:
'
uni:h5-manifest-json
'
,
enforce
:
'
pre
'
,
configResolved
(
config
)
{
defaultRouter
.
assets
=
config
.
build
.
assetsDir
},
transform
(
code
,
id
)
{
if
(
!
opts
.
filter
(
id
))
{
return
...
...
packages/uni-h5/dist/uni-h5.cjs.js
浏览文件 @
e01fe2d7
...
...
@@ -881,14 +881,17 @@ function addBase(filePath) {
return
baseUrl
+
filePath
;
}
function
getRealPath
(
filePath
)
{
if
(
__uniConfig
.
router
.
base
===
"
./
"
)
{
filePath
=
filePath
.
replace
(
/^
\.\/
static
\/
/
,
"
/static/
"
);
const
{
base
,
assets
}
=
__uniConfig
.
router
;
if
(
base
===
"
./
"
)
{
if
(
filePath
.
indexOf
(
"
./static/
"
)
===
0
||
assets
&&
filePath
.
indexOf
(
"
./
"
+
assets
+
"
/
"
)
===
0
)
{
filePath
=
filePath
.
slice
(
1
);
}
}
if
(
filePath
.
indexOf
(
"
/
"
)
===
0
)
{
if
(
filePath
.
indexOf
(
"
//
"
)
===
0
)
{
filePath
=
"
https:
"
+
filePath
;
}
else
{
return
addBase
(
filePath
.
s
ubstr
(
1
));
return
addBase
(
filePath
.
s
lice
(
1
));
}
}
if
(
uniShared
.
SCHEME_RE
.
test
(
filePath
)
||
uniShared
.
DATA_RE
.
test
(
filePath
)
||
filePath
.
indexOf
(
"
blob:
"
)
===
0
)
{
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
e01fe2d7
...
...
@@ -1994,14 +1994,17 @@ function addBase(filePath) {
return baseUrl + filePath;
}
function getRealPath(filePath) {
if (__uniConfig.router.base === "./") {
filePath = filePath.replace(/^\.\/static\//, "/static/");
const { base, assets } = __uniConfig.router;
if (base === "./") {
if (filePath.indexOf("./static/") === 0 || assets && filePath.indexOf("./" + assets + "/") === 0) {
filePath = filePath.slice(1);
}
}
if (filePath.indexOf("/") === 0) {
if (filePath.indexOf("//") === 0) {
filePath = "https:" + filePath;
} else {
return addBase(filePath.s
ubstr
(1));
return addBase(filePath.s
lice
(1));
}
}
if (SCHEME_RE.test(filePath) || DATA_RE.test(filePath) || filePath.indexOf("blob:") === 0) {
...
...
packages/uni-h5/src/platform/dom.ts
浏览文件 @
e01fe2d7
...
...
@@ -28,14 +28,20 @@ function addBase(filePath: string) {
export
function
getRealPath
(
filePath
:
string
)
{
// 相对路径模式对静态资源路径特殊处理
if
(
__uniConfig
.
router
!
.
base
===
'
./
'
)
{
filePath
=
filePath
.
replace
(
/^
\.\/
static
\/
/
,
'
/static/
'
)
const
{
base
,
assets
}
=
__uniConfig
.
router
!
if
(
base
===
'
./
'
)
{
if
(
filePath
.
indexOf
(
'
./static/
'
)
===
0
||
(
assets
&&
filePath
.
indexOf
(
'
./
'
+
assets
+
'
/
'
)
===
0
)
)
{
filePath
=
filePath
.
slice
(
1
)
}
}
if
(
filePath
.
indexOf
(
'
/
'
)
===
0
)
{
if
(
filePath
.
indexOf
(
'
//
'
)
===
0
)
{
filePath
=
'
https:
'
+
filePath
}
else
{
return
addBase
(
filePath
.
s
ubstr
(
1
))
return
addBase
(
filePath
.
s
lice
(
1
))
}
}
// 网络资源或base64
...
...
packages/uni-mp-vue/dist/vue.runtime.esm.js
浏览文件 @
e01fe2d7
...
...
@@ -5380,10 +5380,11 @@ function createInvoker(initialValue, instance) {
}
// 冒泡事件列表
const
bubbles
=
[
'
touchstart
'
,
'
touchmove
'
,
'
touchcancel
'
,
'
touchend
'
,
// touch事件暂不做延迟,否则在 Android 上会影响性能,比如一些拖拽跟手手势等
// 'touchstart',
// 'touchmove',
// 'touchcancel',
// 'touchend',
'
tap
'
,
'
longpress
'
,
'
longtap
'
,
...
...
packages/uni-mp-vue/src/helpers/vOn.ts
浏览文件 @
e01fe2d7
...
...
@@ -96,10 +96,11 @@ function createInvoker(
}
// 冒泡事件列表
const
bubbles
=
[
'
touchstart
'
,
'
touchmove
'
,
'
touchcancel
'
,
'
touchend
'
,
// touch事件暂不做延迟,否则在 Android 上会影响性能,比如一些拖拽跟手手势等
// 'touchstart',
// 'touchmove',
// 'touchcancel',
// 'touchend',
'
tap
'
,
'
longpress
'
,
'
longtap
'
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录