@winning-test/component 0.0.60 → 0.0.62

package/package.json

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

package/{winexRegion → winex-region}/component/TableComponent.js

@@ -60,6 +60,10 @@ class TableComponent extends require("./Component") {
             }
             ret.push(row);
         }
+        // 去重
+        ret = ret.filter((item1, index) => {
+            return ret.findIndex(item2 => JSON.stringify(item1) === JSON.stringify(item2)) === index;
+        });
         return ret;
     }
 

package/winex60/component/TableComponent.js

@@ -47,7 +47,7 @@ class TableComponent extends require("./Component") {
             titles[i] = (await titles[i].getText(true)).trim() || `#${String(i).padStart(3, "0")}`;
         }
         // 处理表体
-        xpath = `${this.getXpath()}${this._createBodyXapth()}//tr`;
+        xpath = `(${this.getXpath()}${this._createBodyXapth()})[1]//tr`;
         let trs = await this.browser.findElements(xpath);
         for (let i = 0; i < trs.length; i++) {
             xpath = `(${this.getXpath()}${this._createBodyXapth()}//tr)[${i + 1}]/td`;

package/winex60/page/Page.js

@@ -152,6 +152,20 @@ class Page extends require("@winning-test/autotest-webui").Page {
         return new RadioComponent(this.browser, label)
     }
 
+    /**
+     * 等待加载
+     */
+    async loading() {
+        try {
+            const xpath = "//*[contains(text(),'加载中')][not (ancestor-or-self::*[contains(@style,'display: none')])]";
+            if (await this.browser.isDisplayed(xpath, 1000)) {
+                await this.browser.waitUntilElementBeNotVisible(xpath);
+            }
+        } catch (error) {
+
+        }
+    }
+
 }
 
 module.exports = Page;