test/amis
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-12-04 21:08:55 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'amis/master'

Browse Source
This commit is contained in:
rickcole 2019-06-11 13:02:37 +08:00
commit 30433b7051
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/factory.tsx
View File

@ -583,7 +583,7 @@ export function HocStoreFactory(renderer:{
} else { } else {
store.initData(createObject(nextProps.scope, nextProps.data)); store.initData(createObject(nextProps.scope, nextProps.data));
} }
} else if (nextProps.data && nextProps.data.__super) { } else if ((!nextProps.store || nextProps.data !== nextProps.store.data) && nextProps.data && nextProps.data.__super) {
(!props.data || nextProps.data.__super !== props.data.__super) (!props.data || nextProps.data.__super !== props.data.__super)
&& store.initData(createObject(nextProps.data.__super, store.data)); && store.initData(createObject(nextProps.data.__super, store.data));
} else if (nextProps.scope !== props.scope) { } else if (nextProps.scope !== props.scope) {

11
src/renderers/Form/Combo.tsx
View File

@ -373,7 +373,7 @@ export default class ComboControl extends React.Component<ComboProps> {
} }
value = value || this.defaultValue; value = value || this.defaultValue;
return canAccessSuperData return canAccessSuperData
? createObject(createObject(data, {index, __index: index}), value) ? createObject(createObject(data, {index, __index: index}), value)
: createObject({index, __index: index}, value); : createObject({index, __index: index}, value);
} }
@ -464,7 +464,8 @@ export default class ComboControl extends React.Component<ComboProps> {
return ( return (
<div <div
className={cx(`Combo-item`)} className={cx(`Combo-item`)}
key={this.keys[index] || (this.keys[index] = guid())}> key={this.keys[index] || (this.keys[index] = guid())}
>
<div className={cx(`Combo-itemInner`)}> <div className={cx(`Combo-itemInner`)}>
{render(`multiple/${index}`, { {render(`multiple/${index}`, {
type: 'form', type: 'form',
@ -503,9 +504,9 @@ export default class ComboControl extends React.Component<ComboProps> {
<span>{addButtonText || '新增'}</span> <span>{addButtonText || '新增'}</span>
</button> </button>
) : null} ) : null}
{ {draggable ? (
draggable ? (<span className={cx(`Combo-dragableTip`)} ref={this.dragTipRef} >{Array.isArray(value) && value.length > 1 ? draggableTip : ''}</span>) : null <span className={cx(`Combo-dragableTip`)} ref={this.dragTipRef} >{Array.isArray(value) && value.length > 1 ? draggableTip : ''}</span>
} ) : null}
</div> </div>
) : null} ) : null}
</div> </div>