@winning-test/component 0.0.100 → 0.0.102

package/TechBookCenter/component/BlockComponent.js

@@ -0,0 +1,173 @@
+/**
+ * 块组件类
+ * @作者 MaoJJ
+ */
+class BlockComponent extends require("./Component") {
+
+    /**
+     * 块组件
+     * @param {Browser} browser 浏览器
+     * @param {String} xpath xpath
+     */
+    constructor(browser, xpath) {
+        super(browser);
+        this.xpath = xpath;
+    }
+
+    _createXpath() {
+        return this.xpath;
+    }
+
+    /**
+     * 获取块组件
+     * @param {String} xpath xpath
+     * @returns 块组件
+     */
+    blockComponent(xpath) {
+        let that = this;
+        class _BlockComponent extends BlockComponent {
+            _createRootXpath() {
+                return that.getXpath();
+            }
+        }
+        return new _BlockComponent(this.browser, xpath);
+    }
+
+    /**
+     * 获取按钮组件
+     * @param {String} text 文本
+     * @returns 按钮组件
+     */
+    buttonComponent(text) {
+        let that = this;
+        class ButtonComponent extends require("./ButtonComponent") {
+            _createRootXpath() {
+                return that.getXpath();
+            }
+        }
+        return new ButtonComponent(this.browser, text);
+    }
+
+    /**
+     * 获取复选框组件
+     * @param {String} label 标签
+     * @returns 复选框组件
+     */
+    checkboxComponent(label) {
+        let that = this;
+        class CheckboxComponent extends require("./CheckboxComponent") {
+            _createRootXpath() {
+                return that.getXpath();
+            }
+        }
+        return new CheckboxComponent(this.browser, label);
+    }
+
+    /**
+     * 获取对话框组件
+     * @param {String} title 标题
+     * @returns 对话框组件
+     */
+    dialogComponent(title) {
+        let that = this;
+        class DialogComponent extends require("./DialogComponent") {
+            _createRootXpath() {
+                return that.getXpath();
+            }
+        }
+        return new DialogComponent(this.browser, title);
+    }
+
+    /**
+     * 获取输入框组件
+     * @param {String} label 标签
+     * @param {String} placeholder 背景文字 
+     * @returns 输入框组件
+     */
+    inputComponent(label, placeholder) {
+        let that = this;
+        class InputComponent extends require("./InputComponent") {
+            _createRootXpath() {
+                return that.getXpath();
+            }
+        }
+        return new InputComponent(this.browser, label, placeholder);
+    }
+
+    /**
+     * 获取菜单组件
+     * @returns 菜单组件
+     */
+    menuComponent() {
+        let that = this;
+        class MenuComponent extends require("./MenuComponent") {
+            _createRootXpath() {
+                return that.getXpath();
+            }
+        }
+        return new MenuComponent(this.browser);
+    }
+
+    /**
+     * 获取消息组件
+     * @param {Stirng} text 文本
+     * @returns 消息组件
+     */
+    messageComponent(text) {
+        let that = this;
+        class MessageComponent extends require("./MessageComponent") {
+            _createRootXpath() {
+                return that.getXpath();
+            }
+        }
+        return new MessageComponent(this.browser, text);
+    }
+
+    /**
+     * 获取选择器组件
+     * @param {String} label 标签
+     * @param {String} placeholder 背景文字 
+     * @returns 选择器组件
+     */
+    selectComponent(label, placeholder) {
+        let that = this;
+        class SelectComponent extends require("./SelectComponent") {
+            _createRootXpath() {
+                return that.getXpath();
+            }
+        }
+        return new SelectComponent(this.browser, label, placeholder);
+    }
+
+    /**
+     * 获取表格组件
+     * @returns 表格组件
+     */
+    tableComponent() {
+        let that = this;
+        class TableComponent extends require("./TableComponent") {
+            _createRootXpath() {
+                return that.getXpath();
+            }
+        }
+        return new TableComponent(this.browser);
+    }
+
+    /**
+     * 获取文本组件
+     * @param {String} text 文本
+     * @returns 文本组件
+     */
+    textComponent(text) {
+        let that = this;
+        class TextComponent extends require("./TextComponent") {
+            _createRootXpath() {
+                return that.getXpath();
+            }
+        }
+        return new TextComponent(this.browser, text);
+    }
+
+}
+
+module.exports = BlockComponent;

