fix outline

This commit is contained in:
kangwei 2020-04-21 21:54:27 +08:00
parent 567281fa9b
commit 007e4ce47e
6 changed files with 17 additions and 30 deletions

View File

@ -4,8 +4,10 @@ import { intl } from './locale';
export default {
name: 'outline-pane',
icon: IconOutline,
description: intl('Outline Tree'),
props: {
icon: IconOutline,
description: intl('Outline Tree'),
},
content: Pane,
};

View File

@ -2,7 +2,7 @@ import React, { Component, PureComponent } from 'react';
import { Tab, Breadcrumb } from '@alifd/next';
import { Title, createIcon, observer } from '@ali/lowcode-globals';
import { Node } from '@ali/lowcode-designer';
import OutlinePane from '@ali/lowcode-plugin-outline-pane';
import { Pane as OutlinePane } from '@ali/lowcode-plugin-outline-pane';
import Editor from '@ali/lowcode-editor-core';
import { SettingsMain } from './main';
import SettingsPane from './settings-pane';

View File

@ -36,20 +36,13 @@ skeleton.rightArea.add({
skeleton.leftArea.add({
name: 'outlinePane',
type: 'PanelDock',
props: {
align: 'top',
icon: 'toggle-right',
description: '大纲树',
},
content: Pane,
...Outline,
panelProps: {
area: 'leftFixedArea',
},
});
// demo
skeleton.leftArea.add({
name: 'icon1',
type: 'Dock',
@ -131,15 +124,3 @@ skeleton.topArea.add({
}
}),
});
// skeleton.topArea.add({
// type: "Dock",
// name: 'preview2',
// props: {
// align: "center",
// title: {
// label: "345",
// icon: "smile",
// tip: "123123123"
// }
// },
// })

View File

@ -5,6 +5,7 @@ import { PanelDockConfig } from './types';
import Panel from './panel';
import { PanelDockView, WidgetView } from './widget-views';
import { IWidget } from './widget';
import { composeTitle } from './utils';
export default class PanelDock implements IWidget {
readonly isWidget = true;
@ -52,7 +53,7 @@ export default class PanelDock implements IWidget {
}
constructor(readonly skeleton: Skeleton, private config: PanelDockConfig) {
const { content, contentProps, panelProps, name } = config;
const { content, contentProps, panelProps, name, props } = config;
this.name = name;
this.id = uniqueId(`dock:${name}$`);
this.panelName = config.panelName || name;
@ -60,7 +61,10 @@ export default class PanelDock implements IWidget {
this._panel = this.skeleton.add({
type: "Panel",
name: this.panelName,
props: panelProps || {},
props: {
// title: props ? composeTitle(props?.title, props?.icon, props?.description, true) : '',
...panelProps,
},
contentProps,
content,
// FIXME! dirty fixed

View File

@ -1,10 +1,10 @@
import { IconType, TitleContent, I18nData, isI18nData } from '@ali/lowcode-globals';
import { isValidElement } from 'react';
export function composeTitle(title?: TitleContent, icon?: IconType, tip?: string | I18nData) {
export function composeTitle(title?: TitleContent, icon?: IconType, tip?: string | I18nData, tipAsTitle?: boolean) {
if (!title) {
title = {};
if (!icon) {
if (!icon || tipAsTitle) {
title.label = tip;
tip = undefined;
}

View File

@ -278,16 +278,16 @@ body {
height: 100%;
display: none;
flex-shrink: 0;
padding-top: 36px;
position: relative;
&.lc-area-visible {
display: block;
}
.lc-pane-close{
.lc-pane-close {
position: absolute;
right: 10px;
top: 6px;
.next-icon{
z-index: 2;
.next-icon {
line-height: 1;
}
}