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

修复 dialog store 数据同步问题

This commit is contained in:
liaoxuezhi 2019-06-11 16:59:52 +08:00
parent f6ae1daec9
commit 61dc28151f
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/factory.tsx
View File

@ -565,7 +565,11 @@ export function HocStoreFactory(renderer:{
const store = this.store;
if (renderer.extendsData === false) {
(props.defaultData !== nextProps.defaultData || isObjectShallowModified(props.data, nextProps.data))
(
props.defaultData !== nextProps.defaultData
|| isObjectShallowModified(props.data, nextProps.data)
|| nextProps.data && props.data && nextProps.data.__suer !== props.data.__super
)
&& store.initData(extendObject(nextProps.data, {
...store.hasRemoteData ? store.data : null, // todo 只保留 remote 数据
...this.formatData(nextProps.defaultData),
@ -585,9 +589,15 @@ export function HocStoreFactory(renderer:{
}
} else if ((!nextProps.store || nextProps.data !== nextProps.store.data) && nextProps.data && nextProps.data.__super) {
(!props.data || nextProps.data.__super !== props.data.__super)
&& store.initData(createObject(nextProps.data.__super, store.data));
&& store.initData(createObject(nextProps.data.__super, {
...nextProps.data,
...store.data
}));
} else if (nextProps.scope !== props.scope) {
store.initData(createObject(nextProps.scope, store.data));
store.initData(createObject(nextProps.scope, {
...nextProps.data,
...store.data
}));
}
}