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 dc048682a..88f773416 100644 --- a/packages/code-generator/CHANGELOG.md +++ b/packages/code-generator/CHANGELOG.md @@ -3,6 +3,24 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.10](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-code-generator@0.8.9...@ali/lowcode-code-generator@0.8.10) (2020-07-21) + + +### Bug Fixes + +* 修复 condition 代码导出错误 ([57b30cf](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/57b30cf)) +* 新增自定义模式 demo & 导出自定义需要的信息 ([07e2759](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/07e2759)) + + +### Features + +* add zip publisher ([31156ed](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/31156ed)) +* prepare publish for code-generator ([93ff5c2](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/93ff5c2)) + + + + ## [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) diff --git a/packages/code-generator/demo/demo.js b/packages/code-generator/demo/demo.js index 28b741f4a..4d36348b0 100644 --- a/packages/code-generator/demo/demo.js +++ b/packages/code-generator/demo/demo.js @@ -169,7 +169,104 @@ function exportProject() { }); } +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(); -demo(); +exportProject(); diff --git a/packages/code-generator/package.json b/packages/code-generator/package.json index bfe83ccf4..4f3b87d88 100644 --- a/packages/code-generator/package.json +++ b/packages/code-generator/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-code-generator", - "version": "0.8.9", + "version": "0.8.10", "description": "出码引擎 for LowCode Engine", "main": "lib/index.js", "files": [ diff --git a/packages/demo/CHANGELOG.md b/packages/demo/CHANGELOG.md index 95527c4d6..0255f6927 100644 --- a/packages/demo/CHANGELOG.md +++ b/packages/demo/CHANGELOG.md @@ -3,6 +3,129 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +## [0.8.52](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.51...@ali/lowcode-demo@0.8.52) (2020-08-14) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + + +## [0.8.51](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.50...@ali/lowcode-demo@0.8.51) (2020-08-07) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + + +## [0.8.50](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.49...@ali/lowcode-demo@0.8.50) (2020-08-06) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + + +## [0.8.49](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.48...@ali/lowcode-demo@0.8.49) (2020-08-06) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + + +## [0.8.48](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.47...@ali/lowcode-demo@0.8.48) (2020-08-06) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + + +## [0.8.47](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.46...@ali/lowcode-demo@0.8.47) (2020-08-04) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + + +## [0.8.46](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.44...@ali/lowcode-demo@0.8.46) (2020-08-04) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + + +## [0.8.45](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.44...@ali/lowcode-demo@0.8.45) (2020-08-04) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + + +## [0.8.44](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.43...@ali/lowcode-demo@0.8.44) (2020-07-29) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + + +## [0.8.43](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.42...@ali/lowcode-demo@0.8.43) (2020-07-28) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + + +## [0.8.42](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.41...@ali/lowcode-demo@0.8.42) (2020-07-23) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + + +## [0.8.41](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.40...@ali/lowcode-demo@0.8.41) (2020-07-22) + + +### Features + +* rax render ([95bf331](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/95bf331)) + + + + + +## [0.8.40](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.39...@ali/lowcode-demo@0.8.40) (2020-07-21) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + + +## [0.8.39](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.38...@ali/lowcode-demo@0.8.39) (2020-07-21) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + + +## [0.8.38](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-demo@0.8.37...@ali/lowcode-demo@0.8.38) (2020-07-21) + + + + +**Note:** Version bump only for package @ali/lowcode-demo + ## [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) diff --git a/packages/demo/build.json b/packages/demo/build.json index 83cf581dd..42ade8d92 100644 --- a/packages/demo/build.json +++ b/packages/demo/build.json @@ -2,7 +2,8 @@ "entry": { "index": "src/index", "editor-preset-vision": "../editor-preset-vision/src/index.ts", - "react-simulator-renderer": "../react-simulator-renderer/src/index.ts" + "react-simulator-renderer": "../react-simulator-renderer/src/index.ts", + "rax-simulator-renderer": "../rax-simulator-renderer/src/index.ts" }, "vendor": false, "devServer": { @@ -15,7 +16,8 @@ "prop-types": "var window.PropTypes", "@alifd/next": "var window.Next", "@ali/visualengine": "var window.VisualEngine", - "@ali/visualengine-utils": "var window.VisualEngineUtils" + "@ali/visualengine-utils": "var window.VisualEngineUtils", + "rax": "var window.Rax" }, "plugins": [ [ diff --git a/packages/demo/build.plugin.js b/packages/demo/build.plugin.js index 53380e73a..9e95cbd09 100644 --- a/packages/demo/build.plugin.js +++ b/packages/demo/build.plugin.js @@ -10,12 +10,15 @@ module.exports = ({ onGetWebpackConfig }) => { ]); config - // 定义插件名称 - .plugin('MonacoWebpackPlugin') - // 第一项为具体插件,第二项为插件参数 - .use(new MonacoWebpackPlugin({ - languages:["typescript","css","json"] - }), []); + // 定义插件名称 + .plugin('MonacoWebpackPlugin') + // 第一项为具体插件,第二项为插件参数 + .use( + new MonacoWebpackPlugin({ + languages: ['typescript', 'css', 'json'], + }), + [], + ); config.plugins.delete('hot'); config.devServer.hot(false); diff --git a/packages/demo/cloud-build.json b/packages/demo/cloud-build.json index 934ab050f..1d0afbef7 100644 --- a/packages/demo/cloud-build.json +++ b/packages/demo/cloud-build.json @@ -12,9 +12,9 @@ "@ali/lowcode-editor-preset-general": "window.LowcodeEditor", "@ali/lowcode-editor-core": "window.LowcodeEditor", "@ali/lowcode-editor-skeleton": "window.LowcodeEditor", - "@ali/lowcode-designer": "window.LowcodeEditor" + "@ali/lowcode-designer": "window.LowcodeEditor", + "rax": "var window.Rax" }, - "minify": false, "sourcemap": true, "outputAssetsPath": { "js": "", "css": "" diff --git a/packages/demo/package.json b/packages/demo/package.json index d27c683ca..2f7d352d7 100644 --- a/packages/demo/package.json +++ b/packages/demo/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-demo", - "version": "0.8.37", + "version": "0.8.52", "private": true, "description": "低代码引擎 DEMO", "scripts": { @@ -9,21 +9,21 @@ }, "config": {}, "dependencies": { - "@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-editor-core": "^0.8.28", + "@ali/lowcode-editor-skeleton": "^0.8.48", + "@ali/lowcode-plugin-components-pane": "^0.8.44", + "@ali/lowcode-plugin-designer": "^0.9.42", + "@ali/lowcode-plugin-event-bind-dialog": "^0.8.27", + "@ali/lowcode-plugin-outline-pane": "^0.8.48", + "@ali/lowcode-plugin-sample-logo": "^0.8.26", + "@ali/lowcode-plugin-sample-preview": "^0.8.46", "@ali/lowcode-plugin-settings-pane": "^0.8.8", - "@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-plugin-undo-redo": "^0.8.46", + "@ali/lowcode-plugin-variable-bind-dialog": "^0.8.25", + "@ali/lowcode-plugin-zh-en": "^0.8.29", + "@ali/lowcode-react-renderer": "^0.8.18", "@ali/lowcode-runtime": "^0.8.16", - "@ali/lowcode-utils": "^0.8.12", + "@ali/lowcode-utils": "^0.8.16", "@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/demo/public/index.html b/packages/demo/public/index.html index d0da148ba..df3c24fa5 100644 --- a/packages/demo/public/index.html +++ b/packages/demo/public/index.html @@ -16,6 +16,7 @@ +