@winning-test/component 0.0.87 → 0.0.89

package/lis60/component/ButtonComponent.js

@@ -16,7 +16,7 @@ class ButtonComponent extends require("./Component") {
 
     _createXpath() {
         if (this.text){
-            return `//*[normalize-space(text())='${this.text}' or @value='${this.text}']`;
+            return `//*[normalize-space(text())='${this.text}']/ancestor-or-self::button`;
         }
         return "//*[@type='button']";
     }

package/lis60/component/CheckboxComponent.js

@@ -15,39 +15,29 @@ class CheckboxComponent extends require("./Component") {
     }
 
     _createXpath() {
-        if (this.label) {
-            return `//*[normalize-space(text())='${this.label}']/../..//*[@class='el-checkbox']`;
+        if (this.label){
+            return `//*[normalize-space(text())='${this.label}']/ancestor-or-self::label//input[@type='checkbox']`;
+        }
+        else {
+            return "//input[@type='checkbox']";
         }
-        return "//*[@class='el-checkbox']";
     }
 
     /**
-     * 选择选项
-     * @param  {...String} items 选项
+     * 选择
      */
-    async select(...items) {
-        let xpath = null;
-        for (let i = 0; i < items.length; i++) {
-            let item = items[i];
-            xpath = `${this.getXpath()}//*[text()='${item}']/..//input`;
-            if (!(await (await this.browser.findElement(xpath)).isSelected())) {
-                await (await this.browser.findElement(xpath)).click();
-            }
+    async select() {
+        if (!(await (await this.browser.findElement(this.getXpath())).isSelected())) {
+            await (await this.browser.findElement(this.getXpath())).click();
         }
     }
 
     /**
-     * 取消选择选项
-     * @param  {...String} items 选项
+     * 取消选择
      */
-    async unselect(...items) {
-        let xpath = null;
-        for (let i = 0; i < items.length; i++) {
-            let item = items[i];
-            xpath = `${this.getXpath()}//*[text()='${item}']/..//input`;
-            if (await (await this.browser.findElement(xpath)).isSelected()) {
-                await (await this.browser.findElement(xpath)).click();
-            }
+    async unselect() {
+        if (await (await this.browser.findElement(this.getXpath())).isSelected()) {
+            await (await this.browser.findElement(this.getXpath())).click();
         }
     }
 

package/lis60/page/Page.js

@@ -137,6 +137,26 @@ class Page extends require("@winning-test/autotest-webui").Page {
         await this.browser.switchToFrame(xpath)
     }
 
+    /**
+     * 切换到最外层iframe
+     */
+    async switchToDefultFrame() {
+        await this.browser.switchToFrame();
+    }
+
+    /**
+         * 切换到对应的iframe
+         * @param {string} id
+         */
+    async switchToFrame(id) {
+        try {
+            await this.browser.switchToFrame(`//iframe[@id='${id}']`);
+
+        } catch (error) {
+
+        }
+    }
+
 }
 
 module.exports = Page;

package/package.json

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

package/rpes5.6/component/TableComponent.js

@@ -34,6 +34,15 @@ class TableComponent extends require("./Component") {
      */
     async getTableData() {
         let ret = [];
+        // 先判断表单是否有数据，没有的话返回[]
+        let z_xpath = `${this.getXpath()}${this._createBodyXapth()}`
+        if(!await this.browser.isDisplayed(`${z_xpath}`, 2000)) {
+            return ret;
+        }
+        if(!await this.browser.isDisplayed(`${z_xpath}//tr`, 2000)) {
+            return ret;
+        }
+        // 默认表格有数据
         let xpath = `(${this.getXpath()}${this._createBodyXapth()}//tr)[1]`;
         await this.browser.waitUntilElementBeVisible(xpath);
         await this.browser.sleep(TableComponent.delayTime);