diff --git a/packages/editor-skeleton/src/components/field/index.less b/packages/editor-skeleton/src/components/field/index.less index 4c427a0d1..4c767cf9b 100644 --- a/packages/editor-skeleton/src/components/field/index.less +++ b/packages/editor-skeleton/src/components/field/index.less @@ -130,7 +130,7 @@ > .lc-field-head { padding-left: @x-gap/2; background: var(--color-block-background-light); - border-bottom-color: var(--color-line-light); + border-bottom-color: var(--color-line-light, rgba(31, 56, 88, .1)); > .lc-field-icon { margin-right: @x-gap/2; } diff --git a/packages/editor-skeleton/src/layouts/workbench.less b/packages/editor-skeleton/src/layouts/workbench.less index a6f3a9359..a658b9635 100644 --- a/packages/editor-skeleton/src/layouts/workbench.less +++ b/packages/editor-skeleton/src/layouts/workbench.less @@ -54,12 +54,12 @@ body { display: none; } .lc-panel-title { - height: 38px; - font-size: 14px; - background-color: var(--pane-title-bg-color,rgba(31,56,88,.04)); + height: 48px; + font-size: 16px; + // background-color: var(--pane-title-bg-color,rgba(31,56,88,.04)); display: flex; align-items: center; - justify-content: center; + justify-content: flex-start; padding: 0 15px; border-bottom: 1px solid var(--color-line-normal,rgba(31,56,88,.1)); @@ -72,7 +72,7 @@ body { .lc-panel-body { position: absolute; - top: 38px; + top: 48px; bottom: 0; left: 0; right: 0; @@ -153,6 +153,72 @@ body { } } */ + /*覆盖旧面板*/ + /*组件面板*/ + .ve-component-list { + .ve-component-list-body{ + .ve-component-list-sidebar{ + .ve-component-list-navigator{ + .navigator-group{ + &:last-child{ + &::after{ + display: none; + } + } + &::after{ + content: ''; + display: block; + height: 1px; + background-color: #EDEFF3; + line-height: 0; + margin: 4px 12px 0; + } + .navigator-group-head{ + .navigator-group-title{ + border-bottom: none; + } + } + .navigator-group-item{ + border-left: 2px solid transparent; + &.active{ + border-left-color: #0079f2; + border-right: none; + } + } + } + } + } + } + } + /*数据源*/ + .engine-datapool{ + .engine-datapool-view-group{ + padding-top: 48px; + .engine-datapool-view-group-title{ + height: 48px; + line-height: 48px; + font-size: 16px; + background-color: transparent; + padding: 0 16px; + border-bottom: 1px solid #EDEFF3; + } + } + } + /*动作面板*/ + .ve-action-pane{ + border-top: none; + .rc-tabs{ + .rc-tabs-bar{ + background-color: transparent; + .rc-tabs-tab{ + line-height: 1; + &.rc-tabs-tab-active{ + + } + } + } + } + } } .my-dock { @@ -222,8 +288,9 @@ body { } .lc-pane-close{ position: absolute; - right: 10px; - top: 6px; + right: 16px; + top: 16px; + height: auto; z-index: 2; .next-icon{ line-height: 1; @@ -231,17 +298,31 @@ body { } .lc-tabs-title { width: 100%; - height: 36px; + height: 32px; position: relative; display: center; display: flex; justify-content: center; align-items: center; - background: rgba(31,56,88,0.04); + // background: rgba(31,56,88,0.04); + border-bottom: 1px solid #EDEFF3; + margin-top: 48px; + .lc-tab-title{ + flex: 1; + height: 32px; + display: flex; + align-items: center; + justify-content: center; + border-bottom: 2px solid transparent; + cursor: pointer; + &.actived{ + border-bottom-color: #0079F2; + } + } } .lc-tabs-content { position: absolute; - top: 36px; + top: 80px; bottom: 0; left: 0; right: 0; @@ -272,7 +353,7 @@ body { height: 46px; svg { - fill: var(--color-icon-normal,rgba(31,56,88,.4)); + // fill: var(--color-icon-normal,rgba(31,56,88,.4)); } &.has-tip{ @@ -308,8 +389,9 @@ body { } .lc-pane-close { position: absolute; - right: 10px; - top: 6px; + right: 16px; + top: 16px; + height: auto; z-index: 2; .next-icon { line-height: 1; diff --git a/packages/vision-preset/src/components/index.tsx b/packages/vision-preset/src/components/index.tsx index 2518705aa..f32681dd0 100644 --- a/packages/vision-preset/src/components/index.tsx +++ b/packages/vision-preset/src/components/index.tsx @@ -48,12 +48,27 @@ export class InstanceNodeSelector extends React.Component { node.select(); } }; - + onMouseOver = (node: Node) => (_: any, flag = true) => { + if (node && typeof node.hover === 'function') { + node.hover(flag); + } + }; + onMouseOut = (node: Node) => (_: any, flag = false) => { + if (node && typeof node.hover === 'function') { + node.hover(flag); + } + }; renderNodes = (node: Node) => { const nodes = this.state.parentNodes || []; const children = nodes.map((node, key) => { return ( -
+