@winning-test/component 0.0.100 → 0.0.101

package/acis60/component/SelectComponent.js

@@ -35,7 +35,18 @@ class SelectComponent extends require("./Component") {
         while (count > 0) {
             try {
                 await this._select(...items);
-                const value = await this.getValue();
+                let value = await this.getValue();
+                if (!(value)) {
+                    let strlist = [];
+                    let strsum = "";
+                    let xpath = `${this.getXpath()}/parent::div`;
+                    let divlist = await this.browser.findElements(xpath);
+                    for (let index = 0; index < divlist.length; index++) {
+                        strlist[index] = (await divlist[index].getText(true)).trim();
+                    }
+                    strlist.forEach((str) => { strsum += str; });
+                    value = strsum;
+                }
                 if (!(value && items.join().indexOf(value) !== -1)) {
                     throw new Error(`选择${items}失败`);
                 }

package/acis60/component/TableComponent.js

@@ -65,6 +65,26 @@ class TableComponent extends require("./Component") {
         return ret;
     }
 
+    /**
+     * 根据列名获取列号
+     * @param {columnStr} columnStr 列名
+     * @returns 列号
+     */
+    async getColumnNumberByTitle(columnStr) {
+        let xpath = `(${this.getXpath()}${this._createBodyXapth()}//tr)[1]`;
+        if (!(await this.browser.isDisplayed(xpath, this.browser.config.timeout))) {
+            return;
+        }
+        await this.browser.sleep(TableComponent.delayTime);
+        xpath = `(${this.getXpath()}${this._createHeaderXapth()}//tr)[1]/th`;
+        let titles = await this.browser.findElements(xpath);
+        for (let i = 0; i < titles.length; i++) {
+            titles[i] = (await titles[i].getText(true)).trim() || `#${String(i).padStart(3, "0")}`;
+        }
+        let columnNumber = titles.indexOf(columnStr) + 1;
+        return columnNumber
+    }
+
 
     /**
      * 获取块组件

package/package.json

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

package/winex60/page/Page.js

@@ -157,7 +157,7 @@ class Page extends require("@winning-test/autotest-webui").Page {
      */
     async loading() {
         try {
-            const xpath = "//*[contains(text(),'加载中') or @class='el-loading-mask'][not (ancestor-or-self::*[contains(@style,'display: none')])]";
+            const xpath = "//*[contains(text(),'加载中') or @class='el-loading-mask' or @class='el-icon-loading'][not (ancestor-or-self::*[contains(@style,'display: none')])]";
             if (await this.browser.isDisplayed(xpath, 1000)) {
                 await this.browser.waitUntilElementBeNotVisible(xpath);
             }