fix(cdk:form,comp:icon): fix suspected memory leak

IDuxFE · Feb 1, 2024 · 7ce35d7 · 7ce35d7
1 parent 2405527
commit 7ce35d7
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 2 deletions.
diff --git a/packages/cdk/forms/src/models/abstractControl.ts b/packages/cdk/forms/src/models/abstractControl.ts
@@ -24,7 +24,7 @@ import {
 
 import { isArray, isFunction, isNil, isPlainObject, isString } from 'lodash-es'
 
-import { convertArray } from '@idux/cdk/utils'
+import { convertArray, tryOnScopeDispose } from '@idux/cdk/utils'
 
 import {
   type AsyncValidatorFn,
@@ -608,6 +608,22 @@ export abstract class AbstractControl<T = any> {
     current.pristine = computed(() => !this._dirty.value)
     current.validated = computed(() => this._validated.value)
 
+    tryOnScopeDispose(() => {
+      current.controls = null
+      current.valueRef = null
+      current.errors = null
+      current.status = null
+      current.valid = null
+      current.invalid = null
+      current.validating = null
+      current.disabled = null
+      current.blurred = null
+      current.unblurred = null
+      current.dirty = null
+      current.pristine = null
+      current.validated = null
+    })
+
     if (this._disabledFn) {
       nextTick(() => {
         watchEffect(() => {

diff --git a/packages/components/icon/src/Icon.tsx b/packages/components/icon/src/Icon.tsx
@@ -5,7 +5,16 @@
  * found in the LICENSE file at https://github.com/IDuxFE/idux/blob/main/LICENSE
  */
 
-import { type CSSProperties, computed, defineComponent, normalizeClass, onMounted, ref, watch } from 'vue'
+import {
+  type CSSProperties,
+  computed,
+  defineComponent,
+  normalizeClass,
+  onBeforeUnmount,
+  onMounted,
+  ref,
+  watch,
+} from 'vue'
 
 import { convertCssPixel, isNumeric } from '@idux/cdk/utils'
 import { type IconConfig, useGlobalConfig } from '@idux/components/config'
@@ -24,6 +33,12 @@ export default defineComponent({
     const root = ref<HTMLElement>()
 
     onMounted(() => appendChild(props, config, root.value!))
+    onBeforeUnmount(() => {
+      if (root.value) {
+        clearSVGElement(root.value)
+        root.value = undefined
+      }
+    })
 
     watch([() => props.name, () => props.iconfont], () => {
       const rootElement = root.value