Merge branch 'preset-vision/0.9.0' of gitlab.alibaba-inc.com:ali-lowcode/ali-lowcode-engine into preset-vision/0.9.0

This commit is contained in:
wuyue.xht 2020-06-17 10:33:58 +08:00
commit 32f0264e45
29 changed files with 188 additions and 61 deletions

View File

@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.8.30"></a>
## [0.8.30](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.29...@ali/lowcode-demo@0.8.30) (2020-06-16)
**Note:** Version bump only for package @ali/lowcode-demo
<a name="0.8.29"></a>
## [0.8.29](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.28...@ali/lowcode-demo@0.8.29) (2020-06-15)

View File

@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-demo",
"version": "0.8.29",
"version": "0.8.30",
"private": true,
"description": "低代码引擎 DEMO",
"scripts": {
@ -10,15 +10,15 @@
"config": {},
"dependencies": {
"@ali/lowcode-editor-core": "^0.8.16",
"@ali/lowcode-editor-skeleton": "^0.8.25",
"@ali/lowcode-plugin-components-pane": "^0.8.22",
"@ali/lowcode-plugin-designer": "^0.9.19",
"@ali/lowcode-editor-skeleton": "^0.8.26",
"@ali/lowcode-plugin-components-pane": "^0.8.23",
"@ali/lowcode-plugin-designer": "^0.9.20",
"@ali/lowcode-plugin-event-bind-dialog": "^0.8.16",
"@ali/lowcode-plugin-outline-pane": "^0.8.25",
"@ali/lowcode-plugin-outline-pane": "^0.8.26",
"@ali/lowcode-plugin-sample-logo": "^0.8.15",
"@ali/lowcode-plugin-sample-preview": "^0.8.24",
"@ali/lowcode-plugin-sample-preview": "^0.8.25",
"@ali/lowcode-plugin-settings-pane": "^0.8.8",
"@ali/lowcode-plugin-undo-redo": "^0.8.24",
"@ali/lowcode-plugin-undo-redo": "^0.8.25",
"@ali/lowcode-plugin-variable-bind-dialog": "^0.8.14",
"@ali/lowcode-plugin-zh-en": "^0.8.18",
"@ali/lowcode-react-renderer": "^0.8.0",

View File

@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.9.20"></a>
## [0.9.20](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.19...@ali/lowcode-designer@0.9.20) (2020-06-16)
**Note:** Version bump only for package @ali/lowcode-designer
<a name="0.9.19"></a>
## [0.9.19](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.18...@ali/lowcode-designer@0.9.19) (2020-06-15)

View File

@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-designer",
"version": "0.9.19",
"version": "0.9.20",
"description": "Designer for Ali LowCode Engine",
"main": "lib/index.js",
"module": "es/index.js",

View File

@ -787,7 +787,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
this.sensing = true;
this.scroller.scrolling(e);
const dropContainer = this.getDropContainer(e);
if (!dropContainer || dropContainer.container?.componentName === 'Page') {
if (!dropContainer) {
return null;
}

View File

@ -96,7 +96,6 @@ export class SettingTopEntry implements SettingEntry {
}
private setupItems() {
console.log('set')
if (this.componentMeta) {
const settingFieldMap: { [prop: string]: SettingField } = {};
const settingFieldCollector = (name: string | number, field: SettingField) => {

View File

@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.9.6"></a>
## [0.9.6](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.5...@ali/lowcode-editor-preset-general@0.9.6) (2020-06-16)
**Note:** Version bump only for package @ali/lowcode-editor-preset-general
<a name="0.9.5"></a>
## [0.9.5](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.4...@ali/lowcode-editor-preset-general@0.9.5) (2020-06-15)

View File

@ -1,6 +1,7 @@
{
"name": "@ali/lowcode-editor-preset-general",
"version": "0.9.5",
"version": "0.9.6",
"private": true,
"description": "Ali General Editor Preset",
"main": "lib/index.js",
"files": [
@ -15,9 +16,9 @@
"license": "MIT",
"dependencies": {
"@ali/lowcode-editor-core": "^0.8.16",
"@ali/lowcode-editor-skeleton": "^0.8.25",
"@ali/lowcode-plugin-designer": "^0.9.19",
"@ali/lowcode-plugin-outline-pane": "^0.8.25",
"@ali/lowcode-editor-skeleton": "^0.8.26",
"@ali/lowcode-plugin-designer": "^0.9.20",
"@ali/lowcode-plugin-outline-pane": "^0.8.26",
"@ali/lowcode-types": "^0.8.6",
"@ali/lowcode-utils": "^0.8.7",
"@alifd/next": "^1.19.12",

View File

@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.8.21"></a>
## [0.8.21](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.20...@ali/lowcode-editor-preset-vision@0.8.21) (2020-06-16)
**Note:** Version bump only for package @ali/lowcode-editor-preset-vision
<a name="0.8.20"></a>
## [0.8.20](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.19...@ali/lowcode-editor-preset-vision@0.8.20) (2020-06-15)

View File

@ -1,6 +1,7 @@
{
"name": "@ali/lowcode-editor-preset-vision",
"version": "0.8.20",
"version": "0.8.21",
"private": true,
"description": "Vision Polyfill for Ali lowCode engine",
"main": "lib/index.js",
"files": [
@ -14,16 +15,16 @@
},
"license": "MIT",
"dependencies": {
"@ali/lowcode-designer": "^0.9.19",
"@ali/lowcode-designer": "^0.9.20",
"@ali/lowcode-editor-core": "^0.8.16",
"@ali/lowcode-editor-skeleton": "^0.8.25",
"@ali/lowcode-plugin-designer": "^0.9.19",
"@ali/lowcode-plugin-outline-pane": "^0.8.25",
"@ali/lowcode-editor-skeleton": "^0.8.26",
"@ali/lowcode-plugin-designer": "^0.9.20",
"@ali/lowcode-plugin-outline-pane": "^0.8.26",
"@ali/ve-i18n-util": "^2.0.0",
"@ali/ve-icons": "^4.1.9",
"@ali/ve-less-variables": "2.0.3",
"@ali/ve-popups": "^4.2.5",
"@ali/ve-utils": "^1.1.0",
"@ali/ve-i18n-util": "^2.0.0",
"@ali/vu-css-style": "^1.1.3",
"@ali/vu-logger": "^1.0.7",
"@ali/vu-style-sheet": "^2.4.0",

View File

@ -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,14 @@ export class Trunk {
setPackages() {
console.warn('Trunk.setPackages is deprecated');
}
getSetter(type: string): any{
const setter = getSetter(type);
if (setter?.component) {
return setter.component;
}
return setter;
}
}
export default new Trunk();

View File

@ -2,6 +2,7 @@ import { ComponentType, ReactElement, isValidElement, ComponentClass } from 'rea
import { isPlainObject } from '@ali/lowcode-utils';
import { isI18nData, SettingTarget, InitialItem, FilterItem, isJSSlot, ProjectSchema, AutorunItem } from '@ali/lowcode-types';
import { untracked } from '@ali/lowcode-editor-core';
import { editor, designer } from '../editor';
type Field = SettingTarget;
@ -212,7 +213,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,
@ -396,7 +399,7 @@ export function upgradePropConfig(config: OldPropConfig, collector: ConfigCollec
},
},
];
if (allowTextInput !== false) {
if (allowTextInput) {
setters.unshift('I18nSetter');
}
if (supportVariable) {
@ -707,8 +710,9 @@ export function upgradeMetadata(oldConfig: OldPrototypeConfig) {
if (initialChildren) {
experimental.initialChildren =
typeof initialChildren === 'function'
? (field: Field) => {
return initialChildren.call(field, (field as any).props);
? (node: any) => {
const props = designer.createSettingEntry(editor, [ node ]);
return initialChildren.call(node, props);
}
: initialChildren;
}

View File

@ -102,6 +102,32 @@ function upgradePropsReducer(props: any) {
// 升级 Props
designer.addPropsReducer(upgradePropsReducer, TransformStage.Init);
function compatiableReducer(props: any) {
if (!isPlainObject(props)) {
return props;
}
const newProps: any = {};
Object.entries<any>(props).forEach(([key, val]) => {
if (isJSSlot(val)) {
val.value
val = {
type: 'JSBlock',
value: {
componentName: 'Slot',
children: val.value,
props: {
slotTitle: val.title,
},
},
}
}
newProps[key] = val;
});
return newProps;
}
// Dirty fix: will remove this reducer
designer.addPropsReducer(compatiableReducer, TransformStage.Save);
// 设计器组件样式处理
function stylePropsReducer(props: any, node: any) {
if (props && typeof props === 'object' && props.__style__) {

View File

@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.8.26"></a>
## [0.8.26](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.25...@ali/lowcode-editor-skeleton@0.8.26) (2020-06-16)
**Note:** Version bump only for package @ali/lowcode-editor-skeleton
<a name="0.8.25"></a>
## [0.8.25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.24...@ali/lowcode-editor-skeleton@0.8.25) (2020-06-15)

View File

@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-editor-skeleton",
"version": "0.8.25",
"version": "0.8.26",
"description": "alibaba lowcode editor skeleton",
"main": "lib/index.js",
"module": "es/index.js",
@ -19,7 +19,7 @@
"editor"
],
"dependencies": {
"@ali/lowcode-designer": "^0.9.19",
"@ali/lowcode-designer": "^0.9.20",
"@ali/lowcode-editor-core": "^0.8.16",
"@ali/lowcode-types": "^0.8.6",
"@ali/lowcode-utils": "^0.8.7",

View File

@ -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;
}

View File

@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.8.23"></a>
## [0.8.23](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.22...@ali/lowcode-plugin-components-pane@0.8.23) (2020-06-16)
**Note:** Version bump only for package @ali/lowcode-plugin-components-pane
<a name="0.8.22"></a>
## [0.8.22](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.21...@ali/lowcode-plugin-components-pane@0.8.22) (2020-06-15)

View File

@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-plugin-components-pane",
"version": "0.8.22",
"version": "0.8.23",
"description": "alibaba lowcode editor component-list plugin",
"files": [
"es/",
@ -20,7 +20,7 @@
],
"author": "xiayang.xy",
"dependencies": {
"@ali/lowcode-designer": "^0.9.19",
"@ali/lowcode-designer": "^0.9.20",
"@ali/lowcode-editor-core": "^0.8.16",
"@ali/lowcode-types": "^0.8.6",
"@ali/ve-component-list": "^1.1.1",

View File

@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.9.20"></a>
## [0.9.20](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.19...@ali/lowcode-plugin-designer@0.9.20) (2020-06-16)
**Note:** Version bump only for package @ali/lowcode-plugin-designer
<a name="0.9.19"></a>
## [0.9.19](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.18...@ali/lowcode-plugin-designer@0.9.19) (2020-06-15)

View File

@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-plugin-designer",
"version": "0.9.19",
"version": "0.9.20",
"description": "alibaba lowcode editor designer plugin",
"files": [
"es",
@ -20,7 +20,7 @@
],
"author": "xiayang.xy",
"dependencies": {
"@ali/lowcode-designer": "^0.9.19",
"@ali/lowcode-designer": "^0.9.20",
"@ali/lowcode-editor-core": "^0.8.16",
"react": "^16.8.1",
"react-dom": "^16.8.1"

View File

@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.8.26"></a>
## [0.8.26](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.25...@ali/lowcode-plugin-outline-pane@0.8.26) (2020-06-16)
**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane
<a name="0.8.25"></a>
## [0.8.25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.24...@ali/lowcode-plugin-outline-pane@0.8.25) (2020-06-15)

View File

@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-plugin-outline-pane",
"version": "0.8.25",
"version": "0.8.26",
"description": "Outline pane for Ali lowCode engine",
"files": [
"es",
@ -14,7 +14,7 @@
"test:snapshot": "ava --update-snapshots"
},
"dependencies": {
"@ali/lowcode-designer": "^0.9.19",
"@ali/lowcode-designer": "^0.9.20",
"@ali/lowcode-editor-core": "^0.8.16",
"@ali/lowcode-types": "^0.8.6",
"@ali/lowcode-utils": "^0.8.7",

View File

@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.8.25"></a>
## [0.8.25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.24...@ali/lowcode-plugin-sample-preview@0.8.25) (2020-06-16)
**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview
<a name="0.8.24"></a>
## [0.8.24](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.23...@ali/lowcode-plugin-sample-preview@0.8.24) (2020-06-15)

View File

@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-plugin-sample-preview",
"version": "0.8.24",
"version": "0.8.25",
"description": "alibaba lowcode editor sample preview plugin",
"files": [
"es",
@ -18,7 +18,7 @@
"editor"
],
"dependencies": {
"@ali/lowcode-designer": "^0.9.19",
"@ali/lowcode-designer": "^0.9.20",
"@ali/lowcode-editor-core": "^0.8.16",
"@alifd/next": "^1.x",
"react": "^16.8.1"

View File

@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.8.25"></a>
## [0.8.25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.24...@ali/lowcode-plugin-undo-redo@0.8.25) (2020-06-16)
**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo
<a name="0.8.24"></a>
## [0.8.24](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.23...@ali/lowcode-plugin-undo-redo@0.8.24) (2020-06-15)

View File

@ -1,6 +1,6 @@
{
"name": "@ali/lowcode-plugin-undo-redo",
"version": "0.8.24",
"version": "0.8.25",
"description": "alibaba lowcode editor undo redo plugin",
"files": [
"es",
@ -19,9 +19,9 @@
],
"author": "xiayang.xy",
"dependencies": {
"@ali/lowcode-designer": "^0.9.19",
"@ali/lowcode-designer": "^0.9.20",
"@ali/lowcode-editor-core": "^0.8.16",
"@ali/lowcode-editor-skeleton": "^0.8.25",
"@ali/lowcode-editor-skeleton": "^0.8.26",
"@ali/lowcode-types": "^0.8.6",
"@ali/lowcode-utils": "^0.8.7",
"react": "^16.8.1",

View File

@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
<a name="0.8.26"></a>
## [0.8.26](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.25...@ali/lowcode-react-simulator-renderer@0.8.26) (2020-06-16)
**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer
<a name="0.8.25"></a>
## [0.8.25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.24...@ali/lowcode-react-simulator-renderer@0.8.25) (2020-06-15)

View File

@ -1,7 +1,7 @@
{
"private": true,
"name": "@ali/lowcode-react-simulator-renderer",
"version": "0.8.25",
"version": "0.8.26",
"description": "react simulator renderer for alibaba lowcode designer",
"main": "lib/index.js",
"module": "es/index.js",
@ -13,7 +13,7 @@
"test:snapshot": "ava --update-snapshots"
},
"dependencies": {
"@ali/lowcode-designer": "^0.9.19",
"@ali/lowcode-designer": "^0.9.20",
"@ali/lowcode-react-renderer": "^0.8.0",
"@ali/lowcode-types": "^0.8.6",
"@ali/lowcode-utils": "^0.8.7",

View File

@ -21,7 +21,7 @@ echo ""
# work
mkdir packages
# cp -r $WORK_DIR/packages/demo packages/demo
cp -r $WORK_DIR/packages/demo packages/demo
cp -r $WORK_DIR/packages/react-simulator-renderer packages/react-simulator-renderer
cp -r $WORK_DIR/packages/editor-preset-vision packages/editor-preset-vision
# cp -r $WORK_DIR/packages/editor-preset-general packages/editor-preset-general
@ -29,8 +29,8 @@ lerna bootstrap
lerna run cloud-build --stream
cd $WORK_DIR
# mv deploy-space/packages/demo/build $BUILD_DEST
mv deploy-space/packages/react-simulator-renderer/dist $BUILD_DEST
mv deploy-space/packages/demo/build $BUILD_DEST
mv deploy-space/packages/react-simulator-renderer/dist/* $BUILD_DEST
mv deploy-space/packages/editor-preset-vision/dist/* $BUILD_DEST
# mv deploy-space/packages/editor-preset-general/dist/* $BUILD_DEST
cp deploy-space/static/* $BUILD_DEST