test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-11-30 02:58:05 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: 修复input-table中input-date相对值不生效问题 (#4885)

Browse Source 
* fix: 修复input-table中input-date相对值不生效问题

* fix: 修复input-table中input-date相对值不生效问题
This commit is contained in:
RickCole 2022-07-15 17:50:44 +08:00 committed by GitHub
parent 895148a458
commit 2efbe1ef0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 38 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
packages/amis/src/renderers/Form/InputTable.tsx
View File

@ -1,24 +1,31 @@
import React from 'react'; import React from 'react';
import {FormItem, FormControlProps, FormBaseControl} from 'amis-core';
import { import {
FormItem,
FormControlProps,
FormBaseControl,
createObject, createObject,
getTree, getTree,
getVariable, getVariable,
setVariable, setVariable,
spliceTree spliceTree,
filterDate,
isEffectiveApi,
filter,
dataMapping,
SimpleMap,
RendererData,
ActionObject,
Api,
Payload,
ApiObject
} from 'amis-core'; } from 'amis-core';
import {Button} from 'amis-ui'; import {Button, Icon} from 'amis-ui';
import {RendererData, ActionObject, Api, Payload, ApiObject} from 'amis-core';
import {isEffectiveApi} from 'amis-core';
import {filter} from 'amis-core';
import omit from 'lodash/omit'; import omit from 'lodash/omit';
import {dataMapping} from 'amis-core';
import findIndex from 'lodash/findIndex'; import findIndex from 'lodash/findIndex';
import {SimpleMap} from 'amis-core';
import {Icon} from 'amis-ui';
import {TableSchema} from '../Table'; import {TableSchema} from '../Table';
import {SchemaApi} from '../../Schema'; import {SchemaApi} from '../../Schema';
import find from 'lodash/find'; import find from 'lodash/find';
import moment from 'moment';
export interface TableControlSchema export interface TableControlSchema
extends FormBaseControl, extends FormBaseControl,
@ -466,7 +473,7 @@ export default class FormTable extends React.Component<TableProps, TableState> {
} }
addItem(index: number) { addItem(index: number) {
const {needConfirm, scaffold, columns} = this.props; const {needConfirm, scaffold, columns, data} = this.props;
const items = this.state.items.concat(); const items = this.state.items.concat();
let value: any = { let value: any = {
__isPlaceholder: true __isPlaceholder: true
@ -478,7 +485,27 @@ export default class FormTable extends React.Component<TableProps, TableState> {
typeof column.value !== 'undefined' && typeof column.value !== 'undefined' &&
typeof column.name === 'string' typeof column.name === 'string'
) { ) {
setVariable(value, column.name, column.value); if (
[
'input-date',
'input-datetime',
'input-time',
'input-month',
'input-quarter',
'input-year'
].includes(column.type)
) {
const date = filterDate(column.value, data, column.format || 'X');
setVariable(
value,
column.name,
(column.utc ? moment.utc(date) : date).format(
column.format || 'X'
)
);
} else {
setVariable(value, column.name, column.value);
}
} }
}); });
} }