Browse Source

v3.5.0 修复关闭confirm提示框控制台报错问题

YunaiV 3 years ago
parent
commit
e3c31c353a
36 changed files with 55 additions and 57 deletions
  1. 2 2
      yudao-module-tool/yudao-module-tool-impl/src/main/resources/codegen/vue/views/index.vue.vm
  2. 1 1
      yudao-ui-admin/src/layout/components/Navbar.vue
  3. 1 1
      yudao-ui-admin/src/utils/request.js
  4. 1 1
      yudao-ui-admin/src/views/bpm/form/index.vue
  5. 1 1
      yudao-ui-admin/src/views/bpm/group/index.vue
  6. 3 3
      yudao-ui-admin/src/views/bpm/model/index.vue
  7. 1 1
      yudao-ui-admin/src/views/infra/apiAccessLog/index.vue
  8. 2 2
      yudao-ui-admin/src/views/infra/apiErrorLog/index.vue
  9. 2 2
      yudao-ui-admin/src/views/infra/config/index.vue
  10. 1 1
      yudao-ui-admin/src/views/infra/file/index.vue
  11. 4 4
      yudao-ui-admin/src/views/infra/job/index.vue
  12. 1 1
      yudao-ui-admin/src/views/infra/job/log.vue
  13. 1 1
      yudao-ui-admin/src/views/pay/app/index.vue
  14. 2 2
      yudao-ui-admin/src/views/pay/merchant/index.vue
  15. 1 1
      yudao-ui-admin/src/views/pay/order/index.vue
  16. 1 1
      yudao-ui-admin/src/views/pay/refund/index.vue
  17. 1 1
      yudao-ui-admin/src/views/system/dept/index.vue
  18. 2 2
      yudao-ui-admin/src/views/system/dict/data.vue
  19. 2 2
      yudao-ui-admin/src/views/system/dict/index.vue
  20. 2 2
      yudao-ui-admin/src/views/system/errorCode/index.vue
  21. 1 1
      yudao-ui-admin/src/views/system/loginlog/index.vue
  22. 1 1
      yudao-ui-admin/src/views/system/menu/index.vue
  23. 1 1
      yudao-ui-admin/src/views/system/notice/index.vue
  24. 1 1
      yudao-ui-admin/src/views/system/operatelog/index.vue
  25. 2 2
      yudao-ui-admin/src/views/system/post/index.vue
  26. 2 2
      yudao-ui-admin/src/views/system/role/index.vue
  27. 1 1
      yudao-ui-admin/src/views/system/session/index.vue
  28. 1 1
      yudao-ui-admin/src/views/system/sms/smsChannel.vue
  29. 1 1
      yudao-ui-admin/src/views/system/sms/smsLog.vue
  30. 2 2
      yudao-ui-admin/src/views/system/sms/smsTemplate.vue
  31. 2 2
      yudao-ui-admin/src/views/system/tenant/index.vue
  32. 2 2
      yudao-ui-admin/src/views/system/user/index.vue
  33. 1 2
      yudao-ui-admin/src/views/tool/build/FormDrawer.vue
  34. 1 2
      yudao-ui-admin/src/views/tool/build/index.vue
  35. 2 2
      yudao-ui-admin/src/views/tool/codegen/index.vue
  36. 2 2
      yudao-ui-admin/src/views/tool/testDemo/index.vue

+ 2 - 2
yudao-module-tool/yudao-module-tool-impl/src/main/resources/codegen/vue/views/index.vue.vm

@@ -373,7 +373,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+        }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -400,7 +400,7 @@ export default {
         }).then(response => {
           this.downloadExcel(response, '${table.classComment}.xls');
           this.exportLoading = false;
-        })
+        }).catch(() => {});
     }
   }
 };

+ 1 - 1
yudao-ui-admin/src/layout/components/Navbar.vue

@@ -104,7 +104,7 @@ export default {
         this.$store.dispatch('LogOut').then(() => {
           location.href = '/index';
         })
-      })
+      }).catch(() => {});
     }
   }
 }

+ 1 - 1
yudao-ui-admin/src/utils/request.js

