@winning-test/component 0.0.78 → 0.0.79

package/lis60/component/BlockComponent.js

@@ -48,22 +48,6 @@ class BlockComponent extends require("./Component") {
         return new ButtonComponent(this.browser, text);
     }
 
-    /**
-     * 获取级联选择器组件
-     * @param {String} placeholder 背景文字 
-     * @param {String} label 标签
-     * @returns 级联选择器组件
-     */
-    cascaderComponent(placeholder, label) {
-        let that = this;
-        class CascaderComponent extends require("./CascaderComponent") {
-            _createRootXpath() {
-                return that.getXpath();
-            }
-        }
-        return new CascaderComponent(this.browser, placeholder, label);
-    }
-
     /**
      * 获取复选框组件
      * @param {String} label 标签
@@ -111,31 +95,17 @@ class BlockComponent extends require("./Component") {
     }
 
     /**
-     * 获取左侧菜单组件
-     * @returns 左侧菜单组件
-     */
-    leftMenuComponent() {
-        let that = this;
-        class LeftMenuComponent extends require("./MenuComponent") {
-            _createRootXpath() {
-                return that.getXpath();
-            }
-        }
-        return new LeftMenuComponent(this.browser);
-    }
-
-    /**
-     * 获取列表组件
-     * @returns 列表组件
+     * 获取菜单组件
+     * @returns 菜单组件
      */
-    listComponent() {
+    menuComponent() {
         let that = this;
-        class ListComponent extends require("./ListComponent") {
+        class MenuComponent extends require("./MenuComponent") {
             _createRootXpath() {
                 return that.getXpath();
             }
         }
-        return new ListComponent(this.browser);
+        return new MenuComponent(this.browser);
     }
 
     /**
@@ -153,21 +123,6 @@ class BlockComponent extends require("./Component") {
         return new MessageComponent(this.browser, text);
     }
 
-    /**
-     * 获取单选框组件
-     * @param {Stirng} label 标签
-     * @returns 单选框组件
-     */
-    radioComponent(label) {
-        let that = this;
-        class RadioComponent extends require("./RadioComponent") {
-            _createRootXpath() {
-                return that.getXpath();
-            }
-        }
-        return new RadioComponent(this.browser, label);
-    }
-
     /**
      * 获取选择器组件
      * @param {String} label 标签
@@ -184,21 +139,6 @@ class BlockComponent extends require("./Component") {
         return new SelectComponent(this.browser, label, placeholder);
     }
 
-    /**
-     * 获取开关组件
-     * @param {String} label 标签
-     * @returns 开关组件
-     */
-    switchComponent(label) {
-        let that = this;
-        class SwitchComponent extends require("./SwitchComponent") {
-            _createRootXpath() {
-                return that.getXpath();
-            }
-        }
-        return new SwitchComponent(this.browser, label);
-    }
-
     /**
      * 获取表格组件
      * @returns 表格组件

package/lis60/component/MessageComponent.js

@@ -8,14 +8,16 @@ class MessageComponent extends require("./Component") {
      * 消息组件
      * @param {Browser} browser 浏览器
      * @param {String} text 消息内容
+     * @param {Boolean} iframe 是否在iframe内
      */
-    constructor(browser, text) {
+    constructor(browser, text, iframe = false) {
         super(browser)
         this.text = text;
+        this.iframe = iframe;
     }
 
     _createXpath() {
-        return `//*[contains(normalize-space(text()),'${this.text}')]/ancestor-or-self::*[@role='alert']`;
+        return `//*[contains(normalize-space(text()),'${this.text}')]/ancestor-or-self::*[contains(@class,'el-message')]`;
     }
 
     /**
@@ -23,8 +25,15 @@ class MessageComponent extends require("./Component") {
      * @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;
     }
 
@@ -32,24 +41,45 @@ class MessageComponent extends require("./Component") {
      * 等待出现
      */
     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);
+        }
     }
 
 }

package/lis60/page/Page.js

@@ -1,15 +1,11 @@
 const BlockComponent = require("../component/BlockComponent");
 const ButtonComponent = require("../component/ButtonComponent");
-const CascaderComponent = require("../component/CascaderComponent");
 const CheckboxComponent = require("../component/CheckboxComponent");
 const DialogComponent = require("../component/DialogComponent");
 const InputComponent = require("../component/InputComponent");
-const ListComponent = require("../component/ListComponent");
 const MenuComponent = require("../component/MenuComponent");
 const MessageComponent = require("../component/MessageComponent");
-const RadioComponent = require("../component/RadioComponent");
 const SelectComponent = require("../component/SelectComponent");
