From 7b24385a08201ea577dca72fcfded76843c03604 Mon Sep 17 00:00:00 2001
From: Jerry <707344974@qq.com>
Date: Wed, 14 Aug 2024 11:09:28 +0800
Subject: [PATCH] =?UTF-8?q?commit=EF=BC=9A=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/online/components/OnlineCustomUpload.vue       |  7 +++++++
 .../src/online/components/OnlineCustomWidget.vue       | 10 +++++++---
 .../src/pages/online/OnlinePageRender/hooks/useForm.ts |  5 ++---
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/OrangeFormsOpen-VUE3/src/online/components/OnlineCustomUpload.vue b/OrangeFormsOpen-VUE3/src/online/components/OnlineCustomUpload.vue
index 6cb7c1c4..c796727d 100644
--- a/OrangeFormsOpen-VUE3/src/online/components/OnlineCustomUpload.vue
+++ b/OrangeFormsOpen-VUE3/src/online/components/OnlineCustomUpload.vue
@@ -170,6 +170,13 @@ const uploadWidgetImpl = reactive(
 
 const getDisabledStatus = () => {
   if (form().isEdit) return true;
+  let formWidgetAuth: ANY_OBJECT | null = null;
+  if (form().formAuth) {
+    formWidgetAuth = form().formAuth();
+    if (formWidgetAuth != null) {
+      formWidgetAuth = formWidgetAuth.pc[pps.widget.variableName];
+    }
+  }
   return props.widget.props.disabled;
 };
 
diff --git a/OrangeFormsOpen-VUE3/src/online/components/OnlineCustomWidget.vue b/OrangeFormsOpen-VUE3/src/online/components/OnlineCustomWidget.vue
index 786e86e2..e9d17f80 100644
--- a/OrangeFormsOpen-VUE3/src/online/components/OnlineCustomWidget.vue
+++ b/OrangeFormsOpen-VUE3/src/online/components/OnlineCustomWidget.vue
@@ -355,9 +355,13 @@ const getWidgetProps = computed(() => {
 });
 
 const getDisabledStatus = () => {
-  const formWidgetAuth: ANY_OBJECT | null = form().formAuth
-    ? form().formAuth().pc[pps.widget.variableName]
-    : null;
+  let formWidgetAuth: ANY_OBJECT | null = null;
+  if (form().formAuth) {
+    formWidgetAuth = form().formAuth();
+    if (formWidgetAuth != null) {
+      formWidgetAuth = formWidgetAuth.pc[pps.widget.variableName];
+    }
+  }
   if (formWidgetAuth && formWidgetAuth.disabled) return true;
   return pps.widget.props.disabled;
 };
diff --git a/OrangeFormsOpen-VUE3/src/pages/online/OnlinePageRender/hooks/useForm.ts b/OrangeFormsOpen-VUE3/src/pages/online/OnlinePageRender/hooks/useForm.ts
index ab8cdd1d..769e1bf3 100644
--- a/OrangeFormsOpen-VUE3/src/pages/online/OnlinePageRender/hooks/useForm.ts
+++ b/OrangeFormsOpen-VUE3/src/pages/online/OnlinePageRender/hooks/useForm.ts
@@ -143,9 +143,8 @@ export const useForm = (props: ANY_OBJECT, formRef: Ref<FormInstance> | null = n
     }
   };
   const getWidgetVisible = widget => {
-    const formWidgetAuth: ANY_OBJECT | null = formAuth.value
-      ? formAuth.value.pc[widget.variableName]
-      : null;
+    const formWidgetAuth: ANY_OBJECT | null =
+      formAuth.value && formAuth.value.pc ? formAuth.value.pc[widget.variableName] : null;
     if (formWidgetAuth && formWidgetAuth.hide) return false;
     return true;
   };