Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DCloud
uni-app
提交
cb81e195
U
uni-app
项目概览
DCloud
/
uni-app
2 个月 前同步成功
通知
717
Star
38705
Fork
3642
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
7
列表
看板
标记
里程碑
合并请求
1
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
7
Issue
7
列表
看板
标记
里程碑
合并请求
1
合并请求
1
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
cb81e195
编写于
6月 24, 2021
作者:
D
DCloud_LXH
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
chore: ServiceJSBridge -> UniServiceJSBridge
上级
b6b97c02
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
43 addition
and
39 deletion
+43
-39
packages/uni-api/src/service/context/canvas.ts
packages/uni-api/src/service/context/canvas.ts
+16
-10
packages/uni-api/src/service/context/editor.ts
packages/uni-api/src/service/context/editor.ts
+2
-3
packages/uni-api/src/service/keyboard/getSelectedTextRange.ts
...ages/uni-api/src/service/keyboard/getSelectedTextRange.ts
+25
-26
未找到文件。
packages/uni-api/src/service/context/canvas.ts
浏览文件 @
cb81e195
...
...
@@ -33,7 +33,6 @@ import {
getPageIdByVm
,
getCurrentPageVm
,
createCallbacks
,
ServiceJSBridge
,
}
from
'
@dcloudio/uni-core
'
import
{
TEMP_PATH
}
from
'
@dcloudio/uni-platform
'
...
...
@@ -43,22 +42,26 @@ import { TEMP_PATH } from '@dcloudio/uni-platform'
//#region UniServiceJSBridge
const
canvasEventCallbacks
=
createCallbacks
(
'
canvasEvent
'
)
ServiceJSBridge
.
subscribe
!
(
'
onCanvasMethodCallback
'
,
({
callbackId
,
data
}:
{
callbackId
:
number
|
string
;
data
:
any
})
=>
{
const
callback
=
canvasEventCallbacks
.
pop
(
callbackId
)
if
(
callback
)
{
callback
(
data
)
const
onCanvasMethodCallback
=
/*#__PURE__*/
once
(()
=>
{
UniServiceJSBridge
.
subscribe
(
'
onCanvasMethodCallback
'
,
({
callbackId
,
data
}:
{
callbackId
:
number
|
string
;
data
:
any
})
=>
{
const
callback
=
canvasEventCallbacks
.
pop
(
callbackId
)
if
(
callback
)
{
callback
(
data
)
}
}
}
)
)
})
function
operateCanvas
(
canvasId
:
string
,
pageId
:
number
,
type
:
unknown
,
data
:
any
)
{
ServiceJSBridge
.
publishHandler
!
(
UniServiceJSBridge
.
publishHandler
(
'
canvas.
'
+
canvasId
,
{
canvasId
,
...
...
@@ -1043,6 +1046,7 @@ export const canvasGetImageData =
defineAsyncApi
<
API_TYPE_CANVAS_GET_IMAGE_DATA
>
(
API_CANVAS_GET_IMAGE_DATA
,
({
canvasId
,
x
,
y
,
width
,
height
},
{
resolve
,
reject
})
=>
{
onCanvasMethodCallback
()
const
pageId
=
getPageIdByVm
(
getCurrentPageVm
()
!
)
!
if
(
!
pageId
)
{
reject
()
...
...
@@ -1078,6 +1082,7 @@ export const canvasPutImageData =
defineAsyncApi
<
API_TYPE_CANVAS_PUT_IMAGE_DATA
>
(
API_CANVAS_PUT_IMAGE_DATA
,
async
({
canvasId
,
data
,
x
,
y
,
width
,
height
},
{
resolve
,
reject
})
=>
{
onCanvasMethodCallback
()
var
pageId
=
getPageIdByVm
(
getCurrentPageVm
()
!
)
!
if
(
!
pageId
)
{
reject
()
...
...
@@ -1133,6 +1138,7 @@ export const canvasToTempFilePath =
},
{
resolve
,
reject
}
)
=>
{
onCanvasMethodCallback
()
var
pageId
=
getPageIdByVm
(
getCurrentPageVm
()
!
)
!
if
(
!
pageId
)
{
reject
()
...
...
packages/uni-api/src/service/context/editor.ts
浏览文件 @
cb81e195
import
{
ServiceJSBridge
}
from
'
@dcloudio/uni-core
'
import
{
callOptions
}
from
'
@dcloudio/uni-shared
'
let
eventReady
=
false
...
...
@@ -19,7 +18,7 @@ function operateEditor(
data
.
callbackId
=
callbackId
optionsCache
[
callbackId
]
=
options
if
(
!
eventReady
)
{
ServiceJSBridge
.
subscribe
!
(
UniServiceJSBridge
.
subscribe
(
'
onEditorMethodCallback
'
,
({
callbackId
,
data
}:
{
callbackId
:
string
;
data
:
any
})
=>
{
callOptions
(
optionsCache
[
callbackId
],
data
)
...
...
@@ -30,7 +29,7 @@ function operateEditor(
}
}
data
.
options
=
options
ServiceJSBridge
.
publishHandler
!
(
UniServiceJSBridge
.
publishHandler
(
'
editor.
'
+
componentId
,
{
componentId
,
...
...
packages/uni-api/src/service/keyboard/getSelectedTextRange.ts
浏览文件 @
cb81e195
import
{
createCallbacks
,
getCurrentPageId
,
ServiceJSBridge
,
}
from
'
@dcloudio/uni-core
'
import
{
createCallbacks
,
getCurrentPageId
}
from
'
@dcloudio/uni-core
'
import
{
API_GET_SELECTED_TEXT_RANGE
,
API_TYPE_GET_SELECTED_TEXT_RANGE
,
}
from
'
../../protocols/keyboard/getSelectedTextRange
'
import
{
defineAsyncApi
}
from
'
../../helpers/api
'
import
{
once
}
from
'
@dcloudio/uni-shared
'
const
getSelectedTextRangeEventCallbacks
=
createCallbacks
(
'
getSelectedTextRangeEvent
'
)
ServiceJSBridge
.
subscribe
&&
ServiceJSBridge
.
subscribe
(
const
onGetSelectedTextRange
=
/*#__PURE__*/
once
(()
=>
{
UniServiceJSBridge
.
subscribe
(
'
onGetSelectedTextRange
'
,
({
callbackId
,
data
}:
{
callbackId
:
number
;
data
:
Data
})
=>
{
const
callback
=
getSelectedTextRangeEventCallbacks
.
pop
(
callbackId
)
...
...
@@ -22,31 +20,32 @@ ServiceJSBridge.subscribe &&
}
}
)
})
export
const
getSelectedTextRange
=
defineAsyncApi
<
API_TYPE_GET_SELECTED_TEXT_RANGE
>
(
API_GET_SELECTED_TEXT_RANGE
,
(
_
,
{
resolve
,
reject
})
=>
{
onGetSelectedTextRange
()
const
pageId
=
getCurrentPageId
()
ServiceJSBridge
.
publishHandler
&&
ServiceJSBridge
.
publishHandler
(
'
getSelectedTextRange
'
,
{
pageId
,
callbackId
:
getSelectedTextRangeEventCallbacks
.
push
(
function
(
res
:
UniApp
.
GetSelectedTextRangeSuccessCallbackResult
UniServiceJSBridge
.
publishHandler
(
'
getSelectedTextRange
'
,
{
pageId
,
callbackId
:
getSelectedTextRangeEventCallbacks
.
push
(
function
(
res
:
UniApp
.
GetSelectedTextRangeSuccessCallbackResult
)
{
if
(
typeof
res
.
end
===
'
undefined
'
&&
typeof
res
.
start
===
'
undefined
'
)
{
if
(
typeof
res
.
end
===
'
undefined
'
&&
typeof
res
.
start
===
'
undefined
'
)
{
reject
(
'
no focused
'
)
}
else
{
resolve
(
res
)
}
}),
},
pageId
)
reject
(
'
no focused
'
)
}
else
{
resolve
(
res
)
}
}),
},
pageId
)
}
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录