From 36c6a65d225b88252095564a2a2fc557ea64cc54 Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Thu, 14 Nov 2024 14:51:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A8=E6=A0=BC=E7=9A=84=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=90=9C=E7=B4=A2=E6=97=A0=E6=B3=95=E5=9C=A8modal/dra?=
 =?UTF-8?q?wer=E4=B8=AD=E4=BD=BF=E7=94=A8=20https://gitee.com/dapppp/ruoyi?=
 =?UTF-8?q?-plus-vben5/issues/IB0960?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web-antd/src/views/system/post/index.vue |  4 +++-
 .../src/views/system/role-assign/index.vue    | 20 ++-----------------
 apps/web-antd/src/views/system/user/index.vue |  4 +++-
 apps/web-antd/src/views/tool/gen/index.vue    | 16 ++-------------
 .../plugins/src/vxe-table/use-vxe-grid.vue    | 10 ++--------
 5 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/apps/web-antd/src/views/system/post/index.vue b/apps/web-antd/src/views/system/post/index.vue
index 9daa9208..4cd4c52c 100644
--- a/apps/web-antd/src/views/system/post/index.vue
+++ b/apps/web-antd/src/views/system/post/index.vue
@@ -37,7 +37,9 @@ const formOptions: VbenFormProps = {
     // eslint-disable-next-line no-use-before-define
     const { formApi, reload } = tableApi;
     await formApi.resetForm();
-    await reload();
+    const formValues = formApi.form.values;
+    formApi.setLatestSubmissionValues(formValues);
+    await reload(formValues);
   },
 };
 
diff --git a/apps/web-antd/src/views/system/role-assign/index.vue b/apps/web-antd/src/views/system/role-assign/index.vue
index 8ba1fcfe..75a2a436 100644
--- a/apps/web-antd/src/views/system/role-assign/index.vue
+++ b/apps/web-antd/src/views/system/role-assign/index.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { Recordable } from '@vben/types';
 
-import { nextTick, ref } from 'vue';
+import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 
 import { Page, useVbenDrawer, type VbenFormProps } from '@vben/common-ui';
@@ -79,24 +79,8 @@ const [BasicTable, tableApi] = useVbenVxeGrid({
   },
 });
 
-const init = ref(true);
 const [RoleAssignDrawer, drawerApi] = useVbenDrawer({
   connectedComponent: roleAssignDrawer,
-  /**
-   * TODO: 等待官方修复
-   * 临时解决方案 for https://github.com/vbenjs/vue-vben-admin/issues/4752
-   * 通过在关闭时使用v-if切换来造成Modal的重新渲染
-   * 目前Modal逻辑为每次打开 内部的元素会重新mount 但是Modal本身不会重新渲染
-   * 该方案会造成关闭动画丢失(应该放在afterClose中)
-   * @param isOpen 是否打开
-   */
-  onOpenChange: async (isOpen) => {
-    if (!isOpen) {
-      init.value = false;
-      await nextTick();
-      init.value = true;
-    }
-  },
 });
 
 function handleAdd() {
@@ -172,6 +156,6 @@ function handleMultipleAuthCancel() {
         </Popconfirm>
       </template>
     </BasicTable>
-    <RoleAssignDrawer v-if="init" @reload="tableApi.query()" />
+    <RoleAssignDrawer @reload="tableApi.query()" />
   </Page>
 </template>
diff --git a/apps/web-antd/src/views/system/user/index.vue b/apps/web-antd/src/views/system/user/index.vue
index 01852fbc..7cf2652f 100644
--- a/apps/web-antd/src/views/system/user/index.vue
+++ b/apps/web-antd/src/views/system/user/index.vue
@@ -73,7 +73,9 @@ const formOptions: VbenFormProps = {
     // eslint-disable-next-line no-use-before-define
     const { formApi, reload } = tableApi;
     await formApi.resetForm();
-    await reload();
+    const formValues = formApi.form.values;
+    formApi.setLatestSubmissionValues(formValues);
+    await reload(formValues);
   },
   // 日期选择格式化
   fieldMappingTime: [
diff --git a/apps/web-antd/src/views/tool/gen/index.vue b/apps/web-antd/src/views/tool/gen/index.vue
index 4909881b..699343f4 100644
--- a/apps/web-antd/src/views/tool/gen/index.vue
+++ b/apps/web-antd/src/views/tool/gen/index.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { Recordable } from '@vben/types';
 
-import { nextTick, onMounted, ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useRouter } from 'vue-router';
 
 import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
@@ -182,20 +182,8 @@ function handleMultiDelete() {
   });
 }
 
-const init = ref(true);
 const [TableImportModal, tableImportModalApi] = useVbenModal({
   connectedComponent: tableImportModal,
-  /**
-   * TODO: 等待官方修复
-   * 临时解决方案 for https://github.com/vbenjs/vue-vben-admin/issues/4752
-   * 通过在关闭时使用v-if切换来造成Modal的重新渲染
-   * 目前Modal逻辑为每次打开 内部的元素会重新mount 但是Modal本身不会重新渲染
-   */
-  async onClosed() {
-    init.value = false;
-    await nextTick();
-    init.value = true;
-  },
 });
 
 function handleImport() {
@@ -298,6 +286,6 @@ function handleImport() {
       </template>
     </BasicTable>
     <CodePreviewModal />
-    <TableImportModal v-if="init" @reload="tableApi.query()" />
+    <TableImportModal @reload="tableApi.query()" />
   </Page>
 </template>
diff --git a/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue b/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
index 547d32d3..642ef114 100644
--- a/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
+++ b/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
@@ -229,14 +229,8 @@ async function init() {
   }
   props.api?.setState?.({ gridOptions: defaultGridOptions });
   // form 由 vben-form 代替，所以需要保证query相关事件可以拿到参数
-  extendProxyOptions(
-    props.api,
-    defaultGridOptions,
-    () =>
-      // 这里默认是readonly的  需要深拷贝才能进行修改操作
-      cloneDeep(formApi.form.values),
-    // 这里的提交记录有很大问题 表单不能被重置
-    // formApi.getLatestSubmissionValues(),
+  extendProxyOptions(props.api, defaultGridOptions, () =>
+    formApi.getLatestSubmissionValues(),
   );
 }