wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-17 18:46:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复修改密码取消后没有catch的问题

Browse Source
This commit is contained in:
Jerry
2024-08-16 10:18:48 +08:00
parent d39f8a6875
commit 6af5c03650
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OrangeFormsOpen-VUE3/src/components/layout/index.vue
View File

@@ -339,7 +339,9 @@ const handleCommand = (command: string) => {
}); });
break; break;
case 'modifyPassword': case 'modifyPassword':
Dialog.show('修改密码', FormModifyPassword, { area: '500px' }, {}); Dialog.show('修改密码', FormModifyPassword, { area: '500px' }, {}).catch(e => {
console.warn(e);
});
break; break;
case 'modifyHeadImage': case 'modifyHeadImage':
Dialog.show('修改头像', FormModifyHeadImage, { area: '500px' }, {}); Dialog.show('修改头像', FormModifyHeadImage, { area: '500px' }, {});

3
OrangeFormsOpen-VUE3/src/online/components/OnlineCardTable.vue
View File

@@ -96,8 +96,7 @@ const handlerEditOperate = (row: ANY_OBJECT | null, res: ANY_OBJECT) => {
} else { } else {
console.log('更新记录', res, props, tableWidget); console.log('更新记录', res, props, tableWidget);
// 更新记录 // 更新记录
// TODO 为什么这里要重新赋值 row = res[props.widget.relation.variableName];
//row = res[props.widget.relation.variableName];
onTableDataListChange( onTableDataListChange(
tableWidget.dataList.map((item: ANY_OBJECT) => { tableWidget.dataList.map((item: ANY_OBJECT) => {
if (row != null && row.__cascade_add_id__ != null) { if (row != null && row.__cascade_add_id__ != null) {

2
OrangeFormsOpen-VUE3/src/pages/online/OnlinePageRender/hooks/useForm.ts
View File

@@ -419,7 +419,7 @@ export const useForm = (props: ANY_OBJECT, formRef: Ref<FormInstance> | null = n
if (dlgComponent == null) { if (dlgComponent == null) {
return Promise.reject(new Error('错误的操作组件！！！')); return Promise.reject(new Error('错误的操作组件！！！'));
} else { } else {
const thirdPath = 'thirdOnlineEditForm'; const thirdPath = `thirdOnlineEditForm${widget == null ? '' : '/' + widget.variableName}`;
operationCallback.value = callback; operationCallback.value = callback;
return Dialog.show( return Dialog.show(
formConfig.formName, formConfig.formName,