From 59e2877f7881c8d95d347102fd0501460ae71ce1 Mon Sep 17 00:00:00 2001
From: zhenyuWang <13641039885@163.com>
Date: Mon, 21 Aug 2023 21:55:15 +0800
Subject: [PATCH] wip(uts): automator

---
 packages/uni-app-uts/lib/automator/apis/App/index.uts | 8 ++++----
 packages/uni-app-uts/lib/automator/apis/Page.uts      | 2 +-
 packages/uni-app-uts/lib/automator/apis/util.uts      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/uni-app-uts/lib/automator/apis/App/index.uts b/packages/uni-app-uts/lib/automator/apis/App/index.uts
index 569a4c5733..cb6900443b 100644
--- a/packages/uni-app-uts/lib/automator/apis/App/index.uts
+++ b/packages/uni-app-uts/lib/automator/apis/App/index.uts
@@ -426,8 +426,8 @@ export const callUniMethod = (
 
 export type CaptureScreenshotParams = {
   id?: string | null
-  fullPage: boolean
-  path: string
+  fullPage?: boolean | null
+  path?: string | null
 }
 export const captureScreenshot = (
   params: CaptureScreenshotParams,
@@ -436,8 +436,8 @@ export const captureScreenshot = (
   const currentPage = _getCurrentPage()
   if (currentPage != null) {
     currentPage.$viewToTempFilePath({
-      id: params.fullPage ? null : params.id,
-      wholeContent: params.fullPage,
+      id: params.fullPage === true ? null : params.id,
+      wholeContent: params.fullPage === true,
       path: params.path,
       success: (res) => {
         // @ts-ignore
diff --git a/packages/uni-app-uts/lib/automator/apis/Page.uts b/packages/uni-app-uts/lib/automator/apis/Page.uts
index 708909dad0..62177f7875 100644
--- a/packages/uni-app-uts/lib/automator/apis/Page.uts
+++ b/packages/uni-app-uts/lib/automator/apis/Page.uts
@@ -5,7 +5,7 @@ import { pageGetData, pageSetData, getPageVm, getValidComponentsOrNodes } from '
 
 export type GetDataParams = {
   pageId: string
-  path: string
+  path?: string | null
 }
 export const getData = (params: GetDataParams, callback: Callback): void => {
   const page = getPageVm(params.pageId)
diff --git a/packages/uni-app-uts/lib/automator/apis/util.uts b/packages/uni-app-uts/lib/automator/apis/util.uts
index ddf11e810c..69198ae717 100644
--- a/packages/uni-app-uts/lib/automator/apis/util.uts
+++ b/packages/uni-app-uts/lib/automator/apis/util.uts
@@ -184,7 +184,7 @@ export function getValidComponentsOrNodes(
   list: UTSJSONObject[],
   getAll = false
 ): void {
-  if (vnode == null) {
+  if (vnode == null || (!getAll && list.length > 0)) {
     return
   }
   if (isValidComponentOrNode(vnode, selector)) {
-- 
GitLab