Merge pull request #1388 from alibaba/fix-preserve

Fix preserve
alibaba · Sep 20, 2023 · 26f7f1b · 26f7f1b · vercel · Sep 20, 2023
2 parents 3d1173e + 98d38e1
commit 26f7f1b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/packages/form-render/CHANGELOG.md b/packages/form-render/CHANGELOG.md
@@ -1,7 +1,9 @@
 # 更新日志
 
+### 2.2.14
+- [!] 修复 List 嵌套下 输入控件被隐藏，提交数据值还能被获取
 ### 2.2.13
-- [!] 修复 list 嵌套 list 组件自身函数表达式不生效
+- [!] 修复 List 嵌套 list 组件自身函数表达式不生效
 ### 2.2.9
 - [!] 修复 schema 依赖更新异常
 ### 2.2.8

diff --git a/packages/form-render/package.json b/packages/form-render/package.json
@@ -1,6 +1,6 @@
 {
   "name": "form-render",
-  "version": "2.2.14-beta.2",
+  "version": "2.2.15",
   "description": "通过 JSON Schema 生成标准 Form，常用于自定义搭建配置界面生成",
   "keywords": [
     "Form",

diff --git a/packages/form-render/src/form-core/index.tsx b/packages/form-render/src/form-core/index.tsx
@@ -169,9 +169,9 @@ const FormCore:FC<FRProps> = (props) => {
       ? await beforeFinish({ data: values, schema, errors: [] })
       : null;
 
-    // console.log(values, form.getValues(true));
+    // console.log(values, form.getValues(true), _values);
     // Stop submit
-    if (fieldsError) {
+    if (fieldsError?.length > 0) {
       form.setFields(fieldsError);
       return;
     }
@@ -211,6 +211,7 @@ const FormCore:FC<FRProps> = (props) => {
       onFinish={handleFinish}
       onFinishFailed={handleFinishFailed}
       onValuesChange={handleValuesChange}
+      preserve={!removeHiddenData}
     >
       <Row gutter={displayType === 'row' ? 16 : 24}>
         <RenderCore schema={schema} />

diff --git a/packages/table-render/package.json b/packages/table-render/package.json
@@ -1,6 +1,6 @@
 {
   "name": "table-render",
-  "version": "2.1.2-beta.2",
+  "version": "2.1.2",
   "description": "中后台表格解决方案",
   "keywords": [
     "TableRender",
@@ -42,7 +42,7 @@
   "dependencies": {
     "@ant-design/icons": "^5.1.4",
     "dayjs": "^1.11.7",
-    "form-render": "2.2.14-beta.2",
+    "form-render": "^2.2.15",
     "lodash.get": "^4.4.2",
     "lodash.omit": "^4.4.2",
     "lodash.defaults": "^4.2.0",