fix(form): remove field binding when deleting schema #471

vbenjs · Apr 19, 2021 · 38f5072 · 38f5072
1 parent b92b8a3
commit 38f5072
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
@@ -14,6 +14,7 @@
 
 - 修复黑暗主题刷新闪烁的白屏
 - 修复标签页关闭其他功能失效问题
+- 修复表单已知问题
 
 ## 2.3.0 (2021-04-10)
 

diff --git a/build/vite/plugin/index.ts b/build/vite/plugin/index.ts
@@ -16,7 +16,7 @@ import { configThemePlugin } from './theme';
 import { configImageminPlugin } from './imagemin';
 import { configWindiCssPlugin } from './windicss';
 import { configSvgIconsPlugin } from './svgSprite';
-// import { configHmrPlugin } from './hmr';
+import { configHmrPlugin } from './hmr';
 
 export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
   const {
@@ -35,7 +35,7 @@ export function createVitePlugins(viteEnv: ViteEnv, isBuild: boolean) {
   ];
 
   // TODO
-  // !isBuild && vitePlugins.push(configHmrPlugin());
+  !isBuild && vitePlugins.push(configHmrPlugin());
 
   // @vitejs/plugin-legacy
   VITE_LEGACY && isBuild && vitePlugins.push(legacy());

diff --git a/src/components/Form/src/hooks/useForm.ts b/src/components/Form/src/hooks/useForm.ts
@@ -77,8 +77,7 @@ export function useForm(props?: Props): UseFormReturnType {
     },
 
     removeSchemaByFiled: async (field: string | string[]) => {
-      const form = await getForm();
-      form.removeSchemaByFiled(field);
+      unref(formRef)?.removeSchemaByFiled(field);
     },
 
     // TODO promisify

diff --git a/src/components/Form/src/hooks/useFormEvents.ts b/src/components/Form/src/hooks/useFormEvents.ts
@@ -88,7 +88,9 @@ export function useFormEvents({
    */
   async function removeSchemaByFiled(fields: string | string[]): Promise<void> {
     const schemaList: FormSchema[] = cloneDeep(unref(getSchema));
-    if (!fields) return;
+    if (!fields) {
+      return;
+    }
 
     let fieldList: string[] = isString(fields) ? [fields] : fields;
     if (isString(fields)) {
@@ -107,6 +109,7 @@ export function useFormEvents({
     if (isString(field)) {
       const index = schemaList.findIndex((schema) => schema.field === field);
       if (index !== -1) {
+        delete formModel[field];
         schemaList.splice(index, 1);
       }
     }

diff --git a/src/components/Icon/README.md b/src/components/Icon/README.md