From 6f643d26949523300fae188543bd33d48b2e1723 Mon Sep 17 00:00:00 2001 From: kangwei Date: Tue, 5 May 2020 16:58:45 +0800 Subject: [PATCH 1/2] fix style --- .../editor-skeleton/src/transducers/addon-combine.ts | 9 +++++---- packages/vision-preset/src/vision.less | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/packages/editor-skeleton/src/transducers/addon-combine.ts b/packages/editor-skeleton/src/transducers/addon-combine.ts index c0ee2a480..cbbf1af17 100644 --- a/packages/editor-skeleton/src/transducers/addon-combine.ts +++ b/packages/editor-skeleton/src/transducers/addon-combine.ts @@ -46,7 +46,7 @@ export default function(metadata: TransformedComponentMetadata): TransformedComp const supportedLifecycles = events.supportedLifecycles || (isRoot - ? [ + ? /*[ { description: '初始化时', name: 'constructor', @@ -63,7 +63,7 @@ export default function(metadata: TransformedComponentMetadata): TransformedComp description: '卸载时', name: 'componentWillUnmount', }, - ] + ]*/ null : null); if (supportedLifecycles) { eventsDefinition.push({ @@ -81,6 +81,7 @@ export default function(metadata: TransformedComponentMetadata): TransformedComp } // 通用设置 const propsGroup = props || []; + /* propsGroup.push({ name: '#generals', title: { type: 'i18n', 'zh-CN': '通用', 'en-US': 'General' }, @@ -101,14 +102,14 @@ export default function(metadata: TransformedComponentMetadata): TransformedComp title: 'Ref', setter: 'StringSetter', }, - /* { name: '!more', title: '更多', setter: 'PropertiesSetter', - },*/ + }, ], }); + */ const combined: FieldConfig[] = [ { title: { type: 'i18n', 'zh-CN': '属性', 'en-US': 'Props' }, diff --git a/packages/vision-preset/src/vision.less b/packages/vision-preset/src/vision.less index d0c17fcc0..7c04b0955 100644 --- a/packages/vision-preset/src/vision.less +++ b/packages/vision-preset/src/vision.less @@ -92,7 +92,8 @@ html.engine-blur #engine { .next-checkbox-group,.next-date-picker,.next-input,.next-month-picker, .next-number-picker,.next-radio-group,.next-range,.next-range-picker, .next-rating,.next-select,.next-switch,.next-time-picker,.next-upload, - .next-year-picker { + .next-year-picker, + .next-breadcrumb-item,.next-calendar-header,.next-calendar-table { pointer-events: auto !important; } } From 4396689dad0fe50ef3c55ec31f4a627dfc42b778 Mon Sep 17 00:00:00 2001 From: kangwei Date: Tue, 5 May 2020 17:08:10 +0800 Subject: [PATCH 2/2] add outline builtin --- packages/designer/src/document/node/node.ts | 2 +- packages/vision-preset/src/editor.ts | 29 ++++++--------------- 2 files changed, 9 insertions(+), 22 deletions(-) diff --git a/packages/designer/src/document/node/node.ts b/packages/designer/src/document/node/node.ts index a8d469309..1aae13208 100644 --- a/packages/designer/src/document/node/node.ts +++ b/packages/designer/src/document/node/node.ts @@ -358,7 +358,7 @@ export class Node { @computed hasCondition() { const v = this.getExtraProp('condition', false)?.getValue(); - return v != null && v !== ''; + return v != null && v !== '' && v !== true; } @computed hasLoop() { diff --git a/packages/vision-preset/src/editor.ts b/packages/vision-preset/src/editor.ts index 5c064a3b0..1b9a21263 100644 --- a/packages/vision-preset/src/editor.ts +++ b/packages/vision-preset/src/editor.ts @@ -2,17 +2,14 @@ import { isJSBlock, isJSSlot } from '@ali/lowcode-types'; import { isPlainObject } from '@ali/lowcode-utils'; import { globalContext, Editor } from '@ali/lowcode-editor-core'; import { Designer, TransformStage, addBuiltinComponentAction } from '@ali/lowcode-designer'; -import { registerSetters } from '@ali/lowcode-setters'; -// import Outline from '@ali/lowcode-plugin-outline-pane'; +// import { registerSetters } from '@ali/lowcode-setters'; +import Outline from '@ali/lowcode-plugin-outline-pane'; import DesignerPlugin from '@ali/lowcode-plugin-designer'; import { Skeleton, SettingsPrimaryPane } from '@ali/lowcode-editor-skeleton'; -import Preview from '@ali/lowcode-plugin-sample-preview'; -// import SourceEditor from '@ali/lowcode-plugin-source-editor'; import { i18nReducer } from './i18n-reducer'; import { InstanceNodeSelector } from './components'; -import { Divider } from '@alifd/next'; export const editor = new Editor(); globalContext.register(editor, Editor); @@ -81,24 +78,14 @@ skeleton.add({ type: 'Panel', content: SettingsPrimaryPane, }); -// skeleton.add({ -// area: 'leftArea', -// name: 'outlinePane', -// type: 'PanelDock', -// content: Outline, -// panelProps: { -// area: 'leftFixedArea', -// }, -// }); - skeleton.add({ - area: 'topArea', - type: 'Dock', - name: 'preview', - props: { - align: 'right', + area: 'leftArea', + name: 'outlinePane', + type: 'PanelDock', + content: Outline, + panelProps: { + area: 'leftFixedArea', }, - content: Preview, }); // skeleton.add({