@winning-test/component 0.0.64 → 0.0.66

package/package.json

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

package/winex60/component/Component.js

@@ -48,6 +48,7 @@ class Component extends require("@winning-test/autotest-webui/src/Component") {
         return await super.getValue();
     }
 
+
     async getAttribute(attributeName) {
         await this.browser.sleep(Component.delayTime);
         return await super.getAttribute(attributeName);

package/winex60/component/DialogComponent.js

@@ -15,7 +15,10 @@ class DialogComponent extends require("./BlockComponent") {
     }
 
     _createXpath() {
-        return `//*[contains(normalize-space(text()),'${this.title}')]/ancestor::*[@role='dialog']`;
+        if (this.title){
+            return `//*[contains(normalize-space(text()),'${this.title}')]/ancestor::*[@role='dialog']`;
+        }
+        return `//*[@role='dialog']`;
     }
 
 }

package/winex60/component/SelectComponent.js

@@ -23,6 +23,7 @@ class SelectComponent extends require("./Component") {
         if (this.label) {
             return `//*[normalize-space(text())='${this.label}']/..//input`;
         }
+        return "//input[@type='text']";
     }
 
     /**

package/winex60/component/TableComponent.js

@@ -35,7 +35,9 @@ class TableComponent extends require("./Component") {
     async getTableData() {
         let ret = [];
         let xpath = `(${this.getXpath()}${this._createBodyXapth()}//tr)[1]`;
-        await this.browser.waitUntilElementBeVisible(xpath);
+        if (!(await this.browser.isDisplayed(xpath, this.browser.config.timeout))) {
+            return ret;
+        }
         await this.browser.sleep(TableComponent.delayTime);
         // 处理表头
         if (!this._createHeaderXapth()) {

package/winex60/page/Page.js

@@ -166,6 +166,22 @@ class Page extends require("@winning-test/autotest-webui").Page {
         }
     }
 
+    /**
+     * 关闭所有对话框
+     */
+    async closeAllDialog() {
+        let count = 5;
+        while ((await this.dialogComponent().isDisplayed(500)) && count > 0) {
+            try {
+                await this.dialogComponent().blockComponent("//*[contains(@class,'el-dialog__close')]").click();
+                await this.dialogComponent().waitUntilBeNotVisible();
+            } catch (error) {
+
+            }
+            count--;
+        }
+    }
+
 }
 
 module.exports = Page;