@@ -72,7 +72,7 @@ service.interceptors.response.use(res => {
           // }
           location.href = '/index';
         })
-      })
+      }).catch(() => {});
     } else if (code === 500) {
       Message({
         message: msg,

+ 1 - 1
yudao-ui-admin/src/views/bpm/form/index.vue

@@ -159,7 +159,7 @@ export default {
       }).then(() => {
         this.getList();
         this.msgSuccess("删除成功");
-      })
+      }).catch(() => {});
     }
   }
 };

+ 1 - 1
yudao-ui-admin/src/views/bpm/group/index.vue

@@ -239,7 +239,7 @@ export default {
       }).then(() => {
         this.getList();
         this.msgSuccess("删除成功");
-      })
+      }).catch(() => {});
     },
     getUserNickname(userId) {
       for (const user of this.users) {

+ 3 - 3
yudao-ui-admin/src/views/bpm/model/index.vue

@@ -434,7 +434,7 @@ export default {
           that.getList();
           that.msgSuccess("删除成功");
         })
-      })
+      }).catch(() => {});
     },
     /** 部署按钮操作 */
     handleDeploy(row) {
@@ -448,7 +448,7 @@ export default {
           that.getList();
           that.msgSuccess("部署成功");
         })
-      })
+      }).catch(() => {});
     },
     /** 流程表单的详情按钮操作 */
     handleFormDetail(row) {
@@ -500,7 +500,7 @@ export default {
       }).then(() => {
         this.getList();
         this.msgSuccess(statusState + "成功");
-      })
+      }).catch(() => {});
     },
     /** 导入按钮操作 */
     handleImport() {

+ 1 - 1
yudao-ui-admin/src/views/infra/apiAccessLog/index.vue

@@ -212,7 +212,7 @@ export default {
       }).then(response => {
         this.downloadExcel(response, 'API 访问日志.xls');
         this.exportLoading = false;
-      })
+      }).catch(() => {});
     }
   }
 };

+ 2 - 2
yudao-ui-admin/src/views/infra/apiErrorLog/index.vue

@@ -214,7 +214,7 @@ export default {
           this.msgSuccess("修改成功");
           this.getList();
         });
-      })
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -234,7 +234,7 @@ export default {
       }).then(response => {
         this.downloadExcel(response, 'API 错误日志.xls');
         this.exportLoading = false;
-      })
+      }).catch(() => {});
     }
   }
 };

+ 2 - 2
yudao-ui-admin/src/views/infra/config/index.vue

@@ -264,7 +264,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -282,7 +282,7 @@ export default {
         }).then(response => {
           this.downloadExcel(response, '参数配置.xls');
           this.exportLoading = false;
-      })
+      }).catch(() => {});
     },
   }
 };

+ 1 - 1
yudao-ui-admin/src/views/infra/file/index.vue

@@ -195,7 +195,7 @@ export default {
       }).then(() => {
         this.getList();
         this.msgSuccess("删除成功");
-      })
+      }).catch(() => {});
     },
   }
 };

+ 4 - 4
yudao-ui-admin/src/views/infra/job/index.vue

@@ -229,7 +229,7 @@ export default {
           return runJob(row.id);
         }).then(() => {
           this.msgSuccess("执行成功");
-        })
+      }).catch(() => {});
     },
     /** 任务详细信息 */
     handleView(row) {
@@ -303,7 +303,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+      }).catch(() => {});
     },
     /** 更新状态操作 */
     handleChangeStatus(row, open) {
@@ -319,7 +319,7 @@ export default {
       }).then(() => {
         this.getList();
         this.msgSuccess(statusStr + "成功");
-      })
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -334,7 +334,7 @@ export default {
         }).then(response => {
           this.downloadExcel(response, '定时任务.xls');
           this.exportLoading = false;
-        })
+      }).catch(() => {});
     }
   }
 };

+ 1 - 1
yudao-ui-admin/src/views/infra/job/log.vue

