From 18333a40ec697f78c94538c45191efea8d9bc13b Mon Sep 17 00:00:00 2001 From: naibo Date: Thu, 14 Dec 2023 09:35:54 +0800 Subject: [PATCH] Bug fix --- ElectronJS/src/taskGrid/FlowChart.css | 417 +++++++++--------- ElectronJS/src/taskGrid/FlowChart.html | 194 ++++---- ElectronJS/src/taskGrid/FlowChart_CN.html | 196 ++++---- ElectronJS/src/taskGrid/logic.js | 16 +- .../src/content-scripts/toolkit.vue | 8 +- 5 files changed, 420 insertions(+), 411 deletions(-) diff --git a/ElectronJS/src/taskGrid/FlowChart.css b/ElectronJS/src/taskGrid/FlowChart.css index 9f0cd2c..74496dd 100644 --- a/ElectronJS/src/taskGrid/FlowChart.css +++ b/ElectronJS/src/taskGrid/FlowChart.css @@ -1,237 +1,242 @@ - * { - margin: 0; - padding: 0; - font-size: 17px!important; - } +* { + margin: 0; + padding: 0; + font-size: 17px !important; +} - .modal-body label{ - margin-top: 10px; - } +input, textarea { + spellcheck: false; +} - #contextMenu { - position: absolute; - background-color: white; - padding: 3px!important; - text-align: center; - border: 1px solid darkblue; - border-radius: 3px; - /*width: 120px;*/ - } +.modal-body label { + margin-top: 10px; +} - #contextMenu div{ - height: 30px; - padding-top: 2px; - } +#contextMenu { + position: absolute; + background-color: white; + padding: 3px !important; + text-align: center; + border: 1px solid darkblue; + border-radius: 3px; + /*width: 120px;*/ +} - #contextMenu div:hover { - background-color: rgba(211,211,211,0.4) !important; - cursor: pointer; - } +#contextMenu div { + height: 30px; + padding-top: 2px; +} - label{ - margin-left: 2px; - } +#contextMenu div:hover { + background-color: rgba(211, 211, 211, 0.4) !important; + cursor: pointer; +} - div.node { - height: 45px; - width: 180px; - border-radius: 7px; - /*border: skyblue solid;*/ - border: #007bff solid; - border-color: transparent; - /*background: rgb(73, 156, 189);*/ - background: rgb(10, 120, 200); - color: white; - text-align: center; - padding: 5px; - margin: 10px auto; - } +label { + margin-left: 2px; +} - .arrow { - margin: 10px auto; - text-align: center; - font-size: 23px!important; - color: black; - } +div.node { + height: 45px; + width: 180px; + border-radius: 7px; + /*border: skyblue solid;*/ + border: #007bff solid; + border-color: transparent; + /*background: rgb(73, 156, 189);*/ + background: rgb(10, 120, 200); + color: white; + text-align: center; + padding: 5px; + margin: 10px auto; +} - .arrow:hover { - background-color: deepskyblue!important; - cursor: pointer; - color: white; - } +.arrow { + margin: 10px auto; + text-align: center; + font-size: 23px !important; + color: black; +} - .branchAdd { - margin: 10px auto; - text-align: center; - font-size: 18px!important; - color: black; - } +.arrow:hover { + background-color: deepskyblue !important; + cursor: pointer; + color: white; +} - .branchAdd:hover { - background-color: deepskyblue; - cursor: pointer; - color: white; - } +.branchAdd { + margin: 10px auto; + text-align: center; + font-size: 18px !important; + color: black; +} - div.node:hover { - cursor: pointer; - background: navy; - } +.branchAdd:hover { + background-color: deepskyblue; + cursor: pointer; + color: white; +} - .loop { - /*border: skyblue solid;*/ - border: rgb(10,120,200) solid; - border-color: deepskyblue; - text-align: center; - padding: 5px; - width: 90%; - min-width: 150px; - overflow: auto; - margin: 10px auto; - border-radius: 7px; - } +div.node:hover { + cursor: pointer; + background: navy; +} - .options { - height: 35px; - } +.loop { + /*border: skyblue solid;*/ + border: rgb(10, 120, 200) solid; + border-color: deepskyblue; + text-align: center; + padding: 5px; + width: 90%; + min-width: 150px; + overflow: auto; + margin: 10px auto; + border-radius: 7px; +} - .judge { - /* display: flex; */ - text-align: center; - padding: 5px; - width: 100%; - min-width: 150px; - margin: 10px auto; - justify-content: center; - border-radius: 7px; - } +.options { + height: 35px; +} - .branch { - display: inline-block; - margin: 5px; - border: deepskyblue solid; - text-align: center; - padding: 5px; - width: 300px; - min-width: 150px; - margin: 10px; - border-radius: 7px; - } +.judge { + /* display: flex; */ + text-align: center; + padding: 5px; + width: 100%; + min-width: 150px; + margin: 10px auto; + justify-content: center; + border-radius: 7px; +} - .sequence { - display: block; - } +.branch { + display: inline-block; + margin: 5px; + border: deepskyblue solid; + text-align: center; + padding: 5px; + width: 300px; + min-width: 150px; + margin: 10px; + border-radius: 7px; +} - .toolbox button { - margin-top: 5px; - margin-left: 3px; - margin-bottom: 5px; - width: 80%; - font-size: 15px!important; - } +.sequence { + display: block; +} - .Modify { - margin: 20px; - } +.toolbox button { + margin-top: 5px; + margin-left: 3px; + margin-bottom: 5px; + width: 80%; + font-size: 15px !important; +} - .Modify input { - font-size: 17px!important; - } +.Modify { + margin: 20px; +} - .elements { - font-size: 17px!important; - margin: 10px 0; - } +.Modify input { + font-size: 17px !important; +} - .elements p { - margin: 5px 0; - } +.elements { + font-size: 17px !important; + margin: 10px 0; +} - .elements input[type=checkbox] { - width: 20px; - height: 20px; - vertical-align: sub; - margin-right: 5px; - } +.elements p { + margin: 5px 0; +} - .elements textarea { - min-height: 100px; - } +.elements input[type=checkbox] { + width: 20px; + height: 20px; + vertical-align: sub; + margin-right: 5px; +} - .elements label { - font-size: 17px!important; - margin: 10px 0; - } - /* th, - td, - tr { - height: 30px; - width: 100px; - font-size: 13px!important; - overflow: hidden; - border: 1px solid rgb(78, 78, 78); - padding-left: 2px; - } +.elements textarea { + min-height: 100px; +} - table { - table-layout: fixed; - word-break: break-all; - word-wrap: break-word; - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - width: 100%; - } */ +.elements label { + font-size: 17px !important; + margin: 10px 0; +} - .toolkitcontain { - border: 1px solid #cdd!important; - width: 100%; - /* 上面的宽度设定很重要 */ - height: 214px; - overflow: auto; - margin-top: 10px; - position: relative; - } +/* th, +td, +tr { + height: 30px; + width: 100px; + font-size: 13px!important; + overflow: hidden; + border: 1px solid rgb(78, 78, 78); + padding-left: 2px; +} - .toolkitcontain table { - table-layout: fixed; - word-break: break-all; - word-wrap: break-word; - text-overflow: ellipsis; - overflow: hidden; - white-space: nowrap; - width: 100%; - } +table { + table-layout: fixed; + word-break: break-all; + word-wrap: break-word; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + width: 100%; +} */ - .toolkitcontain th, - .toolkitcontain td, - .toolkitcontain tr { - border: 1px solid rgb(78, 78, 78); - height: 30px; - width: 100px; - text-align: center; - font-weight: normal!important; - overflow: hidden; - font-size: 13px!important; - padding-left: 1px; - -webkit-user-select: none; - } +.toolkitcontain { + border: 1px solid #cdd !important; + width: 100%; + /* 上面的宽度设定很重要 */ + height: 214px; + overflow: auto; + margin-top: 10px; + position: relative; +} - .toolkitcontain .toolkittb2 { - position: sticky; - top: 0px; - margin-bottom: 0px; - /*background-color: azure;*/ - background-color: aliceblue; - z-index: 1000; - } +.toolkitcontain table { + table-layout: fixed; + word-break: break-all; + word-wrap: break-word; + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + width: 100%; +} - .toolkitcontain .toolkittb4 { - position: absolute; - } +.toolkitcontain th, +.toolkitcontain td, +.toolkitcontain tr { + border: 1px solid rgb(78, 78, 78); + height: 30px; + width: 100px; + text-align: center; + font-weight: normal !important; + overflow: hidden; + font-size: 13px !important; + padding-left: 1px; + -webkit-user-select: none; +} - .toolkitcontain a { - font-size: 13px!important; - cursor: pointer; - color: blue; - } +.toolkitcontain .toolkittb2 { + position: sticky; + top: 0px; + margin-bottom: 0px; + /*background-color: azure;*/ + background-color: aliceblue; + z-index: 1000; +} + +.toolkitcontain .toolkittb4 { + position: absolute; +} + +.toolkitcontain a { + font-size: 13px !important; + cursor: pointer; + color: blue; +} diff --git a/ElectronJS/src/taskGrid/FlowChart.html b/ElectronJS/src/taskGrid/FlowChart.html index 69d70f4..5fb0838 100644 --- a/ElectronJS/src/taskGrid/FlowChart.html +++ b/ElectronJS/src/taskGrid/FlowChart.html @@ -67,7 +67,7 @@
-

