@winning-test/component 0.0.57 → 0.0.58

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@winning-test/component",
-  "version": "0.0.57",
+  "version": "0.0.58",
   "description": "",
   "main": "",
   "scripts": {
@@ -13,9 +13,9 @@
   "author": "",
   "license": "ISC",
   "devDependencies": {
-    "@types/jest": "^29.5.2",
-    "@winning-test/autotest-webui": "^0.1.46",
-    "chromedriver": "^114.0.2",
-    "jest": "^29.5.0"
+    "@types/jest": "^29.5.3",
+    "@winning-test/autotest-webui": "^0.1.48",
+    "chromedriver": "^114.0.3",
+    "jest": "^29.6.1"
   }
 }

package/winex60/component/BlockComponent.js

@@ -7,38 +7,30 @@ class BlockComponent extends require("./Component") {
     /**
      * 块组件
      * @param {Browser} browser 浏览器
-     * @param {String} id id
      * @param {String} xpath xpath
      */
-    constructor(browser, id, xpath) {
+    constructor(browser, xpath) {
         super(browser);
-        this.id = id;
         this.xpath = xpath;
     }
 
     _createXpath() {
-        if (this.id) {
-            return `//*[@id='${this.id}']`
-        }
-        if (this.xpath) {
-            return this.xpath;
-        }
+        return this.xpath;
     }
 
     /**
      * 获取块组件
-     * @param {String} id id
      * @param {String} xpath xpath
      * @returns 块组件
      */
-    blockComponent(id, xpath) {
+    blockComponent(xpath) {
         let that = this;
         class _BlockComponent extends BlockComponent {
             _createRootXpath() {
                 return that.getXpath();
             }
         }
-        return new _BlockComponent(this.browser, id, xpath);
+        return new _BlockComponent(this.browser, xpath);
     }
 
     /**

package/winex60/component/TableComponent.js

@@ -12,8 +12,20 @@ class TableComponent extends require("./Component") {
         super(browser);
     }
 
+    _createRootXpath() {
+        return "";
+    }
+
     _createXpath() {
-        return "//table"
+        return "//table";
+    }
+
+    _createHeaderXapth() {
+        return "//thead";
+    }
+
+    _createBodyXapth() {
+        return "//tbody";
     }
 
     /**
@@ -22,17 +34,23 @@ class TableComponent extends require("./Component") {
      */
     async getTableData() {
         let ret = [];
-        let xpath = `(${this.getXpath()}//tbody)[1]/tr[1]`;
-        await this.browser.findElement(xpath);
-        xpath = `(${this.getXpath()}//thead)[1]/tr/th`;
+        let xpath = `(${this.getXpath()}${this._createBodyXapth()}//tr)[1]`;
+        await this.browser.waitUntilElementBeVisible(xpath);
+        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();
+            titles[i] = (await titles[i].getText(true)).trim() || `#${String(i).padStart(3, "0")}`;
         }
-        xpath = `(${this.getXpath()}//tbody)[1]/tr`;
+        // 处理表体
+        xpath = `${this.getXpath()}${this._createBodyXapth()}//tr`;
         let trs = await this.browser.findElements(xpath);
         for (let i = 0; i < trs.length; i++) {
-            xpath = `(${this.getXpath()}//tbody)[1]/tr[${i + 1}]/td`;
+            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++) {
@@ -47,41 +65,6 @@ class TableComponent extends require("./Component") {
         return ret;
     }
 
-    /**
-     * 双击行
-     * @param {Number} rowNumber 行号
-     */
-    async doubleClickRow(rowNumber) {
-        let xpath = `(${this.getXpath()}//tbody)[1]/tr[${rowNumber}]`;
-        await (await this.browser.findElement(xpath)).doubleClick();
-    }
-
-    /**
-     * 单击行
-     * @param {Number} rowNumber 行号
-     */
-    async clickRow(rowNumber) {
-        let xpath = `(${this.getXpath()}//tbody)[1]/tr[${rowNumber}]`;
-        await (await this.browser.findElement(xpath)).click();
-    }
-
-    /**
-     * 选择所有行
-     */
-    async selectAllRow() {
-        let xpath = `(${this.getXpath()}//thead)[1]/tr[1]/th[1]//input[@type='checkbox']`;
-        await (await this.browser.findElement(xpath)).click();
-    }
-
-    /**
-     * 选择行
-     * @param {Number} rowNumber 行号
-     */
-    async selectRow(rowNumber) {
-        let xpath = `(${this.getXpath()}//tbody)[1]/tr[${rowNumber}]/td[1]//input[@type='checkbox']`;
-        await (await this.browser.findElement(xpath)).click();
-    }
-
 
     /**
      * 获取块组件
@@ -96,12 +79,16 @@ class TableComponent extends require("./Component") {
                 return "";
             }
             _createXpath() {
-                return `(${that.getXpath()}//tbody)[1]/tr[${rowNumber}]/td[${columnNumber}]`;
+                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, null);
+        return new _BlockComponent(this.browser, null);
     }
-
 }
 
 module.exports = TableComponent;

package/winex60/page/Page.js

@@ -28,12 +28,11 @@ class Page extends require("@winning-test/autotest-webui").Page {
 
     /**
      * 获取块组件
-     * @param {String} id id
      * @param {String} xpath xpath
      * @returns 块组件
      */
-    blockComponent(id, xpath) {
-        return new BlockComponent(this.browser, id, xpath);
+    blockComponent(xpath) {
+        return new BlockComponent(this.browser, xpath);
     }
 
     /**

package/winex60/test/component.test.js

@@ -10,46 +10,17 @@ beforeAll(async () => {
 
 test("input/button/text", async () => {
     const page = new Page(browser);
-    await page.inputComponent("在此键入您的工号/账号").input(config.user.admin.username);
-    await page.inputComponent("请输入您的密码").input(config.user.admin.password);
+    await page.inputComponent("在此键入您的工号/账号").input(config.user.doctor.用户名);
+    await page.inputComponent("请输入您的密码").input(config.user.doctor.密码);
+    await page.selectComponent("在此选择院区").select(config.user.doctor.院区);
+    await page.selectComponent("请选择系统").select(config.user.doctor.系统)
     await page.buttonComponent("登录").click();
 })
 
-test.skip("dialog/checkbox", async () => {
+test("table", async () => {
     const page = new Page(browser);
-    await page.blockComponent(null, "//*[@class='application-name']").click();
-    await page.textComponent("门诊医生站").click();
-    await page.dialogComponent("就诊科目").waitUntilBeVisible();
-    await page.dialogComponent("就诊科目").checkboxComponent("全选").select();
-    await page.dialogComponent("就诊科目").checkboxComponent("全选").unselect();
-    await page.dialogComponent("就诊科目").checkboxComponent("内科").select();
-    await page.dialogComponent("就诊科目").buttonComponent("确定").click();
-})
-
-test.skip("blockComponent/table/select/list", async () => {
-    const page = new Page(browser);
-    await page.textComponent("患者列表").click();
-    await page.blockComponent("header-search").waitUntilBeVisible();
-    const tableData = await page.blockComponent("header-search").tableComponent().getTableData();
+    const tableData = await page.blockComponent("//*[@class='table-box']").tableComponent().getTableData();
     console.log(tableData);
-    await page.blockComponent("header-search").selectComponent(null, "时间筛选").select("本月");
+    await page.blockComponent("//*[@class='table-box']").tableComponent().blockComponent(2).doubleClick();
 })
 
-test.skip("switch", async () => {
-    const page = new Page(browser);
-    await page.blockComponent(null, "//*[@class='application-name']").click();
-    await page.textComponent("配置管理").click();
-    await page.blockComponent(null,"//*[@class='left-menu']").waitUntilBeVisible();
-    await page.blockComponent(null,"//*[@class='left-menu']").moveMouseTo();
-    await page.blockComponent(null,"//*[@class='left-menu']").textComponent("主数据").isDisplayed(3000)
-    await page.blockComponent(null,"//*[@class='left-menu']").textComponent("主数据").click();
-    await page.blockComponent(null,"//*[@class='left-menu']").textComponent("资源").isDisplayed(3000)
-    await page.blockComponent(null,"//*[@class='left-menu']").textComponent("资源").click();
-    await page.blockComponent(null,"//*[@class='left-menu']").textComponent("员工").isDisplayed(3000);
-    await page.blockComponent(null,"//*[@class='left-menu']").textComponent("员工").click();
-    await page.switchToFrame();
-    await page.buttonComponent("新建员工").click();
-    await page.switchComponent("员工状态").scrollIntoView();
-    await page.switchComponent("员工状态").off();
-    await page.switchComponent("员工状态").on();
-})

package/winex60/test/component.test.json

@@ -1,13 +1,15 @@
 {
-    "url": "http://172.18.0.66/portal/#/index",
+    "url": "http://101.34.221.139:85/portal/#/login",
     "user": {
         "admin": {
-            "username": "admin",
-            "password": "winning@300253"
+            "用户名": "6618",
+            "密码": "456"
         },
         "doctor": {
-            "username": "224",
-            "password": "abcd@1234"
+            "用户名": "6618",
+            "密码": "456",
+            "院区": "铜陵五院（RC1）",
+            "系统": "门诊医生站"
         }
     }
 }