package/TechBookCenter/component/ButtonComponent.js

@@ -0,0 +1,26 @@
+/**
+ * 按钮组件类
+ * @作者 MaoJJ
+ */
+class ButtonComponent extends require("./Component") {
+
+    /**
+     * 按钮组件
+     * @param {Browser} browser 浏览器
+     * @param {String} text 文本
+     */
+    constructor(browser, text) {
+        super(browser);
+        this.text = text;
+    }
+
+    _createXpath() {
+        if (this.text){
+            return `//*[normalize-space(text())='${this.text}']/ancestor-or-self::button`;
+        }
+        return "//*[@type='button']";
+    }
+
+}
+
+module.exports = ButtonComponent;

package/TechBookCenter/component/CheckboxComponent.js

@@ -0,0 +1,46 @@
+/**
+ * 复选框组件类
+ * @作者 MaoJJ
+ */
+class CheckboxComponent extends require("./Component") {
+
+    /**
+     * 复选框组件
+     * @param {Browser} browser 浏览器
+     * @param {String} label 标签
+     */
+    constructor(browser, label) {
+        super(browser);
+        this.label = label;
+    }
+
+    _createXpath() {
+        if (this.label){
+            return `//*[normalize-space(text())='${this.label}']/ancestor-or-self::label//input[@type='checkbox']`;
+        }
+        else {
+            return "//input[@type='checkbox']";
+        }
+    }
+
+    /**
+     * 选择
+     */
+    async select() {
+        if (!(await (await this.browser.findElement(this.getXpath())).isSelected())) {
+            await (await this.browser.findElement(this.getXpath())).click();
+        }
+    }
+
+    /**
+     * 取消选择
+     */
+    async unselect() {
+        if (await (await this.browser.findElement(this.getXpath())).isSelected()) {
+            await (await this.browser.findElement(this.getXpath())).click();
+        }
+    }
+
+}
+
+module.exports = CheckboxComponent;

package/TechBookCenter/component/Component.js

@@ -0,0 +1,109 @@
+/**
+ * 组件类
+ * @作者 MaoJJ
+ */
+class Component extends require("@winning-test/autotest-webui/src/Component") {
+
+    static delayTime = 200;
+
+    /**
+     * 组件
+     * @param {Browser} browser 
+     */
+    constructor(browser) {
+        super(browser)
+    }
+
+    getXpath() {
+        return `${super.getXpath()}[not (ancestor-or-self::*[contains(@style,'display: none')])]`;
+    }
+
+    async click() {
+        await super.click();
+        await this.browser.sleep(Component.delayTime);
+    }
+
+    async doubleClick() {
+        await super.doubleClick();
+        await this.browser.sleep(Component.delayTime);
+    }
+
+    async input(...agrs) {
+        await super.input(...agrs);
+        await this.browser.sleep(Component.delayTime);
+    }
+
+    async clear() {
+        await super.clear();
+        await this.browser.sleep(Component.delayTime);
+    }
+
+    async getText() {
+        await this.browser.sleep(Component.delayTime);
+        return await super.getText();
+    }
+
+    async getValue() {
+        await this.browser.sleep(Component.delayTime);
+        return await super.getValue();
+    }
+
+
+    async getAttribute(attributeName) {
+        await this.browser.sleep(Component.delayTime);
+        return await super.getAttribute(attributeName);
+    }
+
+    async waitUntilBeDisabled() {
+        await super.waitUntilBeDisabled();
+        await this.browser.sleep(Component.delayTime);
+    }
+
+    async waitUntilBeEnabled() {
+        await super.waitUntilBeEnabled();
+        await this.browser.sleep(Component.delayTime);
+    }
+
+    async waitUntilBeNotVisible() {
+        await super.waitUntilBeNotVisible();
+        await this.browser.sleep(Component.delayTime);
+    }
+
+    async waitUntilBeVisible() {
+        await super.waitUntilBeVisible();
+        await this.browser.sleep(Component.delayTime);
+    }
+
+    async isEnabled() {
+        return await super.isEnabled();
+    }
+
+    /**
+     * 鼠标移动到组件后悬停
+     */
+    async moveMouseTo() {
+        await this.browser.moveMouseTo(this.getXpath());
+        await this.browser.sleep(Component.delayTime);
+    }
+
+    /**
+     * 滚动页面到元素位置
+     */
+    async scrollIntoView() {
+        (await this.browser.findElement(this.getXpath())).scrollIntoView();
+    }
+
+    /**
+     * 右击
+     */
+    async contextClick() {
+        const { By, until } = require("selenium-webdriver");
+        const xpath = this.getXpath();
+        await this.browser.webDriver.wait(until.elementLocated(By.xpath(xpath)), this.browser.config.timeout);
+        let actions = this.browser.webDriver.actions();
+        actions.contextClick(await this.browser.webDriver.findElement(By.xpath(xpath)))
+        await actions.perform();
+    }
+}
+
+module.exports = Component;

