From 46951ca4f95b698e92ce2b9389a1bc6a5be5507d Mon Sep 17 00:00:00 2001 From: "wuyue.xht" Date: Wed, 17 Jun 2020 12:12:30 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=9F=8B=E7=82=B9=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/builtin-simulator/bem-tools/border-resizing.tsx | 2 +- .../src/builtin-simulator/bem-tools/border-selecting.tsx | 2 +- packages/designer/src/builtin-simulator/host.ts | 6 +++--- .../src/builtin-simulator/live-editing/live-editing.ts | 4 ++-- .../designer/src/builtin-simulator/node-selector/index.tsx | 4 ++-- packages/designer/src/designer/designer.ts | 2 +- .../src/components/settings/settings-primary-pane.tsx | 2 +- packages/editor-skeleton/src/components/widget-views.tsx | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/designer/src/builtin-simulator/bem-tools/border-resizing.tsx b/packages/designer/src/builtin-simulator/bem-tools/border-resizing.tsx index e63a50e95..a4947ad7d 100644 --- a/packages/designer/src/builtin-simulator/bem-tools/border-resizing.tsx +++ b/packages/designer/src/builtin-simulator/bem-tools/border-resizing.tsx @@ -184,7 +184,7 @@ export class BoxResizingInstance extends Component<{ [npm?.package, npm?.componentName].filter((item) => !!item).join('-') || node?.componentMeta?.componentName || ''; - editor.emit('designer.border.resize', { + editor?.emit('designer.border.resize', { selected, layout: node?.parent?.getPropValue('layout') || '', }); diff --git a/packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx b/packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx index 61701c944..7adce76b4 100644 --- a/packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx +++ b/packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx @@ -130,7 +130,7 @@ function createAction(content: ReactNode | ComponentType | ActionContentObj [npm?.package, npm?.componentName].filter((item) => !!item).join('-') || node?.componentMeta?.componentName || ''; - editor?.emit('designer.borders.action', { + editor?.emit('designer.border.action', { name: key, target, }); diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts index 1efbf4673..6111977f7 100644 --- a/packages/designer/src/builtin-simulator/host.ts +++ b/packages/designer/src/builtin-simulator/host.ts @@ -272,7 +272,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost !!item).join('-') || node?.componentMeta?.componentName || ''; - editor.emit('designer.builtinSimulator.select', { + editor?.emit('designer.builtinSimulator.select', { selected, }); } @@ -434,12 +434,12 @@ export class BuiltinSimulatorHost implements ISimulatorHost !!item).join('-') || node?.componentMeta?.componentName || ''; editor?.emit('desiger.builtinSimulator.contextmenu', { - target: target, + selected, }); }); } diff --git a/packages/designer/src/builtin-simulator/live-editing/live-editing.ts b/packages/designer/src/builtin-simulator/live-editing/live-editing.ts index f2af842d3..2d74e5880 100644 --- a/packages/designer/src/builtin-simulator/live-editing/live-editing.ts +++ b/packages/designer/src/builtin-simulator/live-editing/live-editing.ts @@ -44,10 +44,10 @@ export class LiveEditing { const editor = globalContext.get(Editor); const npm = node?.componentMeta?.npm; - const targetInfo = + const selected = [npm?.package, npm?.componentName].filter((item) => !!item).join('-') || node?.componentMeta?.componentName || ''; editor?.emit('designer.builinSimulator.LiveEditing', { - target: targetInfo, + selected, }); let setterPropElement = getSetterPropElement(targetElement, rootElement); diff --git a/packages/designer/src/builtin-simulator/node-selector/index.tsx b/packages/designer/src/builtin-simulator/node-selector/index.tsx index 5372d7679..554ef78e7 100644 --- a/packages/designer/src/builtin-simulator/node-selector/index.tsx +++ b/packages/designer/src/builtin-simulator/node-selector/index.tsx @@ -52,8 +52,8 @@ export default class InstanceNodeSelector extends React.Component !!item).join('-') || node?.componentMeta?.componentName || ''; - editor.emit('designer.border.action', { - name: 'select-node', + editor?.emit('designer.border.action', { + name: 'select', selected, }); } diff --git a/packages/designer/src/designer/designer.ts b/packages/designer/src/designer/designer.ts index e782dd42c..c4c8f2050 100644 --- a/packages/designer/src/designer/designer.ts +++ b/packages/designer/src/designer/designer.ts @@ -129,7 +129,7 @@ export class Designer { ''; this.editor?.emit('designer.drag', { time: (endTime - startTime).toFixed(2), - target: nodes + selected: nodes ?.map((n) => { if (!n) { return; diff --git a/packages/editor-skeleton/src/components/settings/settings-primary-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-primary-pane.tsx index 51b1fcf6e..7ce04e9ca 100644 --- a/packages/editor-skeleton/src/components/settings/settings-primary-pane.tsx +++ b/packages/editor-skeleton/src/components/settings/settings-primary-pane.tsx @@ -58,7 +58,7 @@ export class SettingsPrimaryPane extends Component<{ editor: Editor }> { }; const selected = getName(current); const target = getName(node); - editor.emit('skeleton.settingsPane.Breadcrumb', { + editor?.emit('skeleton.settingsPane.Breadcrumb', { selected, target, }); diff --git a/packages/editor-skeleton/src/components/widget-views.tsx b/packages/editor-skeleton/src/components/widget-views.tsx index 931fd6287..e14b2e2df 100644 --- a/packages/editor-skeleton/src/components/widget-views.tsx +++ b/packages/editor-skeleton/src/components/widget-views.tsx @@ -110,7 +110,7 @@ export class TitledPanelView extends Component<{ panel: Panel; area?: string }> } const editor = globalContext.get(Editor); const panelName = area ? `${area}-${panel.name}` : panel.name; - editor.emit('skeleton.panel.toggle', { + editor?.emit('skeleton.panel.toggle', { name: panelName || '', status: panel.visible ? 'show' : 'hide', }); @@ -163,7 +163,7 @@ export class PanelView extends Component<{ panel: Panel; area?: string }> { } const editor = globalContext.get(Editor); const panelName = area ? `${area}-${panel.name}` : panel.name; - editor.emit('skeleton.panel.toggle', { + editor?.emit('skeleton.panel.toggle', { name: panelName || '', status: panel.visible ? 'show' : 'hide', });