Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
weixin_38335589
uni-app
提交
44750bb6
U
uni-app
项目概览
weixin_38335589
/
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,发现更多精彩内容 >>
提交
44750bb6
编写于
4月 23, 2020
作者:
Q
qiang
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of github.com:dcloudio/uni-app into dev
上级
f6525252
60536390
变更
13
展开全部
隐藏空白更改
内联
并排
Showing
13 changed file
with
73 addition
and
35 deletion
+73
-35
build/build.js
build/build.js
+1
-1
packages/uni-automator/dist/index.js
packages/uni-automator/dist/index.js
+2
-2
packages/uni-h5/dist/index.umd.min.js
packages/uni-h5/dist/index.umd.min.js
+1
-1
packages/uni-quickapp-light/lib/uni.config.js
packages/uni-quickapp-light/lib/uni.config.js
+27
-5
packages/vue-cli-plugin-uni/commands/build.js
packages/vue-cli-plugin-uni/commands/build.js
+1
-11
packages/vue-cli-plugin-uni/commands/serve.js
packages/vue-cli-plugin-uni/commands/serve.js
+6
-2
packages/vue-cli-plugin-uni/commands/util.js
packages/vue-cli-plugin-uni/commands/util.js
+15
-0
packages/vue-cli-plugin-uni/lib/h5/index.js
packages/vue-cli-plugin-uni/lib/h5/index.js
+3
-2
packages/vue-cli-plugin-uni/lib/mp/index.js
packages/vue-cli-plugin-uni/lib/mp/index.js
+2
-5
packages/vue-cli-plugin-uni/lib/util.js
packages/vue-cli-plugin-uni/lib/util.js
+4
-0
src/core/helpers/protocol/route/route.js
src/core/helpers/protocol/route/route.js
+2
-2
src/core/service/plugins/page/create-page.js
src/core/service/plugins/page/create-page.js
+6
-2
src/core/service/plugins/page/index.js
src/core/service/plugins/page/index.js
+3
-2
未找到文件。
build/build.js
浏览文件 @
44750bb6
...
...
@@ -40,7 +40,7 @@ service.run('build', {
formats
:
process
.
env
.
UNI_WATCH
===
'
true
'
?
'
umd
'
:
'
umd-min
'
,
entry
,
'
inline-vue
'
:
!!
process
.
env
.
UNI_VIEW
,
// clean: !
process.env.UNI_VIEW,
clean
:
false
,
//!
process.env.UNI_VIEW,
mode
:
process
.
env
.
NODE_ENV
}).
then
(
function
()
{
if
(
...
...
packages/uni-automator/dist/index.js
浏览文件 @
44750bb6
此差异已折叠。
点击以展开。
packages/uni-h5/dist/index.umd.min.js
浏览文件 @
44750bb6
此差异已折叠。
点击以展开。
packages/uni-quickapp-light/lib/uni.config.js
浏览文件 @
44750bb6
const
fs
=
require
(
'
fs
'
)
const
path
=
require
(
'
path
'
)
const
SIGN_DIR_NAME
=
'
sign
'
// TODO quickapp ide 有bug,不识别项目根目录 sign,暂时拷贝到 .quickapp 目录
const
SIGN_OUT_DIR_NAME
=
'
.quickapp/sign
'
function
getSignCopyOption
()
{
const
signDir
=
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
SIGN_DIR_NAME
)
if
(
fs
.
existsSync
(
signDir
))
{
return
{
from
:
signDir
,
to
:
SIGN_OUT_DIR_NAME
}
}
}
module
.
exports
=
{
options
:
{
cssVars
:
{
...
...
@@ -24,11 +38,19 @@ module.exports = {
}
},
copyWebpackOptions
(
platformOptions
,
vueOptions
)
{
const
jsConfigPath
=
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
'
jsconfig.json
'
)
if
(
fs
.
existsSync
(
jsConfigPath
))
{
return
[
jsConfigPath
]
}
return
[
path
.
resolve
(
__dirname
,
'
assets/jsconfig.json
'
)]
const
copyOptions
=
[]
let
jsConfigPath
=
path
.
resolve
(
process
.
env
.
UNI_INPUT_DIR
,
'
jsconfig.json
'
)
if
(
!
fs
.
existsSync
(
jsConfigPath
))
{
jsConfigPath
=
path
.
resolve
(
__dirname
,
'
assets/jsconfig.json
'
)
}
copyOptions
.
push
(
jsConfigPath
)
const
signCopyOption
=
getSignCopyOption
()
if
(
signCopyOption
)
{
copyOptions
.
push
(
signCopyOption
)
}
return
copyOptions
},
configureWebpack
()
{
return
{
...
...
packages/vue-cli-plugin-uni/commands/build.js
浏览文件 @
44750bb6
...
...
@@ -35,17 +35,7 @@ module.exports = (api, options) => {
}
}
const
port
=
args
[
'
auto-port
'
]
||
process
.
env
.
UNI_AUTOMATOR_PORT
if
(
port
)
{
const
host
=
args
[
'
auto-host
'
]
||
process
.
env
.
UNI_AUTOMATOR_HOST
||
'
0.0.0.0
'
const
prepareURLs
=
require
(
'
@vue/cli-service/lib/util/prepareURLs
'
)
const
urls
=
prepareURLs
(
'
ws
'
,
host
,
port
,
''
)
if
(
urls
.
lanUrlForConfig
)
{
process
.
env
.
UNI_AUTOMATOR_WS_ENDPOINT
=
'
ws://
'
+
urls
.
lanUrlForConfig
+
'
:
'
+
port
}
else
{
process
.
env
.
UNI_AUTOMATOR_WS_ENDPOINT
=
urls
.
localUrlForBrowser
}
}
require
(
'
./util
'
).
initAutomator
(
args
)
args
.
entry
=
args
.
entry
||
args
.
_
[
0
]
...
...
packages/vue-cli-plugin-uni/commands/serve.js
浏览文件 @
44750bb6
...
...
@@ -21,10 +21,14 @@ module.exports = (api, options) => {
'
--host
'
:
`specify host (default:
${
defaults
.
host
}
)`
,
'
--port
'
:
`specify port (default:
${
defaults
.
port
}
)`
,
'
--https
'
:
`use https (default:
${
defaults
.
https
}
)`
,
'
--public
'
:
'
specify the public network URL for the HMR client
'
'
--public
'
:
'
specify the public network URL for the HMR client
'
,
'
--auto-host
'
:
'
specify automator host
'
,
'
--auto-port
'
:
'
specify automator port
'
}
},
async
function
serve
(
args
)
{
info
(
'
Starting development server...
'
)
info
(
'
Starting development server...
'
)
require
(
'
./util
'
).
initAutomator
(
args
)
// although this is primarily a dev server, it is possible that we
// are running it in a mode with a production env, e.g. in E2E tests.
...
...
packages/vue-cli-plugin-uni/commands/util.js
0 → 100644
浏览文件 @
44750bb6
module
.
exports
=
{
initAutomator
(
args
)
{
const
port
=
args
[
'
auto-port
'
]
||
process
.
env
.
UNI_AUTOMATOR_PORT
if
(
port
)
{
const
host
=
args
[
'
auto-host
'
]
||
process
.
env
.
UNI_AUTOMATOR_HOST
||
'
0.0.0.0
'
const
prepareURLs
=
require
(
'
@vue/cli-service/lib/util/prepareURLs
'
)
const
urls
=
prepareURLs
(
'
ws
'
,
host
,
port
,
''
)
if
(
urls
.
lanUrlForConfig
)
{
process
.
env
.
UNI_AUTOMATOR_WS_ENDPOINT
=
'
ws://
'
+
urls
.
lanUrlForConfig
+
'
:
'
+
port
}
else
{
process
.
env
.
UNI_AUTOMATOR_WS_ENDPOINT
=
urls
.
localUrlForBrowser
}
}
}
}
packages/vue-cli-plugin-uni/lib/h5/index.js
浏览文件 @
44750bb6
...
...
@@ -116,7 +116,8 @@ module.exports = {
loader
:
path
.
resolve
(
__dirname
,
'
../../packages/wrap-loader
'
),
options
:
{
before
:
[
beforeCode
+
statCode
+
getGlobalUsingComponentsCode
()
beforeCode
+
require
(
'
../util
'
).
getAutomatorCode
()
+
statCode
+
getGlobalUsingComponentsCode
()
]
}
}]
...
...
@@ -179,4 +180,4 @@ module.exports = {
require
(
'
./cssnano-options
'
)(
webpackConfig
)
}
}
}
}
packages/vue-cli-plugin-uni/lib/mp/index.js
浏览文件 @
44750bb6
...
...
@@ -81,9 +81,6 @@ module.exports = {
const
beforeCode
=
'
import
\'
uni-pages
\'
;
'
const
automator
=
`@dcloudio/uni-
${
process
.
env
.
UNI_SUB_PLATFORM
||
process
.
env
.
UNI_PLATFORM
}
/dist/automator`
const
automatorCode
=
process
.
env
.
UNI_AUTOMATOR_WS_ENDPOINT
?
`import '
${
automator
}
';`
:
''
return
{
mode
:
process
.
env
.
NODE_ENV
===
'
production
'
?
'
production
'
:
'
development
'
,
entry
()
{
...
...
@@ -112,7 +109,7 @@ module.exports = {
loader
:
path
.
resolve
(
__dirname
,
'
../../packages/wrap-loader
'
),
options
:
{
before
:
[
beforeCode
+
automatorCode
+
statCode
beforeCode
+
require
(
'
../util
'
).
getAutomatorCode
()
+
statCode
]
}
},
{
...
...
@@ -200,4 +197,4 @@ module.exports = {
webpackConfig
.
plugins
.
delete
(
'
preload
'
)
webpackConfig
.
plugins
.
delete
(
'
prefetch
'
)
}
}
}
packages/vue-cli-plugin-uni/lib/util.js
浏览文件 @
44750bb6
...
...
@@ -12,5 +12,9 @@ module.exports = {
})
}
return
partialIdentifier
},
getAutomatorCode
()
{
const
automator
=
`@dcloudio/uni-
${
process
.
env
.
UNI_SUB_PLATFORM
||
process
.
env
.
UNI_PLATFORM
}
/dist/automator`
return
process
.
env
.
UNI_AUTOMATOR_WS_ENDPOINT
?
`import '
${
automator
}
';`
:
''
}
}
src/core/helpers/protocol/route/route.js
浏览文件 @
44750bb6
...
...
@@ -60,8 +60,8 @@ function createValidator (type) {
}
}
//
tabBar不允许传递参数
if
(
routeOptions
.
meta
.
isTabBar
)
{
//
switchTab不允许传递参数,reLaunch到一个tabBar页面是可以的
if
(
type
===
'
switchTab
'
&&
routeOptions
.
meta
.
isTabBar
)
{
url
=
pagePath
}
...
...
src/core/service/plugins/page/create-page.js
浏览文件 @
44750bb6
import
{
hasOwn
}
from
'
uni-shared
'
}
from
'
uni-shared
'
export
default
function
createPage
(
pageVm
)
{
export
default
function
createPage
(
pageVm
,
options
)
{
const
$route
=
pageVm
.
$route
pageVm
.
route
=
$route
.
meta
.
pagePath
if
(
!
pageVm
.
options
)
{
// 可能开发者会声明 options 属性
pageVm
.
options
=
options
}
const
id
=
hasOwn
(
$route
.
params
,
'
__id__
'
)
?
$route
.
params
.
__id__
:
$route
.
meta
.
id
pageVm
.
__page__
=
{
id
,
path
:
$route
.
path
,
route
:
$route
.
meta
.
pagePath
,
options
:
options
,
meta
:
Object
.
assign
({},
$route
.
meta
)
}
// 兼容 mpvue
...
...
src/core/service/plugins/page/index.js
浏览文件 @
44750bb6
...
...
@@ -20,8 +20,9 @@ function getDecodedQuery (query = {}) {
export
function
createPageMixin
()
{
return
{
created
:
function
pageCreated
()
{
createPage
(
this
)
callPageHook
(
this
,
'
onLoad
'
,
getDecodedQuery
(
this
.
$route
.
query
))
const
options
=
getDecodedQuery
(
this
.
$route
.
query
)
createPage
(
this
,
options
)
callPageHook
(
this
,
'
onLoad
'
,
options
)
callPageHook
(
this
,
'
onShow
'
)
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录