From 05f62da9d59403535b667d3336a43295ef86d9a3 Mon Sep 17 00:00:00 2001 From: "mario.gk" Date: Tue, 16 Jun 2020 11:31:37 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=20=E5=8F=B3=E4=BE=A7=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF=E6=A0=B7=E5=BC=8F=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/bundle/upgrade-metadata.ts | 4 ++- .../src/components/field/index.less | 36 +++++++++---------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/packages/editor-preset-vision/src/bundle/upgrade-metadata.ts b/packages/editor-preset-vision/src/bundle/upgrade-metadata.ts index 99281a8cb..2fe205661 100644 --- a/packages/editor-preset-vision/src/bundle/upgrade-metadata.ts +++ b/packages/editor-preset-vision/src/bundle/upgrade-metadata.ts @@ -212,7 +212,9 @@ export function upgradePropConfig(config: OldPropConfig, collector: ConfigCollec liveTextEditing, } = config; - const extraProps: any = {}; + const extraProps: any = { + display: DISPLAY_TYPE.BLOCK, + }; const newConfig: any = { type: type === 'group' ? 'group' : 'field', name, diff --git a/packages/editor-skeleton/src/components/field/index.less b/packages/editor-skeleton/src/components/field/index.less index f1b155b2f..1ba86368d 100644 --- a/packages/editor-skeleton/src/components/field/index.less +++ b/packages/editor-skeleton/src/components/field/index.less @@ -67,16 +67,16 @@ } } - &.lc-plain-field { - // for top-level style - // padding: 8px 10px; - > .lc-field-body { - flex: 1; - min-width: 0; - display: flex; - align-items: center; - } - } + // &.lc-plain-field { + // // for top-level style + // // padding: 8px 10px; + // > .lc-field-body { + // flex: 1; + // min-width: 0; + // display: flex; + // align-items: center; + // } + // } &.lc-inline-field { display: flex; @@ -211,14 +211,14 @@ } // 3rd level field title width should short - .lc-field-body .lc-inline-field { - > .lc-field-head { - width: 50px; - .lc-title-label { - width: 50px; - } - } - } + // .lc-field-body .lc-inline-field { + // > .lc-field-head { + // width: 50px; + // .lc-title-label { + // width: 50px; + // } + // } + // } >.lc-block-setter { flex: 1; } From b6d64c3a0655b8385bb8f0db52a7d6571bd51b7c Mon Sep 17 00:00:00 2001 From: "mario.gk" Date: Tue, 16 Jun 2020 16:05:04 +0800 Subject: [PATCH 2/3] fix: Trunk add getSetter --- packages/editor-preset-vision/src/bundle/trunk.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/editor-preset-vision/src/bundle/trunk.ts b/packages/editor-preset-vision/src/bundle/trunk.ts index a37f0bc75..99b2d1415 100644 --- a/packages/editor-preset-vision/src/bundle/trunk.ts +++ b/packages/editor-preset-vision/src/bundle/trunk.ts @@ -1,6 +1,6 @@ import { ReactElement, ComponentType } from 'react'; import { EventEmitter } from 'events'; -import { registerSetter, RegisteredSetter } from '@ali/lowcode-editor-core'; +import { registerSetter, RegisteredSetter, getSetter } from '@ali/lowcode-editor-core'; import Bundle from './bundle'; import { CustomView } from '@ali/lowcode-types'; @@ -104,6 +104,10 @@ export class Trunk { setPackages() { console.warn('Trunk.setPackages is deprecated'); } + + getSetter(type: string): any{ + return getSetter(type); + } } export default new Trunk(); From 34bf71d8dd2da7124d24e15c7059a61c5beea986 Mon Sep 17 00:00:00 2001 From: "mario.gk" Date: Tue, 16 Jun 2020 16:08:46 +0800 Subject: [PATCH 3/3] fix: Trunk.getSetter return ReactElement --- packages/editor-preset-vision/src/bundle/trunk.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/editor-preset-vision/src/bundle/trunk.ts b/packages/editor-preset-vision/src/bundle/trunk.ts index 99b2d1415..e4e41e35d 100644 --- a/packages/editor-preset-vision/src/bundle/trunk.ts +++ b/packages/editor-preset-vision/src/bundle/trunk.ts @@ -106,7 +106,11 @@ export class Trunk { } getSetter(type: string): any{ - return getSetter(type); + const setter = getSetter(type); + if (setter?.component) { + return setter.component; + } + return setter; } }