package/TechBookCenter/component/DialogComponent.js

@@ -0,0 +1,26 @@
+/**
+ * 对话框组件类
+ * @作者 MaoJJ
+ */
+class DialogComponent extends require("./BlockComponent") {
+
+    /**
+     * 对话框组件
+     * @param {Browser} browser 浏览器
+     * @param {String} title 标题
+     */
+    constructor(browser, title) {
+        super(browser, null, null);
+        this.title = title;
+    }
+
+    _createXpath() {
+        if (this.title){
+            return `//*[contains(normalize-space(text()),'${this.title}')]/ancestor::*[contains(@class,'el-dialog')]`;
+        }
+        return `//*[contains(@class,'el-dialog')]`;
+    }
+
+}
+
+module.exports = DialogComponent;

package/TechBookCenter/component/InputComponent.js

@@ -0,0 +1,31 @@
+/**
+ * 输入框组件类
+ * @作者 MaoJJ
+ */
+class InputComponent extends require("./Component") {
+
+    /**
+     * 输入框组件
+     * @param {Browser} browser 浏览器
+     * @param {String} label 标签
+     * @param {String} placeholder 背景文字 
+     */
+    constructor(browser, label, placeholder) {
+        super(browser);
+        this.label = label;
+        this.placeholder = placeholder;
+    }
+
+    _createXpath() {
+        if (this.placeholder) {
+            return `//input[@placeholder='${this.placeholder}']`;
+        }
+        if (this.label) {
+            return `//*[normalize-space(text())='${this.label}']/../..//input`;
+        }
+        return "//input[@type='text']";
+    }
+
+}
+
+module.exports = InputComponent;

package/TechBookCenter/component/MenuComponent.js

@@ -0,0 +1,36 @@
+/**
+ * 菜单组件类
+ * @作者 MaoJJ
+ */
+class MenuComponent extends require("./Component") {
+
+    /**
+     * 菜单组件
+     * @param {Browser} browser 浏览器
+     */
+    constructor(browser) {
+        super(browser);
+    }
+
+    _createXpath() {
+        return "//*[contains(@class,'menuListBtn')]";
+    }
+
+    /**
+     * 选择菜单
+     * @param {String} firstMenuItem 一级菜单
+     * @param {String} secondMenuItem 二级菜单
+     */
+    async select(firstMenuItem, secondMenuItem) {
+        await this.browser.switchToFrame();
+        let xpath = this.getXpath();
+        await (await this.browser.findElement(xpath)).click();
+        xpath = `//*[contains(@class,'menuListBox')]//*[text()='${firstMenuItem}']/..//*[text()='${secondMenuItem}']`;
+        await (await this.browser.findElement(xpath)).click();
+        xpath = "//iframe[not (@style='display: none;')]";
+        await this.browser.switchToFrame(xpath)
+    }
+
+}
+
+module.exports = MenuComponent;

package/TechBookCenter/component/MessageComponent.js

