Merge branch 'master' into schema-err

alibaba · Sep 21, 2023 · c7a990c · c7a990c
2 parents 67b2299 + 26f7f1b
commit c7a990c
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 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.1",
+  "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.1",
+  "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.1.26",
+    "form-render": "^2.2.15",
     "lodash.get": "^4.4.2",
     "lodash.omit": "^4.4.2",
     "lodash.defaults": "^4.2.0",

diff --git a/tools/schema-builder/package.json b/tools/schema-builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@xrenders/schema-builder",
-  "version": "1.0.0-alpha.8",
+  "version": "1.0.0-alpha.9",
   "description": "通过 JSON Schema 生成标准 Form，常用于自定义搭建配置界面生成",
   "keywords": [
     "Form",

diff --git a/tools/schema-builder/src/createIframe.ts b/tools/schema-builder/src/createIframe.ts
@@ -11,7 +11,7 @@ const createIframeContent = () => {
         <link href="https://alifd.alicdn.com/npm/@alifd/[email protected]/dist/next.var.min.css" rel="stylesheet" />
         <link rel="stylesheet" href="https://uipaas-assets.com/prod/npm/@alilc/lowcode-engine/1.1.11-beta.8/dist/css/engine-core.css" />
         <link rel="stylesheet" href="https://uipaas-assets.com/prod/npm/@alilc/lowcode-engine-ext/1.0.6/dist/css/engine-ext.css" />
-        <link rel="stylesheet" href="https://g.alicdn.com/fone-lowcode/fr-generator/1.0.8/css/index.css" />
+        <link rel="stylesheet" href="https://g.alicdn.com/fone-lowcode/fr-generator/1.0.9/css/index.css" />
 
         <script>
           window.React = window.parent.React;
@@ -30,7 +30,7 @@ const createIframeContent = () => {
 
       <body>
         <div id="lce-container"></div>
-        <script type="text/javascript" src="https://g.alicdn.com/fone-lowcode/fr-generator/1.0.8/js/index.js"></script>
+        <script type="text/javascript" src="https://g.alicdn.com/fone-lowcode/fr-generator/1.0.9/js/index.js"></script>
       </body>
     </html>
   `;