diff --git a/OrangeFormsOpen-VUE3/src/components/layout/index.vue b/OrangeFormsOpen-VUE3/src/components/layout/index.vue index 4f38d681..226e51cc 100644 --- a/OrangeFormsOpen-VUE3/src/components/layout/index.vue +++ b/OrangeFormsOpen-VUE3/src/components/layout/index.vue @@ -339,7 +339,9 @@ const handleCommand = (command: string) => { }); break; case 'modifyPassword': - Dialog.show('修改密码', FormModifyPassword, { area: '500px' }, {}); + Dialog.show('修改密码', FormModifyPassword, { area: '500px' }, {}).catch(e => { + console.warn(e); + }); break; case 'modifyHeadImage': Dialog.show('修改头像', FormModifyHeadImage, { area: '500px' }, {}); diff --git a/OrangeFormsOpen-VUE3/src/online/components/OnlineCardTable.vue b/OrangeFormsOpen-VUE3/src/online/components/OnlineCardTable.vue index 98d26666..430c494f 100644 --- a/OrangeFormsOpen-VUE3/src/online/components/OnlineCardTable.vue +++ b/OrangeFormsOpen-VUE3/src/online/components/OnlineCardTable.vue @@ -96,8 +96,7 @@ const handlerEditOperate = (row: ANY_OBJECT | null, res: ANY_OBJECT) => { } else { console.log('更新记录', res, props, tableWidget); // 更新记录 - // TODO 为什么这里要重新赋值 - //row = res[props.widget.relation.variableName]; + row = res[props.widget.relation.variableName]; onTableDataListChange( tableWidget.dataList.map((item: ANY_OBJECT) => { if (row != null && row.__cascade_add_id__ != null) { diff --git a/OrangeFormsOpen-VUE3/src/pages/online/OnlinePageRender/hooks/useForm.ts b/OrangeFormsOpen-VUE3/src/pages/online/OnlinePageRender/hooks/useForm.ts index ac957e63..9671ed53 100644 --- a/OrangeFormsOpen-VUE3/src/pages/online/OnlinePageRender/hooks/useForm.ts +++ b/OrangeFormsOpen-VUE3/src/pages/online/OnlinePageRender/hooks/useForm.ts @@ -419,7 +419,7 @@ export const useForm = (props: ANY_OBJECT, formRef: Ref | null = n if (dlgComponent == null) { return Promise.reject(new Error('错误的操作组件!!!')); } else { - const thirdPath = 'thirdOnlineEditForm'; + const thirdPath = `thirdOnlineEditForm${widget == null ? '' : '/' + widget.variableName}`; operationCallback.value = callback; return Dialog.show( formConfig.formName,