Element is inside iframe

+

Element is inside iframe

-

Use element located by xpath relative to the loop

+

Use element located by xpath relative to the loop

- +

- + - + - +

- + - + - +

@@ -206,8 +206,8 @@

-

Clear other field existing values before extracting

-

This operation will generate a new row of data ☺

+

Clear other field existing values before extracting

+

This operation will generate a new row of data ☺

@@ -219,7 +219,7 @@
-
+ {{paras.parameters[i-1]["exampleValues"][0]["value"]}} @@ -234,10 +234,10 @@

Current parameter name (Clicking on the "Modify" option of the field toggles the parameters)

-

Use relative XPath

-

Element is inside iframe

+

Use relative XPath

+

Element is inside iframe

XPATH (Field["FieldName"] and eval("your code") can be used in any XPATHS): ☺

- +

- - + - + - +
@@ -272,7 +272,7 @@ - +
- +
- - +
- +
-

Element is inside iframe

+

Element is inside iframe

-

Use text from the loop (If unchecked, the text entered each time will be the text from the "Input Value" text box below. If checked, it will use the text set within the loop.)

+

Use text from the loop (If unchecked, the text entered each time will be the text from the "Input Value" text box below. If checked, it will use the text set within the loop.)

- +

- +
- +

Click here for more examples): - + - +
- - + - +
- + - - + + + - + - + - + + - + - + - + - +
diff --git a/ElectronJS/src/taskGrid/FlowChart_CN.html b/ElectronJS/src/taskGrid/FlowChart_CN.html index 340384f..1d91a28 100644 --- a/ElectronJS/src/taskGrid/FlowChart_CN.html +++ b/ElectronJS/src/taskGrid/FlowChart_CN.html @@ -67,7 +67,7 @@
-

