Skip to content

Commit b7fde9c

Browse files
fix: 620/617 (#621)
fix
1 parent d624b0c commit b7fde9c

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

packages/antd/src/fields/date.tsx

+13-15
Original file line numberDiff line numberDiff line change
@@ -24,22 +24,20 @@ const transformMoment = (value, format = 'YYYY-MM-DD HH:mm:ss') => {
2424
}
2525

2626
const mapMomentValue = props => {
27-
const { value, showTime = false, disabled = false } = props
27+
const { value, showTime = false } = props
2828
try {
29-
if (!disabled) {
30-
if (isStr(value) && value) {
31-
props.value = moment(
32-
value,
33-
showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'
34-
)
35-
} else if (isArr(value) && value.length) {
36-
props.value = value.map(
37-
item =>
38-
(item &&
39-
moment(item, showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD')) ||
40-
''
41-
)
42-
}
29+
if (isStr(value) && value) {
30+
props.value = moment(
31+
value,
32+
showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD'
33+
)
34+
} else if (isArr(value) && value.length) {
35+
props.value = value.map(
36+
item =>
37+
(item &&
38+
moment(item, showTime ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD')) ||
39+
''
40+
)
4341
}
4442
} catch (e) {
4543
throw new Error(e)

packages/antd/src/fields/table.tsx

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ const FormTableField = styled(
4242
renderMoveUp,
4343
renderEmpty,
4444
renderExtraOperations,
45+
operationsWidth,
4546
operations,
4647
dragable,
4748
...componentProps
@@ -90,6 +91,7 @@ const FormTableField = styled(
9091
...operations,
9192
key: 'operations',
9293
dataIndex: 'operations',
94+
width: operationsWidth || 200,
9395
render: (value: any, record: any, index: number) => {
9496
return (
9597
<Form.Item>

packages/next/src/fields/table.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ const FormTableField = styled(
189189
}, [])
190190
: renderColumns(schema.items)}
191191
<ArrayList.Item
192-
width={200}
192+
width={operationsWidth || 200}
193193
lock="right"
194194
{...operations}
195195
key="operations"

0 commit comments

Comments
 (0)