From 99a7c0c4f01d5ddb4726b3880f8478c18049a232 Mon Sep 17 00:00:00 2001 From: lizhongyi Date: Fri, 26 Jul 2024 20:15:39 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=AE=9E=E7=8E=B0iOS=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=20uts-get-native-view=E6=8F=92=E4=BB=B6=E9=80=BB?= =?UTF-8?q?=E8=BE=91"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 0b1219f19428a9b7c5d74d72a65cf96f0dbf2506. --- pages/component/web-view/web-view.uvue | 2 -- .../utssdk/app-ios/DCGetElementByID.swift | 22 ------------------- .../utssdk/app-ios/index.uts | 22 ------------------- 3 files changed, 46 deletions(-) delete mode 100644 uni_modules/uts-get-native-view/utssdk/app-ios/DCGetElementByID.swift delete mode 100644 uni_modules/uts-get-native-view/utssdk/app-ios/index.uts diff --git a/pages/component/web-view/web-view.uvue b/pages/component/web-view/web-view.uvue index a28d1a7a..ce1b5eec 100644 --- a/pages/component/web-view/web-view.uvue +++ b/pages/component/web-view/web-view.uvue @@ -119,8 +119,6 @@ }, load(event : UniWebViewLoadEvent) { console.log(JSON.stringify(event.detail)); - this.canGoBack = canWebViewGoBack('web-view'); - this.canGoForward = canWebViewGoForward('web-view'); if (this.autoTest) { this.eventLoad = { "tagName": event.target?.tagName, diff --git a/uni_modules/uts-get-native-view/utssdk/app-ios/DCGetElementByID.swift b/uni_modules/uts-get-native-view/utssdk/app-ios/DCGetElementByID.swift deleted file mode 100644 index f60b4608..00000000 --- a/uni_modules/uts-get-native-view/utssdk/app-ios/DCGetElementByID.swift +++ /dev/null @@ -1,22 +0,0 @@ -// -// DCUni.swift -// DCGetElementByID -// -// Created by DCloud-iOS-XHY on 2024/7/8. -// - -import DCloudUniappRuntime - -public class DCGetElementByID { - /// 返回一个匹配特定 ID 的元素, 如果不存在,返回 null 规则同 https://doc.dcloud.net.cn/uni-app-x/api/get-element.html#getelementbyid - public static func dcGetElementById(_ id: String) -> UniElement? { - let appManager = UniSDKEngine.self.getAppManager() - if let app = appManager.getCurretApp(), - let pageManager = app.pageManager as? UniPageManagerImpl, - let page = pageManager.getTopPage(), - let domManager = page.document as? UniDomManager { - return domManager.getElementById(id) - } - return nil - } -} diff --git a/uni_modules/uts-get-native-view/utssdk/app-ios/index.uts b/uni_modules/uts-get-native-view/utssdk/app-ios/index.uts deleted file mode 100644 index 39fe984e..00000000 --- a/uni_modules/uts-get-native-view/utssdk/app-ios/index.uts +++ /dev/null @@ -1,22 +0,0 @@ -import { CanWebViewGoBack, CanWebViewGoForward } from "../interface"; -import { WKWebView } from 'WebKit'; - -export const canWebViewGoBack : CanWebViewGoBack = function (elementId : string) : boolean { - // const element = uni.getElementById(elementId) - const element = DCGetElementByID.dcGetElementById(elementId) - const view = element?.getIOSView(); - if (view != null && view instanceof WKWebView) { - return (view! as WKWebView).canGoBack; - } - return false; -} - -export const canWebViewGoForward : CanWebViewGoForward = function (elementId : string) : boolean { - // const element = uni.getElementById(elementId) - const element = DCGetElementByID.dcGetElementById(elementId) - const view = element?.getIOSView(); - if (view != null && view instanceof WKWebView) { - return (view! as WKWebView).canGoForward; - } - return false; -} -- GitLab