元素在iframe内

+

元素在iframe内

-

使用相对循环内的XPath定位到的元素

+

使用相对循环内的XPath定位到的元素

- +

- + - + - +

- + - + - +

@@ -206,8 +206,8 @@

-

提取数据前清空其他操作字段已记录的值

-

此提取数据操作后生成新数据行 ☺

+

提取数据前清空其他操作字段已记录的值

+

此提取数据操作后生成新数据行 ☺

@@ -219,7 +219,7 @@
-
+ {{paras.parameters[i-1]["exampleValues"][0]["value"]}} @@ -234,10 +234,10 @@

当前编辑字段参数名（点击字段的“修改”选项切换参数）：

-

使用相对循环内的XPATH

-

元素在iframe内

+

使用相对循环内的XPATH

+

元素在iframe内

XPath（所有XPath内均可用Field["字段名"]表示参数值，用eval("你的代码")来替换成自定义的变量）： ☺

- +

- - + - + - +
@@ -272,7 +272,7 @@ - +
- +
- - +
- +
-

元素在iframe内

+

元素在iframe内

-

使用循环内的文本（不勾选则每次输入的文本为下方“输入值”文本框内的文本，勾选后会使用所在“文本列表”循环内设置的文本）

+

使用循环内的文本（不勾选则每次输入的文本为下方“输入值”文本框内的文本，勾选后会使用所在“文本列表”循环内设置的文本）

-

+

- +
- +