@@ -0,0 +1,87 @@
+/**
+ * 消息组件类
+ * @作者: MaoJJ
+ */
+class MessageComponent extends require("./Component") {
+
+    /**
+     * 消息组件
+     * @param {Browser} browser 浏览器
+     * @param {String} text 消息内容
+     * @param {Boolean} iframe 是否在iframe内
+     */
+    constructor(browser, text, iframe = false) {
+        super(browser)
+        this.text = text;
+        this.iframe = iframe;
+    }
+
+    _createXpath() {
+        return `//*[contains(normalize-space(text()),'${this.text}')]/ancestor-or-self::*[contains(@class,'el-message')]`;
+    }
+
+    /**
+     * 获取消息内容
+     * @returns 消息内容
+     */
+    async getText() {
+        if (!this.iframe) {
+            await this.browser.switchToFrame();
+        }
+        let xpath = this.getXpath();
+        let text = await (await this.browser.findElement(xpath)).getText();
+        if (!this.iframe) {
+            xpath = "//iframe[not (@style='display: none;')]";
+            await this.browser.switchToFrame(xpath)
+        }
+        return text;
+    }
+
+    /**
+     * 等待出现
+     */
+    async waitUntilBeVisible() {
+        if (!this.iframe) {
+            await this.browser.switchToFrame();
+        }
+        let xpath = this.getXpath();
+        await this.browser.waitUntilElementBeVisible(xpath);
+        if (!this.iframe) {
+            xpath = "//iframe[not (@style='display: none;')]";
+            await this.browser.switchToFrame(xpath);
+        }
+    }
+
+    /**
+     * 等待消失
+     */
+    async waitUntilBeNotVisible() {
+        if (!this.iframe) {
+            await this.browser.switchToFrame();
+        }
+        let xpath = this.getXpath();
+        await this.browser.waitUntilElementBeNotVisible(xpath);
+        if (!this.iframe) {
+            xpath = "//iframe[not (@style='display: none;')]";
+            await this.browser.switchToFrame(xpath);
+        }
+    }
+
+    /**
+     * 关闭
+     */
+    async close() {
+        if (!this.iframe) {
+            await this.browser.switchToFrame();
+        }
+        let xpath = `${this.getXpath()}//i[contains(@class,'el-message__closeBtn')]`;
+        await (await this.browser.findElement(xpath)).click();
+        if (!this.iframe) {
+            xpath = "//iframe[not (@style='display: none;')]";
+            await this.browser.switchToFrame(xpath);
+        }
+    }
+
+}
+
+module.exports = MessageComponent;

package/TechBookCenter/component/RadioComponent.js

@@ -0,0 +1,41 @@
+/**
+ * 单选框组件类
+ * @作者 MaoJJ
+ */
+class RadioComponent extends require("./Component") {
+
+    /**
+     * 单选框组件
+     * @param {Browser} browser 浏览器
+     * @param {String} label 标签
+     */
+    constructor(browser, label) {
+        super(browser);
+        this.label = label;
+    }
+
+    _createXpath() {
+        return `//*[normalize-space(text())='${this.label}']/ancestor-or-self::label//input[@type='radio']`;
+    }
+
+    /**
+     * 选择
+     */
+    async select() {
+        if (!(await (await this.browser.findElement(this.getXpath())).isSelected())) {
+            await (await this.browser.findElement(this.getXpath())).click();
+        }
+    }
+
+    /**
+     * 取消选择
+     */
+    async unselect() {
+        if (await (await this.browser.findElement(this.getXpath())).isSelected()) {
+            await (await this.browser.findElement(this.getXpath())).click();
+        }
+    }
+
+}
+
+module.exports = RadioComponent;

package/TechBookCenter/component/SelectComponent.js

