@winning-test/component 0.0.112 → 0.0.114

package/package.json

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

package/rpes5.6/component/Component.js

@@ -88,6 +88,22 @@ class Component extends require("../../../autotest-webui/src/Component") {
             }
         }
     }
+
+    async waitUntilValueNotTheValue(theValue ='', count = 20) {
+        while (count > 0) {
+            const value = await this.getValue();
+            if (value === theValue) {
+                return value;
+            } else {
+                if (count > 1) {
+                    count--;
+                    await this.browser.sleep(500);
+                } else {
+                    throw new Error('等待出现特定value失败');
+                }
+            }
+        }
+    }
 }
 
 module.exports = Component;

package/rpes5.6/component/SelectComponent.js

@@ -1,3 +1,5 @@
+const { Key } = require("@winning-test/autotest-webui");
+
 /**
  * 选择器组件类
  * @作者 MaoJJ
@@ -32,22 +34,44 @@ class SelectComponent extends require("./Component") {
      * @param  {...String} items 选项
      */
     async select(...items) {
-        let count = 2;
+        let count = 5;
         while (count > 0) {
             try {
                 await this._select(...items);
-                if (items.length > 1 || this.forceMulti){ // 多选不检查value
+                await this.browser.sleep(500);
+                if (items.length > 1){ // 多选不检查value
                     break;
                 }
-                const value = await this.getValue();
-                if (!(value && items.join().indexOf(value) !== -1)) {
-                    throw new Error(`选择${items}失败`);
+                if(this.forceMulti) {
+                    let xpath = ``;
+                    if(this.label) {
+                        xpath = `//*[normalize-space(text())='${this.label}']/ancestor-or-self::label/following-sibling::*//span[@class='w-select__tags-text']`;
+                    }else{
+                        xpath = `${this.getXpath()}/ancestor-or-self::div[contains(@class, 'w-select')]//span[@class='w-select__tags-text']`;
+                    }
+                    
+                    let selected = await (await this.browser.findElement(xpath)).getAttribute('title');
+                    if(!selected) {
+                        selected = await (await this.browser.findElement(xpath)).getText();                      
+                    }
+                    if (!(selected && items.join().indexOf(selected) !== -1)) {
+                        console.log(count, selected);
+                        await (await this.browser.findElement(this.getXpath())).click();
+                        await (await this.browser.findElement(this.getXpath())).input(Key.DELETE);
+                        await (await this.browser.findElement(this.getXpath())).input(Key.DELETE);
+                        throw new Error(`选择${items}失败`);
+                    }
+                }else {
+                    const value = await this.getValue();
+                    if (!(value && items.join().indexOf(value) !== -1)) {
+                        throw new Error(`选择${items}失败`);
+                    }
                 }
                 break;
             } catch (error) {
                 if (count > 1) {
                     count--;
-                    await this.browser.sleep(500);
+                    await this.browser.sleep(1000);
                 } else {
                     throw error;
                 }

package/rpes5.6/page/Page.js

@@ -169,6 +169,19 @@ class Page extends require("@winning-test/autotest-webui").Page {
         }
     }
 
+    /**
+     * 切换iframe
+     */
+    async switchToActiveFrame() {
+        try {
+            await this.browser.switchToFrame();
+            await this.browser.switchToFrame("//iframe[@class='url-frame' and (not (ancestor-or-self::*[contains(@style,'display: none')]))]");
+            await this.browser.sleep(500);
+        } catch (error) {
+
+        }
+    }
+
     /**
      * 获取菜单组件
      * @param  {String} firstItem 大菜单项
@@ -194,9 +207,30 @@ class Page extends require("@winning-test/autotest-webui").Page {
                     // 数据加载
                     await that.loading();
                 } else {
+                    const menu_dirt = {
+                        "排班管理": "体检排班维护",
+                        "Excel导出任务列表": "Excel导出任务",
+                        "分科检查": "分科录入",
+                        "科室维护": "体检科室维护",
+                        "组合维护": "体检组合维护",
+                        "收费项目维护": "体检收费项目维护"
+                    };
+                    if(menuItem in menu_dirt) {
+                        menuItem = menu_dirt[menuItem];    
+                    }
+                    await this.browser.switchToFrame();
                     await that.blockComponent(`//div[@class='more-menu']//div[contains(@class, 'show-more-btn')]`).click();
                     await (await this.browser.findElement(`//div[@class='w-menu-item--content']//*[text()='区域体检']`)).click();
                     await that.blockComponent(`//span[@title='${menuItem}']`).click();
+                    await that.loading();
+                    // 切换iframe
+                    await that.switchToActiveFrame();
+                    // 页面加载
+                    await that.loading();
+                    await that.loading();
+                    await that.loading();
+                    // 数据加载
+                    await that.loading();
                 }
 
             }