@winning-test/component 0.0.43 → 0.0.45

package/edis5.6/page/Page.js

@@ -157,11 +157,11 @@ class Page extends require("@winning-test/autotest-webui").Page {
     async loading() {
         try {
             let xpath = "//*[contains(@class,'el-loading-mask') and (not (ancestor-or-self::*[contains(@style,'display: none')]))]";
-            if (await this.browser.isDisplayed(xpath, 500)) {
+            if (await this.browser.isDisplayed(xpath, 250)) {
                 await this.browser.waitUntilElementBeNotVisible(xpath);
             }
             xpath = "//*[contains(text(),'加载中') and (not (ancestor-or-self::*[contains(@style,'display: none')]))]";
-            if (await this.browser.isDisplayed(xpath, 500)) {
+            if (await this.browser.isDisplayed(xpath, 250)) {
                 await this.browser.waitUntilElementBeNotVisible(xpath);
             }
         } catch (error) {
@@ -169,6 +169,34 @@ class Page extends require("@winning-test/autotest-webui").Page {
         }
     }
 
+    /**
+     * 关闭打印窗口
+     * @param {Number} timeout 等待时间, 单位: ms
+     */
+    async closePrintWindow(timeout = 10000) {
+        let count = timeout / 500;
+        while (count > 0) {
+            let windows = await this.browser.webDriver.getAllWindowHandles();
+            if (windows.length === 1) {
+                await this.browser.sleep(500);
+                count--;
+                continue;
+            }
+            const js = "document.querySelector('print-preview-app').shadowRoot.querySelector('print-preview-sidebar').shadowRoot.querySelector('print-preview-button-strip').shadowRoot.querySelector('cr-button.cancel-button').click()";
+            for (let i = 1; i < windows.length; i++) {
+                try {
+                    await this.browser.switchToWindow(i);
+                    await this.browser.executeScript(js);
+                    break;
+                } catch (error) {
+
+                }
+            }
+            break;
+        }
+        await this.browser.switchToWindow();
+    }
+
 }
 
 module.exports = Page;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@winning-test/component",
-  "version": "0.0.43",
+  "version": "0.0.45",
   "description": "",
   "main": "",
   "scripts": {

package/rhm5.6/page/Page.js

@@ -163,6 +163,10 @@ class Page extends require("@winning-test/autotest-webui").Page {
             if (await this.browser.isDisplayed(xpath, 200)) {
                 await this.browser.waitUntilElementBeNotVisible(xpath);
             }
+            xpath = "//span[@id='processText'][contains(text(),'请稍候')]";
+            if (await this.browser.isDisplayed(xpath, 100)) {
+                await this.browser.waitUntilElementBeNotVisible(xpath);
+            }
         } catch (error) {
 
         }
@@ -191,6 +195,7 @@ class Page extends require("@winning-test/autotest-webui").Page {
                 xpath = `//*[@id='menuconfig']//*[text()='${firstItem}']/ancestor::ul/li[2]//*[text()='${secondItem}']`;
                 await that.blockComponent(xpath).click();
                 await that.switchToActiveFrame();
+                await that.loading();
             }
 
         }