Skip to content

Commit 5dad43b

Browse files
committed
Java:MultiDataSource 中 APIAutoAI:自定义 alert 弹窗解决 page-agent UI 自动化操作时被原生 alert 阻塞
1 parent c9f84f7 commit 5dad43b

2 files changed

Lines changed: 25 additions & 3 deletions

File tree

  • APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/api

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/api/index.html

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -841,15 +841,25 @@
841841
<!--本网站部分工具是站长整合网上已有工具、开源包等,并全部遵循原有协议发布,著作权归属原作者或是团队。-->
842842
<!--</div>-->
843843

844+
<!--弹出保存框-->
845+
<div class="save-box" v-show="isAlertShow">
846+
<svg class="icon close-icon" @click="showAlert(false)">
847+
<use xlink:href="svg/icon.svg#close"></use>
848+
</svg>
849+
850+
<a type="text" style="background-color: white; padding: 6px 10px 6px 10px">{{alertMsg}}</a><br/>
851+
<button @click="showAlert(false)" >确定</button>
852+
</div>
853+
844854
<!--弹出保存框-->
845855
<div class="save-box" v-show="isSaveShow">
846856
<svg class="icon close-icon" @click="showSave(false)">
847857
<use xlink:href="svg/icon.svg#close"></use>
848858
</svg>
849859

850-
<input type="text" placeholder="请输入名称" v-model="history.name" />
851-
<button @click="save()" >保存</button>
852-
</div>
860+
<input type="text" placeholder="请输入名称" v-model="history.name" />
861+
<button @click="save()" >保存</button>
862+
</div>
853863

854864
<!--弹出下载文本框-->
855865
<div class="save-box" v-show="isExportShow">

APIJSON-Java-Server/APIJSONBoot-MultiDataSource/src/main/resources/static/api/js/main.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1402,9 +1402,11 @@ https://github.com/Tencent/APIJSON/issues
14021402
wait: 0, // 每个请求前的等待延迟
14031403
timeout: null, // 每个请求的超时时间
14041404
loadingCount: 0,
1405+
alertMsg: '',
14051406
isPreScript: true,
14061407
isRandomTest: false,
14071408
isDelayShow: false,
1409+
isAlertShow: false,
14081410
isSaveShow: false,
14091411
isExportShow: false,
14101412
isExportCheckShow: false,
@@ -2126,6 +2128,11 @@ https://github.com/Tencent/APIJSON/issues
21262128
}
21272129
},
21282130

2131+
// 显示提示弹窗
2132+
showAlert(show) {
2133+
this.isAlertShow = show
2134+
},
2135+
21292136
// 显示保存弹窗
21302137
showSave: function (show) {
21312138
if (show) {
@@ -15385,6 +15392,11 @@ Content-Type: ` + contentType) + (StringUtil.isEmpty(headerStr, true) ? '' : hea
1538515392
module.exports = {getRequestFromURL, App}
1538615393
}
1538715394

15395+
function alert(msg) {
15396+
App.alertMsg = msg
15397+
App.showAlert(true)
15398+
}
15399+
1538815400
})()
1538915401

1539015402
// APIJSON >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

0 commit comments

Comments
 (0)