From aac7625e1ea10f4183d85d01863520fd1ac3378f Mon Sep 17 00:00:00 2001 From: tangcq-code <1192601676@qq.com> Date: Tue, 28 Nov 2023 16:14:57 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E5=B0=86taro-mpharmony=E4=B8=ADH5?= =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E7=9A=84=E6=8E=A5=E5=8F=A3=E7=9A=84=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=90=8C=E6=AD=A5=E5=88=B0taro-h5=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E6=95=B4=E5=90=88taro-mpharmony=E5=92=8Ctaro-h5=E7=9B=B8?= =?UTF-8?q?=E5=90=8C=E7=9A=84=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/taro-h5/src/api/base/index.ts | 2 +- packages/taro-h5/src/api/device/clipboard.ts | 8 +- packages/taro-h5/src/api/device/network.ts | 1 - .../src/api/location/chooseLocation.ts | 66 ++- packages/taro-h5/src/api/location/index.ts | 7 +- .../taro-h5/src/api/location/openLocation.ts | 83 ++++ packages/taro-h5/src/api/location/style.scss | 23 +- packages/taro-h5/src/api/media/map.ts | 1 + .../src/api/network/websocket/index.ts | 2 + .../taro-h5/src/api/ui/animation/index.ts | 141 ++++-- packages/taro-h5/src/api/ui/fonts.ts | 7 +- .../src/api/ui/interaction/actionSheet.ts | 63 ++- .../taro-h5/src/api/ui/interaction/index.ts | 10 +- .../taro-h5/src/api/ui/interaction/modal.ts | 4 +- .../src/api/wxml/IntersectionObserver.ts | 3 +- packages/taro-h5/src/api/wxml/index.ts | 4 +- packages/taro-h5/src/api/wxml/nodesRef.ts | 31 +- packages/taro-mpharmony/src/api/base/index.ts | 10 +- .../taro-mpharmony/src/api/device/battery.ts | 20 +- .../taro-mpharmony/src/api/device/calendar.ts | 184 +------- .../src/api/device/clipboard.ts | 69 +-- .../taro-mpharmony/src/api/device/motion.ts | 71 +--- .../taro-mpharmony/src/api/device/network.ts | 87 +--- .../taro-mpharmony/src/api/framework/index.ts | 11 +- .../src/api/location/chooseLocation.ts | 112 +---- .../src/api/location/openLocation.ts | 78 +--- .../src/api/location/style.scss | 74 ---- .../BackgroundAudioManager.ts | 183 -------- .../src/api/media/background-audio/index.ts | 13 +- .../src/api/media/video/index.ts | 11 +- .../src/api/network/websocket/index.ts | 104 +---- .../src/api/network/websocket/socketTask.ts | 91 ---- .../taro-mpharmony/src/api/storage/index.ts | 192 +-------- .../src/api/ui/animation/index.ts | 401 +----------------- packages/taro-mpharmony/src/api/ui/fonts.ts | 57 +-- .../src/api/ui/interaction/actionSheet.ts | 248 ----------- .../src/api/ui/interaction/index.ts | 330 +------------- .../src/api/ui/interaction/modal.ts | 266 ------------ .../src/api/ui/interaction/toast.ts | 263 ------------ .../src/api/ui/pull-down-refresh.ts | 24 +- .../taro-mpharmony/src/api/ui/scroll/index.ts | 98 +---- packages/taro-mpharmony/src/api/ui/tab-bar.ts | 291 +------------ packages/taro-mpharmony/src/api/ui/window.ts | 27 +- .../src/api/wxml/IntersectionObserver.ts | 144 ------- .../src/api/wxml/MediaQueryObserver.ts | 63 --- packages/taro-mpharmony/src/api/wxml/index.ts | 25 +- .../taro-mpharmony/src/api/wxml/nodesRef.ts | 68 +-- 47 files changed, 409 insertions(+), 3662 deletions(-) create mode 100644 packages/taro-h5/src/api/location/openLocation.ts delete mode 100644 packages/taro-mpharmony/src/api/location/style.scss delete mode 100644 packages/taro-mpharmony/src/api/media/background-audio/BackgroundAudioManager.ts delete mode 100644 packages/taro-mpharmony/src/api/network/websocket/socketTask.ts delete mode 100644 packages/taro-mpharmony/src/api/ui/interaction/actionSheet.ts delete mode 100644 packages/taro-mpharmony/src/api/ui/interaction/modal.ts delete mode 100644 packages/taro-mpharmony/src/api/ui/interaction/toast.ts delete mode 100644 packages/taro-mpharmony/src/api/wxml/IntersectionObserver.ts delete mode 100644 packages/taro-mpharmony/src/api/wxml/MediaQueryObserver.ts diff --git a/packages/taro-h5/src/api/base/index.ts b/packages/taro-h5/src/api/base/index.ts index 65b8ea56c297..3888b0f34d75 100644 --- a/packages/taro-h5/src/api/base/index.ts +++ b/packages/taro-h5/src/api/base/index.ts @@ -15,7 +15,7 @@ export function arrayBufferToBase64 (arrayBuffer: ArrayBuffer) { } export function base64ToArrayBuffer (base64: string) { - return toByteArray(base64) + return toByteArray(base64).buffer } export * from './crypto' diff --git a/packages/taro-h5/src/api/device/clipboard.ts b/packages/taro-h5/src/api/device/clipboard.ts index 8635378bb1fd..20596925f4b1 100644 --- a/packages/taro-h5/src/api/device/clipboard.ts +++ b/packages/taro-h5/src/api/device/clipboard.ts @@ -10,9 +10,9 @@ import { isFunction } from '@tarojs/shared' import { MethodHandler } from '../../utils/handler' import { getStorageSync, setStorage, setStorageSync } from '../storage/index' +import { showToast } from '../ui/interaction' const CLIPBOARD_STORAGE_NAME = 'taro_clipboard' - document.addEventListener('copy', () => { setStorage({ key: CLIPBOARD_STORAGE_NAME, @@ -21,7 +21,6 @@ document.addEventListener('copy', () => { console.error(e) }) }) - /** * 设置系统剪贴板的内容 */ @@ -49,6 +48,11 @@ export const setClipboardData: typeof Taro.setClipboardData = async ({ data, suc } else { throw new Error('Unsupported Function: \'document.execCommand\'.') } + showToast({ + title: '内容已复制', + icon: 'none', + duration: 1500 + }) return handle.success() } catch (e) { return handle.fail({ errMsg: e.message }) diff --git a/packages/taro-h5/src/api/device/network.ts b/packages/taro-h5/src/api/device/network.ts index 863dc270cbcd..785aaac6b72b 100644 --- a/packages/taro-h5/src/api/device/network.ts +++ b/packages/taro-h5/src/api/device/network.ts @@ -52,7 +52,6 @@ export const getNetworkType: typeof Taro.getNetworkType = (options = {}) => { } const networkStatusManager = new CallbackManager() - const networkStatusListener = async () => { const { networkType } = await getNetworkType() const isConnected = networkType !== 'none' diff --git a/packages/taro-h5/src/api/location/chooseLocation.ts b/packages/taro-h5/src/api/location/chooseLocation.ts index 285856f267e0..105169fc304e 100644 --- a/packages/taro-h5/src/api/location/chooseLocation.ts +++ b/packages/taro-h5/src/api/location/chooseLocation.ts @@ -6,26 +6,25 @@ import { stringify } from 'query-string' import { MethodHandler } from '../../utils/handler' let container: HTMLDivElement | null = null -function createLocationChooser (handler, key = LOCATION_APIKEY, mapOpt: Taro.chooseLocation.Option['mapOpts'] = {}) { - const { latitude, longitude, ...opts } = mapOpt +function createLocationChooser (handler, mapOpt: Taro.chooseLocation.Option['mapOpts'] = {}) { + const { key = LOCATION_APIKEY, referer = 'myapp', ...opts } = mapOpt const query = { key, type: 1, - coord: mapOpt.coord ?? [latitude, longitude].every(e => Number(e) >= 0) ? `${latitude},${longitude}` : undefined, - referer: 'myapp', - ...opts + referer, + ...opts, } if (!container) { const html = ` -
-
-
-

位置

- -
-