From ac71f5f02f40f25d9ad0e6fa3224eb96eb75bbe9 Mon Sep 17 00:00:00 2001 From: wb-hbc831417 Date: Fri, 4 Mar 2022 15:49:50 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix:=20table-render=20=E4=B8=AD=E7=9A=84=20?= =?UTF-8?q?Search=20=E4=B8=8D=E9=9C=80=E8=A6=81=20form=20=E5=B1=9E?= =?UTF-8?q?=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/table-render/src/interface.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/table-render/src/interface.ts b/packages/table-render/src/interface.ts index 81ecf2001..1db0df082 100644 --- a/packages/table-render/src/interface.ts +++ b/packages/table-render/src/interface.ts @@ -68,7 +68,7 @@ export interface TableState { } // TODO这里FR的props应该去FR里写，这里继承就好了 -export interface SearchProps extends FRProps { +export interface SearchProps extends Omit { debug?: boolean; searchBtnStyle?: React.CSSProperties; searchBtnClassName?: string; From 2f864caec98cbd32e603b5d4980cee6f7d1b386c Mon Sep 17 00:00:00 2001 From: F-loat Date: Fri, 4 Mar 2022 16:07:28 +0800 Subject: [PATCH 2/8] =?UTF-8?q?docs(fr):=20=E4=BF=AE=E5=A4=8D=E6=97=A7?= =?UTF-8?q?=E7=89=88=20schema=20=E8=BD=AC=E6=8D=A2=E5=99=A8=20close=20#684?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/form-render/migrate.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/form-render/migrate.md b/docs/form-render/migrate.md index 5ee0a02a2..3cbf28b8d 100644 --- a/docs/form-render/migrate.md +++ b/docs/form-render/migrate.md @@ -188,7 +188,7 @@ const MyWidget = props => { ```jsx import React, { useState } from 'react'; import { Input, Button } from 'antd'; -import { updateSchemaToNewVersion } from 'form-render/src/utils.js'; +import { updateSchemaToNewVersion } from 'form-render/src/form-render-core/src/utils.js'; const TextArea = Input.TextArea; From 481cf4b81cb251b80b38296773b87264a68d5f71 Mon Sep 17 00:00:00 2001 From: F-loat Date: Wed, 9 Mar 2022 15:19:32 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat(fr):=20=E5=A4=8D=E6=9D=82=E5=B5=8C?= =?UTF-8?q?=E5=A5=97=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=B1=95=E7=A4=BA=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RenderChildren/RenderList/DrawerList.js | 58 +++++++++++-------- .../src/form-render-core/src/utils.js | 5 +- 2 files changed, 37 insertions(+), 26 deletions(-) diff --git a/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/DrawerList.js b/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/DrawerList.js index 752fa656f..7e481bf7f 100644 --- a/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/DrawerList.js +++ b/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/DrawerList.js @@ -1,7 +1,7 @@ /* eslint-disable jsx-a11y/anchor-is-valid */ import React, { useRef } from 'react'; import Core from '../../index'; -import { useSet } from '../../../hooks'; +import { useSet, useTools } from '../../../hooks'; import { getDataPath, getKeyFromPath, getDisplayValue } from '../../../utils'; import { Button, Table, Drawer, Popconfirm } from 'antd'; // import ArrowDown from '../../../components/ArrowDown'; @@ -25,6 +25,7 @@ const DrawerList = ({ changeList, listData, }) => { + const { widgets } = useTools(); const { props = {}, itemProps = {} } = schema; const { buttons, ...columnProps } = itemProps; const { pagination = {}, ...rest } = props; @@ -66,9 +67,16 @@ const DrawerList = ({ const childPath = getDataPath(child, [record.$idx]); const errorObj = errorFields.find(item => item.name == childPath) || {}; //TODO: 万一error在更深的层，这个办法是find不到的，会展示那一行没有提示。可以整一行加一个红线的方式处理 + const Widget = widgets[schema.readOnlyWidget]; return (
-
{getDisplayValue(value, schema)}
+
+ {Widget ? ( + + ) : ( + getDisplayValue(value, schema) + ) + }
{errorObj.error && ( )} @@ -147,34 +155,34 @@ const DrawerList = ({ )} {Array.isArray(props.buttons) ? props.buttons.map((item, idx) => { - const { callback, text, html } = item; - let onClick = () => { - console.log({ + const { callback, text, html } = item; + let onClick = () => { + console.log({ + value: listData, + onChange: changeList, + schema, + }); + }; + if (typeof window[callback] === 'function') { + onClick = () => { + window[callback]({ value: listData, onChange: changeList, schema, }); }; - if (typeof window[callback] === 'function') { - onClick = () => { - window[callback]({ - value: listData, - onChange: changeList, - schema, - }); - }; - } - return ( - - ); - }) + } + return ( + + ); + }) : null}
{ return value; } } - return JSON.stringify(value); + if (typeof value === 'object') { + return JSON.stringify(value); + } + return value; }; // 去掉数组里的空元素 {a: [null, {x:1}]} => {a: [{x:1}]} From 6705898047e846f3c06c8933d38eaa14d05c52c0 Mon Sep 17 00:00:00 2001 From: F-loat Date: Tue, 15 Mar 2022 15:43:08 +0800 Subject: [PATCH 4/8] =?UTF-8?q?chore:=20=E4=BB=A3=E7=A0=81=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RenderChildren/RenderList/DrawerList.js | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/DrawerList.js b/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/DrawerList.js index 7e481bf7f..689e535d6 100644 --- a/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/DrawerList.js +++ b/packages/form-render/src/form-render-core/src/core/RenderChildren/RenderList/DrawerList.js @@ -75,8 +75,8 @@ const DrawerList = ({ ) : ( getDisplayValue(value, schema) - ) - } + )} + {errorObj.error && ( )} @@ -155,34 +155,34 @@ const DrawerList = ({ )} {Array.isArray(props.buttons) ? props.buttons.map((item, idx) => { - const { callback, text, html } = item; - let onClick = () => { - console.log({ - value: listData, - onChange: changeList, - schema, - }); - }; - if (typeof window[callback] === 'function') { - onClick = () => { - window[callback]({ + const { callback, text, html } = item; + let onClick = () => { + console.log({ value: listData, onChange: changeList, schema, }); }; - } - return ( - - ); - }) + if (typeof window[callback] === 'function') { + onClick = () => { + window[callback]({ + value: listData, + onChange: changeList, + schema, + }); + }; + } + return ( + + ); + }) : null} Date: Tue, 15 Mar 2022 16:59:49 +0800 Subject: [PATCH 5/8] feat(md):update README.md --- README.md | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/README.md b/README.md index 3c6dba543..ee7a20fe4 100755 --- a/README.md +++ b/README.md @@ -117,6 +117,47 @@ width="160" /> + + + + + + + + + + + + + + + + + + + + + + + From 41ef5cfe9eeb081b570e4eeaf99a6cce7cbdedc7 Mon Sep 17 00:00:00 2001 From: 0027020481 Date: Wed, 16 Mar 2022 21:42:33 +0800 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20SchemaBase=E6=B7=BB=E5=8A=A0column?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/form-render/src/index.d.ts | 1 + packages/form-render/src/schema.d.ts | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/form-render/src/index.d.ts b/packages/form-render/src/index.d.ts index 7ea66ebce..6b701e7da 100644 --- a/packages/form-render/src/index.d.ts +++ b/packages/form-render/src/index.d.ts @@ -33,6 +33,7 @@ interface SchemaBase { displayType: 'row' | 'column'; width: string; labelWidth: number | string; + column: number; className: string; widget: string; readOnlyWidget: string; diff --git a/packages/form-render/src/schema.d.ts b/packages/form-render/src/schema.d.ts index c0718cba5..19b04860a 100644 --- a/packages/form-render/src/schema.d.ts +++ b/packages/form-render/src/schema.d.ts @@ -32,6 +32,7 @@ interface SchemaBase { displayType: 'row' | 'column'; width: string; labelWidth: number | string; + column: number; className: string; widget: string; readOnlyWidget: string; From ebae8c7635db8a8a133768fda989f82c829ada7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=91=E5=A4=95?= Date: Sat, 19 Mar 2022 21:30:44 +0800 Subject: [PATCH 7/8] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ee7a20fe4..428c8f8ed 100755 --- a/README.md +++ b/README.md @@ -175,6 +175,8 @@ 想贡献代码、解 BUG 或者提高文档可读性？非常欢迎一起参与进来，在提交 PR 前阅读一下 [Contributing Guide](https://github.com/alibaba/form-render/blob/master/CONTRIBUTING.md)。 +![Alt](https://repobeats.axiom.co/api/embed/2b2e9f5fdcdddeea164ef615d55816d8c2d2dc66.svg "Repobeats analytics image") + 感谢给 XRender 贡献代码的你们： From e49d933e11cae6610cc05136b9fec048c021fb07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=80=9D=E7=BF=8A?= Date: Tue, 22 Mar 2022 11:23:33 +0800 Subject: [PATCH 8/8] Update issue templates --- .github/ISSUE_TEMPLATE/bug-report.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index ce60e4cfc..761b66fdf 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -7,7 +7,7 @@ assignees: siyi98 --- ----