diff --git a/.gitignore b/.gitignore index d6c4d6312..2073a217c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ dist packages/*/lib/ packages/*/es/ packages/*/dist/ +packages/*/output/ package-lock.json yarn.lock deploy-space/packages @@ -102,4 +103,4 @@ typings/ .DS_Store # codealike -codealike.json \ No newline at end of file +codealike.json diff --git a/packages/code-generator/CHANGELOG.md b/packages/code-generator/CHANGELOG.md index 257f7c5bc..dc048682a 100644 --- a/packages/code-generator/CHANGELOG.md +++ b/packages/code-generator/CHANGELOG.md @@ -3,6 +3,35 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.9](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-code-generator@0.8.7...@ali/lowcode-code-generator@0.8.9) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-code-generator + + +## [0.8.7](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-code-generator@0.8.6...@ali/lowcode-code-generator@0.8.7) (2020-07-12) + + +### Bug Fixes + +* demo data ([b4a27fc](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/b4a27fc)) +* factory api ([237b866](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/237b866)) +* same name chunk case ([d6855e2](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/d6855e2)) + + +### Features + +* add recore project template ([267953b](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/267953b)) +* add template create tool ([e906683](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/e906683)) +* recore solution ([3bfe758](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/3bfe758)) +* rewrite demo & export plugins and utils ([6cf7c3d](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/6cf7c3d)) + + + + ## [0.8.6](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-code-generator@0.8.5...@ali/lowcode-code-generator@0.8.6) (2020-06-23) diff --git a/packages/code-generator/demo/demo.js b/packages/code-generator/demo/demo.js index 91e145de9..61c71de97 100644 --- a/packages/code-generator/demo/demo.js +++ b/packages/code-generator/demo/demo.js @@ -1,4 +1,5 @@ const fs = require('fs'); +// ../lib 可以替换成 @ali/lowcode-code-generator const CodeGenerator = require('../lib').default; function flatFiles(rootName, dir) { @@ -50,4 +51,104 @@ function main() { }); } -main(); +function exportModule() { + const schemaJson = fs.readFileSync('./demo/shenmaSample.json', { encoding: 'utf8' }); + const moduleBuilder = CodeGenerator.createModuleBuilder({ + plugins: [ + CodeGenerator.plugins.react.reactCommonDeps(), + CodeGenerator.plugins.common.esmodule({ + fileType: 'jsx', + }), + CodeGenerator.plugins.react.containerClass(), + CodeGenerator.plugins.react.containerInitState(), + CodeGenerator.plugins.react.containerLifeCycle(), + CodeGenerator.plugins.react.containerMethod(), + CodeGenerator.plugins.react.jsx(), + CodeGenerator.plugins.style.css(), + ], + postProcessors: [ + CodeGenerator.postprocessor.prettier(), + ], + mainFileName: 'index', + }); + + moduleBuilder.generateModuleCode(schemaJson).then(result => { + displayResultInConsole(result); + return result; + }); +} + +function exportProject() { + const schemaJson = fs.readFileSync('./demo/sampleSchema.json', { encoding: 'utf8' }); + + const builder = CodeGenerator.createProjectBuilder({ + template: CodeGenerator.solutionParts.icejs.template, + plugins: { + components: [ + CodeGenerator.plugins.react.reactCommonDeps(), + CodeGenerator.plugins.common.esmodule({ + fileType: 'jsx', + }), + CodeGenerator.plugins.react.containerClass(), + CodeGenerator.plugins.react.containerInitState(), + CodeGenerator.plugins.react.containerLifeCycle(), + CodeGenerator.plugins.react.containerMethod(), + CodeGenerator.plugins.react.jsx(), + CodeGenerator.plugins.style.css(), + ], + pages: [ + CodeGenerator.plugins.react.reactCommonDeps(), + CodeGenerator.plugins.common.esmodule({ + fileType: 'jsx', + }), + CodeGenerator.plugins.react.containerClass(), + CodeGenerator.plugins.react.containerInitState(), + CodeGenerator.plugins.react.containerLifeCycle(), + CodeGenerator.plugins.react.containerMethod(), + CodeGenerator.plugins.react.jsx(), + CodeGenerator.plugins.style.css(), + ], + router: [ + CodeGenerator.plugins.common.esmodule(), + CodeGenerator.solutionParts.icejs.plugins.router(), + ], + entry: [ + CodeGenerator.solutionParts.icejs.plugins.entry(), + ], + constants: [ + CodeGenerator.plugins.project.constants(), + ], + utils: [ + CodeGenerator.plugins.common.esmodule(), + CodeGenerator.plugins.project.utils(), + ], + i18n: [ + CodeGenerator.plugins.project.i18n(), + ], + globalStyle: [ + CodeGenerator.solutionParts.icejs.plugins.globalStyle(), + ], + htmlEntry: [ + CodeGenerator.solutionParts.icejs.plugins.entryHtml(), + ], + packageJSON: [ + CodeGenerator.solutionParts.icejs.plugins.packageJSON(), + ], + }, + postProcessors: [ + CodeGenerator.postprocessor.prettier(), + ], + }); + + builder.generateProject(schemaJson).then(result => { + displayResultInConsole(result); + writeResultToDisk(result, 'output/lowcodeDemo').then(response => + console.log('Write to disk: ', JSON.stringify(response)), + ); + return result; + }); +} + +// main(); +// exportModule(); +exportProject(); diff --git a/packages/code-generator/demo/shenmaSample.json b/packages/code-generator/demo/shenmaSample.json new file mode 100644 index 000000000..eed4c1031 --- /dev/null +++ b/packages/code-generator/demo/shenmaSample.json @@ -0,0 +1,36 @@ +{ + "version": "1.0.0", + "componentsMap": [ + { + "componentName": "Demo", + "package": "@ali/demo", + "version": "1.19.18", + "destructuring": true, + "exportName": "Demo" + } + ], + "id": "page_kc326r8m", + "componentsTree": [{ + "componentName": "Page", + "id": "node_kc326r8h", + "props": {}, + "condition": true, + "loopArgs": ["item", "index"], + "children": [{ + "componentName": "Demo", + "id": "node_kc326r8i", + "props": { + "value": "文本内容", + "color": "#ffffff", + "ui_maxLine": 2, + "url": "", + "ui_type": "xs", + "style": {}, + "className": "" + }, + "condition": true, + "loopArgs": ["item", "index"] + }] + }], + "params": {} +} diff --git a/packages/code-generator/package.json b/packages/code-generator/package.json index 3bffb2689..bfe83ccf4 100644 --- a/packages/code-generator/package.json +++ b/packages/code-generator/package.json @@ -1,10 +1,11 @@ { "name": "@ali/lowcode-code-generator", - "version": "0.8.6", + "version": "0.8.9", "description": "出码引擎 for LowCode Engine", "main": "lib/index.js", "files": [ - "lib" + "lib", + "demo" ], "scripts": { "build": "rimraf lib && tsc", @@ -21,6 +22,7 @@ "@babel/types": "^7.9.5", "@types/prettier": "^1.19.1", "change-case": "^3.1.0", + "jszip": "^3.5.0", "prettier": "^2.0.2", "short-uuid": "^3.1.1" }, diff --git a/packages/code-generator/src/index.ts b/packages/code-generator/src/index.ts index 9de9c1538..5d670b5ab 100644 --- a/packages/code-generator/src/index.ts +++ b/packages/code-generator/src/index.ts @@ -5,11 +5,17 @@ import { createProjectBuilder } from './generator/ProjectBuilder'; import { createModuleBuilder } from './generator/ModuleBuilder'; import { createDiskPublisher } from './publisher/disk'; +import { createZipPublisher } from './publisher/zip'; import createIceJsProjectBuilder from './solutions/icejs'; import createRecoreProjectBuilder from './solutions/recore'; // 引入说明 import { REACT_CHUNK_NAME } from './plugins/component/react/const'; +import { + COMMON_CHUNK_NAME, + CLASS_DEFINE_CHUNK_NAME, + DEFAULT_LINK_AFTER, +} from './const/generator'; // 引入通用插件组 import esmodule from './plugins/common/esmodule'; @@ -26,6 +32,7 @@ import css from './plugins/component/style/css'; import constants from './plugins/project/constants'; import i18n from './plugins/project/i18n'; import utils from './plugins/project/utils'; +import prettier from './postprocessor/prettier'; // 引入常用工具 import * as utilsCommon from './utils/common'; @@ -34,6 +41,9 @@ import * as utilsJsExpression from './utils/jsExpression'; import * as utilsNodeToJSX from './utils/nodeToJSX'; import * as utilsTemplateHelper from './utils/templateHelper'; +// 引入内置解决方案模块 +import icejs from './plugins/project/framework/icejs'; + export * from './types'; export default { @@ -43,8 +53,12 @@ export default { icejs: createIceJsProjectBuilder, recore: createRecoreProjectBuilder, }, + solutionParts: { + icejs, + }, publishers: { disk: createDiskPublisher, + zip: createZipPublisher, }, plugins: { common: { @@ -70,6 +84,9 @@ export default { utils, }, }, + postprocessor: { + prettier, + }, utils: { common: utilsCommon, compositeType: utilsCompositeType, @@ -77,4 +94,12 @@ export default { nodeToJSX: utilsNodeToJSX, templateHelper: utilsTemplateHelper, }, + chunkNames: { + COMMON_CHUNK_NAME, + CLASS_DEFINE_CHUNK_NAME, + REACT_CHUNK_NAME, + }, + defaultLinkAfter: { + COMMON_DEFAULT_LINK_AFTER: DEFAULT_LINK_AFTER, + }, }; diff --git a/packages/code-generator/src/plugins/project/framework/icejs/index.ts b/packages/code-generator/src/plugins/project/framework/icejs/index.ts new file mode 100644 index 000000000..e9c8f255f --- /dev/null +++ b/packages/code-generator/src/plugins/project/framework/icejs/index.ts @@ -0,0 +1,17 @@ +import template from './template'; +import entry from './plugins/entry'; +import entryHtml from './plugins/entryHtml'; +import globalStyle from './plugins/globalStyle'; +import packageJSON from './plugins/packageJSON'; +import router from './plugins/router'; + +export default { + template, + plugins: { + entry, + entryHtml, + globalStyle, + packageJSON, + router, + }, +}; diff --git a/packages/code-generator/src/postprocessor/prettier/index.ts b/packages/code-generator/src/postprocessor/prettier/index.ts index 519c2db5d..85c2f9741 100644 --- a/packages/code-generator/src/postprocessor/prettier/index.ts +++ b/packages/code-generator/src/postprocessor/prettier/index.ts @@ -5,7 +5,7 @@ import { PostProcessor, PostProcessorFactory } from '../../types'; const PARSERS = ['css', 'scss', 'less', 'json', 'html', 'vue']; -interface ProcessorConfig { +type ProcessorConfig = { customFileTypeParser: Record; } diff --git a/packages/code-generator/src/publisher/disk/index.ts b/packages/code-generator/src/publisher/disk/index.ts index 77f45c07a..b63649ab9 100644 --- a/packages/code-generator/src/publisher/disk/index.ts +++ b/packages/code-generator/src/publisher/disk/index.ts @@ -1,21 +1,10 @@ -import { CodeGeneratorError, IResultDir } from '../../types'; - -export type PublisherFactory = (configuration?: Partial) => U; - -export interface IPublisher { - publish: (options?: T) => Promise>; - getProject: () => IResultDir | void; - setProject: (project: IResultDir) => void; -} - -export interface IPublisherFactoryParams { - project?: IResultDir; -} -export interface IPublisherResponse { - success: boolean; - payload?: T; -} - +import { + IResultDir, + PublisherFactory, + IPublisher, + IPublisherFactoryParams, + PublisherError, +} from '../../types'; import { writeFolder } from './utils'; export interface IDiskFactoryParams extends IPublisherFactoryParams { @@ -37,7 +26,7 @@ export const createDiskPublisher: PublisherFactory< const getProject = (): IResultDir => { if (!project) { - throw new CodeGeneratorError('Missing Project'); + throw new PublisherError('Missing Project'); } return project; }; @@ -55,7 +44,7 @@ export const createDiskPublisher: PublisherFactory< const publish = async (options: IDiskFactoryParams = {}) => { const projectToPublish = options.project || project; if (!projectToPublish) { - throw new CodeGeneratorError('Missing Project'); + throw new PublisherError('Missing Project'); } const projectOutputPath = options.outputPath || outputPath; @@ -75,7 +64,7 @@ export const createDiskPublisher: PublisherFactory< ); return { success: true, payload: projectOutputPath }; } catch (error) { - throw new CodeGeneratorError(error); + throw new PublisherError(error); } }; diff --git a/packages/code-generator/src/publisher/zip/index.ts b/packages/code-generator/src/publisher/zip/index.ts new file mode 100644 index 000000000..c400c6849 --- /dev/null +++ b/packages/code-generator/src/publisher/zip/index.ts @@ -0,0 +1,69 @@ +import { + IResultDir, + PublisherFactory, + IPublisher, + IPublisherFactoryParams, + PublisherError, +} from '../../types'; +import { isNodeProcess, writeZipToDisk, generateProjectZip } from './utils' + +// export type ZipBuffer = Buffer | Blob; +export type ZipBuffer = Buffer; + +declare type ZipPublisherResponse = string | ZipBuffer; + +export interface ZipFactoryParams extends IPublisherFactoryParams { + outputPath?: string; + projectSlug?: string; +} + +export interface ZipPublisher extends IPublisher { + getOutputPath: () => string | undefined; + setOutputPath: (path: string) => void; +} + +export const createZipPublisher: PublisherFactory = ( + params: ZipFactoryParams = {}, +): ZipPublisher => { + let { project, outputPath } = params; + + const getProject = () => project; + const setProject = (projectToSet: IResultDir) => { + project = projectToSet; + } + + const getOutputPath = () => outputPath; + const setOutputPath = (path: string) => { + outputPath = path; + } + + const publish = async (options: ZipFactoryParams = {}) => { + const projectToPublish = options.project || project; + if (!projectToPublish) { + throw new PublisherError('MissingProject'); + } + + const zipName = options.projectSlug || params.projectSlug || projectToPublish.name; + + try { + const zipContent = await generateProjectZip(projectToPublish); + + // If not output path is provided, zip is not written to disk + const projectOutputPath = options.outputPath || outputPath; + if (projectOutputPath && isNodeProcess()) { + await writeZipToDisk(projectOutputPath, zipContent, zipName); + } + return { success: true, payload: zipContent }; + } catch (error) { + throw new PublisherError(error); + } + } + + return { + publish, + getProject, + setProject, + getOutputPath, + setOutputPath, + }; +} diff --git a/packages/code-generator/src/publisher/zip/utils.ts b/packages/code-generator/src/publisher/zip/utils.ts new file mode 100644 index 000000000..b7e1100b8 --- /dev/null +++ b/packages/code-generator/src/publisher/zip/utils.ts @@ -0,0 +1,60 @@ +import JSZip from 'jszip'; +import { IResultDir, IResultFile } from '../../types'; +import { ZipBuffer } from './index'; + +export const isNodeProcess = (): boolean => { + return ( + typeof process === 'object' && + typeof process.versions === 'object' && + typeof process.versions.node !== 'undefined' + ); +} + +export const writeZipToDisk = ( + zipFolderPath: string, + content: ZipBuffer, + zipName: string, +): void => { + const fs = require('fs'); + const path = require('path'); + + if (!fs.existsSync(zipFolderPath)) { + fs.mkdirSync(zipFolderPath, { recursive: true }); + } + + const zipPath = path.join(zipFolderPath, `${zipName}.zip`); + + const writeStream = fs.createWriteStream(zipPath); + writeStream.write(content); + writeStream.end(); +} + +export const generateProjectZip = async (project: IResultDir): Promise => { + let zip = new JSZip(); + zip = writeFolderToZip(project, zip, true); + // const zipType = isNodeProcess() ? 'nodebuffer' : 'blob'; + const zipType = 'nodebuffer'; // 目前先只支持 node 调用 + return zip.generateAsync({ type: zipType }); +} + +const writeFolderToZip = ( + folder: IResultDir, + parentFolder: JSZip, + ignoreFolder: boolean = false, +) => { + const zipFolder = ignoreFolder ? parentFolder : parentFolder.folder(folder.name); + if (zipFolder !== null) { + folder.files.forEach((file: IResultFile) => { + // const options = file.contentEncoding === 'base64' ? { base64: true } : {}; + const options = {}; + const fileName = file.ext ? `${file.name}.${file.ext}` : file.name; + zipFolder.file(fileName, file.content, options); + }); + + folder.dirs.forEach((subFolder: IResultDir) => { + writeFolderToZip(subFolder, zipFolder); + }); + } + + return parentFolder; +} diff --git a/packages/code-generator/src/solutions/icejs.ts b/packages/code-generator/src/solutions/icejs.ts index 62a514008..bfb7e28f8 100644 --- a/packages/code-generator/src/solutions/icejs.ts +++ b/packages/code-generator/src/solutions/icejs.ts @@ -12,20 +12,16 @@ import jsx from '../plugins/component/react/jsx'; import reactCommonDeps from '../plugins/component/react/reactCommonDeps'; import css from '../plugins/component/style/css'; import constants from '../plugins/project/constants'; -import iceJsEntry from '../plugins/project/framework/icejs/plugins/entry'; -import iceJsEntryHtml from '../plugins/project/framework/icejs/plugins/entryHtml'; -import iceJsGlobalStyle from '../plugins/project/framework/icejs/plugins/globalStyle'; -import iceJsPackageJSON from '../plugins/project/framework/icejs/plugins/packageJSON'; -import iceJsRouter from '../plugins/project/framework/icejs/plugins/router'; -import template from '../plugins/project/framework/icejs/template'; import i18n from '../plugins/project/i18n'; import utils from '../plugins/project/utils'; +import icejs from '../plugins/project/framework/icejs'; + import { prettier } from '../postprocessor'; export default function createIceJsProjectBuilder(): IProjectBuilder { return createProjectBuilder({ - template, + template: icejs.template, plugins: { components: [ reactCommonDeps(), @@ -53,14 +49,14 @@ export default function createIceJsProjectBuilder(): IProjectBuilder { jsx(), css(), ], - router: [esmodule(), iceJsRouter()], - entry: [iceJsEntry()], + router: [esmodule(), icejs.plugins.router()], + entry: [icejs.plugins.entry()], constants: [constants()], utils: [esmodule(), utils()], i18n: [i18n()], - globalStyle: [iceJsGlobalStyle()], - htmlEntry: [iceJsEntryHtml()], - packageJSON: [iceJsPackageJSON()], + globalStyle: [icejs.plugins.globalStyle()], + htmlEntry: [icejs.plugins.entryHtml()], + packageJSON: [icejs.plugins.packageJSON()], }, postProcessors: [prettier()], }); diff --git a/packages/code-generator/src/types/error.ts b/packages/code-generator/src/types/error.ts index b58e9fe90..8c0393a88 100644 --- a/packages/code-generator/src/types/error.ts +++ b/packages/code-generator/src/types/error.ts @@ -18,3 +18,10 @@ export class CompatibilityError extends CodeGeneratorError { super(errorString); } } + +// tslint:disable-next-line: max-classes-per-file +export class PublisherError extends CodeGeneratorError { + constructor(errorString: string) { + super(errorString); + } +} diff --git a/packages/code-generator/src/types/index.ts b/packages/code-generator/src/types/index.ts index 1938ed5f5..102515d43 100644 --- a/packages/code-generator/src/types/index.ts +++ b/packages/code-generator/src/types/index.ts @@ -4,3 +4,4 @@ export * from './error'; export * from './result'; export * from './schema'; export * from './intermediate'; +export * from './publisher'; diff --git a/packages/code-generator/src/types/publisher.ts b/packages/code-generator/src/types/publisher.ts new file mode 100644 index 000000000..a632e4d9b --- /dev/null +++ b/packages/code-generator/src/types/publisher.ts @@ -0,0 +1,19 @@ +import { + IResultDir, +} from './index'; + +export type PublisherFactory = (configuration?: Partial) => U; + +export interface IPublisher { + publish: (options?: T) => Promise>; + getProject: () => IResultDir | void; + setProject: (project: IResultDir) => void; +} + +export interface IPublisherFactoryParams { + project?: IResultDir; +} +export interface IPublisherResponse { + success: boolean; + payload?: T; +} diff --git a/packages/code-generator/src/utils/nodeToJSX.ts b/packages/code-generator/src/utils/nodeToJSX.ts index a60351202..db5f87c1d 100644 --- a/packages/code-generator/src/utils/nodeToJSX.ts +++ b/packages/code-generator/src/utils/nodeToJSX.ts @@ -96,8 +96,10 @@ export function generateReactCtrlLine(nodeItem: IComponentNodeItem): CodePiece[] } if (nodeItem.condition) { + const [isString, value] = generateCompositeType(nodeItem.condition); + pieces.unshift({ - value: `(${generateCompositeType(nodeItem.condition)}) && (`, + value: `(${isString ? `'${value}'` : value}) && (`, type: PIECE_TYPE.BEFORE, }); pieces.push({ diff --git a/packages/demo/CHANGELOG.md b/packages/demo/CHANGELOG.md index afd875066..95527c4d6 100644 --- a/packages/demo/CHANGELOG.md +++ b/packages/demo/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.37](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.36...@ali/lowcode-demo@0.8.37) (2020-07-14) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + + +## [0.8.36](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.35...@ali/lowcode-demo@0.8.36) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + + +## [0.8.35](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.34...@ali/lowcode-demo@0.8.35) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + + +## [0.8.34](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.33...@ali/lowcode-demo@0.8.34) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + ## [0.8.33](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.32...@ali/lowcode-demo@0.8.33) (2020-06-24) diff --git a/packages/demo/package.json b/packages/demo/package.json index 6fb0effa4..85c3fe9df 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-demo", - "version": "0.8.33", + "version": "0.8.37", "private": true, "description": "低代码引擎 DEMO", "scripts": { @@ -9,21 +9,21 @@ }, "config": {}, "dependencies": { - "@ali/lowcode-editor-core": "^0.8.19", - "@ali/lowcode-editor-skeleton": "^0.8.29", - "@ali/lowcode-plugin-components-pane": "^0.8.25", - "@ali/lowcode-plugin-designer": "^0.9.23", - "@ali/lowcode-plugin-event-bind-dialog": "^0.8.18", - "@ali/lowcode-plugin-outline-pane": "^0.8.29", - "@ali/lowcode-plugin-sample-logo": "^0.8.17", - "@ali/lowcode-plugin-sample-preview": "^0.8.27", + "@ali/lowcode-editor-core": "^0.8.21", + "@ali/lowcode-editor-skeleton": "^0.8.33", + "@ali/lowcode-plugin-components-pane": "^0.8.29", + "@ali/lowcode-plugin-designer": "^0.9.27", + "@ali/lowcode-plugin-event-bind-dialog": "^0.8.20", + "@ali/lowcode-plugin-outline-pane": "^0.8.33", + "@ali/lowcode-plugin-sample-logo": "^0.8.19", + "@ali/lowcode-plugin-sample-preview": "^0.8.31", "@ali/lowcode-plugin-settings-pane": "^0.8.8", - "@ali/lowcode-plugin-undo-redo": "^0.8.27", - "@ali/lowcode-plugin-variable-bind-dialog": "^0.8.16", - "@ali/lowcode-plugin-zh-en": "^0.8.20", - "@ali/lowcode-react-renderer": "^0.8.12", + "@ali/lowcode-plugin-undo-redo": "^0.8.31", + "@ali/lowcode-plugin-variable-bind-dialog": "^0.8.18", + "@ali/lowcode-plugin-zh-en": "^0.8.22", + "@ali/lowcode-react-renderer": "^0.8.13", "@ali/lowcode-runtime": "^0.8.16", - "@ali/lowcode-utils": "^0.8.10", + "@ali/lowcode-utils": "^0.8.12", "@ali/ve-action-pane": "^4.7.0-beta.0", "@ali/ve-datapool-pane": "^6.4.3", "@ali/ve-history-pane": "4.0.0", diff --git a/packages/designer/CHANGELOG.md b/packages/designer/CHANGELOG.md index 9243bc743..dbd839efc 100644 --- a/packages/designer/CHANGELOG.md +++ b/packages/designer/CHANGELOG.md @@ -3,6 +3,43 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.9.27](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.26...@ali/lowcode-designer@0.9.27) (2020-07-14) + + + + +**Note:** Version bump only for package @ali/lowcode-designer + + +## [0.9.26](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.25...@ali/lowcode-designer@0.9.26) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-designer + + +## [0.9.25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.24...@ali/lowcode-designer@0.9.25) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-designer + + +## [0.9.24](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.23...@ali/lowcode-designer@0.9.24) (2020-07-12) + + +### Bug Fixes + +* nextId append the id of document ([80a5c93](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/80a5c93)) +* NodeChildren伪装为Array保证向前兼容 ([7950bf5](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/7950bf5)) +* 低代码组件 props 显示 object 问题 ([116498e](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/116498e)) + + + + ## [0.9.23](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-designer@0.9.21...@ali/lowcode-designer@0.9.23) (2020-06-23) diff --git a/packages/designer/package.json b/packages/designer/package.json index 2e7888cda..8fed27d67 100644 --- a/packages/designer/package.json +++ b/packages/designer/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-designer", - "version": "0.9.23", + "version": "0.9.27", "description": "Designer for Ali LowCode Engine", "main": "lib/index.js", "module": "es/index.js", @@ -15,9 +15,9 @@ }, "license": "MIT", "dependencies": { - "@ali/lowcode-editor-core": "^0.8.19", - "@ali/lowcode-types": "^0.8.9", - "@ali/lowcode-utils": "^0.8.10", + "@ali/lowcode-editor-core": "^0.8.21", + "@ali/lowcode-types": "^0.8.11", + "@ali/lowcode-utils": "^0.8.12", "classnames": "^2.2.6", "event": "^1.0.0", "react": "^16", diff --git a/packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx b/packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx index 7adce76b4..4562c9ffd 100644 --- a/packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx +++ b/packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx @@ -126,13 +126,13 @@ function createAction(content: ReactNode | ComponentType | ActionContentObj action && action(node); const editor = globalContext.get(Editor); const npm = node?.componentMeta?.npm; - const target = + const selected = [npm?.package, npm?.componentName].filter((item) => !!item).join('-') || node?.componentMeta?.componentName || ''; editor?.emit('designer.border.action', { name: key, - target, + selected, }); }} > diff --git a/packages/designer/src/designer/setting/utils.js b/packages/designer/src/designer/setting/utils.js index 991918c54..59085e5f4 100644 --- a/packages/designer/src/designer/setting/utils.js +++ b/packages/designer/src/designer/setting/utils.js @@ -37,9 +37,9 @@ export class Transducer { if (Array.isArray(setter)) { setter = setter[0]; } else if (isValidElement(setter) && setter.type.displayName === 'MixedSetter') { - setter = setter.props.setters[0]; + setter = setter.props?.setters?.[0]; } else if (typeof setter === 'object' && setter.componentName === 'MixedSetter') { - setter = setter.props.setters?.[0]; + setter = setter.props?.setters?.[0]; } if (isSetterConfig(setter)) { diff --git a/packages/designer/src/document/document-model.ts b/packages/designer/src/document/document-model.ts index e60d51040..e6130bc2c 100644 --- a/packages/designer/src/document/document-model.ts +++ b/packages/designer/src/document/document-model.ts @@ -173,7 +173,7 @@ export class DocumentModel { } let node: Node | null = null; - if (!this.inited) { + if (this.inited) { schema.id = null; } if (schema.id) { @@ -523,7 +523,7 @@ export class DocumentModel { }; } - setRendererReady(renderer) { + setRendererReady(renderer: any) { this.emitter.emit('lowcode_engine_renderer_ready', renderer); } diff --git a/packages/designer/src/document/node/node.ts b/packages/designer/src/document/node/node.ts index e2673169b..b6f0ed4c3 100644 --- a/packages/designer/src/document/node/node.ts +++ b/packages/designer/src/document/node/node.ts @@ -103,7 +103,7 @@ export class Node { /** * @deprecated */ - private _addons: { [key: string]: any } = {}; + private _addons: { [key: string]: { exportData: () => any; isProp: boolean; } } = {}; @obx.ref private _parent: ParentalNode | null = null; /** * 父级节点 @@ -159,7 +159,7 @@ export class Node { this.props = new Props(this, props, extras); this._children = new NodeChildren(this as ParentalNode, this.initialChildren(children)); this._children.interalInitParent(); - this.props.import(this.transformProps(props || {}), extras); + this.props.import(this.upgradeProps(this.initProps(props || {})), this.upgradeProps(extras || {})); this.setupAutoruns(); } @@ -167,10 +167,11 @@ export class Node { this.emitter = new EventEmitter(); } - private transformProps(props: any): any { - // FIXME! support PropsList + private initProps(props: any): any { return this.document.designer.transformProps(props, this, TransformStage.Init); - // TODO: run transducers in metadata.experimental + } + private upgradeProps(props: any): any { + return this.document.designer.transformProps(props, this, TransformStage.Upgrade); } private autoruns?: Array<() => void>; @@ -561,14 +562,16 @@ export class Node { const _extras_: { [key: string]: any } = { ...extras, }; - if (_extras_) { - Object.keys(_extras_).forEach((key) => { - const addon = this._addons[key]; - if (addon) { - _extras_[key] = addon(); + Object.keys(this._addons).forEach((key) => { + const addon = this._addons[key]; + if (addon) { + if (addon.isProp) { + (props as any)[getConvertedExtraKey(key)] = addon.exportData(); + } else { + _extras_[key] = addon.exportData(); } - }); - } + } + }); const schema: any = { ...baseSchema, @@ -782,19 +785,19 @@ export class Node { getAddonData(key: string) { const addon = this._addons[key]; if (addon) { - return addon(); + return addon.exportData(); } - return this.getExtraProp(key)?.value; + return this.getExtraProp(key)?.getValue(); } /** * @deprecated */ - registerAddon(key: string, exportData: any) { + registerAddon(key: string, exportData: () => any, isProp: boolean = false) { if (this._addons[key]) { throw new Error(`node addon ${key} exist`); } - this._addons[key] = exportData; + this._addons[key] = { exportData, isProp }; } getRect(): DOMRect | null { diff --git a/packages/editor-core/CHANGELOG.md b/packages/editor-core/CHANGELOG.md index 71f977c99..b0e58b5bb 100644 --- a/packages/editor-core/CHANGELOG.md +++ b/packages/editor-core/CHANGELOG.md @@ -3,6 +3,25 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.21](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.20...@ali/lowcode-editor-core@0.8.21) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-core + + +## [0.8.20](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.19...@ali/lowcode-editor-core@0.8.20) (2020-07-12) + + +### Bug Fixes + +* 修复删除时，当前组件信息丢失问题 ([3bd1248](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/3bd1248)) + + + + ## [0.8.19](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-core@0.8.17...@ali/lowcode-editor-core@0.8.19) (2020-06-23) diff --git a/packages/editor-core/package.json b/packages/editor-core/package.json index 4eef2a14f..9a850913f 100644 --- a/packages/editor-core/package.json +++ b/packages/editor-core/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-core", - "version": "0.8.19", + "version": "0.8.21", "description": "Core Api for Ali lowCode engine", "license": "MIT", "main": "lib/index.js", @@ -15,8 +15,8 @@ "cloud-build": "build-scripts build --skip-demo" }, "dependencies": { - "@ali/lowcode-types": "^0.8.9", - "@ali/lowcode-utils": "^0.8.10", + "@ali/lowcode-types": "^0.8.11", + "@ali/lowcode-utils": "^0.8.12", "@alifd/next": "^1.19.16", "@recore/obx": "^1.0.9", "@recore/obx-react": "^1.0.8", diff --git a/packages/editor-preset-general/CHANGELOG.md b/packages/editor-preset-general/CHANGELOG.md index 28faee4c7..da8819415 100644 --- a/packages/editor-preset-general/CHANGELOG.md +++ b/packages/editor-preset-general/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.9.12](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.11...@ali/lowcode-editor-preset-general@0.9.12) (2020-07-14) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-preset-general + + +## [0.9.11](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.10...@ali/lowcode-editor-preset-general@0.9.11) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-preset-general + + +## [0.9.10](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.9...@ali/lowcode-editor-preset-general@0.9.10) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-preset-general + + +## [0.9.9](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.8...@ali/lowcode-editor-preset-general@0.9.9) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-preset-general + ## [0.9.8](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-general@0.9.7...@ali/lowcode-editor-preset-general@0.9.8) (2020-06-23) diff --git a/packages/editor-preset-general/package.json b/packages/editor-preset-general/package.json index e98a17209..9857247d8 100644 --- a/packages/editor-preset-general/package.json +++ b/packages/editor-preset-general/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-preset-general", - "version": "0.9.8", + "version": "0.9.12", "private": true, "description": "Ali General Editor Preset", "main": "lib/index.js", @@ -15,12 +15,12 @@ }, "license": "MIT", "dependencies": { - "@ali/lowcode-editor-core": "^0.8.19", - "@ali/lowcode-editor-skeleton": "^0.8.29", - "@ali/lowcode-plugin-designer": "^0.9.23", - "@ali/lowcode-plugin-outline-pane": "^0.8.29", - "@ali/lowcode-types": "^0.8.9", - "@ali/lowcode-utils": "^0.8.10", + "@ali/lowcode-editor-core": "^0.8.21", + "@ali/lowcode-editor-skeleton": "^0.8.33", + "@ali/lowcode-plugin-designer": "^0.9.27", + "@ali/lowcode-plugin-outline-pane": "^0.8.33", + "@ali/lowcode-types": "^0.8.11", + "@ali/lowcode-utils": "^0.8.12", "@alifd/next": "^1.19.12", "@alife/theme-lowcode-dark": "^0.1.0", "@alife/theme-lowcode-light": "^0.1.0", @@ -28,7 +28,7 @@ "react-dom": "^16.8.1" }, "devDependencies": { - "@ali/lowcode-editor-setters": "^0.9.5", + "@ali/lowcode-editor-setters": "^0.9.7", "@alib/build-scripts": "^0.1.18", "@types/events": "^3.0.0", "@types/react": "^16.8.3", diff --git a/packages/editor-preset-vision/CHANGELOG.md b/packages/editor-preset-vision/CHANGELOG.md index aeca1e8b2..b6e31334f 100644 --- a/packages/editor-preset-vision/CHANGELOG.md +++ b/packages/editor-preset-vision/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.28](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.27...@ali/lowcode-editor-preset-vision@0.8.28) (2020-07-14) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-preset-vision + + +## [0.8.27](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.26...@ali/lowcode-editor-preset-vision@0.8.27) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-preset-vision + + +## [0.8.26](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.25...@ali/lowcode-editor-preset-vision@0.8.26) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-preset-vision + + +## [0.8.25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.24...@ali/lowcode-editor-preset-vision@0.8.25) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-preset-vision + ## [0.8.24](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-preset-vision@0.8.23...@ali/lowcode-editor-preset-vision@0.8.24) (2020-06-24) diff --git a/packages/editor-preset-vision/package.json b/packages/editor-preset-vision/package.json index 36c5428d2..eb02c827d 100644 --- a/packages/editor-preset-vision/package.json +++ b/packages/editor-preset-vision/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-preset-vision", - "version": "0.8.24", + "version": "0.8.28", "private": true, "description": "Vision Polyfill for Ali lowCode engine", "main": "lib/index.js", @@ -15,11 +15,11 @@ }, "license": "MIT", "dependencies": { - "@ali/lowcode-designer": "^0.9.23", - "@ali/lowcode-editor-core": "^0.8.19", - "@ali/lowcode-editor-skeleton": "^0.8.29", - "@ali/lowcode-plugin-designer": "^0.9.23", - "@ali/lowcode-plugin-outline-pane": "^0.8.29", + "@ali/lowcode-designer": "^0.9.27", + "@ali/lowcode-editor-core": "^0.8.21", + "@ali/lowcode-editor-skeleton": "^0.8.33", + "@ali/lowcode-plugin-designer": "^0.9.27", + "@ali/lowcode-plugin-outline-pane": "^0.8.33", "@ali/ve-i18n-util": "^2.0.0", "@ali/ve-icons": "^4.1.9", "@ali/ve-less-variables": "2.0.3", diff --git a/packages/editor-preset-vision/src/bundle/prototype.ts b/packages/editor-preset-vision/src/bundle/prototype.ts index 04c0e47b0..b1406c987 100644 --- a/packages/editor-preset-vision/src/bundle/prototype.ts +++ b/packages/editor-preset-vision/src/bundle/prototype.ts @@ -1,5 +1,5 @@ import { ComponentType, ReactElement } from 'react'; -import { ComponentMetadata, FieldConfig, InitialItem, FilterItem, AutorunItem } from '@ali/lowcode-types'; +import { ComponentMetadata, FieldConfig, InitialItem, FilterItem, AutorunItem, isI18nData } from '@ali/lowcode-types'; import { ComponentMeta, addBuiltinComponentAction, @@ -15,6 +15,7 @@ import { upgradePropConfig, upgradeConfigure, } from './upgrade-metadata'; +import { intl } from '@ali/lowcode-editor-core'; import { designer } from '../editor'; import { uniqueId } from '@ali/lowcode-utils'; @@ -23,7 +24,7 @@ const GlobalPropsConfigure: Array<{ initials?: InitialItem[]; filters?: FilterItem[]; autoruns?: AutorunItem[]; - config: FieldConfig + config: FieldConfig; }> = []; const Overrides: { [componentName: string]: { @@ -53,7 +54,7 @@ function addGlobalPropsConfigure(config: OldGlobalPropConfig) { addAutorun: (item) => { autoruns.push(item); }, - }) + }), }); } function removeGlobalPropsConfigure(name: string) { @@ -82,7 +83,7 @@ function overridePropsConfigure(componentName: string, config: { [name: string]: override = upgradeConfigure(config, { addInitial, addFilter, addAutorun }); } else { override = {}; - Object.keys(config).forEach(key => { + Object.keys(config).forEach((key) => { override[key] = upgradePropConfig(config[key], { addInitial, addFilter, addAutorun }); }); } @@ -261,7 +262,7 @@ class Prototype { } getTitle() { - return this.meta.title; + return intl(this.meta.title); } getComponentName() { diff --git a/packages/editor-preset-vision/src/editor.ts b/packages/editor-preset-vision/src/editor.ts index 45a9938db..9d8a94bb8 100644 --- a/packages/editor-preset-vision/src/editor.ts +++ b/packages/editor-preset-vision/src/editor.ts @@ -75,14 +75,16 @@ function upgradePropsReducer(props: any) { return newProps; } // 升级 Props -designer.addPropsReducer(upgradePropsReducer, TransformStage.Init); +designer.addPropsReducer(upgradePropsReducer, TransformStage.Upgrade); // 节点 props 初始化 designer.addPropsReducer((props, node) => { // run initials const initials = node.componentMeta.getMetadata().experimental?.initials; if (initials) { - const newProps: any = {}; + const newProps: any = { + ...props, + }; initials.forEach((item) => { // FIXME! this implements SettingTarget try { diff --git a/packages/editor-setters/CHANGELOG.md b/packages/editor-setters/CHANGELOG.md index 3ea9745a1..ecfe30ddf 100644 --- a/packages/editor-setters/CHANGELOG.md +++ b/packages/editor-setters/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.9.7](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.6...@ali/lowcode-editor-setters@0.9.7) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-setters + + +## [0.9.6](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.5...@ali/lowcode-editor-setters@0.9.6) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-setters + ## [0.9.5](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-setters@0.9.4...@ali/lowcode-editor-setters@0.9.5) (2020-06-23) diff --git a/packages/editor-setters/package.json b/packages/editor-setters/package.json index bf579ff12..45381b226 100644 --- a/packages/editor-setters/package.json +++ b/packages/editor-setters/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-setters", - "version": "0.9.5", + "version": "0.9.7", "description": "Builtin setters for Ali lowCode engine", "files": [ "es", @@ -22,7 +22,7 @@ "@ali/iceluna-comp-react-node": "^1.0.5", "@ali/iceluna-sdk": "^1.0.5-beta.24", "@ali/lc-style-setter": "^0.0.1", - "@ali/lowcode-editor-core": "^0.8.19", + "@ali/lowcode-editor-core": "^0.8.21", "@alifd/next": "^1.19.16", "acorn": "^6.4.1", "classnames": "^2.2.6", diff --git a/packages/editor-setters/src/index.tsx b/packages/editor-setters/src/index.tsx index 474aad89f..4f649a842 100644 --- a/packages/editor-setters/src/index.tsx +++ b/packages/editor-setters/src/index.tsx @@ -4,6 +4,7 @@ import ExpressionSetter from './expression-setter'; import ColorSetter from './color-setter'; import JsonSetter from './json-setter'; import EventsSetter from './events-setter'; +import MixedSetter from './mixed-setter'; export const StringSetter = { component: Input, @@ -29,7 +30,12 @@ export const DateYearSetter = DatePicker.YearPicker; export const DateMonthSetter = DatePicker.MonthPicker; export const DateRangeSetter = DatePicker.RangePicker; -export { ExpressionSetter, EventsSetter }; +export { + ExpressionSetter, + EventsSetter, + JsonSetter, + MixedSetter, +}; const builtinSetters: any = { StringSetter, @@ -51,6 +57,7 @@ const builtinSetters: any = { EventsSetter, ColorSetter, JsonSetter, + MixedSetter, }; registerSetter(builtinSetters); diff --git a/packages/editor-setters/src/mixed-setter/index.scss b/packages/editor-setters/src/mixed-setter/index.scss new file mode 100644 index 000000000..9a9e3f086 --- /dev/null +++ b/packages/editor-setters/src/mixed-setter/index.scss @@ -0,0 +1,13 @@ +// mixed +.lowcode-setter-mixed > * { + vertical-align: middle; +} +.lowcode-setter-mixed { + width: 86%; +} +.lowcode-setter-mixed .next-input { + width: 100%; +} +.lowcode-setter-mixed .next-select-trigger { + width: 100%; +} \ No newline at end of file diff --git a/packages/editor-setters/src/mixin-setter/index.tsx b/packages/editor-setters/src/mixed-setter/index.tsx similarity index 96% rename from packages/editor-setters/src/mixin-setter/index.tsx rename to packages/editor-setters/src/mixed-setter/index.tsx index a77664758..a41427dc1 100644 --- a/packages/editor-setters/src/mixin-setter/index.tsx +++ b/packages/editor-setters/src/mixed-setter/index.tsx @@ -8,8 +8,8 @@ import { generateI18n } from './locale/utils'; import zhCN from './locale/zh-CN'; import './index.scss'; -export default class Mixin extends PureComponent { - static displayName = 'Mixin'; +export default class Mixed extends PureComponent { + static displayName = 'Mixed'; static propTypes = { locale: PropTypes.string, messages: PropTypes.object, @@ -147,7 +147,7 @@ export default class Mixin extends PureComponent { let TargetNode = this.typeMap[this.state.type]?.component || 'div'; let targetProps = this.typeMap[this.state.type]?.props || {}; let tarStyle = { position: 'relative', ...style }; - let classes = classNames(className, 'lowcode-setter-mixin'); + let classes = classNames(className, 'lowcode-setter-mixed'); return (
diff --git a/packages/editor-setters/src/mixin-setter/locale/utils.js b/packages/editor-setters/src/mixed-setter/locale/utils.js similarity index 100% rename from packages/editor-setters/src/mixin-setter/locale/utils.js rename to packages/editor-setters/src/mixed-setter/locale/utils.js diff --git a/packages/editor-setters/src/mixin-setter/locale/zh-CN.js b/packages/editor-setters/src/mixed-setter/locale/zh-CN.js similarity index 100% rename from packages/editor-setters/src/mixin-setter/locale/zh-CN.js rename to packages/editor-setters/src/mixed-setter/locale/zh-CN.js diff --git a/packages/editor-setters/src/mixin-setter/index.scss b/packages/editor-setters/src/mixin-setter/index.scss deleted file mode 100644 index 5e793311c..000000000 --- a/packages/editor-setters/src/mixin-setter/index.scss +++ /dev/null @@ -1,13 +0,0 @@ -// mixin -.lowcode-setter-mixin > * { - vertical-align: middle; -} -.lowcode-setter-mixin { - width: 86%; -} -.lowcode-setter-mixin .next-input { - width: 100%; -} -.lowcode-setter-mixin .next-select-trigger { - width: 100%; -} \ No newline at end of file diff --git a/packages/editor-skeleton/CHANGELOG.md b/packages/editor-skeleton/CHANGELOG.md index f015ab3db..bc616b774 100644 --- a/packages/editor-skeleton/CHANGELOG.md +++ b/packages/editor-skeleton/CHANGELOG.md @@ -3,6 +3,44 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.33](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.32...@ali/lowcode-editor-skeleton@0.8.33) (2020-07-14) + + +### Bug Fixes + +* 右侧配置面板面包屑点击无效 ([353fb10](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/353fb10)) + + + + + +## [0.8.32](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.31...@ali/lowcode-editor-skeleton@0.8.32) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-skeleton + + +## [0.8.31](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.30...@ali/lowcode-editor-skeleton@0.8.31) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-editor-skeleton + + +## [0.8.30](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.29...@ali/lowcode-editor-skeleton@0.8.30) (2020-07-12) + + +### Bug Fixes + +* 区块模板切换之后数据不显示 ([292c1c3](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/292c1c3)) + + + + ## [0.8.29](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-editor-skeleton@0.8.27...@ali/lowcode-editor-skeleton@0.8.29) (2020-06-23) diff --git a/packages/editor-skeleton/package.json b/packages/editor-skeleton/package.json index c57202c22..891e1d872 100644 --- a/packages/editor-skeleton/package.json +++ b/packages/editor-skeleton/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-editor-skeleton", - "version": "0.8.29", + "version": "0.8.33", "description": "alibaba lowcode editor skeleton", "main": "lib/index.js", "module": "es/index.js", @@ -19,10 +19,10 @@ "editor" ], "dependencies": { - "@ali/lowcode-designer": "^0.9.23", - "@ali/lowcode-editor-core": "^0.8.19", - "@ali/lowcode-types": "^0.8.9", - "@ali/lowcode-utils": "^0.8.10", + "@ali/lowcode-designer": "^0.9.27", + "@ali/lowcode-editor-core": "^0.8.21", + "@ali/lowcode-types": "^0.8.11", + "@ali/lowcode-utils": "^0.8.12", "@alifd/next": "^1.20.12", "classnames": "^2.2.6", "react": "^16.8.1", diff --git a/packages/editor-skeleton/src/layouts/left-fixed-pane.tsx b/packages/editor-skeleton/src/layouts/left-fixed-pane.tsx index b3d9594a7..6baf176f9 100644 --- a/packages/editor-skeleton/src/layouts/left-fixed-pane.tsx +++ b/packages/editor-skeleton/src/layouts/left-fixed-pane.tsx @@ -34,11 +34,19 @@ export default class LeftFixedPane extends Component<{ area: Area {!hideTitleBar && ( diff --git a/packages/editor-skeleton/src/layouts/workbench.less b/packages/editor-skeleton/src/layouts/workbench.less index f73c6ca52..a5ea65a77 100644 --- a/packages/editor-skeleton/src/layouts/workbench.less +++ b/packages/editor-skeleton/src/layouts/workbench.less @@ -139,10 +139,14 @@ body { height: var(--top-area-height); background-color: var(--color-pane-background); width: 100%; - display: flex; + display: none; margin-bottom: 2px; padding: 8px 12px 8px 16px; + &.lc-area-visible { + display: flex; + } + .lc-top-area-left { display: flex; align-items: center; diff --git a/packages/editor-skeleton/src/transducers/parse-props.ts b/packages/editor-skeleton/src/transducers/parse-props.ts index 3c216c396..2413ccdb2 100644 --- a/packages/editor-skeleton/src/transducers/parse-props.ts +++ b/packages/editor-skeleton/src/transducers/parse-props.ts @@ -155,6 +155,7 @@ function propTypeToSetter(propType: PropType): SetterType { return { componentName: 'MixedSetter', isRequired, + props: {}, }; } diff --git a/packages/plugin-components-pane/CHANGELOG.md b/packages/plugin-components-pane/CHANGELOG.md index 49eae1ceb..5db5e527a 100644 --- a/packages/plugin-components-pane/CHANGELOG.md +++ b/packages/plugin-components-pane/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.29](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.28...@ali/lowcode-plugin-components-pane@0.8.29) (2020-07-14) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-components-pane + + +## [0.8.28](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.27...@ali/lowcode-plugin-components-pane@0.8.28) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-components-pane + + +## [0.8.27](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.26...@ali/lowcode-plugin-components-pane@0.8.27) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-components-pane + + +## [0.8.26](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.25...@ali/lowcode-plugin-components-pane@0.8.26) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-components-pane + ## [0.8.25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-components-pane@0.8.24...@ali/lowcode-plugin-components-pane@0.8.25) (2020-06-23) diff --git a/packages/plugin-components-pane/package.json b/packages/plugin-components-pane/package.json index 77e9ab350..d1f936966 100644 --- a/packages/plugin-components-pane/package.json +++ b/packages/plugin-components-pane/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-components-pane", - "version": "0.8.25", + "version": "0.8.29", "description": "alibaba lowcode editor component-list plugin", "files": [ "es/", @@ -20,9 +20,9 @@ ], "author": "xiayang.xy", "dependencies": { - "@ali/lowcode-designer": "^0.9.23", - "@ali/lowcode-editor-core": "^0.8.19", - "@ali/lowcode-types": "^0.8.9", + "@ali/lowcode-designer": "^0.9.27", + "@ali/lowcode-editor-core": "^0.8.21", + "@ali/lowcode-types": "^0.8.11", "@ali/ve-component-list": "^1.1.1", "@alifd/next": "^1.19.19", "react": "^16.8.1" diff --git a/packages/plugin-designer/CHANGELOG.md b/packages/plugin-designer/CHANGELOG.md index 5f29c5be8..d885ed6ca 100644 --- a/packages/plugin-designer/CHANGELOG.md +++ b/packages/plugin-designer/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.9.27](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.26...@ali/lowcode-plugin-designer@0.9.27) (2020-07-14) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-designer + + +## [0.9.26](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.25...@ali/lowcode-plugin-designer@0.9.26) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-designer + + +## [0.9.25](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.24...@ali/lowcode-plugin-designer@0.9.25) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-designer + + +## [0.9.24](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.23...@ali/lowcode-plugin-designer@0.9.24) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-designer + ## [0.9.23](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-designer@0.9.21...@ali/lowcode-plugin-designer@0.9.23) (2020-06-23) diff --git a/packages/plugin-designer/package.json b/packages/plugin-designer/package.json index bed8ea603..80797c689 100644 --- a/packages/plugin-designer/package.json +++ b/packages/plugin-designer/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-designer", - "version": "0.9.23", + "version": "0.9.27", "description": "alibaba lowcode editor designer plugin", "files": [ "es", @@ -20,8 +20,8 @@ ], "author": "xiayang.xy", "dependencies": { - "@ali/lowcode-designer": "^0.9.23", - "@ali/lowcode-editor-core": "^0.8.19", + "@ali/lowcode-designer": "^0.9.27", + "@ali/lowcode-editor-core": "^0.8.21", "react": "^16.8.1", "react-dom": "^16.8.1" }, diff --git a/packages/plugin-event-bind-dialog/CHANGELOG.md b/packages/plugin-event-bind-dialog/CHANGELOG.md index 79faa2569..8efff9246 100644 --- a/packages/plugin-event-bind-dialog/CHANGELOG.md +++ b/packages/plugin-event-bind-dialog/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.20](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@0.8.19...@ali/lowcode-plugin-event-bind-dialog@0.8.20) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-event-bind-dialog + + +## [0.8.19](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@0.8.18...@ali/lowcode-plugin-event-bind-dialog@0.8.19) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-event-bind-dialog + ## [0.8.18](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-event-bind-dialog@0.8.17...@ali/lowcode-plugin-event-bind-dialog@0.8.18) (2020-06-23) diff --git a/packages/plugin-event-bind-dialog/package.json b/packages/plugin-event-bind-dialog/package.json index 546449d67..e53473bcd 100644 --- a/packages/plugin-event-bind-dialog/package.json +++ b/packages/plugin-event-bind-dialog/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-event-bind-dialog", - "version": "0.8.18", + "version": "0.8.20", "description": "alibaba lowcode editor event bind dialog plugin", "files": [ "es", @@ -19,8 +19,8 @@ ], "author": "zude.hzd", "dependencies": { - "@ali/lowcode-editor-core": "^0.8.19", - "@ali/lowcode-types": "^0.8.9", + "@ali/lowcode-editor-core": "^0.8.21", + "@ali/lowcode-types": "^0.8.11", "@alifd/next": "^1.19.16", "react": "^16.8.1", "react-dom": "^16.8.1" diff --git a/packages/plugin-outline-pane/CHANGELOG.md b/packages/plugin-outline-pane/CHANGELOG.md index 3b1c92629..b897664b2 100644 --- a/packages/plugin-outline-pane/CHANGELOG.md +++ b/packages/plugin-outline-pane/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.33](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.32...@ali/lowcode-plugin-outline-pane@0.8.33) (2020-07-14) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane + + +## [0.8.32](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.31...@ali/lowcode-plugin-outline-pane@0.8.32) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane + + +## [0.8.31](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.30...@ali/lowcode-plugin-outline-pane@0.8.31) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane + + +## [0.8.30](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.29...@ali/lowcode-plugin-outline-pane@0.8.30) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-outline-pane + ## [0.8.29](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-outline-pane@0.8.27...@ali/lowcode-plugin-outline-pane@0.8.29) (2020-06-23) diff --git a/packages/plugin-outline-pane/package.json b/packages/plugin-outline-pane/package.json index 7cfa70527..c7330826d 100644 --- a/packages/plugin-outline-pane/package.json +++ b/packages/plugin-outline-pane/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-outline-pane", - "version": "0.8.29", + "version": "0.8.33", "description": "Outline pane for Ali lowCode engine", "files": [ "es", @@ -14,10 +14,10 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-designer": "^0.9.23", - "@ali/lowcode-editor-core": "^0.8.19", - "@ali/lowcode-types": "^0.8.9", - "@ali/lowcode-utils": "^0.8.10", + "@ali/lowcode-designer": "^0.9.27", + "@ali/lowcode-editor-core": "^0.8.21", + "@ali/lowcode-types": "^0.8.11", + "@ali/lowcode-utils": "^0.8.12", "@alifd/next": "^1.19.16", "classnames": "^2.2.6", "react": "^16", diff --git a/packages/plugin-outline-pane/src/views/tree-title.tsx b/packages/plugin-outline-pane/src/views/tree-title.tsx index d891d024e..1e3ae7924 100644 --- a/packages/plugin-outline-pane/src/views/tree-title.tsx +++ b/packages/plugin-outline-pane/src/views/tree-title.tsx @@ -14,6 +14,18 @@ import { IconRadioActive } from '../icons/radio-active'; import { IconRadio } from '../icons/radio'; import { createIcon } from '@ali/lowcode-utils'; +function emitOutlineEvent(type: string, treeNode: TreeNode, rest?: object) { + const editor = globalContext.get(Editor); + const node = treeNode?.node; + const npm = node?.componentMeta?.npm; + const selected = + [npm?.package, npm?.componentName].filter((item) => !!item).join('-') || node?.componentMeta?.componentName || ''; + editor?.emit(`outlinePane.${type}`, { + selected, + ...rest, + }); +} + @observer export default class TreeTitle extends Component<{ treeNode: TreeNode; @@ -40,7 +52,9 @@ export default class TreeTitle extends Component<{ private saveEdit = (e: FocusEvent | KeyboardEvent) => { const { treeNode } = this.props; - treeNode.setTitleLabel((e.target as HTMLInputElement).value || ''); + const value = (e.target as HTMLInputElement).value || ''; + treeNode.setTitleLabel(value); + emitOutlineEvent('rename', treeNode, { value }); this.cancelEdit(); }; @@ -190,17 +204,8 @@ class HideBtn extends Component<{ treeNode: TreeNode }> { className="tree-node-hide-btn" onClick={(e) => { e.stopPropagation(); + emitOutlineEvent(treeNode.hidden ? 'show' : 'hide', treeNode); treeNode.setHidden(!treeNode.hidden); - const editor = globalContext.get(Editor); - const node = treeNode?.node; - const npm = node?.componentMeta?.npm; - const selected = - [npm?.package, npm?.componentName].filter((item) => !!item).join('-') || - node?.componentMeta?.componentName || - ''; - editor?.emit('outlinePane.hide', { - selected, - }); }} > {treeNode.hidden ? : } @@ -227,6 +232,7 @@ class ExpandBtn extends Component<{ treeNode: TreeNode }> { if (treeNode.expanded) { e.stopPropagation(); } + emitOutlineEvent(treeNode.expanded ? 'collapse' : 'expand', treeNode); treeNode.setExpanded(!treeNode.expanded); }} > diff --git a/packages/plugin-sample-logo/CHANGELOG.md b/packages/plugin-sample-logo/CHANGELOG.md index 37d8bc183..c9fdfa3f1 100644 --- a/packages/plugin-sample-logo/CHANGELOG.md +++ b/packages/plugin-sample-logo/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.19](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-logo@0.8.18...@ali/lowcode-plugin-sample-logo@0.8.19) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-sample-logo + + +## [0.8.18](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-logo@0.8.17...@ali/lowcode-plugin-sample-logo@0.8.18) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-sample-logo + ## [0.8.17](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-logo@0.8.16...@ali/lowcode-plugin-sample-logo@0.8.17) (2020-06-23) diff --git a/packages/plugin-sample-logo/package.json b/packages/plugin-sample-logo/package.json index 3f44f30da..b5247553d 100644 --- a/packages/plugin-sample-logo/package.json +++ b/packages/plugin-sample-logo/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-sample-logo", - "version": "0.8.17", + "version": "0.8.19", "description": "alibaba lowcode editor logo plugin", "files": [ "es/", @@ -20,7 +20,7 @@ ], "author": "xiayang.xy", "dependencies": { - "@ali/lowcode-editor-core": "^0.8.19", + "@ali/lowcode-editor-core": "^0.8.21", "react": "^16.8.1" }, "devDependencies": { diff --git a/packages/plugin-sample-preview/CHANGELOG.md b/packages/plugin-sample-preview/CHANGELOG.md index 241436b35..1a529346c 100644 --- a/packages/plugin-sample-preview/CHANGELOG.md +++ b/packages/plugin-sample-preview/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.31](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.30...@ali/lowcode-plugin-sample-preview@0.8.31) (2020-07-14) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview + + +## [0.8.30](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.29...@ali/lowcode-plugin-sample-preview@0.8.30) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview + + +## [0.8.29](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.28...@ali/lowcode-plugin-sample-preview@0.8.29) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview + + +## [0.8.28](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.27...@ali/lowcode-plugin-sample-preview@0.8.28) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-sample-preview + ## [0.8.27](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-sample-preview@0.8.26...@ali/lowcode-plugin-sample-preview@0.8.27) (2020-06-23) diff --git a/packages/plugin-sample-preview/package.json b/packages/plugin-sample-preview/package.json index 9b786d98b..66edd7417 100644 --- a/packages/plugin-sample-preview/package.json +++ b/packages/plugin-sample-preview/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-sample-preview", - "version": "0.8.27", + "version": "0.8.31", "description": "alibaba lowcode editor sample preview plugin", "files": [ "es", @@ -18,8 +18,8 @@ "editor" ], "dependencies": { - "@ali/lowcode-designer": "^0.9.23", - "@ali/lowcode-editor-core": "^0.8.19", + "@ali/lowcode-designer": "^0.9.27", + "@ali/lowcode-editor-core": "^0.8.21", "@alifd/next": "^1.x", "react": "^16.8.1" }, diff --git a/packages/plugin-source-editor/CHANGELOG.md b/packages/plugin-source-editor/CHANGELOG.md index 492e4dadc..48f518f4e 100644 --- a/packages/plugin-source-editor/CHANGELOG.md +++ b/packages/plugin-source-editor/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.17](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-source-editor@0.8.16...@ali/lowcode-plugin-source-editor@0.8.17) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-source-editor + + +## [0.8.16](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-source-editor@0.8.15...@ali/lowcode-plugin-source-editor@0.8.16) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-source-editor + ## [0.8.15](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-source-editor@0.8.14...@ali/lowcode-plugin-source-editor@0.8.15) (2020-06-23) diff --git a/packages/plugin-source-editor/package.json b/packages/plugin-source-editor/package.json index 7ccf98fbf..bbc58bb7b 100644 --- a/packages/plugin-source-editor/package.json +++ b/packages/plugin-source-editor/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-source-editor", - "version": "0.8.15", + "version": "0.8.17", "description": "alibaba lowcode editor source-editor plugin", "files": [ "es", @@ -19,7 +19,7 @@ ], "author": "zude.hzd", "dependencies": { - "@ali/lowcode-editor-core": "^0.8.19", + "@ali/lowcode-editor-core": "^0.8.21", "@alifd/next": "^1.19.16", "js-beautify": "^1.10.1", "prettier": "^1.18.2", diff --git a/packages/plugin-undo-redo/CHANGELOG.md b/packages/plugin-undo-redo/CHANGELOG.md index 4a4fff7e6..f8d7fc259 100644 --- a/packages/plugin-undo-redo/CHANGELOG.md +++ b/packages/plugin-undo-redo/CHANGELOG.md @@ -3,6 +3,38 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.31](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.30...@ali/lowcode-plugin-undo-redo@0.8.31) (2020-07-14) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo + + +## [0.8.30](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.29...@ali/lowcode-plugin-undo-redo@0.8.30) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo + + +## [0.8.29](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.28...@ali/lowcode-plugin-undo-redo@0.8.29) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo + + +## [0.8.28](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.27...@ali/lowcode-plugin-undo-redo@0.8.28) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-undo-redo + ## [0.8.27](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-undo-redo@0.8.26...@ali/lowcode-plugin-undo-redo@0.8.27) (2020-06-23) diff --git a/packages/plugin-undo-redo/package.json b/packages/plugin-undo-redo/package.json index 50f13180f..2bacd62f1 100644 --- a/packages/plugin-undo-redo/package.json +++ b/packages/plugin-undo-redo/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-undo-redo", - "version": "0.8.27", + "version": "0.8.31", "description": "alibaba lowcode editor undo redo plugin", "files": [ "es", @@ -19,11 +19,11 @@ ], "author": "xiayang.xy", "dependencies": { - "@ali/lowcode-designer": "^0.9.23", - "@ali/lowcode-editor-core": "^0.8.19", - "@ali/lowcode-editor-skeleton": "^0.8.29", - "@ali/lowcode-types": "^0.8.9", - "@ali/lowcode-utils": "^0.8.10", + "@ali/lowcode-designer": "^0.9.27", + "@ali/lowcode-editor-core": "^0.8.21", + "@ali/lowcode-editor-skeleton": "^0.8.33", + "@ali/lowcode-types": "^0.8.11", + "@ali/lowcode-utils": "^0.8.12", "react": "^16.8.1", "react-dom": "^16.8.1" }, diff --git a/packages/plugin-variable-bind-dialog/CHANGELOG.md b/packages/plugin-variable-bind-dialog/CHANGELOG.md index 1b40f05ad..c0b5fd0e5 100644 --- a/packages/plugin-variable-bind-dialog/CHANGELOG.md +++ b/packages/plugin-variable-bind-dialog/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.18](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-variable-bind-dialog@0.8.17...@ali/lowcode-plugin-variable-bind-dialog@0.8.18) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-variable-bind-dialog + + +## [0.8.17](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-variable-bind-dialog@0.8.16...@ali/lowcode-plugin-variable-bind-dialog@0.8.17) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-variable-bind-dialog + ## [0.8.16](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-variable-bind-dialog@0.8.15...@ali/lowcode-plugin-variable-bind-dialog@0.8.16) (2020-06-23) diff --git a/packages/plugin-variable-bind-dialog/package.json b/packages/plugin-variable-bind-dialog/package.json index b84d09ffb..43c779c80 100644 --- a/packages/plugin-variable-bind-dialog/package.json +++ b/packages/plugin-variable-bind-dialog/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-variable-bind-dialog", - "version": "0.8.16", + "version": "0.8.18", "description": "alibaba lowcode editor variable bind dialog plugin", "files": [ "es", @@ -19,7 +19,7 @@ ], "author": "zude.hzd", "dependencies": { - "@ali/lowcode-editor-core": "^0.8.19", + "@ali/lowcode-editor-core": "^0.8.21", "@alifd/next": "^1.19.16", "react": "^16.8.1", "react-dom": "^16.8.1" diff --git a/packages/plugin-zh-en/CHANGELOG.md b/packages/plugin-zh-en/CHANGELOG.md index 65cc7e928..df8c08f4a 100644 --- a/packages/plugin-zh-en/CHANGELOG.md +++ b/packages/plugin-zh-en/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.22](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-zh-en@0.8.21...@ali/lowcode-plugin-zh-en@0.8.22) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-zh-en + + +## [0.8.21](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-zh-en@0.8.20...@ali/lowcode-plugin-zh-en@0.8.21) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-plugin-zh-en + ## [0.8.20](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-plugin-zh-en@0.8.19...@ali/lowcode-plugin-zh-en@0.8.20) (2020-06-23) diff --git a/packages/plugin-zh-en/package.json b/packages/plugin-zh-en/package.json index 9be0cf901..9ed6ec9bb 100644 --- a/packages/plugin-zh-en/package.json +++ b/packages/plugin-zh-en/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-plugin-zh-en", - "version": "0.8.20", + "version": "0.8.22", "description": "alibaba lowcode editor zhong english plugin", "files": [ "es", @@ -14,9 +14,9 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-editor-core": "^0.8.19", - "@ali/lowcode-types": "^0.8.9", - "@ali/lowcode-utils": "^0.8.10", + "@ali/lowcode-editor-core": "^0.8.21", + "@ali/lowcode-types": "^0.8.11", + "@ali/lowcode-utils": "^0.8.12", "react": "^16.8.1", "react-dom": "^16.8.1" }, diff --git a/packages/react-renderer/CHANGELOG.md b/packages/react-renderer/CHANGELOG.md index 6e24cc175..6653ca184 100644 --- a/packages/react-renderer/CHANGELOG.md +++ b/packages/react-renderer/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.13](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-renderer@0.8.12...@ali/lowcode-react-renderer@0.8.13) (2020-07-12) + + +### Bug Fixes + +* 区块模板根节点支持 Div ([c3b796e](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/c3b796e)) + + +### Reverts + +* 去掉多余注释 ([2495afa](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/2495afa)) + + + + ## [0.8.12](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-renderer@0.8.11...@ali/lowcode-react-renderer@0.8.12) (2020-06-24) diff --git a/packages/react-renderer/package.json b/packages/react-renderer/package.json index 713904b9d..1e5318c21 100644 --- a/packages/react-renderer/package.json +++ b/packages/react-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-react-renderer", - "version": "0.8.12", + "version": "0.8.13", "description": "react renderer for ali lowcode engine", "main": "lib/index.js", "module": "es/index.js", diff --git a/packages/react-simulator-renderer/CHANGELOG.md b/packages/react-simulator-renderer/CHANGELOG.md index 7317c21be..8cba6101a 100644 --- a/packages/react-simulator-renderer/CHANGELOG.md +++ b/packages/react-simulator-renderer/CHANGELOG.md @@ -3,6 +3,46 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.33](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.32...@ali/lowcode-react-simulator-renderer@0.8.33) (2020-07-14) + + + + +**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer + + +## [0.8.32](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.31...@ali/lowcode-react-simulator-renderer@0.8.32) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer + + +## [0.8.31](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.30...@ali/lowcode-react-simulator-renderer@0.8.31) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-react-simulator-renderer + + +## [0.8.30](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.29...@ali/lowcode-react-simulator-renderer@0.8.30) (2020-07-12) + + +### Bug Fixes + +* 低代码组件 props 显示 object 问题 ([116498e](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/116498e)) + + +### Features + +* 支持低代码组件设计态实时改变 ([c5a817b](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/c5a817b)) + + + + ## [0.8.29](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-react-simulator-renderer@0.8.28...@ali/lowcode-react-simulator-renderer@0.8.29) (2020-06-24) diff --git a/packages/react-simulator-renderer/package.json b/packages/react-simulator-renderer/package.json index 2b4a3e23f..d31b1deb6 100644 --- a/packages/react-simulator-renderer/package.json +++ b/packages/react-simulator-renderer/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@ali/lowcode-react-simulator-renderer", - "version": "0.8.29", + "version": "0.8.33", "description": "react simulator renderer for alibaba lowcode designer", "main": "lib/index.js", "module": "es/index.js", @@ -13,10 +13,10 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-designer": "^0.9.23", - "@ali/lowcode-react-renderer": "^0.8.12", - "@ali/lowcode-types": "^0.8.9", - "@ali/lowcode-utils": "^0.8.10", + "@ali/lowcode-designer": "^0.9.27", + "@ali/lowcode-react-renderer": "^0.8.13", + "@ali/lowcode-types": "^0.8.11", + "@ali/lowcode-utils": "^0.8.12", "@ali/vu-css-style": "^1.0.2", "@recore/obx": "^1.0.8", "@recore/obx-react": "^1.0.7", diff --git a/packages/types/CHANGELOG.md b/packages/types/CHANGELOG.md index 1f5fe7e10..8953e8f5c 100644 --- a/packages/types/CHANGELOG.md +++ b/packages/types/CHANGELOG.md @@ -3,6 +3,25 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.11](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-types@0.8.10...@ali/lowcode-types@0.8.11) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-types + + +## [0.8.10](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-types@0.8.9...@ali/lowcode-types@0.8.10) (2020-07-12) + + +### Bug Fixes + +* 低代码组件 props 显示 object 问题 ([116498e](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/116498e)) + + + + ## [0.8.9](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-types@0.8.7...@ali/lowcode-types@0.8.9) (2020-06-23) diff --git a/packages/types/package.json b/packages/types/package.json index e732f99bf..4e22aaf01 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-types", - "version": "0.8.9", + "version": "0.8.11", "description": "Types for Ali lowCode engine", "files": [ "es", diff --git a/packages/types/src/transform-stage.ts b/packages/types/src/transform-stage.ts index e415d44ae..f3b968c08 100644 --- a/packages/types/src/transform-stage.ts +++ b/packages/types/src/transform-stage.ts @@ -4,4 +4,5 @@ export enum TransformStage { Save = 3, Clone = 4, Init = 5, + Upgrade = 6, } diff --git a/packages/utils/CHANGELOG.md b/packages/utils/CHANGELOG.md index 124dfe78e..994aaab03 100644 --- a/packages/utils/CHANGELOG.md +++ b/packages/utils/CHANGELOG.md @@ -3,6 +3,22 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.12](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-utils@0.8.11...@ali/lowcode-utils@0.8.12) (2020-07-13) + + + + +**Note:** Version bump only for package @ali/lowcode-utils + + +## [0.8.11](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-utils@0.8.10...@ali/lowcode-utils@0.8.11) (2020-07-12) + + + + +**Note:** Version bump only for package @ali/lowcode-utils + ## [0.8.10](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-utils@0.8.8...@ali/lowcode-utils@0.8.10) (2020-06-23) diff --git a/packages/utils/package.json b/packages/utils/package.json index 5aafff2cc..5477b47cb 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-utils", - "version": "0.8.10", + "version": "0.8.12", "description": "Utils for Ali lowCode engine", "files": [ "es", @@ -14,7 +14,7 @@ "test:snapshot": "ava --update-snapshots" }, "dependencies": { - "@ali/lowcode-types": "^0.8.9", + "@ali/lowcode-types": "^0.8.11", "@alifd/next": "^1.19.16", "react": "^16" },