点击此处查看更多示例）： - + - +
- - + - +
- + - - + + + - + - + - + + - + - + - + - +
diff --git a/ElectronJS/src/taskGrid/logic.js b/ElectronJS/src/taskGrid/logic.js index cf0fd4d..22bb175 100644 --- a/ElectronJS/src/taskGrid/logic.js +++ b/ElectronJS/src/taskGrid/logic.js @@ -290,7 +290,7 @@ function addParameters(t) { t["parameters"]["optionValue"] = ""; //下拉值 t["parameters"]["index"] = 0; //输入框索引 } else if (t.option == 8) { //循环 - t["title"] = LANG("循环 - 单个元素", "Loop - single element"); + t["title"] = LANG("循环 - 单个元素", "Loop - Single Element"); t["parameters"]["scrollType"] = 0; //滚动类型，0不滚动，1向下滚动1屏，2滚动到底部 t["parameters"]["scrollCount"] = 1; //滚动次数 t["parameters"]["scrollWaitTime"] = 1; //滚动后等待时间 @@ -307,7 +307,7 @@ function addParameters(t) { t["parameters"]["breakCode"] = ""; //break条件 t["parameters"]["breakCodeWaitTime"] = 0; //break条件等待时间 } else if (t.option == 9) { //条件 - t["title"] = LANG("判断条件 - 从左往右依次判断", "Judgment condition - judge from left to right"); + t["title"] = LANG("判断条件 - 从左往右依次判断", "Judgment Condition - Judge from Left to Right"); } else if (t.option == 10) { //条件分支 t["parameters"]["class"] = 0; //0代表什么条件都没有，1代表当前页面包括文本，2代表当前页面包括元素，3代表当前循环包括文本，4代表当前循环包括元素 t["parameters"]["value"] = ""; //相关值 @@ -366,17 +366,17 @@ function modifyParameters(t, para) { t["parameters"]["allXPaths"] = para["allXPaths"]; t["parameters"]["textList"] = para["value"]; if (para["nextPage"]) { //循环点击下一页的情况下 - t["title"] = LANG("循环点击下一页", "Loop click next page"); + t["title"] = LANG("循环点击下一页", "Loop Click Next Page"); } else if (para["type"] == "loopClickSingle") { //循环点击单个元素 - t["title"] = LANG("循环点击单个元素", "Loop click single element"); + t["title"] = LANG("循环点击单个元素", "Loop Click Single Element"); } else if (para["type"] == "loopClickEvery") { //循环点击每个元素 - t["title"] = LANG("循环点击每个元素", "Loop click every element"); + t["title"] = LANG("循环点击每个元素", "Loop click Every Element"); } else if (para["type"] == "loopMouseMove") { //循环移动到单个元素 - t["title"] = LANG("循环移动到每个元素", "Loop move to every element"); + t["title"] = LANG("循环移动到每个元素", "Loop Move to Every Element"); } else if (para["type"] == "multiCollectWithPattern") { - t["title"] = LANG("循环采集数据", "Loop collect data"); + t["title"] = LANG("循环采集数据", "Loop Collect Data"); } else if (para["type"] == "batchInputText") { - t["title"] = LANG("循环输入文字", "Loop input text"); + t["title"] = LANG("循环输入文字", "Loop Input Text"); } else { t["title"] = LANG("循环", "Loop"); } diff --git a/Extension/manifest_v3/src/content-scripts/toolkit.vue b/Extension/manifest_v3/src/content-scripts/toolkit.vue index ba05fcb..8d406ba 100644 --- a/Extension/manifest_v3/src/content-scripts/toolkit.vue +++ b/Extension/manifest_v3/src/content-scripts/toolkit.vue @@ -193,7 +193,7 @@ ● 请在页面上右键选择要点击的下一页按钮/链接，如要取消设置翻页操作，请点击下方取消选项。
- ● 已选中一个元素，您可以点击下方选项确认设置翻页操作。 + ● 已选中一个元素：{{getSelectedInnerText()}}，您可以点击下方选项确认设置翻页操作。
● 翻页操作只能设置一个元素，请点击下方取消翻页操作选项并重新选择。 @@ -415,7 +415,7 @@
● Please right-click on the page and select the next page button/link. To cancel the pagination setup, click the option below.
- ● A single element has been selected, you can click the option below to confirm the pagination setup. + ● A single element has been selected: {{getSelectedInnerText()}}, you can click the option below to confirm the pagination setup.
● The page-turning operation can only be set for one element. Please click the option below to cancel the @@ -773,6 +773,10 @@ export default { this.selectStatus = true; clearReady(); }, + getSelectedInnerText: function () { //提示文字 + let l = 10; + return global.nodeList[0]["node"].innerText.trim().length > l ? global.nodeList[0]["node"].innerText.trim().substring(0, l) + "..." : global.nodeList[0]["node"].innerText.trim(); + }, getSelectedText: function () { //采集选中文字 generateParameters(11, true, false); this.selectStatus = true;