chore: fix conflicts

This commit is contained in:
lihao.ylh 2021-11-09 16:40:47 +08:00
commit 75518e1f8a
2 changed files with 1 additions and 4 deletions

View File

@ -13,7 +13,6 @@
}, },
"dependencies": { "dependencies": {
"@ali/lowcode-datasource-types": "^1.0.21", "@ali/lowcode-datasource-types": "^1.0.21",
"@ali/lowcode-designer": "1.0.72-beta.7",
"power-di": "^2.2.4", "power-di": "^2.2.4",
"react": "^16", "react": "^16",
"strict-event-emitter-types": "^2.0.0" "strict-event-emitter-types": "^2.0.0"

View File

@ -1,8 +1,6 @@
import { IPropParent, SettingEntry } from '@ali/lowcode-designer';
export interface ChangeOptions { export interface ChangeOptions {
key?: string | number; key?: string | number;
prop?: SettingEntry | IPropParent; prop?: any;
node: Node; node: Node;
newValue: any; newValue: any;
oldValue: any; oldValue: any;