@winning-test/component 0.0.30 → 0.0.32

package/edis5.6/component/ListComponent.js

@@ -22,11 +22,11 @@ class ListComponent extends require("./Component") {
      */
     async select(...items) {
         let xpath = `${this.getXpath()}`;
-        await (await this.browser.findElement(xpath)).waitUntilBeVisible();
+        await this.browser.waitUntilElementBeVisible(xpath);
         for (let i = 0; i < items.length; i++) {
             let item = items[i];
-            xpath = `${this.getXpath()}//*[normalize-space(text())='${item}']/ancestor-or-self::li`;
-            await (await this.browser.findElement(xpath)).waitUntilBeVisible();
+            xpath = `${this.getXpath()}//li/descendant-or-self::*[normalize-space(text())='${item}']`;
+            await this.browser.waitUntilElementBeVisible(xpath);
             await (await this.browser.findElement(xpath)).scrollIntoView();
             await (await this.browser.findElement(xpath)).click();
             await this.browser.sleep(ListComponent.delayTime);

package/edis5.6/component/SelectComponent.js

@@ -63,7 +63,7 @@ class SelectComponent extends require("./Component") {
         await listComponent.select(...items);
         if (items.length > 1) {
             xpath = this.getXpath();
-            await (await this.browser.findElement(xpath)).click();
+            //await (await this.browser.findElement(xpath)).click();
         }
     }
 

package/edis5.6/component/TableComponent.js

@@ -23,7 +23,7 @@ class TableComponent extends require("./Component") {
     async getTableData() {
         let ret = [];
         let xpath = `(${this.getXpath()}//tbody)[1]/tr[1]`;
-        await (await this.browser.findElement(xpath)).waitUntilBeVisible();
+        await this.browser.waitUntilElementBeVisible(xpath);
         await this.browser.sleep(TableComponent.delayTime);
         xpath = `(${this.getXpath()}//thead)[1]/tr/th`;
         let titles = await this.browser.findElements(xpath);

package/edis5.6/test/component.test.js

@@ -1,7 +1,7 @@
 const { Browser, Key } = require("@winning-test/autotest-webui");
 const config = require("./component.test.json");
 const Page = require("../page/Page")
-const browser = new Browser();
+const browser = new Browser(10000);
 
 beforeAll(async () => {
     await browser.maximize();
@@ -17,6 +17,14 @@ test("登录", async () => {
 
 })
 
+test.skip("级联选择器", async () => {
+    const page = new Page(browser);
+    await page.textComponent("预检系统").click();
+    await page.textComponent("患者查询").click();
+    await page.textComponent("展开").click();
+    await page.selectComponent("症状").select("呼吸","咳嗽")
+})
+
 test.skip("input/button/block/text/radio/checkbox", async () => {
     const page = new Page(browser);
     await page.textComponent("急诊医学管理软件").click();
@@ -52,11 +60,18 @@ test.skip("topMenu/table", async () => {
 
 test("dialog/select/list", async () => {
     const page = new Page(browser);
-    await page.textComponent("急诊医学管理软件").click();
     await page.textComponent("护士站点").click();
     await page.topMenuComponent().select("患者管理");
     await page.loading();
-    await page.blockComponent("(//*[contains(@class,'bed ')])[1]").moveMouseTo();
-    await page.blockComponent("(//*[contains(@class,'bed ')])[1]").textComponent("编辑").click();
-    await page.dialogComponent("编辑").selectComponent(null, "护理组长").select("张护士");
+    await page.textComponent("座位管理").click();
+    await page.blockComponent("(//*[contains(@class,'bed ')])[2]").moveMouseTo();
+    await page.blockComponent("(//*[contains(@class,'bed ')])[2]").textComponent("患者信息").click();
+    let time1 = new Date().valueOf();
+    try {
+        await page.dialogComponent("患者信息").selectComponent(null, "肝功能").select("肝功能不全"); 
+    } catch (error) {
+        console.log(error);
+    }
+    let time2 = new Date().valueOf();
+    console.log((time2-time1)/1000);
 })

package/infusion60/component/ListComponent.js

@@ -22,11 +22,11 @@ class ListComponent extends require("./Component") {
      */
     async select(...items) {
         let xpath = `${this.getXpath()}`;
-        await (await this.browser.findElement(xpath)).waitUntilBeVisible();
+        await this.browser.waitUntilElementBeVisible(xpath);
         for (let i = 0; i < items.length; i++) {
             let item = items[i];
             xpath = `${this.getXpath()}//*[normalize-space(text())='${item}']/ancestor-or-self::li`;
-            await (await this.browser.findElement(xpath)).waitUntilBeVisible();
+            await this.browser.waitUntilElementBeVisible(xpath);
             await (await this.browser.findElement(xpath)).scrollIntoView();
             await (await this.browser.findElement(xpath)).click();
             await this.browser.sleep(ListComponent.delayTime);

package/infusion60/component/TableComponent.js

@@ -23,7 +23,7 @@ class TableComponent extends require("./Component") {
     async getTableData() {
         let ret = [];
         let xpath = `(${this.getXpath()}//tbody)[1]/tr[1]`;
-        await (await this.browser.findElement(xpath)).waitUntilBeVisible();
+        await this.browser.waitUntilElementBeVisible(xpath);
         await this.browser.sleep(TableComponent.delayTime);
         xpath = `(${this.getXpath()}//thead)[1]/tr/th`;
         let titles = await this.browser.findElements(xpath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@winning-test/component",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "description": "",
   "main": "",
   "scripts": {
@@ -13,11 +13,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@winning-test/autotest-webui": "^0.1.43"
+    "@winning-test/autotest-webui": "^0.1.44"
   },
   "devDependencies": {
-    "@types/jest": "^29.5.1",
-    "chromedriver": "^113.0.0",
+    "@types/jest": "^29.5.2",
+    "chromedriver": "^114.0.2",
     "jest": "^29.5.0"
   }
 }

package/rhm5.6/component/TableComponent.js

@@ -35,7 +35,7 @@ class TableComponent extends require("./Component") {
     async getTableData() {
         let ret = [];
         let xpath = `${this.getXpath()}${this._createBodyXapth()}//tr[1]`;
-        await (await this.browser.findElement(xpath)).waitUntilBeVisible();
+        await this.browser.waitUntilElementBeVisible(xpath);
         await this.browser.sleep(TableComponent.delayTime);
         // 处理表头
         if (!this._createHeaderXapth()) {

package/winex60/component/LeftMenuComponent.js

@@ -32,7 +32,7 @@ class LeftMenuComponent extends require("./Component") {
             await (await this.browser.findElement(xpath))._click(true);
         }
         xpath = `//*[@class='nav-scroll']//*[normalize-space(text())='${menuItems[menuItems.length - 1]}']`;
-        await (await this.browser.findElement(xpath)).waitUntilBeVisible();
+        await this.browser.waitUntilElementBeVisible(xpath);
     }
 
     /**

package/winex60/component/ListComponent.js

@@ -22,11 +22,11 @@ class ListComponent extends require("./Component") {
      */
     async select(...items) {
         let xpath = `${this.getXpath()}`;
-        await (await this.browser.findElement(xpath)).waitUntilBeVisible();
+        await this.browser.waitUntilElementBeVisible(xpath);
         for (let i = 0; i < items.length; i++) {
             let item = items[i];
             xpath = `${this.getXpath()}//*[normalize-space(text())='${item}']/ancestor-or-self::li`;
-            await (await this.browser.findElement(xpath)).waitUntilBeVisible();
+            await this.browser.waitUntilElementBeVisible(xpath);
             await (await this.browser.findElement(xpath)).scrollIntoView();
             await (await this.browser.findElement(xpath)).click();
         }

package/winex60/test/component.test.js

@@ -13,9 +13,6 @@ test("input/button/text", async () => {
     await page.inputComponent("在此键入您的工号/账号").input(config.user.admin.username);
     await page.inputComponent("请输入您的密码").input(config.user.admin.password);
     await page.buttonComponent("登录").click();
-    if (await page.messageComponent("未经处理的异常").isDisplayed(1000)){
-        await page.buttonComponent("登录").click();
-    }
 })
 
 test.skip("dialog/checkbox", async () => {