@@ -173,7 +173,7 @@ export default {
       }).then(response => {
         this.downloadExcel(response, '定时任务日志.xls');
         this.exportLoading = false;
-      })
+      }).catch(() => {});
     }
   }
 };

+ 1 - 1
yudao-ui-admin/src/views/pay/app/index.vue

@@ -430,7 +430,7 @@ export default {
         return exportAppExcel(params);
       }).then(response => {
         this.downloadExcel(response, '支付应用信息.xls');
-      })
+      }).catch(() => {});
     },
     /**
      * 根据商户名称模糊匹配商户信息

+ 2 - 2
yudao-ui-admin/src/views/pay/merchant/index.vue

@@ -273,7 +273,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -293,7 +293,7 @@ export default {
         }).then(response => {
           this.downloadExcel(response, '支付商户信息.xls');
           this.exportLoading = false;
-        })
+      }).catch(() => {});
     }
   }
 };

+ 1 - 1
yudao-ui-admin/src/views/pay/order/index.vue

@@ -473,7 +473,7 @@ export default {
         return exportOrderExcel(params);
       }).then(response => {
         this.downloadExcel(response, '支付订单.xls');
-      })
+      }).catch(() => {});
     },
     /**
      * 根据商户名称模糊匹配商户信息

+ 1 - 1
yudao-ui-admin/src/views/pay/refund/index.vue

@@ -442,7 +442,7 @@ export default {
         return exportRefundExcel(params);
       }).then(response => {
         this.downloadExcel(response, '退款订单.xls');
-      })
+      }).catch(() => {});
     },
     /**
      * 根据商户名称模糊匹配商户信息

+ 1 - 1
yudao-ui-admin/src/views/system/dept/index.vue

@@ -298,7 +298,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+      }).catch(() => {});
     }
   }
 };

+ 2 - 2
yudao-ui-admin/src/views/system/dict/data.vue

@@ -259,7 +259,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -274,7 +274,7 @@ export default {
         }).then(response => {
           this.downloadExcel(response, '字典数据.xls');
           this.exportLoading = false;
-      })
+      }).catch(() => {});
     }
   }
 };

+ 2 - 2
yudao-ui-admin/src/views/system/dict/index.vue

@@ -240,7 +240,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -260,7 +260,7 @@ export default {
       }).then(response => {
         this.downloadExcel(response, '字典类型.xls');
         this.exportLoading = false;
-      })
+      }).catch(() => {});
     }
   }
 };

+ 2 - 2
yudao-ui-admin/src/views/system/errorCode/index.vue

@@ -233,7 +233,7 @@ export default {
       }).then(() => {
         this.getList();
         this.msgSuccess("删除成功");
-      })
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -253,7 +253,7 @@ export default {
       }).then(response => {
         this.downloadExcel(response, '错误码.xls');
         this.exportLoading = false;
-      })
+      }).catch(() => {});
     }
   }
 };

+ 1 - 1
yudao-ui-admin/src/views/system/loginlog/index.vue

@@ -137,7 +137,7 @@ export default {
         }).then(response => {
           this.downloadExcel(response, '登录日志.xls');
           this.exportLoading = false;
-      })
+      }).catch(() => {});
     }
   }
 };

+ 1 - 1
yudao-ui-admin/src/views/system/menu/index.vue

@@ -320,7 +320,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+      }).catch(() => {});
     }
   }
 };

+ 1 - 1
yudao-ui-admin/src/views/system/notice/index.vue

@@ -245,7 +245,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+      }).catch(() => {});
     }
   }
 };

+ 1 - 1
yudao-ui-admin/src/views/system/operatelog/index.vue

@@ -224,7 +224,7 @@ export default {
         }).then(response => {
           this.downloadExcel(response, '操作日志.xls');
           this.exportLoading = false;
-      })
+      }).catch(() => {});
     }
   }
 };

+ 2 - 2
yudao-ui-admin/src/views/system/post/index.vue

@@ -231,7 +231,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -246,7 +246,7 @@ export default {
         }).then(response => {
           this.downloadExcel(response, '岗位数据.xls');
           this.exportLoading = false;
-      })
+      }).catch(() => {});
     }
   }
 };

+ 2 - 2
yudao-ui-admin/src/views/system/role/index.vue

@@ -496,7 +496,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -511,7 +511,7 @@ export default {
         }).then(response => {
           this.downloadExcel(response, '角色数据.xls');
           this.exportLoading = false;
-      })
+      }).catch(() => {});
     }
   }
 };

+ 1 - 1
yudao-ui-admin/src/views/system/session/index.vue

@@ -92,7 +92,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("强退成功");
-        })
+      }).catch(() => {});
     }
   }
 };

+ 1 - 1
yudao-ui-admin/src/views/system/sms/smsChannel.vue

@@ -242,7 +242,7 @@ export default {
       }).then(() => {
         this.getList();
         this.msgSuccess("删除成功");
-      })
+      }).catch(() => {});
     }
   }
 };

+ 1 - 1
yudao-ui-admin/src/views/system/sms/smsLog.vue

@@ -283,7 +283,7 @@ export default {
       }).then(response => {
         this.downloadExcel(response, '短信日志.xls');
         this.exportLoading = false;
-      })
+      }).catch(() => {});
     },
     /** 详细按钮操作 */
     handleView(row) {

+ 2 - 2
yudao-ui-admin/src/views/system/sms/smsTemplate.vue

@@ -324,7 +324,7 @@ export default {
       }).then(() => {
         this.getList();
         this.msgSuccess("删除成功");
-      })
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -344,7 +344,7 @@ export default {
       }).then(response => {
         this.downloadExcel(response, '短信模板.xls');
         this.exportLoading = false;
-      })
+      }).catch(() => {});
     },
     /** 发送短息按钮 */
     handleSendSms(row) {

+ 2 - 2
yudao-ui-admin/src/views/system/tenant/index.vue

@@ -236,7 +236,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -256,7 +256,7 @@ export default {
         }).then(response => {
           this.downloadExcel(response, '租户.xls');
           this.exportLoading = false;
-      })
+      }).catch(() => {});
     }
   }
 };