-const SwitchComponent = require("../component/SwitchComponent");
 const TableComponent = require("../component/TableComponent");
 const TextComponent = require("../component/TextComponent");
 
@@ -44,16 +40,6 @@ class Page extends require("@winning-test/autotest-webui").Page {
         return new ButtonComponent(this.browser, text);
     }
 
-    /**
-     * 获取级联选择器组件
-     * @param {String} placeholder 背景文字 
-     * @param {String} label 标签
-     * @returns 级联选择器组件
-     */
-    cascaderComponent(placeholder, label) {
-        return new CascaderComponent(this.browser, placeholder, label);
-    }
-
     /**
      * 获取复选框组件
      * @param {String} label 标签
@@ -82,17 +68,10 @@ class Page extends require("@winning-test/autotest-webui").Page {
         return new InputComponent(this.browser, label, placeholder);
     }
 
-    /**
-     * 获取列表组件
-     * @returns 列表组件
-     */
-    listComponent() {
-        return new ListComponent(this.browser);
-    }
 
     /**
      * 获取菜单组件
-     * @returns 左侧菜单组件
+     * @returns 菜单组件
      */
     menuComponent() {
         return new MenuComponent(this.browser);
@@ -101,10 +80,11 @@ class Page extends require("@winning-test/autotest-webui").Page {
     /**
      * 获取消息组件
      * @param {Stirng} text 文本
+     * @param {Boolean} iframe 是否在iframe内
      * @returns 消息组件
      */
-    messageComponent(text) {
-        return new MessageComponent(this.browser, text);
+    messageComponent(text, iframe = false) {
+        return new MessageComponent(this.browser, text, iframe);
     }
 
     /**
@@ -117,15 +97,6 @@ class Page extends require("@winning-test/autotest-webui").Page {
         return new SelectComponent(this.browser, label, placeholder);
     }
 
-    /**
-     * 获取开关组件
-     * @param {String} label 标签
-     * @returns 开关组件
-     */
-    switchComponent(label) {
-        return new SwitchComponent(this.browser, label);
-    }
-
     /**
      * 获取表格组件
      * @returns 表格组件
@@ -143,15 +114,6 @@ class Page extends require("@winning-test/autotest-webui").Page {
         return new TextComponent(this.browser, text);
     }
 
-    /**
-     * 获取单选框组件
-     * @param {String} label 标签
-     * @returns 单选框组件
-     */
-    radioComponent(label) {
-        return new RadioComponent(this.browser, label)
-    }
-
     /**
      * 等待加载
      */

package/lis60/test/component.test.js

@@ -13,11 +13,11 @@ test.skip("001", async () => {
     await page.inputComponent(null, "请输入登录账户").input("yj");
     await page.inputComponent(null, "请输入登录密码").input("1");
     await page.buttonComponent().click();
-    await page.menuComponent().select("标本采集","门诊采集");
-    await page.menuComponent().select("标本采集","标本查询");
-    await page.inputComponent("扫描条码").input("1111",Key.ENTER);
+    await page.menuComponent().select("标本采集", "门诊采集");
+    await page.menuComponent().select("标本采集", "标本查询");
+    await page.inputComponent("扫描条码").input("1111", Key.ENTER);
     await page.inputComponent("发票号").input("22222");
-    await page.checkboxComponent("病人类型").select("门诊","体检","其他");
+    await page.checkboxComponent("病人类型").select("门诊", "体检", "其他");
     await page.checkboxComponent("病人类型").unselect("住院");
     await page.selectComponent("标本状态").select("已绑定");
 })
@@ -27,14 +27,14 @@ test.skip("002", async () => {
     await page.inputComponent(null, "请输入登录账户").input("yj");
     await page.inputComponent(null, "请输入登录密码").input("1");
     await page.buttonComponent().click();
-    await page.menuComponent().select("标本采集","门诊采集");
-    await page.inputComponent(null,"读卡用F8或←").input("000002319",Key.ENTER);
+    await page.menuComponent().select("标本采集", "门诊采集");
+    await page.inputComponent(null, "读卡用F8或←").input("000002319", Key.ENTER);
     await page.loading();
     await page.loading();
     await page.loading();
     await page.buttonComponent("打印条码").click();
     await page.loading();
-    await page.inputComponent(null,"读卡用F8或←").input("000002319",Key.ENTER);
+    await page.inputComponent(null, "读卡用F8或←").input("000002319", Key.ENTER);
     await page.blockComponent("//*[@class='mzcj-list-history-ul-bottom']").moveMouseTo();
     await page.textComponent("取消绑定").click();
     await page.dialogComponent("取消绑定原因").waitUntilBeVisible();
@@ -49,21 +49,23 @@ test("003", async () => {
     await page.inputComponent(null, "请输入登录账户").input("yj");
     await page.inputComponent(null, "请输入登录密码").input("1");
     await page.buttonComponent().click();
-    await page.menuComponent().select("标本采集","标本查询");
+    await page.menuComponent().select("标本采集", "标本查询");
     await page.browser.sleep(1000);
-    await page.inputComponent("扫描条码").input("000002319");
+    await page.inputComponent("磁卡号").input("2023100901");
     await page.checkboxComponent("病人类型").select("门诊");
     await page.buttonComponent("查询标本列表").click();
     let bbtm = await page.blockComponent("//*[@class='query-table-bottom']//input").getValue();
-    await page.menuComponent().select("日常操作","标本签收");
+    await page.menuComponent().select("日常操作", "标本签收");
     await page.inputComponent("扫描条码").input(bbtm, Key.ENTER);
     let td = await page.tableComponent().getTableData();
     console.log(td);
+    await page.messageComponent("标本签收成功").waitUntilBeVisible();
     await page.tableComponent().blockComponent(1).textComponent("撤销").click();
     await page.dialogComponent("撤销签收").waitUntilBeVisible();
     await page.dialogComponent("撤销签收").selectComponent("受话人").select("1");
     await page.dialogComponent("撤销签收").inputComponent("原因").input("1");
     await page.dialogComponent("撤销签收").buttonComponent("确 定").click();
     await page.dialogComponent("撤销签收").waitUntilBeNotVisible();
+    await page.messageComponent("成功", true).waitUntilBeVisible();
 })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@winning-test/component",
-  "version": "0.0.78",
+  "version": "0.0.79",
   "description": "",
   "main": "",
   "scripts": {
@@ -15,7 +15,7 @@
   "devDependencies": {
     "@types/jest": "^29.5.3",
     "@winning-test/autotest-webui": "^0.1.51",
-    "chromedriver": "^116.0.0",
+    "chromedriver": "^118.0.0",
     "jest": "^29.6.2"
   }
 }

package/lis60/component/CascaderComponent.js

@@ -1,51 +0,0 @@
-/**
- * 级联选择器组件类
- * @作者 MaoJJ
- */
-class CascaderComponent extends require("./Component") {
-
-    /**
-     * 级联选择器组件
-     * @param {Browser} browser 浏览器
-     * @param {String} placeholder 背景文字 
-     * @param {String} label 标签
-     */
-    constructor(browser, placeholder, label) {
-        super(browser);
-        this.placeholder = placeholder;
-        this.label = label;
-    }
-
-    _createXpath() {
-        if (this.placeholder) {
-            return `//input[@placeholder='${this.placeholder}']`;
-        }
-        if (this.label) {
-            return `//*[normalize-space(text())='${this.label}']/..//input`;
-        }
-    }
-
-    /**
-     * 选择
-     * @param  {...String} items 选项
-     */
-    async select(...items) {
-        class ListComponent extends require("./ListComponent") {
-            _createXpath() {
-                return "//*[contains(@class,'el-scrollbar')]//ul"
-            }
-        }
-        let xpath = this.getXpath();
-        await (await this.browser.findElement(xpath)).click();
-        let listComponent = new ListComponent(this.browser);
-        await listComponent.waitUntilBeVisible();
-        for (let i = 0; i < items.length; i++) {
-            let item = items[i];
-            let listComponent = new ListComponent(this.browser);
-            await listComponent.select(item);
-        }
-    }
-
-}
-
-module.exports = CascaderComponent;

package/lis60/component/RadioComponent.js

@@ -1,41 +0,0 @@
-/**
- * 单选框组件类
- * @作者 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/lis60/component/SwitchComponent.js

@@ -1,48 +0,0 @@
-/**
- * 开关组件类
- * @作者 MaoJJ
- */
-class SwitchComponent 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}']/..//*[@role='switch']`;
-        }
-        return "//*[@role='switch']";
-    }
-
-    /**
-     * 打开
-     */
-    async on() {
-        let xpath = `${this.getXpath()}//input[@type='checkbox']`;
-        let checked = Boolean(await (await this.browser.findElement(xpath)).getAttribute("checked"));
-        if (!checked) {
-            await (await this.browser.findElement(xpath)).click();
-        }
-    }
-
-    /**
-     * 关闭
-     */
-    async off() {
-        let xpath = `${this.getXpath()}//input[@type='checkbox']`;
-        let checked = Boolean(await (await this.browser.findElement(xpath)).getAttribute("checked"));
-        if (checked) {
-            await (await this.browser.findElement(xpath)).click();
-        }
-    }
-
-}
-
-module.exports = SwitchComponent;