fix: when the form is destroyed, the form parameters still exist (vbe…

…njs#4834) * fix: when the form is destroyed, the form parameters still exist * chore: update deps
zhuizhubf · Nov 7, 2024 · 8f1e397 · 8f1e397
1 parent dcdebaf
commit 8f1e397
Show file tree

Hide file tree

Showing 9 changed files with 159 additions and 154 deletions.
diff --git a/docs/src/components/common-ui/vben-vxe-table.md b/docs/src/components/common-ui/vben-vxe-table.md
@@ -224,8 +224,6 @@ useVbenVxeGrid 返回的第二个参数，是一个对象，包含了一些表
 | grid | vxe-table grid实例 | `VxeGridInstance` |
 | formApi | vbenForm api实例 | `FormApi` |
 
-### Props
-
 ## Props
 
 所有属性都可以传入 `useVbenVxeGrid` 的第一个参数中。

diff --git a/docs/src/en/guide/essentials/styles.md b/docs/src/en/guide/essentials/styles.md
@@ -72,7 +72,7 @@ const { b, e, is } = useNamespace('menu');
 </template>
 <style lang="scss" scoped>
 // If you use it within the application, this line of code can be omitted as it has already been globally introduced in all applications
-@import '@vben/styles/global';
+@use '@vben/styles/global' as *;
 @include b('menu') {
   color: black;
 

diff --git a/docs/src/guide/essentials/styles.md b/docs/src/guide/essentials/styles.md
@@ -72,7 +72,7 @@ const { b, e, is } = useNamespace('menu');
 </template>
 <style lang="scss" scoped>
 // 如果你在应用内使用，这行代码可以省略，已经在所有的应用内全局引入了
-@import '@vben/styles/global';
+@use '@vben/styles/global' as *;
 @include b('menu') {
   color: black;
 

diff --git a/internal/vite-config/src/config/application.ts b/internal/vite-config/src/config/application.ts
@@ -109,7 +109,7 @@ function createCssOptions(injectGlobalScss = true) {
               const relativePath = relative(root, filepath);
               // apps下的包注入全局样式
               if (relativePath.startsWith(`apps${path.sep}`)) {
-                return `@import "@vben/styles/global";\n${content}`;
+                return `@use "@vben/styles/global" as *;\n${content}`;
               }
               return content;
             },

diff --git a/packages/@core/ui-kit/form-ui/src/form-api.ts b/packages/@core/ui-kit/form-ui/src/form-api.ts
@@ -253,6 +253,7 @@ export class FormApi {
   }
 
   unmount() {
+    this.form?.resetForm?.();
     // this.state = null;
     this.isMounted = false;
     this.stateHandler.reset();

diff --git a/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue b/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
@@ -11,6 +11,7 @@ import {
   computed,
   nextTick,
   onMounted,
+  onUnmounted,
   toRaw,
   useSlots,
   useTemplateRef,
@@ -256,6 +257,11 @@ onMounted(() => {
   props.api?.mount?.(gridRef.value, formApi);
   init();
 });
+
+onUnmounted(() => {
+  formApi?.unmount?.();
+  props.api?.unmount?.();
+});
 </script>
 
 <template>

diff --git a/packages/styles/src/global/index.scss b/packages/styles/src/global/index.scss
@@ -1 +1 @@
-@import '@vben-core/design/bem';
+@use '@vben-core/design/bem' as *;
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		@import '@vben-core/design/bem';
		@use '@vben-core/design/bem' as *;