@winning-test/component 0.0.109 → 0.0.111

package/package.json

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

package/rpes5.6/page/Page.js

@@ -16,7 +16,7 @@ const TopMenuComponent = require("../component/TopMenuComponent");
 /**
  * 页面类
  */
-class Page extends require("../../../autotest-webui").Page {
+class Page extends require("@winning-test/autotest-webui").Page {
 
     /**
      * 页面类
@@ -174,7 +174,7 @@ class Page extends require("../../../autotest-webui").Page {
      * @param  {String} firstItem 大菜单项
      * @returns 顶部菜单组件
      */
-    menuComponent(firstItem) {
+    menuComponent(system_type, firstItem) {
         let that = this;
         class MenuComponent extends require("../component/TopMenuComponent") {
             constructor(browser, firstItem) {
@@ -186,12 +186,19 @@ class Page extends require("../../../autotest-webui").Page {
              * @param  {String} menuItem 菜单项
              */
             async select(menuItem) {
-                super.select(menuItem);
-                await that.blockComponent(`//div[@role="tab"][text()='${menuItem}']`).waitUntilBeVisible();
-                // 页面加载
-                await that.loading();
-                // 数据加载
-                await that.loading();
+                if(system_type == '单独系统') {
+                    super.select(menuItem);
+                    await that.blockComponent(`//div[@role="tab"][text()='${menuItem}']`).waitUntilBeVisible();
+                    // 页面加载
+                    await that.loading();
+                    // 数据加载
+                    await that.loading();
+                } else {
+                    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();
+                }
+
             }
         
         

package/winex-region/page/Page.js

@@ -236,7 +236,7 @@ class Page extends require("../../../autotest-webui").Page {
                 await that.switchToDefultFrame();
                 let xpath = "//*[@class='more-menu']"
                 await this.browser.waitUntilElementBeVisible(xpath)
-                xpath = "//*[contains(text(),'...')]";
+                xpath = "//*[@class='w-icon-search w-icon']";
                 await that.blockComponent(xpath).click();
                 xpath = `//*[@class='w-menu-item--content']//*[contains(text(),'${firstItem}')]`;
                 await this.browser.waitUntilElementBeVisible(xpath);