From 63cea84cfc5c92d9525cc212866b8c7dbbe85bad Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Fri, 11 Aug 2023 15:35:11 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90issues/675=E3=80=91=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5Popup=E5=BC=B9=E6=A1=86=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/modal/JPopupOnlReportModal.vue    |  6 +++++-
 .../JVxeCustom/src/components/JVxePopupCell.vue  | 15 ++++++++++-----
 src/components/jeecg/OnLine/hooks/usePopBiz.ts   | 16 ++++++++++++++--
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/components/Form/src/jeecg/components/modal/JPopupOnlReportModal.vue b/src/components/Form/src/jeecg/components/modal/JPopupOnlReportModal.vue
index 645ad95..80ca90e 100644
--- a/src/components/Form/src/jeecg/components/modal/JPopupOnlReportModal.vue
+++ b/src/components/Form/src/jeecg/components/modal/JPopupOnlReportModal.vue
@@ -101,7 +101,11 @@
       const toggleSearchStatus = ref(false);
       const attrs = useAttrs();
       const tableScroll = ref({ x: true });
-      const getBindValue = Object.assign({}, unref(props), unref(attrs));
+      // update-begin--author:liaozhiyang---date:20230811---for：【issues/675】子表字段Popup弹框数据不更新
+      const getBindValue = computed(() => {
+        return Object.assign({}, unref(props), unref(attrs));
+      });
+      // update-end--author:liaozhiyang---date:20230811---for：【issues/675】子表字段Popup弹框数据不更新
       const [
         {
           visibleChange,
diff --git a/src/components/JVxeCustom/src/components/JVxePopupCell.vue b/src/components/JVxeCustom/src/components/JVxePopupCell.vue
index e3144fd..5efe444 100644
--- a/src/components/JVxeCustom/src/components/JVxePopupCell.vue
+++ b/src/components/JVxeCustom/src/components/JVxePopupCell.vue
@@ -1,8 +1,8 @@
 <template>
-  <JPopup v-bind="popupProps" />
+  <JPopup v-bind="popupProps" @focus="handleFocus" />
 </template>
 <script lang="ts">
-  import { computed, defineComponent } from 'vue';
+  import { computed, defineComponent, ref } from 'vue';
   import { JPopup } from '/@/components/Form';
   import { JVxeComponent } from '/@/components/jeecg/JVxeTable/types';
   import { useJVxeComponent, useJVxeCompProps } from '/@/components/jeecg/JVxeTable/hooks';
@@ -15,7 +15,7 @@
     props: useJVxeCompProps(),
     setup(props: JVxeComponent.Props) {
       const { innerValue, row, originColumn, cellProps, handleChangeCommon } = useJVxeComponent(props);
-
+      const groupId = ref<string>('j-vxe-popup');
       const popupProps = computed(() => {
         return {
           ...cellProps,
@@ -25,7 +25,7 @@
           fieldConfig: originColumn.value.fieldConfig,
           // orgFields: originColumn.value.orgFields,
           // destFields: originColumn.value.destFields,
-          groupId: 'j-vxe-popup',
+          groupId: groupId.value,
           param: originColumn.value.params,
           sorter: originColumn.value.sorter,
           setFieldsValue: (values) => {
@@ -45,8 +45,13 @@
           },
         };
       });
-
+      // update-begin--author:liaozhiyang---date:20230811---for：【issues/675】子表字段Popup弹框数据不更新
+      const handleFocus = () => {
+        groupId.value = '';
+      };
+      // update-end--author:liaozhiyang---date:20230811---for：【issues/675】子表字段Popup弹框数据不更新
       return {
+        handleFocus,
         popupProps,
       };
     },
diff --git a/src/components/jeecg/OnLine/hooks/usePopBiz.ts b/src/components/jeecg/OnLine/hooks/usePopBiz.ts
index c533ff9..e8e70de 100644
--- a/src/components/jeecg/OnLine/hooks/usePopBiz.ts
+++ b/src/components/jeecg/OnLine/hooks/usePopBiz.ts
@@ -1,4 +1,4 @@
-import { reactive, ref, unref, defineAsyncComponent, toRaw, markRaw } from 'vue';
+import { reactive, ref, unref, defineAsyncComponent, toRaw, markRaw, isRef, watch, onUnmounted } from 'vue';
 import { httpGroupRequest } from '/@/components/Form/src/utils/GroupRequest';
 import { defHttp } from '/@/utils/http/axios';
 import { filterMultiDictText } from '/@/utils/dict/JDictSelectUtil.js';
@@ -9,7 +9,19 @@ import { useRouter, useRoute } from 'vue-router';
 import { useMethods } from '/@/hooks/system/useMethods';
 import { importViewsFile } from '/@/utils';
 
-export function usePopBiz(props, tableRef?) {
+export function usePopBiz(ob, tableRef?) {
+  // update-begin--author:liaozhiyang---date:20230811---for：【issues/675】子表字段Popup弹框数据不更新
+  let props: any;
+  if (isRef(ob)) {
+    props = ob.value;
+    const stopWatch = watch(ob, (newVal) => {
+      props = newVal;
+    });
+    onUnmounted(() => stopWatch());
+  } else {
+    props = ob;
+  }
+  // update-end--author:liaozhiyang---date:20230811---for：【issues/675】子表字段Popup弹框数据不更新
   const { createMessage } = useMessage();
   //弹窗可视状态
   const visible = ref(false);