Merge remote-tracking branch 'baidu/master'

This commit is contained in:
2betop 2020-02-26 13:30:27 +08:00
commit ad744e731d
1 changed files with 5 additions and 5 deletions

View File

@ -8,7 +8,7 @@ import {observer} from 'mobx-react';
import {ServiceStore, IServiceStore} from '../../store/service'; import {ServiceStore, IServiceStore} from '../../store/service';
@Renderer({ @Renderer({
test: /(^|\/)form\/(.*)\/service$/, test: /(^|\/)form(?:\/.+)?\/control\/(?:\d+\/)?service$/,
weight: -100, weight: -100,
storeType: ServiceStore.name, storeType: ServiceStore.name,
storeExtendsData: false, storeExtendsData: false,
@ -64,10 +64,10 @@ export class ServiceRenderer extends BasicService {
const finnalSchema = store.schema || const finnalSchema = store.schema ||
schema || { schema || {
controls, controls,
tabs, tabs,
feildSet feildSet
}; };
if ( if (
finnalSchema && finnalSchema &&
!finnalSchema.type && !finnalSchema.type &&