fix: 修复问题

JackySoft · Nov 1, 2024 · 2334268 · 2334268
1 parent 32fe9f3
commit 2334268
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 5 deletions.
diff --git a/packages/editor/src/packages/Container/Form/Form.tsx b/packages/editor/src/packages/Container/Form/Form.tsx
@@ -78,6 +78,7 @@ const MForm = ({ id, type, config, elements, onFinish, onChange }: ComponentType
         setFormData({
           name: id,
           value: form.getFieldsValue(),
+          type: 'override',
         });
       },
       submit() {
@@ -98,6 +99,7 @@ const MForm = ({ id, type, config, elements, onFinish, onChange }: ComponentType
         setFormData({
           name: id,
           value: initData,
+          type: 'override',
         });
       },
       getFormData(key: string) {

diff --git a/packages/editor/src/packages/Scene/SearchForm/SearchForm.tsx b/packages/editor/src/packages/Scene/SearchForm/SearchForm.tsx
@@ -87,6 +87,7 @@ const SearchForm = ({ id, type, config, elements, onSearch, onChange, onReset }:
     setFormData({
       name: id,
       value: values,
+      type: 'override',
     });
   };
 
@@ -113,6 +114,7 @@ const SearchForm = ({ id, type, config, elements, onSearch, onChange, onReset }:
       setFormData({
         name: id,
         value: form.getFieldsValue(),
+        type: 'override',
       });
     },
     submit() {
@@ -124,6 +126,7 @@ const SearchForm = ({ id, type, config, elements, onSearch, onChange, onReset }:
       setFormData({
         name: id,
         value: initData,
+        type: 'override',
       });
     },
     getFormData(key: string) {

diff --git a/packages/editor/src/stores/pageStore.ts b/packages/editor/src/stores/pageStore.ts
@@ -488,10 +488,14 @@ export const usePageStore = create<PageState & PageAction>((set) => ({
       }),
     );
   },
-  setFormData({ name, value }: any) {
+  setFormData({ name, value, type }: any) {
     set(
       produce((state) => {
-        state.page.formData[name] = { ...state.page.formData[name], ...value };
+        if (type === 'override') {
+          state.page.formData[name] = value;
+        } else {
+          state.page.formData[name] = { ...state.page.formData[name], ...value };
+        }
       }),
     );
   },

diff --git a/packages/materials/Container/Form/Form.tsx b/packages/materials/Container/Form/Form.tsx
@@ -52,6 +52,7 @@ const MForm = ({ id, config, elements, onFinish, onChange }: ComponentType, ref:
         setFormData({
           name: id,
           value: form.getFieldsValue(),
+          type: 'override',
         });
       },
       submit() {
@@ -72,6 +73,7 @@ const MForm = ({ id, config, elements, onFinish, onChange }: ComponentType, ref:
         setFormData({
           name: id,
           value: initData,
+          type: 'override',
         });
       },
       getFormData(key: string) {

diff --git a/packages/materials/Scene/MarsTable/MarsTable.tsx b/packages/materials/Scene/MarsTable/MarsTable.tsx
@@ -317,6 +317,7 @@ const MarsTable = ({ config, elements, onCheckedChange }: ComponentType<IConfig>
                       btnTxt = '解析异常';
                     }
                   }
+                  if (btnTxt === '') return;
                   return (
                     <AuthButton
                       key={btn.eventName}

diff --git a/packages/materials/Scene/SearchForm/SearchForm.tsx b/packages/materials/Scene/SearchForm/SearchForm.tsx
@@ -55,12 +55,12 @@ const SearchForm = ({ id, type, config, elements, onSearch, onChange, onReset }:
   // 重置表单
   const handleReset = () => {
     form.resetFields();
-    onReset && onReset();
     const values = form.getFieldsValue();
     onReset && onReset(dateFormat(elements, values));
     setFormData({
       name: id,
       value: values,
+      type: 'override',
     });
   };
 
@@ -86,6 +86,7 @@ const SearchForm = ({ id, type, config, elements, onSearch, onChange, onReset }:
       setFormData({
         name: id,
         value: form.getFieldsValue(),
+        type: 'override',
       });
     },
     submit() {

diff --git a/packages/materials/stores/pageStore.ts b/packages/materials/stores/pageStore.ts
@@ -131,10 +131,14 @@ export const usePageStore = create<PageState & PageAction>((set) => ({
       }),
     );
   },
-  setFormData({ name, value }: any) {
+  setFormData({ name, value, type }: any) {
     set(
       produce((state) => {
-        state.page.formData[name] = { ...state.page.formData[name], ...value };
+        if (type === 'override') {
+          state.page.formData[name] = value;
+        } else {
+          state.page.formData[name] = { ...state.page.formData[name], ...value };
+        }
       }),
     );
   },