From df1a950e3757ac3d760ffbb41b26e83d61ce8385 Mon Sep 17 00:00:00 2001 From: siyi98 Date: Sat, 5 Feb 2022 16:30:44 +0800 Subject: [PATCH 1/9] =?UTF-8?q?feat(tr):searchText=E5=92=8CresetText?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB=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/CHANGELOG.md | 4 ++++ packages/table-render/src/interface.ts | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/table-render/CHANGELOG.md b/packages/table-render/CHANGELOG.md index ab083b351..75850a99d 100644 --- a/packages/table-render/CHANGELOG.md +++ b/packages/table-render/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +### 1.2.1 + +- [+] `searchText`和`resetText`属性为非必填属性。 + ### 1.2.0 - [+] `Search` 组件新增`searchText`和`resetText`属性，支持自定义`搜索/重置`按钮文本。 diff --git a/packages/table-render/src/interface.ts b/packages/table-render/src/interface.ts index 799e48e75..79a0f0d7f 100644 --- a/packages/table-render/src/interface.ts +++ b/packages/table-render/src/interface.ts @@ -83,8 +83,8 @@ export interface SearchProps { submit: Function, clearSearch: Function ) => React.ReactNode[]; - searchText: string; - resetText: string; + searchText?: string; + resetText?: string; onSearch?: (search: any) => any; afterSearch?: (params: any) => any; widgets?: any; From 79296aeda565a9c11b22b7238c51323b24786133 Mon Sep 17 00:00:00 2001 From: siyi98 Date: Sat, 5 Feb 2022 16:30:52 +0800 Subject: [PATCH 2/9] 0.0.1 --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 6656ed83c..6e3857902 100644 --- a/package.json +++ b/package.json @@ -51,5 +51,6 @@ "url": "git+https://github.com/alibaba/x-render.git", "branch": "master", "platform": "github" - } + }, + "version": "0.0.1" } From 64c38cc5c271804f77845cebd8af05718785b290 Mon Sep 17 00:00:00 2001 From: siyi98 Date: Sat, 5 Feb 2022 16:31:49 +0800 Subject: [PATCH 3/9] feat(tr):v1.2.1 --- package.json | 3 +-- packages/table-render/package.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 6e3857902..6656ed83c 100644 --- a/package.json +++ b/package.json @@ -51,6 +51,5 @@ "url": "git+https://github.com/alibaba/x-render.git", "branch": "master", "platform": "github" - }, - "version": "0.0.1" + } } diff --git a/packages/table-render/package.json b/packages/table-render/package.json index 4a2b3bb25..2baa2d7cc 100644 --- a/packages/table-render/package.json +++ b/packages/table-render/package.json @@ -1,6 +1,6 @@ { "name": "table-render", - "version": "1.2.0", + "version": "1.2.1", "description": "中后台表格解决方案", "scripts": { "start": "dumi dev", From 56dc4aba874a62707ff13cf6139055983c69cd29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=92=E8=A8=80?= Date: Tue, 15 Feb 2022 14:40:07 +0800 Subject: [PATCH 4/9] =?UTF-8?q?fix:=20#382=20=E6=97=A5=E6=9C=9F=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91=20(#669)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/form-render/src/widgets/antd/date.js | 40 ++++++++++--------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/packages/form-render/src/widgets/antd/date.js b/packages/form-render/src/widgets/antd/date.js index f8eab4fc1..db98ae066 100644 --- a/packages/form-render/src/widgets/antd/date.js +++ b/packages/form-render/src/widgets/antd/date.js @@ -1,36 +1,40 @@ -import React from 'react'; +import React, { useMemo } from 'react'; import moment from 'moment'; import { DatePicker } from 'antd'; import { getFormat } from '../../utils'; -// TODO: 不要使用moment，使用dayjs +// TODO: 不要使用 moment，使用 dayjs export default ({ onChange, format, value, style, ...rest }) => { const dateFormat = getFormat(format); - // week的时候会返回 2020-31周 quarter会返回 2020-Q2 需要处理之后才能被 moment - let _value = value || undefined; - if (typeof _value === 'string') { - if (format === 'week') { - _value = _value ? _value.substring(0, _value.length - 1) : _value; + + const valueObj = useMemo(() => { + // week 的时候会返回 2020-31周 quarter 会返回 2020-Q2 需要处理之后才能被 moment + let _value = value || undefined; + if (typeof _value === 'string') { + if (format === 'week') { + _value = _value ? _value.substring(0, _value.length - 1) : _value; + } + if (format === 'quarter') { + _value = _value.replace('Q', ''); + } } - if (format === 'quarter') { - _value = _value.replace('Q', ''); + if (_value) { + _value = moment(_value, dateFormat); } - } - if (_value) { - _value = moment(_value, dateFormat); - } + return _value + }, [value]); const handleChange = (value, string) => { onChange(string); }; - let dateParams = { - value: _value, + const dateParams = { + value: valueObj, style: { width: '100%', ...style }, onChange: handleChange, }; - // TODO: format是在options里自定义的情况，是否要判断一下要不要showTime + // TODO: format 是在 options 里自定义的情况，是否要判断一下要不要 showTime if (format === 'dateTime') { dateParams.showTime = true; } @@ -39,11 +43,9 @@ export default ({ onChange, format, value, style, ...rest }) => { dateParams.picker = format; } - dateParams = { ...dateParams, ...rest }; - if (dateFormat === format) { dateParams.format = format; } - return ; + return ; }; From 15c29370aeeb3117691a0c931a31ae2ae3a18494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=92=E8=A8=80?= Date: Wed, 16 Feb 2022 16:52:28 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix(generator):=20=E5=B1=9E=E6=80=A7?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8=E5=8D=95=20(#670)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/schema-generator/src/components/Settings/ItemSettings.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/schema-generator/src/components/Settings/ItemSettings.jsx b/tools/schema-generator/src/components/Settings/ItemSettings.jsx index ea9421df1..2d845a6dd 100644 --- a/tools/schema-generator/src/components/Settings/ItemSettings.jsx +++ b/tools/schema-generator/src/components/Settings/ItemSettings.jsx @@ -131,7 +131,6 @@ export default function ItemSettings({ widgets }) {
Date: Mon, 21 Feb 2022 14:08:36 +0800 Subject: [PATCH 6/9] =?UTF-8?q?chore(tr):valueType=E5=85=BC=E5=AE=B9object?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/table-render/src/components/field.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/table-render/src/components/field.tsx b/packages/table-render/src/components/field.tsx index 83a2c2a60..5ffd0ff50 100644 --- a/packages/table-render/src/components/field.tsx +++ b/packages/table-render/src/components/field.tsx @@ -68,6 +68,9 @@ export const renderCode = (code: string) => { // 渲染单元格 export const renderDom = (val: string, item: any) => { + if (typeof item.val === 'object') { + return; + } if (item.valueType === 'code') { return renderCode(val); } From 6010f6355fd84395723e992defc9da7c0a2b6719 Mon Sep 17 00:00:00 2001 From: siyi98 Date: Mon, 21 Feb 2022 14:09:29 +0800 Subject: [PATCH 7/9] chore(tr):v1.2.2 --- packages/table-render/CHANGELOG.md | 4 ++++ packages/table-render/package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/table-render/CHANGELOG.md b/packages/table-render/CHANGELOG.md index 75850a99d..62032e490 100644 --- a/packages/table-render/CHANGELOG.md +++ b/packages/table-render/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +### 1.2.2 + +- [+] `valueType`兼容`object`值类型。 + ### 1.2.1 - [+] `searchText`和`resetText`属性为非必填属性。 diff --git a/packages/table-render/package.json b/packages/table-render/package.json index 2baa2d7cc..769665aa7 100644 --- a/packages/table-render/package.json +++ b/packages/table-render/package.json @@ -1,6 +1,6 @@ { "name": "table-render", - "version": "1.2.1", + "version": "1.2.2", "description": "中后台表格解决方案", "scripts": { "start": "dumi dev", From 80641e95cfbaa83815a987da50e4a7b196f471ea Mon Sep 17 00:00:00 2001 From: siyi98 Date: Mon, 21 Feb 2022 14:16:40 +0800 Subject: [PATCH 8/9] =?UTF-8?q?chore(tr):valueType=E5=85=BC=E5=AE=B9object?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/table-render/src/components/field.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/table-render/src/components/field.tsx b/packages/table-render/src/components/field.tsx index 5ffd0ff50..220701cd3 100644 --- a/packages/table-render/src/components/field.tsx +++ b/packages/table-render/src/components/field.tsx @@ -68,7 +68,7 @@ export const renderCode = (code: string) => { // 渲染单元格 export const renderDom = (val: string, item: any) => { - if (typeof item.val === 'object') { + if (typeof val === 'object') { return; } if (item.valueType === 'code') { From 67c1fb6b1e6bebf9de8c1094583dd934fbb0e2b9 Mon Sep 17 00:00:00 2001 From: siyi98 Date: Mon, 21 Feb 2022 14:17:02 +0800 Subject: [PATCH 9/9] chore(tr):v1.2.3 --- packages/table-render/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/table-render/package.json b/packages/table-render/package.json index 769665aa7..496edfa47 100644 --- a/packages/table-render/package.json +++ b/packages/table-render/package.json @@ -1,6 +1,6 @@ { "name": "table-render", - "version": "1.2.2", + "version": "1.2.3", "description": "中后台表格解决方案", "scripts": { "start": "dumi dev",