chore: fix conflicts

This commit is contained in:
lihao.ylh 2021-09-22 20:15:04 +08:00
commit 69d5ab0b3a
2 changed files with 5 additions and 1 deletions

View File

@ -66,6 +66,8 @@ export function leafWrapper(Comp: types.IBaseRenderer, {
node?: Node; node?: Node;
} = {}; } = {};
static displayName = schema.componentName;
disposeFunctions: ((() => void) | Function)[] = []; disposeFunctions: ((() => void) | Function)[] = [];
recordTime = () => { recordTime = () => {
@ -292,5 +294,7 @@ export function leafWrapper(Comp: types.IBaseRenderer, {
}); });
} }
LeafWrapper.displayName = (Comp as any).displayName;
return LeafWrapper; return LeafWrapper;
} }

View File

@ -54,7 +54,7 @@ export default function baseRenererFactory() {
let scopeIdx = 0; let scopeIdx = 0;
return class BaseRenderer extends Component implements IRenderer { return class BaseRenderer extends Component implements IRenderer {
static dislayName = 'base-renderer'; static displayName = 'base-renderer';
static defaultProps = { static defaultProps = {
__schema: {}, __schema: {},