Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qianlong66
uni-app
提交
bb3c55c8
U
uni-app
项目概览
qianlong66
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
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,发现更多精彩内容 >>
提交
bb3c55c8
编写于
6月 29, 2022
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore: build
上级
74096b2b
变更
11
展开全部
隐藏空白更改
内联
并排
Showing
11 changed file
with
91 addition
and
27 deletion
+91
-27
packages/playground/uts/nativeplugins/test-uniplugin/ios/src/TestModuleImpl.uts
...s/nativeplugins/test-uniplugin/ios/src/TestModuleImpl.uts
+1
-0
packages/playground/uts/unpackage/nativeplugins/test-uniplugin-ios/ios/src/TestModuleImpl.swift
...veplugins/test-uniplugin-ios/ios/src/TestModuleImpl.swift
+3
-2
packages/uni-app-plus/dist/uni-app-view.umd.js
packages/uni-app-plus/dist/uni-app-view.umd.js
+1
-1
packages/uni-h5/dist/uni-h5.cjs.js
packages/uni-h5/dist/uni-h5.cjs.js
+46
-5
packages/uni-h5/dist/uni-h5.es.js
packages/uni-h5/dist/uni-h5.es.js
+34
-5
packages/uts-darwin-arm64/uts.darwin-arm64.node
packages/uts-darwin-arm64/uts.darwin-arm64.node
+0
-0
packages/uts-darwin-x64/uts.darwin-x64.node
packages/uts-darwin-x64/uts.darwin-x64.node
+0
-0
packages/uts-win32-ia32-msvc/uts.win32-ia32-msvc.node
packages/uts-win32-ia32-msvc/uts.win32-ia32-msvc.node
+0
-0
packages/uts-win32-x64-msvc/uts.win32-x64-msvc.node
packages/uts-win32-x64-msvc/uts.win32-x64-msvc.node
+0
-0
packages/uts/src/index.ts
packages/uts/src/index.ts
+5
-5
packages/uts/src/types.ts
packages/uts/src/types.ts
+1
-9
未找到文件。
packages/playground/uts/nativeplugins/test-uniplugin/ios/src/TestModuleImpl.uts
浏览文件 @
bb3c55c8
import "Foundation";
//
// TestModuleImpl.swift
// libWeex
...
...
packages/playground/uts/unpackage/nativeplugins/test-uniplugin-ios/ios/src/TestModuleImpl.swift
浏览文件 @
bb3c55c8
import
Foundation
;
@objcMembers
class
TestModuleImpl
:
NSObject
{
func
testAsyncFunc
(
option
:
NSDictionary
,
callback
:
UniModuleKeepAliveCallback
)
{
func
testAsyncFunc
(
_
option
:
NSDictionary
,
_
callback
:
UniModuleKeepAliveCallback
)
{
console
.
log
(
option
);
callback
(
"success"
,
false
);
}
func
testSyncFunc
(
option
:
NSDictionary
)
->
String
{
func
testSyncFunc
(
_
option
:
NSDictionary
)
->
String
{
console
.
log
(
option
);
return
""
;
}
...
...
packages/uni-app-plus/dist/uni-app-view.umd.js
浏览文件 @
bb3c55c8
此差异已折叠。
点击以展开。
packages/uni-h5/dist/uni-h5.cjs.js
浏览文件 @
bb3c55c8
...
...
@@ -613,13 +613,23 @@ function useHover(props2) {
});
}
function
onTouchstartPassive
(
evt
)
{
if
(
evt
.
_hoverPropagationStopped
)
{
if
(
evt
.
touches
.
length
>
1
)
{
return
;
}
if
(
!
props2
.
hoverClass
||
props2
.
hoverClass
===
"
none
"
||
props2
.
disabled
)
{
handleHoverStart
(
evt
);
}
function
onMousedown
(
evt
)
{
if
(
hoverTouch
)
{
return
;
}
if
(
evt
.
touches
.
length
>
1
)
{
handleHoverStart
(
evt
);
window
.
addEventListener
(
"
mouseup
"
,
handlePCHoverEnd
);
}
function
handleHoverStart
(
evt
)
{
if
(
evt
.
_hoverPropagationStopped
)
{
return
;
}
if
(
!
props2
.
hoverClass
||
props2
.
hoverClass
===
"
none
"
||
props2
.
disabled
)
{
return
;
}
if
(
props2
.
hoverStopPropagation
)
{
...
...
@@ -634,11 +644,24 @@ function useHover(props2) {
},
parseInt
(
props2
.
hoverStartTime
));
}
function
onTouchend
()
{
handleHoverEnd
();
}
function
onMouseup
()
{
if
(
!
hoverTouch
)
{
return
;
}
handlePCHoverEnd
();
}
function
handleHoverEnd
()
{
hoverTouch
=
false
;
if
(
hovering
.
value
)
{
hoverReset
();
}
}
function
handlePCHoverEnd
()
{
handleHoverEnd
();
window
.
removeEventListener
(
"
mouseup
"
,
handlePCHoverEnd
);
}
function
onTouchcancel
()
{
hoverTouch
=
false
;
hovering
.
value
=
false
;
...
...
@@ -648,7 +671,9 @@ function useHover(props2) {
hovering
,
binding
:
{
onTouchstartPassive
,
onMousedown
,
onTouchend
,
onMouseup
,
onTouchcancel
}
};
...
...
@@ -4023,6 +4048,9 @@ function useMovableViewState(props2, trigger, rootRef) {
vue
.
watch
(
ySync
,
(
val
)
=>
{
_setY
(
val
);
});
vue
.
watch
(()
=>
props2
.
disabled
,
()
=>
{
__handleTouchStart
();
});
vue
.
watch
(()
=>
props2
.
scaleValue
,
(
val
)
=>
{
scaleValueSync
.
value
=
Number
(
val
)
||
0
;
});
...
...
@@ -4080,6 +4108,18 @@ function useMovableViewState(props2, trigger, rootRef) {
_updateScale
(
scale
,
true
);
return
scale
;
}
function
__handleTouchStart
()
{
{
if
(
!
props2
.
disabled
)
{
FAandSFACancel
();
if
(
xMove
.
value
)
;
if
(
yMove
.
value
)
;
rootRef
.
value
.
style
.
willChange
=
"
transform
"
;
}
}
}
function
_getLimitXY
(
x
,
y
)
{
let
outOfBounds
=
false
;
if
(
x
>
maxX
.
value
)
{
...
...
@@ -4390,14 +4430,15 @@ var index$t = /* @__PURE__ */ defineBuiltInComponent({
return
vue
.
createVNode
(
"
a
"
,
{
"
class
"
:
"
navigator-wrap
"
,
"
href
"
:
url
,
"
onClick
"
:
onEventPrevent
"
onClick
"
:
onEventPrevent
,
"
onMousedown
"
:
onEventPrevent
},
[
vue
.
createVNode
(
"
uni-navigator
"
,
vue
.
mergeProps
({
"
class
"
:
hasHoverClass
&&
hovering
.
value
?
hoverClass
:
""
},
hasHoverClass
&&
binding
,
vm
?
vm
.
attrs
:
{},
{
[
__scopeId
]:
""
},
{
"
onClick
"
:
onClick
}),
[
slots
.
default
&&
slots
.
default
()],
16
,
[
"
onClick
"
])],
8
,
[
"
href
"
,
"
onClick
"
]);
}),
[
slots
.
default
&&
slots
.
default
()],
16
,
[
"
onClick
"
])],
40
,
[
"
href
"
,
"
onClick
"
,
"
onMousedown
"
]);
};
}
});
...
...
packages/uni-h5/dist/uni-h5.es.js
浏览文件 @
bb3c55c8
...
...
@@ -1688,13 +1688,23 @@ function useHover(props2) {
});
}
function onTouchstartPassive(evt) {
if (evt.
_hoverPropagationStopped
) {
if (evt.
touches.length > 1
) {
return;
}
if (!props2.hoverClass || props2.hoverClass === "none" || props2.disabled) {
handleHoverStart(evt);
}
function onMousedown(evt) {
if (hoverTouch) {
return;
}
if (evt.touches.length > 1) {
handleHoverStart(evt);
window.addEventListener("mouseup", handlePCHoverEnd);
}
function handleHoverStart(evt) {
if (evt._hoverPropagationStopped) {
return;
}
if (!props2.hoverClass || props2.hoverClass === "none" || props2.disabled) {
return;
}
if (props2.hoverStopPropagation) {
...
...
@@ -1709,11 +1719,24 @@ function useHover(props2) {
}, parseInt(props2.hoverStartTime));
}
function onTouchend() {
handleHoverEnd();
}
function onMouseup() {
if (!hoverTouch) {
return;
}
handlePCHoverEnd();
}
function handleHoverEnd() {
hoverTouch = false;
if (hovering.value) {
hoverReset();
}
}
function handlePCHoverEnd() {
handleHoverEnd();
window.removeEventListener("mouseup", handlePCHoverEnd);
}
function onTouchcancel() {
hoverTouch = false;
hovering.value = false;
...
...
@@ -1723,7 +1746,9 @@ function useHover(props2) {
hovering,
binding: {
onTouchstartPassive,
onMousedown,
onTouchend,
onMouseup,
onTouchcancel
}
};
...
...
@@ -9742,6 +9767,9 @@ function useMovableViewState(props2, trigger, rootRef) {
watch(ySync, (val) => {
_setY(val);
});
watch(() => props2.disabled, () => {
__handleTouchStart();
});
watch(() => props2.scaleValue, (val) => {
scaleValueSync.value = Number(val) || 0;
});
...
...
@@ -10305,14 +10333,15 @@ var index$q = /* @__PURE__ */ defineBuiltInComponent({
return createVNode("a", {
"class": "navigator-wrap",
"href": url,
"onClick": onEventPrevent
"onClick": onEventPrevent,
"onMousedown": onEventPrevent
}, [createVNode("uni-navigator", mergeProps({
"class": hasHoverClass && hovering.value ? hoverClass : ""
}, hasHoverClass && binding, vm ? vm.attrs : {}, {
[__scopeId]: ""
}, {
"onClick": onClick
}), [slots.default && slots.default()], 16, ["onClick"])],
8, ["href", "onClick
"]);
}), [slots.default && slots.default()], 16, ["onClick"])],
40, ["href", "onClick", "onMousedown
"]);
};
}
});
...
...
packages/uts-darwin-arm64/uts.darwin-arm64.node
浏览文件 @
bb3c55c8
无法预览此类型文件
packages/uts-darwin-x64/uts.darwin-x64.node
浏览文件 @
bb3c55c8
无法预览此类型文件
packages/uts-win32-ia32-msvc/uts.win32-ia32-msvc.node
浏览文件 @
bb3c55c8
无法预览此类型文件
packages/uts-win32-x64-msvc/uts.win32-x64-msvc.node
浏览文件 @
bb3c55c8
无法预览此类型文件
packages/uts/src/index.ts
浏览文件 @
bb3c55c8
...
...
@@ -103,7 +103,7 @@ function resolveSrcDir(target: UtsTarget, dir: string) {
return
path
.
join
(
dir
,
UtsTargetDirs
[
target
]
+
'
/src
'
)
}
function
initInputOptions
(
root
:
string
):
UtsInputOptions
{
function
initInputOptions
(
_
:
UtsTarget
,
root
:
string
):
UtsInputOptions
{
return
{
root
,
filename
:
''
,
...
...
@@ -136,10 +136,10 @@ function watch(
extname
=
extname
||
EXTNAME
const
inputSrcDir
=
resolveSrcDir
(
UtsTarget
.
KOTLIN
,
inputDir
)
const
outputSrcDir
=
resolveSrcDir
(
UtsTarget
.
KOTLIN
,
outputDir
)
const
inputSrcDir
=
resolveSrcDir
(
target
,
inputDir
)
const
outputSrcDir
=
resolveSrcDir
(
target
,
outputDir
)
const
input
=
initInputOptions
(
inputSrcDir
)
const
input
=
initInputOptions
(
target
,
inputSrcDir
)
const
output
=
initOutputOptions
(
target
,
outputSrcDir
,
...
...
@@ -195,7 +195,7 @@ function build(
const
inputSrcDir
=
resolveSrcDir
(
target
,
inputDir
)
const
outputSrcDir
=
resolveSrcDir
(
target
,
outputDir
)
const
input
=
initInputOptions
(
inputSrcDir
)
const
input
=
initInputOptions
(
target
,
inputSrcDir
)
const
output
=
initOutputOptions
(
target
,
outputSrcDir
,
...
...
packages/uts/src/types.ts
浏览文件 @
bb3c55c8
export
interface
UtsParserConfig
{
/**
* Defaults to `false`.
*/
tsx
?:
boolean
/**
* Defaults to `false`.
*/
decorators
?:
boolean
/**
* Defaults to `false`
*/
dynamicImport
?:
boolean
allowImportWithoutSpecifiers
?:
boolean
}
export
type
UtsParseOptions
=
UtsParserConfig
&
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录