@@ -0,0 +1,43 @@
+/**
+ * 选择器组件类
+ * @作者 MaoJJ
+ */
+class SelectComponent extends require("./Component") {
+
+    /**
+     * 选择器组件
+     * @param {Browser} browser 浏览器
+     * @param {String} label 标签
+     * @param {String} placeholder 背景文字 
+     */
+    constructor(browser, label,placeholder) {
+        super(browser);
+        this.label = label;
+        this.placeholder = placeholder;
+    }
+
+    _createXpath() {
+        if (this.label) {
+            return `//*[normalize-space(text())='${this.label}']/../..//input`;
+        }
+        if (this.placeholder) {
+            return `//input[@placeholder='${this.placeholder}']`;
+        }
+        return "//input[@type='text']";
+    }
+
+    async select(...items) {
+        let xpath = this.getXpath();
+        await (await this.browser.findElement(xpath)).click();
+        xpath = "//*[@class='el-autocomplete-suggestion' and not (contains(@style,'display: none'))]";
+        await this.browser.waitUntilElementBeVisible(xpath);
+        for (let i = 0; i < items.length; i++) {
+            let item = items[i];
+            xpath = `//*[@class='el-autocomplete-suggestion' and not (contains(@style,'display: none'))]//*[contains(text(),'${item}')]/ancestor::li`;
+            await (await this.browser.findElement(xpath)).click();
+        }
+    }
+
+}
+
+module.exports = SelectComponent;

package/TechBookCenter/component/TableComponent.js

@@ -0,0 +1,113 @@
+/**
+ * 表格组件类
+ * @作者 MaoJJ
+ */
+class TableComponent extends require("./Component") {
+
+    /**
+     * 表格组件
+     * @param {Browser} browser 浏览器
+     */
+    constructor(browser) {
+        super(browser);
+    }
+
+    _createRootXpath() {
+        return "";
+    }
+
+    _createXpath() {
+        return "//*[contains(@class,'vxe-table ')]";
+    }
+
+    _createHeaderXapth() {
+        return "//thead";
+    }
+
+    _createBodyXapth() {
+        return "//tbody";
+    }
+
+    /**
+     * 获取表格数据
+     * @returns 表格数据
+     */
+    async getTableData() {
+        let ret = [];
+        let xpath = `(${this.getXpath()}${this._createBodyXapth()}//tr)[1]`;
+        if (!(await this.browser.isDisplayed(xpath, this.browser.config.timeout))) {
+            return ret;
+        }
+        await this.browser.sleep(TableComponent.delayTime);
+        // 处理表头
+        if (!this._createHeaderXapth()) {
+            return ret;
+        }
+        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")}`;
+        }
+        // 处理表体
+        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`;
+            let tds = await this.browser.findElements(xpath);
+            let row = {};
+            for (let j = 0; j < tds.length; j++) {
+                let title = titles[j]
+                let text = (await tds[j].getText(true)).replaceAll("\n", " ");
+                row[title] = text;
+            }
+            ret.push(row);
+        }
+        return ret;
+    }
+    
+    /**
+     * 根据列名获取列号
+     * @param   {Str}    columnStr    列名
+     * @returns {Number} columnNumber 列号
+     */
+    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
+    }
+
+    /**
+     * 获取块组件
+     * @param {Number} rowNumber 行号
+     * @param {Number} columnNumber 列号
+     * @returns 块组件
+     */
+    blockComponent(rowNumber, columnNumber) {
+        let that = this;
+        class _BlockComponent extends require("./BlockComponent") {
+            _createRootXpath() {
+                return "";
+            }
+            _createXpath() {
+                if (columnNumber) {
+                    return `${that.getXpath()}${that._createBodyXapth()}//tr[${rowNumber}]/td[${columnNumber}]`;
+                }
+                else {
+                    return `${that.getXpath()}${that._createBodyXapth()}//tr[${rowNumber}]`;
+                }
+            }
+        }
+        return new _BlockComponent(this.browser, null);
+    }
+}
+
+module.exports = TableComponent;

package/TechBookCenter/component/TextComponent.js

@@ -0,0 +1,23 @@
+/**
+ * 文本组件类
+ * @作者 MaoJJ
+ */
+class TextComponent extends require("./Component") {
+
+    /**
+     * 文本组件
+     * @param {Browser} browser 浏览器
+     * @param {String} text 文本
+     */
+    constructor(browser, text) {
+        super(browser);
+        this.text = text;
+    }
+
+    _createXpath() {
+        return `//*[normalize-space(text())='${this.text}']`;
+    }
+
+}
+
+module.exports = TextComponent;

