Commit e3c31c353ad540fe5d36e96d541c6fbcba7e944a
1 parent
c06a96b7
v3.5.0 修复关闭confirm提示框控制台报错问题
Showing
36 changed files
with
55 additions
and
57 deletions
yudao-module-tool/yudao-module-tool-impl/src/main/resources/codegen/vue/views/index.vue.vm
| ... | ... | @@ -373,7 +373,7 @@ export default { |
| 373 | 373 | }).then(() => { |
| 374 | 374 | this.getList(); |
| 375 | 375 | this.msgSuccess("删除成功"); |
| 376 | - }) | |
| 376 | + }).catch(() => {}); | |
| 377 | 377 | }, |
| 378 | 378 | /** 导出按钮操作 */ |
| 379 | 379 | handleExport() { |
| ... | ... | @@ -400,7 +400,7 @@ export default { |
| 400 | 400 | }).then(response => { |
| 401 | 401 | this.downloadExcel(response, '${table.classComment}.xls'); |
| 402 | 402 | this.exportLoading = false; |
| 403 | - }) | |
| 403 | + }).catch(() => {}); | |
| 404 | 404 | } |
| 405 | 405 | } |
| 406 | 406 | }; | ... | ... |
yudao-ui-admin/src/layout/components/Navbar.vue
yudao-ui-admin/src/utils/request.js
yudao-ui-admin/src/views/bpm/form/index.vue
yudao-ui-admin/src/views/bpm/group/index.vue
yudao-ui-admin/src/views/bpm/model/index.vue
| ... | ... | @@ -434,7 +434,7 @@ export default { |
| 434 | 434 | that.getList(); |
| 435 | 435 | that.msgSuccess("删除成功"); |
| 436 | 436 | }) |
| 437 | - }) | |
| 437 | + }).catch(() => {}); | |
| 438 | 438 | }, |
| 439 | 439 | /** 部署按钮操作 */ |
| 440 | 440 | handleDeploy(row) { |
| ... | ... | @@ -448,7 +448,7 @@ export default { |
| 448 | 448 | that.getList(); |
| 449 | 449 | that.msgSuccess("部署成功"); |
| 450 | 450 | }) |
| 451 | - }) | |
| 451 | + }).catch(() => {}); | |
| 452 | 452 | }, |
| 453 | 453 | /** 流程表单的详情按钮操作 */ |
| 454 | 454 | handleFormDetail(row) { |
| ... | ... | @@ -500,7 +500,7 @@ export default { |
| 500 | 500 | }).then(() => { |
| 501 | 501 | this.getList(); |
| 502 | 502 | this.msgSuccess(statusState + "成功"); |
| 503 | - }) | |
| 503 | + }).catch(() => {}); | |
| 504 | 504 | }, |
| 505 | 505 | /** 导入按钮操作 */ |
| 506 | 506 | handleImport() { | ... | ... |
yudao-ui-admin/src/views/infra/apiAccessLog/index.vue
yudao-ui-admin/src/views/infra/apiErrorLog/index.vue
| ... | ... | @@ -214,7 +214,7 @@ export default { |
| 214 | 214 | this.msgSuccess("修改成功"); |
| 215 | 215 | this.getList(); |
| 216 | 216 | }); |
| 217 | - }) | |
| 217 | + }).catch(() => {}); | |
| 218 | 218 | }, |
| 219 | 219 | /** 导出按钮操作 */ |
| 220 | 220 | handleExport() { |
| ... | ... | @@ -234,7 +234,7 @@ export default { |
| 234 | 234 | }).then(response => { |
| 235 | 235 | this.downloadExcel(response, 'API 错误日志.xls'); |
| 236 | 236 | this.exportLoading = false; |
| 237 | - }) | |
| 237 | + }).catch(() => {}); | |
| 238 | 238 | } |
| 239 | 239 | } |
| 240 | 240 | }; | ... | ... |
yudao-ui-admin/src/views/infra/config/index.vue
| ... | ... | @@ -264,7 +264,7 @@ export default { |
| 264 | 264 | }).then(() => { |
| 265 | 265 | this.getList(); |
| 266 | 266 | this.msgSuccess("删除成功"); |
| 267 | - }) | |
| 267 | + }).catch(() => {}); | |
| 268 | 268 | }, |
| 269 | 269 | /** 导出按钮操作 */ |
| 270 | 270 | handleExport() { |
| ... | ... | @@ -282,7 +282,7 @@ export default { |
| 282 | 282 | }).then(response => { |
| 283 | 283 | this.downloadExcel(response, '参数配置.xls'); |
| 284 | 284 | this.exportLoading = false; |
| 285 | - }) | |
| 285 | + }).catch(() => {}); | |
| 286 | 286 | }, |
| 287 | 287 | } |
| 288 | 288 | }; | ... | ... |
yudao-ui-admin/src/views/infra/file/index.vue
yudao-ui-admin/src/views/infra/job/index.vue
| ... | ... | @@ -229,7 +229,7 @@ export default { |
| 229 | 229 | return runJob(row.id); |
| 230 | 230 | }).then(() => { |
| 231 | 231 | this.msgSuccess("执行成功"); |
| 232 | - }) | |
| 232 | + }).catch(() => {}); | |
| 233 | 233 | }, |
| 234 | 234 | /** 任务详细信息 */ |
| 235 | 235 | handleView(row) { |
| ... | ... | @@ -303,7 +303,7 @@ export default { |
| 303 | 303 | }).then(() => { |
| 304 | 304 | this.getList(); |
| 305 | 305 | this.msgSuccess("删除成功"); |
| 306 | - }) | |
| 306 | + }).catch(() => {}); | |
| 307 | 307 | }, |
| 308 | 308 | /** 更新状态操作 */ |
| 309 | 309 | handleChangeStatus(row, open) { |
| ... | ... | @@ -319,7 +319,7 @@ export default { |
| 319 | 319 | }).then(() => { |
| 320 | 320 | this.getList(); |
| 321 | 321 | this.msgSuccess(statusStr + "成功"); |
| 322 | - }) | |
| 322 | + }).catch(() => {}); | |
| 323 | 323 | }, |
| 324 | 324 | /** 导出按钮操作 */ |
| 325 | 325 | handleExport() { |
| ... | ... | @@ -334,7 +334,7 @@ export default { |
| 334 | 334 | }).then(response => { |
| 335 | 335 | this.downloadExcel(response, '定时任务.xls'); |
| 336 | 336 | this.exportLoading = false; |
| 337 | - }) | |
| 337 | + }).catch(() => {}); | |
| 338 | 338 | } |
| 339 | 339 | } |
| 340 | 340 | }; | ... | ... |
yudao-ui-admin/src/views/infra/job/log.vue
yudao-ui-admin/src/views/pay/app/index.vue
yudao-ui-admin/src/views/pay/merchant/index.vue
| ... | ... | @@ -273,7 +273,7 @@ export default { |
| 273 | 273 | }).then(() => { |
| 274 | 274 | this.getList(); |
| 275 | 275 | this.msgSuccess("删除成功"); |
| 276 | - }) | |
| 276 | + }).catch(() => {}); | |
| 277 | 277 | }, |
| 278 | 278 | /** 导出按钮操作 */ |
| 279 | 279 | handleExport() { |
| ... | ... | @@ -293,7 +293,7 @@ export default { |
| 293 | 293 | }).then(response => { |
| 294 | 294 | this.downloadExcel(response, '支付商户信息.xls'); |
| 295 | 295 | this.exportLoading = false; |
| 296 | - }) | |
| 296 | + }).catch(() => {}); | |
| 297 | 297 | } |
| 298 | 298 | } |
| 299 | 299 | }; | ... | ... |
yudao-ui-admin/src/views/pay/order/index.vue
yudao-ui-admin/src/views/pay/refund/index.vue
yudao-ui-admin/src/views/system/dept/index.vue
yudao-ui-admin/src/views/system/dict/data.vue
| ... | ... | @@ -259,7 +259,7 @@ export default { |
| 259 | 259 | }).then(() => { |
| 260 | 260 | this.getList(); |
| 261 | 261 | this.msgSuccess("删除成功"); |
| 262 | - }) | |
| 262 | + }).catch(() => {}); | |
| 263 | 263 | }, |
| 264 | 264 | /** 导出按钮操作 */ |
| 265 | 265 | handleExport() { |
| ... | ... | @@ -274,7 +274,7 @@ export default { |
| 274 | 274 | }).then(response => { |
| 275 | 275 | this.downloadExcel(response, '字典数据.xls'); |
| 276 | 276 | this.exportLoading = false; |
| 277 | - }) | |
| 277 | + }).catch(() => {}); | |
| 278 | 278 | } |
| 279 | 279 | } |
| 280 | 280 | }; | ... | ... |
yudao-ui-admin/src/views/system/dict/index.vue
| ... | ... | @@ -240,7 +240,7 @@ export default { |
| 240 | 240 | }).then(() => { |
| 241 | 241 | this.getList(); |
| 242 | 242 | this.msgSuccess("删除成功"); |
| 243 | - }) | |
| 243 | + }).catch(() => {}); | |
| 244 | 244 | }, |
| 245 | 245 | /** 导出按钮操作 */ |
| 246 | 246 | handleExport() { |
| ... | ... | @@ -260,7 +260,7 @@ export default { |
| 260 | 260 | }).then(response => { |
| 261 | 261 | this.downloadExcel(response, '字典类型.xls'); |
| 262 | 262 | this.exportLoading = false; |
| 263 | - }) | |
| 263 | + }).catch(() => {}); | |
| 264 | 264 | } |
| 265 | 265 | } |
| 266 | 266 | }; | ... | ... |
yudao-ui-admin/src/views/system/errorCode/index.vue
| ... | ... | @@ -233,7 +233,7 @@ export default { |
| 233 | 233 | }).then(() => { |
| 234 | 234 | this.getList(); |
| 235 | 235 | this.msgSuccess("删除成功"); |
| 236 | - }) | |
| 236 | + }).catch(() => {}); | |
| 237 | 237 | }, |
| 238 | 238 | /** 导出按钮操作 */ |
| 239 | 239 | handleExport() { |
| ... | ... | @@ -253,7 +253,7 @@ export default { |
| 253 | 253 | }).then(response => { |
| 254 | 254 | this.downloadExcel(response, '错误码.xls'); |
| 255 | 255 | this.exportLoading = false; |
| 256 | - }) | |
| 256 | + }).catch(() => {}); | |
| 257 | 257 | } |
| 258 | 258 | } |
| 259 | 259 | }; | ... | ... |
yudao-ui-admin/src/views/system/loginlog/index.vue
yudao-ui-admin/src/views/system/menu/index.vue
yudao-ui-admin/src/views/system/notice/index.vue
yudao-ui-admin/src/views/system/operatelog/index.vue
yudao-ui-admin/src/views/system/post/index.vue
| ... | ... | @@ -231,7 +231,7 @@ export default { |
| 231 | 231 | }).then(() => { |
| 232 | 232 | this.getList(); |
| 233 | 233 | this.msgSuccess("删除成功"); |
| 234 | - }) | |
| 234 | + }).catch(() => {}); | |
| 235 | 235 | }, |
| 236 | 236 | /** 导出按钮操作 */ |
| 237 | 237 | handleExport() { |
| ... | ... | @@ -246,7 +246,7 @@ export default { |
| 246 | 246 | }).then(response => { |
| 247 | 247 | this.downloadExcel(response, '岗位数据.xls'); |
| 248 | 248 | this.exportLoading = false; |
| 249 | - }) | |
| 249 | + }).catch(() => {}); | |
| 250 | 250 | } |
| 251 | 251 | } |
| 252 | 252 | }; | ... | ... |
yudao-ui-admin/src/views/system/role/index.vue
| ... | ... | @@ -496,7 +496,7 @@ export default { |
| 496 | 496 | }).then(() => { |
| 497 | 497 | this.getList(); |
| 498 | 498 | this.msgSuccess("删除成功"); |
| 499 | - }) | |
| 499 | + }).catch(() => {}); | |
| 500 | 500 | }, |
| 501 | 501 | /** 导出按钮操作 */ |
| 502 | 502 | handleExport() { |
| ... | ... | @@ -511,7 +511,7 @@ export default { |
| 511 | 511 | }).then(response => { |
| 512 | 512 | this.downloadExcel(response, '角色数据.xls'); |
| 513 | 513 | this.exportLoading = false; |
| 514 | - }) | |
| 514 | + }).catch(() => {}); | |
| 515 | 515 | } |
| 516 | 516 | } |
| 517 | 517 | }; | ... | ... |
yudao-ui-admin/src/views/system/session/index.vue
yudao-ui-admin/src/views/system/sms/smsChannel.vue
yudao-ui-admin/src/views/system/sms/smsLog.vue
yudao-ui-admin/src/views/system/sms/smsTemplate.vue
| ... | ... | @@ -324,7 +324,7 @@ export default { |
| 324 | 324 | }).then(() => { |
| 325 | 325 | this.getList(); |
| 326 | 326 | this.msgSuccess("删除成功"); |
| 327 | - }) | |
| 327 | + }).catch(() => {}); | |
| 328 | 328 | }, |
| 329 | 329 | /** 导出按钮操作 */ |
| 330 | 330 | handleExport() { |
| ... | ... | @@ -344,7 +344,7 @@ export default { |
| 344 | 344 | }).then(response => { |
| 345 | 345 | this.downloadExcel(response, '短信模板.xls'); |
| 346 | 346 | this.exportLoading = false; |
| 347 | - }) | |
| 347 | + }).catch(() => {}); | |
| 348 | 348 | }, |
| 349 | 349 | /** 发送短息按钮 */ |
| 350 | 350 | handleSendSms(row) { | ... | ... |
yudao-ui-admin/src/views/system/tenant/index.vue
| ... | ... | @@ -236,7 +236,7 @@ export default { |
| 236 | 236 | }).then(() => { |
| 237 | 237 | this.getList(); |
| 238 | 238 | this.msgSuccess("删除成功"); |
| 239 | - }) | |
| 239 | + }).catch(() => {}); | |
| 240 | 240 | }, |
| 241 | 241 | /** 导出按钮操作 */ |
| 242 | 242 | handleExport() { |
| ... | ... | @@ -256,7 +256,7 @@ export default { |
| 256 | 256 | }).then(response => { |
| 257 | 257 | this.downloadExcel(response, '租户.xls'); |
| 258 | 258 | this.exportLoading = false; |
| 259 | - }) | |
| 259 | + }).catch(() => {}); | |
| 260 | 260 | } |
| 261 | 261 | } |
| 262 | 262 | }; | ... | ... |
yudao-ui-admin/src/views/system/user/index.vue
| ... | ... | @@ -589,7 +589,7 @@ export default { |
| 589 | 589 | }).then(() => { |
| 590 | 590 | this.getList(); |
| 591 | 591 | this.msgSuccess("删除成功"); |
| 592 | - }) | |
| 592 | + }).catch(() => {}); | |
| 593 | 593 | }, |
| 594 | 594 | /** 导出按钮操作 */ |
| 595 | 595 | handleExport() { |
| ... | ... | @@ -607,7 +607,7 @@ export default { |
| 607 | 607 | }).then(response => { |
| 608 | 608 | this.downloadExcel(response, '用户数据.xls'); |
| 609 | 609 | this.exportLoading = false; |
| 610 | - }) | |
| 610 | + }).catch(() => {}); | |
| 611 | 611 | }, |
| 612 | 612 | /** 导入按钮操作 */ |
| 613 | 613 | handleImport() { | ... | ... |
yudao-ui-admin/src/views/tool/build/FormDrawer.vue
yudao-ui-admin/src/views/tool/build/index.vue
yudao-ui-admin/src/views/tool/codegen/index.vue
| ... | ... | @@ -213,7 +213,7 @@ export default { |
| 213 | 213 | return syncCodegenFromDB(row.id); |
| 214 | 214 | }).then(() => { |
| 215 | 215 | this.msgSuccess("同步成功"); |
| 216 | - }) | |
| 216 | + }).catch(() => {}); | |
| 217 | 217 | }, |
| 218 | 218 | /** 打开导入表弹窗 */ |
| 219 | 219 | openImportTable() { |
| ... | ... | @@ -335,7 +335,7 @@ export default { |
| 335 | 335 | }).then(() => { |
| 336 | 336 | this.getList(); |
| 337 | 337 | this.msgSuccess("删除成功"); |
| 338 | - }) | |
| 338 | + }).catch(() => {}); | |
| 339 | 339 | }, |
| 340 | 340 | // 取消按钮 |
| 341 | 341 | cancel() { | ... | ... |
yudao-ui-admin/src/views/tool/testDemo/index.vue
| ... | ... | @@ -243,7 +243,7 @@ export default { |
| 243 | 243 | }).then(() => { |
| 244 | 244 | this.getList(); |
| 245 | 245 | this.msgSuccess("删除成功"); |
| 246 | - }) | |
| 246 | + }).catch(() => {}); | |
| 247 | 247 | }, |
| 248 | 248 | /** 导出按钮操作 */ |
| 249 | 249 | handleExport() { |
| ... | ... | @@ -263,7 +263,7 @@ export default { |
| 263 | 263 | }).then(response => { |
| 264 | 264 | this.downloadExcel(response, '字典类型.xls'); |
| 265 | 265 | this.exportLoading = false; |
| 266 | - }) | |
| 266 | + }).catch(() => {}); | |
| 267 | 267 | } |
| 268 | 268 | } |
| 269 | 269 | }; | ... | ... |