+ 2 - 2
yudao-ui-admin/src/views/system/user/index.vue

@@ -589,7 +589,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -607,7 +607,7 @@ export default {
         }).then(response => {
           this.downloadExcel(response, '用户数据.xls');
           this.exportLoading = false;
-      })
+      }).catch(() => {});
     },
     /** 导入按钮操作 */
     handleImport() {

+ 1 - 2
yudao-ui-admin/src/views/tool/build/FormDrawer.vue

@@ -218,8 +218,7 @@ export default {
             '提示',
             {
               type: 'warning'
-            }
-          )
+            }).catch(() => {});
           return
         }
         if (astBody[0].type === 'ExportDefaultDeclaration') {

+ 1 - 2
yudao-ui-admin/src/views/tool/build/index.vue

@@ -381,8 +381,7 @@ export default {
         () => {
           this.drawingList = []
           this.idGlobal = 100
-        }
-      )
+        }).catch(() => {});
     },
     drawingItemCopy(item, list) {
       let clone = deepClone(item)

+ 2 - 2
yudao-ui-admin/src/views/tool/codegen/index.vue

@@ -213,7 +213,7 @@ export default {
           return syncCodegenFromDB(row.id);
       }).then(() => {
           this.msgSuccess("同步成功");
-      })
+      }).catch(() => {});
     },
     /** 打开导入表弹窗 */
     openImportTable() {
@@ -335,7 +335,7 @@ export default {
       }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-      })
+      }).catch(() => {});
     },
     // 取消按钮
     cancel() {

+ 2 - 2
yudao-ui-admin/src/views/tool/testDemo/index.vue

@@ -243,7 +243,7 @@ export default {
         }).then(() => {
           this.getList();
           this.msgSuccess("删除成功");
-        })
+      }).catch(() => {});
     },
     /** 导出按钮操作 */
     handleExport() {
@@ -263,7 +263,7 @@ export default {
         }).then(response => {
           this.downloadExcel(response, '字典类型.xls');
           this.exportLoading = false;
-      })
+      }).catch(() => {});
     }
   }
 };