package/TechBookCenter/page/Page.js

@@ -0,0 +1,172 @@
+const BlockComponent = require("../component/BlockComponent");
+const ButtonComponent = require("../component/ButtonComponent");
+const CheckboxComponent = require("../component/CheckboxComponent");
+const DialogComponent = require("../component/DialogComponent");
+const InputComponent = require("../component/InputComponent");
+const MenuComponent = require("../component/MenuComponent");
+const MessageComponent = require("../component/MessageComponent");
+const RadioComponent = require("../component/RadioComponent");
+const SelectComponent = require("../component/SelectComponent");
+const TableComponent = require("../component/TableComponent");
+const TextComponent = require("../component/TextComponent");
+
+/**
+ * 页面类
+ */
+class Page extends require("@winning-test/autotest-webui").Page {
+
+    /**
+     * 页面类
+     * @param {Browser} browser 浏览器
+     */
+    constructor(browser) {
+        super(browser);
+    }
+
+    /**
+     * 获取块组件
+     * @param {String} xpath xpath
+     * @returns 块组件
+     */
+    blockComponent(xpath) {
+        return new BlockComponent(this.browser, xpath);
+    }
+
+    /**
+     * 获取按钮组件
+     * @param {String} text 文本
+     * @returns 按钮组件
+     */
+    buttonComponent(text) {
+        return new ButtonComponent(this.browser, text);
+    }
+
+    /**
+     * 获取复选框组件
+     * @param {String} label 标签
+     * @returns 复选框组件
+     */
+    checkboxComponent(label) {
+        return new CheckboxComponent(this.browser, label);
+    }
+
+    /**
+     * 获取对话框组件
+     * @param {String} title 标题
+     * @returns 对话框组件
+     */
+    dialogComponent(title) {
+        return new DialogComponent(this.browser, title);
+    }
+
+    /**
+     * 获取输入框组件
+     * @param {String} label 标签
+     * @param {String} placeholder 背景文字 
+     * @returns 输入框组件
+     */
+    inputComponent(label, placeholder) {
+        return new InputComponent(this.browser, label, placeholder);
+    }
+
+
+    /**
+     * 获取菜单组件
+     * @returns 菜单组件
+     */
+    menuComponent() {
+        return new MenuComponent(this.browser);
+    }
+
+    /**
+     * 获取消息组件
+     * @param {Stirng} text 文本
+     * @param {Boolean} iframe 是否在iframe内
+     * @returns 消息组件
+     */
+    messageComponent(text, iframe = false) {
+        return new MessageComponent(this.browser, text, iframe);
+    }
+
+    /**
+     * 获取选择器组件
+     * @param {String} label 标签
+     * @param {String} placeholder 背景文字 
+     * @returns 选择器组件
+     */
+    selectComponent(label, placeholder) {
+        return new SelectComponent(this.browser, label, placeholder);
+    }
+
+    /**
+     * 获取表格组件
+     * @returns 表格组件
+     */
+    tableComponent() {
+        return new TableComponent(this.browser);
+    }
+
+    /**
+     * 获取文本组件
+     * @param {String} text 文本
+     * @returns 文本组件
+     */
+    textComponent(text) {
+        return new TextComponent(this.browser, text);
+    }
+
+    /**
+     * 获取单选框组件
+     * @param {String} label 标签
+     * @returns 单选框组件
+     */
+    radioComponent(label) {
+        return new RadioComponent(this.browser, label)
+    }
+    
+    /**
+     * 等待加载
+     */
+    async loading() {
+        try {
+            let xpath = "//*[contains(text(),'加载中') or contains(@class,'el-loading-mask')][not (ancestor-or-self::*[contains(@style,'display: none')])]";
+            if (await this.browser.isDisplayed(xpath, 1000)) {
+                await this.browser.waitUntilElementBeNotVisible(xpath);
+            }
+        } catch (error) {
+
+        }
+    }
+
+    /**
+     * 切换到活动Frame
+     */
+    async switchToActiveFrame() {
+        await this.browser.switchToFrame();
+        let xpath = "//iframe[not (@style='display: none;')]";
+        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/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.102",
   "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);
             }