p85126437
/
amis
forked from p96170835/amis
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix conflict

This commit is contained in:
2betop 2020-03-06 12:43:42 +08:00
parent 2d6c924464 0990ec3146
commit f65fc630ff
4 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/renderers/Form/Matrix.tsx
View File

@ -171,6 +171,7 @@ export default class MatrixCheckbox extends React.Component<
columns: (ret.data as any).columns || []
},
() => {
let replace = source && (source as ApiObject).replaceData;
let value = (ret.data as any).value;
if (value) {
value = (source as ApiObject).replaceData

1
src/renderers/Tasks.tsx
View File

@ -210,6 +210,7 @@ export default class Task extends React.Component<TaskProps, TaskState> {
if (Array.isArray(ret.data)) {
this.handleLoaded(ret);
} else {
let replace = api && (api as ApiObject).replaceData;
const items = this.state.items.map(item =>
item.key === ret.data.key
? {

2
src/store/crud.ts
View File

@ -288,7 +288,7 @@ export const CRUDStore = ServiceStore.named('CRUDStore')
}
self.items.replace(rowsData);
self.reInitData(data, !!(api && (api as ApiObject).replaceData));
self.reInitData(data, !!(api as ApiObject).replaceData);
options.syncResponse2Query !== false &&
updateQuery(
pick(rest, Object.keys(self.query)),

2
src/store/form.ts
View File

@ -233,7 +233,7 @@ export const FormStore = ServiceStore.named('FormStore')
{
__saved: Date.now()
},
!!(api && (api as ApiObject).replaceData)
!!(api as ApiObject).replaceData
);
self.updatedAt = Date.now();
}