From 6af5c03650f30d7f4f7db80810a83fdfa2b4762a Mon Sep 17 00:00:00 2001
From: Jerry <707344974@qq.com>
Date: Fri, 16 Aug 2024 10:18:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E5=8F=96=E6=B6=88=E5=90=8E=E6=B2=A1=E6=9C=89catch?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OrangeFormsOpen-VUE3/src/components/layout/index.vue          | 4 +++-
 .../src/online/components/OnlineCardTable.vue                 | 3 +--
 .../src/pages/online/OnlinePageRender/hooks/useForm.ts        | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

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<FormInstance> | 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,