From a37d6550da0f0919917b7d21a3a94af488b119fc Mon Sep 17 00:00:00 2001 From: gengyang Date: Wed, 1 Apr 2020 10:38:12 +0800 Subject: [PATCH 1/5] fix: fix bug of missing ajv --- packages/material-parser/package.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/material-parser/package.json b/packages/material-parser/package.json index dab853438..a978e307f 100644 --- a/packages/material-parser/package.json +++ b/packages/material-parser/package.json @@ -13,8 +13,6 @@ "@types/js-yaml": "^3.12.2", "@types/lodash": "^4.14.149", "@types/semver": "^7.1.0", - "ajv": "^6.10.2", - "better-ajv-errors": "^0.6.4", "globby": "^10.0.1", "jest": "^24.8.0", "jest-watch-typeahead": "^0.3.1", @@ -48,6 +46,7 @@ "@babel/parser": "^7.8.4", "@babel/traverse": "^7.8.4", "@babel/types": "^7.8.3", + "ajv": "^6.12.0", "ast-types": "^0.13.3", "cross-spawn-promise": "^0.10.2", "debug": "^4.1.1", From 5d8000a991f4776ce9398ce938fcb0463294ce7e Mon Sep 17 00:00:00 2001 From: gengyang Date: Wed, 1 Apr 2020 11:29:18 +0800 Subject: [PATCH 2/5] Publish - @ali/lowcode-material-parser@0.9.1 --- packages/material-parser/CHANGELOG.md | 11 +++++++++++ packages/material-parser/package.json | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/material-parser/CHANGELOG.md b/packages/material-parser/CHANGELOG.md index cc9d6a4cf..0bf74fb7e 100644 --- a/packages/material-parser/CHANGELOG.md +++ b/packages/material-parser/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.9.1](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-material-parser@0.9.0...@ali/lowcode-material-parser@0.9.1) (2020-04-01) + + +### Bug Fixes + +* fix bug of missing ajv ([a37d655](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/commit/a37d655)) + + + + + # [0.9.0](https://gitlab.alibaba-inc.com/ali-lowcode/ali-lowcode-engine/compare/@ali/lowcode-material-parser@0.8.4...@ali/lowcode-material-parser@0.9.0) (2020-03-31) diff --git a/packages/material-parser/package.json b/packages/material-parser/package.json index a978e307f..bd59b4ac4 100644 --- a/packages/material-parser/package.json +++ b/packages/material-parser/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-material-parser", - "version": "0.9.0", + "version": "0.9.1", "description": "material parser for Ali lowCode engine", "main": "lib/index.js", "files": [ From de4e0be01d51ff21350ac331476c147fc542dd00 Mon Sep 17 00:00:00 2001 From: "wuyue.xht" Date: Wed, 1 Apr 2020 13:16:44 +0800 Subject: [PATCH 3/5] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3registerLayout?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/demo/src/app/index.ts | 2 +- packages/runtime/package.json | 2 +- packages/runtime/src/core/container.ts | 11 +++++++- packages/runtime/src/core/index.ts | 6 ++--- packages/runtime/src/core/provider/index.ts | 30 ++++++++++++++++++--- 5 files changed, 42 insertions(+), 9 deletions(-) diff --git a/packages/demo/src/app/index.ts b/packages/demo/src/app/index.ts index f4df24866..d78f6211a 100644 --- a/packages/demo/src/app/index.ts +++ b/packages/demo/src/app/index.ts @@ -8,7 +8,7 @@ import Preview from './plugins/provider'; app.registerRenderer(Renderer); // 注册布局组件，可注册多个 -app.registerLayout('BasicLayout', BasicLayout); +app.registerLayout(BasicLayout, { componentName: 'BasicLayout' }); // 注册页面 Loading app.registerLoading(FusionLoading); diff --git a/packages/runtime/package.json b/packages/runtime/package.json index 4b99d22eb..2236fa63c 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-runtime", - "version": "0.8.6", + "version": "0.8.7", "description": "Runtime for Ali lowCode engine", "files": [ "es", diff --git a/packages/runtime/src/core/container.ts b/packages/runtime/src/core/container.ts index c6b2bfc53..677fd32ad 100644 --- a/packages/runtime/src/core/container.ts +++ b/packages/runtime/src/core/container.ts @@ -1,6 +1,11 @@ import { ReactType } from 'react'; import Provider from './provider'; +export interface ILayoutOptions { + componentName?: string; + props?: any; +} + export default class Container { private renderer: ReactType | null = null; private layouts: { [key: string]: ReactType } = {}; @@ -11,7 +16,11 @@ export default class Container { this.renderer = renderer; } - registerLayout(componentName: string, Layout: ReactType): any { + registerLayout(Layout: ReactType, options: ILayoutOptions): any { + if (!options) { + return; + } + const { componentName } = options; if (!componentName || !Layout) { return; } diff --git a/packages/runtime/src/core/index.ts b/packages/runtime/src/core/index.ts index bd1758b52..076fbc2ce 100644 --- a/packages/runtime/src/core/index.ts +++ b/packages/runtime/src/core/index.ts @@ -1,5 +1,5 @@ import { ReactType } from 'react'; -import Container from './container'; +import Container, { ILayoutOptions } from './container'; import run from './run'; class App { @@ -17,8 +17,8 @@ class App { this.container.registerRenderer(renderer); } - registerLayout(componentName: string, Layout: ReactType): any { - this.container.registerLayout(componentName, Layout); + registerLayout(Layout: ReactType, options: ILayoutOptions): any { + this.container.registerLayout(Layout, options); } registerLoading(component: ReactType) { diff --git a/packages/runtime/src/core/provider/index.ts b/packages/runtime/src/core/provider/index.ts index 77f1d388d..fb3512c68 100644 --- a/packages/runtime/src/core/provider/index.ts +++ b/packages/runtime/src/core/provider/index.ts @@ -27,7 +27,7 @@ interface IHistoryConfig { basement?: string; } -interface IAppData { +export interface IAppData { history?: HistoryMode; layout?: ILayoutConfig; routes?: IRouterConfig; @@ -36,6 +36,7 @@ interface IAppData { componentsMap?: IComponentMap[]; utils?: IUtils; constants?: IConstants; + i18n?: I18n; } export interface ComponentProps { @@ -92,6 +93,13 @@ export interface ComponentModel { loopArgs?: string[]; } +export interface I18n { + 'zh-CN': { [key: string]: string }; + 'en-US': { [key: string]: string }; +} + +type Locale = 'zh-CN' | 'en-US'; + // export interface IProvider { // init?(): void; // getAppData?(appkey: string): Promise; @@ -109,6 +117,7 @@ export default class Provider { private componentsMap: IComponentMap[] = []; private history: HistoryMode = 'hash'; private containerId = ''; + private i18n: I18n | null = null; private lazyElementsMap: { [key: string]: any } = {}; constructor() { @@ -118,15 +127,16 @@ export default class Provider { async(): Promise { return new Promise(async (resolve, reject) => { try { - const appData = await this.getAppData(); + const appData: IAppData = await this.getAppData(); if (!appData) { return; } - const { history, layout, routes, containerId, components, componentsMap, utils, constants } = appData; + const { history, layout, routes, containerId, components, componentsMap, utils, constants, i18n } = appData; this.setHistory(history); this.setLayoutConfig(layout); this.setRouterConfig(routes); this.setContainerId(containerId); + this.setI18n(i18n); this.registerComponents(components); this.registerComponentsMap(componentsMap); this.registerUtils(utils); @@ -220,6 +230,13 @@ export default class Provider { this.containerId = id; } + setI18n(i18n: I18n) { + if (!i18n) { + return; + } + this.i18n = i18n; + } + setlazyElement(pageId: string, cache: any) { if (!pageId || !cache) { return; @@ -281,6 +298,13 @@ export default class Provider { return this.containerId; } + getI18n(locale?: Locale) { + if (!this.i18n) { + return; + } + return locale ? this.i18n[locale] : this.i18n; + } + getlazyElement(pageId: string) { if (!pageId) { return; From ee55d43fd97c7d5d365996115e0ec396c3d69cde Mon Sep 17 00:00:00 2001 From: "wuyue.xht" Date: Wed, 1 Apr 2020 13:18:45 +0800 Subject: [PATCH 4/5] chore: @ali/lowcode-runtime@0.8.8 --- packages/runtime/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/runtime/package.json b/packages/runtime/package.json index 2236fa63c..862cc38d9 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-runtime", - "version": "0.8.7", + "version": "0.8.8", "description": "Runtime for Ali lowCode engine", "files": [ "es", From f15aefd88137667af94a0e83e2d0e8c6c5f3871e Mon Sep 17 00:00:00 2001 From: "wuyue.xht" Date: Wed, 1 Apr 2020 13:38:17 +0800 Subject: [PATCH 5/5] chore: @ali/lowcode-runtime@0.8.9 --- packages/runtime/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/runtime/package.json b/packages/runtime/package.json index 862cc38d9..191b3e633 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -1,6 +1,6 @@ { "name": "@ali/lowcode-runtime", - "version": "0.8.8", + "version": "0.8.9", "description": "Runtime for Ali lowCode engine", "files": [ "es",