Merge branch 'fix/monitor' into 'release/0.9.0'

修复画布BorderAction埋点以及增加大纲树埋点



See merge request !869524
This commit is contained in:
康为 2020-07-16 12:47:20 +08:00
commit 618ff638a3
2 changed files with 19 additions and 13 deletions

View File

@ -126,13 +126,13 @@ function createAction(content: ReactNode | ComponentType<any> | ActionContentObj
action && action(node); action && action(node);
const editor = globalContext.get(Editor); const editor = globalContext.get(Editor);
const npm = node?.componentMeta?.npm; const npm = node?.componentMeta?.npm;
const target = const selected =
[npm?.package, npm?.componentName].filter((item) => !!item).join('-') || [npm?.package, npm?.componentName].filter((item) => !!item).join('-') ||
node?.componentMeta?.componentName || node?.componentMeta?.componentName ||
''; '';
editor?.emit('designer.border.action', { editor?.emit('designer.border.action', {
name: key, name: key,
target, selected,
}); });
}} }}
> >

View File

@ -14,6 +14,18 @@ import { IconRadioActive } from '../icons/radio-active';
import { IconRadio } from '../icons/radio'; import { IconRadio } from '../icons/radio';
import { createIcon } from '@ali/lowcode-utils'; import { createIcon } from '@ali/lowcode-utils';
function emitOutlineEvent(type: string, treeNode: TreeNode, rest?: object) {
const editor = globalContext.get(Editor);
const node = treeNode?.node;
const npm = node?.componentMeta?.npm;
const selected =
[npm?.package, npm?.componentName].filter((item) => !!item).join('-') || node?.componentMeta?.componentName || '';
editor?.emit(`outlinePane.${type}`, {
selected,
...rest,
});
}
@observer @observer
export default class TreeTitle extends Component<{ export default class TreeTitle extends Component<{
treeNode: TreeNode; treeNode: TreeNode;
@ -40,7 +52,9 @@ export default class TreeTitle extends Component<{
private saveEdit = (e: FocusEvent<HTMLInputElement> | KeyboardEvent<HTMLInputElement>) => { private saveEdit = (e: FocusEvent<HTMLInputElement> | KeyboardEvent<HTMLInputElement>) => {
const { treeNode } = this.props; const { treeNode } = this.props;
treeNode.setTitleLabel((e.target as HTMLInputElement).value || ''); const value = (e.target as HTMLInputElement).value || '';
treeNode.setTitleLabel(value);
emitOutlineEvent('rename', treeNode, { value });
this.cancelEdit(); this.cancelEdit();
}; };
@ -190,17 +204,8 @@ class HideBtn extends Component<{ treeNode: TreeNode }> {
className="tree-node-hide-btn" className="tree-node-hide-btn"
onClick={(e) => { onClick={(e) => {
e.stopPropagation(); e.stopPropagation();
emitOutlineEvent(treeNode.hidden ? 'show' : 'hide', treeNode);
treeNode.setHidden(!treeNode.hidden); treeNode.setHidden(!treeNode.hidden);
const editor = globalContext.get(Editor);
const node = treeNode?.node;
const npm = node?.componentMeta?.npm;
const selected =
[npm?.package, npm?.componentName].filter((item) => !!item).join('-') ||
node?.componentMeta?.componentName ||
'';
editor?.emit('outlinePane.hide', {
selected,
});
}} }}
> >
{treeNode.hidden ? <IconEyeClose /> : <IconEye />} {treeNode.hidden ? <IconEyeClose /> : <IconEye />}
@ -227,6 +232,7 @@ class ExpandBtn extends Component<{ treeNode: TreeNode }> {
if (treeNode.expanded) { if (treeNode.expanded) {
e.stopPropagation(); e.stopPropagation();
} }
emitOutlineEvent(treeNode.expanded ? 'collapse' : 'expand', treeNode);
treeNode.setExpanded(!treeNode.expanded); treeNode.setExpanded(!treeNode.expanded);
}} }}
> >