Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
erosXXX
uni-app
提交
36e1bcbe
U
uni-app
项目概览
erosXXX
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
36e1bcbe
编写于
9月 06, 2019
作者:
fxy060608
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' of
https://github.com/dcloudio/uni-app
into alpha
上级
2267f9aa
99abbc4d
变更
9
展开全部
隐藏空白更改
内联
并排
Showing
9 changed file
with
958 addition
and
7 deletion
+958
-7
build/rollup.config.service.js
build/rollup.config.service.js
+22
-0
package.json
package.json
+2
-1
packages/uni-app-plus-nvue/dist/service.legacy.js
packages/uni-app-plus-nvue/dist/service.legacy.js
+871
-0
packages/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/template.js
...builderx/packages/webpack-uni-nvue-loader/lib/template.js
+4
-1
packages/vue-cli-plugin-uni/packages/vue-template-compiler/browser.js
...-cli-plugin-uni/packages/vue-template-compiler/browser.js
+2
-2
packages/vue-cli-plugin-uni/packages/vue-template-compiler/build.js
...ue-cli-plugin-uni/packages/vue-template-compiler/build.js
+2
-2
src/platforms/app-plus-nvue/services/api/legacy/api.js
src/platforms/app-plus-nvue/services/api/legacy/api.js
+1
-0
src/platforms/app-plus-nvue/services/api/legacy/index.js
src/platforms/app-plus-nvue/services/api/legacy/index.js
+2
-1
src/platforms/app-plus-nvue/services/index.legacy.old.js
src/platforms/app-plus-nvue/services/index.legacy.old.js
+52
-0
未找到文件。
build/rollup.config.service.js
0 → 100644
浏览文件 @
36e1bcbe
const
path
=
require
(
'
path
'
)
const
alias
=
require
(
'
rollup-plugin-alias
'
)
const
replace
=
require
(
'
rollup-plugin-replace
'
)
module
.
exports
=
{
input
:
'
src/platforms/app-plus-nvue/services/index.legacy.old.js
'
,
output
:
{
file
:
`packages/uni-app-plus-nvue/dist/service.legacy.js`
,
format
:
'
es
'
},
plugins
:
[
alias
({
'
uni-core
'
:
path
.
resolve
(
__dirname
,
'
../src/core
'
),
'
uni-shared
'
:
path
.
resolve
(
__dirname
,
'
../src/shared/util.js
'
),
'
uni-helpers
'
:
path
.
resolve
(
__dirname
,
'
../src/core/helpers
'
)
}),
replace
({
__GLOBAL__
:
'
getGlobalUni()
'
,
__PLATFORM_TITLE__
:
'
app-plus-nvue
'
})
]
}
package.json
浏览文件 @
36e1bcbe
{
"name"
:
"uniapp-js-framework"
,
"version"
:
"0.0.1"
,
"scripts"
:
{
"scripts"
:
{
"build:service:legacy"
:
"npm run lint && rollup -c build/rollup.config.service.js"
,
"lint"
:
"eslint --fix --config package.json --ext .js --ext .vue --ignore-path .eslintignore build src"
,
"lint:cli"
:
"eslint --fix --config package.json --ignore-path .eslintignore packages/uni-cli-shared packages/uni-template-compiler
\"
packages/vue-cli-*/**/*.js
\"
\"
packages/webpack-uni-*/**/*.js
\"
"
,
"dev:h5"
:
"npm run lint && cross-env NODE_ENV=production UNI_WATCH=true UNI_PLATFORM=h5 node build/build.js"
,
...
...
packages/uni-app-plus-nvue/dist/service.legacy.js
0 → 100644
浏览文件 @
36e1bcbe
此差异已折叠。
点击以展开。
packages/vue-cli-plugin-hbuilderx/packages/webpack-uni-nvue-loader/lib/template.js
浏览文件 @
36e1bcbe
module
.
exports
=
function
(
content
)
{
this
.
cacheable
&&
this
.
cacheable
()
this
.
cacheable
&&
this
.
cacheable
()
if
(
content
.
indexOf
(
'
recycle-list
'
)
===
-
1
)
{
return
`<scroll-view :scroll-y="true" :enableBackToTop="true" bubble="true" style="flex-direction:column">
${
content
}
</scroll-view>`
}
return
content
}
packages/vue-cli-plugin-uni/packages/vue-template-compiler/browser.js
浏览文件 @
36e1bcbe
...
...
@@ -655,7 +655,7 @@
return
cumulated
},
{})
};
// fixed by xxxxxx
if
(
isSpecialTag
(
tag
)
&&
!
isCustomBlock
(
currentBlock
.
attrs
.
lang
||
''
))
{
if
(
isSpecialTag
(
tag
)
&&
!
isCustomBlock
(
String
(
currentBlock
.
attrs
.
lang
||
''
)
))
{
checkAttrs
(
currentBlock
,
attrs
);
if
(
tag
===
'
style
'
)
{
sfc
.
styles
.
push
(
currentBlock
);
...
...
@@ -713,7 +713,7 @@
}
else
{
var
offset
=
content
.
slice
(
0
,
block
.
start
).
split
(
splitRE$1
).
length
;
var
lang
=
block
.
attrs
&&
block
.
attrs
.
lang
;
// fixed by xxxxxx
var
padChar
=
block
.
type
===
'
script
'
&&
!
block
.
lang
&&
!
isCustomBlock
(
lang
||
''
)
var
padChar
=
block
.
type
===
'
script
'
&&
!
block
.
lang
&&
!
isCustomBlock
(
String
(
lang
||
''
)
)
?
'
//
\n
'
:
'
\n
'
;
return
Array
(
offset
).
join
(
padChar
)
...
...
packages/vue-cli-plugin-uni/packages/vue-template-compiler/build.js
浏览文件 @
36e1bcbe
...
...
@@ -613,7 +613,7 @@ function parseComponent (
return
cumulated
},
{})
};
// fixed by xxxxxx
if
(
isSpecialTag
(
tag
)
&&
!
isCustomBlock
(
currentBlock
.
attrs
.
lang
||
''
))
{
if
(
isSpecialTag
(
tag
)
&&
!
isCustomBlock
(
String
(
currentBlock
.
attrs
.
lang
||
''
)
))
{
checkAttrs
(
currentBlock
,
attrs
);
if
(
tag
===
'
style
'
)
{
sfc
.
styles
.
push
(
currentBlock
);
...
...
@@ -671,7 +671,7 @@ function parseComponent (
}
else
{
var
offset
=
content
.
slice
(
0
,
block
.
start
).
split
(
splitRE
).
length
;
var
lang
=
block
.
attrs
&&
block
.
attrs
.
lang
;
// fixed by xxxxxx
var
padChar
=
block
.
type
===
'
script
'
&&
!
block
.
lang
&&
!
isCustomBlock
(
lang
||
''
)
var
padChar
=
block
.
type
===
'
script
'
&&
!
block
.
lang
&&
!
isCustomBlock
(
String
(
lang
||
''
)
)
?
'
//
\n
'
:
'
\n
'
;
return
Array
(
offset
).
join
(
padChar
)
...
...
src/platforms/app-plus-nvue/services/api/legacy/api.js
浏览文件 @
36e1bcbe
...
...
@@ -14,3 +14,4 @@ export {
export
*
from
'
../../../service/api/context/map
'
export
*
from
'
../../../service/api/context/video
'
export
*
from
'
../../../service/api/context/live-pusher
'
export
*
from
'
uni-core/service/api/base/interceptor
'
src/platforms/app-plus-nvue/services/api/legacy/index.js
浏览文件 @
36e1bcbe
...
...
@@ -47,7 +47,8 @@ export default function initUni (uni, nvue, plus, BroadcastChannel) {
return
promisify
(
name
,
uni
[
name
])
},
set
(
target
,
name
,
value
)
{
target
[
name
]
=
value
target
[
name
]
=
value
return
true
}
})
}
...
...
src/platforms/app-plus-nvue/services/index.legacy.old.js
0 → 100644
浏览文件 @
36e1bcbe
import
initUni
from
'
./api/legacy/index
'
import
initUpx2px
from
'
./api/upx2px
'
import
initEventBus
from
'
./api/event-bus
'
let
getGlobalUni
let
getGlobalApp
let
getGlobalUniEmitter
let
getGlobalCurrentPages
export
default
{
create
(
id
,
env
,
config
)
{
return
{
initUniApp
({
nvue
,
getUni
,
getApp
,
getUniEmitter
,
getCurrentPages
})
{
getGlobalUni
=
getUni
getGlobalApp
=
getApp
getGlobalUniEmitter
=
getUniEmitter
getGlobalCurrentPages
=
getCurrentPages
initUpx2px
(
nvue
)
initEventBus
(
getUniEmitter
)
},
instance
:
{
getUni
(
nvue
,
plus
,
BroadcastChannel
)
{
return
initUni
(
getGlobalUni
(),
nvue
,
plus
,
BroadcastChannel
)
},
getApp
()
{
return
getGlobalApp
()
},
getUniEmitter
()
{
return
getGlobalUniEmitter
()
},
getCurrentPages
()
{
return
getGlobalCurrentPages
()
}
}
}
},
refresh
:
function
(
id
,
env
,
config
)
{
},
destroy
:
function
(
id
,
env
)
{
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录