diff --git a/deploy-space/static/index.html b/deploy-space/static/index.html index 3b4cbddc2..e7ff4ba73 100644 --- a/deploy-space/static/index.html +++ b/deploy-space/static/index.html @@ -21,7 +21,7 @@ + + + + + + + + + + + + + + + +``` +> 注：如果 unpkg 的服务比较缓慢，您可以使用 alicdn 来获得确定版本的低代码引擎，如对于引擎的 1.0.1 版本，可用 [https://alifd.alicdn.com/npm/@alilc/lowcode-engine@1.0.1/dist/js/engine-core.js](https://alifd.alicdn.com/npm/@alilc/lowcode-engine@1.0.1/dist/js/engine-core.js) + + +## 配置打包 + +因为这些资源已经通过 UMD 方式引入，所以在 Webpack 等构建工具中需要配置它们为 external，不再重复打包： + +```javascript +{ + "externals": { + "react": "var window.React", + "react-dom": "var window.ReactDOM", + "prop-types": "var window.PropTypes", + "@alifd/next": "var window.Next", + "@alilc/lowcode-engine": "var window.AliLowCodeEngine", + "@alilc/lowcode-editor-core": "var window.AliLowCodeEngine.common.editorCabin", + "@alilc/lowcode-editor-skeleton": "var window.AliLowCodeEngine.common.skeletonCabin", + "@alilc/lowcode-designer": "var window.AliLowCodeEngine.common.designerCabin", + "@alilc/lowcode-engine-ext": "var window.AliLowCodeEngineExt", + "@ali/lowcode-engine": "var window.AliLowCodeEngine", + "moment": "var window.moment", + "lodash": "var window._" + } +} +``` + +## 初始化低代码编辑器 + +### 方法 2.1 使用 init 进行初始化 + +正确引入后，我们可以直接通过 window 上的变量进行引用，如 `window.AliLowCodeEngine.init`。您可以直接通过此方式初始化低代码引擎： + +```javascript +// 确保在执行此命令前，在 中已有一个 id 为 lce-container 的
+window.AliLowCodeEngine.init(document.getElementById('lce-container'), { + enableCondition: true, + enableCanvasLock: true, +}); +``` + +如果您的项目中使用了 TypeScript，您可以通过如下 devDependencies 引入相关包，并获得对应的类型推断。 +```javascript +// package.json +{ + "devDependencies": { + "@alilc/lowcode-engine": "beta" + } +} +``` +```javascript +import { init } from '@alilc/lowcode-engine'; + +init(document.getElementById('lce-container'), { + enableCondition: true, + enableCanvasLock: true, +}); +``` + +init 的功能包括但不限于： + +1. 传递 options 并设置 config 对象； +2. 传递 preference 并设置 plugins 入参； +3. 初始化 Workbench； + +> 本节中的低代码编辑器例子可以在 demo 中找到：[https://github.com/alibaba/lowcode-demo/blob/main/src/index.ts#L21-L34](https://github.com/alibaba/lowcode-demo/blob/main/src/index.ts#L21-L34) + + +### 方法 2.2 使用 skeletonCabin.Workbench 方式初始化 + +`init()` 内部会调用 `ReactDOM.render()` 函数，因此这样初始化的内容没有办法与外部的 React 组件进行通信，也就没有办法在一些自定义的 plugin 中获取 redux 上的全局数据等内容。 +因此，这种场景下您可以通过 `skeletonCabin.Workbench` 进行初始化。 + +> 注：您不需要同时使用 2.1 和 2.2 的方法。根据使用场景，只有需要低代码引擎插件和外界进行一定通信时，2.2 提供的方法才是必要的。 + + +```javascript +import React, { useState, useEffect } from 'react' +import { project, plugins, common, skeleton } from '@alilc/lowcode-engine' + +// 此 schema 参考 demo 中的默认 schema 书写 +import userSchema from './schema.json' + +export default function EditorView() { + /** 插件是否已初始化成功，因为必须要等插件初始化后才能渲染 Workbench */ + const [hasPluginInited, setHasPluginInited] = useState(false); + + useEffect(() => { + plugins.init().then(() => { + setHasPluginInited(true) + }).catch(err => console.error(err)) + }, []); + + useEffect(() => { + project.importSchema(userSchema) + }, [userSchema]); + + if (!hasPluginInited) { + return null; + } + + return ( + + ); +} +``` + +> 本节中的低代码编辑器类似的例子可以在 demo 中找到：[https://github.com/alibaba/lowcode-demo/blob/main/src/scenarios/custom-initialization/index.tsx](https://github.com/alibaba/lowcode-demo/blob/main/src/scenarios/custom-initialization/index.tsx) + + +# 配置低代码编辑器 +详见“低代码扩展简述“章节。 diff --git a/docs/docs/guide/create/useRenderer.md b/docs/docs/guide/create/useRenderer.md new file mode 100644 index 000000000..4f7a0a08b --- /dev/null +++ b/docs/docs/guide/create/useRenderer.md @@ -0,0 +1,100 @@ +--- +title: 接入运行时 +sidebar_position: 1 +--- + +低代码引擎的编辑器将产出两份数据： + +- 资产包数据 assets：包含物料名称、包名及其获取方式，对应协议中的[《低代码引擎资产包协议规范》](https://lowcode-engine.cn/assets) +- 页面数据 schema：包含页面结构信息、生命周期和代码信息，对应协议中的[《低代码引擎搭建协议规范》](https://lowcode-engine.cn/lowcode) + +经过上述两份数据，可以直接交由渲染模块或者出码模块来运行，二者的区别在于： + +- 渲染模块：使用资产包数据、页面数据和低代码运行时，并且允许维护者在低代码编辑器中用 Low Code 的方式继续维护； +- 出码模块：不依赖低代码运行时和页面数据，直接生成可直接运行的代码，并且允许维护者用 Pro Code 的方式继续维护，但无法再利用用低代码编辑器； + +## 渲染模块 + +[在 Demo 中](https://lowcode-engine.cn/demo)，右上角有渲染模块的示例使用方式： +![Mar-13-2022 16-52-49.gif](https://cdn.nlark.com/yuque/0/2022/gif/242652/1647161579197-20c72ea4-6d9a-4692-9b23-005182f6387e.gif#clientId=u244806d0-100a-4&crop=0&crop=0&crop=1&crop=1&from=ui&id=u9b403d3d&margin=%5Bobject%20Object%5D&name=Mar-13-2022%2016-52-49.gif&originHeight=514&originWidth=1534&originalType=binary&ratio=1&rotation=0&showTitle=false&size=755539&status=done&style=stroke&taskId=u14f0f4c2-4d6c-4296-b2df-ccda870faff&title=) + +基于官方提供的渲染模块 [@alifd/lowcode-react-renderer](https://github.com/alibaba/lowcode-engine/tree/main/packages/react-renderer)，你可以在 React 上下文渲染低代码编辑器产出的页面。 + +### 构造渲染模块所需数据 + +渲染模块所需要的数据需要通过编辑器产出的数据进行一定的转换，规则如下： + +- schema：从编辑器产出的 projectSchema 中拿到 componentsTree 中的首项，即 `projectSchema.componentsTree[0]`； +- components：需要根据编辑器产出的资产包 assets 中，根据页面 projectSchema 中声明依赖的 componentsMap，来加载所有依赖的资产包，最后获取资产包的实例并生成物料 - 资产包的键值对 components。 + +这个过程可以参考 demo 项目中的 `src/preview.tsx`： +```typescript +async function getSchemaAndComponents() { + const packages = JSON.parse(window.localStorage.getItem('packages') || ''); + const projectSchema = JSON.parse(window.localStorage.getItem('projectSchema') || ''); + const { componentsMap: componentsMapArray, componentsTree } = projectSchema; + const componentsMap: any = {}; + componentsMapArray.forEach((component: any) => { + componentsMap[component.componentName] = component; + }); + const schema = componentsTree[0]; + + const libraryMap = {}; + const libraryAsset = []; + packages.forEach(({ package: _package, library, urls, renderUrls }) => { + libraryMap[_package] = library; + if (renderUrls) { + libraryAsset.push(renderUrls); + } else if (urls) { + libraryAsset.push(urls); + } + }); + + const vendors = [assetBundle(libraryAsset, AssetLevel.Library)]; + + const assetLoader = new AssetLoader(); + await assetLoader.load(libraryAsset); + const components = await injectComponents(buildComponents(libraryMap, componentsMap)); + + return { + schema, + components, + }; +} +``` + +### 进行渲染 + +拿到 schema 和 components 以后，您可以借由资产包数据和页面数据来完成页面的渲染： +```tsx +import React from 'react'; +import ReactRenderer from '@alilc/lowcode-react-renderer'; + +const SamplePreview = () => { + return ( + + ) +} +``` + +> 注：您可以注意到，此处是依赖了 React 进行渲染的，对于 Vue 形态的渲染或编辑器支持，详见[对应公告](https://github.com/alibaba/lowcode-engine/issues/236)。 +> 本节示例可在 Demo 代码里找到：[https://github.com/alibaba/lowcode-demo/blob/main/src/preview.tsx](https://github.com/alibaba/lowcode-demo/blob/main/src/preview.tsx#L54-L58) + + +## 出码模块 + +[在 Demo 中](https://lowcode-engine.cn/demo)，右上角有出码模块的示例使用方式： +![Mar-13-2022 16-55-56.gif](https://cdn.nlark.com/yuque/0/2022/gif/242652/1647161777243-b16045c4-3cac-4920-8e68-ce064a90fe26.gif#clientId=u244806d0-100a-4&crop=0&crop=0&crop=1&crop=1&from=ui&id=ud7bfd5a2&margin=%5Bobject%20Object%5D&name=Mar-13-2022%2016-55-56.gif&originHeight=514&originWidth=1536&originalType=binary&ratio=1&rotation=0&showTitle=false&size=1727314&status=done&style=stroke&taskId=u4e079100-d6a0-4ad2-ac0c-938ab8e7759&title=) + +> 本节示例可在出码插件里找到：[https://github.com/alibaba/lowcode-code-generator-demo](https://github.com/alibaba/lowcode-code-generator-demo) + + +## 低代码的生产和消费 + +经过“接入编辑器” - “接入运行时” 这两节的介绍，我们已经可以了解到低代码所构建的生产和消费流程了，梳理如下图： +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644405393410-1c54fa37-74de-4c48-a4a9-1cbce359feeb.png#clientId=ua752ee55-c225-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=396&id=u4ceefadb&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1786&originWidth=3206&originalType=binary&ratio=1&rotation=0&showTitle=false&size=312489&status=done&style=none&taskId=uae8eacd1-4c05-4689-bb6a-24ceb76327d&title=&width=710) + +如上述流程所示，您一般需要一个后端项目来保存页面数据信息，如果资产包信息是动态的，也需要保存资产包信息。 diff --git a/docs/docs/guide/design/_category_.json b/docs/docs/guide/design/_category_.json new file mode 100644 index 000000000..1868732be --- /dev/null +++ b/docs/docs/guide/design/_category_.json @@ -0,0 +1,6 @@ +{ + "label": "引擎设计原理", + "position": 3, + "collapsed": false, + "collapsible": true +} diff --git a/docs/docs/guide/design/datasourceEngine.md b/docs/docs/guide/design/datasourceEngine.md new file mode 100644 index 000000000..1ea076866 --- /dev/null +++ b/docs/docs/guide/design/datasourceEngine.md @@ -0,0 +1,153 @@ +--- +title: 数据源引擎设计 +sidebar_position: 7 +--- +## 核心原理 + +考虑之后的扩展性和兼容性，核心分为了 2 类包，一个是 **datasource-engine** ，另一个是 **datasource-engine-x-handler** ，x 的意思其实是对应数据源的 type，比如说 **datasource-engine-mtop-handler**，也就是说我们会将真正的请求工具放在 handler 里面去处理，engine 在使用的时候由使用方自身来决定需要注册哪些 handler，这样的目的有 2 个，一个是如果将所有的 handler 都放到一个包，对于端上来说这个包过大，有一些浪费资源和损耗性能的问题，另一个是如果有新的类型的数据源出现，只需要按照既定的格式去新增一个对应的 handler 处理器即可，达到了高扩展性的目的； + +![](https://intranetproxy.alipay.com/skylark/lark/0/2020/png/275191/1599545889374-73acbe09-3bb6-4df9-b6f9-80a86764afa2.png?x-oss-process=image%2Fresize%2Cw_720#crop=0&crop=0&crop=1&crop=1&id=zq0Rr&originHeight=370&originWidth=720&originalType=binary&ratio=1&rotation=0&showTitle=false&status=done&style=none&title=) + +### DataSourceEngine + +- engine： engine 主要分 2 类，一类是面向 render 引擎的，可以从 engine/interpret 引入，一类是面向出码或者说直接单纯使用数据源引擎的场景，可以从 engine/runtime 引入，代码如下 + +```javascript +import { createInterpret, createRuntime } from '@alilc/lowcode-datasource-engine'; +``` + +create 方法定义如下 + +```javascript +interface IDataSourceEngineFactory { + create(dataSource: DataSource, context: Omit, extraConfig?: { + requestHandlersMap: RequestHandlersMap; + [key: string]: any; + }): IDataSourceEngine; +} +``` + +create 接收三个参数，第一个是 DataSource，对于运行时渲染和出码来说，DataSource 的定义分别如下： + +```javascript +/** + * 数据源对象--运行时渲染 + * @see https://yuque.antfin-inc.com/mo/spec/spec-low-code-building-schema#XMeF5 + */ +export interface DataSource { + list: DataSourceConfig[]; + dataHandler?: JSFunction; +} +/** + * 数据源对象 + * @see https://yuque.antfin-inc.com/mo/spec/spec-low-code-building-schema#XMeF5 + */ +export interface DataSourceConfig { + id: string; + isInit: boolean | JSExpression; + type: string; + requestHandler?: JSFunction; + dataHandler?: JSFunction; + options?: { + uri: string | JSExpression; + params?: JSONObject | JSExpression; + method?: string | JSExpression; + isCors?: boolean | JSExpression; + timeout?: number | JSExpression; + headers?: JSONObject | JSExpression; + [option: string]: CompositeValue; + }; + [otherKey: string]: CompositeValue; +} +``` + +但是对于出码来说，create 和 DataSource 定义如下： + +```javascript +export interface IRuntimeDataSourceEngineFactory { + create(dataSource: RuntimeDataSource, context: Omit, extraConfig?: { + requestHandlersMap: RequestHandlersMap; + [key: string]: any; + }): IDataSourceEngine; +} + +export interface RuntimeOptionsConfig { + uri: string; + params?: Record; + method?: string; + isCors?: boolean; + timeout?: number; + headers?: Record; + shouldFetch?: () => boolean; + [option: string]: unknown; +} +export declare type RuntimeOptions = () => RuntimeOptionsConfig; // 考虑需要动态获取值的情况，这里在运行时会真正的转为一个 function + +export interface RuntimeDataSourceConfig { + id: string; + isInit: boolean; + type: string; + requestHandler?: () => {}; + dataHandler: (data: unknown, err?: Error) => {}; + options?: RuntimeOptions; + [otherKey: string]: unknown; +} +/** + * 数据源对象 + * @see https://yuque.antfin-inc.com/mo/spec/spec-low-code-building-schema#XMeF5 + */ +export interface RuntimeDataSource { + list: RuntimeDataSourceConfig[]; + dataHandler?: (dataMap: DataSourceMap) => void; +} +``` + +2 者的区别还是比较明显的，一个是带 js 表达式一类的字符串，另一个是真正转为直接可以运行的 js 代码，对于出码来说，转为可执行的 js 代码的过程是出码自身负责的，对于渲染引擎来说，它只能接受到初始的 schema json 所以需要数据源引擎来做转化 + +- context：数据源引擎内部有一些使用了 this 的表达式，这些表达式需要求值的时候依赖上下文，因此需要将当前的上下文丢给数据源引擎，另外在 handler 里面去赋值的时候，也会用到诸如 setState 这种上下文里面的 api，当然，这个是可选的，我们后面再说。 + +```javascript +/** + * 运行时上下文--暂时是参考 react，当然可以自己构建，完全没问题 + */ +export interface IRuntimeContext> { + /** 当前容器的状态 */ + readonly state: TState; + /** 设置状态(浅合并) */ + setState(state: Partial): void; + /** 自定义的方法 */ + [customMethod: string]: any; + /** 数据源, key 是数据源的 ID */ + dataSourceMap: Record; + /** 重新加载所有的数据源 */ + reloadDataSource(): Promise; + /** 页面容器 */ + readonly page: IRuntimeContext & { + readonly props: Record; + }; + /** 低代码业务组件容器 */ + readonly component: IRuntimeContext & { + readonly props: Record; + }; +} +``` + +- extraConfig：这个字段是为了留着扩展用的，除了一个必填的字段 **requestHandlersMap** + +```javascript +export declare type RequestHandler = (ds: RuntimeDataSourceConfig, context: IRuntimeContext) => Promise>; +export declare type RequestHandlersMap = Record; +``` + +RequestHandlersMap 是一个把数据源以及对应的数据源 handler 关联起来的桥梁，它的 key 对应的是数据源 DataSourceConfig 的 type，比如 mtop/http/jsonp ... ，每个类型的数据源在真正使用的时候会调用对应的 type-handler，并将当前的参数和上下文带给对应的 handler。 + +create 调用结束后，可以获取到一个 DataSourceEngine 实例 + +```javascript +export interface IDataSourceEngine { + /** 数据源, key 是数据源的 ID */ + dataSourceMap: Record; + /** 重新加载所有的数据源 */ + reloadDataSource(): Promise; +} +``` diff --git a/docs/docs/guide/design/editor.md b/docs/docs/guide/design/editor.md new file mode 100644 index 000000000..d861ae7d6 --- /dev/null +++ b/docs/docs/guide/design/editor.md @@ -0,0 +1,283 @@ +--- +title: 编排模块设计 +sidebar_position: 3 +--- +本篇重点介绍如何从零开始设计编排模块，设计思路是什么？思考编排的本质是什么？围绕着本质，如何设计并实现对应的功能模块。 + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644397577227-99a77c7d-6a6e-4d92-b222-eaac0ee7988e.png#clientId=u45d0137b-8a6f-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=540&id=u4613aa03&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1080&originWidth=1920&originalType=binary&ratio=1&rotation=0&showTitle=false&size=911801&status=done&style=none&taskId=u449864e5-516f-41eb-b86a-7c026b797a8&title=&width=960) + +# 编排是什么 +所谓编排，即将设计器中的所有物料，进行布局设置、组件设置、交互设置（JS编写/逻辑编排）后，形成符合业务诉求的 schema 描述。 +# 编排的本质 +首先，思考编排的本质是什么？ +编排的本质是生产符合《阿里巴巴中后台前端搭建协议规范》的数据**，**在这个场景里，协议是通过 JSON 来承载的。如： +```json +{ + "componentName": "Page", + "props": { + "layout": "wide", + }, + "children": [ + { + "componentName": "Button", + "props": { + "size": "large" + } + } + ] +} +``` + +可是在真实场景，节点数可能有成百上千，每个节点都具有新增、删除、修改、移动、插入子节点等操作，同时还有若干约束，JSON 结构操作起来不是很便利，于是我们仿 DOM 设计了 **节点模型 & 属性模型，**用更具可编程性的方式来编排，这是**编排系统的基石**。 +其次，每次编排动作后（CRUD），都需要实时的渲染出视图。广义的视图应该包括各种平台上的展现，浏览器、Rax、小程序、Flutter 等等，所以使用何种渲染器去渲染 JSON 结构应该可以由用户去扩展，我们定义一种机制去衔接设计态和渲染态。 +至此，我们已经完成了**编排模块最基础的功能**，接下来，就是完善细节，逐步丰满功能。比如： +1）编排面板的整体功能区划分设计； +2）节点属性设计；节点删除、移动等操作设计；容器节点设计； +3）节点拖拽功能、拖拽定位设计和实现； +4）节点在画布上的辅助功能，比如 hover、选中、选中时的操作项、resize、拖拽占位符等； +5）设计态和渲染态的坐标系转换，滚动监听等； +6）快捷键机制； +7）历史功能，撤销和重做； +8）结构化的插件扩展机制； +9）原地编辑功能； +有非常多模块，但只要记住一点，这些功能的目的都是辅助用户在画布上有更好的编排体验、扩展能力而逐个增加设计的。 +# 编排功能模块 +## 模型设计 +编排实际上操作 schema，但是实际代码运行的过程中，我们将 schema 分成了很多层，每一层有各自的职责，他们所负责的功能是明确清晰的。这就是低代码引擎中的模型设计。 +我们通过将 schema 和常用的操作等结合起来，最终将低代码引擎的模型分为节点模型、属性模型、文档模型和项目模型。 +### 项目模型（`Project`） +项目模型提供项目管理能力。通常一个引擎启动会默认创建一个 `Project` 实例，有且只有一个。项目模型实例下可以持有多个文档模型的实例，而当前处于设计器设计状态的文档模型，我们将其添加 active 标识，也将其称为 `currentDocument`，可以通过 `project.currentDocument` 获得。 +一个 `Project` 包含若干个 `DocumentModel` 实例，即项目模型和文档模型的关系是 1 对 n，如下图所示： + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644397244733-2492a7bf-20bf-4610-a335-99cc047037b7.png#clientId=u45d0137b-8a6f-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=824&id=uadf98e25&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1648&originWidth=1226&originalType=url&ratio=1&rotation=0&showTitle=false&size=1260603&status=done&style=none&taskId=u50b01e40-96f2-4629-a1b9-1b5a22967fc&title=&width=613) +### 文档模型（`DocumentModel`） +文档模型提供文档管理的能力，每一个页面即一个文档流，对应一个文档模型。文档模型包含了一组 Node 组成的一颗树，类似于 DOM。我们可以通过文档模型来操作 `Node` 树，来达到管理文档模型的能力。每一个文档模型对应多个 `Node`，但是根 `Node` 只有一个，即 `rootNode` 和 `nodes`。 +文档模型可以通过 `Node` 树，通过 `doc.schema` 来导出文档的 `schema`，并使用其进行渲染。 +他们的关系如下图： +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644397244327-d931aff8-40d4-47df-8b1c-b81c06c40c48.png#clientId=u45d0137b-8a6f-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=745&id=L5LAf&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1490&originWidth=960&originalType=url&ratio=1&rotation=0&showTitle=false&size=1110316&status=done&style=none&taskId=u7d873681-f61a-40ea-baaa-8f7b76c769c&title=&width=480) +### 节点模型（`Node`） +我们先看一下一个 `Node` 在 `schema` 中对应的示例： +```json +{ + componentName: 'Text', + id: 'node_k1ow3cbf', + props: { + showTitle: false, + behavior: 'NORMAL', + content: { + use: 'zh_CN', + en_US: 'Title', + zh_CN: '个人信息', + type: 'i18n', + }, + fieldId: 'text_k1ow3h1j', + maxLine: 0, + }, + condition: true, +} +``` +上面的示例是一个 `Text` 的 `Node` 节点，而我们的 `Node` 节点模型就是负责这一层级的 `Schema` 管理。它的功能聚焦于单层级的 schema 相关操作。我们可以看一下节点模型的一些方法，了解其功能。 +```typescript +declare class Node { + // Props + props: Props; + get propsData(): PropsMap | PropsList | null; + getProp(path: string, stash?: boolean): Prop | null; + getPropValue(path: string): any; + setPropValue(path: string, value: any): void; + clearPropValue(path: string): void; + mergeProps(props: PropsMap): void; + setProps(props?: PropsMap | PropsList | Props | null): void; + + // Node + get parent(): ParentalNode | null; + get children(): NodeChildren | null; + get nextSibling(): Node | null; + get prevSibling(): Node | null; + remove(useMutator?: boolean, purge?: boolean): void; + select(): void; + hover(flag?: boolean): void; + replaceChild(node: Node, data: any): Node; + mergeChildren(remover: () => any, adder: (children: Node[]) => NodeData[] | null, sorter: () => any): void; + removeChild(node: Node): void; + insert(node: Node, ref?: Node, useMutator?: boolean): void; + insertBefore(node: any, ref?: Node, useMutator?: boolean): void; + insertAfter(node: any, ref?: Node, useMutator?: boolean): void; + + // Schema + get schema(): Schema; + set schema(data: Schema); + export(stage?: TransformStage): Schema; + replaceWith(schema: Schema, migrate?: boolean): any; +} +``` +这里没有展示全部的方法，但是我们可以发现，`Node` 节点模型核心功能点有三个 +1）`Props` 管理：通过 `Props` 实例管理所有的 `Prop`，包括新增、设置、删除等 `Prop` 相关操作。 +2）`Node` 管理：管理 `Node` 树的关系，修改当前 `Node` 节点或者 `Node` 子节点等。 +3）`Schema` 管理：可以通过 `Node` 获取当前层级的 `Schema` 描述协议内容，并且也可以修改它。 +通过 `Node` 这一层级，对 `Props`、`Node` 树和 `Schema` 的管理粒度控制到最低，这样扩展性也就更强。 +### 属性模型（Prop） +一个 `Props` 对应多个 `Prop`，每一个 `Prop` 对应 schema 的 `props` 下的一个字段。 +`Props` 管理的是 `Node` 节点模型中的 `props` 字段下的内容。而 `Prop` 管理的是 `props` 下的每一个 `key` 的内容，例如下面的示例中，一个 `Props` 管理至少 6 个 `Prop`，而其中一个 `Prop` 管理的是 `showTitle` 的结果。 +```typescript +{ + props: { + showTitle: false, + behavior: 'NORMAL', + content: { + use: 'zh_CN', + en_US: 'Title', + zh_CN: '个人信息', + type: 'i18n', + }, + fieldId: 'text_k1ow3h1j', + maxLine: 0, + }, +} +``` +### 组件描述模型（ComponentMeta） +编排已经等价于直接操作节点 & 属性了，而一个节点和一组对应的属性相当于一个真实的组件，而真实的组件一定是有约束的，比如组件名、组件类型、支持哪些属性以及属性类型、组件能否拖动、支持哪些扩展操作、组件是否是容器型组件、A 组件中能否放入 B 组件等等。 +于是，我们设计了一份协议专门负责组件描述，即《中后台搭建组件描述协议》，而编排模块中也有负责解析和使用符合描述协议规范的模块。 +每一个组件对应一个 `ComponentMeta` 的实例，其属性和方法就是描述协议中的所有字段，所有 `ComponentMeta` 都由设计器器的 `designer` 模块进行创建和管理，其他模块通过 `designer` 来获取指定的 `ComponentMeta` 实例，尤其是每个 `Node` 实例上都会挂载对应的 `ComponentMeta` 实例。 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644397244032-8aa176d5-a74e-49c9-a309-251dba81b37c.png#clientId=u45d0137b-8a6f-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=u044bdacd&margin=%5Bobject%20Object%5D&name=image.png&originHeight=756&originWidth=998&originalType=url&ratio=1&rotation=0&showTitle=false&size=294191&status=done&style=none&taskId=uee9dfeef-f646-41db-afd4-a0b1acf8019&title=) +组件描述模型是后续编排辅助的基础，包括设置面板、拖拽定位机制等。 +### 项目、文档、节点和属性模型关系 +整体来看，一个 Project 包含若干个 DocumentModel 实例，每个 DocumentModel 包含一组 Node 构成一颗树（类似 DOM 树），每个 Node 通过 Props 实例管理所有 Prop。整体的关系图如下。 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/110793/1645066478805-57802de7-382e-4105-99cb-161b8c07f117.png#clientId=uf22d1b91-761d-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=678&id=uc2db9afa&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1356&originWidth=1694&originalType=binary&ratio=1&rotation=0&showTitle=false&size=285816&status=done&style=none&taskId=u6526eafb-f082-46dd-8584-9dd9b1bb395&title=&width=847) +节点 & 属性模型是引擎基石，几乎贯穿所有模块，相信从上面的类图已经能看出几个基础类的职责以及依赖关系。 +节点 & 属性模型等价于 JSON 数据结构，而编排的本质是产出 JSON 数据结构，现在可以重新表述为编排的本质是操作节点 & 属性模型了。 +```typescript +// 一段编排的示例代码 +rootNode.insertAfter({ componentName: 'Button', props: { size: 'medium' } }); +rootNode.insertAfter({ componentName: 'Button', props: { size: 'medium' } }); +rootNode.children.get(1).getProp('size').setValue('large'); +rootNode.children.get(2).remove(); +rootNode.export(); +// => 产出 schema +``` + +## 画布渲染 +画布渲染使用了设计态与渲染态的双层架构。![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644397244328-61bb9ce7-a27c-4917-baee-c0a93bd0fd36.png#clientId=u45d0137b-8a6f-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=u3c9164cd&margin=%5Bobject%20Object%5D&name=image.png&originHeight=710&originWidth=1416&originalType=url&ratio=1&rotation=0&showTitle=false&size=287707&status=done&style=none&taskId=u6c993606-238b-478f-9317-397eb0708eb&title=) +如上图，设计器和渲染器其实处在不同的 Frame 下，渲染器以单独的 `iframe` 嵌入。这样做的好处，一是为了给渲染器一个更纯净的运行环境，更贴近生产环境，二是扩展性考虑，让用户基于接口约束自定义自己的渲染器。 + +### xxx-renderer +xxx-renderer 是一个纯 renderer，即一个渲染器，通过给定输入 schema、依赖组件和配置参数之后完成渲染。 + +### xxx-simulator-renderer +xxx-simulator-renderer 通过和 host进行通信来和设计器打交道，提供了 `DocumentModel` 获取 schema 和组件。将其传入 xxx-renderer 来完成渲染。 +另外其提供了一些必要的接口，来帮助设计器完成交互，比如点击渲染画布任意一个位置，需要能计算出点击的组件实例，继而找到设计器对应的 Node 实例，以及组件实例的位置/尺寸信息，让设计器完成辅助 UI 的绘制，如节点选中。 + +### react-simulator-renderer +以官方提供的 react-simulator-renderer 为例，我们看一下点击一个 DOM 节点后编排模块是如何处理的。 +首先在初始化的时候，renderer 渲染的时候会给每一个元素添加 ref，通过 ref 机制在组件创建时将其存储起来。在存储的时候我们给实例添加 `Symbol('_LCNodeId')` 的属性。 +当点击之后，会去根据 `__reactInternalInstance$` 查找相应的 fiberNode，通过递归查找到对应的 React 组件实例。找到一个挂载着 `Symbol('_LCNodeId')` 的实例，也就是上面我们初始化添加的属性。 +通过 `Symbol('_LCNodeId')` 属性，我们可以获取 Node 的 id，这样我们就可以找到 Node 实例。 +通过 `getBoundingClientRect` 我们可以获取到 Node 渲染出来的 DOM 的相关信息，包括 `x`、`y`、`width`、`height` 等。 +通过 DOM 信息，我们将 focus 节点所需的标志渲染到对应的地方。hover、拖拽占位符、resize handler 等辅助 UI 都是类似逻辑。 + +### 通信机制 +既然设计器和渲染器处于两个 Frame，它们之间的事件通信、方法调用是通过各自的代理对象进行的，不允许其他方式，避免代码耦合。 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644397245794-927fa812-ea1c-4bc1-967b-4c1dff924fd1.png#clientId=u45d0137b-8a6f-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=u22088dc8&margin=%5Bobject%20Object%5D&name=image.png&originHeight=648&originWidth=1290&originalType=url&ratio=1&rotation=0&showTitle=false&size=223251&status=done&style=none&taskId=uf720b921-07c2-4cda-a101-74e863ce10d&title=) +**host** +host 可以访问设计器的所有模块，由于 renderer 层不负责与设计器相关的交互。所以增加了一层 host，作为通信的中间层。host 可以访问到设计器中所有模块，并提供相关方法供 simulator-renderer 层调用。例如schema 的获取、组件获取等。 +simulator-renderer 通过调用 host 的方法，将 schema、components 等参数传给 renderer，让 renderer 进行渲染。 + +**xxx-simulator-renderer** +为了完成双向交互，simulator-renderer 也需要提供一些方法来供 host 层调用，之后当设计器和用户有交互，例如上述提到的节点选中。这里需要提供的方法有： + +- getClientRects +- getClosestNodeInstance +- findDOMNodes +- getComponent +- setNativeSelection +- setDraggingState +- setCopyState +- clearState + +这样，host 和 simulator-renderer 之间便通过相关方法实现了双向通信，能在隔离设计器的基础上完成设计器到画布和画布到设计器的通信流程。 + +## 编排辅助的核心 +### 设置面板与设置器 +当在渲染画布上点击一个 DOM 节点，我们可以通过 xxx-simulator-renderer 获取 `Node` 节点，我们在 `Node` 上挂载了 `ComponentMeta` 实例。通过 `ComponentMeta` 我们获取到当前组件的描述模型。通过描述模型，我们即可获得组件、即当前 Node 支持的所有属性配置。 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644397246381-ed265cc3-b6c1-4a38-985a-df1898862fe8.png#clientId=u45d0137b-8a6f-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=u1422ee5e&margin=%5Bobject%20Object%5D&name=image.png&originHeight=985&originWidth=1500&originalType=url&ratio=1&rotation=0&showTitle=false&size=332497&status=done&style=none&taskId=u2bbbb9ae-7834-48ba-b87f-fa5ccf8fa39&title=) +#### 设置面板 +设置面板对于配置项的呈现结构是通过 `ComponentMeta.configure` 来确定的。 +```json +{ + "component": { + "isContainer": true + }, + "props": { + "isExtends": true, + "override": [ + { + "name": "count", + "title": { + "label": "展示的数字", + "tip": "count|大于 overflowCount 时显示为 ${overflowCount}+，为 0 时默认隐藏", + "docUrl": "https://fusion.alibaba-inc.com/pc/component/basic/badge" + }, + "setter": { + "componentName": "MixedSetter", + "props": { + "setters": [ + "StringSetter", + "ExpressionSetter" + ] + } + } + } + ] + } +} +``` +上述的 `component.isContainer` 描述了这个组件是否是一个容器组件。而 props 下的属性就是我们在设置面板中展示的属性，包含了这个属性的名称、使用的设置器、配置之后影响的是哪个属性等。 +而这只是描述，编排模块的 `SettingTopEntry` 便是管理设置面板的实现模块。 +`SettingTopEntry` 包含了 n 个 `SettingField`，每一个 `SettingField` 就对应下面要将的设置器。即 `SettingTopEntry` 负责管理多个 `SettingField`。 +#### 设置器 +选中节点可供配置的属性都有相应的设置器配置，比如文本、数字、颜色、JSON、Choice、I18N、表达式 等等，或者混合多种。 +设置器本质上是一个 React 组件，但是设置面板在渲染时会传入当前配置项对应的 `SettingField` 实例，`SettingField` 本质上就是包裹了 `Prop` 实例，设置器内部的行为以及 UI 变化都由设置器自己把控，但当属性值发生变化时需要通过 `SettingField` 下的 `Prop` 来修改值，因为修改 `Prop` 实例就相当于修改了 schema。一方面这样的设置器设置之后，保存的 schema 才是正确的，另外一方面，只有 schema 变化了，才能触发渲染画布重新渲染。 +### 拖拽引擎 & 拖拽定位机制 +![](https://cdn.nlark.com/yuque/0/2022/gif/242652/1644397245744-af8b951c-ee22-4fcb-9175-6f1b0eb2ba37.gif#clientId=u45d0137b-8a6f-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=uf8b286a2&margin=%5Bobject%20Object%5D&originHeight=917&originWidth=1425&originalType=url&ratio=1&rotation=0&showTitle=false&status=done&style=none&taskId=u9b4475cb-bb5c-4c86-9b03-b824bc46b12&title=) +拖拽引擎（`Dragon`）核心完成的工作是将被拖拽对象拖拽到目标位置，涉及到几个概念： + +- 被拖拽对象 - `DragObject` +- 拖拽到的目标位置 - `DropLocation` +- 拖拽感应区 - `ISensor` +- 定位事件 - `LocateEvent` + +#### Sensor +在引擎初始化的时候，我们监听 `document` 和 iframe `contentDocument` 的 `mouse`、`keyboard`、`drag` 事件来感知拖拽的发生。而这些监听的区域我们又称为拖拽感应区，也就是 `Sensor`。`Sensor` 会有多个，因为感应器有多个，默认设置器和设置面板是没有 `Sensor`，但是他们是可以注册 `Sensor` 来增加感应区域，例如大纲树就注册了自己的 `Sensor`。 + +`Sensor` 有两个关键职责： +1）用于事件对象转换，比如坐标系换算 +2）根据拖拽过程中提供的位置信息，结合每一层 `Node` 也就是组件包含的描述信息，知道其是否能作为容器等限制条件，来进行进一步的定位，最后计算出精准信息来进行视图渲染。 + +**拖拽流程** +在引擎初始化的时候，初始化多个 `Sensor`。 +当拖拽开始的时候，开启 `mousemove`、`mouseleave`、`mouseover` 等事件的监听。 +拖拽过程中根据 `mousemove` 的 `MouseEvent` 对象封装出 `LocateEvent` 对象，继而交给相应 `sensor` 做进一步定位处理。 +拖拽结束时，根据拖拽的结果进行 schema 变更和视图渲染。 +最后关闭拖拽开始时的事件监听。 + +#### 拖拽方式 +根据拖拽的对象不同，我们将拖拽分为几种方式： +1）**画布内拖拽：**此时 sensor 是 simulatorHost，拖拽完成之后，会根据拖拽的位置来完成节点的精确插入。 +2）**从组件面板拖拽到画布**：此时的 sensor 还是 simulatorHost，因为拖拽结束的目标还是画布。 +3）**大纲树面板拖拽到画布中**：此时有两个 sensor，一个是大纲树，当我们拖拽到画布区域时，画布区域内的 simulatorHost 开始接管。 +4）画布拖拽到画布中：从画布中开始拖拽时，最新生效的是 simulatorHost，当离开画布到大纲树时，大纲树 sensor 开始接管生效。当拖拽到大纲树的某一个节点下时，大纲树会将大纲树中的信息转化为 schema，然后渲染到画布中。 +## 其他 +引擎的编排能力远远不止上述所描述的功能，这里只描述了其核心和关键的功能。在整个引擎的迭代和设计过程中还有很多细节来使我们的引擎更好用、更容易扩展。 +**schema 处理的管道机制** +通过PropsReducer 的管道机制，用户可以定制自己需要的逻辑，来修改 Schema。 +**组件 metadata 处理的管道机制** +组件的描述信息都收拢在各自的 ComponentMeta 实例内，涉及到的消费方几乎遍及整个编排过程，包括但不限于 组件拖拽、拖拽辅助 UI、设置区、原地编辑、大纲树 等等。 +在用户需要自定义的场景，开放 ComponentMeta 的修改能力至关重要，因此我们设计了 metadata 初始化/修改的管道机制。 +**hotkey & builtin-hotkey** +快捷键的实现，以及引擎内核默认绑定的快捷键行为。 +**drag resize 引擎** +对于布局等类型的组件，支持拖拽改变大小。resize 拖拽引擎根据组件 ComponentMeta 声明来开启，拖拽后，触发组件的钩子函数（`onResizeStart` / `onResize` / `onResizeEnd`），完成 resize 过程。 +**OffsetObserver** +设计态的辅助 UI 需要根据渲染态的视图变化而变化，比如渲染容器滚动了，此时通过 OffsetObserver 做一个动态的监听。 +**插件机制** +我们希望保持引擎内核足够小，但拥有足够强的扩展能力，所有扩展功能都通过插件机制来承载。 diff --git a/docs/docs/guide/design/generator.md b/docs/docs/guide/design/generator.md new file mode 100644 index 000000000..19d34560b --- /dev/null +++ b/docs/docs/guide/design/generator.md @@ -0,0 +1,100 @@ +--- +title: 出码模块设计 +sidebar_position: 5 +--- +本篇主要讲解了出码模块实现的基本思路与一些概念。如需接入出码和定制出码方案，可以参考《[使用出码功能](https://www.yuque.com/lce/doc/cplfv0)》一节。 +# npm 包与仓库信息 +| **NPM 包** | **代码仓库** | **说明** | +| --- | --- | --- | +| [@alilc/lowcode-code-generator](https://www.npmjs.com/package/@alilc/lowcode-code-generator) | [alibaba/lowcode-engine](https://github.com/alibaba/lowcode-engine) +(子目录：modules/code-generator) | 出码模块核心库，支持在 node 环境下运行，也提供了浏览器下运行的 standalone 模式 | +| [@alilc/lowcode-plugin-code-generator](https://www.npmjs.com/package/@alilc/lowcode-plugin-code-generator) | [alibaba/lowcode-code-generator-demo](https://github.com/alibaba/lowcode-code-generator-demo) | 出码示例 -- 浏览器端出码插件 | + +# 出码模块原理 + +出码模块的输入和输出很简单： +![](https://cdn.nlark.com/yuque/0/2022/jpeg/263300/1644825891969-1777dbe4-5ffc-4c94-a022-3aba0c116021.jpeg) + +这里有几个概念： + +- schema: 搭建协议内容，指符合《阿里巴巴中后台前端搭建协议规范》的 schema +- solution：出码方案，指具体的项目框架（如 Rax，Ice.js) +- Source Codes：生成的源代码，以目录树的形式进行描述 + +可以看出，这是一个与用户基本没有交互，通过既定的流程完成整个功能链路的模块。其核心暴露的是一个将搭建协议 schema 按既定的 solution 转换为代码的函数。对于使用者来说就是一个输入输出都确定的黑盒系统。 + +## 出码流程概述 +出码模块和编译器很类似，都是将代码的一种表现形式转换成另一种表现形式，如： + +**编译器流程** +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644403720547-e5021c3c-0c63-47ea-b8f0-1af79bbae3ef.png#clientId=u70bc6751-fff0-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=246&id=u3b3e3126&margin=%5Bobject%20Object%5D&name=image.png&originHeight=492&originWidth=3228&originalType=binary&ratio=1&rotation=0&showTitle=false&size=110319&status=done&style=none&taskId=u32f55257-a18c-4caa-9334-0b3ca5b0bc0&title=&width=1614) + +**出码模块流程** +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644402753768-02d402da-dd1a-4783-9021-606e276d4c68.png#clientId=u70bc6751-fff0-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=182&id=GlAz4&margin=%5Bobject%20Object%5D&name=image.png&originHeight=182&originWidth=1536&originalType=binary&ratio=1&rotation=0&showTitle=false&size=23743&status=done&style=none&taskId=ubbea9289-cb03-4fcf-9ce7-22da1ce077b&title=&width=1536) + +## 出码流程详解 +### 协议解析 +协议解析主要是将输入的 schema 解析成更适合出码模块内部使用的数据结构的过程。这样在后面的代码生成过程中就可以直接用这些数据，不必重复解析了。 +![](https://intranetproxy.alipay.com/skylark/lark/0/2021/jpeg/154771/1636960093808-624b5e50-18d6-476d-a951-556912832cdb.jpeg) +主要步骤如下： + +- 解析三方组件依赖 +- 分析 ref API 的使用情况 +- 建立容器之间的依赖关系索引 +- 分析容器内的组件依赖关系 +- 分析路由配置 +- 分析 utils 和 NPM 包依赖关系 +- 其他兼容处理 + +### 前置优化 +前置优化是计划基于策略对 schema 做一些优化。 +主要逻辑分为分析、规则和优化三个部分，组合为一个支持通过配置进行一定程度定制化的策略包。每个策略包会先执行分析器，对输入进行特征提取，然后通过规则对特征进行判断，决定是否执行优化动作： +![](https://intranetproxy.alipay.com/skylark/lark/0/2021/jpeg/154771/1636960832211-0db6925b-c4b5-4be4-a883-fdd52a47e19a.jpeg) + +### 代码生成 +代码生成的流程如下： +![](https://intranetproxy.alipay.com/skylark/lark/0/2021/jpeg/154771/1636975834791-e3fe89f9-cd2d-446f-aa9f-fca0bb1d56c3.jpeg) +如果简单粗暴地拼字符串生成源代码将难以扩展和维护，因此出码模块在代码生成过程中将代码进行了一些抽象化。 +日常开发中，我们常常是基于某一个特定的项目框架，将一些配置、UI 代码、逻辑代码放到他们应该在的地方，最终形成一套可以 run 起来的业务系统。那么其实对于出码这件事，我们也可以层层拆解，**项目 -> 插槽 -> 模块 -> 文件 -> 代码块**（代码片段）。这样就能将复杂的项目产出问题，拆分为一个个相对专注且单一的代码块产出问题，同时也支持组合复用。 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644402753919-1f063db3-5ad9-406b-9b45-6eeef79ea38b.png#clientId=u70bc6751-fff0-4&crop=0&crop=0&crop=1&crop=1&height=305&id=LgGUo&margin=%5Bobject%20Object%5D&name=image.png&originHeight=454&originWidth=892&originalType=binary&ratio=1&rotation=0&showTitle=false&size=230321&status=done&style=none&taskId=u50d38d84-3a3e-4c77-af05-8bc5f794643&title=&width=600) +注：中间表达结构即为对 Schema 解析后的结构化产物 + +**插槽** +首先来看下插槽，插槽描述了对应模块在项目中相对路径，并且可以对模块做固定的命名。每个插槽都有一系列插件来完成代码产出工作。生成的一个或多个文件，最终会依照插槽的描述放入项目中。 +```typescript +// 项目模版 +export interface IProjectTemplate { + slots: Record; +} + +// 插槽 +interface IProjectSlot { + path: string[]; + fileName?: string; +} + +// 插槽出码插件配置 +interface IProjectPlugins { + [slotName: string]: BuilderComponentPlugin[]; +} +``` +**代码块** +代码块是出码产物的最小单元，由出码模块插件产出，多个代码块最后会被组装为代码文件。每个代码块通过 name 描述自己，再通过 linkAfter 描述应该跟在哪些 name 的代码块后面。 +```typescript +interface ICodeChunk { + type: ChunkType; // 处理类型 ast | string | json + fileType: string; // 文件类型 js | css | ts ... + name: string; // 代码块名称，与 linkAfter 相关 + subModule?: string; // 模块内文件名，默认是 index + content: ChunkContent; // 代码块内容，数据格式与 type 相关 + linkAfter: string[]; // +} +``` + +### 后置优化 +后置优化分为文件级别和项目级别两种： + +- 文件级别：在生成完一个文件后进行处理 +- 项目级别：在所有文件都生成完了之后进行处理 + +文件级别的后置优化目前主要是有 prettier 这个代码格式化工具。 diff --git a/docs/docs/guide/design/materialParser.md b/docs/docs/guide/design/materialParser.md new file mode 100644 index 000000000..42aaadcf0 --- /dev/null +++ b/docs/docs/guide/design/materialParser.md @@ -0,0 +1,70 @@ +--- +title: 入料模块设计 +sidebar_position: 2 +--- +## 介绍 +入料模块负责物料接入，通过自动扫描、解析源码组件，产出一份符合《中后台低代码组件描述协议》的** **JSON Schema。这份 Schema 包含基础信息和属性描述信息部分，低代码引擎会基于它们在运行时自动生成一份configure 配置，用作设置面板展示。 + +## npm 包与仓库信息 + +- npm 包：@alilc/lowcode-material-parser +- 仓库：[https://github.com/alibaba/lowcode-engine](https://github.com/alibaba/lowcode-engine) 下的 modules/material-parser + +## 原理 +入料模块使用动静态分析结合的方案，动态胜在真实，静态胜在细致，不过全都依赖源码中定义的属性，若未定义，或者定义错误，则无法正确入料。 + +### 整体流程 +大体分为本地化、扫描、解析、转换、校验 5 部分，如下图所示。 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644396777217-58246e52-b5b9-4509-8bac-db2820535c39.png#clientId=u41c9ba96-15b6-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=u8b5a70fd&margin=%5Bobject%20Object%5D&name=image.png&originHeight=206&originWidth=2116&originalType=url&ratio=1&rotation=0&showTitle=false&size=51634&status=done&style=none&taskId=u76c5b45a-6fa8-404e-8d8b-f1d6f38438e&title=) + +### 静态解析 +在静态分析时，分为 JS 和 TS 两种情况。 + +#### 静态解析 JS +在 JS 情况下，基于 react-docgen 进行扩展，自定义了 resolver 及 handler，前者用于寻找组件定义，后者用于解析 propTypes、defaultProps 等信息，整体流程图如下： + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644396777192-c9d3c3b3-c7d2-4780-b7dc-632349b00edb.png#clientId=u41c9ba96-15b6-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=u3edfb33c&margin=%5Bobject%20Object%5D&name=image.png&originHeight=478&originWidth=2176&originalType=url&ratio=1&rotation=0&showTitle=false&size=93513&status=done&style=none&taskId=ua23bd89a-3d0c-43cf-936b-13080cdc5ef&title=) + +react-docgen 使用 babel 生成语法树，再使用 ast-types 进行遍历去寻找组件节点及其属性类型定义。原本的 react-docgen 只能解析单文件，且不能解析 IIFE、逗号表达式等语法结构(一般出现在转码后的代码中)。笔者对其进行改造，使之可以递归解析多文件去查找组件定义，且能够解开 IIFE，以及对逗号表达式进行转换，以方便后续的组件解析。另外，还增加了子组件解析的功能，即类似 `Button.Group = Group` 这种定义。 + +#### 静态解析 TS +在 TS 情况下，还要再细分为 TS 源码和 TS 编译后的代码。 +TS 源码中，React 组件具有类型签名；TS 编译后的代码中，dts 文件(如有)包含全部的 class / interface / type 类型信息。可以从这些类型信息中获取组件属性描述。整体流程图如下： + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644396777193-14c74287-d0cb-4864-ba64-9259a88c8b99.png#clientId=u41c9ba96-15b6-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=ud7fc6e1a&margin=%5Bobject%20Object%5D&name=image.png&originHeight=240&originWidth=2280&originalType=url&ratio=1&rotation=0&showTitle=false&size=59331&status=done&style=none&taskId=u711959ae-241a-48c9-a446-59b9fcdc52e&title=) + +react-docgen 内置了 TypeScript 的 babel 插件，所以也具备解析 interface 的能力，可惜能力有限，babel 只能解析 TS 代码，但没法做类型检查，类型处理是由 react-docgen 实现的，它对于extends/implements/utility 的情况处理不好，并且没有类型推断，虽然可以对其功能进行完善，不过这种情况下，应该借助 TypeScript Compiler 的能力，而非自己造轮子。通过调研，发现市面上有 typescript-react-docgen 这个项目。它在底层依赖了 TypeScript，且产出的数据格式与 react-docgen 一致，所以我们选择基于它进行解析。 + +TypeScript Compiler 会递归解析某个文件中出现及引用的全部类型，当然，前提是已经定义或安装了相应的类型声明。typescript-react-docgen 会调用 TypeScript Compiler 的 API，获取每个文件输出的类型，判断其是否为 React 组件。满足下列条件之一的，会被判定为 React 组件： + +1. 获取其函数签名，如果只有一个入参，或者第一个入参名称为 props ，会被判定为函数式组件； +2. 获取其 `constructor` 方法，如果其返回值包含 props 属性，会被判定为有状态组件。 + +然后，遍历组件的 props 类型，获取每个属性的类型签名字符串，比如 `(a: string) => void`。typescript-react-docgen 可以克服 react-docgen 解析 TypeScirpt 类型的问题，但是每个类型都以字符串的形式来呈现，不利于后续的解析。所以，笔者对其进行了扩展，递归解析每一层的属性值。此外，在函数式组件的判定上，笔者做了完善，会看函数的返回值是否为 `ReactElement` ，若是，才为函数式组件。 + +下面讲对于一些特殊情况的处理。 +**循环定义** +TypeScript 类型可以循环定义，比如下面的 JSON 类型： +```typescript +interface Json { + [x: string]: string | number | boolean | Json | JsonArray; +} +type JsonArray = Array; +``` +因为低代码组件描述协议中没有引用功能，而且也不方便在界面上展示出来，所以这种循环定义无需完全解析，入料模块会在检测到循环定义的时候，把类型简化为 `object` 。对于特殊的类型，如 JSON，可以用相应的 Setter 来编辑。 + +**复杂类型** +TypeScript Compiler 会将合成类型的所有属性展开，比如 `boolean | string`，会被展开为 `true | false | string`，这带来了不必要的精确，我们需要的只是 `boolean | string` 而已。当然，对于这个例子，我们很容易把它还原回 `boolean | string`，然而，对于诸如 `React.ButtonHTMLAttributes & {'data-name': string}` 这种类型，它会把 `ButtonHTMLAttributes` 中众多的属性和 `data-name` 混杂在一起，完全无法分辨，只能以展开的形式提供。这 100 多个属性，如果都放在设置面板，绝对是使用者的噩梦，所以，其结果会被简化为 `object` 。当然，即使没有 `{'data-name': string}`，`ButtonHTMLAttributes` 也是没有单独的 Setter 的，同样会被简化为 `object` 。 + +### 动态解析 +当一个组件，使用静态解析无法入料时，会使用动态解析。 +整体流程图如下： +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644396776984-d390ec0c-33c6-4468-b68c-555a263b097e.png#clientId=u41c9ba96-15b6-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=ube12dcbd&margin=%5Bobject%20Object%5D&name=image.png&originHeight=449&originWidth=2516&originalType=url&ratio=1&rotation=0&showTitle=false&size=84334&status=done&style=none&taskId=ube349a5b-94c0-4a77-9bf3-ffe453226e1&title=) +基本思想很简单，require 组件进来，然后读取其组件类上定义的 propTypes 和 defaultProps 属性。这里使用了 parse-prop-types 库，使用它的时候必须在组件之前引用，因为它会先对 prop-types 库进行修改，在每个 PropTypes 透出的函数上挂上类型，比如 string, number 等等，然后再去遍历。动态解析可以解析出全部的类型信息，因为 PropTypes 有可能引入依赖组件的一些类型定义，这在静态解析中很难做到，或者成本较高，而对于动态解析来说，都由运行时完成了。 + +##### 技术细节 +值得注意的是，有些 js 文件里还会引入 css 文件，而且从笔者了解的情况来看，这种情况在集团内部不在少数。这种组件不配合 webpack 使用，肯定会报错，但是使用 webpack 会明显拖慢速度，所以笔者采用了sandbox 的方式，对 require 进来的类 css 文件进行 mock。这里，笔者使用了 vm2 这个库，它对 node 自带的 vm 进行了封装，可以劫持文件中的 require 方法。因为 parse-prop-types 的修改在沙箱中会失效，所以笔者也 mock 了组件中的 prop-types 库。 + +### 整体大图 +把上述的静态解析和动态解析流程结合起来，可以得到以下大图。 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644396777248-9e26dd26-51ac-473e-ae66-c08f8bed3aeb.png#clientId=u41c9ba96-15b6-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=ue6806530&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1072&originWidth=2658&originalType=url&ratio=1&rotation=0&showTitle=false&size=184784&status=done&style=none&taskId=u0d982b36-25b8-442f-8d98-43b9e1629bb&title=) diff --git a/docs/docs/guide/design/renderer.md b/docs/docs/guide/design/renderer.md new file mode 100644 index 000000000..74674bcdb --- /dev/null +++ b/docs/docs/guide/design/renderer.md @@ -0,0 +1,210 @@ +--- +title: 渲染模块设计 +sidebar_position: 4 +--- +# 低代码渲染介绍 + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644398134750-7b352564-a400-460e-a189-e72ef551624f.png#clientId=udd4eb4ee-bdb1-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=198&id=OSLhL&margin=%5Bobject%20Object%5D&name=image.png&originHeight=872&originWidth=1440&originalType=binary&ratio=1&rotation=0&showTitle=false&size=193396&status=done&style=none&taskId=ua5d2ae84-0117-4744-a49c-bd3dd1b8a5e&title=&width=327) +基于 Schema 和物料组件，如何渲染出我们的页面？这一节描述的就是这个。 + +# npm 包与仓库信息 + +- React 框架渲染 npm 包：@alilc/lowcode-react-renderer +- Rax 框架渲染 npm 包：@alilc/lowcode-rax-renderer +- 仓库：[https://github.com/alibaba/lowcode-engine](https://github.com/alibaba/lowcode-engine) 下的 + - packages/renderer-core + - packages/react-renderer + - packages/react-simulator-renderer + +# 渲染框架原理 +## 整体架构 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644398135242-d83a9d48-c244-4869-b61e-70e825006727.png#clientId=udd4eb4ee-bdb1-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=531&id=udb49df4c&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1062&originWidth=1686&originalType=binary&ratio=1&rotation=0&showTitle=false&size=821823&status=done&style=none&taskId=u90381546-a7a8-4099-b24f-844b8489f4d&title=&width=843) + +- 协议层：基于标准的《阿里巴巴中后台前端搭建协议规范》产出的 Schema 作为我们的规范协议。 +- 能力层：提供组件、区块、页面等渲染所需的核心能力，包括 Props 解析、样式注入、条件渲染等。 +- 适配层：由于我们使用的运行时框架不是统一的，所以统一使用适配层将不同运行框架的差异部分，通过接口对外，让渲染层注册/适配对应所需的方法。能保障渲染层和能力层直接通过适配层连接起来，能起到独立可扩展的作用。 +- 渲染层：提供核心的渲染方法，由于不同运行时框架提供的渲染方法是不同的，所以其通过适配层进行注入，只需要提供适配层所需的接口，即可实现渲染。 +- 应用层：根据渲染层所提供的方法，可以应用到项目中，根据使用的方法和规模即可实现应用、页面、区块的渲染。 + +## 核心解析 +这里主要解析一下刚刚提到的架构中的适配层和渲染层。 +### 适配层 +适配层提供的是各个框架之间的差异项。比如 `React.createElement` 和 `Rax.createElement` 方法是不同的。所以需要在适配层对 API 进行抹平。 + +#### React +```typescript +import { createElement } from 'react'; +import { + adapter, +} from '@ali/lowcode-renderer-core'; + +adapter.setRuntime({ + createElement, +}); +``` +#### Rax +```typescript +import { createElement } from 'rax'; +import { + adapter, +} from '@ali/lowcode-renderer-core'; + +adapter.setRuntime({ + createElement, +}); +``` +这时，在核心层使用的 `createElement` 会基于使用不同的 renderer 而使用不同的方法，自动适配框架所需的运行时方法。 + +所需的方法包括： + +- `setRuntime`：设置运行时相关方法 + - `Component`：组件类，参考 React 的 `Component`。 + - `PureComponent`：组件类，参考 React 的 `PureComponent`。 + - `createContext`：创建一个 `Context` 对象的方法。例如，当 React 渲染一个订阅了这个 `Context` 对象的组件，这个组件会从组件树中离自身最近的那个匹配的 `Provider` 中读取到当前的 `context` 值。 + - `createElement`：创建 `Component` 元素，例如在 React 中即为创建 React 元素。 + - `forwardRef`：ref 转发的方法。Ref 转发是一个可选特性，其允许某些组件接收 ref，并将其向下传递（换句话说，“转发”它）给子组件。 + - `findDOMNode`：是一个访问底层 DOM 节点的方法。如果组件已经被挂载到 DOM 上，此方法会返回浏览器中相应的原生 DOM 元素。 +- `setRenderers` + - `PageRenderer`：页面渲染的方法。可以定制页面渲染的生命周期，定制导航，定制路由等。 + - `ComponentRenderer`：组件渲染的方法。 + - `BlockRenderer`：区块渲染的方法。 + +### 渲染层 +#### React Renderer +内部的技术栈统一都是 React，大多数适配层的 API 都是按照 React 来设计的，所以对于 React Renderer 来说，需要做的不多。 +React Renderer 的代码量很少，主要是将 React API 注册到适配层中。 +```typescript +import React, { Component, PureComponent, createElement, createContext, forwardRef, ReactInstance, ContextType } from 'react'; +import ReactDOM from 'react-dom'; +import { + adapter, + pageRendererFactory, + componentRendererFactory, + blockRendererFactory, + addonRendererFactory, + tempRendererFactory, + rendererFactory, + types, +} from '@ali/lowcode-renderer-core'; +import ConfigProvider from '@alifd/next/lib/config-provider'; + +window.React = React; +(window as any).ReactDom = ReactDOM; + +adapter.setRuntime({ + Component, + PureComponent, + createContext, + createElement, + forwardRef, + findDOMNode: ReactDOM.findDOMNode, +}); + +adapter.setRenderers({ + PageRenderer: pageRendererFactory(), + ComponentRenderer: componentRendererFactory(), + BlockRenderer: blockRendererFactory(), + AddonRenderer: addonRendererFactory(), + TempRenderer: tempRendererFactory(), + DivRenderer: blockRendererFactory(), +}); + +adapter.setConfigProvider(ConfigProvider); +``` + +#### Rax Renderer +Rax 的大多数 API 和 React 基本也是一致的，差异点在于重写了一些方法。 +```typescript +import { Component, PureComponent, createElement, createContext, forwardRef } from 'rax'; +import findDOMNode from 'rax-find-dom-node'; +import { + adapter, + addonRendererFactory, + tempRendererFactory, + rendererFactory, +} from '@ali/lowcode-renderer-core'; +import pageRendererFactory from './renderer/page'; +import componentRendererFactory from './renderer/component'; +import blockRendererFactory from './renderer/block'; +import CompFactory from './hoc/compFactory'; + +adapter.setRuntime({ + Component, + PureComponent, + createContext, + createElement, + forwardRef, + findDOMNode, +}); + +adapter.setRenderers({ + PageRenderer: pageRendererFactory(), + ComponentRenderer: componentRendererFactory(), + BlockRenderer: blockRendererFactory(), + AddonRenderer: addonRendererFactory(), + TempRenderer: tempRendererFactory(), +}); +``` + +## 多模式渲染 +### 预览模式渲染 +预览模式的渲染，主要是通过 Schema、components 即可完成上述的页面渲染能力。 +```typescript +import ReactRenderer from '@ali/lowcode-react-renderer'; +import ReactDOM from 'react-dom'; +import { Button } from '@alifd/next'; + +const schema = { + componentName: 'Page', + props: {}, + children: [ + { + componentName: 'Button', + props: { + type: 'primary', + style: { + color: '#2077ff' + }, + }, + children: '确定', + }, + ], +}; + +const components = { + Button, +}; + +ReactDOM.render(( + +), document.getElementById('root')); +``` + +### 设计模式渲染（Simulator） +设计模式渲染就是将编排生成的《搭建协议》渲染成视图的过程，视图是可以交互的，所以必须要处理好内部数据流、生命周期、事件绑定、国际化等等。也称为画布的渲染，画布是 UI 编排的核心，它一般融合了页面的渲染以及组件/区块的拖拽、选择、快捷配置。 +画布的渲染和预览模式的渲染的区别在于，画布的渲染和设计器之间是有交互的。所以在这里我们新增了一层 `Simulator` 作为设计器和渲染的连接器。 +`Simulator` 是将设计器传入的 `DocumentModel` 和组件/库描述转成相应的 Schema 和 组件类。再调用 Render 层完成渲染。我们这里介绍一下它提供的能力。 +#### 整体架构 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644398136330-0f48202b-b581-4b1f-af79-72a667a194d9.png#clientId=udd4eb4ee-bdb1-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=432&id=u734b5c16&margin=%5Bobject%20Object%5D&name=image.png&originHeight=864&originWidth=1500&originalType=binary&ratio=1&rotation=0&showTitle=false&size=572012&status=done&style=none&taskId=u7d7cf569-d5a9-4bea-9b2d-1121b85728f&title=&width=750) + +- `Project`：位于顶层的 Project，保留了对所有文档模型的引用，用于管理应用级 Schema 的导入与导出。 +- `Document`：文档模型包括 Simulator 与数据模型两部分。Simulator 通过一份 Simulator Host 协议与数据模型层通信，达到画布上的 UI 操作驱动数据模型变化。通过多文档的设计及多 Tab 交互方式，能够实现同时设计多个页面，以及在一个浏览器标签里进行搭建与配置应用属性。 +- `Simulator`：模拟器主要承载特定运行时环境的页面渲染及与模型层的通信。 +- `Node`：节点模型是对可视化组件/区块的抽象，保留了组件属性集合 Props 的引用，封装了一系列针对组件的 API，比如修改、编辑、保存、拖拽、复制等。 +- `Props`：描述了当前组件所维系的所有可以「设计」的属性，提供一系列操作、遍历和修改属性的方法。同时保持对单个属性 Prop 的引用。 +- `Prop`：属性模型 Prop 与当前可视化组件/区块的某一具体属性想映射，提供了一系列操作属性变更的 API。 +- `Settings`：`SettingField` 的集合。 +- `SettingField`：它连接属性设置器 `Setter` 与属性模型 `Prop`，它是实现多节点属性批处理的关键。 +- 通用交互模型：内置了拖拽、活跃追踪、悬停探测、剪贴板、滚动、快捷键绑定。 + +#### 模拟器介绍 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644398137096-260646a0-f264-48af-9600-6f7141a6a1d8.png#clientId=udd4eb4ee-bdb1-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=370&id=ubfb08f11&margin=%5Bobject%20Object%5D&name=image.png&originHeight=740&originWidth=1500&originalType=binary&ratio=1&rotation=0&showTitle=false&size=353179&status=done&style=none&taskId=u3cd764bb-52f6-47a6-8026-fee6a36d08d&title=&width=750) + +- 运行时环境：从运行时环境来看，目前我们有 React 生态、Rax 生态。而在对外的历程中，我们也会拥有 Vue 生态、Angular 生态等。 +- 布局模式：不同于 C 端营销页的搭建，中后台场景大多是表单、表格，流式布局是主流的选择。对于设计师、产品来说，是需要绝对布局的方式来进行页面研发的。 +- 研发场景：从研发场景来看，低代码搭建不仅有页面编排，还有诸如逻辑编排、业务编排的场景。 + +基于以上思考，我们通过基于沙箱隔离的模拟器技术来实现了多运行时环境（如 React、Rax、小程序、Vue）、多模式（如流式布局、自由布局）、多场景（如页面编排、关系图编排）的 UI 编排。通过注册不同的运行时环境的渲染模块，能够实现编辑器从 React 页面搭建到 Rax 页面搭建的迁移。通过注册不同的模拟器画布，你可以基于 G6或者 mxgraph 来做关系图编排。你可以定制一个流式布局的画布，也可以定制一个自由布局的画布。 diff --git a/docs/docs/guide/design/setter.md b/docs/docs/guide/design/setter.md new file mode 100644 index 000000000..66de03bb1 --- /dev/null +++ b/docs/docs/guide/design/setter.md @@ -0,0 +1,86 @@ +--- +title: 设置器设计 +sidebar_position: 6 +--- +设置器，又称为 Setter，是作为物料属性和用户交互的重要途径，在编辑器日常使用中有着非常重要的作用，本文重点介绍 Setter 的设计原理和使用方式，帮助用户更好的理解 Setter。 +在编辑器的右边区域，Setter 的区块就展现在这里，如下图： +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644404887956-8ffc8c8c-380c-4843-8bc9-512be77a9b18.png#clientId=u4cc5b992-0df5-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=865&id=wNOuZ&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1730&originWidth=3836&originalType=binary&ratio=1&rotation=0&showTitle=false&size=947162&status=done&style=none&taskId=ue623b488-8774-401a-b80c-c102e8aac8f&title=&width=1918) +其中包含 属性、样式、事件、高级： + +- 属性：展示该物料常规的属性； +- 样式：展示该物料样式的属性； +- 事件：如果该物料有声明事件，则会出现事件面板，用于绑定事件； +- 高级：两个逻辑相关的属性，**条件渲染**和**循环。** +# npm 包与仓库信息 + +- npm 包：@alilc/lowcode-engine-ext +- 仓库：[https://github.com/alibaba/lowcode-engine-ext](https://github.com/alibaba/lowcode-engine-ext) + +# 设置器模块原理 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644404909143-eede0a27-e990-4333-816a-d2d0cf2594b3.png#clientId=u4cc5b992-0df5-4&crop=0&crop=0&crop=1&crop=1&height=482&id=PyO6v&name=image.png&originHeight=964&originWidth=1534&originalType=binary&ratio=1&rotation=0&showTitle=false&size=273494&status=done&style=none&taskId=ufb317b56-de50-4693-8c39-8faa9b38307&title=&width=767) + +设置面板依赖于以下三块抽象 + +- 编辑器上下文 `editor`，主要包含：消息通知、插件引用等 +- 设置对象 `settingTarget`，主要包含：选中的节点、是否同一值、值的储存等 +- 设置列 `settingField`，主要和当前设置视图相关，包含视图的 `ref`、以及设置对象 `settingTarget` + +#### SettingTarget 抽象 +如果不是多选，可以直接暴露 `Node` 给到这，但涉及多选编辑的时候，大家的值时通常是不一样的，设置的时候需要批量设置进去，这里主要封装这些逻辑，把多选编辑的复杂性屏蔽掉。 + +所选节点所构成的**设置对象**抽象如下： + +```typescript +interface SettingTarget { + // 所设置的节点集，至少一个 + readonly nodes: Node[]; + // 所有属性值数据 + readonly props: object; + // 设置属性值 + setPropValue(propName: string, value: any): void; + // 获取属性值 + getPropValue(propName: string): any; + // 设置多个属性值，替换原有值 + setProps(data: object): void; + // 设置多个属性值，和原有值合并 + mergeProps(data: object): void; + // 绑定属性值发生变化时 + onPropsChange(fn: () => void): () => void; +} +``` + +基于设置对象所派生的**设置目标属性**抽象如下: + +```typescript +interface SettingTargetProp extends SettingTarget { + // 当前属性名称 + readonly propName: string; + // 当前属性值 + value: any; + // 是否设置对象的值一致 + isSameValue(): boolean; + // 是否是空值 + isEmpty(): boolean; + // 设置属性值 + setValue(value: any): void; + // 移除当前设置 + remove(): void; +} +``` + +#### SettingField 抽象 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644396933393-779423e2-29a7-4e97-9ef9-e3c7964a5412.png#clientId=u41c9ba96-15b6-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=201&id=uc71z&margin=%5Bobject%20Object%5D&name=image.png&originHeight=402&originWidth=2022&originalType=binary&ratio=1&rotation=0&showTitle=false&size=218611&status=done&style=none&taskId=u534089f2-363d-464e-8c69-ac79f268f5a&title=&width=1011) + +```typescript +interface SettingField extends SettingTarget { + // 当前 Field 设置的目标属性，为 group 时此值为空 + readonly prop?: SettingTargetProp; + + // 当前设置项的 ref 引用 + readonly ref?: ReactInstance; + + // 属性配置描述传入的配置 + readonly config: SettingConfig; + // others.... +} +``` diff --git a/docs/docs/guide/design/specs.md b/docs/docs/guide/design/specs.md new file mode 100644 index 000000000..be449e3dc --- /dev/null +++ b/docs/docs/guide/design/specs.md @@ -0,0 +1,60 @@ +--- +title: 低代码引擎协议栈简介 +sidebar_position: 1 +--- +# 什么是低代码协议 +这是两份中后台低代码领域的标准协议，即《低代码引擎物料协议规范》和《低代码引擎搭建协议规范》。它们保障了低代码领域的标准化，成为了生态建设和流通的基石。 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1648642508161-64dd3a2c-d2d2-43ed-92e4-ead40ab62498.png#clientId=ub4563dfd-c5b1-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=532&id=u60966832&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1064&originWidth=1928&originalType=binary&ratio=1&rotation=0&showTitle=false&size=974317&status=done&style=none&taskId=u88a8512e-a57c-43f6-a01f-19f6878b7a0&title=&width=964) +# 为什么需要协议 +首先，我们做一个不恰当的类比，我们将低代码引擎和 JavaScript 语言做一下类别。还记得之前，大家都被浏览器兼容性支配的恐惧，特别是 IE 和其他浏览器，对上层 API 实现的不一致，导致一份代码需要运行在两端需要做适配。当浏览器 / JavaScript 相关的标准出现之后，各个浏览器进行了 API 的统一，使得我们终于可以从这部分工作中解放出来（PS：Babel 对于语言特性的转换是另一个方面的问题）。 +而在《低代码引擎搭建协议规范》出现之前，低代码领域也有类似的问题。 +## 概念不通 +在交流的过程中，一些对于搭建产品的术语的不一致，导致了一些沟通成本，不管是在文章分享、技术分享、交流会上，都会有这个问题。 +## 物料孤岛 +由于低代码产品实现的方式不同，物料的消费方式也各不相同。这里分为两种物料，低代码物料和 ProCode 物料。 +对于低代码物料来说，A 平台创建的物料无法使用到 B 平台上，如果想在 B 平台实现同样的物料，需要按照 B 平台的标准搭建一份物料。 +对于 ProCode 物料来说，需要在低代码平台进行消费，是需要进行转换的，包括搭建配置项的生成、物料搭建试图等，可能还需要特殊的描述文件进行描述。由于这一层没有统一，同一份 ProCode 物料每接入一个低代码，可能需要的描述文件格式不同，转换的代码不同，使用的工具也不同。 +## 生态隔离 +不同低代码平台的生态体系也不相同，有的低代码平台的物料生态不错，有的低代码平台的搭建体验生态不错。但是这些利好的生态，都是无法互通的，甚至就算知道了代码，也无法复用，因为底层是不一致的。对于集团来说，每一个平台都创建一份自己的生态，这并不是利好的。 +## 技术深度不够 +大家可能觉得，以上问题对于自己造轮子来说，其实也是有利的，因为自己得到了技术上的成长。 +但是对于低代码的平台方，实际上更多的工作，在物料的转化、物料的生成、搭建体验的小优化、部分其他平台生态的实现。这些的技术深度其实并不高。 +## 价值不高 +如果每个业务都要从 0 开始做，做自己的平台，会花费大量的时间来构建底层基础设施，对业务本身而言并不是一件好事；而且前端领域的底层基础设施都大同小异，不同团队重复构建造成了极大的资源浪费。 +这样的建设，会导致从 0 到 1 都需要花费大量的时间，往往在内部人力不足、投入有限时，产品很容易在未发展壮大的时候就面临了死亡相关的决策。 +设想一下，如果可以开发一份全集团低代码平台都可以使用的物料，是否更有成就感呢？如果可以基于已有生态进行低代码平台的快速落地，而不是花费 1-2 年搭建一个可用的低代码平台，再验证市场。在快速的验证之后，再进行更深入的打磨，这其中的思考和技术含量是否更优于之前的模式呢？ +比如不同平台的低代码物料 + +1. vc-deep — vc 协议 + Deep 组件库(企业智能基于 Fusion Next 定制)； +2. Iceluna 协议 + Fusion Next； +3. AIMake 物料； +4. vc-fusion-basic + 业务改造 — vc 协议 + Fusion Next(各业务 Fork 定制)； +5. vision 魔改 + vc 协议扩展 + fusion 业务组件； +6. vc 协议 + antd； + +可以看到，各个搭建平台都需要维护一套自己的基础组件库，这是非常不合理的，对基础组件库的维护会分散开发同学完成业务目标的精力。 +建立统一的低代码领域标准化，是百利而无一害的。于是，在阿里巴巴集团2020财年进行了讨论，建立了搭建治理&物料流通战役，此战役便产出了《低代码引擎物料协议规范》、《低代码引擎搭建协议规范》两份规范，成为了低代码引擎和其生态的基础。 +# 协议的作用 +基于统一的协议，我们完成业务组件、区块、模板等各类物料的标准统一，基于统一的协议，我们完成业务组件、区块、模板等各类物料的标准统一，集团各类中后台研发系统生产的物料可借助物料中心进行跨系统流通，通过丰富物料生态的共享提升阿里巴巴中后台研发系统的效率。同时完成低代码引擎的标准统一以及低代码搭建中台能力的输出，帮助业务方快速孵化本业务域中后台研发系统。 + +## 打破物料孤岛 +### 物料中心 +在《低代码引擎物料协议规范》成立了之后，规范先行建立了阿里巴巴各个中后台研发平台沟通、对话的基础，物料流通的先决条件已经成熟，这个时候我们还需要一个统一的物料源，用于管理物料的上传、存储、检索、分发，一个典型的中心化架构，类似 npm 的管理，这便是我们物料中心。 +Fusion Market 是物料中心的前身，它提供了业务组件的存储、文档展示和全局透出的功能，由于 fusion 体系在集团内的广泛使用，Fusion Market 沉淀了不少的业务组件，但是这个项目却一直不温不火，只看到业务组件数量的增加，却未看到物料流通起来。其中一个原因是，没有阿里巴巴前端委员会的背书，规范很难统一，规范如果不统一，物料就很难流通； +在规范成立之后，物料中心也将有了建设的基础，最终于 2019 年建立了物料中心，提供了物料流通的平台能力。 +### 低代码基础物料 +就像 AntD、Element 之于源码研发模式，在低代码研发模式下各个搭建平台也需要一套统一的、开箱即用的低代码基础组件库。基于低代码描述协议完成了两份低代码基础物料的建设，即“Fusion 低代码基础组件库”和“AntD 低代码基础组件库”。 +### 源码组件低代码化 +将源码组件一键转化为低代码物料，符合低代码物料规范，可以在低代码平台进行流通。 +### 低代码物料中心 +当低代码物料积累到一定的量级之后，所有的搭建平台的业务物料越来越多。这些物料通过低代码物料中心进行统一的管理和消费。 +## Setter 生态的基础 + +Snippet(组件默认搭建 schema )由《低代码引擎搭建协议规范》定义，低代码引擎会按照规范对组件进行渲染，Configure 由《低代码引擎物料协议规范》定义，它描述了组件的 props 以及每个 prop 对应的 setter (Prop 配置面板)，低代码引擎提供了 14 个内置 Setter，但如果我们组件的 props 超出了引擎内置 setter 的范围，就需要我们自己来开发对应 Setter。 +setter 最终也慢慢形成了自己的生态，这使得开发物料更加容易，可以使用已有的 setter 生态，进行物料配置描述。 +## 低代码引擎实现标准 +低代码引擎是以上生态的消费端，它是实现了标准协议的低代码引擎。这是不可或缺的部分，低代码引擎这里就相当于一个标准浏览器，一方面给其他的低代码平台提供了一个 Demo，其他平台可以参考低代码引擎进行实现，满足官方协议，便也可以消费相关的物料生态和其他生态。 +通过物料中心实现集团各业务域物料跨系统流通是第一步，通过低代码引擎快速搭建出来的各业务域低代码平台平滑高效地使用各业务域物料，提升集团中后台研发系统的效率是关键的第二步。 + + +其中入料模块，使得任意符合物料协议的物料都可以被消费，也就打破了物料孤岛，实现物料之间的流通。 diff --git a/docs/docs/guide/design/summary.md b/docs/docs/guide/design/summary.md new file mode 100644 index 000000000..604886e8b --- /dev/null +++ b/docs/docs/guide/design/summary.md @@ -0,0 +1,57 @@ +--- +title: 低代码引擎架构综述 +sidebar_position: 0 +--- +## 分层架构描述 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644392855407-44040c3e-f98e-4e93-a7ba-7efc0a7927fb.png#clientId=ue3f00c22-d0cc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=540&id=u0d1fdc91&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1080&originWidth=1920&originalType=binary&ratio=1&rotation=0&showTitle=false&size=177518&status=done&style=none&taskId=u0ac7d0a3-e838-4982-ad41-e830af33545&title=&width=960) +我们设计了这样一套分层架构，自下而上分别是协议 - 引擎 - 生态 - 平台。 +底层协议栈定义的是标准，**标准的统一让上层产物的互通成为可能**， +**引擎是对协议的实现，同时通过能力的输出，向上支撑生态开放体系，提供各种生态扩展能力，** +那么生态就好理解了，是基于引擎核心能力上扩展出来的，比如物料、设置器、插件等，还有工具链支撑开发体系， +最后，各个平台基于引擎内核以及生态中的产品组合、衔接形成满足其需求的低代码平台。 +**每一层都明确自身的定位，各司其职，协议不会去思考引擎如何实现，引擎也不会实现具体上层平台功能，上层平台的定制化均通过插件来实现，这些理念将会贯穿我们体系设计、实现的过程。** + +## 引擎内核简述 + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644393521380-2b5dda70-cd35-4cc2-aeae-6d0ba98deccd.png#clientId=ue3f00c22-d0cc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=540&id=u6b0dd5f3&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1080&originWidth=1920&originalType=binary&ratio=1&rotation=0&showTitle=false&size=330340&status=done&style=none&taskId=u39127ebd-dbac-4636-9cb5-5c4833146a1&title=&width=960) + +低代码引擎分为 4 大模块，入料 - 编排 - 渲染 - 出码。 +入料模块就是将外部的物料，比如海量的 npm 组件，按照《物料描述协议》进行描述。 +**注意，这里仅是增加描述，而非重写一套，这样我们能最大程度复用ProCode体系已沉淀的组件。** +将描述后的数据通过引擎 API 注册后，在编辑器中使用。 +编排，本质上来讲，就是**不断在生成符合《搭建协议》的页面描述，将编辑器中的所有物料，进行布局设置、组件 CRUD 操作、以及 JS/CSS编写/逻辑编排**等，最终转换成页面描述，技术细节待会儿我们再展开讲讲。 +渲染，顾名思义，就是**将编排生成的页面描述结构渲染成视图的过程**，视图是面向用户的，所以必须处理好内部数据流、生命周期、事件绑定、国际化等。 +出码，就是**将页面描述结构解析和转换成应用代码的机制**。 + +## 引擎生态简述 + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644393489755-b9a6a471-c099-480b-b40b-3094b793394d.png#clientId=ue3f00c22-d0cc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=540&id=u81ccc9e2&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1080&originWidth=1920&originalType=binary&ratio=1&rotation=0&showTitle=false&size=504671&status=done&style=none&taskId=u52008ac0-e9c6-407b-a59e-7dbf4c02c0c&title=&width=960) + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644397483218-2b58bfca-94b1-474e-8983-afc757f20e59.png#clientId=uafdaa655-f89e-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=540&id=u3aeacdac&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1080&originWidth=1920&originalType=binary&ratio=1&rotation=0&showTitle=false&size=394834&status=done&style=none&taskId=udcd28484-1df2-484c-9f98-87175972d65&title=&width=960) + +引擎生态主要分为 3 部分，物料、设置器和插件。 +### 物料生态 +物料是低代码平台的生产资料，没有物料低代码平台则变成了无源之水无本之木。低代码平台的物料即低代码组件。因此低代码物料生态指的是： +1）低代码物料生产能力和规范。 +2）对低代码物料进行统一管理的物料中心。 +3）基于 Fusion Next 的低代码基础组件库。 + +### 设置器生态 +对于已接入物料的属性配置，需要不同的设置器。 +比如配置数值类型的 age，需要一个数值设置器，配置对象类型的 hobby，需要一个对象设置器，依次类推。 +每个设置器本质上都是一个 React 组件，接受由引擎传入的参数，比如 value 和 onChange，value 是初始传入的值，onChange 是在设置器的值变化时的回传函数，将值写回到引擎中。 +```json +// 一个最简单的文本设置器示例 +class TextSetter extends Component { + render() { + const { value, onChange } = this.props; + return onChange(e.target.value)} />; + } +} +``` +大多数组件所使用的设置器都是一致或相似的。如同建设低代码基础组件库一样，设置器生态是一组基础的设置器，供大多数组件配置场景使用。 +同时提供了设置器的定制功能。 + +### 插件生态 +低代码引擎本身只包含了最小的内核，而我们所能看到的设计器上的按钮、面板等都是插件提供的。插件是组成设计器的必要部分。 +因此我们提供了一套官方的插件生态，提供最基础的设计器功能。帮助用户通过使用插件，快速完成自己的设计器。 diff --git a/docs/docs/guide/expand/_category_.json b/docs/docs/guide/expand/_category_.json new file mode 100644 index 000000000..36116999b --- /dev/null +++ b/docs/docs/guide/expand/_category_.json @@ -0,0 +1,6 @@ +{ + "label": "扩展低代码应用", + "position": 2, + "collapsed": false, + "collapsible": true +} diff --git a/docs/docs/guide/expand/editor/_category_.json b/docs/docs/guide/expand/editor/_category_.json new file mode 100644 index 000000000..b0c35885c --- /dev/null +++ b/docs/docs/guide/expand/editor/_category_.json @@ -0,0 +1,4 @@ +{ + "label": "扩展低代码编辑器", + "position": 1 +} diff --git a/docs/docs/guide/expand/editor/cli.md b/docs/docs/guide/expand/editor/cli.md new file mode 100644 index 000000000..7f46c7b2e --- /dev/null +++ b/docs/docs/guide/expand/editor/cli.md @@ -0,0 +1,181 @@ +--- +title: 低代码生态脚手架 & 调试机制 +sidebar_position: 7 +--- +## 脚手架简述 + +在 fork 低代码编辑器 demo 项目后，您可以直接在项目中任意扩展低代码编辑器。如果您想要将自己的组件/插件/设置器封装成一个独立的 npm 包并提供给社区，您可以使用我们的低代码脚手架建立低代码扩展。 + +> Windows 开发者请在 WSL 环境下使用开发工具 +> WSL 中文 doc：[https://docs.microsoft.com/zh-cn/windows/wsl/install](https://docs.microsoft.com/zh-cn/windows/wsl/install) +中文教程：[https://blog.csdn.net/weixin_45027467/article/details/106862520](https://blog.csdn.net/weixin_45027467/article/details/106862520) + + +## 脚手架功能 +### 脚手架初始化 +```shell +$ npm init @alilc/element your-element-name +``` +不写 your-element-name 的情况下，则在当前目录创建。 + +> 觉得安装速度比较慢的同学，可以设置 npm 国内镜像，如 + +```bash +$ npm init @alilc/element your-element-name --registry=https://registry.npmmirror.com +``` + +选择对应的元素类型，并填写对应的问题，即可完成创建。 +![截屏2022-02-09 下午8.15.07.png](https://cdn.nlark.com/yuque/0/2022/png/134449/1644408912640-ae7a9a9b-54a4-49c3-a5d8-ccac1db7da0b.png#averageHue=%23f0f0ef&clientId=ue2be1de5-5d30-4&crop=0&crop=0&crop=1&crop=1&errorMessage=unknown%20error&from=drop&height=82&id=uaff32f98&margin=%5Bobject%20Object%5D&name=%E6%88%AA%E5%B1%8F2022-02-09%20%E4%B8%8B%E5%8D%888.15.07.png&originHeight=148&originWidth=688&originalType=binary&ratio=1&rotation=0&showTitle=false&size=72918&status=error&style=none&taskId=uf08c7e98-b502-416d-be39-0029f765203&title=&width=382) +### 脚手架本地环境调试 +```shell +cd your-element-name +npm install +npm start +``` + +### 脚手架构建 +```shell +$ npm run build +``` +### 脚手架发布 +修改版本号后，执行如下指令即可： +```shell +$ npm publish +``` + +# 🔥🔥🔥 调试物料/插件/设置器 + +> 📢📢 📢 低代码生态脚手架提供的调试利器，在启动 setter/插件/物料 项目后，直接在已有的低代码平台就可以调试，不需要 npm link / 手改 npm main 入口等传统方式，轻松上手，强烈推荐使用！！ + + +注：若控制台出现如下错误，直接访问一次该 url 即可~ +![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1652408638502-0509191d-1cd6-435c-9196-5c7abac7cc4d.png#averageHue=%23c8e1be&clientId=u0b1196f0-7f06-4&crop=0&crop=0&crop=1&crop=1&errorMessage=unknown%20error&from=paste&height=113&id=tjF5F&margin=%5Bobject%20Object%5D&name=image.png&originHeight=226&originWidth=1418&originalType=binary&ratio=1&rotation=0&showTitle=false&size=180782&status=error&style=none&taskId=u57eb2bdc-6dfd-4332-b176-c453947be2d&title=&width=709) + +## 组件/插件/Setter 侧 + +1. 插件/setter 在原有 alt 的配置中添加相关的调试配置 +```json +// build.json 中 +{ + "plugins": [ + [ + "@alilc/build-plugin-alt", + { + "type": "plugin", + "inject": true, // 开启注入调试 + // 配置要打开的页面，在注入调试模式下，不配置此项的话不会打开浏览器 + // 支持直接使用官方 demo 项目：https://lowcode-engine.cn/demo/index.html + "openUrl": "https://lowcode-engine.cn/demo/index.html?debug" + } + ], + ] +} +``` + +2. 组件需先安装 @alilc/build-plugin-alt，再将组件内的 `build.lowcode.js`文件修改如下 +```javascript +const { library } = require('./build.json'); + +module.exports = { + alias: { + '@': './src', + }, + plugins: [ + [ + // lowcode 的配置保持不变，这里仅为示意。 + '@alifd/build-plugin-lowcode', + { + library, + engineScope: "@alilc" + }, + ], + [ + '@alilc/build-plugin-alt', + { + type: 'component', + inject: true, + library, + // 配置要打开的页面，在注入调试模式下，不配置此项的话不会打开浏览器 + // 支持直接使用官方 demo 项目：https://lowcode-engine.cn/demo/index.html + openUrl: "https://lowcode-engine.cn/demo/index.html?debug" + } + ]], +}; +``` + +3. 本地组件/插件/Setter正常启动调试，在项目的访问地址增加 debug，即可开启注入调试。 +```typescript +https://lowcode-engine.cn/demo/index.html?debug +``` +## 项目侧的准备 +> 如果你的低代码项目 fork 自官方 demo，那么项目侧的准备已经就绪，不用再看以下内容~ + +1. 安装 @alilc/lowcode-plugin-inject +```shell +npm i @alilc/lowcode-plugin-inject --save-dev +``` + +2. 在引擎初始化侧引入插件 +```json +import Inject, { injectAssets } from '@alilc/lowcode-plugin-inject'; + +export default async () => { + // 注意 Inject 插件必须在其他插件前注册，且所有插件的注册必须 await + await plugins.register(Inject); + await plugins.register(OtherPlugin); + await plugins.register((ctx: ILowCodePluginContext) => { + return { + name: "editor-init", + async init() { + // 设置物料描述前，使用插件提供的 injectAssets 进行处理 + const { material, project } = ctx; + material.setAssets(await injectAssets(assets)); + }, + }; + }); +} +``` + +3. 在 saveSchema 时过滤掉插入的url，避免影响渲染态 +```javascript +import { filterPackages } from '@alilc/lowcode-plugin-inject'; +export const saveSchema = async () => { + // ... + const packages = await filterPackages(editor.get('assets').packages); + window.localStorage.setItem( + 'packages', + JSON.stringify(packages), + ); + // ... +}; + +``` + +4. 如果希望预览态也可以注入调试组件，则需要在 preview 逻辑里插入组件 +```javascript +import { injectComponents } from '@alilc/lowcode-plugin-inject'; + +async function init() { + // 在传递给 ReactRenderer 前，先通过 injectComponents 进行处理 + const components = await injectComponents(buildComponents(libraryMap, componentsMap)); + // ... +} +``` + +# Meta 信息 +meta 信息是放在生态元素 package.json 中的一小段 json，用户可以通过 meta 了解到这个元素的一些基本信息，如元素类型，一些入口信息等。 + +```typescript +interface LcMeta { + type: 'plugin' | 'setter' | 'component'; // 元素类型，尚未实现 + pluginName: string; // 插件名，仅插件包含 + meta: { + dependencies: string[]; // 插件依赖的其他插件列表，仅插件包含 + engines: { + lowcodeEngine: string; // 适配的引擎版本 + } + prototype: string; // 物料描述入口，仅组件包含，尚未实现 + prototypeView: string; // 物料设计态入口，仅组件包含，尚未实现 + } +} +``` diff --git a/docs/docs/guide/expand/editor/material.md b/docs/docs/guide/expand/editor/material.md new file mode 100644 index 000000000..88ea8b908 --- /dev/null +++ b/docs/docs/guide/expand/editor/material.md @@ -0,0 +1,271 @@ +--- +title: 物料扩展 +sidebar_position: 1 +--- +## 物料简述 +物料是页面搭建的原料，按照粒度可分为组件、区块和模板： + +1. 组件：组件是页面搭建最小的可复用单元，其只对外暴露配置项，用户无需感知其内部实现； +2. 区块：区块是一小段符合低代码协议的 schema，其内部会包含一个或多个组件，用户向设计器中拖入一个区块后可以随意修改其内部内容； +3. 模板：模板和区块类似，也是一段符合低代码协议的 schema，不过其根节点的 componentName 需固定为 Page，它常常用于初始化一个页面； + +低代码编辑器中的物料需要进行一定的配置和处理，才能让用户在低代码平台使用起来。这个过程中，需要一份一份配置文件，也就是资产包。资产包文件中，针对每个物料定义了它们在低代码编辑器中的使用描述。 +## 资产包配置 +### 什么是低代码资产包 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1647671718994-e013a162-37be-4fa7-bd3b-3af06878c3c2.png#clientId=uf20508c2-6786-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=579&id=u7a0c3dae&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1646&originWidth=3068&originalType=binary&ratio=1&rotation=0&showTitle=false&size=635660&status=done&style=stroke&taskId=uc304cc2b-24bf-449d-8e2e-fd25c88b189&title=&width=1080) +在低代码 Demo 中，我们可以看到，组件面板不只提供一个组件，组件是以集合的形式提供给低代码平台的，而低代码资产包正是这些组件构成集合的形式。 +**_它背后的 Interface，_**[**_在引擎中的定义摘抄如下_**](https://github.com/alibaba/lowcode-engine/blob/main/packages/types/src/assets.ts)**_：_** + +```typescript +export interface Assets { + version: string; // 资产包协议版本号 + packages?: Array; // 大包列表，external与package的概念相似，融合在一起 + components: Array | Array; // 所有组件的描述协议列表 + sort: ComponentSort; // 新增字段，用于描述组件面板中的 tab 和 category +} + +export interface ComponentSort { + groupList?: String[]; // 用于描述组件面板的 tab 项及其排序，例如：["精选组件", "原子组件"] + categoryList?: String[]; // 组件面板中同一个 tab 下的不同区间用 category 区分，category 的排序依照 categoryList 顺序排列； +} + +export interface RemoteComponentDescription { + exportName: string; // 组件描述导出名字，可以通过 window[exportName] 获取到组件描述的 Object 内容； + url: string; // 组件描述的资源链接； + package: { // 组件(库)的 npm 信息； + npm: string; + } +} +``` +资产包协议 TS 描述 +### Demo 中的资产包 +在 Demo 项目中，自带了一份默认的资产包： +> [https://github.com/alibaba/lowcode-demo/blob/main/src/universal/assets.json](https://github.com/alibaba/lowcode-demo/blob/main/src/universal/assets.json) + +这份资产包里的物料是我们内部沉淀出的，用户可以通过这套资产包体验引擎提供的搭建、配置能力。 +**_在项目中正常注册资产包：_** +```json +import { material } from '@alilc/lowcode-engine' +// 以任何方式引入 assets +material.setAssets(assets) +``` +**_以支持调试的方式注册资产包：_** +> 这样启动并部署出来的项目，可以通过在预览地址加上 ?debug 来调试本地物料。 +> 例如： +> - 通过插件初始化一个物料 +> - 按照参考文章配置物料支持调试 +> - 启动物料 +> - 访问：[https://lowcode-engine.cn/demo?debug](https://lowcode-engine.cn/demo?debug) +> +详细参考：[https://www.yuque.com/lce/doc/ulvlkz](https://www.yuque.com/lce/doc/ulvlkz) + +```javascript +import { material } from '@alilc/lowcode-engine' +import Inject, { injectAssets } from '@alilc/lowcode-plugin-inject'; +await material.setAssets(await injectAssets(assets)); +``` + +### 手工配置资产包 +参考 Demo 中的[基础 Fusion Assets 定义](https://github.com/alibaba/lowcode-demo/blob/main/src/scenarios/basic-fusion/assets.json)，如果我们修改 assets.json，我们就能做到配置资产包： + +- packages 对象：我们需要在其中定义这个包的获取方式，如果不定义，就不会被低代码引擎动态加载并对应上组件实例。定义方式是 UMD 的包，低代码引擎会尝试在 window 上寻找对应 library 的实例； +- components 对象：我们需要在其中定义物料描述，物料描述我们将在下一节继续讲解。 +## 物料描述配置 +### 什么是物料描述 +在低代码平台中，用户是不同的，有可能是开发、测试、运营、设计，也有可能是销售、行政、HR 等等各种角色。他们大多数不具备专业的前端开发知识，对于低代码平台来说，我们使用组件的流程如下： + +1. 用户通过拖拽/选择组件，在画布中看到组件； +2. 选中组件，出现组件的配置项； +3. 修改组件配置项； +4. 画布更新生效。 + +**_当我们选中一个组件，我们可以看到面板右侧会显示组件的配置项。_** +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644312295732-5e0df2b5-065a-4d80-a66c-b5b20c8c32af.png#clientId=ue1d4eb8d-3b5c-4&crop=0&crop=0&crop=1&crop=1&from=url&height=535&id=ML9vP&margin=%5Bobject%20Object%5D&name=image.png&originHeight=743&originWidth=1500&originalType=binary&ratio=1&rotation=0&showTitle=false&size=212807&status=done&style=stroke&taskId=u2458e0f7-6bea-40d8-bb9b-9811562c6fe&title=&width=1080) +**_它包含以下内容：_** + +1. 基础信息：描述组件的基础信息，通常包含包信息、组件名称、标题、描述等。 +2. 组件属性信息：描述组件属性信息，通常包含参数、说明、类型、默认值 4 项内容。 +3. 能力配置/体验增强：推荐用于优化搭建产品编辑体验，定制编辑能力的配置信息。 + +因此，我们设计了[**《中后台低代码组件描述协议》**](http://lowcode-engine.cn/material)来描述一个低代码编辑器中可被配置的内容。 +### Demo 中的物料描述 +我们可以从 Demo 中的 assets.json 找到如下三个物料描述： + +- @alifd/pro-layout：布局组件，放在`window.AlifdProLayoutMeta`，[meta 文件地址](https://alifd.alicdn.com/npm/@alifd/pro-layout@1.0.1-beta.5/build/lowcode/meta.js)； +- @alifd/fusion-ui：精选组件，放在`window.AlifdFusionUiMeta`，[meta 文件地址](https://alifd.alicdn.com/npm/@alifd/fusion-ui@1.0.5-beta.1/build/lowcode/meta.js)； +- @alilc/lowcode-materials：原子组件，放在 `window.AlilcLowcodeMaterialsMeta`，[meta 文件地址](https://alifd.alicdn.com/npm/@alilc/lowcode-materials@1.0.1/build/lowcode/meta.js)； + +**_引擎中，会尝试调用对应 meta 文件，并注入到全局：_** +```tsx +const src = 'https://alifd.alicdn.com/npm/@alifd/pro-layout@1.0.1-beta.5/build/lowcode/meta.js' +const script = document.createElement('script') +script.src = src +document.head.appendChild(script) +``` +然后在 window 上就能拿到对应的物料描述内容了： +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1647672326187-ec19ed1e-645a-4086-8384-ccca19b9f36c.png#clientId=uf20508c2-6786-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=648&id=ue7a84d56&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1138&originWidth=1896&originalType=binary&ratio=1&rotation=0&showTitle=false&size=582492&status=done&style=stroke&taskId=u11707d78-e1c5-4368-9de0-e98b7597815&title=&width=1080) +手工配置物料描述时，可以用这样的方式参考一下 Demo 中的物料描述是如何实现的。 +### 手工配置物料描述 +详见：“物料描述详解”章节。 +## 物料的低代码开发 +> _**注意：引擎提供的 cli 并未对 windows 系统做适配，windows 环境必须使用 **_[_**WSL**_](https://docs.microsoft.com/zh-cn/windows/wsl/install)_**，其他终端不保证能正常运行**_ + +您可以通过本节内容，完成一个组件在低代码编辑器中的配置和调试。 +### 前言（必读） +引擎提供的物料开发脚手架内置了**_入料模块_**，初始化的时候会自动根据源码解析出一份_**低代码描述**_，但是从源码解析出来的低代码描述让用户直接使用是不够精细的，因为源码包含的信息不够，它没办法完全包含配置项的交互； +![image.png](https://cdn.nlark.com/yuque/0/2022/png/231502/1650539267595-c15e6200-9747-46bf-a61d-2a635d295406.png?x-oss-process=image/format,png#clientId=u97daa023-2ae2-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=856&id=u5b22ab2d&name=image.png&originHeight=1830&originWidth=802&originalType=binary&ratio=1&rotation=0&showTitle=false&size=4406602&status=done&style=stroke&taskId=ued90eb0c-b714-401a-bbfe-9f0b04794f6&title=&width=375) +比如设计师出了上面的设计稿，这里面除了有哪些 props 可被配置，通过哪个设置器配置，还包含了 props 之间的聚合、排序，甚至有自定义 setter ，这些信息源码里是不具备的，需要在低代码描述里进行开发； +**_因此我们建议只把 cli 初始化的低代码描述作为启动，要根据用户习惯对配置项进行设计，然后人工地去开发调试直接的低代码描述。_** +### 新开发组件 +#### 组件项目初始化 +```json +npm init @alilc/element your-material-name +``` +#### 选择组件类型 +> 组件 -> <组件组织方式> + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/231502/1647569723981-d0cb5f94-c137-4abf-8165-947b49595c8c.png#clientId=u6b9f3678-e2a3-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=174&id=ud7ad63de&margin=%5Bobject%20Object%5D&name=image.png&originHeight=464&originWidth=1596&originalType=binary&ratio=1&rotation=0&showTitle=false&size=298505&status=done&style=stroke&taskId=ud5e35ff9-c823-41bf-b441-db9e06a1f29&title=&width=600) +这里我们选择 react-组件库，之后便生出我们的组件库项目，目录结构如下： +``` +my-materials +├── README.md +├── components (业务组件目录） +│ ├── ExampleComponent // 业务组件1 +│ │ ├── build // 【编译生成】【必选】 +│ │ │ └── index.html // 【编译生成】【必选】可直接预览文件 +│ │ ├── lib // 【编译生成】【必选】 +│ │ │ ├── index.js // 【编译生成】【必选】js 入口文件 +│ │ │ ├── index.scss // 【编译生成】【必选】css 入口文件 +│ │ │ └── style.js // 【编译生成】【必选】js 版本 css 入口文件，方便去重 +│ │ ├── demo // 【必选】组件文档，用于生成组件开发预览，以及生成组件文档 +│ │ │ └── basic.md +│ │ ├── src // 【必选】组件源码 +│ │ │ ├── index.js // 【必选】，组件出口文件 +│ │ │ └── main.scss // 【必选】，仅包含组件自身样式的源码文件 +│ │ ├── README.md // 【必选】，组件说明及API +│ │ └── package.json // 【必选】 +└── └── ExampleComponent2 // 业务组件2 +``` +#### 组件开发与调试 +``` +# 安装依赖 +npm install + +# 启动 lowcode 环境进行调试预览 +npm run lowcode:dev + +# 构建低代码产物 +npm run lowcode:build +``` +执行上述命令后会在组件(库)根目录生成一个 `lowcode` 文件夹，里面会包含每个组件的低代码描述： +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644314663918-b2464be7-a65b-447c-af2a-12ea326a7558.png#clientId=ue1d4eb8d-3b5c-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=376&id=AYq7T&margin=%5Bobject%20Object%5D&name=image.png&originHeight=906&originWidth=1446&originalType=binary&ratio=1&rotation=0&showTitle=false&size=347634&status=done&style=stroke&taskId=u25ffbb86-6681-427f-b199-69a22560a9c&title=&width=600) + +在 src/components 目录新增一个组件并在 src/index.tsx 中导出，然后再执行 npm run lowcode:dev 时，低代码插件会在 lowcode/ 目录自动生成新增组件的低代码描述（meta.ts）。 + +用户可以直接修改低代码描述来修改组件的配置： + +- 设置组件的 setter；（上一个章节介绍的设置器，也可以定制设置器用到物料中） +- 新增组件配置项 +- 更改当前配置项； +#### 配置示例 +隐藏一个 prop +```typescript +{ + name: 'dataSource', + condition: () => false, +} +``` +展示样式 +```typescript +{ + name: 'dataSource', + display: 'accordion' | 'inline' | 'block' | 'plain' | 'popup' | 'entry' // 常用的是 inline(默认), block、entry +} +``` +发布组件 +``` +# 在组件根目录下，执行 +$ npm publish +``` +### 现存组件低代码化 +组件低代码化是指，在引入低代码平台之前，我们大多数都是使用源码开发的组件，也就是 ProCode 组件。 +在引入低代码平台之后，原来的源码组件是需要转化为低代码物料，这样才能在低代码平台进行消费。 +所以接下来会说明，对于已有的源码组件，我们如何把它低代码化。 +#### 配置低代码开发环境 +在您的组件开发环境中，安装 [build-scripts](https://github.com/ice-lab/build-scripts) 和它的低代码开发插件： +```shell +npm install -D @alifd/build-plugin-lowcode @alib/build-scripts --save-dev +``` +新增 build-scripts 配置文件：build.lowcode.js +```javascript +module.exports = { + alias: { + '@': './src', + }, + plugins: [ + [ + "@alifd/build-plugin-lowcode", + { + engineScope: '@alilc', + } + ] + ], +}; + +``` +在 package.json 中定义低代码开发相关命令 +```javascript +"lowcode:dev": "build-scripts start --config ./build.lowcode.js", +"lowcode:build": "build-scripts build --config ./build.lowcode.js", +``` +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644314665584-018b6675-ca7c-4bf5-b755-15a9b629f78f.png#clientId=ue1d4eb8d-3b5c-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=270&id=brUY9&margin=%5Bobject%20Object%5D&name=image.png&originHeight=822&originWidth=1830&originalType=binary&ratio=1&rotation=0&showTitle=false&size=972113&status=done&style=stroke&taskId=u09d05c9e-cf05-417e-bf32-8268d004134&title=&width=600) +#### 开发调试 +```bash +# 启动低代码开发调试环境 +npm run lowcode:dev +``` +组件开发形式还和原来的保持一致，但是新增了一份组件的配置文件，其中配置方式和低代码物料的配置是一样的。 +#### 构建 +```bash +# 构建低代码产物 +npm run lowcode:build +``` +#### 发布组件 +```bash +# 在组件根目录下，执行 +npm publish +``` +## 在项目中引入组件(库) +> 以下内容可观看[《阿里巴巴低代码引擎项目实战(3)-自定义组件接入》](https://www.bilibili.com/video/BV1dZ4y1m76S/)直播回放 + +对于平台或者用户来说，可能所需要的组件集合是不同的。如果需要自定义组件集合，就需要定制资产包，定制的资产包是配置了一系列组件的，将这份资产包用于引擎即可在引擎中使用自定义的组件集合。 +### 管理一份资产包 +项目中使用的组件相关资源都需要在资产包中定义，那么我们自己开发的组件库如果要在项目中使用，只需要把组件构建好的相关资源 merge 到 assets.json 中就可以； +#### 自定义组件加入到资产包 +通过官方脚手架自定义组件构建发布之后，npm 包里会出现一个 `build/lowcode/assets-prod.json`文件，我们只需要把该文件的内容 merge 到项目的 assets.json 中就可以； +#### 资产包托管 + +- 最简单的方式就是类似[引擎 demo 项目](https://github.com/alibaba/lowcode-demo/blob/main/src/universal/assets.json)的做法，在项目中维护一份 assets.json，新增组件或者组件版本更新都需要修改这份资产包； +- 灵活一点的做法是通过 oss 等服务维护一份远程可配置的 assets.json ，新增组件或者组件更新只需要修改这份远程的资产包，项目无需更新； +- 再高级一点的做法是实现一个资产包管理的服务，能够通过用户界面去更新资产包的内容； +### 在项目中引入资产包 +```javascript +import { ILowCodePluginContext, material, plugins } from '@alilc/lowcode-engine' + +// 动态加载 assets +plugins.register((ctx: ILowCodePluginContext) => { + return { + name: 'ext-assets', + async init() { + try { + // 将下述链接替换为您的物料即可。无论是通过 utils 从物料中心引入，还是通过其他途径如直接引入物料描述 + const res = await window.fetch('https://fusion.alicdn.com/assets/default@0.1.95/assets.json') + const assets = await res.text() + material.setAssets(assets) + } catch (err) { + console.error(err) + } + }, + } +}).catch(err => console.error(err)) +``` diff --git a/docs/docs/guide/expand/editor/metaSpec.md b/docs/docs/guide/expand/editor/metaSpec.md new file mode 100644 index 000000000..b1c41dfd9 --- /dev/null +++ b/docs/docs/guide/expand/editor/metaSpec.md @@ -0,0 +1,535 @@ +--- +title: 物料描述详解 +sidebar_position: 2 +--- +## 物料描述概述 + +中后台前端体系中，存在大量的组件，程序员可以通过阅读文档，知悉组件的用法。可是搭建平台无法理解 README，而且很多时候，README 里并没有属性列表。这时，我们需要一份额外的描述，来告诉低代码搭建平台，组件接受哪些属性，又是该用怎样的方式来配置这些属性，于是，[**《中后台低代码组件描述协议》**](http://lowcode-engine.cn/material)应运而生。协议主要包含三部分：基础信息、属性信息 props、能力配置/体验增强 configure。 + +物料配置，就是产出一份符合[**《中后台低代码组件描述协议》**](http://lowcode-engine.cn/material)的 JSON Schema。如果需要补充属性描述信息，或需要定制体验增强部分（如修改 Setter、调整展示顺序等），就可以通过修改这份 Schema 来实现。目前有自动生成、手工配置这两种方式生成物料描述配置。 + +## 可视化生成物料描述 + +使用Parts造物平台：[https://www.yuque.com/lce/xhk5hf/qa9pbx](https://www.yuque.com/lce/xhk5hf/qa9pbx) + +## 自动生成物料描述 + +可以使用官方提供的 `@alilc/lowcode-material-parser` 解析本地组件，自动生成物料描述。把物料描述放到资产包定义中，就能让低代码引擎理解如何制作物料。详见上一个章节“物料扩展”。 + +下面以某个组件代码片段为例： +```typescript +// /path/to/component +import { PureComponent } from 'react'; +import PropTypes from 'prop-types'; + +export default class FusionForm extends PureComponent { + static displayName = 'FusionForm'; + + static defaultProps = { + name: '张三', + age: 18, + friends: ['李四','王五','赵六'] + } + + static propTypes = { + /** + * 这是用于描述姓名 + */ + name: PropTypes.string.isRequired, + /** + * 这是用于描述年龄 + */ + age: PropTypes.number, + /** + * 这是用于描述好友列表 + */ + friends: PropTypes.array + }; + + render() { + return
dumb
+ } +} +``` +引入 parse 工具自动解析 +```typescript +import parse from '@alilc/lowcode-material-parser'; +(async () => { + const result = await parse({ entry: '/path/to/component' }); + console.log(JSON.stringify(result, null, 2)); +})(); +``` +因为一个组件可能输出多个子组件，所以解析结果是个数组。 +```json +[ + { + "componentName": "FusionForm", + "title": "", + "docUrl": "", + "screenshot": "", + "devMode": "proCode", + "npm": { + "package": "", + "version": "", + "exportName": "default", + "main": "", + "destructuring": false, + "subName": "" + }, + "props": [ + { + "name": "name", + "propType": "string", + "description": "这是用于描述姓名", + "defaultValue": "张三" + }, + { + "name": "age", + "propType": "number", + "description": "这是用于描述年龄", + "defaultValue": 18 + }, + { + "name": "friends", + "propType": "array", + "description": "这是用于描述好友列表", + "defaultValue": [ + "李四", + "王五", + "赵六" + ] + } + ] + } +] +``` +## 手工配置物料描述 + +如果自动生成的物料无法满足需求，我们就需要手动配置物料描述。本节将分场景描述物料配置的内容。 + +### 常见配置 + +#### 组件的属性只有有限的值 + +增加一个 size 属性，只能从 'large'、'normal'、'small' 这个候选值中选择。 + +以上面自动解析的物料为例，在此基础上手工加上 size 属性： +```json +[ + { + "componentName": "FusionForm", + "title": "", + "docUrl": "", + "screenshot": "", + "devMode": "proCode", + "npm": { + "package": "", + "version": "", + "exportName": "default", + "main": "", + "destructuring": false, + "subName": "" + }, + "props": [ + { + "name": "name", + "propType": "string", + "description": "这是用于描述姓名", + "defaultValue": "张三" + }, + { + "name": "age", + "propType": "number", + "description": "这是用于描述年龄", + "defaultValue": 18 + }, + { + "name": "friends", + "propType": "array", + "description": "这是用于描述好友列表", + "defaultValue": [ + "李四", + "王五", + "赵六" + ] + } + ], + // 手工增加的 size 属性 + "configure": { + "isExtend": true, + "props": [ + { + "title": "尺寸", + "name": "size", + "setter": { + "componentName": 'RadioGroupSetter', + "isRequired": true, + "props": { + "options": [ + { "title": "大", "value": "large" }, + { "title": "中", "value": "normal" }, + { "title": "小", "value": "small" }, + ] + }, + } + } + ] + } + } +] +``` + +#### 组件的属性既可以设置固定值，也可以绑定到变量 +我们知道一种属性形式就需要一种 setter 来设置，如果想要将 value 属性允许输入字符串，那就需要设置为 `StringSetter`，如果允许绑定变量，就需要设置为 `VariableSetter`，具体设置器请参考[预置 Setter 列表](https://www.yuque.com/lce/doc/oc220p) + +那如果都想要呢？可以使用 `MixedSetter` 来实现 +```json +{ + ..., + configure: { + isExtend: true, + props: [ + { + title: "输入框的值", + name: "activeValue", + setter: { + componentName: 'MixedSetter', + isRequired: true, + props: { + setters: [ + 'StringSetter', + 'NumberSetter', + 'VariableSetter', + ], + }, + } + } + ] + } +} +``` +设置后，就会出现 “切换设置器” 的操作项了 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/189077/1647590065530-b50ed66a-8d24-40fc-91a9-13561663537b.png#clientId=ubd9972cd-765c-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=126&id=ub0e036f6&margin=%5Bobject%20Object%5D&name=image.png&originHeight=252&originWidth=598&originalType=binary&ratio=1&rotation=0&showTitle=false&size=62314&status=done&style=none&taskId=u6545c47c-0fed-44eb-bfab-03694941981&title=&width=299) ![image.png](https://cdn.nlark.com/yuque/0/2022/png/189077/1647590197192-cd0071cf-a90c-4882-9b65-4b46bff13ce9.png#clientId=ubd9972cd-765c-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=154&id=u67de127d&margin=%5Bobject%20Object%5D&name=image.png&originHeight=308&originWidth=244&originalType=binary&ratio=1&rotation=0&showTitle=false&size=24027&status=done&style=none&taskId=u1a44a2d7-3680-4018-8709-9832cd03ad0&title=&width=122) + +#### 开启组件样式设置 + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/231502/1647571003600-48ef05cd-dbac-4aad-b7a5-012727fe1c6f.png#clientId=uad16fa90-b520-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=u467d584c&margin=%5Bobject%20Object%5D&name=image.png&originHeight=772&originWidth=820&originalType=url&ratio=1&rotation=0&showTitle=false&size=128316&status=done&style=none&taskId=ub01cb8bb-e784-485b-b2a6-aead3302c4f&title=) + +```tsx +{ + configure: { + // ..., + supports: { + style: true, + }, + // ... + } +} +``` + +#### 设置组件的默认事件 + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/231502/1647571003649-c0da562f-220c-415e-83ea-e07b71c07552.png#clientId=uad16fa90-b520-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=u7b452a11&margin=%5Bobject%20Object%5D&name=image.png&originHeight=800&originWidth=776&originalType=url&ratio=1&rotation=0&showTitle=false&size=120022&status=done&style=none&taskId=u6805e481-897b-4929-86c8-9321791a21a&title=) + +```tsx +{ + configure: { + // ..., + supports: { + events: ['onPressEnter', 'onClear', 'onChange', 'onKeyDown', 'onFocus', 'onBlur'], + }, + // ... + } +} +``` + +#### 设置 prop 标题的 tip + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/231502/1647571003618-4a1bb1c4-da39-437b-8510-a121329aa91d.png#clientId=uad16fa90-b520-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=u7fe57bc7&margin=%5Bobject%20Object%5D&name=image.png&originHeight=176&originWidth=908&originalType=url&ratio=1&rotation=0&showTitle=false&size=39688&status=done&style=none&taskId=u7e9e26eb-a4c3-423c-b7f1-f096d654d4e&title=) + +```tsx +{ + name: 'label', + setter: 'StringSetter', + title: { + label: { + type: 'i18n', + zh_CN: '标签文本', + en_US: 'Label', + }, + tip: { + type: 'i18n', + zh_CN: '属性: label | 说明: 标签文本内容', + en_US: 'prop: label | description: label content', + }, + }, +} +``` + +#### 配置 prop 对应 setter 在配置面板的展示方式 + +inline:![image.png](https://cdn.nlark.com/yuque/0/2022/png/231502/1647571004529-c879ec4c-18af-46fd-8231-4ab80c937399.png#clientId=uad16fa90-b520-4&crop=0.0174&crop=0.0597&crop=0.9933&crop=0.3909&from=paste&height=260&id=u8cdcc718&margin=%5Bobject%20Object%5D&name=image.png&originHeight=266&originWidth=790&originalType=url&ratio=1&rotation=0&showTitle=false&size=40667&status=done&style=none&taskId=u9390a3bb-0290-46c7-b487-7380f162fd0&title=&width=771) + +```tsx +{ + configure: { + props: [{ + description: '标签文本', + display: 'inline' + }] + } +} +``` + +block: +![image.png](https://cdn.nlark.com/yuque/0/2022/png/231502/1647571004690-22e7dc4f-db0d-43fe-b837-48ed1145bde7.png#clientId=uad16fa90-b520-4&crop=0&crop=0&crop=0.996&crop=1&from=paste&height=273&id=ua1717366&margin=%5Bobject%20Object%5D&name=image.png&originHeight=274&originWidth=792&originalType=url&ratio=1&rotation=0&showTitle=false&size=31246&status=done&style=none&taskId=u9e678772-1217-4c64-ac75-c5928b48834&title=&width=789) +```tsx +{ + configure: { + props: [{ + description: '高级', + display: 'block' + }] + } +} +``` + +accordion + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/231502/1647571005189-552ef14d-6043-48fa-a526-4565d42fa581.png#clientId=uad16fa90-b520-4&crop=0&crop=0.0159&crop=1&crop=1&from=paste&height=740&id=u53a75049&margin=%5Bobject%20Object%5D&name=image.png&originHeight=740&originWidth=798&originalType=url&ratio=1&rotation=0&showTitle=false&size=163685&status=done&style=none&taskId=ub42fca77-545e-435f-bafe-88e2b2ddfd1&title=&width=798) +```tsx +{ + configure: { + props: [{ + description: '表单项配置', + display: 'accordion' + }] + } +} +``` + +entry + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/231502/1647571005244-fb508efb-a2d8-4064-8ff3-d6140e4c20a1.png#clientId=uad16fa90-b520-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=u16645b5c&margin=%5Bobject%20Object%5D&name=image.png&originHeight=424&originWidth=796&originalType=url&ratio=1&rotation=0&showTitle=false&size=91418&status=done&style=none&taskId=u38c7b284-f480-4440-baac-9f7c985104f&title=) +![image.png](https://cdn.nlark.com/yuque/0/2022/png/231502/1647571005468-1c7f4b24-4330-45e2-b6c9-5bf5362874b4.png#clientId=uad16fa90-b520-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=u2fad6ab5&margin=%5Bobject%20Object%5D&name=image.png&originHeight=632&originWidth=794&originalType=url&ratio=1&rotation=0&showTitle=false&size=158094&status=done&style=none&taskId=u7c356adc-4286-46b8-9a2c-d33b4268ddc&title=) + +```tsx +{ + configure: { + props: [{ + description: '风格与样式', + display: 'entry' + }] + } +} +``` + +plain + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/231502/1647571005702-ad979f93-cc47-4c6f-8de7-454cc6305614.png#clientId=uad16fa90-b520-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=u6aa6d230&margin=%5Bobject%20Object%5D&name=image.png&originHeight=438&originWidth=776&originalType=url&ratio=1&rotation=0&showTitle=false&size=133070&status=done&style=none&taskId=u1db8205a-79ed-4d60-91b4-6e7f5bfaff3&title=) + +```tsx +{ + configure: { + props: [{ + description: '返回上级', + display: 'plain' + }] + } +} +``` + + +### 进阶配置 + +#### 组件的 children 属性允许传入 ReactNode +例如有一个如下的 Tab 选项卡组件，每个 TabPane 的 children 都是一个组件 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/189077/1647588145478-fb8b7296-a8ee-4698-9851-846c78de301e.png#clientId=ubd9972cd-765c-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=167&id=bi43p&margin=%5Bobject%20Object%5D&name=image.png&originHeight=334&originWidth=2332&originalType=binary&ratio=1&rotation=0&showTitle=false&size=55470&status=done&style=none&taskId=ub8c8b04a-e2e9-4b5d-9be7-c7ad7154864&title=&width=1166) +只需要增加 `isContainer` 配置即可 +```json +{ + ..., + configure: { + ..., + component: { + // 新增，设置组件为容器组件，可拖入组件 + isContainer: true, + }, + } +} +``` +假设我们希望只允许拖拽 Table、Button 等内容放在 TabPane 里。配置白名单 `childWhitelist` 即可 +```json +{ + ..., + configure: { + ..., + component: { + isContainer: true, + nestingRule: { + // 允许拖入的组件白名单 + childWhitelist: ['Table', 'Button'], + // 同理也可以设置该组件允许被拖入哪些父组件里 + parentWhitelist: ['Tab'], + }, + }, + }, +} +``` +#### 组件的非 children 属性允许传入 ReactNode +这就需要使用 `SlotSetter` 开启插槽了，如下面示例，给 Tab 的 title 开启插槽，允许拖拽组件 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/189077/1647590398244-479c820e-3b2f-4d7e-8742-37cf896bcafb.png#clientId=ubd9972cd-765c-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=290&id=Utp8Y&margin=%5Bobject%20Object%5D&name=image.png&originHeight=580&originWidth=3016&originalType=binary&ratio=1&rotation=0&showTitle=false&size=254405&status=done&style=none&taskId=u0c8f777c-3559-455a-b136-c884312bb67&title=&width=1508) +```json +{ + // ..., + configure: { + isExtend: true, + props: [ + { + title: "选项卡标题", + name: "title", + setter: { + componentName: 'MixedSetter', + props: { + setters: [ + 'StringSetter', + 'SlotSetter', + 'VariableSetter', + ], + }, + } + } + ] + } +} +``` + +#### 屏蔽组件在设计器中的操作按钮 + +正常情况下，组件允许复制： +![image.png](https://cdn.nlark.com/yuque/0/2022/png/231502/1647571003626-06d80381-4d97-4d5b-8621-331674832c82.png#clientId=uad16fa90-b520-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=Sp6IN&margin=%5Bobject%20Object%5D&name=image.png&originHeight=226&originWidth=1158&originalType=url&ratio=1&rotation=0&showTitle=false&size=54949&status=done&style=none&taskId=u7e4b2cbe-5acf-467f-950b-ee48deb9502&title=) +如果希望禁止组件的复制行为，我们可以这样做： + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1647673808399-2708ff56-70d1-4c58-b93b-aa65269fb179.png#clientId=ufbfe731c-4217-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=150&id=A304J&margin=%5Bobject%20Object%5D&name=image.png&originHeight=300&originWidth=1176&originalType=binary&ratio=1&rotation=0&showTitle=false&size=90147&status=done&style=none&taskId=uf8da0392-c584-4d27-b664-95b3e908103&title=&width=588) +```tsx +{ + configure: { + component: { + disableBehaviors: ['copy'], + } + } +} +``` + +#### 实现一个 BackwardSetter + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1647674621328-6b0a5afc-eafc-43cc-95ce-bbe00981ac20.png#clientId=ufbfe731c-4217-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=219&id=u9c11597c&margin=%5Bobject%20Object%5D&name=image.png&originHeight=438&originWidth=776&originalType=binary&ratio=1&rotation=0&showTitle=false&size=125336&status=done&style=none&taskId=u01853245-46a8-42dd-9c62-6cdbb909afa&title=&width=388) + +```tsx +{ + name: 'back', + title: ' ', + virtual: () => true, + display: 'plain', + setter: BackwardSetter, +} + +// BackwardSetter +import { SettingTarget, DynamicSetter } from '@alilc/lowcode-types'; +const BackwardSetter: DynamicSetter = (target: SettingTarget) => { + return { + componentName: ( + + ), + }; +}; +``` + +### 高级配置 + +#### 不展现一个 prop 配置 + +- 始终隐藏当前 prop + +```tsx +{ + // 始终隐藏当前 prop 配置 + condition: () => false +} +``` + +- 根据其它 prop 的值展示/隐藏当前 prop + +```tsx +{ + // direction 为 hoz 则展示当前 prop 配置 + condition: (target) => { + return target.getProps().getPropValue('direction') === 'hoz'; + } +} +``` + +#### props 联动 + +```tsx +// 根据当前 prop 的值动态设置其它 prop 的值 +{ + name: 'labelAlign', + // ... + extraProps: { + setValue: (target, value) => { + if (value === 'inset') { + target.getProps().setPropValue('labelCol', null); + target.getProps().setPropValue('wrapperCol', null); + } else if (value === 'left') { + target.getProps().setPropValue('labelCol', { fixedSpan: 4 }); + target.getProps().setPropValue('wrapperCol', null); + } + return target.getProps().setPropValue('labelAlign', value); + }, + }, +} +// 根据其它 prop 的值来设置当前 prop 的值 +{ + name: 'status', + // ... + extraProps: { + getValue: (target) => { + const isPreview = target.getProps().getPropValue('isPreview'); + return isPreview ? 'readonly' : 'editable'; + } + } +} +``` + +#### 动态 setter 配置 + +可以通过 DynamicSetter 传入的 target 获取一些引擎暴露的数据，例如当前有哪些组件被加载到引擎中，将这个数据作为 SelectSetter 的选项，让用户选择: + +```tsx +{ + setter: (target) => { + return { + componentName: 'SelectSetter', + props: { + options: target.designer.props.componentMetadatas.filter( + (item) => item.isFormItemComponent).map( + (item) => { + return { + title: item.title || item.componentName, + value: item.componentName, + }; + } + ), + ), + } + }; + } +} +``` diff --git a/docs/docs/guide/expand/editor/partsIntro.md b/docs/docs/guide/expand/editor/partsIntro.md new file mode 100644 index 000000000..6e56ae1e6 --- /dev/null +++ b/docs/docs/guide/expand/editor/partsIntro.md @@ -0,0 +1,100 @@ +--- +title: 利用Parts造物快速使用react组件 +sidebar_position: 3 +--- +## 介绍 +大家在使用[低代码引擎](https://lowcode-engine.cn/)构建低代码应用平台时，遇到的一个主要问题是如何让已有的 React 组件能够快速低成本地接入进来。这个问题拆解下来主要包括两个子问题：1. 如何给已有组件[配置物料描述](https://lowcode-engine.cn/material)，2. 如何构建出一个低代码引擎能够识别的资产包(Assets)。 +我们的产品 「[Parts·造物](https://parts.lowcode-engine.cn/)」 可以帮助大家解决这个问题。我们通过在线可视化的方式完成物料描述配置，并且提供一键打包的功能生成引擎可以识别的资产包。 + +## 导入物料 +首先，我们需要在 [物料管理](https://parts.lowcode-engine.cn/material#/) 页面导入我们需要进行在线物料描述配置的物料。 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/12718919/1652434800993-0fbf5ed5-63e5-492b-85ab-feafd663ad2d.png#clientId=u0f780a28-b8dc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=196&id=u918deb34&margin=%5Bobject%20Object%5D&name=image.png&originHeight=342&originWidth=1399&originalType=binary&ratio=1&rotation=0&showTitle=false&size=33102&status=done&style=stroke&taskId=u95c39b84-836c-45f8-aee6-0effc1ccfd1&title=&width=800) + +- 点击列表左上方的 导入已有物料 按钮 +- 在弹框中输入 npm包名 +- 点击 获取包信息 按钮，获取npm包基本信息 +- 点击确定，导入成功 + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/12718919/1652434801003-7bd783f0-8804-445e-b508-8601501dfa60.png#clientId=u0f780a28-b8dc-4&crop=0&crop=0&crop=1&crop=1&from=paste&id=u825d698a&margin=%5Bobject%20Object%5D&name=image.png&originHeight=315&originWidth=640&originalType=binary&ratio=1&rotation=0&showTitle=false&size=21969&status=done&style=stroke&taskId=ued992c2e-822b-4c32-81b5-9c9add84954&title=) +## 配置管理 +第二步：物料导入以后，我们就可以为导入的物料新增[物料描述配置](https://lowcode-engine.cn/material)，点击右侧的组件配置开始配置。 + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/12718919/1652434801125-979e6348-b78a-47b4-bb2e-fa8f1bb4ff90.png#clientId=u0f780a28-b8dc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=216&id=u7fb954eb&margin=%5Bobject%20Object%5D&name=image.png&originHeight=261&originWidth=965&originalType=binary&ratio=1&rotation=0&showTitle=false&size=15305&status=done&style=stroke&taskId=uc1e18ffd-fe76-4fe4-83a4-c907f308b14&title=&width=800) +### 新增配置 + +- 点击配置管理右上角的 新增配置 + - 选择组件的版本号 + - 填写组件路径，一般和 npm 包的 package.json 里的 main 字段相同 （如果填写错误，后面会渲染不出来） + - 描述字段用于给这份配置增加一些备注信息。 + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/12718919/1652434801095-1957da7f-5d9d-4c17-a762-c576bf0f763f.png#clientId=u0f780a28-b8dc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=380&id=u9ad0ec47&margin=%5Bobject%20Object%5D&name=image.png&originHeight=418&originWidth=596&originalType=binary&ratio=1&rotation=0&showTitle=false&size=26130&status=done&style=stroke&taskId=u2b592498-195a-4fec-9853-ec5c3b95ef7&title=&width=541.8181700745893) +为了降低配置成本，第一次新增配置的时候会自动解析组件代码，生成一份初始化组件物料描述。所以需要等待片刻，用于代码解析。解析完成后，点击配置按钮即可进入在线配置界面。 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/12718919/1652434801053-1a48b598-e987-4cd5-b657-030d345e0a99.png#clientId=u0f780a28-b8dc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=193&id=ud384a13d&margin=%5Bobject%20Object%5D&name=image.png&originHeight=232&originWidth=963&originalType=binary&ratio=1&rotation=0&showTitle=false&size=23541&status=done&style=stroke&taskId=ud2efc4d3-6d52-4b77-adbd-14dd5ee4b11&title=&width=800) +### 组件描述配置 +操作界面如下，接下来讲具体的配置流程 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/12718919/1652434802081-6546d0f5-19da-475e-8dec-93ea324cc4e3.png#clientId=u0f780a28-b8dc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=522&id=uf73c4753&margin=%5Bobject%20Object%5D&name=image.png&originHeight=938&originWidth=1438&originalType=binary&ratio=1&rotation=0&showTitle=false&size=111984&status=done&style=stroke&taskId=u0ce37d2b-8ca3-48b5-ac67-8fb461d17b5&title=&width=800) +#### 新增组件 +如果新增配置的过程中，代码自动解析失败或者解析出来的组件列表不满足开发要求，我们可以点击左侧组件列表插件 新增 按钮，添加新的组件，具体的字段描述可以参考提示内容，以 [react-color](https://github.com/casesandberg/react-color) 为例： +![image.png](https://cdn.nlark.com/yuque/0/2022/png/12718919/1652434802087-eaf4e2f1-2028-4415-b696-9788a6b2d0ed.png#clientId=u0f780a28-b8dc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=560&id=u4341eb1b&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1005&originWidth=1436&originalType=binary&ratio=1&rotation=0&showTitle=false&size=147918&status=done&style=stroke&taskId=ud921b52d-1961-4be9-b4ec-77d6364b213&title=&width=800) +![image.png](https://cdn.nlark.com/yuque/0/2022/png/12718919/1652434802555-bbd14a55-89a6-42cd-a4b3-76c98febf00c.png#clientId=u0f780a28-b8dc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=472&id=u06e0b78f&margin=%5Bobject%20Object%5D&name=image.png&originHeight=704&originWidth=1193&originalType=binary&ratio=1&rotation=0&showTitle=false&size=240470&status=done&style=stroke&taskId=u77603c5d-9d14-4379-86d2-deb4deaba50&title=&width=800) +#### 给组件增加物料描述 +选中刚刚新增的BlockPicker组件，然后给它增加描述： + +- 打开左侧 Sette r面板 +- 按照组件的属性拖入需要 Setter 类型 （如图中组件的width属性，拖入数字Setter） +- 各种 Setter 的介绍可以参看这篇文档：[https://www.yuque.com/lce/doc/grfylu](https://www.yuque.com/lce/doc/grfylu) +- 配置属性的基本信息（如图所示） +- 配置完成后点击右上角的保存 + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/12718919/1652434802458-b0fb8a0e-307e-458c-a9f9-af3d2697024c.png#clientId=u0f780a28-b8dc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=539&id=udeb647da&margin=%5Bobject%20Object%5D&name=image.png&originHeight=967&originWidth=1434&originalType=binary&ratio=1&rotation=0&showTitle=false&size=158958&status=done&style=stroke&taskId=u2950484f-659b-4643-af5e-75d04f14346&title=&width=800) +![image.png](https://cdn.nlark.com/yuque/0/2022/png/12718919/1652434802443-cdc533bf-1b08-4c11-b3d2-7cfd7fe0a5dd.png#clientId=u0f780a28-b8dc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=311&id=uaaaa88fb&margin=%5Bobject%20Object%5D&name=image.png&originHeight=360&originWidth=925&originalType=binary&ratio=1&rotation=0&showTitle=false&size=64587&status=done&style=stroke&taskId=u7139e8ef-eee3-468b-833c-a42d8f3cb56&title=&width=800) +#### 高级配置（属性联动） +举个栗子：如图所示，如果期望 “设置器” 这个配置项的值 “被修改”的时候，下面的 “默认值” 跟着变化。 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/12718919/1652434803379-009a9783-ec24-4a08-8a46-55ae775ce7ba.png#clientId=u0f780a28-b8dc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=520&id=u005ad05e&margin=%5Bobject%20Object%5D&name=image.png&originHeight=572&originWidth=371&originalType=binary&ratio=1&rotation=0&showTitle=false&size=96588&status=done&style=stroke&taskId=u97330f9d-6728-4a05-a842-55df114ccee&title=&width=337.27271996253796) +如何使用 +组件的属性配置目前支持3个基本的联动函数： + +- 显示状态：返回true | false，如果返回true，表示组件配置显示，否则配置时不显示 +- 获取值：当调用该配置节点的getValue方法时触发的方法 +- 值变化：当调用该配置节点的setValue方法时触发的方法 + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/12718919/1652434803522-85aed489-4e00-4787-a496-54cc73e25bc5.png#clientId=u0f780a28-b8dc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=129&id=u0a782260&margin=%5Bobject%20Object%5D&name=image.png&originHeight=142&originWidth=316&originalType=binary&ratio=1&rotation=0&showTitle=false&size=29086&status=done&style=stroke&taskId=u95864da5-4ccf-4e4b-b903-1ce26af4f66&title=&width=287.2727210462587) +方法的第一个参数都是当前配置节点的对象，常用到的有以下几个： + +- getValue(): 获取当前节点的值，如果当前节点是子节点的话，否则为undefined +- setValue(): 设置当前节点的值，如果当前节点是子节点的话 +- parent: 当前节点的父节点 +- getPropValue(propName): 父节点获取子节点的属性值，propName为子节点的属性名称 +- setPropValue(propName, value): 父节点设置子节点的属性值，propName为子节点的属性名称, value 为设置的值 +- getConfig: 获取当前节点的配置，如title、setter等 +#### 调试物料描述 +点击右上角的预览按钮，开始调试我们刚刚配置的属性，如果是组件的首次预览，会有一段组件构建的过程（构建出umd包的过程），构建完成后就可以调试我们的配置了。 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/12718919/1652434804408-717e49bd-26b3-4a28-b3e5-bd1d67cdab00.png#clientId=u0f780a28-b8dc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=209&id=ucf92cc3e&margin=%5Bobject%20Object%5D&name=image.png&originHeight=373&originWidth=1431&originalType=binary&ratio=1&rotation=0&showTitle=false&size=46363&status=done&style=stroke&taskId=u501edca5-bbef-4fde-b341-b42c28b125a&title=&width=800) +#### 发布物料描述 +物料描述调试没问题后，就可以到项目中去使用了，使用前需要先发布物料描述 + +- 点击右上角的发布按钮 +- 选择需要发布的组件 +- 点击确定发布完成 + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/12718919/1652434804305-276f03e2-4dd2-41e9-9375-1c3bd0c7092a.png#clientId=u0f780a28-b8dc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=410&id=uf879e7fd&margin=%5Bobject%20Object%5D&name=image.png&originHeight=734&originWidth=1431&originalType=binary&ratio=1&rotation=0&showTitle=false&size=103858&status=done&style=stroke&taskId=udc267585-ffb7-4247-b1f5-b7aca386e10&title=&width=800) +## 资产包构建 +第三步：物料描述发布完成后，接下来我们就需要构建出可用的资产包用于低代码应用中。 +#### 资产包构建 + +- 选择需要构建的组件 +- 点击构建资产包按钮 +- 选择刚刚的物料描述配置 +- 开始构建，构建完成后你将得到一份json文件（里面包含了物料描述和umd包），就可以到项目中使用了 + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/12718919/1652434804769-6f6f60f1-9ee3-4561-972d-610f0616576e.png#clientId=u0f780a28-b8dc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=430&id=ue119fa2b&margin=%5Bobject%20Object%5D&name=image.png&originHeight=770&originWidth=1431&originalType=binary&ratio=1&rotation=0&showTitle=false&size=93492&status=done&style=stroke&taskId=ubfd97421-964b-4823-adc8-b056a588924&title=&width=800) +#### 资产包使用 +**方式一、在 **[**lowcode-demo**](https://github.com/alibaba/lowcode-demo)**中直接引用，可直接替换demo中原来的资产包文件：** +例如，在basic-fusion demo中，直接用你的资产包文件替换文件[assets.json](https://github.com/alibaba/lowcode-demo/blob/main/src/scenarios/basic-fusion/assets.json)，即可快速使用自己的物料了。 +**方式二、将新的资产包内容和现有的资产包内容融合：** +将上面构建完成的资产包与你项目中的[assets.json文件](https://github.com/alibaba/lowcode-demo/blob/main/src/scenarios/basic-fusion/assets.json)合并，主要合并packages 和 components + +- packages中是构建好的umd包 +- components中是上面配置好的[物料描述](https://lowcode-engine.cn/material)，你也可以在基础上二次加工 + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/12718919/1652434804944-860abc0c-057c-46d5-a6e5-8d33fde8a762.png#clientId=u0f780a28-b8dc-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=676&id=u5499b1c9&margin=%5Bobject%20Object%5D&name=image.png&originHeight=744&originWidth=1140&originalType=binary&ratio=1&rotation=0&showTitle=false&size=116233&status=done&style=stroke&taskId=u7be27934-77ce-4dd7-a406-1d402acef2c&title=&width=1036.36361390106) diff --git a/docs/docs/guide/expand/editor/pluginContextMenu.md b/docs/docs/guide/expand/editor/pluginContextMenu.md new file mode 100644 index 000000000..603aa09c0 --- /dev/null +++ b/docs/docs/guide/expand/editor/pluginContextMenu.md @@ -0,0 +1,69 @@ +--- +title: 插件扩展-编排扩展 +sidebar_position: 6 +--- +## 场景一：扩展选中节点操作项 +### 增加节点操作项 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/110793/1647693318212-173890bc-b0b5-437b-9802-4b1fd9f74c5a.png#clientId=u2eca2bba-d284-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=254&id=u55228975&margin=%5Bobject%20Object%5D&name=image.png&originHeight=292&originWidth=1240&originalType=binary&ratio=1&rotation=0&showTitle=false&size=38144&status=done&style=none&taskId=u426cac9f-24ad-4d06-adbe-faca1896eaa&title=&width=1080) +选中节点后，在选中框的右上角有操作按钮，编排模块默认实现了查看组件直系父节点、复制节点和删除节点按钮外，还可以通过相关 API 来扩展更多操作，如下代码： +```typescript +import { plugins } from '@alilc/lowcode-engine'; +import { Icon, Message } from '@alifd/next'; + +const addHelloAction = (ctx: ILowCodePluginContext) => { + return { + async init() { + const { addBuiltinComponentAction } = ctx.material; + addBuiltinComponentAction({ + name: 'hello', + content: { + icon: , + title: 'hello', + action(node: Node) { + Message.show('Welcome to Low-Code engine'); + }, + }, + condition: (node: Node) => { + return node.componentMeta.componentName === 'NextTable'; + }, + important: true, + }); + } + }; +} +addHelloAction.pluginName = 'addHelloAction'; +await plugins.register(addHelloAction); +``` +**_效果如下：_** +![image.png](https://cdn.nlark.com/yuque/0/2022/png/110793/1647694920149-b8d9a534-b943-45d2-b67e-cc42b906f827.png#clientId=u2eca2bba-d284-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=282&id=ua20a09c8&margin=%5Bobject%20Object%5D&name=image.png&originHeight=343&originWidth=1315&originalType=binary&ratio=1&rotation=0&showTitle=false&size=35131&status=done&style=none&taskId=u3f47b55d-15ff-495c-8615-31e3ccb0222&title=&width=1080) +具体 API 参考：[https://www.yuque.com/lce/doc/mu7lml#ieJzi](https://www.yuque.com/lce/doc/mu7lml#ieJzi) +### 删除节点操作项 +```typescript +import { plugins } from '@alilc/lowcode-engine'; + +const removeCopyAction = (ctx: ILowCodePluginContext) => { + return { + async init() { + const { removeBuiltinComponentAction } = ctx.material; + removeBuiltinComponentAction('copy'); + } + } +} +removeCopyAction.pluginName = 'removeCopyAction'; +await plugins.register(removeCopyAction); +``` +**_效果如下：_** +![image.png](https://cdn.nlark.com/yuque/0/2022/png/110793/1647695353667-e22bef51-3c6a-4b6a-87d2-c144ddb68115.png#clientId=u2eca2bba-d284-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=237&id=ufa1f9434&margin=%5Bobject%20Object%5D&name=image.png&originHeight=290&originWidth=1319&originalType=binary&ratio=1&rotation=0&showTitle=false&size=22495&status=done&style=none&taskId=u73e01acc-96e8-45e7-9d42-a31edca193e&title=&width=1080) +具体 API 参考：[https://www.yuque.com/lce/doc/mu7lml#va9mb](https://www.yuque.com/lce/doc/mu7lml#va9mb) +## 实际案例 +### 区块管理 + +- 仓库地址：[https://github.com/alibaba/lowcode-plugins](https://github.com/alibaba/lowcode-plugins) +- 具体代码：[https://github.com/alibaba/lowcode-plugins/tree/main/packages/action-block](https://github.com/alibaba/lowcode-plugins/tree/main/packages/action-block) +- 直播回放： + - [低代码引擎项目实战(9)-区块管理(1)-保存为区块](https://www.bilibili.com/video/BV1YF411M7RK/) + - [低代码引擎项目实战(10)-区块管理-区块面板](https://www.bilibili.com/video/BV1FB4y1S7tu/) + - [阿里巴巴低代码引擎项目实战(11)-区块管理- ICON优化](https://www.bilibili.com/video/BV1zr4y1H7Km/) + - [阿里巴巴低代码引擎项目实战(11)-区块管理-自动截图](https://www.bilibili.com/video/BV1GZ4y117VH/) + - [阿里巴巴低代码引擎项目实战(11)-区块管理-样式优化](https://www.bilibili.com/video/BV1Pi4y1S7ZT/) + - [阿里低代码引擎项目实战(12)-区块管理(完结)-给引擎插件提个 PR](https://www.bilibili.com/video/BV1hB4y1277o/) diff --git a/docs/docs/guide/expand/editor/pluginWidget.md b/docs/docs/guide/expand/editor/pluginWidget.md new file mode 100644 index 000000000..fd63167e9 --- /dev/null +++ b/docs/docs/guide/expand/editor/pluginWidget.md @@ -0,0 +1,170 @@ +--- +title: 插件扩展-面板扩展 +sidebar_position: 5 +--- +## 插件简述 +插件功能赋予低代码引擎更高的灵活性，低代码引擎的生态提供了一些官方的插件，但是无法满足所有人的需求，所以提供了强大的插件定制功能。 +通过定制插件，在和低代码引擎解耦的基础上，我们可以和引擎核心模块进行交互，从而满足多样化的功能。不仅可以自定义插件的 UI，还可以实现一些非 UI 的逻辑： +1）调用编辑器框架提供的 API 进行编辑器操作或者 schema 操作； +2）通过插件类的生命周期函数实现一些插件初始化的逻辑； +3）通过实现监听编辑器内的消息实现特定的切片逻辑（例如面板打开、面板关闭等） +> 本文仅介绍面板层面的扩展，编辑器插件层面的扩展可以参考 "插件扩展 - 编排扩展" 章节。 + +## 注册插件 API +```typescript +import { plugins, ILowCodePluginContext } from '@alilc/lowcode-engine'; + +const pluginA = (ctx: ILowCodePluginContext, options: any) => { + return { + init() { + console.log(options.key); + // 往引擎增加面板 + ctx.skeleton.add({ + // area 配置见下方说明 + area: 'leftArea', + // type 配置见下方说明 + type: 'PanelDock', + content:
demo
, + }); + ctx.logger.log('打个日志'); + }, + destroy() { + console.log('我被销毁了~'); + } + } +} + +pluginA.pluginName = 'pluginA'; + +plugins.register(pluginA, { key: 'test' }); +``` +> 如果您想了解抽取出来的插件如何封装成为一个 npm 包并提供给社区，可以参考“扩展低代码应用 - 扩展低代码编辑器 - 低代码插件脚手架”章节。 +插件系统的详细设计，可参考“参与低代码引擎开发 - 低代码引擎设计文档 - 插件”章节。 + +## 面板插件配置说明 +面板插件是作用于设计器的，主要是通过按钮、图标等展示在设计器的骨架中。设计器的骨架我们分为下面的几个区域，而我们的插件大多数都是作用于这几个区域的。 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644393006009-165e36cd-fa7b-4ee0-b3e3-dc7ba9d80d55.png#averageHue=%237cac76&clientId=u45843f36-7f71-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=608&id=u9e018f89&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1080&originWidth=1920&originalType=binary&ratio=1&rotation=0&showTitle=false&size=149463&status=done&style=stroke&taskId=u74f952e4-c783-47ae-b11c-be48d3c52be&title=&width=1080) +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644320581783-b8fcd29c-45c2-48df-be2c-7101b12474e3.png#averageHue=%23edf6d4&clientId=u221f0bd4-c19e-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=580&id=ixlrN&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1648&originWidth=3068&originalType=binary&ratio=1&rotation=0&showTitle=false&size=165621&status=done&style=stroke&taskId=u030d9faf-015f-4475-b34a-ba1fbf8868b&title=&width=1080) +### 展示区域 area +#### topArea +展示在设计器的顶部区域，常见的相关区域的插件主要是： +1）注册设计器 Logo； +2）设计器操作回退和撤销按钮； +3）全局操作按钮，例如：保存、预览等； +#### leftArea +左侧区域的展示形式大多数是 Icon 和对应的面板，通过点击 Icon 可以展示对应的面板并隐藏其他的面板。 +该区域相关插件的主要有： +1）大纲树展示，展示该设计器设计页面的大纲。 +2）组件库，展示注册到设计器中的组件，点击之后，可以从组件库面板中拖拽到设计器的画布中。 +3）数据源面板 +4）JS 等代码面板。 +可以发现，这个区域的面板大多数操作时是不需要同时并存的，且交互比较复杂的，需要一个更整块的区域来进行操作。 +#### centerArea +画布区域，由于画布大多数是展示作用，所以一般扩展的种类比较少。常见的扩展有： +1）画布大小修改 +2）物料选中扩展区域修改 +#### rightArea +右侧区域，常用于组件的配置。常见的扩展有：统一处理组件的配置项，例如统一删除某一个配置项，统一添加某一个配置项的。 +#### toolbar +跟 topArea 类似，按需放置面板插件~ +### 展示形式 type +#### PanelDock +PanelDock 是以面板的形式展示在设计器的左侧区域的。其中主要有两个部分组成，一个是图标，一个是面板。当点击图标时可以控制面板的显示和隐藏。 +下图是组件库插件的展示效果。 +![Feb-08-2022 19-44-15.gif](https://cdn.nlark.com/yuque/0/2022/gif/242652/1644320663827-ee9c54a1-f684-40e2-8a6b-875103d04b31.gif#averageHue=%23eaf6d2&clientId=u221f0bd4-c19e-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=555&id=u5292d9cc&margin=%5Bobject%20Object%5D&name=Feb-08-2022%2019-44-15.gif&originHeight=790&originWidth=1536&originalType=binary&ratio=1&rotation=0&showTitle=false&size=1381641&status=done&style=stroke&taskId=ub28a13a4-3d80-4a02-bcaa-cc9d6127243&title=&width=1080) +其中右上角可以进行固定，可以对弹出的宽度做设定 +接入可以参考代码 +```javascript +import { skeleton } from "@alilc/lowcode-engine"; + +skeleton.add({ + area: "leftArea", // 插件区域 + type: "PanelDock", // 插件类型，弹出面板 + name: "sourceEditor", + content: SourceEditor, // 插件组件实例 + props: { + align: "left", + icon: "wenjian", + description: "JS面板", + }, + panelProps: { + floatable: true, // 是否可浮动 + height: 300, + hideTitleBar: false, + maxHeight: 800, + maxWidth: 1200, + title: "JS面板", + width: 600, + }, +}); +``` +#### Widget +Widget 形式是直接渲染在当前编辑器的对应位置上。如 demo 中在设计器顶部的所有组件都是这种展现形式。 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644320068765-47efc836-30c2-452f-8104-b98b1ea3533d.png#averageHue=%23fefefb&clientId=u221f0bd4-c19e-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=51&id=u68c58cad&margin=%5Bobject%20Object%5D&name=image.png&originHeight=94&originWidth=1988&originalType=binary&ratio=1&rotation=0&showTitle=false&size=58410&status=done&style=stroke&taskId=u4eadd643-2e63-4be7-8736-b27b9c82b81&title=&width=1080) +接入可以参考代码： +```javascript +import {skeleton} from "@alilc/lowcode-engine"; +// 注册 logo 面板 +skeleton.add({ + area: "topArea", + type: "Widget", + name: "logo", + content: Logo, // Widget 组件实例 + contentProps: { // Widget 插件props + logo: + "https://img.alicdn.com/tfs/TB1_SocGkT2gK0jSZFkXXcIQFXa-66-66.png", + href: "/", + }, + props: { + align: "left", + width: 100, + }, +}); +``` +#### Dock +一个图标的表现形式，可以用于语言切换、跳转到外部链接、打开一个 widget 等场景 +```javascript +import { skeleton } from "@alilc/lowcode-engine"; + +skeleton.add({ + area: "leftArea", + type: "Dock", + name: "opener", + content: Opener, // Widget 组件实例 + contentProps: { // Widget 插件props + xxx: "1", + }, + props: { + align: "bottom", + }, + onClick: function() { + // 打开外部链接 + window.open('https://lowcode-engine.cn'); + // 显示 widget + skeleton.showWidget('xxx'); + } +}); +``` +#### Panel +一般不建议单独使用，通过 PanelDock 使用~ +## 实际案例 +### 页面管理面板 + +- 仓库地址：[https://github.com/mark-ck/lowcode-portal](https://github.com/mark-ck/lowcode-portal) +- 具体代码：[https://github.com/mark-ck/lowcode-portal/blob/master/src/plugins/pages-plugin/index.tsx](https://github.com/mark-ck/lowcode-portal/blob/master/src/plugins/pages-plugin/index.tsx) +- 直播回放： + - [低代码引擎项目实战(4)-自定义插件-页面管理](https://www.bilibili.com/video/BV17a411i73f/) + - [低代码引擎项目实战(4)-自定义插件-页面管理-后端](https://www.bilibili.com/video/BV1uZ4y1U7Ly/) + - [低代码引擎项目实战(4)-自定义插件-页面管理-前端](https://www.bilibili.com/video/BV1Yq4y1a74P/) + - [低代码引擎项目实战(4)-自定义插件-页面管理-完结](https://www.bilibili.com/video/BV13Y4y1e7EV/) +### 区块面板 + +- 仓库地址：[https://github.com/alibaba/lowcode-plugins](https://github.com/alibaba/lowcode-plugins) +- 具体代码：[https://github.com/alibaba/lowcode-plugins/tree/main/packages/plugin-block](https://github.com/alibaba/lowcode-plugins/tree/main/packages/plugin-block) +- 直播回放： + - [低代码引擎项目实战(9)-区块管理(1)-保存为区块](https://www.bilibili.com/video/BV1YF411M7RK/) + - [低代码引擎项目实战(10)-区块管理-区块面板](https://www.bilibili.com/video/BV1FB4y1S7tu/) + - [阿里巴巴低代码引擎项目实战(11)-区块管理- ICON优化](https://www.bilibili.com/video/BV1zr4y1H7Km/) + - [阿里巴巴低代码引擎项目实战(11)-区块管理-自动截图](https://www.bilibili.com/video/BV1GZ4y117VH/) + - [阿里巴巴低代码引擎项目实战(11)-区块管理-样式优化](https://www.bilibili.com/video/BV1Pi4y1S7ZT/) + - [阿里低代码引擎项目实战(12)-区块管理(完结)-给引擎插件提个 PR](https://www.bilibili.com/video/BV1hB4y1277o/) diff --git a/docs/docs/guide/expand/editor/setter.md b/docs/docs/guide/expand/editor/setter.md new file mode 100644 index 000000000..846c60b3e --- /dev/null +++ b/docs/docs/guide/expand/editor/setter.md @@ -0,0 +1,202 @@ +--- +title: 设置器扩展 +sidebar_position: 4 +--- +## 设置器简述 +设置器主要用于低代码组件属性值的设置，顾名思义叫"设置器"，又称为 Setter。由于组件的属性有各种类型，需要有与之对应的设置器支持，每一个设置器对应一个值的类型。 +### 设计器展示位置 +设置器展示在编辑器的右边区域，如下图： +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644387351052-0be9546e-9e46-41ff-bbb4-a1effe650d7f.png#clientId=u39aebc41-90a1-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=487&id=pi5XH&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1730&originWidth=3836&originalType=binary&ratio=1&rotation=0&showTitle=false&size=947162&status=done&style=stroke&taskId=u4d4deed8-40f5-40a6-b20d-d092c90775c&title=&width=1080) +其中包含四类设置器： + +- 属性：展示该物料常规的属性 +- 样式：展示该物料样式的属性 +- 事件：如果该物料有声明事件，则会出现事件面板，用于绑定事件。 +- 高级：两个逻辑相关的属性，**条件渲染**和**循环** +### 设置器类型 +上述区域中是有多项设置器的，对于一个组件来说，每一项配置都对应一个设置器，比如我们的配置是一个文本，我们需要的是文本设置器，我们需要配置的是数字，我们需要的就是数字设置器。 +下图中的标题和按钮类型配置就分别是文本设置器和下拉框设置器。 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1644387350762-7337e729-53e9-4a6c-8da1-8f17260e1347.png#clientId=u39aebc41-90a1-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=744&id=ztLvk&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1460&originWidth=2120&originalType=binary&ratio=1&rotation=0&showTitle=false&size=489840&status=done&style=stroke&taskId=u7375a322-b6c8-43f1-a096-07b204656aa&title=&width=1080) +我们提供了常用的设置器作为内置设置器，也提供了定制能力帮助大家开发特定需求的设置器。 +## 为物料配置设置器 +我们提供了[常用的设置器](https://www.yuque.com/lce/doc/oc220p?view=doc_embed&from=kb&from=kb&outline=1&title=1)作为内置设置器。 +我们可以将目标组件的属性值类型值配置到物料资源配置文件中： +```json +{ + "componentName": "Message", + "title": "Message", + "configure": { + "props": [ + { + "name": "type", + "setter": "InputSetter" + } + ] + } +} +``` +props 字段是入料模块扫描自动填入的类型，用户可以通过 configure 节点进行配置通过 override 节点对属性的声明重新定义，setter 就是注册在引擎中的 setter。 +为物料配置引擎内置的 setter 时，均可以使用对应 setter 的高级功能，对应功能参考“全部内置设置器”章节下的对应 setter 文章。 +**_对高级功能的配置如下：_** +例如我们需要在NumberSetter中配置units属性，可以在asset.json中声明 +```json +"configure": { + "component": { + "isContainer": true, + "nestingRule": { + "parentWhitelist": [ + "NextP" + ] + } + }, + "props": [ + { + "name": "width", + "title": "宽度", + "initialValue": "auto", + "defaultValue": "auto", + "condition": { + "type": "JSFunction", + "value": "() => false" + }, + "setter": { + "componentName": "NumberSetter", + "props": { + "units": [ + { + "type": "px", + "list": true + }, + { + "type": "%", + "list": true + } + ] + } + } + }, + ], + "supports": { + "style": true + } +}, +``` +## 自定义设置器 +### 编写 AltStringSetter +我们编写一个简单的 Setter，它的功能如下： +![image.png](https://cdn.nlark.com/yuque/0/2022/png/2553587/1644764687180-0121f0c0-d113-4907-a86d-e4f3a04ff221.png#clientId=ucb27c83c-48cf-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=45&id=u32dc8cd0&margin=%5Bobject%20Object%5D&name=image.png&originHeight=90&originWidth=720&originalType=binary&ratio=1&rotation=0&showTitle=false&size=17539&status=done&style=stroke&taskId=u0f886bda-a93e-4b10-ad7e-9ba9a38a3fb&title=&width=360) +**_代码如下：_** +```typescript +import * as React from "react"; +import { Input } from "@alifd/next"; + +import "./index.scss"; +interface AltStringSetterProps { + // 当前值 + value: string; + // 默认值 + defaultValue: string; + // setter唯一输出 + onChange: (val: string) => void; + // AltStringSetter 特殊配置 + placeholder: string; +} +export default class AltStringSetter extends React.PureComponent { + componentDidMount() { + const { onChange, value, defaultValue } = this.props; + if (value == undefined && defaultValue) { + onChange(defaultValue); + } + } + + // 声明Setter的title + static displayName = 'AltStringSetter'; + + render() { + const { onChange, value, placeholder } = this.props; + return ( + onChange(val)} + > + ); + } +} +``` +#### setter 和 setter/plugin 之间的联动 +我们采用 emit 来进行相互之前的通信，首先我们在 A setter 中进行事件注册： +```javascript +import { event } from '@alilc/lowcode-engine'; + +componentDidMount() { + // 这里由于面板上会有多个setter，这里我用field.id来标记setter名 + this.emitEventName = `${SETTER_NAME}-${this.props.field.id}`; + event.on(`${this.emitEventName}.bindEvent`, this.bindEvent) +} + +bindEvent = (eventName) => { + // do someting +} + +componentWillUnmount() { + // setter是以实例为单位的，每个setter注销的时候需要把事件也注销掉，避免事件池过多 + event.off(`${this.emitEventName}.bindEvent`, this.bindEvent) +} +``` +在 B setter 中触发事件，来完成通信： +```javascript +import { event } from '@alilc/lowcode-engine'; + +bindFunction = () => { + const { field, value } = this.props; + // 这里展示的和插件进行通信,事件规则是插件名+方法 + event.emit('eventBindDialog.openDialog', field.name, this.emitEventName); +} +``` +#### 修改同级 props 的其他属性值 +setter 本身只影响其中一个 props 的值，如果需要影响其他组件的 props 的值，需要使用 field 的 props： +```json +bindFunction = () => { + const { field, value } = this.props; + const propsField = field.parent; + // 获取同级其他属性showJump的值 + const otherValue = propsField.getPropValue('showJump'); + // set同级其他属性showJump的值 + propsField.setPropValue('showJump', false); +} +``` +### 注册 AltStringSetter +我们需要在低代码引擎中注册 Setter，这样就可以通过 AltStringSetter 的名字在物料中使用了。 +```typescript +import AltStringSetter from './AltStringSetter'; +const registerSetter = window.AliLowCodeEngine.setters.registerSetter; +registerSetter('AltStringSetter', AltStringSetter); +``` +### 物料中使用 +我们需要将目标组件的属性值类型值配置到物料资源配置文件中，其中核心配置如下： +```json +{ + "props": [ + { + "name": "type", + "setter": "AltStringSetter" + } + ] +} +``` +在物料中的相关配置如下： +```json +{ + "componentName": "Message", + "title": "Message", + "configure": { + "props": [ + { + "name": "type", + "setter": "AltStringSetter" + } + ] + } +} +``` diff --git a/docs/docs/guide/expand/editor/summary.md b/docs/docs/guide/expand/editor/summary.md new file mode 100644 index 000000000..e8487213c --- /dev/null +++ b/docs/docs/guide/expand/editor/summary.md @@ -0,0 +1,90 @@ +--- +title: 低代码扩展简述 +sidebar_position: 0 +--- +## 扩展点简述 + +我们可以从 Demo 的项目中看到页面中有很多的区块： +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1643447049972-e324320a-7f97-4e48-bef3-a4c5d2b06517.png#clientId=udea0fe9a-4e7e-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=1080&id=rGr7U&margin=%5Bobject%20Object%5D&name=image.png&originHeight=2160&originWidth=3840&originalType=binary&ratio=1&rotation=0&showTitle=false&size=518455&status=done&style=none&taskId=u872d1136-0f18-41b3-900d-710e9fc9eea&title=&width=1920) +这些功能点背后都是可扩展项目，如下图所示： +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1643447052089-8e340da7-3c2c-4a88-9ed8-c89516dccf75.png#clientId=udea0fe9a-4e7e-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=957&id=lL1sN&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1914&originWidth=3838&originalType=binary&ratio=1&rotation=0&showTitle=false&size=538736&status=done&style=none&taskId=u43e8a14e-0d52-4a22-bd19-e5083814daf&title=&width=1919) + +- 插件定制：可以配置低代码编辑器的功能和面板 +- 物料定制：可以配置能够拖入的物料 +- 操作辅助区定制：可以配置编辑器画布中的操作辅助区功能 +- 设置器定制：可以配置编辑器中组件的配置表单 + +我们从可扩展项目的视角，可以把低代码引擎架构理解为下图： + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1643447051959-7abb91ea-44af-46e0-b73a-dd2127648b32.png#clientId=udea0fe9a-4e7e-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=1080&id=M07o7&margin=%5Bobject%20Object%5D&name=image.png&originHeight=2160&originWidth=3840&originalType=binary&ratio=1&rotation=0&showTitle=false&size=779021&status=done&style=none&taskId=u640e4616-d38d-45fb-a560-e4a98cd1605&title=&width=1920) +（注：引擎内核中大量数据交互的细节被简化，这张图仅仅强调编辑器和外部扩展的交互） + +## 配置扩展点 + +### 配置物料 +通过配置注入物料，这里的配置是物料中心根据物料资产包协议生成的，后面“物料扩展”章节会有详细说明。 +```typescript +import { material } from '@alilc/lowcode-engine' +// 假设您已把物料配置在本地 +import assets from './assets.json' + +// 静态加载 assets +material.setAssets(assets) +``` + +也可以通过异步加载物料中心上的物料。 +```typescript +import { ILowCodePluginContext, material, plugins } from '@alilc/lowcode-engine' + +// 动态加载 assets +plugins.register((ctx: ILowCodePluginContext) => { + return { + name: 'ext-assets', + async init() { + try { + // 将下述链接替换为您的物料即可。无论是通过 utils 从物料中心引入，还是通过其他途径如直接引入物料描述 + const res = await window.fetch('https://fusion.alicdn.com/assets/default@0.1.95/assets.json') + const assets = await res.text() + material.setAssets(assets) + } catch (err) { + console.error(err) + } + }, + } +}).catch(err => console.error(err)) +``` + +### 配置插件 +可以通过 npm 包的方式引入社区插件，配置如下所示： +```typescript +import { ILowCodePluginContext, plugins } from '@alilc/lowcode-engine' +import PluginIssueTracker from '@alilc/lowcode-plugin-issue-tracker' + +// 注册一个提 issue 组件到您的编辑器中，方位默认在左栏下侧 +plugins.register(PluginIssueTracker) + .catch(err => console.error(err)) +``` +后续“插件扩展”章节会详细说明。 + +### 配置设置器 +低代码引擎默认内置了设置器（详见“配置设置器”章节）。您可以通过 npm 包的方式引入自定义的设置器，配置如下所示： +```typescript +import { setters } from '@alilc/lowcode-engine' +// 假设您自定义了一个 setter +import MuxMonacoEditorSetter from './components/setters/MuxMonacoEditorSetter' + +// 注册设置器 +setters.registerSetter({ + MuxMonacoEditorSetter: { + component: MuxMonacoEditorSetter, + title: 'Textarea', + condition: (field) => { + const v = field.getValue() + return typeof v === 'string' + }, + }, +}) +``` +后续“设置器扩展”章节会详细说明。 + +> 本章节所有可扩展配置内容在 demo 中均可找到：[https://github.com/alibaba/lowcode-demo/blob/main/src/universal/plugin.tsx](https://github.com/alibaba/lowcode-demo/blob/main/src/universal/plugin.tsx) diff --git a/docs/docs/guide/expand/runtime/_category_.json b/docs/docs/guide/expand/runtime/_category_.json new file mode 100644 index 000000000..14aafc939 --- /dev/null +++ b/docs/docs/guide/expand/runtime/_category_.json @@ -0,0 +1,4 @@ +{ + "label": "扩展低代码运行时", + "position": 2 +} diff --git a/docs/docs/guide/expand/runtime/codeGeneration.md b/docs/docs/guide/expand/runtime/codeGeneration.md new file mode 100644 index 000000000..e1d9dc3d8 --- /dev/null +++ b/docs/docs/guide/expand/runtime/codeGeneration.md @@ -0,0 +1,132 @@ +--- +title: 使用出码功能 +sidebar_position: 1 +--- + +## 出码简述 +所谓出码，即将低代码编排出的 schema 进行解析并转换成最终可执行的代码的过程。 +## 出码的适用范围 +出码是为了更高效的运行和更灵活地定制渲染，相对而言，基于 Schema 的运行时渲染，有着能实时响应内容的变化和接入成本低的优点，但是也存在着实时解析运行的性能开销比较大和包大小比较大的问题，而且无法自由地进行扩展二次开发，功能自由度受到一定程度限制。 +当然，出码也会存在一些限制：一方面需要额外的接入成本，另一方面通常需要额外的生成代码和打包构建的时间，难以做到基于 Schema 的运行时渲染那样保存即预览的效果。 + +所以不是所有场景都建议做出码，一般来说以下 3 个场景可以考虑使用出码进行优化。 + +### 场景一：想要极致的打开速度，降低 LCP/FID +这种场景比较常见的是 C 端应用，比如手淘上的页面和手机钉钉上的页面，要求能够尽快得响应用户操作，不要出现卡死的情况。当一个流入协议大小比较大的时候，前端进行解析时的开销也比较大。如果能把这部分负担转移到编译时去完成的话，前端依赖包大小就会减少许多。从而也提升了加载速度，降低了带宽消耗。页面越简单，这其中的 gap 就会越明显。 + +### 场景二：老项目 + 新需求，想用搭建产出 +这是一个很常见的场景，毕竟迁移或者重构都是有一个过程的，阿里的业务都是一边跑一边换发动机。在这种场景中，我们不可能要求使用运行时方案来做实现，因为运行时是一个项目级别的能力，最好是项目中统一使用他这一种方式，保证体验的一致性与连贯性。所以我们可以只在低代码平台上搭建新的业务页面，然后通过出码模块导出这些页面的源码，连同一些全局依赖模块，一起 Merge 到老项目中。完成开发体验的优化。 + +### 场景三：协议不能描述部分代码逻辑（协议功能不足或特别定制化的逻辑） +当我们发现一些逻辑诉求不能在目前协议中很好地表达的时候，这其实是项目复杂度较高的一个信号。比较好的方式就是将低代码研发和源码研发结合起来。这种模式下最大的诉求点之一就是，需要将搭建的内容输出为可读性和确定性都比较良好的代码模块。这也就是出码模块需要支持好的使用场景了。 + +## 如何使用 +### 1) 通过命令行快速体验 + +欢迎使用命令行工具快速体验：`npx @alilc/lowcode-code-generator -i example-schema.json -o generated -s icejs` + +--其中 example-schema.json 可以从[这里下载](https://unpkg.com/@alilc/lowcode-code-generator@beta/example-schema.json) + +### 2) 通过设计器插件快速体验 + +1. 安装依赖: `npm install --save @alilc/lowcode-plugin-code-generator` +2. 注册插件: + +```typescript +import { plugins } from '@alilc/lowcode-engine'; +import CodeGenPlugin from '@alilc/lowcode-plugin-code-generator'; + +// 在你的初始化函数中： +await plugins.register(CodeGenPlugin); + +// 如果您不希望自动加上出码按钮，则可以这样注册 +await plugins.register(CodeGenPlugin, { disableCodeGenActionBtn: true }); +``` + +然后运行你的低代码编辑器项目即可 -- 在设计器的右上角会出现一个“出码”按钮，点击即可在浏览器中出码并预览。 + +### 3）服务端出码接入 + +此代码生成器一开始就是为服务端出码设计的，你可以直接这样来在 node.js 环境中使用： + +1. 安装依赖: `npm install --save @alilc/lowcode-code-generator` +2. 引入代码生成器: + +```javascript +import CodeGenerator from '@alilc/lowcode-code-generator'; +``` + +3. 创建项目构建器: + +```javascript +const projectBuilder = CodeGenerator.solutions.icejs(); +``` + +4. 生成代码 + +```javascript +const project = await projectBuilder.generateProject( + schema, // 编排搭建出来的 schema +); +``` + +5. 将生成的代码写入到磁盘中(也可以生成一个 zip 包) + +```javascript +// 写入磁盘 +await CodeGenerator.publishers.disk().publish({ + project, // 上一步生成的 project + outputPath: '/path/to/your/output/dir', // 输出目录 + projectSlug: 'your-project-slug', // 项目标识 +}); + +// 写入到 zip 包 +await CodeGenerator.publishers.zip().publish({ + project, // 上一步生成的 project + outputPath: '/path/to/your/output/dir', // 输出目录 + projectSlug: 'your-project-slug', // 项目标识 -- 对应生成 your-project-slug.zip 文件 +}); +``` + +注：一般来说在服务端出码可以跟 github/gitlab, CI 和 CD 流程等一起串起来使用，通常用于优化性能。 + +### 4）浏览器中出码接入 + +随着现在电脑性能和浏览器技术的发展，出码其实已经不必非得在服务端做了，借助于 Web Worker 特性，可以在浏览器中进行出码： + +1. 安装依赖: `npm install --save @alilc/lowcode-code-generator` +2. 引入代码生成器: + +```javascript +import * as CodeGenerator from '@alilc/lowcode-code-generator/standalone-loader'; +``` + +3. 【可选】提前初始化代码生成器: + +```javascript +// 提前初始化下，这样后面用的时候更快(这个 init 内部会提前准备好创建 worker 的一些资源) +await CodeGenerator.init(); +``` + +4. 出码 + +```javascript +const result = await CodeGenerator.generateCode({ + solution: 'icejs', // 出码方案 (目前内置有 icejs 和 rax ) + schema, // 编排搭建出来的 schema +}); + +console.log(result); // 出码结果(默认是递归结构描述的，可以传 flattenResult: true 以生成扁平结构的结果) +``` + +注：一般来说在浏览器中出码适合做即时预览功能。 + +### 5）自定义出码 +前端框架灵活多变，默认内置的出码方案很难满足所有人的需求，好在此代码生成器支持非常灵活的插件机制 -- 内置功能大多都是通过插件完成的（在 `src/plugins`下），比如： +![image.png](https://cdn.nlark.com/yuque/0/2022/png/263300/1644824565650-584c2be5-4be3-4c9a-96d9-e27990111b0b.png#averageHue=%232b2b2e&clientId=u8b65d964-7bef-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=376&id=u3e0a61a8&margin=%5Bobject%20Object%5D&name=image.png&originHeight=376&originWidth=457&originalType=binary&ratio=1&rotation=0&showTitle=false&size=151355&status=done&style=none&taskId=ueef52494-2e18-45a2-8409-7f68e200f63&title=&width=457) +所以您可以通过添加自己的插件或替换掉默认内置的插件来实现您的自定义功能。 +为了方便自定义出码方案，出码模块还提供自定义出码方案的脚手架功能，即执行下面脚本即可生成一个自定义出码方案： +```shell +npx @alilc/lowcode-code-generator init-solution +``` +里面内置了一个示例的插件(在 `src/plugins/example.ts`中)，您可以根据注释引导来完善相关插件，从而组合生成您的专属出码方案(`src/index.ts`)。您所生成的出码方案可以发布成 NPM 包，从而能按上文 1~4 中的使用方案进行使用。 diff --git a/docs/docs/guide/expand/runtime/renderer.md b/docs/docs/guide/expand/runtime/renderer.md new file mode 100644 index 000000000..20cc35bae --- /dev/null +++ b/docs/docs/guide/expand/runtime/renderer.md @@ -0,0 +1,349 @@ +--- +title: 使用渲染模块 +sidebar_position: 0 +--- +## 快速使用 +渲染依赖于 schema 和 components。其中 schema 和 components 需要一一对应，schema 中使用到的组件都需要在 components 中进行声明，否则无法正常渲染。 +### 简单示例 + +```jsx +import ReactRenderer from '@alilc/lowcode-react-renderer'; +import ReactDOM from 'react-dom'; +import { Button } from '@alifd/next'; + +const schema = { + componentName: 'Page', + props: {}, + children: [ + { + componentName: 'Button', + props: { + type: 'primary', + style: { + color: '#2077ff' + }, + }, + children: '确定', + }, + ], +}; + +const components = { + Button, +}; + +ReactDOM.render(( + +), document.getElementById('root')); +``` + +- rax-renderer：npm 包替换为 @alilc/lowcode-rax-renderer +#### +### 项目使用示例 +> 设计器 demo：[https://lowcode-engine.cn/demo](https://lowcode-engine.cn/demo) +> 项目代码完整示例：[https://github.com/alibaba/lowcode-demo](https://github.com/alibaba/lowcode-demo) + +**step 1：在设计器中获取组件列表** +```typescript +import { material, project } from '@alilc/lowcode-engine'; +const packages = material.getAssets().packages +``` +**step 2：在设计器中获取当前配置页面的 schema** +```typescript +import { material, project } from '@alilc/lowcode-engine'; + +const schema = project.exportSchema(); +``` + + +**step 3：以某种方式存储 schema 和 packages** +这里用 localStorage 作为存储示例，真实项目中使用数据库或者其他存储方式。 +```typescript +window.localStorage.setItem( + 'projectSchema', + JSON.stringify(project.exportSchema()) +); +const packages = await filterPackages(material.getAssets().packages); +window.localStorage.setItem( + 'packages', + JSON.stringify(packages) +); +``` +**step 4：预览时，获取存储的 schema 和 packages** +```typescript +const packages = JSON.parse(window.localStorage.getItem('packages') || ''); +const projectSchema = JSON.parse(window.localStorage.getItem('projectSchema') || ''); +const { componentsMap: componentsMapArray, componentsTree } = projectSchema; +``` +**step 5：通过整合 schema 和 packages 信息，进行渲染** +```typescript +import ReactDOM from 'react-dom'; +import React, { useState } from 'react'; +import { Loading } from '@alifd/next'; +import { buildComponents, assetBundle, AssetLevel, AssetLoader } from '@alilc/lowcode-utils'; +import ReactRenderer from '@alilc/lowcode-react-renderer'; +import { injectComponents } from '@alilc/lowcode-plugin-inject'; + +const SamplePreview = () => { + const [data, setData] = useState({}); + + async function init() { + // 渲染前置处理，初始化项目 schema 和资产包为渲染模块所需的 schema prop 和 components prop + const packages = JSON.parse(window.localStorage.getItem('packages') || ''); + const projectSchema = JSON.parse(window.localStorage.getItem('projectSchema') || ''); + const { componentsMap: componentsMapArray, componentsTree } = projectSchema; + const componentsMap: any = {}; + componentsMapArray.forEach((component: any) => { + componentsMap[component.componentName] = component; + }); + const schema = componentsTree[0]; + + const libraryMap = {}; + const libraryAsset = []; + packages.forEach(({ package: _package, library, urls, renderUrls }) => { + libraryMap[_package] = library; + if (renderUrls) { + libraryAsset.push(renderUrls); + } else if (urls) { + libraryAsset.push(urls); + } + }); + + const vendors = [assetBundle(libraryAsset, AssetLevel.Library)]; + + const assetLoader = new AssetLoader(); + await assetLoader.load(libraryAsset); + const components = await injectComponents(buildComponents(libraryMap, componentsMap)); + + setData({ + schema, + components, + }); + } + + const { schema, components } = data; + + if (!schema || !components) { + init(); + return ; + } + + return ( +
+ +
+ ); +}; + +ReactDOM.render(, document.getElementById('ice-container')); + +``` +### 国际化示例 +```typescript +class Demo extends PureComponent { + static displayName = 'renderer-demo'; + render() { + return ( +
+ +
+ ); + } +} +``` + +## API + +| 参数 | 说明 | 类型 | 必选 | +| --- | --- | --- | --- | +| schema | 符合[搭建协议](https://lowcode-engine.cn/lowcode)的数据 | Object | 是 | +| components | 组件依赖的实例 | Object | 是 | +| componentsMap | 组件的配置信息 | Object | 否 | +| appHelper | 渲染模块全局上下文 | Object | 否 | +| designMode | 设计模式，可选值：extend、border、preview | String | 否 | +| suspended | 是否挂起 | Boolean | 否 | +| onCompGetRef | 组件 ref 回调（schema, ref）=> {} | Function | 否 | +| onCompGetCtx | 组件 ctx 更新回调 (schema, ctx) => {} | Function | 否 | +| rendererName | 渲染类型，标识当前模块是以什么类型进行渲染的 | string | 否 | +| customCreateElement | 自定义创建 element 的钩子 +(Component, props, children) => {} | Function | 否 | +| notFoundComponent | 当组件找不到时，可以通过这个参数自定义展示文案。 | Component | 否 | +| thisRequiredInJSE | 为 true 的情况下 JSExpression 仅支持通过 this 来访问。假如需要兼容原来的 'state.xxx'，则设置为 false，推荐使用 true。 | Boolean | 否 | +| locale | 国际化语言类型 | string | 否 | +| messages | 国际化语言对象 | Object | 否 | + + +### schema + +搭建基础协议数据，渲染模块将基于 schema 中的内容进行实时渲染。 + +### messages +国际化内容，需要配合 locale 使用 +messages 格式示例： +```typescript +{ + 'zh-CN': { + 'hello-world': '你好，世界！', + }, + 'en-US': { + 'hello-world': 'Hello world!', + }, +} +``` + +### locale +当前语言类型 +示例：'zh-CN' | 'en-US' + +### components + +渲染模块渲染页面需要用到的组件依赖的实例，`components` 对象中的 Key 需要和搭建 schema 中的`componentName` 字段对应。 + +### componentsMap + +> 在生产环境下不需要设置。 + + +配置规范参见[《低代码引擎搭建协议规范》](https://lowcode-engine.cn/lowcode)，主要在搭建场景中使用，用于提升用户搭建体验。 + +- 属性配置校验：用户可以配置组件特定属性的 `propTypes`，在搭建场景中用户输入的属性值不满足 `propType` 配置时，渲染模块会将当前属性设置为 `undefined`，避免组件抛错导致编辑器崩溃； +- `isContainer` 标记：当组件被设置为容器组件且当前容器组件内没有其他组件时，用户可以通过拖拽方式将组件直接添加到容器组件内部； +- `parentRule` 校验：当用户使用的组件未出现在组件配置的 `parentRule` 组件内部时，渲染模块会使用 `visualDom` 组件进行占位，避免组件抛错的同时在下钻编辑场景也能够不阻塞用户配置，典型的场景如`Step.Item`、`Table.Column`、`Tab.Item` 等等。 + +### appHelper + +appHelper 主要用于设置渲染模块的全局上下文，目前 appHelper 支持设置以下上下文： + +- `utils`：全局公共函数 +- `constants`：全局常量 +- `location`：react-router 的 `location` 实例 +- `history`：react-router 的 `history` 实例 + +设置了 appHelper 以后，上下文会直接挂载到容器组件的 this 上，用户可以在搭建协议中的 function 及变量表达式场景使用上下文，具体使用方式如下所示： +**schema：** + +```javascript +export default { + "componentName": "Page", + "fileName": "test", + "props": {}, + "children": [{ + "componentName": "Div", + "props": {}, + "children": [{ + "componentName": "Text", + "props": { + "text": { + "type": "JSExpression", + "value": "this.location.pathname" + } + } + }, { + "componentName": "Button", + "props": { + "type": "primary", + "style": { + "marginLeft": 10 + }, + "onClick": { + "type": "JSExpression", + "value": "function onClick(e) { this.utils.xxx(this.constants.yyy);}" + } + }, + "children": "click me" + }] + }] +} +``` + +```typescript +import ReactRenderer from '@alilc/lowcode-react-renderer'; +import ReactDOM from 'react-dom'; +import { Button } from '@alifd/next'; +import schema from './schema' + +const components = { + Button, +}; + +ReactDOM.render(( + {} + } + }} + /> +), document.getElementById('root')); +``` +### designMode + +> 在生产环境下不需要设置。 + + +designMode 属性主要在搭建场景中使用，主要有以下作用： + +- 当 `designMode` 改变时，触发当前 schema 中所有组件重新渲染 +- 当 `designMode` 设置为 `design` 时，渲染模块会为 `Dialog`、`Overlay` 等初始状态无 dom 渲染的组件外层包裹一层 div，使其在画布中能够展示边框供用户选中 + +### suspended + +渲染模块是否挂起，当设置为 `true` 时，渲染模块最外层容器的 `shouldComponentUpdate` 将始终返回false，在下钻编辑或者多引擎渲染的场景会用到该参数。 + +### onCompGetRef + +组件 ref 的回调，在搭建场景下编排模块可以根据该回调获取组件实例并实现生命周期注入或者组件 DOM 操作等功能，回调函数主要包含两个参数： + +- `schema`： 当前组件的 schema 模型结构 +- `ref`：当前组件的 ref 实例 + +### onCompGetCtx +组件 ctx 更新的回调，在组件每次 render 渲染周期我们都会为组件构造新的上下文环境，因此该回调函数会在组件每次 render 过程中触发，主要包含两个参数： + +- `schema`：当前组件的 schema 模型结构 +- `ctx`：当前组件的上下文信息，主要包含以下内容： + - `page`：当前页面容器实例 + - `this`: 当前组件所属的容器组件实例 + - `item`/`index`: 循环上下文（属性 key 可以根据 loopArgs 进行定制） + - `form`: 表单上下文 + +### rendererName +渲染类型，标识当前模块是以什么类型进行渲染的 + +- `LowCodeRenderer`: 低代码组件 +- `PageRenderer`: 页面 + +### customCreateElement +自定义创建 element 的钩子，用于在渲染前后对组件进行一些处理，包括但不限于增加 props、删除部分 props。主要包含三个参数： + +- `Component`：要渲染的组件 +- `props`：要渲染的组件的 props +- `children`：要渲染的组件的子元素 + +### thisRequiredInJSE +> 版本 >= 1.0.11 + +默认值：true +为 true 的情况下 JSExpression 仅支持通过 this 来访问。假如需要兼容原来的 'state.xxx'，则设置为 false，推荐使用 true。 diff --git a/docs/docs/guide/quickStart/_category_.json b/docs/docs/guide/quickStart/_category_.json new file mode 100644 index 000000000..0a47c9da5 --- /dev/null +++ b/docs/docs/guide/quickStart/_category_.json @@ -0,0 +1,6 @@ +{ + "label": "入门", + "position": 0, + "collapsed": false, + "collapsible": true +} diff --git a/docs/docs/guide/quickStart/demo.md b/docs/docs/guide/quickStart/demo.md new file mode 100644 index 000000000..536c8efab --- /dev/null +++ b/docs/docs/guide/quickStart/demo.md @@ -0,0 +1,47 @@ +--- +title: 试用低代码引擎 Demo +sidebar_position: 1 +--- +# 访问地址 + +低代码引擎的 Demo 可以通过如下永久链接访问到： + +[https://lowcode-engine.cn/demo](https://lowcode-engine.cn/demo) + +> 注意我们会经常更新 demo，所以您可以通过上述链接得到最新版地址。 + + +# 低代码引擎 Demo 功能概览 + +我们可以从 Demo 的项目中看到页面中有很多的区块：
![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1643447049972-e324320a-7f97-4e48-bef3-a4c5d2b06517.png#clientId=udea0fe9a-4e7e-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=1080&id=rGr7U&margin=%5Bobject%20Object%5D&name=image.png&originHeight=2160&originWidth=3840&originalType=binary&ratio=1&rotation=0&showTitle=false&size=518455&status=done&style=none&taskId=u872d1136-0f18-41b3-900d-710e9fc9eea&title=&width=1920)
它主要包含这些功能点：
![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1643447051103-de714f27-ec70-4982-b180-e1ebe444b0fe.png#clientId=udea0fe9a-4e7e-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=1080&id=lD0YM&margin=%5Bobject%20Object%5D&name=image.png&originHeight=2160&originWidth=3840&originalType=binary&ratio=1&rotation=0&showTitle=false&size=616472&status=done&style=none&taskId=u61de17fa-6df0-43c8-9171-96388fda32e&title=&width=1920) + +- 顶部：操作区 + - 右侧：撤回和重做、保存到本地、重置页面、预览、异步加载资源 +- 左侧：面板与操作区 + - 大纲面板：可以调整页面内的组件树结构 + - 物料面板：可以查找组件，并在此拖动组件到编辑器画布中 + - 源码面板：可以编辑页面级别的 JavaScript 代码和 CSS 配置 + - 提交 Issue：可以给引擎开发提 bug + - Schema 编辑：可以编辑页面的底层数据 + - 中英文切换：可以切换编辑器的语言 +- 中部：可视化页面编辑画布区域 + - 点击组件在右侧面板中能够显示出对应组件的属性配置选项 + - 拖拽修改组件的排列顺序 + - 将组件拖拽到容器类型的组件中 + - 复制组件：点击组件右上角的复制按钮 + - 删除组件：点击组件右上角的 X 或者直接使用 `Delete` 键 +- 右侧：组件级别配置 + - 选中的组件：从页面开始一直到当前选中的组件位置，点击对应的名称可以切换到对应的组件上 + - 选中组件的配置：当前组件的大类目选项，根据组件类型不同，包含如下子类目： + - 属性：组件的基础属性值设置 + - 样式：组件的样式配置 + - 事件：绑定组件对外暴露的事件 + - 高级：循环、条件渲染与 key 设置 + +# 深入使用低代码引擎 Demo + +我们在低代码引擎 Demo 中直接内置了产品使用文档，对常见场景中的使用进行了向导，它的入口如下： + +![image.png](https://cdn.nlark.com/yuque/0/2022/png/242652/1647163471895-a12d0f5d-e09e-462d-bd0b-b633c64afb15.png#clientId=uecc3752b-3539-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=825&id=u86d6fa24&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1650&originWidth=3070&originalType=binary&ratio=1&rotation=0&showTitle=false&size=1040703&status=done&style=none&taskId=u54aeddda-78e0-4259-b184-d06e2dba10b&title=&width=1535) + +如果暂时没有看到对应的产品使用文档，可以通过此永久链接直接访问：[https://www.yuque.com/lce/usage](https://www.yuque.com/lce/usage) diff --git a/docs/docs/guide/quickStart/intro.md b/docs/docs/guide/quickStart/intro.md new file mode 100644 index 000000000..67750b2a9 --- /dev/null +++ b/docs/docs/guide/quickStart/intro.md @@ -0,0 +1,48 @@ +--- +title: 简介 +sidebar_position: 0 +--- + +# 阿里低代码引擎简介 + +## 低代码介绍 + +零代码、低代码的概念在整个全球行业内已经流行了很长一段时间。通常意义上的低代码定义会有三个关键点： + +1. 一个用于生产软件的可视化编辑器 +2. 中间包含了一些用于组装的物料，可以通过编排、组合和配置它们以生成丰富的功能或表现 +3. 最后的实施结果是成本降低 + +通常情况下低代码平台会具备以下的几个能力： + +- **可视化页面搭建**，通过简单的拖拽完成应用页面开发，对前端技能没有要求或不需要特别专业的了解； +- **可视化模型设计**，与业务相关的数据存储变得更容易理解，甚至大多数简单场景可以做到表单即模型，模型字段的类型更加业务化； +- **可视化流程设计**，不管是业务流程还是审批流程，都可以通过简单的点线连接来进行配置； +- **可视化报表及数据分析**，BI数据分析能力成为标配，随时随地通过拖拽选择来定义自定义分析报表； +- **可视化服务与数据开放、集成**，具备与其他系统互联互通的配置； +- **权限、角色设置标准化和业务化**，通过策略规则配置来将数据、操作的权限进行精细化管理； +- **无需关心服务器、数据库等底层运维、计算设施设备、网络等等复杂技术概念**，具备安全、性能的统一解决方案，开发者只需要专注于业务本身； + +有了上面这些，你会发现即使是个技术小白，只要你了解业务，就能不受束缚的完成大多数业务应用的搭建。但低代码本身也不仅仅是为技术小白准备的。在实践中，低代码因为通过组件化、模块化的思路让业务的抽象更加容易，而且在扩展及配置化上带来了更加新鲜的模式探索，技术人员的架构设计成本和实施成本也就降了很多。 + +市面上常见的低代码产品[可以看 Golden 的梳理](https://golden.com/wiki/No-code_%2F_low-code_development-NMGMEA6)。 + +## 低代码引擎介绍 + +**低代码引擎是一款为低代码平台开发者提供的，具备强大定制扩展能力的低代码设计器研发框架。** + +下面简单描述定义中的子部分： + +**低代码设计器** +现如今低代码平台越来越多，而每一个低代码平台中都会有的一个能力就是搭建和配置页面、模块的页面，这个页面我们称为设计器。例如，下图是中后台低代码平台的设计器。 +![image.png](https://img.alicdn.com/imgextra/i4/O1CN01LunuQh23b5NtP8k86_!!6000000007273-2-tps-1682-969.png?originHeight=1914&originWidth=3838&originalType=binary&ratio=1&rotation=0&showTitle=false&size=538736&status=done&style=stroke&taskId=u9a19d4d1-4d87-4b4e-b7cc-3aedfb00aaa&title=&width=1080) +设计器承载着低代码平台的核心功能，包括入料、编排、组件配置、画布渲染等等。由于其功能多，打磨精细难，也是低代码平台建设最耗时的地方。 + +**定制扩展能力** + +什么是扩展能力呢，一方面我们可以快速拥有一份标准的低代码设计器，另外一方面如果有业务独特的功能需要，我们可以不用看它的源码、不用关心其实现，可以使用 API、插件等方式快速完成能力的开发。 +而低代码引擎对于设计器的扩展能力支持基本上覆盖了低代码设计器的所有功能点。下图是针对标准的设计器提供了扩展功能的区域。 +![](https://cdn.nlark.com/yuque/0/2022/png/242652/1643446752531-8b1493d4-ea8a-463b-9631-6bb4fc681719.png#clientId=u2b839b63-1827-4&crop=0&crop=0&crop=1&crop=1&from=drop&height=539&id=ucff2881c&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1914&originWidth=3838&originalType=binary&ratio=1&rotation=0&showTitle=false&size=538736&status=done&style=stroke&taskId=u9a19d4d1-4d87-4b4e-b7cc-3aedfb00aaa&title=&width=1080) +**低代码设计器研发框架** + +低代码引擎的核心是设计器，通过扩展、周边生态等可以产出各式各样的设计器。它不是一套可以适合所有人的低代码平台，而是帮助低代码平台的开发者，快速生产低代码平台的工具。 diff --git a/docs/docs/guide/quickStart/start.md b/docs/docs/guide/quickStart/start.md new file mode 100644 index 000000000..001e4e789 --- /dev/null +++ b/docs/docs/guide/quickStart/start.md @@ -0,0 +1,296 @@ +--- +sidebar_position: 2 +title: 快速开始 +--- +# 前置知识 +我们假定你已经对 HTML 和 JavaScript 都比较熟悉了。即便你之前使用其他编程语言，你也可以跟上这篇教程的。除此之外，我们假定你也已经熟悉了一些编程的概念，例如，函数、对象、数组，以及 class 的一些内容。
如果你想回顾一下 JavaScript，你可以阅读[这篇教程](https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/A_re-introduction_to_JavaScript)。注意，我们也用到了一些 ES6（较新的 JavaScript 版本）的特性。在这篇教程里，我们主要使用了[箭头函数（arrow functions）](https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Functions/Arrow_functions)、[class](https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Classes)、[let](https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Statements/let) 语句和 [const](https://developer.mozilla.org/zh-CN/docs/Web/JavaScript/Reference/Statements/const) 语句。你可以使用 [Babel REPL](https://babeljs.io/repl/#?presets=react&code_lz=MYewdgzgLgBApgGzgWzmWBeGAeAFgRgD4AJRBEAGhgHcQAnBAEwEJsB6AwgbgChRJY_KAEMAlmDh0YWRiGABXVOgB0AczhQAokiVQAQgE8AkowAUAcjogQUcwEpeAJTjDgUACIB5ALLK6aRklTRBQ0KCohMQk6Bx4gA) 在线预览 ES6 的编译结果。 + +# 环境准备 +## WSL（Window 电脑） +Window 环境需要使用 WSL 在 windows 下进行低代码引擎相关的开发。安装教程 ➡️ [WSL 安装教程](https://docs.microsoft.com/zh-cn/windows/wsl/install)。
**对于 Window 环境来说，之后所有需要执行命令的操作都是在 WSL 终端执行的。** +## Node +node 版本推荐 14.17.0。 + +### 查看 Node 版本 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660653856191-128d8e3f-9636-4b73-94ab-c03cf6965365.png#clientId=ubcf63daf-5747-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=35&id=u44a9af04&margin=%5Bobject%20Object%5D&name=image.png&originHeight=70&originWidth=238&originalType=binary&ratio=1&rotation=0&showTitle=false&size=11948&status=done&style=none&taskId=udb616117-a27c-409d-9e1c-1b89931a714&title=&width=119) + +### 变更 node 版本 +可以安装 [n](https://www.npmjs.com/package/n) 来管理和变更 node 版本。 + +#### 安装 +```json +npm install -g n +``` + +#### 变更 node 版本 +```json +n 14.17.0 +``` + +## React +低代码引擎的扩展能力都是基于 React 来研发的，在继续阅读之前最好有一定的 React 基础，React 学习教程 ➡️ [React 快速开始教程](https://zh-hans.reactjs.org/docs/getting-started.html)。 + +## 下载 Demo +可以前往 github（https://github.com/alibaba/lowcode-demo）将 DEMO 下载到本地。 + +### git clone +#### HTTPS +需要使用到 git 工具 +```json +git clone https://github.com/alibaba/lowcode-demo.git +``` +#### SSH +需要配置 SSH key，如果没有配置可以 +```json +git clone git@github.com:alibaba/lowcode-demo.git +``` + +### 下载 Zip 包 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660653725650-ab734ba4-64a7-4801-9d2f-5c496879054f.png#clientId=ubcf63daf-5747-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=897&id=uc1b07458&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1794&originWidth=3584&originalType=binary&ratio=1&rotation=0&showTitle=false&size=1306258&status=done&style=stroke&taskId=ubaa4eb12-0e87-464e-b3da-306ed9685b7&title=&width=1792) + +## 安装依赖 +在 lowcode-demo 目录下执行： +```json +npm install +``` + +## 启动 demo +在 lowcode-demo 目录下执行： +```json +npm run start +``` + +之后就可以通过 [http://localhost:5556/](http://localhost:5556/) 来访问我们的 DEMO 了。 +# 认识 Demo +我们的 Demo 是一个**低代码平台的设计器**。它是一个低代码平台中最重要的一环，用户可以在这里通过拖拽、配置、写代码等等来完成一个页面的开发。由于用户的人群不同、场景不同、诉求不同等等，这个页面的功能就会有所差异。
这里记住**设计器**这个词，它描述的就是下面的这个页面，后面我们会经常看到它。
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660654189055-45fd0c7e-75cb-4072-a4d4-7cf244405c7d.png#clientId=ubcf63daf-5747-4&crop=0&crop=0.008&crop=1&crop=1&from=paste&height=904&id=LBi2j&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1808&originWidth=3584&originalType=binary&ratio=1&rotation=0&showTitle=false&size=763122&status=done&style=stroke&taskId=u82753ad5-3b5d-43b2-b309-a99c2a7bb24&title=&width=1792) + +## 场景介绍 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660654738730-490fc94a-8b42-4c48-b21e-4c0694416b07.png#clientId=ubcf63daf-5747-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=903&id=ub700edc2&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1806&originWidth=3584&originalType=binary&ratio=1&rotation=0&showTitle=false&size=802013&status=done&style=stroke&taskId=u317bff98-636d-402a-98f2-f9e0b08293b&title=&width=1792) + +Demo 根据**不同的设计器所需要的物料不同**，分为了下面的 8 个场景： + +- 综合场景 +- 基础 fusion 组件 +- 基础 fusion 组件 + 单自定义组件 +- 基础 antd 组件 +- 自定义初始化引擎 +- 扩展节点操作项 +- 基于next实现的高级表单低代码物料 +- antd 高级组件 + formily 表单组件 + +可以点开不同的场景，看看他们使用的物料。 + +## 目录介绍 +仓库下的 src/scenarios 目录就对应刚刚介绍的场景。
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660655237007-fddd8534-d4ed-4a25-ba2f-f335f8ac3c36.png#clientId=ubcf63daf-5747-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=348&id=ubf68019d&margin=%5Bobject%20Object%5D&name=image.png&originHeight=696&originWidth=696&originalType=binary&ratio=1&rotation=0&showTitle=false&size=148777&status=done&style=stroke&taskId=u68648c51-7648-494e-bd41-4f29fb144f9&title=&width=348) + +不同场景的目录结构实际上都是类似的，这里我们主要介绍一下综合场景的目录结构即可。
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660655399364-b40d206a-977d-4000-9be1-681823f8a995.png#clientId=ubcf63daf-5747-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=1010&id=ub727a7fa&margin=%5Bobject%20Object%5D&name=image.png&originHeight=2020&originWidth=3584&originalType=binary&ratio=1&rotation=0&showTitle=false&size=1373541&status=done&style=stroke&taskId=ue55dc86f-375d-4c7f-a63f-d5208683035&title=&width=1792)
综合场景目录下只有一个文件，这个文件做了几个事情： + +- 通过 plugins.register 注册「切换场景」的插件，也就是上面介绍的切换场景的功能。 +- 通过 registerPlugins 注册更多的插件： + - ManualPlugin：增加弹出「低代码产品使用文档」按钮 + - Inject：支持调试功能 + - registerRefProp：支持给每个组件注入 ref + - ... +- 通过 init 初始化低代码设计器 + +做了这些事情之后，我们的低代码设计器就已经有了基本的能力了。也就是最开始我们看到的这样。
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660654189055-45fd0c7e-75cb-4072-a4d4-7cf244405c7d.png#clientId=ubcf63daf-5747-4&crop=0&crop=0.008&crop=1&crop=1&from=paste&height=904&id=MZdfk&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1808&originWidth=3584&originalType=binary&ratio=1&rotation=0&showTitle=false&size=763122&status=done&style=stroke&taskId=u82753ad5-3b5d-43b2-b309-a99c2a7bb24&title=&width=1792) + +接下来我们就根据我们自己的诉求通过对设计器进行扩展，改动成我们需要的设计器功能。 +# 开发一个插件 +## 方式1：在 DEMO 中直接新增插件 +![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660656064139-8da57c37-7e0b-4e8d-9f2d-8ea86d5af134.png#clientId=ubcf63daf-5747-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=280&id=uc7f75c37&margin=%5Bobject%20Object%5D&name=image.png&originHeight=560&originWidth=820&originalType=binary&ratio=1&rotation=0&showTitle=false&size=125690&status=done&style=stroke&taskId=u53c07118-a2ca-4a77-a27f-3b2b20085ac&title=&width=410) + +可以在 demo/sample-plugins 直接新增插件，这里我新增的插件目录是 plugin-demo。并且新增了 index.tsx 文件，将下面的代码粘贴到 index.tsx 中。 +```javascript +import * as React from 'react'; +import { ILowCodePluginContext } from '@alilc/lowcode-engine'; + +const LowcodePluginPluginDemo = (ctx: ILowCodePluginContext) => { + return { + // 插件对外暴露的数据和方法 + exports() { + return { + data: '你可以把插件的数据这样对外暴露', + func: () => { + console.log('方法也是一样'); + }, + } + }, + // 插件的初始化函数，在引擎初始化之后会立刻调用 + init() { + // 你可以拿到其他插件暴露的方法和属性 + // const { data, func } = ctx.plugins.pluginA; + // func(); + + // console.log(options.name); + + // 往引擎增加面板 + ctx.skeleton.add({ + area: 'leftArea', + name: 'LowcodePluginPluginDemoPane', + type: 'PanelDock', + props: { + description: 'Demo', + }, + content:
这是一个 Demo 面板
, + }); + + ctx.logger.log('打个日志'); + }, + }; +}; + +// 插件名，注册环境下唯一 +LowcodePluginPluginDemo.pluginName = 'LowcodePluginPluginDemo'; +LowcodePluginPluginDemo.meta = { + // 依赖的插件（插件名数组） + dependencies: [], + engines: { + lowcodeEngine: '^1.0.0', // 插件需要配合 ^1.0.0 的引擎才可运行 + }, +} + +export default LowcodePluginPluginDemo; +``` + +在 src/scenarios/index/index.ts 中新增下面代码
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660656497051-49e08633-2d78-428c-becc-c282905cdb90.png#clientId=ubcf63daf-5747-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=1010&id=u426edc7b&margin=%5Bobject%20Object%5D&name=image.png&originHeight=2020&originWidth=3584&originalType=binary&ratio=1&rotation=0&showTitle=false&size=1458910&status=done&style=stroke&taskId=uf1e42399-caf7-4d82-a797-698fa730486&title=&width=1792) + +这样在我们的设计器中就新增了一个 Demo 面板。
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660656566260-86dfed37-60d0-45ca-967e-5df8ea7a34d0.png#clientId=ubcf63daf-5747-4&crop=0&crop=0.0053&crop=1&crop=1&from=paste&height=903&id=u17565cd3&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1806&originWidth=3584&originalType=binary&ratio=1&rotation=0&showTitle=false&size=734227&status=done&style=stroke&taskId=u5dbe00f3-447b-451e-ac48-9b02281afc3&title=&width=1792) +## 方式2：在新的仓库下开发插件 +初始化 +```json +npm init @alilc/element your-plugin-name +``` + +选择设计器插件（plugin）
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660702297326-ccfe60f9-ee22-4a24-a293-26351d107663.png#clientId=udb19495f-ea47-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=107&id=ub2bf5248&margin=%5Bobject%20Object%5D&name=image.png&originHeight=214&originWidth=730&originalType=binary&ratio=1&rotation=0&showTitle=false&size=82091&status=done&style=stroke&taskId=u82628265-73f0-4d57-b4ba-1b18600a1f0&title=&width=365) + +根据操作完善信息
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660702439529-867a893f-f27a-4e48-8a5a-ee45aa97e355.png#clientId=udb19495f-ea47-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=109&id=uc9b09fec&margin=%5Bobject%20Object%5D&name=image.png&originHeight=218&originWidth=866&originalType=binary&ratio=1&rotation=0&showTitle=false&size=102705&status=done&style=stroke&taskId=ue4a95f21-43d3-4da8-9c0e-b21dfe239bf&title=&width=433) + +插件项目就初始化完成了
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660702464438-3d7e07eb-53c7-417c-9e6d-06fdf9acfb86.png#clientId=udb19495f-ea47-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=280&id=u0ee65b4e&margin=%5Bobject%20Object%5D&name=image.png&originHeight=2020&originWidth=3584&originalType=binary&ratio=1&rotation=0&showTitle=false&size=1197702&status=done&style=stroke&taskId=u5f9fdae3-1adc-4b02-969c-5c43c3d4c9c&title=&width=496) + +在插件项目下安装依赖 +```json +npm install +``` + +启动项目 +```json +npm run start +``` + +调试项目
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660705712773-f2446689-2b5f-42e7-9e85-30857270dfbb.png#clientId=udb19495f-ea47-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=346&id=u448649c5&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1936&originWidth=3584&originalType=binary&ratio=1&rotation=0&showTitle=false&size=757713&status=done&style=stroke&taskId=u0b617456-826e-4993-951e-303da417172&title=&width=641) + +在 Demo 中调试项目
在 build.json 下面新增 "inject": true，就可以在 [https://lowcode-engine.cn/demo/index.html?debug](https://lowcode-engine.cn/demo/index.html?debug) 页面下进行调试了。
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660705860117-5a11a5fa-9215-4b94-84b7-497899cafe10.png#clientId=udb19495f-ea47-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=1010&id=u3a36c42f&margin=%5Bobject%20Object%5D&name=image.png&originHeight=2020&originWidth=3584&originalType=binary&ratio=1&rotation=0&showTitle=false&size=887101&status=done&style=stroke&taskId=u747bc337-5212-4a8b-a88f-127c53ea621&title=&width=1792) +# 开发一个自定义物料 +## 初始化物料 +```json +npm init @alilc/element your-material-demo +``` +选择组件/物料栏
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660706045985-db73ca55-925a-446b-ace4-b59fa1e18469.png#clientId=udb19495f-ea47-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=104&id=kuWIf&margin=%5Bobject%20Object%5D&name=image.png&originHeight=208&originWidth=824&originalType=binary&ratio=1&rotation=0&showTitle=false&size=88910&status=done&style=stroke&taskId=u92f5fa65-386a-4f52-a093-bcbbebdc2d7&title=&width=412) + +配置其他信息
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660706116845-9b3b938f-c132-426b-81bd-d49283ebf9e8.png#clientId=udb19495f-ea47-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=124&id=u941c9808&margin=%5Bobject%20Object%5D&name=image.png&originHeight=248&originWidth=800&originalType=binary&ratio=1&rotation=0&showTitle=false&size=111864&status=done&style=stroke&taskId=ue4ff4dab-3a53-4811-bf70-7fa6fc0c8b6&title=&width=400) + +这样我们就初始化好了一个 React 物料。
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660706173968-3e5db25a-e08d-4852-90c9-ffaa0968fd62.png#clientId=udb19495f-ea47-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=1010&id=u854b37cc&margin=%5Bobject%20Object%5D&name=image.png&originHeight=2020&originWidth=3584&originalType=binary&ratio=1&rotation=0&showTitle=false&size=1080400&status=done&style=stroke&taskId=u10e21350-23d4-4d8f-8c16-0c5a221fc2e&title=&width=1792) +## 启动并调试物料 +### 安装依赖 +```json +npm i +``` +### 启动 +```json +npm run lowcode:dev +``` + +我们就可以通过 [http://localhost:3333/](http://localhost:3333/) 看到我们的研发的物料了。
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660706484894-73798e35-1e58-4ffe-bb3c-bfba7b014433.png#clientId=udb19495f-ea47-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=895&id=zVMiy&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1790&originWidth=3584&originalType=binary&ratio=1&rotation=0&showTitle=false&size=678753&status=done&style=stroke&taskId=u241f50c0-1a43-4854-8443-7e972f15623&title=&width=1792) +### 在 Demo 中调试 +```json +npm i @alilc/build-plugin-alt +``` + +修改 build.lowcode.js
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660706733149-0170b2fb-88de-40e3-8204-f510d7e42f77.png#clientId=udb19495f-ea47-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=311&id=u8a1a8bea&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1046&originWidth=1388&originalType=binary&ratio=1&rotation=0&showTitle=false&size=291155&status=done&style=stroke&taskId=u61ede7d2-f92d-43b9-8582-a2362a9ea14&title=&width=413) + +如图，新增如下代码 +```json +[ + '@alilc/build-plugin-alt', + { + type: 'component', + inject: true, + library, + // 配置要打开的页面，在注入调试模式下，不配置此项的话不会打开浏览器 + // 支持直接使用官方 demo 项目：https://lowcode-engine.cn/demo/index.html + openUrl: 'https://lowcode-engine.cn/demo/index.html?debug', + }, +], +``` + +我们重新启动项目，就可以在 Demo 中找到我们的自定义组件。
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660706823666-ca28a08d-6241-4112-bc78-b9078c81fb75.png#clientId=udb19495f-ea47-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=906&id=u31bdc31a&margin=%5Bobject%20Object%5D&name=image.png&originHeight=1812&originWidth=3584&originalType=binary&ratio=1&rotation=0&showTitle=false&size=788013&status=done&style=stroke&taskId=uaa4789a2-452f-4b04-8894-759989e4568&title=&width=1792) + +## 发布 +首先进行构建 +```json +npm run lowcode:build +``` + +发布组件 +```json +npm publish +``` + +这里我发布的组件是 [my-material-demo](https://www.npmjs.com/package/my-material-demo)。在发布之后我们就会有两个重要的文件： + +- 低代码描述：[https://unpkg.com/my-material-demo@0.1.0/build/lowcode/meta.js](https://unpkg.com/my-material-demo@0.1.0/build/lowcode/meta.js) +- 组件代码：[https://unpkg.com/my-material-demo@0.1.0/build/lowcode/render/default/view.js](https://unpkg.com/my-material-demo@0.1.0/build/lowcode/render/default/view.js) + +我们也可以从 [https://unpkg.com/my-material-demo@0.1.0/build/lowcode/assets-prod.json](https://unpkg.com/my-material-demo@0.1.0/build/lowcode/assets-prod.json) 找到我们的资产包描述。 +```json +{ + "packages": [ + { + "package": "my-material-demo", + "version": "0.1.0", + "library": "BizComp", + "urls": [ + "https://unpkg.com/my-material-demo@0.1.0/build/lowcode/render/default/view.js", + "https://unpkg.com/my-material-demo@0.1.0/build/lowcode/render/default/view.css" + ], + "editUrls": [ + "https://unpkg.com/my-material-demo@0.1.0/build/lowcode/view.js", + "https://unpkg.com/my-material-demo@0.1.0/build/lowcode/view.css" + ], + "advancedUrls": { + "default": [ + "https://unpkg.com/my-material-demo@0.1.0/build/lowcode/render/default/view.js", + "https://unpkg.com/my-material-demo@0.1.0/build/lowcode/render/default/view.css" + ] + }, + "advancedEditUrls": {} + } + ], + "components": [ + { + "exportName": "MyMaterialDemoMeta", + "npm": { + "package": "my-material-demo", + "version": "0.1.0" + }, + "url": "https://unpkg.com/my-material-demo@0.1.0/build/lowcode/meta.js", + "urls": { + "default": "https://unpkg.com/my-material-demo@0.1.0/build/lowcode/meta.js" + }, + "advancedUrls": { + "default": [ + "https://unpkg.com/my-material-demo@0.1.0/build/lowcode/meta.js" + ] + } + } + ], +} +``` + +## 使用 +我们将刚刚发布的组件的 assets-prod.json 的内容放到 demo 的 src/universal/assets.json 中。
*最好放到最后，防止因为资源加载顺序问题导致出现报错。
如图，新增 packages 配置
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660707789785-ea75a399-6845-45a8-8c53-08402749c9a8.png#clientId=udb19495f-ea47-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=1010&id=uf0f75c17&margin=%5Bobject%20Object%5D&name=image.png&originHeight=2020&originWidth=3584&originalType=binary&ratio=1&rotation=0&showTitle=false&size=1327766&status=done&style=stroke&taskId=ub053d846-69fd-4a55-8e9e-b41d1e06e47&title=&width=1792)
如图，新增 components 配置
![image.png](https://cdn.nlark.com/yuque/0/2022/png/2622706/1660707811725-a0e36f48-910d-45b5-b162-3aa4e2f87e9b.png#clientId=udb19495f-ea47-4&crop=0&crop=0&crop=1&crop=1&from=paste&height=1010&id=uf8c9506f&margin=%5Bobject%20Object%5D&name=image.png&originHeight=2020&originWidth=3584&originalType=binary&ratio=1&rotation=0&showTitle=false&size=1222080&status=done&style=stroke&taskId=u10147f1f-27ed-4cec-bfc9-2cb3d61d6a2&title=&width=1792) + +这时候再启动 DEMO 项目，就会有新的低代码物料了。接下来就按照你们的需求，继续扩展物料吧。 +# 总结 +这里只是简单的介绍了一些低代码引擎的基础能力，带大家简单的对低代码 DEMO 进行扩展，定制一些新的功能。低代码引擎的能力还有很多很多，可以继续去探索更多的功能。 diff --git a/docs/docs/participate/config.md b/docs/docs/participate/config.md new file mode 100644 index 000000000..e30040010 --- /dev/null +++ b/docs/docs/participate/config.md @@ -0,0 +1,80 @@ +--- +title: 工程化配置 +sidebar_position: 3 +--- +目前引擎体系共包含 3 个 js 文件，即： +```html + + + + +``` + +工程化配置我们进行了统一，具体如下： +```shell +{ + "entry": { + ... + }, + "library": "...", + "libraryTarget": "umd", + "externals": { + "react": "var window.React", + "react-dom": "var window.ReactDOM", + "prop-types": "var window.PropTypes", + "rax": "var window.Rax", + "@alilc/lowcode-engine": "var window.AliLowCodeEngine", + "@alilc/lowcode-engine-ext": "var window.AliLowCodeEngineExt", + "moment": "var moment", + "lodash": "var _", + "@alifd/next": "var Next" + }, + "polyfill": false, + "outputDir": "dist", + "vendor": false, + "ignoreHtmlTemplate": true, + "sourceMap": true, + "plugins": [ + "build-plugin-react-app", + ["build-plugin-fusion", { + }], + ["build-plugin-moment-locales", { + "locales": ["zh-cn"] + }], + "./build.plugin.js" + ] +} + +``` +总结一下，有 2 点： + +1. **都不包含 polyfill，**需要应用级别单独引入 polyfill，推荐动态 polyfill +2. **都不包含 lodash / moment / next** + + +#### 前置依赖资源： +```html + + + + + + +``` + + +#### 所有资源： +```html + + + + + + + + + + + + +``` diff --git a/docs/docs/participate/doc.md b/docs/docs/participate/doc.md new file mode 100644 index 000000000..c1ef26f8d --- /dev/null +++ b/docs/docs/participate/doc.md @@ -0,0 +1,17 @@ +--- +title: 官网文档协作流程 +sidebar_position: 3 +--- + +## 基本原则 + +### 维护方式 + +- 官方文档通过 github 管理文档源, 官网文档与[主仓库 develop 分支](https://github.com/alibaba/lowcode-engine/tree/develop/docs)保持同步。 +- 点击每篇文档下发的 `编辑此页` 可直接定位到 github 中位置。 +- 欢迎 PR， 文档 PR 也会作为贡献者贡献，会用于贡献度统计。 +- 文档同步到官方网站由官方人员进行操作，如有需要可以通过 issue 或 贡献者群与相关人员沟通。 + +### PR 方式 + +- 操作与代码贡献一致，指向 develop 分支。 \ No newline at end of file diff --git a/docs/docs/participate/flow.md b/docs/docs/participate/flow.md new file mode 100644 index 000000000..24ebd3629 --- /dev/null +++ b/docs/docs/participate/flow.md @@ -0,0 +1,153 @@ +--- +title: 研发协作流程 +sidebar_position: 2 +--- +## 代码风格 +引擎项目配置了 eslint 和 stylelint，在每次 git commit 前都会检查代码风格，假如有报错，请修改后再提交。（**严禁 -n 提交，-n 也逃脱不了 github workflow 的 lint 检查，放弃吧，骚年~**） + +## 测试机制 +每次提交代码前，务必本地跑一次单元测试，通过后再提交 MR。 + +假如涉及新的功能，需要**补充相应的单元测试**，目前引擎核心模块的单测覆盖率都在 80%+，假如降低了覆盖率，将会不予以通过。 + +跑单测流程： + +1. 项目根目录下执行 npm run build +2. 只改了一个包，比如 designer，则在 designer 目录下，执行 npm test +3. （or）改了多个包，则在根目录下执行 npm test +## commit 风格 +几点要求： + +1. commit message 格式遵循 [ConvensionalCommits](https://www.conventionalcommits.org/en/v1.0.0/#summary) +![image.png](https://cdn.nlark.com/yuque/0/2022/png/110793/1645066644352-4de1c64c-bff6-4482-90d1-1fb610aa91f2.png#averageHue=%23eceef0&clientId=u6dcee4f0-35df-4&crop=0&crop=0&crop=1&crop=1&height=297&id=CfpQy&margin=%5Bobject%20Object%5D&name=image.png&originHeight=594&originWidth=2070&originalType=binary&ratio=1&rotation=0&showTitle=false&size=341605&status=done&style=none&taskId=u4499b752-5e24-42f6-9186-280fd5a51aa&title=&width=1035) +2. 请按照一个 bugfix / feature 对应一个 commit，假如不是，请 rebase 后再提交 MR，不要一堆无用的、试验性的 commit。 + +好处：从引擎的整体 commit 历史来看，会很清晰，**每个 commit 完成一件确定的事，changelog 也能自动生成**。另外，假如因为某个 commit 导致了 bug，也很容易通过 rebase drop 等方式快速修复。 + +## 分支用途 + +- main 分支，最稳定的分支，跟 npm latest 包的内容保持一致 +- develop 分支，开发分支，拥有最新的、已经验证过的 feature / bugfix，Pull Request 的**目标合入分支** +- release 分支 + - 正式发布分支，命名规则为 release/x.y.z，一般从 develop 拉出来进行发布，x.y.z 为待发布的版本号 + - beta 发布分支，命名规则为 release/x.y.z-beta(\.\d+)?，可以快速验证修改，发布 npm beta 版本。 + +验证通过后，因为 beta 发布分支上会存在无用的 commit（比如 lerna 修改 package.json 这种），所以不直接 PR 到 develop，而是从 develop 拉分支，从 beta 发布分支 cherry pick 有用的 commit 到新分支，然后 PR 到 develop。 + +## 引擎发布机制 + +日常迭代先从 develop 拉分支，然后自测、单测通过后，提交 PR 到 develop 分支，由发布负责人基于 develop 拉 release/1.0.z 分支~ + +### 版本规划 + +> 此处是理想节奏，实际情况可能会有调整 + +- 日常迭代 2 周，一般月中或月底 +- 特殊情况紧急迭代随时发 +- 大Feature迭代，每年 2 - 4 次 + + +### 发布步骤 +> **发布需要权限，如果提 PR 之后着急发布可以**[**加入贡献者交流群**](../participate/#核心贡献者交流)**。** + +#### 发正式版 +步骤如下（以发布 1.0.0 版本为例）： + +1. git checkout develop + ```bash + git checkout develop + ``` +2. 创建release分支 + ```bash + git checkout -b release/1.0.0 + ``` +3. build + ```bash + npm run build + ``` +4. 发布到npm + ```bash + npm run pub + ``` +5. 同步到 tnpm 源 & alifd CDN（此步骤将发布在 npm 源的包同步到阿里内网源，因为 alifd cdn 将依赖内网 npm 源） + ```bash + tnpm run sync + ``` +6. 更新[发布日志](https://github.com/alibaba/lowcode-engine/releases) +7. 合并 release/x.x.x 到 main 分支 +8. 合并 main 分支到 develop 分支 + +如果是发布beta 版本，步骤如下（以发布 1.0.1 版本为例）： + +#### 发某版本首个 beta ，如 1.0.1-beta.0 +1. 拉 develop 分支 + ```bash + git checkout develop + ``` + 更新到最新（如需） + ```bash + git pull + ``` +2. 拉 release 分支，此处以 1.0.1 版本做示例 + ```bash + git checkout -b release/1.0.1-beta + ``` +3. build + ```bash + npm run build + ``` +4. 发布，此处需有 @alilc scope 发包权限 + ```bash + npm run pub:prepatch + ``` +5. 同步到 tnpm 源 & alifd CDN + ```bash + tnpm run sync + ``` + +#### 发某版本非首个 beta ，如 1.0.1-beta.0 -> 1.0.1-beta.1 +1. 切换到 release 分支 + ```bash + git checkout release/1.0.1-beta + ``` +2. 更新到 develop 分支最新代码 + ```bash + git rebase origin/develop + ``` +3. build + ```bash + npm run build + ``` +4. 发布，此处需有 @alilc scope 发包权限 ***此处命令与发首个 beta 时有变化*** + ```bash + npm run pub:prerelease + ``` +5. 同步到 tnpm 源 & alifd CDN + ```bash + tnpm run sync + ``` + + + +## DEMO 发布机制 +1. **修改版本号** + 手动修改 package.json 的版本号 +2. **build** + ```bash + npm run build + ``` +3. publish （此步骤需要 npm 发包权限） + ```bash + npm run pub + ``` + 如发 beta 版 + ```bash + npm publish --tag beta + ``` +4. 同步到 tnpm 源 & alifd CDN + ```bash + tnpm run sync + ``` + +**官网生效** +需要在通过阿里内部系统更新 demo 版本 diff --git a/docs/docs/participate/index.md b/docs/docs/participate/index.md new file mode 100644 index 000000000..854da7e18 --- /dev/null +++ b/docs/docs/participate/index.md @@ -0,0 +1,30 @@ +--- +title: 贡献者指南 +sidebar_position: 0 +--- +### 首个 Pull Request +在写第一个 Pull Request？你可以从这一系列视频中学习怎么做： +[How to Contribute to an Open Source Project on GitHub](https://egghead.io/courses/how-to-contribute-to-an-open-source-project-on-github) + +为了使你能够快速上手和熟悉贡献流程，我们这里有个列表 [good first issues](https://github.com/alibaba/lowcode-engine/issues?q=is:open+is:issue+label:%22good+first+issue%22)，里面有相对没那么笼统的漏洞，从这开始是个不错的选择。 + +如果你想解决一个 issue，请确定检查了该 issue 下的评论以防有人正在处理它。如果目前没人在处理该 issue，那么请留下评论去表明你想处理该 issue 以便其他人不会意外重复你的工作。 + +如果有人留言表明要处理该 issue 但是超过两周没有跟进，你可以接手工作，不过也应该留言说明。 + +### 提交 Pull Request +核心团队时刻关注 pull requests，我们会先评审你的 pull request，之后可能会合并，可能会要求再次更改，也可能会关闭该 pull request 并对此作出解释。我们会尽力全程更新和反馈。 + +**提交 pull request 前**，请确保完成以下步骤： + +1. Fork [此仓库](https://github.com/alibaba/lowcode-engine)，从 main 创建分支。 +2. 在仓库根目录下执行 yarn。 +3. 如果你修复了 bug 或者添加了代码，而这些内容需要测试，请添加测试！ +4. 确保通过测试套件（yarn test）。 +5. 请签订贡献者许可证协议（Contributor License Agreement）。 + +### 核心贡献者交流 +如果你想长期参与到项目维护中，我们提供了一个核心贡献者交流群。 + +1. 可以通过[填写问卷](https://survey.taobao.com/apps/zhiliao/4YEtu9gHF)的方式，参与到其中。 +2. 填写问卷后加微信号 `wxidvlalalalal` 说明一下 diff --git a/docs/docs/participate/prepare.md b/docs/docs/participate/prepare.md new file mode 100644 index 000000000..dd962cd64 --- /dev/null +++ b/docs/docs/participate/prepare.md @@ -0,0 +1,64 @@ +--- +title: 调试环境配置 +sidebar_position: 1 +--- +低代码引擎的核心仓库是不包含任何物料、插件、setter 的，它本身用于生成低代码引擎的主包。 + +如果您需要对低代码的主包进行开发和调试，需要用到本文里介绍的知识。 + +如果您需要对低代码编辑器进行定制，您可能只需要 clone [lowcode-demo 项目](https://github.com/alibaba/lowcode-demo)并进行修改，参考“[配置低代码扩展点](/site/docs/guide/expand/editor/summary)”章节。 + +> 前置条件： +> node >= 14 + +### 1. 拉取代码，启动项目 +```bash +git clone git@github.com:alibaba/lowcode-engine.git +cd lowcode-engine +npm install && npm run setup +npm start + + +git clone git@github.com:alibaba/lowcode-demo.git +cd lowcode-demo +npm install && npm start +``` + +### 2. 配置资源代理 +本质上是将 demo 页面引入的几个 js/css 代理到 engine 项目，可以使用趁手的代理工具，这里推荐 [XSwitch](https://chrome.google.com/webstore/detail/xswitch/idkjhjggpffolpidfkikidcokdkdaogg?hl=en-US)。 + +本地开发代理规则如下： +```json +{ + "proxy": [ + [ + "https://alifd.alicdn.com/npm/@alilc/lowcode-engine@(.*)/dist/js/engine-core.js", + "http://localhost:5555/js/engine-core.js" + ], + [ + "https://alifd.alicdn.com/npm/@alilc/lowcode-engine@(.*)/dist/css/engine-core.css", + "http://localhost:5555/css/engine-core.css" + ], + [ + "https?://alifd.alicdn.com/npm/@alilc/lowcode-engine@(.*)/dist/js/react-simulator-renderer.js", + "http://localhost:5555/js/react-simulator-renderer.js" + ], + [ + "https?://alifd.alicdn.com/npm/@alilc/lowcode-engine@(.*)/dist/css/react-simulator-renderer.css", + "http://localhost:5555/css/react-simulator-renderer.css" + ], + [ + "https?://alifd.alicdn.com/npm/@alilc/lowcode-engine@(.*)/dist/js/rax-simulator-renderer.js", + "http://localhost:5555/js/rax-simulator-renderer.js" + ], + [ + "https?://alifd.alicdn.com/npm/@alilc/lowcode-engine@(.*)/dist/css/rax-simulator-renderer.css", + "http://localhost:5555/css/rax-simulator-renderer.css" + ], + ] +} +``` + +### 3. 本地调试物料/插件/设置器 + +详见[低代码生态脚手架 & 调试机制](/site/docs/guide/expand/editor/cli) diff --git a/specs/assets-spec.md b/docs/docs/specs/assets-spec.md similarity index 94% rename from specs/assets-spec.md rename to docs/docs/specs/assets-spec.md index ab0e1abc0..5c7df0163 100644 --- a/specs/assets-spec.md +++ b/docs/docs/specs/assets-spec.md @@ -1,8 +1,12 @@ +--- +title: 《低代码引擎资产包协议规范》 +sidebar_position: 2 +--- # 《低代码引擎资产包协议规范》 -# 1 介绍 +## 1 介绍 -## 1.1 本协议规范涉及的问题域 +### 1.1 本协议规范涉及的问题域 - 定义本协议版本号规范 - 定义本协议中每个子规范需要被支持的 Level @@ -12,16 +16,16 @@ - 定义低代码资产包协议组件描述资源加载规范（A） - 定义低代码资产包协议组件在面板展示规范（AA） -## 1.2 协议草案起草人 +### 1.2 协议草案起草人 - 撰写：金禅、璿玑、彼洋 - 审阅：力皓、絮黎、光弘、戊子、潕量、游鹿 -## 1.3 版本号 +### 1.3 版本号 1.1.0 -## 1.4 协议版本号规范（A） +### 1.4 协议版本号规范（A） 本协议采用语义版本号，版本号格式为 `major.minor.patch` 的形式。 @@ -29,7 +33,7 @@ - minor 是小版本号：用于发布向下兼容的协议功能新增 - patch 是补丁号：用于发布向下兼容的协议问题修正 -## 1.5 协议中子规范 Level 定义 +### 1.5 协议中子规范 Level 定义 | 规范等级 | 实现要求 | | -------- | ------------------------------------------------------------ | @@ -37,19 +41,19 @@ | AA | 推荐规范，由低代码引擎官方插件、setter 支持。 | | AAA | 参考规范，需由基于引擎的上层搭建平台支持，实现可参考该规范。 | -## 1.6 名词术语 +### 1.6 名词术语 - **资产包**: 低代码引擎加载资源的动态数据集合，主要包含组件及其依赖的资源、组件低代码描述、动态插件/设置器资源等。 -## 1.7 背景 +### 1.7 背景 根据低代码引擎的实现，一个组件要在引擎上渲染和配置，需要提供组件的 umd 资源以及组件的`低代码描述`，并且组件通常都是以集合的形式被引擎消费的；除了组件之外，还有组件的依赖资源、引擎的动态插件/设置器等资源也需要注册到引擎中；因此我们定义了“低代码资产包”这个数据结构，来描述引擎所需加载的动态资源的集合。 -## 1.8 受众 +### 1.8 受众 本协议适用于使用“低代码引擎”构建搭建平台的开发者，通过本协议的定义来进行资源的分类和加载。阅读及使用本协议，需要对低代码搭建平台的交互和实现有一定的了解，对前端开发相关技术栈的熟悉也会有帮助，协议中对通用的前端相关术语不会做进一步的解释说明。 -# 2 协议结构 +## 2 协议结构 协议最顶层结构如下，包含 7 方面的描述内容： @@ -61,7 +65,7 @@ - setters { Array } 设计器中设置器描述协议列表 - extConfig { Object } 平台自定义扩展字段 -## 2.1 version（A） +### 2.1 version（A） 定义当前协议 schema 的版本号； @@ -69,7 +73,7 @@ | ---------- | ------ | ---------- | -------- | ------ | | version | String | 协议版本号 | - | 1.1.0 | -## 2.2 packages（A） +### 2.2 packages（A） 定义低代码编辑器中加载的资源列表，包含公共库和组件(库) cdn 资源等； @@ -81,18 +85,18 @@ | packages[].version | npm 包版本号 | String | A | 组件资源版本号 | | packages[].type | 资源包类型 | String | AA | 取值为: proCode（源码）、lowCode（低代码，默认为 proCode | | packages[].schema | 低代码组件 schema 内容 | object | AA | 取值为: proCode（源码）、lowCode（低代码） | -| packages[].deps | 当前资源包的依赖资源的唯一标识列表 | Array | A | 唯一标识为 id 或者 package 对应的值 | +| packages[].deps | 当前资源包的依赖资源的唯一标识列表 | Array | A | 唯一标识为 id 或者 package 对应的值 | | packages[].library | 作为全局变量引用时的名称，用来定义全局变量名 | String | A | 低代码引擎通过该字段获取组件实例 | -| packages[].editUrls | 组件编辑态视图打包后的 CDN url 列表，包含 js 和 css | Array | A | 低代码引擎编辑器会加载这些 url | -| packages[].urls | 组件渲染态视图打包后的 CDN url 列表，包含 js 和 css | Array | AA | 低代码引擎渲染模块会加载这些 url | +| packages[].editUrls | 组件编辑态视图打包后的 CDN url 列表，包含 js 和 css | Array | A | 低代码引擎编辑器会加载这些 url | +| packages[].urls | 组件渲染态视图打包后的 CDN url 列表，包含 js 和 css | Array | AA | 低代码引擎渲染模块会加载这些 url | | packages[].advancedEditUrls | 组件多个编辑态视图打包后的 CDN url 列表集合，包含 js 和 css | Object | AAA | 上层平台根据特定标识提取某个编辑态的资源，低代码引擎编辑器会加载这些资源，优先级高于 packages[].editUrls | | packages[].advancedUrls | 组件多个端的渲染态视图打包后的 CDN url 列表集合，包含 js 和 css | Object | AAA | 上层平台根据特定标识提取某个渲染态的资源， 低代码引擎渲染模块会加载这些资源，优先级高于 packages[].urls | | packages[].external | 当前资源在作为其他资源的依赖，在其他依赖打包时时是否被排除了(同 webpack 中 external 概念) | Boolean | AAA | 某些资源会被单独提取出来，是其他依赖的前置依赖，根据这个字段决定是否提前加载该资源 | -| packages[].loadEnv | 指定当前资源加载的环境 | Array | AAA | 主要用于指定 external 资源加载的环境，取值为 design(设计态)、runtime(预览态)中的一个或多个 | +| packages[].loadEnv | 指定当前资源加载的环境 | Array | AAA | 主要用于指定 external 资源加载的环境，取值为 design(设计态)、runtime(预览态)中的一个或多个 | | packages[].exportSourceId | 标识当前 package 内容是从哪个 package 导出来的 | String | AAA | 此时 urls 无效 | | packages[].exportSourceLibrary | 标识当前 package 是从 window 上的哪个属性导出来的 | String | AAA | exportSourceId 的优先级高于exportSourceLibrary ,此时 urls 无效 | | packages[].async | 标识当前 package 资源加载在 window.library 上的是否是一个异步对象 | Boolean | A | async 为 true 时，需要通过 await 才能拿到真正内容 | -| packages[].exportMode | 标识当前 package 从其他 package 的导出方式 | String | A | 目前只支持 `"functionCall"`, exportMode等于 `"functionCall"` 时，当前package 的内容以函数的方式从其他 package 中导出，具体导出接口如: (library: string, packageName: string, isRuntime?: boolean) => any | Promise, library 为当前 package 的 library, packageName 为当前的包名，返回值为当前 package 的导出内容 | +| packages[].exportMode | 标识当前 package 从其他 package 的导出方式 | String | A | 目前只支持 `"functionCall"`, exportMode等于 `"functionCall"` 时，当前package 的内容以函数的方式从其他 package 中导出，具体导出接口如: (library: string, packageName: string, isRuntime?: boolean) => any | Promise, library 为当前 package 的 library, packageName 为当前的包名，返回值为当前 package 的导出内容 | 描述举例: @@ -294,14 +298,14 @@ } ``` -## 2.3 components （A） +### 2.3 components （A） 定义资产包中包含的所有组件的低代码描述的集合，分为“ComponentDescription”和“RemoteComponentDescription”(详见 2.6 TypeScript 定义)： - ComponentDescription: 符合“组件描述协议”的数据，详见物料规范中`2.2.2 组件描述协议`部分； - RemoteComponentDescription 是将一个或多个 ComponentDescription 构建打包的 js 资源的描述，在浏览器中加载该资源后可获取到其中包含的每个组件的 ComponentDescription 的具体内容； -## 2.4 sort （AA） +### 2.4 sort （AA） 定义组件列表分组 @@ -310,7 +314,7 @@ | sort.groupList | String[] | 组件分组，用于组件面板 tab 展示 | - | ['精选组件', '原子组件'] | | sort.categoryList | String[] | 组件面板中同一个 tab 下的不同区间用 category 区分，category 的排序依照 categoryList 顺序排列 | - | ['通用', '数据展示', '表格类', '表单类'] | -## 2.5 plugins (AAA) +### 2.5 plugins (AAA) 自定义设计器插件列表 @@ -325,7 +329,7 @@ | plugins[].keywords | String[] | 插件检索关键字 | - | - | | plugins[].reference | Reference | 插件引用的资源包信息 | - | - | -## 2.6 setters (AAA) +### 2.6 setters (AAA) 自定义设置器列表 @@ -340,11 +344,11 @@ | setters[].keywords | String[] | 设置器检索关键字 | - | - | | setters[].reference | Reference | 设置器引用的资源包信息 | - | - | -## 2.7 extConfig (AAA) +### 2.7 extConfig (AAA) 定义平台相关的扩展内容，用于存放平台自身实现的一些私有协议, 以允许存量平台能够平滑地迁移至标准协议。 extConfig 是一个 key-value 结构的对象，协议不会规定 extConfig 中的字段名称以及类型, 完全自定义 -## 2.8 TypeScript 定义 +### 2.8 TypeScript 定义 _组件低代码描述相关部分字段含义详见物料规范中`2.2.2 组件描述协议`部分；_ @@ -463,7 +467,7 @@ export interface Package { */ exportName?: string; /** - * 标识当前 package 资源加载在 window.library 上的是否是一个异步对象 + * 标识当前 package 资源加载在 window.library 上的是否是一个异步对象 */ async?: boolean; /** @@ -471,11 +475,11 @@ export interface Package { */ exportMode?: string; /** - * 标识当前 package 内容是从哪个 package 导出来的 + * 标识当前 package 内容是从哪个 package 导出来的 */ exportSourceId?: string; /** - * 标识当前 package 是从 window 上的哪个属性导出来的 + * 标识当前 package 是从 window 上的哪个属性导出来的 */ exportSourceLibrary?: string; } @@ -684,4 +688,4 @@ export interface ComponentSchema { ``` -`ComponentSchema` 的定义见[低代码业务组件描述](./1.material-spec.md#221-组件规范) +`ComponentSchema` 的定义见[低代码业务组件描述](./material-spec.md#221-组件规范) diff --git a/specs/lowcode-spec.md b/docs/docs/specs/lowcode-spec.md similarity index 89% rename from specs/lowcode-spec.md rename to docs/docs/specs/lowcode-spec.md index 65e05130d..e1d57daa0 100644 --- a/specs/lowcode-spec.md +++ b/docs/docs/specs/lowcode-spec.md @@ -1,8 +1,13 @@ +--- +title: 《低代码引擎搭建协议规范》 +sidebar_position: 0 +--- # 《低代码引擎搭建协议规范》 -# 1 介绍 -## 1.1 本协议规范涉及的问题域 +## 1 介绍 + +### 1.1 本协议规范涉及的问题域 - 定义本协议版本号规范 - 定义本协议中每个子规范需要被支持的 Level @@ -14,17 +19,17 @@ - 定义搭建基础协议无障碍访问规范（AAA） -## 1.2 协议草案起草人 +### 1.2 协议草案起草人 - 撰写：月飞、康为、林熠 - 审阅：大果、潕量、九神、元彦、戊子、屹凡、金禅、前道、天晟、戊子、游鹿、光弘、力皓 -## 1.3 版本号 +### 1.3 版本号 1.0.0 -## 1.4 协议版本号规范（A） +### 1.4 协议版本号规范（A） 本协议采用语义版本号，版本号格式为 `major.minor.patch` 的形式。 @@ -33,7 +38,7 @@ - patch 是补丁号：用于发布向下兼容的协议问题修正 -## 1.5 协议中子规范 Level 定义 +### 1.5 协议中子规范 Level 定义 | 规范等级 | 实现要求 | | -------- | ---------------------------------------------------------------------------------- | @@ -42,9 +47,9 @@ | AAA | 参考规范，根据业务场景实际诉求实现；是集团层面鼓励的技术实现引导。 | -## 1.6 名词术语 +### 1.6 名词术语 -### 1.6.1 物料系统名词 +#### 1.6.1 物料系统名词 - **基础组件（Basic Component）**：前端领域通用的基础组件，阿里巴巴前端委员会官方指定的基础组件库是 Fusion Next/AntD。 - **图表组件（Chart Component）**：前端领域通用的图表组件，有代表性的图表组件库有 BizCharts。 @@ -56,7 +61,7 @@ - **模板（Template）**：特定垂直业务领域内的业务组件、区块可组合为单个页面，或者是再配合路由组合为多个页面集，统称为模板。 -### 1.6.2 低代码搭建系统名词 +#### 1.6.2 低代码搭建系统名词 - **搭建编辑器**：使用可视化的方式实现页面搭建，支持组件 UI 编排、属性编辑、事件绑定、数据绑定，最终产出符合搭建基础协议规范的数据。 - **属性面板**：低代码编辑器内部用于组件、区块、页面的属性编辑、事件绑定、数据绑定的操作面板。 @@ -71,7 +76,7 @@ - **数据绑定**：是指为某个组件的某个属性绑定用于该属性使用的数据。 - **生命周期**: 一般指某个对象的生老病死，本文中指某个实体（组件、容器、区块等等）的创建、加载、显示、销毁等关键生命阶段的统称。 -## 1.7 背景 +### 1.7 背景 - **协议目标**： 通过约束低代码引擎的搭建协议规范，让上层低代码编辑器的产出物（低代码业务组件、区块、应用）保持一致性，可跨低代码研发平台进行流通而提效，亦不阻碍集团业务间融合的发展。  - **协议通**： @@ -85,19 +90,19 @@ - 事件描述，包含统一事件上下文、统一搭建 API； - **物料通**：指在相同领域内的不同搭建产品，可直接使用的物料。比如模版、区块、组件； -## 1.8 受众 +### 1.8 受众 本协议适用于所有使用低代码搭建平台来开发页面或组件的开发者，以及围绕此协议的相关工具或工程化方案的开发者。阅读及使用本协议，需要对低代码搭建平台的交互和实现有一定的了解，对前端开发相关技术栈的熟悉也会有帮助，协议中对通用的前端相关术语不会做进一步的解释说明。 -## 1.9 使用范围 +### 1.9 使用范围 本协议描述的是低代码搭建平台产物（应用、页面、区块、组件）的 schema 结构，以及实现其数据状态更新（内置 api)、能力扩展、国际化等方面完整，只在低代码搭建场景下可用； -## 1.10 协议目标 +### 1.10 协议目标 一套面向开发者的 schema 规范，用于规范化约束搭建编辑器的输出，以及渲染模块和出码模块的输入，将搭建编辑器、渲染模块、出码模块解耦，保障搭建编辑器、渲染模块、出码模块的独立升级。 -## 1.11 设计说明 +### 1.11 设计说明 - **语义化**：语义清晰，简明易懂，可读性强。 - **渐进性描述**：搭建的本质是通过 源码组件 进行嵌套组合，从小往大、依次组合生成 组件、区块、页面，最终通过云端构建生成 应用 的过程。因此在搭建基础协议中，我们需要知道如何去渐进性的描述组件、区块、页面、应用这 4 个实体概念。 @@ -107,15 +112,20 @@ - **支持国际化&无障碍访问标准的实现** -# 2 协议结构 +## 2 协议结构 -协议最顶层结构如下，包含5方面的描述内容： +协议最顶层结构如下： - version { String } 当前协议版本号 - componentsMap { Array } 组件映射关系 - componentsTree { Array } 描述模版/页面/区块/低代码业务组件的组件树 - utils { Array } 工具类扩展映射关系 - i18n { Object } 国际化语料 +- constants { Object } 应用范围内的全局常量 +- css { string } 应用范围内的全局样式 +- config: { Object } 当前应用配置信息 +- meta: { Object } 当前应用元数据信息 +- dataSource: { Array } 当前应用的公共数据源 描述举例： @@ -198,6 +208,41 @@ }] }] }], + "constants": { + "ENV": "prod", + "DOMAIN": "xxx.com" + }, + "css": "body {font-size: 12px;} .table { width: 100px;}", + "config": { // 当前应用配置信息 + "sdkVersion": "1.0.3", // 渲染模块版本 + "historyMode": "hash", // 浏览器路由：browser 哈希路由：hash + "targetRootID": "J_Container", + "layout": { + "componentName": "BasicLayout", + "props": { + "logo": "...", + "name": "测试网站" + }, + }, + "theme": { + // for Fusion use dpl defined + "package": "@alife/theme-fusion", + "version": "^0.1.0", + // for Antd use variable + "primary": "#ff9966" + } + }, + "meta": { // 应用元数据信息, key 为业务自定义 + "name": "demo 应用", // 应用中文名称, + "git_group": "appGroup", // 应用对应 git 分组名 + "project_name": "app_demo", // 应用对应 git 的 project 名称 + "description": "这是一个测试应用", // 应用描述 + "spma": "spa23d", // 应用 spm A 位信息 + "creator": "月飞", + "gmt_create": "2020-02-11 00:00:00", // 创建时间 + "gmt_modified": "2020-02-11 00:00:00", // 修改时间 + ... + }, "i18n": { "zh-CN": { "i18n-jwg27yo4": "你好", @@ -211,7 +256,7 @@ } ``` -## 2.1 协议版本号（A） +### 2.1 协议版本号（A） 定义当前协议 schema 的版本号，不同的版本号对应不同的渲染 SDK，以保障不同版本搭建协议产物的正常渲染； @@ -229,7 +274,7 @@ } ``` -## 2.2 组件映射关系（A） +### 2.2 组件映射关系（A） 协议中用于描述 componentName 到公域组件映射关系的规范。 @@ -320,7 +365,7 @@ import { Input as CustomInput } from '@ali/custom/lib/input'; ``` -## 2.3 组件树描述（A） +### 2.3 组件树描述（A） 协议中用于描述搭建出来的组件树结构的规范，整个组件树的描述由**组件结构**&**容器结构**两种结构嵌套构成。 @@ -333,13 +378,13 @@ import { Input as CustomInput } from '@ali/custom/lib/input'; - 组件结构：转换成一个 .jsx 文件内 React Class 类 render 函数返回的 **jsx** 代码。 - 容器结构：将转换成一个标准文件，如 React 的 jsx 文件， export 一个 React Class，包含生命周期定义、自定义方法、事件属性绑定、异步数据请求等。 -### 2.3.1 基础结构描述 (A) +#### 2.3.1 基础结构描述 (A) 此部分定义了组件结构、容器结构的公共基础字段。 > 阅读时可先跳到后续章节，待需要时回来参考阅读 -#### 2.3.1.1 Props 结构描述 +##### 2.3.1.1 Props 结构描述 | 参数 | 说明 | 类型 | 支持变量 | 默认值 | 备注 | | ----------- | ------------ | ------ | -------- | ------ | ------------------------------------- | @@ -350,7 +395,7 @@ import { Input as CustomInput } from '@ali/custom/lib/input'; | extendProps | 组件继承属性 | 变量 | ✅ | - | 仅支持变量绑定，常用于继承属性对象 | | ... | 组件私有属性 | - | - | - | | -#### 2.3.1.2 css/less/scss 样式描述 +##### 2.3.1.2 css/less/scss 样式描述 | 参数 | 说明 | 类型 | 支持变量 | 默认值 | | ------------- | -------------------------------------------------------------------------- | ------ | -------- | ------ | @@ -364,14 +409,14 @@ import { Input as CustomInput } from '@ali/custom/lib/input'; } ``` -#### 2.3.1.3 ComponentDataSource 对象描述 +##### 2.3.1.3 ComponentDataSource 对象描述 | 参数 | 说明 | 类型 | 支持变量 | 默认值 | 备注 | | ----------- | ---------------------- | -------------------------------------- | -------- | ------ | ----------------------------------------------------------------------------------------------------------- | | list[] | 数据源列表 | Array\<**ComponentDataSourceItem**\> | - | - | 成为为单个请求配置, 内容定义详见 [ComponentDataSourceItem 对象描述](#2314-componentdatasourceitem-对象描述) | | dataHandler | 所有请求数据的处理函数 | Function | - | - | 详见 [dataHandler Function 描述](#2317-datahandler-function 描述) | -#### 2.3.1.4 ComponentDataSourceItem 对象描述 +##### 2.3.1.4 ComponentDataSourceItem 对象描述 | 参数 | 说明 | 类型 | 支持变量 | 默认值 | 备注 | | -------------- | ---------------------------- | ---------------------------------------------------- | -------- | --------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------- | @@ -408,7 +453,7 @@ try { - dataHandler 会有默认值，考虑到返回结果入参都是 response 完整对象，默认值会返回 `response.data`，errorHandler 没有默认值 -#### 2.3.1.5 ComponentDataSourceItemOptions 对象描述 +##### 2.3.1.5 ComponentDataSourceItemOptions 对象描述 | 参数 | 说明 | 类型 | 支持变量 | 默认值 | 备注 | | ------- | ------------ | ------- | -------- | ------ | ----------------------------------------------------------------------------------------------------------- | @@ -421,7 +466,7 @@ try { -#### 2.3.1.6 ComponentLifeCycles 对象描述 +##### 2.3.1.6 ComponentLifeCycles 对象描述 生命周期对象，schema 面向多端，不同 DSL 有不同的生命周期方法： @@ -461,14 +506,14 @@ try { ``` -#### 2.3.1.7 dataHandler Function 描述 +##### 2.3.1.7 dataHandler Function 描述 - 参数：为 dataMap 对象，包含字段如下： - key: 数据 id - value: 单个请求结果 - 返回值：数据对象 data，将会在渲染引擎和 schemaToCode 中通过调用 `this.setState(...)` 将返回的数据对象生效到 state 中；支持返回一个 Promise，通过 `resolve（返回数据）`，常用于串行发送请求场景。 -#### 2.3.1.8 ComponentPropDefinition 对象描述 +##### 2.3.1.8 ComponentPropDefinition 对象描述 | 参数 | 说明 | 类型 | 支持变量 | 默认值 | 备注 | | ------------ | ---------- | -------------- | -------- | --------- | ----------------------------------------------------------------------------------------------------------------- | @@ -492,7 +537,7 @@ try { }, ``` -### 2.3.2 组件结构描述（A） +#### 2.3.2 组件结构描述（A） 对应生成源码开发体系中 render 函数返回的 jsx 代码，主要描述有以下属性： @@ -538,7 +583,7 @@ try { ``` -### 2.3.3 容器结构描述 (A)  +#### 2.3.3 容器结构描述 (A)  容器是一类特殊的组件，在组件能力基础上增加了对生命周期对象、自定义方法、样式文件、数据源等信息的描述。包含**低代码业务组件容器 Component**、**区块容器 Block**、**页面容器 Page** 3 种。主要描述有以下属性： @@ -693,11 +738,11 @@ try { } ``` -### 2.3.4 属性值类型描述（A） +#### 2.3.4 属性值类型描述（A） 在上述**组件结构**和**容器结构**描述中，每一个属性所对应的值，除了传统的 JS 值类型（String、Number、Object、Array、Boolean）外，还包含有**节点类型**、**事件函数类型**、**变量类型**等多种复杂类型；接下来将对于复杂类型的详细描述方式进行详细介绍。 -#### 2.3.4.1 节点类型（A） +##### 2.3.4.1 节点类型（A） 通常用于描述组件的某一个属性为 **ReactNode** 或 **Function-Return-ReactNode** 的场景。该类属性的描述均以 **JSSlot** 的方式进行描述，详细描述如下： @@ -761,7 +806,7 @@ try { ``` -#### 2.4.3.2 事件函数类型（A） +##### 2.3.4.2 事件函数类型（A） 协议内的事件描述，主要包含**容器结构**的**生命周期**和**自定义方法**，以及**组件结构**的**事件函数类属性**三类。所有事件函数的描述，均以 **JSFunction** 的方式进行描述，保留与原组件属性、生命周期（React / 小程序）一致的输入参数，并给所有事件函数 binding 统一一致的上下文（当前组件所在容器结构的 **this** 对象）。 @@ -823,7 +868,7 @@ try { } ``` -#### 2.4.3.3 变量类型（A） +##### 2.3.4.3 变量类型（A） 在上述**组件结构** 或**容器结构**中，有多个属性的值类型是支持变量类型的，通常会通过变量形式来绑定某个数据，所有的变量表达式均通过 JSExpression 表达式，上下文与事件函数描述一致，表达式内通过 **this** 对象获取上下文； @@ -846,7 +891,7 @@ try { "value": "this.state.num - this.state.num2" } ``` -- return "8万" 字符串类型 +- return "8万" 字符串类型 ```json { @@ -854,7 +899,7 @@ try { "value": "`${this.state.num}万`" } ``` -- return "8万" 字符串类型 +- return "8万" 字符串类型 ```json { @@ -862,7 +907,7 @@ try { "value": "this.state.num + '万'" } ``` -- return 13 数字类型 +- return 13 数字类型 ```json { @@ -870,7 +915,7 @@ try { "value": "getNum(this.state.num, this.state.num2)" } ``` -- return true 布尔类型 +- return true 布尔类型 ```json { @@ -903,7 +948,7 @@ try { "props": { "text": { "type": "JSExpression", - "value": "getNum(this.state.num, this.state.num2) + '万'" + "value": "this.getNum(this.state.num, this.state.num2) + '万'" } }, "condition": { @@ -914,7 +959,7 @@ try { } ``` -#### 2.4.3.4 国际化多语言类型（AA） +##### 2.3.4.4 国际化多语言类型（AA） 协议内的一些文本值内容，我们希望是和协议全局的国际化多语言语料是关联的，会按照全局国际化语言环境的不同使用对应的语料。所有国际化多语言值均以 **i18n** 结构描述。这样可以更为清晰且结构化得表达使用场景。 @@ -936,11 +981,11 @@ type Ti18n = { "i18n": { "zh-CN": { "i18n-jwg27yo4": "你好", - "i18n-jwg27yo3": "${name}博士" + "i18n-jwg27yo3": "{name}博士" }, "en-US": { "i18n-jwg27yo4": "Hello", - "i18n-jwg27yo3": "Doctor ${name}" + "i18n-jwg27yo3": "Doctor {name}" } } } @@ -982,11 +1027,11 @@ type Ti18n = { ``` -### 2.3.5 上下文 API 描述（A） +#### 2.3.5 上下文 API 描述（A） 在上述**事件类型描述**和**变量类型描述**中，在函数或 JS 表达式内，均可以通过 **this** 对象获取当前组件所在容器（React Class）的实例化对象，在搭建场景下的渲染模块和出码模块实现上，统一约定了该实例化 **this** 对象下所挂载的最小 API 集合，以保障搭建协议具备有一致的**数据流**和**事件上下文**。  -#### 2.3.5.1 容器 API： +##### 2.3.5.1 容器 API： | 参数 | 说明 | 类型 | 备注 | | ----------------------------------- | --------------------------------------- | ---------------------------- | -------------------------------------------------------------------------------------------------------------- | @@ -1045,7 +1090,7 @@ this.setState((prevState) => ({ count: prevState.count + 1 })); 备注： 如果组件没有在区块容器内，而是直接在页面内，那么 `this === this.page` -#### 2.3.5.2 循环数据 API +##### 2.3.5.2 循环数据 API 获取在循环场景下的数据对象。举例：上层组件设置了 loop 循环数据，且设置了 `loopArgs：["item", "index"]`，当前组件的属性表达式或绑定的事件函数中，可以通过 this 上下文获取所在循环的数据环境；默认值为 `['item','index']` ，如有多层循环，需要自定义不同 loopArgs，同样通过 `this[自定义循环别名]` 获取对应的循环数据和序号； @@ -1055,7 +1100,7 @@ this.setState((prevState) => ({ count: prevState.count + 1 })); | this.item | 获取当前 index 对应的循环体数据； | Any | - | | this.index | 当前物料在循环体中的 index | Number | - | -## 2.5 工具类扩展描述（AA） +### 2.4 工具类扩展描述（AA） 用于描述物料开发过程中，自定义扩展或引入的第三方工具类（例如：lodash 及 moment），增强搭建基础协议的扩展性，提供通用的工具类方法的配置方案及调用 API。 @@ -1130,7 +1175,7 @@ export const recordEvent = function(logkey, gmkey, gokey, reqMethod) { } ``` -## 2.6 国际化多语言支持（AA） +### 2.5 国际化多语言支持（AA） 协议中用于描述国际化语料和组件引用国际化语料的规范，遵循集团国际化中台关于国际化语料规范定义。 @@ -1199,158 +1244,34 @@ export const recordEvent = function(logkey, gmkey, gokey, reqMethod) { } ``` -# 3 应用描述 +### 2.6 应用范围内的全局常量（AA） -面向开发者的，描述完整应用的 Schema 规范，用于规范化约束**低代码平台**对**完整应用**的**输出**，以及**出码模块**( Schema2Code) 或**运行时动态渲染框架**（预览）的**输入**。 +用于描述在整个应用内通用的全局常量，比如请求 API 的域名、环境等。 -## 3.1 结构描述 +### 2.7 应用范围内的全局样式（AA） -- version { String } 当前应用协议版本号 -- componentsMap { Array } 当前应用所有组件映射关系 -- componentsTree { Array } 描述应用所有页面、低代码组件的组件树 -- utils { Array } 应用范围内的全局自定义函数或第三方工具类扩展 -- css { string } 应用范围内的全局样式； -- config: { Object } 当前应用配置信息 -- meta: { Object } 当前应用元数据信息 -- dataSource: { Array } 当前应用的公共数据源 （待定） -- i18n { Object } 国际化语料 +用于描述在应用范围内的全局样式，比如 reset.css 等。 +### 2.8 当前应用配置信息（AA） -完整应用描述举例： +用于描述当前应用的配置信息，比如当前应用的路由模式、Shell/Layout、主题等。 -```json -{ - "version": "1.0.0", // 当前协议版本号 - "componentsMap": [{ // 依赖 npm 组件描述 - "componentName": "Button", - "package": "alife/next", - "version": "1.0.0", - "destructuring": true, - "exportName": "Select", - "subName": "Button" - }], - "componentsTree": [{ // 应用内页面、低代码组件描述 - "componentName": "Page", // 单个页面 - "fileName": "page_index", - "props": {}, - "css": "body {font-size: 12px;} .table { width: 100px;}", - "meta": { // 页面元信息 - "title": "首页", // 页面标题描述 - "router": "/", // 页面路由 - "spmb": "abef21", // spm B 位 - "url": "https://fusion.design", // 页面访问地址 - "creator": "xxx", - "gmt_create": "2020-02-11 00:00:00", // 创建时间 - "gmt_modified": "2020-02-11 00:00:00", // 修改时间 - ... - }, - "children": [{ - "componentName": "Div", - "props": { - "className": "red", - }, - "children": [{ - "componentName": "Button", - "props": { - "type": "primary", - "valueBind": { // 变量绑定 - "type": "JSExpression", - "value": "this.state.user.name" - }, - "onClick": { // 动作绑定 - "type": "JSExpression", - "value": "function(e) { console.log(e.target.innerText) }", - } - }, - }] - }, { - "componentName": "Component", // 单个组件 - "fileName": "BasicLayout", // 组件名称 - "props": {}, - "css": "body {font-size: 12px;} .table { width: 100px;}", - "meta": { // 组件元信息 - "title": "导航组件", // 组件中文标题 - "description": "这是一个导航类组件...", // 组件描述 - "creator": "xxx", - "gmt_create": "2020-02-11 00:00:00", // 创建时间 - "gmt_modified": "2020-02-11 00:00:00", // 修改时间 - ... - }, - "children": [{ - "componentName": "Nav", - "props": { - "className": "red" - }, - "children": [{ - "componentName": "NavItem", - "props": {} - }] - }] - }] - }], - "utils": [{ - "name": "clone", - "type": "npm", - "content": { - "package": "lodash", - "version": "0.0.1", - "exportName": "clone", - "subName": "", - "destructuring": false, - "main": "/lib/clone" - } - }, { - "name": "beforeRequestHandler", - "type": "function", - "content": { - "type": "JSFunction", - "value": "function(){\n ... \n}" - } - }], - "css": "body {font-size: 12px;} .table { width: 100px;}", - "config": { // 当前应用配置信息 - "sdkVersion": "1.0.3", // 渲染模块版本 - "historyMode": "hash", // 浏览器路由：browser 哈希路由：hash - "container": "J_Container", - "layout": { - "componentName": "BasicLayout", - "props": { - "logo": "...", - "name": "测试网站" - }, - }, - "theme": { - // for Fusion use dpl defined - "package": "@alife/theme-fusion", - "version": "^0.1.0", - // for Antd use variable - "primary": "#ff9966" - } - }, - "meta": { // 应用元数据信息 - "name": "demo 应用", // 应用中文名称, - "git_group": "appGroup", // 应用对应 git 分组名 - "project_name": "app_demo", // 应用对应 git 的 project 名称 - "description": "这是一个测试应用", // 应用描述 - "spma": "spa23d", // 应用 spma A 位信息 - "gmt_create": "2020-02-11 00:00:00", // 创建时间 - "gmt_modified": "2020-02-11 00:00:00", // 修改时间 - ... - }, - "i18n": { - "zh-CN": { - "i18n-jwg27yo4": "你好", - "i18n-jwg27yo3": "中国" - }, - "en-US": { - "i18n-jwg27yo4": "Hello", - "i18n-jwg27yo3": "China" - } - } -} -``` +> 注意：该字段为扩展字段，消费方式由各自场景自己决定，包括运行时和出码。 -## 3.2 文件目录 +### 2.9 当前应用元数据信息（AA） + +用于描述当前应用的元数据信息，比如当前应用的名称、Git 信息、版本号等等。 + +> 注意：该字段为扩展字段，消费方式由各自场景自己决定，包括运行时和出码。 + +### 2.10 当前应用的公共数据源（AA） + +用于描述当前应用的公共数据源，数据结构跟容器结构里的 ComponentDataSource 保持一致。 +在运行时 / 出码使用时，API 和应用级数据源 API 保持一致，都是 `this.dataSourceMap['globalDSName'].load()` + +## 3 应用描述 + +### 3.1 文件目录 以下是推荐的应用目录结构，与标准源码 build-scripts 对齐，这里的目录结构是帮助理解应用级协议的设计，不做强约束 @@ -1398,17 +1319,17 @@ export const recordEvent = function(logkey, gmkey, gokey, reqMethod) { └── .stylelintrc.js ``` -## 3.3 应用级别 APIs +### 3.2 应用级别 APIs > 下文中 `xxx` 代指任意 API -### 3.3.1 路由 Router API +#### 3.2.1 路由 Router API - this.location.`xxx` - this.history.`xxx` - this.match.`xxx` -### 3.3.2 应用级别的公共函数或第三方扩展 +#### 3.2.2 应用级别的公共函数或第三方扩展 - this.utils.`xxx` -### 3.3.3 国际化相关 API +#### 3.2.3 国际化相关 API | API | 函数签名 | 说明 | | -------------- | ---------------------------------------------------------------------- | ------------------------------------------------------------------ | | this.i18n | (i18nKey: string, params?: { [paramName: string]: string; }) => string | i18nKey 是语料的标识符，params 可选，是用来做模版字符串替换的。返回语料字符串 | diff --git a/specs/material-spec.md b/docs/docs/specs/material-spec.md similarity index 89% rename from specs/material-spec.md rename to docs/docs/specs/material-spec.md index 468033886..f7687114b 100644 --- a/specs/material-spec.md +++ b/docs/docs/specs/material-spec.md @@ -1,8 +1,12 @@ +--- +title: 《低代码引擎物料协议规范》 +sidebar_position: 1 +--- # 《低代码引擎物料协议规范》 -# 1 介绍 +## 1 介绍 -## 1.1 本协议规范涉及的问题域 +### 1.1 本协议规范涉及的问题域 - 定义本协议版本号规范 - 定义本协议中每个子规范需要被支持的 Level @@ -14,16 +18,16 @@ - 定义中后台物料无障碍访问规范（AAA） -## 1.2 协议草案起草人 +### 1.2 协议草案起草人 - 撰写：九神、大果、元彦、戊子、林熠、屹凡、金禅 - 审阅：潕量、月飞、康为、力皓、荣彬、暁仙、度城、金禅、戊子、林熠、絮黎 -## 1.3 版本号 +### 1.3 版本号 1.0.0 -## 1.4 协议版本号规范（A） +### 1.4 协议版本号规范（A） 本协议采用语义版本号，版本号格式为 `major.minor.patch` 的形式。 @@ -32,7 +36,7 @@ - patch 是补丁号：用于发布向下兼容的协议问题修正 -## 1.5 协议中子规范 Level 定义 +### 1.5 协议中子规范 Level 定义 | 规范等级 | 实现要求 | | -------- | ---------------------------------------------------------------------------------- | @@ -40,26 +44,27 @@ | AA | 推荐规范，推荐实现；遵守此类规范有助于业务未来的扩展性和跨团队合作研发效率的提升。 | | AAA | 参考规范，根据业务场景实际诉求实现；是集团层面鼓励的技术实现引导。 | -## 1.6 名词术语 + +### 1.6 名词术语 - **物料**：能够被沉淀下来直接使用的前端能力，一般表现为业务组件、区块、模板。 - **业务组件（Business Component）**：业务领域内基于基础组件之上定义的组件，可能会包含特定业务域的交互或者是业务数据，对外仅暴露可配置的属性，且必须发布到公域（如阿里 NPM）；在同一个业务域内可以流通，但不需要确保可以跨业务域复用。 - **低代码业务组件（Low-Code Business Component）**：通过低代码编辑器搭建而来，有别于源码开发的业务组件，属于业务组件中的一种类型，遵循业务组件的定义；同时低代码业务组件还可以通过低代码编辑器继续多次编辑。 - **区块（Block）**：通过低代码搭建的方式，将一系列业务组件、布局组件进行嵌套组合而成，不对外提供可配置的属性。可通过区块容器组件的包裹，实现区块内部具备有完整的样式、事件、生命周期管理、状态管理、数据流转机制。能独立存在和运行，可通过复制 schema 实现跨页面、跨应用的快速复用，保障功能和数据的正常。 - **模板（Template）**：特定垂直业务领域内的业务组件、区块可组合为单个页面，或者是再配合路由组合为多个页面集，统称为模板。 -## 1.7 物料规范背景 +### 1.7 物料规范背景 目前集团业务融合频繁，而物料规范的不统一给业务融合带来额外的高成本，另一方面集团各个 BU 的前端物料也存在不同程度的重复建设。我们期望通过集团层面的物料通不阻碍业务融合的发展，同时通过集团层面的物料流通来提升物料丰富度，通过丰富物料的复用来提效中后台系统研发，同时也能给新业务场景提供高质量的启动物料。 -## 1.8 物料规范定义 +### 1.8 物料规范定义 - **源码物料规范**：一套面向开发者的目录规范，用于规范化约束开发过程中的代码、文档、接口规范，以方便物料在集团内的流通。 - **搭建物料规范**：一套面向开发者的 Schema 规范，用于规范化约束开发过程中的代码、文档、接口规范，以方便物料在集团内的流通。 -# 2. 物料规范 - 业务组件规范 +## 2. 物料规范 - 业务组件规范 -## 2.1 源码规范 +### 2.1 源码规范 -### 2.1.1 目录规范（A） +#### 2.1.1 目录规范（A） ``` @@ -228,7 +233,7 @@ ReactDOM.render(
``` ~~~ -### 2.1.2 API 规范（A) +#### 2.1.2 API 规范（A) API 是组件的属性解释，给开发者作为组件属性配置的参考。为了保持 API 的一致性，我们制定这个 API 命名规范。对于业界通用的，约定俗成的命名，我们遵循社区的约定。对于业界有多种规则难以确定的，我们确定其中一种，大家共同遵守。 @@ -326,7 +331,7 @@ true 表示触发规则都会关闭，false 表示触发规则不会关闭。 **xxxProps 例子**： 比如 `Search` 组件由 `Input` 和 `Button` 构成，`Button` 的属性通过 `buttonProps` 传递给内部的 `Button`。`` -### 2.1.3 入库方式 (A) +#### 2.1.3 入库方式 (A) 入库是指：发布组件，并且存储到集团物料中心，方便统一管理和流通。 @@ -346,7 +351,7 @@ $ iceworks sync ``` -### 2.1.4 国际化多语言支持规范（AA） +#### 2.1.4 国际化多语言支持规范（AA） 文件命名采取 [bcp47](https://tools.ietf.org/html/bcp47) 规范 @@ -392,7 +397,7 @@ export default { // index.jsx import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import zh_CN from './locale/zh-CN.js'; // 引入默认语言 +import zhCN from './locale/zh-CN.js'; // 引入默认语言 export default class BizHello extends Component { static componentName = 'BizHello'; @@ -401,7 +406,7 @@ export default class BizHello extends Component { }; static defaultProps = { - locale: zh_CN, + locale: zhCN, }; render() { @@ -421,14 +426,14 @@ export default class BizHello extends Component { import React, { Component } from 'react'; import PropTypes from 'prop-types'; import { ConfigProvider } from '@alifd/next'; -import zh_CN from './locale/zh-CN.js'; // 引入默认语言 +import zhCN from './locale/zh-CN.js'; // 引入默认语言 class BizHello extends Component { static propTypes = { locale: PropTypes.object, // 增加 locale，用于配置文案 }; static defaultProps = { - locale: zh_CN, + locale: zhCN, }; render() { @@ -443,7 +448,7 @@ export default ConfigProvider.config(BizHello, { }); ``` -### 2.1.5 主题切换规范（AA） +#### 2.1.5 主题切换规范（AA） 业务组件中如果有自定义的需要跟随主题色的 UI，一定要引入变量的形式，增加组件的流通性。 @@ -460,7 +465,7 @@ export default ConfigProvider.config(BizHello, { ``` -### 2.1.6 [Deprecated]支持转设计稿（AAA） +#### 2.1.6 [Deprecated]支持转设计稿（AAA） 对接 sketch 插件（FusionCool）的目的是为了让开发产出的业务组件能够直接给设计师使用，用法类似现在 Fusion Next 基础组件。 @@ -494,7 +499,7 @@ export default { api 属性标准参考 [https://fusion.design/help.html#/dev-biz](https://fusion.design/help.html#/dev-biz) -### 2.1.7 无障碍访问规范(AAA) +#### 2.1.7 无障碍访问规范(AAA) 无障碍需要符合 [WCAG 2.1 A级标准](https://www.w3.org/TR/WCAG21/)，可参考 [W3C 无障碍最佳实践](https://www.w3.org/TR/wai-aria-practices-1.1/)、[Fusion 无障碍指引 2.3.1](https://alibaba-fusion.github.io/next/part1/basics.html) 章节等。 @@ -536,9 +541,9 @@ component - 传参数 - 有些组件需要根据具体的业务，实现不同的可访问性，这里为开发者内置一些参数，想使用无障碍的时候，用户只需要根据现有的需求，选择对应的内置参数，例如设置 aria-label，以下组件需要用户传参数才支持无障碍组件如下：`NumberPicker`、`Transfer` -## 2.2 低代码规范 +### 2.2 低代码规范 -### 2.2.1 组件规范 +#### 2.2.1 组件规范 通过低代码编辑器搭建而来，有别于源码开发的业务组件，属于业务组件中的一种类型，遵循业务组件的定义；同时低代码业务组件还可以通过低代码编辑器继续多次编辑。 @@ -593,10 +598,10 @@ component } ``` -### 2.2.2 组件描述协议 +#### 2.2.2 组件描述协议 对源码组件在低代码搭建平台中使用时所具备的配置能力和交互行为进行规范化描述，让不同平台对组件接入的实现保持一致，让组件针对不同的搭建平台接入时可以使用一份统一的描述内容，让组件在不同的业务中流通成为可能。 -#### 2.2.2.1 协议结构 +##### 2.2.2.1 协议结构 单个组件描述内容为 json 结构，主要包含以下三部分内容，分别为： @@ -606,7 +611,7 @@ component 整体结构概览: [http://lowcode-engine.cn/doc?url=sde3wf](http://lowcode-engine.cn/doc?url=sde3wf) -#### 2.2.2.2 基础信息（A） +##### 2.2.2.2 基础信息（A） | 字段 | 字段描述 | 字段类型 | 允许空 | | ----------------- | --------------------- | ------------------------- | ------ | @@ -632,7 +637,7 @@ component | priority | 用于描述组件在同一 category 中的排序 | String | 否 | -#### 2.2.2.3 组件属性信息 props (A) +##### 2.2.2.3 组件属性信息 props (A) 描述组件属性信息，通常包含名称、类型、描述、默认值 4 项内容。 @@ -803,7 +808,7 @@ export default class FusionForm extends PureComponent { ``` -#### 2.2.2.4 编辑体验增强 configure +##### 2.2.2.4 编辑体验增强 configure 推荐用于优化搭建产品的编辑体验，定制编辑能力的配置信息，通过能力抽象分类，主要包含如下几个维度的配置项： @@ -817,7 +822,7 @@ export default class FusionForm extends PureComponent { | 【已废弃】experimental (AAA) | 将引擎的一些实验性特性放在这个配置里 | Object | 用户可以提前体验这些特性 | -##### 2.2.2.4.1 属性面板配置 props (A) +###### 2.2.2.4.1 属性面板配置 props (A) props 数组下对象字段描述： @@ -825,14 +830,14 @@ props 数组下对象字段描述： | 字段 | 字段描述 | 字段类型 | 备注 | | ---------- | -------------------------------------------------------------------------------------- | ----------------- | ------------------- | | type | 指定类型 | Enum | 可选值为 `'field' | 'group'` ,默认为 'field'| -| display | 指定类型 | Enum | 可选值为 `'accordion' | 'inline' | 'block' | 'plain' | 'popup' | 'entry'` ,默认为 'inline'| +| display | 指定类型 | Enum | 可选值为 `'accordion' \| 'inline' \| 'block' \| 'plain' \| 'popup' \| 'entry'` ，默认为 'inline'| | title | 分类标题 | 属性标题 | String | | | items | 分类下的属性列表 | Array\ | type = 'group' 生效 | | name | 属性名 | String | type = 'field' 生效 | | defaultValue | 默认值 | Any(视字段类型而定) | type = 'field' 生效 | | supportVariable | 是否支持配置变量 | Boolean | type = 'field' 生效 | | condition | 配置当前 prop 是否展示 | (target: SettingTarget) => boolean; | - | -| setter | 单个控件(setter)描述，搭建基础协议组件的描述对象，支持 JSExpression / JSFunction / JSSlot | `String|Object|Function` | type = 'field' 生效 | +| setter | 单个控件(setter)描述，搭建基础协议组件的描述对象，支持 JSExpression / JSFunction / JSSlot | `String\|Object\|Function` | type = 'field' 生效 | | extraProps | 其他配置属性（不做流通要求） | Object | 其他配置 | | extraProps.getValue | setter 渲染时被调用，setter 会根据该函数的返回值设置 setter 当前值 | Function | (target: SettingTarget, value: any) => any; | | extraProps.setValue | setter 内容修改时调用，开发者可在该函数内部修改节点 schema 或者进行其他操作 | Function | (target: SettingTarget, value: any) => void; | @@ -841,7 +846,7 @@ props 数组下对象字段描述： 根据属性值类型 propType，确定对应控件类型 (setter) ，详见 [https://lowcode-engine.cn/docV2/grfylu](https://lowcode-engine.cn/docV2/grfylu) -##### 2.2.2.4.2 通用扩展面板支持性配置 supports (AA) +###### 2.2.2.4.2 通用扩展面板支持性配置 supports (AA) 样式配置面板能力描述，描述是否支持行业样式编辑、是否支持类名设置等。 @@ -864,7 +869,7 @@ props 数组下对象字段描述： ``` -##### 2.2.2.4.3 组件能力配置 component +###### 2.2.2.4.3 组件能力配置 component 与组件相关的能力、约束、行为等描述，有些信息可从组件视图实例上直接获取，包含如下字段： @@ -875,10 +880,10 @@ props 数组下对象字段描述： | isModal(A) | 组件是否带浮层，浮层组件拖入设计器时会遮挡画布区域，此时应当辅助一些交互以防止阻挡 | Boolean | | descriptor(A) | 组件树描述信息 | String | | nestingRule(A) | 嵌套控制：防止错误的节点嵌套，比如 a 嵌套 a, FormField 只能在 Form 容器下，Column 只能在 Table 下等 | Object | -| nestingRule.childWhitelist | 子节点类型白名单 | `String|Function` | -| nestingRule.parentWhitelist | 父节点类型白名单 | `String|Function` | -| nestingRule.descendantBlacklist | 后裔节点类型黑名单 | `String|Function` | -| nestingRule.ancestorWhitelist | 祖父节点类型白名单 | `String|Function` | +| nestingRule.childWhitelist | 子节点类型白名单 | `String\|Function` | +| nestingRule.parentWhitelist | 父节点类型白名单 | `String\|Function` | +| nestingRule.descendantBlacklist | 后裔节点类型黑名单 | `String\|Function` | +| nestingRule.ancestorWhitelist | 祖父节点类型白名单 | `String\|Function` | | isNullNode(AAA) | 是否存在渲染的根节点 | Boolean | | isLayout(AAA) | 是否是layout布局组件 | Boolean | | rootSelector(AAA) | 组件选中框的 cssSelector | String | @@ -913,7 +918,7 @@ props 数组下对象字段描述： } ``` -##### 2.2.2.4.4 高级功能配置 advanced (AAA) +###### 2.2.2.4.4 高级功能配置 advanced (AAA) 组件在低代码引擎设计器中的事件回调和 hooks 等高级功能配置，包含如下字段： @@ -962,7 +967,7 @@ props 数组下对象字段描述： } ``` -#### 2.2.2.5 TypeScript 定义 +##### 2.2.2.5 TypeScript 定义 ```TypeScript @@ -1195,9 +1200,9 @@ export interface ComponentDescription { // 组件描述协议，通过 npm 中 } ``` -### 2.2.3 资产包协议 +#### 2.2.3 资产包协议 -#### 2.2.3.1 协议结构 +##### 2.2.3.1 协议结构 协议最顶层结构如下，包含 5 方面的描述内容： @@ -1206,7 +1211,7 @@ export interface ComponentDescription { // 组件描述协议，通过 npm 中 - components { Array } 所有组件的描述协议列表 - sort { Object } 用于描述组件面板中的 tab 和 category -#### 2.2.3.2 version（A） +##### 2.2.3.2 version（A） 定义当前协议 schema 的版本号； @@ -1214,7 +1219,7 @@ export interface ComponentDescription { // 组件描述协议，通过 npm 中 | ---------- | ------ | ---------- | -------- | ------ | | version | String | 协议版本号 | - | 1.0.0 | -#### 2.2.3.3 packages（A） +##### 2.2.3.3 packages（A） 定义低代码编辑器中加载的资源列表，包含公共库和组件(库) cdn 资源等； @@ -1224,8 +1229,8 @@ export interface ComponentDescription { // 组件描述协议，通过 npm 中 | packages[].package (A) | npm 包名 | String | 组件资源唯一标识 | | packages[].version(A) | npm 包版本号 | String | 组件资源版本号 | | packages[].library(A) | 作为全局变量引用时的名称，用来定义全局变量名 | String | 低代码引擎通过该字段获取组件实例 | -| packages[].editUrls (A) | 组件编辑态视图打包后的 CDN url 列表，包含 js 和 css | Array | 低代码引擎编辑器会加载这些 url | -| packages[].urls (AA) | 组件渲染态视图打包后的 CDN url 列表，包含 js 和 css | Array | 低代码引擎渲染模块会加载这些 url | +| packages[].editUrls (A) | 组件编辑态视图打包后的 CDN url 列表，包含 js 和 css | Array\ | 低代码引擎编辑器会加载这些 url | +| packages[].urls (AA) | 组件渲染态视图打包后的 CDN url 列表，包含 js 和 css | Array\ | 低代码引擎渲染模块会加载这些 url | 描述举例: @@ -1287,11 +1292,11 @@ export interface ComponentDescription { // 组件描述协议，通过 npm 中 } ``` -#### 2.2.3.4 components （A） +##### 2.2.3.4 components （A） 定义所有组件的描述协议列表，组件描述协议遵循本规范章节 2.2.2 的定义； -#### 2.2.3.5 sort （A） +##### 2.2.3.5 sort （A） 定义组件列表分组 @@ -1300,7 +1305,7 @@ export interface ComponentDescription { // 组件描述协议，通过 npm 中 | sort.groupList | String[] | 组件分组，用于组件面板 tab 展示 | - | ['精选组件', '原子组件'] | | sort.categoryList | String[] | 组件面板中同一个 tab 下的不同区间用 category 区分，category 的排序依照 categoryList 顺序排列 | - | ['通用', '数据展示', '表格类', '表单类'] | -#### 2.2.3.6 TypeScript 定义 +##### 2.2.3.6 TypeScript 定义 ```TypeScript export interface ComponentSort { @@ -1325,13 +1330,13 @@ export interface RemoteComponentDescription { } ``` -# 3 物料规范-区块规范 +## 3 物料规范-区块规范 -## 3.1 源码规范 +### 3.1 源码规范 英文 block, 可复用的代码片段，每个区块对应一个 npm。 -### 3.1.1 目录 (A) +#### 3.1.1 目录 (A) ```html @@ -1351,7 +1356,7 @@ block/ ``` -### 3.1.2 package.json (A) +#### 3.1.2 package.json (A) ```json @@ -1369,9 +1374,9 @@ block/ } ``` -### 3.1.3 html2sketch (3A) +#### 3.1.3 html2sketch (3A) -#### 3.1.3.1 package.json 内 blockConfig 结构 +##### 3.1.3.1 package.json 内 blockConfig 结构 ```json { @@ -1399,7 +1404,7 @@ block/ } ``` -## 3.2 低代码规范 +### 3.2 低代码规范 由业务组件、布局组件进行嵌套组合而成。不对外提供可配置的属性。可通过**区块容器组件**的包裹，实现容器内部具备有完整的样式、事件、生命周期管理、状态管理、数据流转机制。能独立存在和运行，可实现跨页面、跨应用的快速复用，保障功能和数据的正常。 @@ -1478,11 +1483,11 @@ block/ } ``` -# 4 物料规范 - 模板规范 +## 4 物料规范 - 模板规范 -## 4.1 源码规范 +### 4.1 源码规范 -### 4.1.1 目录规范（A） +#### 4.1.1 目录规范（A） 与标准源码 build-scripts 对齐 @@ -1641,9 +1646,9 @@ a { } ``` -### 4.1.2 html2sketch (AAA) +#### 4.1.2 html2sketch (AAA) -#### 4.1.2.1 package.json 内 scaffoldConfig 结构 +##### 4.1.2.1 package.json 内 scaffoldConfig 结构 ```json { @@ -1666,156 +1671,3 @@ a { } } ``` - -## 4.2 低代码规范 - -### 4.2.1 结构描述 - -- version { String } 当前应用协议版本号 -- componentsMap { Array } 当前应用所有组件映射关系 -- componentsTree { Array } 描述应用所有页面、低代码组件的组件树 -- utils { Array } 应用范围内的全局自定义函数或第三方工具类扩展 -- constants { Object } 应用范围内的全局常量 -- css { string } 应用范围内的全局样式 -- config: { Object } 当前应用配置信息 -- meta: { Object } 当前应用元数据信息 -- dataSource: { Array } 当前应用的公共数据源 -- i18n { Object } 国际化语料 - -```json -// 完整应用描述举例： -{ - "version": "1.0.0", // 当前协议版本号 - "componentsMap": [{ // 依赖 npm 组件描述 - "componentName": "Button", - "package": "@alifd/next", - "version": "1.0.0", - "destructuring": true, - "exportName": "Select", - "subName": "Button" - }], - "componentsTree": [{ // 应用内页面、低代码组件描述 - "componentName": "Page", // 单个页面 - "fileName": "page_index", - "props": {}, - "css": "body {font-size: 12px;} .table { width: 100px;}", - "meta": { // 页面元信息 - "title": "首页", // 页面标题描述 - "router": "/", // 页面路由 - "spmb": "abef21", // spm B 位 - "url": "https://fusion.design", // 页面访问地址 - "creator": "月飞", - "gmt_create": "2020-02-11 00:00:00", // 创建时间 - "gmt_modified": "2020-02-11 00:00:00", // 修改时间 - ... - }, - "children": [{ - "componentName": "Div", - "props": { - "className": "red", - }, - "children": [{ - "componentName": "Button", - "props": { - "type": "primary", - "valueBind": { // 变量绑定 - "type": "JSExpression", - "value": "this.state.user.name" - }, - "onClick": { // 动作绑定 - "type": "JSExpression", - "value": "function(e) { console.log(e.target.innerText) }", - } - }, - }] - }, { - "componentName": "Component", // 单个组件 - "fileName": "BasicLayout", // 组件名称 - "props": {}, - "css": "body {font-size: 12px;} .table { width: 100px;}", - "meta": { // 组件元信息 - "title": "导航组件", // 组件中文标题 - "description": "这是一个导航类组件...", // 组件描述 - "creator": "月飞", - "gmt_create": "2020-02-11 00:00:00", // 创建时间 - "gmt_modified": "2020-02-11 00:00:00", // 修改时间 - ... - }, - "children": [{ - "componentName": "Nav", - "props": { - "className": "red" - }, - "children": [{ - "componentName": "NavItem", - "props": {} - }] - }] - }] - }], - "utils": [{ - "name": "clone", - "type": "npm", - "content": { - "package": "lodash", - "version": "0.0.1", - "exportName": "clone", - "subName": "", - "destructuring": false, - "main": "/lib/clone" - } - }, { - "name": "beforeRequestHandler", - "type": "function", - "content": { - "type": "JSFunction", - "value": "function(){\n ... \n}" - } - }], - "constants": { - "ENV": "prod", - "DOMAIN": "xxx.com" - }, - "css": "body {font-size: 12px;} .table { width: 100px;}", - "config": { // 当前应用配置信息 - "sdkVersion": "1.0.3", // 渲染模块版本 - "historyMode": "hash", // 浏览器路由：browser 哈希路由：hash - "targetRootID": "J_Container", - "layout": { - "componentName": "BasicLayout", - "props": { - "logo": "...", - "name": "测试网站" - }, - }, - "theme": { - // for Fusion use dpl defined - "package": "@alife/theme-fusion", - "version": "^0.1.0", - // for Antd use variable - "primary": "#ff9966" - } - }, - "meta": { // 应用元数据信息, key 为业务自定义 - "name": "demo 应用", // 应用中文名称, - "git_group": "appGroup", // 应用对应 git 分组名 - "project_name": "app_demo", // 应用对应 git 的 project 名称 - "description": "这是一个测试应用", // 应用描述 - "spma": "spa23d", // 应用 spma A 位信息 - "creator": "月飞", - "gmt_create": "2020-02-11 00:00:00", // 创建时间 - "gmt_modified": "2020-02-11 00:00:00", // 修改时间 - ... - }, - "i18n": { - "zh-CN": { - "i18n-jwg27yo4": "你好", - "i18n-jwg27yo3": "中国" - }, - "en-US": { - "i18n-jwg27yo4": "Hello", - "i18n-jwg27yo3": "China" - } - } -} -``` diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js new file mode 100644 index 000000000..04c99067e --- /dev/null +++ b/docs/docusaurus.config.js @@ -0,0 +1,93 @@ +/* eslint-disable @typescript-eslint/no-require-imports */ +// Note: type annotations allow type checking and IDEs autocompletion + +const lightCodeTheme = require('prism-react-renderer/themes/github'); +const darkCodeTheme = require('prism-react-renderer/themes/dracula'); +const navbar = require('./config/navbar'); + +/** @type {import('@docusaurus/types').Config} */ +const config = { + title: 'Low-Code Engine', + tagline: 'Low-Code Engine is awesome!', + url: 'https://lowcode-engine.cn', + baseUrl: '/site/', + onBrokenLinks: 'throw', + onBrokenMarkdownLinks: 'warn', + favicon: + 'https://img.alicdn.com/imgextra/i2/O1CN01TNJDDg20pKniPOkN4_!!6000000006898-2-tps-66-78.png', + + organizationName: 'alibaba', // Usually your GitHub org/user name. + projectName: 'lowcode-engine', // Usually your repo name. + + i18n: { + defaultLocale: 'zh-Hans', + locales: ['zh-Hans'], + }, + + plugins: [ + [ + '@docusaurus/plugin-content-docs', + { + id: 'community', + path: 'community', + routeBasePath: 'community', + sidebarPath: require.resolve('./config/sidebarsCommunity.js'), + }, + ], + ], + + presets: [ + [ + 'classic', + /** @type {import('@docusaurus/preset-classic').Options} */ + ({ + docs: { + sidebarPath: require.resolve('./config/sidebars.js'), + // lastVersion: 'current', + editUrl: + 'https://github.com/alibaba/lowcode-engine/tree/develop/docs/', + }, + theme: { + customCss: require.resolve('./src/css/custom.css'), + }, + }), + ], + ], + + themeConfig: + /** @type {import('@docusaurus/preset-classic').ThemeConfig} */ + ({ + docs: { + sidebar: { + hideable: true, + }, + }, + navbar, + footer: { + // style: 'dark', + copyright: `Copyright © ${new Date().getFullYear()} 阿里巴巴集团, Inc. Built with Docusaurus.`, + }, + // 主题切换 + prism: { + theme: lightCodeTheme, + darkTheme: darkCodeTheme, + }, + // 语雀文档导出的图片，会进行 referrer 校验，这里设置关闭，不然加载不了语雀的图片 + metadata: [{ name: 'referrer', content: 'no-referrer' }], + }), + + themes: [ + [ + require.resolve('@easyops-cn/docusaurus-search-local'), + { + hashed: true, + // For Docs using Chinese, The `language` is recommended to set to: + // ``` + language: ['en', 'zh'], + // ``` + }, + ], + ], +}; + +module.exports = config; diff --git a/docs/package.json b/docs/package.json new file mode 100644 index 000000000..93b2c4319 --- /dev/null +++ b/docs/package.json @@ -0,0 +1,62 @@ +{ + "name": "@alilc/lowcode-engine-docs", + "version": "1.0.1", + "description": "低代码引擎版本化文档", + "license": "MIT", + "files": [ + "build" + ], + "scripts": { + "docusaurus": "docusaurus", + "start": "docusaurus start --host 0.0.0.0", + "build": "docusaurus build", + "swizzle": "docusaurus swizzle", + "deploy": "docusaurus deploy", + "clear": "docusaurus clear", + "serve": "docusaurus serve", + "write-translations": "docusaurus write-translations", + "write-heading-ids": "docusaurus write-heading-ids", + "typecheck": "tsc" + }, + "dependencies": { + "@docusaurus/core": "^2.2.0", + "@docusaurus/preset-classic": "^2.2.0", + "@easyops-cn/docusaurus-search-local": "^0.32.0", + "@mdx-js/react": "^1.6.22", + "axios": "^1.1.3", + "clsx": "^1.2.1", + "fs-extra": "^10.1.0", + "prism-react-renderer": "^1.3.5", + "react": "^17.0.2", + "react-dom": "^17.0.2" + }, + "devDependencies": { + "@docusaurus/module-type-aliases": "^2.2.0", + "@tsconfig/docusaurus": "^1.0.5", + "typescript": "^4.7.4" + }, + "browserslist": { + "production": [ + ">0.5%", + "not dead", + "not op_mini all" + ], + "development": [ + "last 1 chrome version", + "last 1 firefox version", + "last 1 safari version" + ] + }, + "engines": { + "node": ">=16.14" + }, + "publishConfig": { + "access": "public", + "registry": "https://registry.npmjs.org/" + }, + "repository": { + "type": "http", + "url": "https://github.com/alibaba/lowcode-engine/tree/main" + }, + "gitHead": "2669f179e6f899d395ce1942d0fe04f9c5ed48a6" +} diff --git a/docs/scripts/getDocsFromDir.js b/docs/scripts/getDocsFromDir.js new file mode 100644 index 000000000..1d3236fe6 --- /dev/null +++ b/docs/scripts/getDocsFromDir.js @@ -0,0 +1,60 @@ +const fs = require('fs'); +const path = require('path'); +const glob = require('glob'); +const matter = require('gray-matter'); + +module.exports = function getDocsFromDir(dir, cateList) { + // docs/ + const baseDir = path.join(__dirname, '../docs/'); + const docsDir = path.join(baseDir, dir); + + function getMarkdownOrder(filepath) { + return (matter(fs.readFileSync(filepath, 'utf-8')).data || {}).order || 100; + } + + const docs = glob.sync('*.md?(x)', { + cwd: docsDir, + // ignore: 'README.md', + }); + + const result = docs + .filter(doc => !/^index.md(x)?$/.test(doc)) + .map(doc => { + return path.join(docsDir, doc); + }) + .sort((a, b) => { + const orderA = getMarkdownOrder(a); + const orderB = getMarkdownOrder(b); + + return orderA - orderB; + }) + .map(filepath => { + // /Users/xxx/site/docs/guide/basic/router.md => guide/basic/router + const id = path + .relative(baseDir, filepath) + .replace(/\\/g, '/') + .replace(/\.mdx?/, ''); + return id; + }); + + (cateList || []).forEach(item => { + const { dir, subCategory, ...otherConfig } = item; + const indexList = glob.sync('index.md?(x)', { + cwd: path.join(baseDir, dir), + }); + if (indexList.length > 0) { + otherConfig.link = { + type: 'doc', + id: `${dir}/index`, + }; + } + result.push({ + type: 'category', + collapsed: false, + ...otherConfig, + items: getDocsFromDir(dir, subCategory), + }); + }); + + return result; +}; diff --git a/docs/src/css/custom.css b/docs/src/css/custom.css new file mode 100644 index 000000000..9b929baae --- /dev/null +++ b/docs/src/css/custom.css @@ -0,0 +1,103 @@ + +/** + * Any CSS included here will be global. The classic template + * bundles Infima by default. Infima is a CSS framework designed to + * work well for content-centric websites. + */ + +/* You can override the default Infima variables here. */ +:root { + --ifm-font-size-base: 14px; + --ifm-color-primary: #0089ff; + --ifm-color-primary-dark: #007be6; + --ifm-color-primary-darker: #0074d9; + --ifm-color-primary-darkest: #0060b3; + --ifm-color-primary-light: #1a95ff; + --ifm-color-primary-lighter: #269bff; + --ifm-color-primary-lightest: #4dacff; + --ifm-code-font-size: 95%; + --ifm-container-width-xl: 2000px; + --aa-search-input-height: 32px; + --ifm-font-family-base: -apple-system, Segoe UI, Roboto, Ubuntu, Cantarell, Noto Sans, sans-serif, BlinkMacSystemFont, + 'Segoe UI', Helvetica, Arial, sans-serif, 'Apple Color Emoji'; + --ifm-font-family-monospace: Menlo, Monaco, Consolas, "Courier New", monospace; + --ifm-global-spacing: 1.5rem; + --ifm-line-height-base: 1.85; + /* --ifm-font-color-base: #333; */ +} + +.header-github-link::before { + content: ''; + width: 24px; + height: 24px; + display: flex; + background: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12'/%3E%3C/svg%3E") + no-repeat; +} + +[data-theme='dark'] .header-github-link::before { + background: url("data:image/svg+xml,%3Csvg viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath fill='white' d='M12 .297c-6.63 0-12 5.373-12 12 0 5.303 3.438 9.8 8.205 11.385.6.113.82-.258.82-.577 0-.285-.01-1.04-.015-2.04-3.338.724-4.042-1.61-4.042-1.61C4.422 18.07 3.633 17.7 3.633 17.7c-1.087-.744.084-.729.084-.729 1.205.084 1.838 1.236 1.838 1.236 1.07 1.835 2.809 1.305 3.495.998.108-.776.417-1.305.76-1.605-2.665-.3-5.466-1.332-5.466-5.93 0-1.31.465-2.38 1.235-3.22-.135-.303-.54-1.523.105-3.176 0 0 1.005-.322 3.3 1.23.96-.267 1.98-.399 3-.405 1.02.006 2.04.138 3 .405 2.28-1.552 3.285-1.23 3.285-1.23.645 1.653.24 2.873.12 3.176.765.84 1.23 1.91 1.23 3.22 0 4.61-2.805 5.625-5.475 5.92.42.36.81 1.096.81 2.22 0 1.606-.015 2.896-.015 3.286 0 .315.21.69.825.57C20.565 22.092 24 17.592 24 12.297c0-6.627-5.373-12-12-12'/%3E%3C/svg%3E") + no-repeat; +} + +.docusaurus-highlight-code-line { + background-color: rgba(0, 0, 0, 0.1); + display: block; + margin: 0 calc(-1 * var(--ifm-pre-padding)); + padding: 0 var(--ifm-pre-padding); +} + +html[data-theme='dark'] .docusaurus-highlight-code-line { + background-color: rgba(0, 0, 0, 0.3); +} + +.navbar__logo, +.navbar__search { + margin-right: 2rem; +} + +.hero { + padding: 5rem 0 !important; + box-shadow: var(--ifm-navbar-shadow); +} + +.homepage-content { + max-width: 1400px; + margin: 0 auto; +} + +.heroBanner { + padding: 4rem 0; + text-align: center; + position: relative; + overflow: hidden; +} + +.hero__title{ + font-size: 2.4rem; + background: -webkit-linear-gradient(315deg,#0089ff 25%,#30e724); + background-clip: text; + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + display: inline-block; +} + +.pagination-nav__link { + padding: 0.5rem 1.5rem; +} + +.markdown h1:first-child { + --ifm-h1-font-size: 2rem; +} + +.markdown > h2{ + --ifm-h2-font-size: 1.5rem; +} + +.markdown > h3{ + --ifm-h3-font-size: 1.25rem; +} + +.markdown img { + box-shadow: 9px 8px 10px 0px rgb(0 0 0 / 15%); +} diff --git a/docs/src/pages/index-old.tsx b/docs/src/pages/index-old.tsx new file mode 100644 index 000000000..13be38e6e --- /dev/null +++ b/docs/src/pages/index-old.tsx @@ -0,0 +1,40 @@ +import React from 'react'; +import clsx from 'clsx'; +import Link from '@docusaurus/Link'; +import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; +import Layout from '@theme/Layout'; + +import styles from './index.module.css'; + +function HomepageHeader() { + const { siteConfig } = useDocusaurusContext(); + return ( +
+
+

{siteConfig.title}

+

欢迎光临 低代码引擎文档站

+

{siteConfig.tagline}

+
+ + 快速开始 + +
+
+
+ ); +} + +export default function Home(): JSX.Element { + const { siteConfig } = useDocusaurusContext(); + return ( + + + + ); +} diff --git a/docs/src/pages/index.module.css b/docs/src/pages/index.module.css new file mode 100644 index 000000000..ac3d44996 --- /dev/null +++ b/docs/src/pages/index.module.css @@ -0,0 +1,29 @@ +/** + * CSS files with the .module.css suffix will be treated as CSS modules + * and scoped locally. + */ + +.heroBanner { + padding: 4rem 0; + text-align: center; + position: relative; + overflow: hidden; + height: 60rem; +} + +.heroTitle { + color: #30e724; + font-size: 3rem; +} + +@media screen and (max-width: 996px) { + .heroBanner { + padding: 2rem; + } +} + +.buttons { + display: flex; + align-items: center; + justify-content: center; +} \ No newline at end of file diff --git a/docs/src/pages/index.tsx b/docs/src/pages/index.tsx new file mode 100644 index 000000000..cdf826a64 --- /dev/null +++ b/docs/src/pages/index.tsx @@ -0,0 +1,16 @@ +import React from 'react'; +import BrowserOnly from '@docusaurus/BrowserOnly'; + +export default function ToIndex(): JSX.Element { + return ( + + {() => { + /** + * 跳转到首页 + */ + window.location.href = '/index'; + return <>; + }} + + ); +} diff --git a/docs/src/pages/markdown-page.md b/docs/src/pages/markdown-page.md new file mode 100644 index 000000000..7d2421c8a --- /dev/null +++ b/docs/src/pages/markdown-page.md @@ -0,0 +1,15 @@ + + +# 文档能力介绍 + +这是一个使用 Markdown 编写的任意页面，访问地址为 /markdown-page + +Product Docs Capability Introduction. + +## 功能 + +- ✅ 支持本地离线搜搜 +- ✅ 版本化文档管理 +- ✅ 离线静态部署 diff --git a/docs/static/img/docusaurus.png b/docs/static/img/docusaurus.png new file mode 100644 index 000000000..f458149e3 Binary files /dev/null and b/docs/static/img/docusaurus.png differ diff --git a/docs/static/img/logo.svg b/docs/static/img/logo.svg new file mode 100644 index 000000000..9db6d0d06 --- /dev/null +++ b/docs/static/img/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/docs/static/img/undraw_docusaurus_mountain.svg b/docs/static/img/undraw_docusaurus_mountain.svg new file mode 100644 index 000000000..af961c49a --- /dev/null +++ b/docs/static/img/undraw_docusaurus_mountain.svg @@ -0,0 +1,171 @@ + + Easy to Use + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/static/img/undraw_docusaurus_react.svg b/docs/static/img/undraw_docusaurus_react.svg new file mode 100644 index 000000000..94b5cf08f --- /dev/null +++ b/docs/static/img/undraw_docusaurus_react.svg @@ -0,0 +1,170 @@ + + Powered by React + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/static/img/undraw_docusaurus_tree.svg b/docs/static/img/undraw_docusaurus_tree.svg new file mode 100644 index 000000000..d9161d339 --- /dev/null +++ b/docs/static/img/undraw_docusaurus_tree.svg @@ -0,0 +1,40 @@ + + Focus on What Matters + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docs/tsconfig.json b/docs/tsconfig.json new file mode 100644 index 000000000..6f4756980 --- /dev/null +++ b/docs/tsconfig.json @@ -0,0 +1,7 @@ +{ + // This file is not used in compilation. It is here just for a nice editor experience. + "extends": "@tsconfig/docusaurus/tsconfig.json", + "compilerOptions": { + "baseUrl": "." + } +} diff --git a/lerna.json b/lerna.json index aff0e850f..506c77a04 100644 --- a/lerna.json +++ b/lerna.json @@ -1,6 +1,6 @@ { "lerna": "4.0.0", - "version": "1.0.16", + "version": "1.0.17", "npmClient": "yarn", "useWorkspaces": true, "packages": [ diff --git a/modules/code-generator/.gitignore b/modules/code-generator/.gitignore index ec49a4955..bf10c9f82 100644 --- a/modules/code-generator/.gitignore +++ b/modules/code-generator/.gitignore @@ -115,3 +115,8 @@ codealike.json # backup files *.bak +# tests +tests/fixtures/**/actual + + + diff --git a/modules/code-generator/.versionrc b/modules/code-generator/.versionrc new file mode 100644 index 000000000..a41c11e26 --- /dev/null +++ b/modules/code-generator/.versionrc @@ -0,0 +1,3 @@ +{ + "releaseCommitMessageFormat": "chore(release): code-generator - {{currentTag}}" +} \ No newline at end of file diff --git a/modules/code-generator/CHANGELOG.md b/modules/code-generator/CHANGELOG.md index 2cccdfe79..62527d022 100644 --- a/modules/code-generator/CHANGELOG.md +++ b/modules/code-generator/CHANGELOG.md @@ -2,12 +2,22 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +### [1.0.7-beta.2](https://github.com/alibaba/lowcode-engine/compare/@alilc/lowcode-code-generator@1.0.3...@alilc/lowcode-code-generator@1.0.7-beta.2) (2022-11-24) + +### Bug Fixes + +* 🐛 解决 react 中 jsx 出码的时候对于循环数据漏包 __$evalArray 的问题 ([3b9b177](https://github.com/alibaba/lowcode-engine/commit/3b9b177b052169cd0c1078cf8b488f04cb374dac)) +* 🐛 解决出码缺乏对于 i18n 数据的 params 的处理的问题 ([2cf788c](https://github.com/alibaba/lowcode-engine/commit/2cf788c1716ae63fef20004348c59a5a65c6b3d2)), closes [#288](https://github.com/alibaba/lowcode-engine/issues/288) +* 🐛 解决小程序环境没有 window, 而 rax 出码中却默认在 __$eval 中用到 window 的问题 ([ce531ae](https://github.com/alibaba/lowcode-engine/commit/ce531aeb457711fac92d828b431cfc3d643b3682)) +* add support for jsx expression ([453e069](https://github.com/alibaba/lowcode-engine/commit/453e0699ece06d98e59227e23248baf1de4082aa)) +* 修复生成的 icejs 项目不支持 constants 的问题, fixes [#1259](https://github.com/alibaba/lowcode-engine/issues/1259) ([a079fbc](https://github.com/alibaba/lowcode-engine/commit/a079fbc256f8275e8a69eb6d8abb6f6b08179578)) +* 修正 react 框架出码中在严格模式对 methods 和 context 的处理 ([b1a6100](https://github.com/alibaba/lowcode-engine/commit/b1a61006bba4292790899c7c49c9c611a9384472)) ### [1.0.7-beta.1](https://github.com/alibaba/lowcode-engine/compare/@alilc/lowcode-code-generator@1.0.7-beta.0...@alilc/lowcode-code-generator@1.0.7-beta.1) (2022-10-26) ### Bug Fixes -* fix empty string lost when generate variable ([2cf74cd](https://github.com/alibaba/lowcode-engine/commit/2cf74cd04b4f48a3501d37329d39784f6964366a)) +* fix empty string lost when generate variable ([2cf74cd](https://github.com/alibaba/lowcode-engine/commit/2cf74cd04b4f48a3501d37329d39784f6964366a)) ### [1.0.7-beta.0](https://github.com/alibaba/lowcode-engine/compare/@alilc/lowcode-code-generator@1.0.6-beta.0...@alilc/lowcode-code-generator@1.0.7-beta.0) (2022-10-25) diff --git a/modules/code-generator/package.json b/modules/code-generator/package.json index f1ca3df06..3e7898e39 100644 --- a/modules/code-generator/package.json +++ b/modules/code-generator/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-code-generator", - "version": "1.0.7-beta.1", + "version": "1.0.7-beta.3", "description": "出码引擎 for LowCode Engine", "license": "MIT", "main": "lib/index.js", @@ -47,6 +47,11 @@ "prepublishOnly": "npm run build", "demo": "node bin/lowcode-code-generator.js -i example-schema.json -o demo -s icejs" }, + "standard-version": { + "skip": { + "changelog": true + } + }, "husky": { "hooks": { "pre-commit": "lint-staged", diff --git a/modules/code-generator/src/plugins/common/esmodule.ts b/modules/code-generator/src/plugins/common/esmodule.ts index ee28083d1..04dfd1ce2 100644 --- a/modules/code-generator/src/plugins/common/esmodule.ts +++ b/modules/code-generator/src/plugins/common/esmodule.ts @@ -16,7 +16,7 @@ import { IWithDependency, } from '../../types'; -import { isValidIdentifier } from '../../utils/validate'; +import { isValidIdentifier, isValidComponentName } from '../../utils/validate'; // TODO: main 这个信息到底怎么用，是不是外部包不需要使用？ const DEP_MAIN_BLOCKLIST = ['lib', 'lib/index', 'es', 'es/index', 'main']; @@ -261,7 +261,7 @@ function buildPackageImport( if (!isValidIdentifier(name)) { throw new CodeGeneratorError(`Invalid Identifier [${name}]`); } - if (info.nodeIdentifier && !isValidIdentifier(info.nodeIdentifier)) { + if (info.nodeIdentifier && !isValidComponentName(info.nodeIdentifier)) { throw new CodeGeneratorError(`Invalid Identifier [${info.nodeIdentifier}]`); } }); diff --git a/modules/code-generator/src/plugins/component/react/containerInjectConstants.ts b/modules/code-generator/src/plugins/component/react/containerInjectConstants.ts new file mode 100644 index 000000000..92cd4a392 --- /dev/null +++ b/modules/code-generator/src/plugins/component/react/containerInjectConstants.ts @@ -0,0 +1,55 @@ +import { + CLASS_DEFINE_CHUNK_NAME, + COMMON_CHUNK_NAME, + DEFAULT_LINK_AFTER, +} from '../../../const/generator'; + +import { + BuilderComponentPlugin, + BuilderComponentPluginFactory, + ChunkType, + FileType, + ICodeStruct, +} from '../../../types'; + +export interface PluginConfig { + fileType: string; +} + +const pluginFactory: BuilderComponentPluginFactory = (config?) => { + const cfg: PluginConfig = { + fileType: FileType.JSX, + ...config, + }; + + const plugin: BuilderComponentPlugin = async (pre: ICodeStruct) => { + const next: ICodeStruct = { + ...pre, + }; + + next.chunks.push({ + type: ChunkType.STRING, + fileType: cfg.fileType, + name: COMMON_CHUNK_NAME.InternalDepsImport, + content: "import __$$constants from '../../constants';", + linkAfter: [COMMON_CHUNK_NAME.ExternalDepsImport], + }); + + next.chunks.push({ + type: ChunkType.STRING, + fileType: cfg.fileType, + name: CLASS_DEFINE_CHUNK_NAME.InsVar, + content: ` + get constants() { + return __$$constants || {}; + } + `, + linkAfter: [...DEFAULT_LINK_AFTER[CLASS_DEFINE_CHUNK_NAME.InsVar]], + }); + + return next; + }; + return plugin; +}; + +export default pluginFactory; diff --git a/modules/code-generator/src/plugins/project/i18n.ts b/modules/code-generator/src/plugins/project/i18n.ts index 7658f9c85..ae568f972 100644 --- a/modules/code-generator/src/plugins/project/i18n.ts +++ b/modules/code-generator/src/plugins/project/i18n.ts @@ -34,13 +34,13 @@ const pluginFactory: BuilderComponentPluginFactory = () => { }; const isEmptyVariables = variables => ( - Array.isArray(variables) && variables.length === 0 + Array.isArray(variables) && variables.length === 0 || typeof variables === 'object' && (!variables || Object.keys(variables).length === 0) ); // 按低代码规范里面的要求进行变量替换 const format = (msg, variables) => ( - typeof msg === 'string' + typeof msg === 'string' ? msg.replace(/\\\$\\{(\\w+)\\}/g, (match, key) => variables?.[key] ?? '') : msg ); @@ -69,7 +69,7 @@ const pluginFactory: BuilderComponentPluginFactory = () => { }; target._i18nText = (t) => { // 优先取直接传过来的语料 - const localMsg = t[locale] ?? t[String(locale).replace('-', '_')] + const localMsg = t[locale] ?? t[String(locale).replace('-', '_')] if (localMsg != null) { return format(localMsg, t.params); } @@ -81,7 +81,7 @@ const pluginFactory: BuilderComponentPluginFactory = () => { } // 兜底用 use 指定的或默认语言的 - return format(t[t.use || "zh_CN"] ?? t.en_US, t.params); + return format(t[t.use || "zh-CN"] ?? t.en_US, t.params); } // 注入到上下文中去 diff --git a/modules/code-generator/src/solutions/icejs.ts b/modules/code-generator/src/solutions/icejs.ts index 0a9d5c60d..85ce7c1f5 100644 --- a/modules/code-generator/src/solutions/icejs.ts +++ b/modules/code-generator/src/solutions/icejs.ts @@ -8,6 +8,7 @@ import containerInitState from '../plugins/component/react/containerInitState'; import containerInjectContext from '../plugins/component/react/containerInjectContext'; import containerInjectUtils from '../plugins/component/react/containerInjectUtils'; import containerInjectDataSourceEngine from '../plugins/component/react/containerInjectDataSourceEngine'; +import containerInjectConstants from '../plugins/component/react/containerInjectConstants'; import containerInjectI18n from '../plugins/component/react/containerInjectI18n'; import containerLifeCycle from '../plugins/component/react/containerLifeCycle'; import containerMethod from '../plugins/component/react/containerMethod'; @@ -22,7 +23,7 @@ import icejs from '../plugins/project/framework/icejs'; import { prettier } from '../postprocessor'; -export interface IceJsProjectBuilderOptions extends IProjectBuilderOptions {} +export type IceJsProjectBuilderOptions = IProjectBuilderOptions; export default function createIceJsProjectBuilder( options?: IceJsProjectBuilderOptions, @@ -65,6 +66,7 @@ export default function createIceJsProjectBuilder( containerInjectUtils(), containerInjectDataSourceEngine(), containerInjectI18n(), + containerInjectConstants(), containerInitState(), containerLifeCycle(), containerMethod(), diff --git a/modules/code-generator/src/utils/validate.ts b/modules/code-generator/src/utils/validate.ts index 4ee0d5b2a..8d6f9c0d1 100644 --- a/modules/code-generator/src/utils/validate.ts +++ b/modules/code-generator/src/utils/validate.ts @@ -2,6 +2,10 @@ export const isValidIdentifier = (name: string) => { return /^[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF]*$/.test(name); }; +export const isValidComponentName = (name: string) => { + return /^[_$a-zA-Z\xA0-\uFFFF][_$a-zA-Z0-9\xA0-\uFFFF.]*$/.test(name); +}; + export const ensureValidClassName = (name: string) => { if (!isValidIdentifier(name)) { return `$${name.replace(/[^_$a-zA-Z0-9]/g, '')}`; diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/i18n.js b/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/i18n.js deleted file mode 100644 index acf6cd388..000000000 --- a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/i18n.js +++ /dev/null @@ -1,75 +0,0 @@ -const i18nConfig = { - 'zh-CN': { - 'hello-world': '你好，世界！', - }, - 'en-US': { - 'hello-world': 'Hello world!', - }, -}; - -let locale = typeof navigator === 'object' && typeof navigator.language === 'string' ? navigator.language : 'zh-CN'; - -const getLocale = () => locale; - -const setLocale = (target) => { - locale = target; -}; - -const isEmptyVariables = (variables) => - (Array.isArray(variables) && variables.length === 0) || - (typeof variables === 'object' && (!variables || Object.keys(variables).length === 0)); - -// 按低代码规范里面的要求进行变量替换 -const format = (msg, variables) => - typeof msg === 'string' ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? '') : msg; - -const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { - const msg = i18nConfig[locale]?.[id] ?? i18nConfig[locale.replace('-', '_')]?.[id] ?? defaultMessage; - if (msg == null) { - console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale); - return fallback === undefined ? `${id}` : fallback; - } - - return format(msg, variables); -}; - -const i18n = (id, params) => { - return i18nFormat({ id }, params); -}; - -// 将国际化的一些方法注入到目标对象&上下文中 -const _inject2 = (target) => { - target.i18n = i18n; - target.getLocale = getLocale; - target.setLocale = (locale) => { - setLocale(locale); - target.forceUpdate(); - }; - target._i18nText = (t) => { - // 优先取直接传过来的语料 - const localMsg = t[locale] ?? t[String(locale).replace('-', '_')]; - if (localMsg != null) { - return format(localMsg, t.params); - } - - // 其次用项目级别的 - const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); - if (projectMsg != null) { - return projectMsg; - } - - // 兜底用 use 指定的或默认语言的 - return format(t[t.use || 'zh_CN'] ?? t.en_US, t.params); - }; - - // 注入到上下文中去 - if (target._context && target._context !== target) { - Object.assign(target._context, { - i18n, - getLocale, - setLocale: target.setLocale, - }); - } -}; - -export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/i18n.js b/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/i18n.js deleted file mode 100644 index acf6cd388..000000000 --- a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/i18n.js +++ /dev/null @@ -1,75 +0,0 @@ -const i18nConfig = { - 'zh-CN': { - 'hello-world': '你好，世界！', - }, - 'en-US': { - 'hello-world': 'Hello world!', - }, -}; - -let locale = typeof navigator === 'object' && typeof navigator.language === 'string' ? navigator.language : 'zh-CN'; - -const getLocale = () => locale; - -const setLocale = (target) => { - locale = target; -}; - -const isEmptyVariables = (variables) => - (Array.isArray(variables) && variables.length === 0) || - (typeof variables === 'object' && (!variables || Object.keys(variables).length === 0)); - -// 按低代码规范里面的要求进行变量替换 -const format = (msg, variables) => - typeof msg === 'string' ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? '') : msg; - -const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { - const msg = i18nConfig[locale]?.[id] ?? i18nConfig[locale.replace('-', '_')]?.[id] ?? defaultMessage; - if (msg == null) { - console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale); - return fallback === undefined ? `${id}` : fallback; - } - - return format(msg, variables); -}; - -const i18n = (id, params) => { - return i18nFormat({ id }, params); -}; - -// 将国际化的一些方法注入到目标对象&上下文中 -const _inject2 = (target) => { - target.i18n = i18n; - target.getLocale = getLocale; - target.setLocale = (locale) => { - setLocale(locale); - target.forceUpdate(); - }; - target._i18nText = (t) => { - // 优先取直接传过来的语料 - const localMsg = t[locale] ?? t[String(locale).replace('-', '_')]; - if (localMsg != null) { - return format(localMsg, t.params); - } - - // 其次用项目级别的 - const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); - if (projectMsg != null) { - return projectMsg; - } - - // 兜底用 use 指定的或默认语言的 - return format(t[t.use || 'zh_CN'] ?? t.en_US, t.params); - }; - - // 注入到上下文中去 - if (target._context && target._context !== target) { - Object.assign(target._context, { - i18n, - getLocale, - setLocale: target.setLocale, - }); - } -}; - -export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/i18n.js b/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/i18n.js deleted file mode 100644 index 2c28c064e..000000000 --- a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/i18n.js +++ /dev/null @@ -1,68 +0,0 @@ -const i18nConfig = {}; - -let locale = typeof navigator === 'object' && typeof navigator.language === 'string' ? navigator.language : 'zh-CN'; - -const getLocale = () => locale; - -const setLocale = (target) => { - locale = target; -}; - -const isEmptyVariables = (variables) => - (Array.isArray(variables) && variables.length === 0) || - (typeof variables === 'object' && (!variables || Object.keys(variables).length === 0)); - -// 按低代码规范里面的要求进行变量替换 -const format = (msg, variables) => - typeof msg === 'string' ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? '') : msg; - -const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { - const msg = i18nConfig[locale]?.[id] ?? i18nConfig[locale.replace('-', '_')]?.[id] ?? defaultMessage; - if (msg == null) { - console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale); - return fallback === undefined ? `${id}` : fallback; - } - - return format(msg, variables); -}; - -const i18n = (id, params) => { - return i18nFormat({ id }, params); -}; - -// 将国际化的一些方法注入到目标对象&上下文中 -const _inject2 = (target) => { - target.i18n = i18n; - target.getLocale = getLocale; - target.setLocale = (locale) => { - setLocale(locale); - target.forceUpdate(); - }; - target._i18nText = (t) => { - // 优先取直接传过来的语料 - const localMsg = t[locale] ?? t[String(locale).replace('-', '_')]; - if (localMsg != null) { - return format(localMsg, t.params); - } - - // 其次用项目级别的 - const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); - if (projectMsg != null) { - return projectMsg; - } - - // 兜底用 use 指定的或默认语言的 - return format(t[t.use || 'zh_CN'] ?? t.en_US, t.params); - }; - - // 注入到上下文中去 - if (target._context && target._context !== target) { - Object.assign(target._context, { - i18n, - getLocale, - setLocale: target.setLocale, - }); - } -}; - -export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/i18n.js b/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/i18n.js deleted file mode 100644 index acf6cd388..000000000 --- a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/i18n.js +++ /dev/null @@ -1,75 +0,0 @@ -const i18nConfig = { - 'zh-CN': { - 'hello-world': '你好，世界！', - }, - 'en-US': { - 'hello-world': 'Hello world!', - }, -}; - -let locale = typeof navigator === 'object' && typeof navigator.language === 'string' ? navigator.language : 'zh-CN'; - -const getLocale = () => locale; - -const setLocale = (target) => { - locale = target; -}; - -const isEmptyVariables = (variables) => - (Array.isArray(variables) && variables.length === 0) || - (typeof variables === 'object' && (!variables || Object.keys(variables).length === 0)); - -// 按低代码规范里面的要求进行变量替换 -const format = (msg, variables) => - typeof msg === 'string' ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? '') : msg; - -const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { - const msg = i18nConfig[locale]?.[id] ?? i18nConfig[locale.replace('-', '_')]?.[id] ?? defaultMessage; - if (msg == null) { - console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale); - return fallback === undefined ? `${id}` : fallback; - } - - return format(msg, variables); -}; - -const i18n = (id, params) => { - return i18nFormat({ id }, params); -}; - -// 将国际化的一些方法注入到目标对象&上下文中 -const _inject2 = (target) => { - target.i18n = i18n; - target.getLocale = getLocale; - target.setLocale = (locale) => { - setLocale(locale); - target.forceUpdate(); - }; - target._i18nText = (t) => { - // 优先取直接传过来的语料 - const localMsg = t[locale] ?? t[String(locale).replace('-', '_')]; - if (localMsg != null) { - return format(localMsg, t.params); - } - - // 其次用项目级别的 - const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); - if (projectMsg != null) { - return projectMsg; - } - - // 兜底用 use 指定的或默认语言的 - return format(t[t.use || 'zh_CN'] ?? t.en_US, t.params); - }; - - // 注入到上下文中去 - if (target._context && target._context !== target) { - Object.assign(target._context, { - i18n, - getLocale, - setLocale: target.setLocale, - }); - } -}; - -export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/i18n.js b/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/i18n.js deleted file mode 100644 index 2c28c064e..000000000 --- a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/i18n.js +++ /dev/null @@ -1,68 +0,0 @@ -const i18nConfig = {}; - -let locale = typeof navigator === 'object' && typeof navigator.language === 'string' ? navigator.language : 'zh-CN'; - -const getLocale = () => locale; - -const setLocale = (target) => { - locale = target; -}; - -const isEmptyVariables = (variables) => - (Array.isArray(variables) && variables.length === 0) || - (typeof variables === 'object' && (!variables || Object.keys(variables).length === 0)); - -// 按低代码规范里面的要求进行变量替换 -const format = (msg, variables) => - typeof msg === 'string' ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? '') : msg; - -const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { - const msg = i18nConfig[locale]?.[id] ?? i18nConfig[locale.replace('-', '_')]?.[id] ?? defaultMessage; - if (msg == null) { - console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale); - return fallback === undefined ? `${id}` : fallback; - } - - return format(msg, variables); -}; - -const i18n = (id, params) => { - return i18nFormat({ id }, params); -}; - -// 将国际化的一些方法注入到目标对象&上下文中 -const _inject2 = (target) => { - target.i18n = i18n; - target.getLocale = getLocale; - target.setLocale = (locale) => { - setLocale(locale); - target.forceUpdate(); - }; - target._i18nText = (t) => { - // 优先取直接传过来的语料 - const localMsg = t[locale] ?? t[String(locale).replace('-', '_')]; - if (localMsg != null) { - return format(localMsg, t.params); - } - - // 其次用项目级别的 - const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); - if (projectMsg != null) { - return projectMsg; - } - - // 兜底用 use 指定的或默认语言的 - return format(t[t.use || 'zh_CN'] ?? t.en_US, t.params); - }; - - // 注入到上下文中去 - if (target._context && target._context !== target) { - Object.assign(target._context, { - i18n, - getLocale, - setLocale: target.setLocale, - }); - } -}; - -export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/i18n.js b/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/i18n.js deleted file mode 100644 index 60e05915d..000000000 --- a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/i18n.js +++ /dev/null @@ -1,77 +0,0 @@ -const i18nConfig = {}; - -let locale = - typeof navigator === "object" && typeof navigator.language === "string" - ? navigator.language - : "zh-CN"; - -const getLocale = () => locale; - -const setLocale = (target) => { - locale = target; -}; - -const isEmptyVariables = (variables) => - (Array.isArray(variables) && variables.length === 0) || - (typeof variables === "object" && - (!variables || Object.keys(variables).length === 0)); - -// 按低代码规范里面的要求进行变量替换 -const format = (msg, variables) => - typeof msg === "string" - ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? "") - : msg; - -const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { - const msg = - i18nConfig[locale]?.[id] ?? - i18nConfig[locale.replace("-", "_")]?.[id] ?? - defaultMessage; - if (msg == null) { - console.warn("[i18n]: unknown message id: %o (locale=%o)", id, locale); - return fallback === undefined ? `${id}` : fallback; - } - - return format(msg, variables); -}; - -const i18n = (id, params) => { - return i18nFormat({ id }, params); -}; - -// 将国际化的一些方法注入到目标对象&上下文中 -const _inject2 = (target) => { - target.i18n = i18n; - target.getLocale = getLocale; - target.setLocale = (locale) => { - setLocale(locale); - target.forceUpdate(); - }; - target._i18nText = (t) => { - // 优先取直接传过来的语料 - const localMsg = t[locale] ?? t[String(locale).replace("-", "_")]; - if (localMsg != null) { - return format(localMsg, t.params); - } - - // 其次用项目级别的 - const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); - if (projectMsg != null) { - return projectMsg; - } - - // 兜底用 use 指定的或默认语言的 - return format(t[t.use || "zh_CN"] ?? t.en_US, t.params); - }; - - // 注入到上下文中去 - if (target._context && target._context !== target) { - Object.assign(target._context, { - i18n, - getLocale, - setLocale: target.setLocale, - }); - } -}; - -export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/i18n.js b/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/i18n.js deleted file mode 100644 index 60e05915d..000000000 --- a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/i18n.js +++ /dev/null @@ -1,77 +0,0 @@ -const i18nConfig = {}; - -let locale = - typeof navigator === "object" && typeof navigator.language === "string" - ? navigator.language - : "zh-CN"; - -const getLocale = () => locale; - -const setLocale = (target) => { - locale = target; -}; - -const isEmptyVariables = (variables) => - (Array.isArray(variables) && variables.length === 0) || - (typeof variables === "object" && - (!variables || Object.keys(variables).length === 0)); - -// 按低代码规范里面的要求进行变量替换 -const format = (msg, variables) => - typeof msg === "string" - ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? "") - : msg; - -const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { - const msg = - i18nConfig[locale]?.[id] ?? - i18nConfig[locale.replace("-", "_")]?.[id] ?? - defaultMessage; - if (msg == null) { - console.warn("[i18n]: unknown message id: %o (locale=%o)", id, locale); - return fallback === undefined ? `${id}` : fallback; - } - - return format(msg, variables); -}; - -const i18n = (id, params) => { - return i18nFormat({ id }, params); -}; - -// 将国际化的一些方法注入到目标对象&上下文中 -const _inject2 = (target) => { - target.i18n = i18n; - target.getLocale = getLocale; - target.setLocale = (locale) => { - setLocale(locale); - target.forceUpdate(); - }; - target._i18nText = (t) => { - // 优先取直接传过来的语料 - const localMsg = t[locale] ?? t[String(locale).replace("-", "_")]; - if (localMsg != null) { - return format(localMsg, t.params); - } - - // 其次用项目级别的 - const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); - if (projectMsg != null) { - return projectMsg; - } - - // 兜底用 use 指定的或默认语言的 - return format(t[t.use || "zh_CN"] ?? t.en_US, t.params); - }; - - // 注入到上下文中去 - if (target._context && target._context !== target) { - Object.assign(target._context, { - i18n, - getLocale, - setLocale: target.setLocale, - }); - } -}; - -export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/i18n.js b/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/i18n.js deleted file mode 100644 index 60e05915d..000000000 --- a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/i18n.js +++ /dev/null @@ -1,77 +0,0 @@ -const i18nConfig = {}; - -let locale = - typeof navigator === "object" && typeof navigator.language === "string" - ? navigator.language - : "zh-CN"; - -const getLocale = () => locale; - -const setLocale = (target) => { - locale = target; -}; - -const isEmptyVariables = (variables) => - (Array.isArray(variables) && variables.length === 0) || - (typeof variables === "object" && - (!variables || Object.keys(variables).length === 0)); - -// 按低代码规范里面的要求进行变量替换 -const format = (msg, variables) => - typeof msg === "string" - ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? "") - : msg; - -const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { - const msg = - i18nConfig[locale]?.[id] ?? - i18nConfig[locale.replace("-", "_")]?.[id] ?? - defaultMessage; - if (msg == null) { - console.warn("[i18n]: unknown message id: %o (locale=%o)", id, locale); - return fallback === undefined ? `${id}` : fallback; - } - - return format(msg, variables); -}; - -const i18n = (id, params) => { - return i18nFormat({ id }, params); -}; - -// 将国际化的一些方法注入到目标对象&上下文中 -const _inject2 = (target) => { - target.i18n = i18n; - target.getLocale = getLocale; - target.setLocale = (locale) => { - setLocale(locale); - target.forceUpdate(); - }; - target._i18nText = (t) => { - // 优先取直接传过来的语料 - const localMsg = t[locale] ?? t[String(locale).replace("-", "_")]; - if (localMsg != null) { - return format(localMsg, t.params); - } - - // 其次用项目级别的 - const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); - if (projectMsg != null) { - return projectMsg; - } - - // 兜底用 use 指定的或默认语言的 - return format(t[t.use || "zh_CN"] ?? t.en_US, t.params); - }; - - // 注入到上下文中去 - if (target._context && target._context !== target) { - Object.assign(target._context, { - i18n, - getLocale, - setLocale: target.setLocale, - }); - } -}; - -export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/i18n.js b/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/i18n.js deleted file mode 100644 index 60e05915d..000000000 --- a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/i18n.js +++ /dev/null @@ -1,77 +0,0 @@ -const i18nConfig = {}; - -let locale = - typeof navigator === "object" && typeof navigator.language === "string" - ? navigator.language - : "zh-CN"; - -const getLocale = () => locale; - -const setLocale = (target) => { - locale = target; -}; - -const isEmptyVariables = (variables) => - (Array.isArray(variables) && variables.length === 0) || - (typeof variables === "object" && - (!variables || Object.keys(variables).length === 0)); - -// 按低代码规范里面的要求进行变量替换 -const format = (msg, variables) => - typeof msg === "string" - ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? "") - : msg; - -const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { - const msg = - i18nConfig[locale]?.[id] ?? - i18nConfig[locale.replace("-", "_")]?.[id] ?? - defaultMessage; - if (msg == null) { - console.warn("[i18n]: unknown message id: %o (locale=%o)", id, locale); - return fallback === undefined ? `${id}` : fallback; - } - - return format(msg, variables); -}; - -const i18n = (id, params) => { - return i18nFormat({ id }, params); -}; - -// 将国际化的一些方法注入到目标对象&上下文中 -const _inject2 = (target) => { - target.i18n = i18n; - target.getLocale = getLocale; - target.setLocale = (locale) => { - setLocale(locale); - target.forceUpdate(); - }; - target._i18nText = (t) => { - // 优先取直接传过来的语料 - const localMsg = t[locale] ?? t[String(locale).replace("-", "_")]; - if (localMsg != null) { - return format(localMsg, t.params); - } - - // 其次用项目级别的 - const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); - if (projectMsg != null) { - return projectMsg; - } - - // 兜底用 use 指定的或默认语言的 - return format(t[t.use || "zh_CN"] ?? t.en_US, t.params); - }; - - // 注入到上下文中去 - if (target._context && target._context !== target) { - Object.assign(target._context, { - i18n, - getLocale, - setLocale: target.setLocale, - }); - } -}; - -export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/i18n.js b/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/i18n.js deleted file mode 100644 index 60e05915d..000000000 --- a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/i18n.js +++ /dev/null @@ -1,77 +0,0 @@ -const i18nConfig = {}; - -let locale = - typeof navigator === "object" && typeof navigator.language === "string" - ? navigator.language - : "zh-CN"; - -const getLocale = () => locale; - -const setLocale = (target) => { - locale = target; -}; - -const isEmptyVariables = (variables) => - (Array.isArray(variables) && variables.length === 0) || - (typeof variables === "object" && - (!variables || Object.keys(variables).length === 0)); - -// 按低代码规范里面的要求进行变量替换 -const format = (msg, variables) => - typeof msg === "string" - ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? "") - : msg; - -const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { - const msg = - i18nConfig[locale]?.[id] ?? - i18nConfig[locale.replace("-", "_")]?.[id] ?? - defaultMessage; - if (msg == null) { - console.warn("[i18n]: unknown message id: %o (locale=%o)", id, locale); - return fallback === undefined ? `${id}` : fallback; - } - - return format(msg, variables); -}; - -const i18n = (id, params) => { - return i18nFormat({ id }, params); -}; - -// 将国际化的一些方法注入到目标对象&上下文中 -const _inject2 = (target) => { - target.i18n = i18n; - target.getLocale = getLocale; - target.setLocale = (locale) => { - setLocale(locale); - target.forceUpdate(); - }; - target._i18nText = (t) => { - // 优先取直接传过来的语料 - const localMsg = t[locale] ?? t[String(locale).replace("-", "_")]; - if (localMsg != null) { - return format(localMsg, t.params); - } - - // 其次用项目级别的 - const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); - if (projectMsg != null) { - return projectMsg; - } - - // 兜底用 use 指定的或默认语言的 - return format(t[t.use || "zh_CN"] ?? t.en_US, t.params); - }; - - // 注入到上下文中去 - if (target._context && target._context !== target) { - Object.assign(target._context, { - i18n, - getLocale, - setLocale: target.setLocale, - }); - } -}; - -export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/i18n.js b/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/i18n.js deleted file mode 100644 index 60e05915d..000000000 --- a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/i18n.js +++ /dev/null @@ -1,77 +0,0 @@ -const i18nConfig = {}; - -let locale = - typeof navigator === "object" && typeof navigator.language === "string" - ? navigator.language - : "zh-CN"; - -const getLocale = () => locale; - -const setLocale = (target) => { - locale = target; -}; - -const isEmptyVariables = (variables) => - (Array.isArray(variables) && variables.length === 0) || - (typeof variables === "object" && - (!variables || Object.keys(variables).length === 0)); - -// 按低代码规范里面的要求进行变量替换 -const format = (msg, variables) => - typeof msg === "string" - ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? "") - : msg; - -const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { - const msg = - i18nConfig[locale]?.[id] ?? - i18nConfig[locale.replace("-", "_")]?.[id] ?? - defaultMessage; - if (msg == null) { - console.warn("[i18n]: unknown message id: %o (locale=%o)", id, locale); - return fallback === undefined ? `${id}` : fallback; - } - - return format(msg, variables); -}; - -const i18n = (id, params) => { - return i18nFormat({ id }, params); -}; - -// 将国际化的一些方法注入到目标对象&上下文中 -const _inject2 = (target) => { - target.i18n = i18n; - target.getLocale = getLocale; - target.setLocale = (locale) => { - setLocale(locale); - target.forceUpdate(); - }; - target._i18nText = (t) => { - // 优先取直接传过来的语料 - const localMsg = t[locale] ?? t[String(locale).replace("-", "_")]; - if (localMsg != null) { - return format(localMsg, t.params); - } - - // 其次用项目级别的 - const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); - if (projectMsg != null) { - return projectMsg; - } - - // 兜底用 use 指定的或默认语言的 - return format(t[t.use || "zh_CN"] ?? t.en_US, t.params); - }; - - // 注入到上下文中去 - if (target._context && target._context !== target) { - Object.assign(target._context, { - i18n, - getLocale, - setLocale: target.setLocale, - }); - } -}; - -export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/tests/bugfix/i18n-with-params.schema.json b/modules/code-generator/tests/bugfix/i18n-with-params.schema.json index 88217ab95..227a1d66f 100644 --- a/modules/code-generator/tests/bugfix/i18n-with-params.schema.json +++ b/modules/code-generator/tests/bugfix/i18n-with-params.schema.json @@ -42,10 +42,10 @@ } ], "i18n": { - "zh_CN": { + "zh-CN": { "greetings.hello": "${name}, 你好！" }, - "en_US": { + "en-US": { "greetings.hello": "Hello, ${name}!" } } diff --git a/modules/code-generator/tests/bugfix/tolerate-eval-errors-1-loop.schema.json b/modules/code-generator/tests/bugfix/tolerate-eval-errors-1-loop.schema.json index a8e2feb40..347ef7d3e 100644 --- a/modules/code-generator/tests/bugfix/tolerate-eval-errors-1-loop.schema.json +++ b/modules/code-generator/tests/bugfix/tolerate-eval-errors-1-loop.schema.json @@ -48,10 +48,10 @@ } ], "i18n": { - "zh_CN": { + "zh-CN": { "greetings.hello": "${name}, 你好！" }, - "en_US": { + "en-US": { "greetings.hello": "Hello, ${name}!" } } diff --git a/modules/code-generator/tests/bugfix/tolerate-eval-errors-2-nested-loop.schema.json b/modules/code-generator/tests/bugfix/tolerate-eval-errors-2-nested-loop.schema.json index f35a9d16b..6b35a8db6 100644 --- a/modules/code-generator/tests/bugfix/tolerate-eval-errors-2-nested-loop.schema.json +++ b/modules/code-generator/tests/bugfix/tolerate-eval-errors-2-nested-loop.schema.json @@ -60,10 +60,10 @@ } ], "i18n": { - "zh_CN": { + "zh-CN": { "greetings.hello": "${name}, 你好！" }, - "en_US": { + "en-US": { "greetings.hello": "Hello, ${name}!" } } diff --git a/modules/code-generator/test-cases/.gitignore b/modules/code-generator/tests/fixtures/test-cases/.gitignore similarity index 100% rename from modules/code-generator/test-cases/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/.gitignore diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/app.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/app.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/app.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/app.json diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/document/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/document/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/document/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/document/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/global.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/global.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/global.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/global.css diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/i18n.js similarity index 97% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/i18n.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/i18n.js index 2c28c064e..043df6c79 100644 --- a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/i18n.js +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/i18n.js @@ -52,7 +52,7 @@ const _inject2 = (target) => { } // 兜底用 use 指定的或默认语言的 - return format(t[t.use || 'zh_CN'] ?? t.en_US, t.params); + return format(t[t.use || 'zh-CN'] ?? t.en_US, t.params); }; // 注入到上下文中去 diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/pages/Home/index.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/pages/Home/index.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/pages/Home/index.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/pages/Home/index.css diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/pages/Home/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/pages/Home/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/pages/Home/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/pages/Home/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo01/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo01/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo01/schema.json5 diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/app.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/app.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/app.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/app.json diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/document/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/document/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/document/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/document/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/global.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/global.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/global.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/global.css diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/i18n.js similarity index 97% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/i18n.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/i18n.js index 2c28c064e..043df6c79 100644 --- a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/i18n.js +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/i18n.js @@ -52,7 +52,7 @@ const _inject2 = (target) => { } // 兜底用 use 指定的或默认语言的 - return format(t[t.use || 'zh_CN'] ?? t.en_US, t.params); + return format(t[t.use || 'zh-CN'] ?? t.en_US, t.params); }; // 注入到上下文中去 diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/pages/Home/index.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/pages/Home/index.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/pages/Home/index.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/pages/Home/index.css diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/pages/Home/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/pages/Home/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/pages/Home/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/pages/Home/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo02/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo02/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo02/schema.json5 diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/app.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/app.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/app.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/app.json diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/document/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/document/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/document/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/document/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/global.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/global.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/global.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/global.css diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/i18n.js similarity index 97% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/i18n.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/i18n.js index 2c28c064e..043df6c79 100644 --- a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/i18n.js +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/i18n.js @@ -52,7 +52,7 @@ const _inject2 = (target) => { } // 兜底用 use 指定的或默认语言的 - return format(t[t.use || 'zh_CN'] ?? t.en_US, t.params); + return format(t[t.use || 'zh-CN'] ?? t.en_US, t.params); }; // 注入到上下文中去 diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/pages/Detail/index.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/pages/Detail/index.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/pages/Detail/index.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/pages/Detail/index.css diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/pages/Detail/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/pages/Detail/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/pages/Detail/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/pages/Detail/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/pages/Home/index.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/pages/Home/index.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/pages/Home/index.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/pages/Home/index.css diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/pages/Home/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/pages/Home/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/pages/Home/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/pages/Home/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/pages/List/index.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/pages/List/index.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/pages/List/index.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/pages/List/index.css diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/pages/List/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/pages/List/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/pages/List/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/pages/List/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo03/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo03/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo03/schema.json5 diff --git a/modules/code-generator/test-cases/rax-app/demo04/README.md b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/README.md similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/README.md rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/README.md diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/app.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/app.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/app.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/app.json diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/document/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/document/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/document/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/document/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/global.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/global.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/global.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/global.css diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/i18n.js similarity index 97% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/i18n.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/i18n.js index 2c28c064e..043df6c79 100644 --- a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/i18n.js +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/i18n.js @@ -52,7 +52,7 @@ const _inject2 = (target) => { } // 兜底用 use 指定的或默认语言的 - return format(t[t.use || 'zh_CN'] ?? t.en_US, t.params); + return format(t[t.use || 'zh-CN'] ?? t.en_US, t.params); }; // 注入到上下文中去 diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/pages/Home/index.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/pages/Home/index.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/pages/Home/index.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/pages/Home/index.css diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/pages/Home/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/pages/Home/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/pages/Home/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/pages/Home/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo04/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo04/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo04/schema.json5 diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/app.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/app.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/app.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/app.json diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/document/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/document/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/document/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/document/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/global.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/global.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/global.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/global.css diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/i18n.js similarity index 97% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/i18n.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/i18n.js index acf6cd388..f73870fdb 100644 --- a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/i18n.js +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/i18n.js @@ -59,7 +59,7 @@ const _inject2 = (target) => { } // 兜底用 use 指定的或默认语言的 - return format(t[t.use || 'zh_CN'] ?? t.en_US, t.params); + return format(t[t.use || 'zh-CN'] ?? t.en_US, t.params); }; // 注入到上下文中去 diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/pages/Home/index.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/pages/Home/index.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/pages/Home/index.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/pages/Home/index.css diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/pages/Home/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/pages/Home/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/pages/Home/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/pages/Home/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo05/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo05/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo05/schema.json5 diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/app.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/app.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/app.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/app.json diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/document/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/document/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/document/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/document/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/global.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/global.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/global.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/global.css diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/i18n.js similarity index 97% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/i18n.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/i18n.js index acf6cd388..f73870fdb 100644 --- a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/i18n.js +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/i18n.js @@ -59,7 +59,7 @@ const _inject2 = (target) => { } // 兜底用 use 指定的或默认语言的 - return format(t[t.use || 'zh_CN'] ?? t.en_US, t.params); + return format(t[t.use || 'zh-CN'] ?? t.en_US, t.params); }; // 注入到上下文中去 diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/pages/Home/index.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/pages/Home/index.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/pages/Home/index.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/pages/Home/index.css diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/pages/Home/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/pages/Home/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/pages/Home/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/pages/Home/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo06-jsslot/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo06-jsslot/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo06-jsslot/schema.json5 diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/app.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/app.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/app.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/app.json diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/document/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/document/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/document/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/document/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/global.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/global.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/global.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/global.css diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/i18n.js similarity index 97% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/i18n.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/i18n.js index acf6cd388..f73870fdb 100644 --- a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/i18n.js +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/i18n.js @@ -59,7 +59,7 @@ const _inject2 = (target) => { } // 兜底用 use 指定的或默认语言的 - return format(t[t.use || 'zh_CN'] ?? t.en_US, t.params); + return format(t[t.use || 'zh-CN'] ?? t.en_US, t.params); }; // 注入到上下文中去 diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/pages/Home/index.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/pages/Home/index.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/pages/Home/index.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/pages/Home/index.css diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/pages/Home/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/pages/Home/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/pages/Home/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/pages/Home/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo07-newline-in-props/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo07-newline-in-props/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo07-newline-in-props/schema.json5 diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/app.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/app.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/app.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/app.json diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/document/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/document/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/document/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/document/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/global.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/global.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/global.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/global.css diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/i18n.js similarity index 97% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/i18n.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/i18n.js index acf6cd388..f73870fdb 100644 --- a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/i18n.js +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/i18n.js @@ -59,7 +59,7 @@ const _inject2 = (target) => { } // 兜底用 use 指定的或默认语言的 - return format(t[t.use || 'zh_CN'] ?? t.en_US, t.params); + return format(t[t.use || 'zh-CN'] ?? t.en_US, t.params); }; // 注入到上下文中去 diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/pages/Home/index.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/pages/Home/index.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/pages/Home/index.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/pages/Home/index.css diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/pages/Home/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/pages/Home/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/pages/Home/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/pages/Home/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo08-jsslot-with-multiple-children/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo08-jsslot-with-multiple-children/schema.json5 diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/app.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/app.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/app.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/app.json diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/document/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/document/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/document/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/document/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/global.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/global.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/global.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/global.css diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/i18n.js new file mode 100644 index 000000000..f73870fdb --- /dev/null +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/i18n.js @@ -0,0 +1,75 @@ +const i18nConfig = { + 'zh-CN': { + 'hello-world': '你好，世界！', + }, + 'en-US': { + 'hello-world': 'Hello world!', + }, +}; + +let locale = typeof navigator === 'object' && typeof navigator.language === 'string' ? navigator.language : 'zh-CN'; + +const getLocale = () => locale; + +const setLocale = (target) => { + locale = target; +}; + +const isEmptyVariables = (variables) => + (Array.isArray(variables) && variables.length === 0) || + (typeof variables === 'object' && (!variables || Object.keys(variables).length === 0)); + +// 按低代码规范里面的要求进行变量替换 +const format = (msg, variables) => + typeof msg === 'string' ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? '') : msg; + +const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { + const msg = i18nConfig[locale]?.[id] ?? i18nConfig[locale.replace('-', '_')]?.[id] ?? defaultMessage; + if (msg == null) { + console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale); + return fallback === undefined ? `${id}` : fallback; + } + + return format(msg, variables); +}; + +const i18n = (id, params) => { + return i18nFormat({ id }, params); +}; + +// 将国际化的一些方法注入到目标对象&上下文中 +const _inject2 = (target) => { + target.i18n = i18n; + target.getLocale = getLocale; + target.setLocale = (locale) => { + setLocale(locale); + target.forceUpdate(); + }; + target._i18nText = (t) => { + // 优先取直接传过来的语料 + const localMsg = t[locale] ?? t[String(locale).replace('-', '_')]; + if (localMsg != null) { + return format(localMsg, t.params); + } + + // 其次用项目级别的 + const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); + if (projectMsg != null) { + return projectMsg; + } + + // 兜底用 use 指定的或默认语言的 + return format(t[t.use || 'zh-CN'] ?? t.en_US, t.params); + }; + + // 注入到上下文中去 + if (target._context && target._context !== target) { + Object.assign(target._context, { + i18n, + getLocale, + setLocale: target.setLocale, + }); + } +}; + +export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/pages/Home/index.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/pages/Home/index.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/pages/Home/index.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/pages/Home/index.css diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/pages/Home/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/pages/Home/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/pages/Home/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/pages/Home/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo09-jsslot-with-conditional-children/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo09-jsslot-with-conditional-children/schema.json5 diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/app.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/app.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/app.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/app.json diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/document/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/document/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/document/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/document/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/global.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/global.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/global.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/global.css diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/i18n.js new file mode 100644 index 000000000..f73870fdb --- /dev/null +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/i18n.js @@ -0,0 +1,75 @@ +const i18nConfig = { + 'zh-CN': { + 'hello-world': '你好，世界！', + }, + 'en-US': { + 'hello-world': 'Hello world!', + }, +}; + +let locale = typeof navigator === 'object' && typeof navigator.language === 'string' ? navigator.language : 'zh-CN'; + +const getLocale = () => locale; + +const setLocale = (target) => { + locale = target; +}; + +const isEmptyVariables = (variables) => + (Array.isArray(variables) && variables.length === 0) || + (typeof variables === 'object' && (!variables || Object.keys(variables).length === 0)); + +// 按低代码规范里面的要求进行变量替换 +const format = (msg, variables) => + typeof msg === 'string' ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? '') : msg; + +const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { + const msg = i18nConfig[locale]?.[id] ?? i18nConfig[locale.replace('-', '_')]?.[id] ?? defaultMessage; + if (msg == null) { + console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale); + return fallback === undefined ? `${id}` : fallback; + } + + return format(msg, variables); +}; + +const i18n = (id, params) => { + return i18nFormat({ id }, params); +}; + +// 将国际化的一些方法注入到目标对象&上下文中 +const _inject2 = (target) => { + target.i18n = i18n; + target.getLocale = getLocale; + target.setLocale = (locale) => { + setLocale(locale); + target.forceUpdate(); + }; + target._i18nText = (t) => { + // 优先取直接传过来的语料 + const localMsg = t[locale] ?? t[String(locale).replace('-', '_')]; + if (localMsg != null) { + return format(localMsg, t.params); + } + + // 其次用项目级别的 + const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); + if (projectMsg != null) { + return projectMsg; + } + + // 兜底用 use 指定的或默认语言的 + return format(t[t.use || 'zh-CN'] ?? t.en_US, t.params); + }; + + // 注入到上下文中去 + if (target._context && target._context !== target) { + Object.assign(target._context, { + i18n, + getLocale, + setLocale: target.setLocale, + }); + } +}; + +export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/pages/Home/index.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/pages/Home/index.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/pages/Home/index.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/pages/Home/index.css diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/pages/Home/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/pages/Home/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/pages/Home/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/pages/Home/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo10-jsslot-with-loop-children/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo10-jsslot-with-loop-children/schema.json5 diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/app.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/app.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/app.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/app.json diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/document/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/document/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/document/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/document/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/global.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/global.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/global.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/global.css diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/i18n.js new file mode 100644 index 000000000..043df6c79 --- /dev/null +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/i18n.js @@ -0,0 +1,68 @@ +const i18nConfig = {}; + +let locale = typeof navigator === 'object' && typeof navigator.language === 'string' ? navigator.language : 'zh-CN'; + +const getLocale = () => locale; + +const setLocale = (target) => { + locale = target; +}; + +const isEmptyVariables = (variables) => + (Array.isArray(variables) && variables.length === 0) || + (typeof variables === 'object' && (!variables || Object.keys(variables).length === 0)); + +// 按低代码规范里面的要求进行变量替换 +const format = (msg, variables) => + typeof msg === 'string' ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? '') : msg; + +const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { + const msg = i18nConfig[locale]?.[id] ?? i18nConfig[locale.replace('-', '_')]?.[id] ?? defaultMessage; + if (msg == null) { + console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale); + return fallback === undefined ? `${id}` : fallback; + } + + return format(msg, variables); +}; + +const i18n = (id, params) => { + return i18nFormat({ id }, params); +}; + +// 将国际化的一些方法注入到目标对象&上下文中 +const _inject2 = (target) => { + target.i18n = i18n; + target.getLocale = getLocale; + target.setLocale = (locale) => { + setLocale(locale); + target.forceUpdate(); + }; + target._i18nText = (t) => { + // 优先取直接传过来的语料 + const localMsg = t[locale] ?? t[String(locale).replace('-', '_')]; + if (localMsg != null) { + return format(localMsg, t.params); + } + + // 其次用项目级别的 + const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); + if (projectMsg != null) { + return projectMsg; + } + + // 兜底用 use 指定的或默认语言的 + return format(t[t.use || 'zh-CN'] ?? t.en_US, t.params); + }; + + // 注入到上下文中去 + if (target._context && target._context !== target) { + Object.assign(target._context, { + i18n, + getLocale, + setLocale: target.setLocale, + }); + } +}; + +export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.css diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo11-utils-name-alias/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo11-utils-name-alias/schema.json5 diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/app.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/app.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/app.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/app.json diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/document/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/document/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/document/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/document/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/global.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/global.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/global.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/global.css diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/i18n.js new file mode 100644 index 000000000..f73870fdb --- /dev/null +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/i18n.js @@ -0,0 +1,75 @@ +const i18nConfig = { + 'zh-CN': { + 'hello-world': '你好，世界！', + }, + 'en-US': { + 'hello-world': 'Hello world!', + }, +}; + +let locale = typeof navigator === 'object' && typeof navigator.language === 'string' ? navigator.language : 'zh-CN'; + +const getLocale = () => locale; + +const setLocale = (target) => { + locale = target; +}; + +const isEmptyVariables = (variables) => + (Array.isArray(variables) && variables.length === 0) || + (typeof variables === 'object' && (!variables || Object.keys(variables).length === 0)); + +// 按低代码规范里面的要求进行变量替换 +const format = (msg, variables) => + typeof msg === 'string' ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? '') : msg; + +const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { + const msg = i18nConfig[locale]?.[id] ?? i18nConfig[locale.replace('-', '_')]?.[id] ?? defaultMessage; + if (msg == null) { + console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale); + return fallback === undefined ? `${id}` : fallback; + } + + return format(msg, variables); +}; + +const i18n = (id, params) => { + return i18nFormat({ id }, params); +}; + +// 将国际化的一些方法注入到目标对象&上下文中 +const _inject2 = (target) => { + target.i18n = i18n; + target.getLocale = getLocale; + target.setLocale = (locale) => { + setLocale(locale); + target.forceUpdate(); + }; + target._i18nText = (t) => { + // 优先取直接传过来的语料 + const localMsg = t[locale] ?? t[String(locale).replace('-', '_')]; + if (localMsg != null) { + return format(localMsg, t.params); + } + + // 其次用项目级别的 + const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); + if (projectMsg != null) { + return projectMsg; + } + + // 兜底用 use 指定的或默认语言的 + return format(t[t.use || 'zh-CN'] ?? t.en_US, t.params); + }; + + // 注入到上下文中去 + if (target._context && target._context !== target) { + Object.assign(target._context, { + i18n, + getLocale, + setLocale: target.setLocale, + }); + } +}; + +export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/pages/Home/index.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/pages/Home/index.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/pages/Home/index.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/pages/Home/index.css diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/pages/Home/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/pages/Home/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/pages/Home/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/pages/Home/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo12-refs/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo12-refs/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo12-refs/schema.json5 diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/app.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/app.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/app.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/app.json diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/document/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/document/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/document/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/document/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/global.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/global.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/global.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/global.css diff --git a/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/i18n.js new file mode 100644 index 000000000..043df6c79 --- /dev/null +++ b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/i18n.js @@ -0,0 +1,68 @@ +const i18nConfig = {}; + +let locale = typeof navigator === 'object' && typeof navigator.language === 'string' ? navigator.language : 'zh-CN'; + +const getLocale = () => locale; + +const setLocale = (target) => { + locale = target; +}; + +const isEmptyVariables = (variables) => + (Array.isArray(variables) && variables.length === 0) || + (typeof variables === 'object' && (!variables || Object.keys(variables).length === 0)); + +// 按低代码规范里面的要求进行变量替换 +const format = (msg, variables) => + typeof msg === 'string' ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? '') : msg; + +const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { + const msg = i18nConfig[locale]?.[id] ?? i18nConfig[locale.replace('-', '_')]?.[id] ?? defaultMessage; + if (msg == null) { + console.warn('[i18n]: unknown message id: %o (locale=%o)', id, locale); + return fallback === undefined ? `${id}` : fallback; + } + + return format(msg, variables); +}; + +const i18n = (id, params) => { + return i18nFormat({ id }, params); +}; + +// 将国际化的一些方法注入到目标对象&上下文中 +const _inject2 = (target) => { + target.i18n = i18n; + target.getLocale = getLocale; + target.setLocale = (locale) => { + setLocale(locale); + target.forceUpdate(); + }; + target._i18nText = (t) => { + // 优先取直接传过来的语料 + const localMsg = t[locale] ?? t[String(locale).replace('-', '_')]; + if (localMsg != null) { + return format(localMsg, t.params); + } + + // 其次用项目级别的 + const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); + if (projectMsg != null) { + return projectMsg; + } + + // 兜底用 use 指定的或默认语言的 + return format(t[t.use || 'zh-CN'] ?? t.en_US, t.params); + }; + + // 注入到上下文中去 + if (target._context && target._context !== target) { + Object.assign(target._context, { + i18n, + getLocale, + setLocale: target.setLocale, + }); + } +}; + +export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/pages/Example/index.css b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/pages/Example/index.css similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/pages/Example/index.css rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/pages/Example/index.css diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/pages/Example/index.jsx b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/pages/Example/index.jsx similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/pages/Example/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/pages/Example/index.jsx diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/rax-app/demo13-datasource-prop/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/rax-app/demo13-datasource-prop/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/rax-app/demo13-datasource-prop/schema.json5 diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/.editorconfig b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/.editorconfig similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/.editorconfig rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/.editorconfig diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/abc.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/abc.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/abc.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/abc.json diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/public/index.html b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/public/index.html similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/public/index.html rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/public/index.html diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/global.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/global.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/global.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/global.scss diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/i18n.js similarity index 97% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/i18n.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/i18n.js index 60e05915d..1ae7c84b5 100644 --- a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/i18n.js +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/i18n.js @@ -61,7 +61,7 @@ const _inject2 = (target) => { } // 兜底用 use 指定的或默认语言的 - return format(t[t.use || "zh_CN"] ?? t.en_US, t.params); + return format(t[t.use || "zh-CN"] ?? t.en_US, t.params); }; // 注入到上下文中去 diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/menuConfig.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/menuConfig.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/menuConfig.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/layouts/BasicLayout/menuConfig.js diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/pages/Test/index.css b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/pages/Test/index.css similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/pages/Test/index.css rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/pages/Test/index.css diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/pages/Test/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/pages/Test/index.jsx similarity index 98% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/pages/Test/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/pages/Test/index.jsx index f3d65f8fd..b90fe6254 100644 --- a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/pages/Test/index.jsx +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/pages/Test/index.jsx @@ -14,6 +14,8 @@ import utils, { RefsManager } from "../../utils"; import * as __$$i18n from "../../i18n"; +import __$$constants from "../../constants"; + import "./index.css"; class Test$$Page extends React.Component { @@ -36,6 +38,10 @@ class Test$$Page extends React.Component { await this._dataSourceEngine.reloadDataSource(); }; + get constants() { + return __$$constants || {}; + } + constructor(props, context) { super(props); diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/routes.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/routes.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/routes.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/routes.js diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/react-app/demo1/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo1/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/react-app/demo1/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/react-app/demo1/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo1/schema.json5 diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.editorconfig b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.editorconfig similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.editorconfig rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.editorconfig diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/abc.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/abc.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/abc.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/abc.json diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/public/index.html b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/public/index.html similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/public/index.html rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/public/index.html diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/global.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/global.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/global.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/global.scss diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/i18n.js similarity index 97% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/i18n.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/i18n.js index 60e05915d..1ae7c84b5 100644 --- a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/i18n.js +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/i18n.js @@ -61,7 +61,7 @@ const _inject2 = (target) => { } // 兜底用 use 指定的或默认语言的 - return format(t[t.use || "zh_CN"] ?? t.en_US, t.params); + return format(t[t.use || "zh-CN"] ?? t.en_US, t.params); }; // 注入到上下文中去 diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/menuConfig.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/menuConfig.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/menuConfig.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/layouts/BasicLayout/menuConfig.js diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.css b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.css similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.css rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.css diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.jsx similarity index 96% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.jsx index a4751b6f7..cc8332e1d 100644 --- a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.jsx +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/pages/Aaaa/index.jsx @@ -14,6 +14,8 @@ import utils from "../../utils"; import * as __$$i18n from "../../i18n"; +import __$$constants from "../../constants"; + import "./index.css"; class Aaaa$$Page extends React.Component { @@ -35,6 +37,10 @@ class Aaaa$$Page extends React.Component { await this._dataSourceEngine.reloadDataSource(); }; + get constants() { + return __$$constants || {}; + } + constructor(props, context) { super(props); diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/routes.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/routes.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/routes.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/routes.js diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo2-utils-name-alias/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2-utils-name-alias/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2-utils-name-alias/schema.json5 diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/.editorconfig b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/.editorconfig similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/.editorconfig rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/.editorconfig diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/abc.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/abc.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/abc.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/abc.json diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/public/index.html b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/public/index.html similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/public/index.html rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/public/index.html diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/global.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/global.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/global.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/global.scss diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/i18n.js similarity index 97% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/i18n.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/i18n.js index 3f0a822ce..d1eaf9464 100644 --- a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/i18n.js +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/i18n.js @@ -70,7 +70,7 @@ const _inject2 = (target) => { } // 兜底用 use 指定的或默认语言的 - return format(t[t.use || "zh_CN"] ?? t.en_US, t.params); + return format(t[t.use || "zh-CN"] ?? t.en_US, t.params); }; // 注入到上下文中去 diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/menuConfig.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/menuConfig.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/menuConfig.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/layouts/BasicLayout/menuConfig.js diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/pages/Test/index.css b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/pages/Test/index.css similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/pages/Test/index.css rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/pages/Test/index.css diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/pages/Test/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/pages/Test/index.jsx similarity index 96% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/pages/Test/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/pages/Test/index.jsx index eda8c2fbe..0541a8df6 100644 --- a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/pages/Test/index.jsx +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/pages/Test/index.jsx @@ -8,11 +8,17 @@ import utils, { RefsManager } from "../../utils"; import * as __$$i18n from "../../i18n"; +import __$$constants from "../../constants"; + import "./index.css"; class Test$$Page extends React.Component { _context = this; + get constants() { + return __$$constants || {}; + } + constructor(props, context) { super(props); diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/routes.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/routes.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/routes.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/routes.js diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/react-app/demo2/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo2/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/react-app/demo2/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/react-app/demo2/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo2/schema.json5 diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/.editorconfig b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/.editorconfig similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/.editorconfig rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/.editorconfig diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/abc.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/abc.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/abc.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/abc.json diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/public/index.html b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/public/index.html similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/public/index.html rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/public/index.html diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/global.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/global.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/global.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/global.scss diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/i18n.js similarity index 97% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/i18n.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/i18n.js index 3f0a822ce..d1eaf9464 100644 --- a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/i18n.js +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/i18n.js @@ -70,7 +70,7 @@ const _inject2 = (target) => { } // 兜底用 use 指定的或默认语言的 - return format(t[t.use || "zh_CN"] ?? t.en_US, t.params); + return format(t[t.use || "zh-CN"] ?? t.en_US, t.params); }; // 注入到上下文中去 diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/menuConfig.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/menuConfig.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/menuConfig.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/layouts/BasicLayout/menuConfig.js diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/pages/Test/index.css b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/pages/Test/index.css similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/pages/Test/index.css rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/pages/Test/index.css diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/pages/Test/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/pages/Test/index.jsx similarity index 94% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/pages/Test/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/pages/Test/index.jsx index de9b20393..b8265dd96 100644 --- a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/pages/Test/index.jsx +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/pages/Test/index.jsx @@ -17,6 +17,8 @@ import utils from "../../utils"; import * as __$$i18n from "../../i18n"; +import __$$constants from "../../constants"; + import "./index.css"; const SuperSub = Super.Sub; @@ -28,6 +30,10 @@ const SearchTable = SearchTableExport.default; class Test$$Page extends React.Component { _context = this; + get constants() { + return __$$constants || {}; + } + constructor(props, context) { super(props); diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/routes.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/routes.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/routes.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/routes.js diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/react-app/demo3/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo3/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/react-app/demo3/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/react-app/demo3/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo3/schema.json5 diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/.editorconfig b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/.editorconfig similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/.editorconfig rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/.editorconfig diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/abc.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/abc.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/abc.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/abc.json diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/public/index.html b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/public/index.html similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/public/index.html rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/public/index.html diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/global.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/global.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/global.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/global.scss diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/i18n.js similarity index 97% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/i18n.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/i18n.js index 60e05915d..1ae7c84b5 100644 --- a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/i18n.js +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/i18n.js @@ -61,7 +61,7 @@ const _inject2 = (target) => { } // 兜底用 use 指定的或默认语言的 - return format(t[t.use || "zh_CN"] ?? t.en_US, t.params); + return format(t[t.use || "zh-CN"] ?? t.en_US, t.params); }; // 注入到上下文中去 diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/menuConfig.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/menuConfig.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/menuConfig.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/layouts/BasicLayout/menuConfig.js diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/pages/Test/index.css b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/pages/Test/index.css similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/pages/Test/index.css rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/pages/Test/index.css diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/pages/Test/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/pages/Test/index.jsx similarity index 98% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/pages/Test/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/pages/Test/index.jsx index b81e72ad7..9b2ea7afa 100644 --- a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/pages/Test/index.jsx +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/pages/Test/index.jsx @@ -19,6 +19,8 @@ import utils, { RefsManager } from "../../utils"; import * as __$$i18n from "../../i18n"; +import __$$constants from "../../constants"; + import "./index.css"; const NextBlockCell = NextBlock.Cell; @@ -42,6 +44,10 @@ class Test$$Page extends React.Component { await this._dataSourceEngine.reloadDataSource(); }; + get constants() { + return __$$constants || {}; + } + constructor(props, context) { super(props); diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/routes.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/routes.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/routes.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/routes.js diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/react-app/demo4/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo4/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/react-app/demo4/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/react-app/demo4/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo4/schema.json5 diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/.editorconfig b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/.editorconfig similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/.editorconfig rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/.editorconfig diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/abc.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/abc.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/abc.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/abc.json diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/public/index.html b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/public/index.html similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/public/index.html rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/public/index.html diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/global.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/global.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/global.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/global.scss diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/i18n.js similarity index 97% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/i18n.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/i18n.js index 60e05915d..1ae7c84b5 100644 --- a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/i18n.js +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/i18n.js @@ -61,7 +61,7 @@ const _inject2 = (target) => { } // 兜底用 use 指定的或默认语言的 - return format(t[t.use || "zh_CN"] ?? t.en_US, t.params); + return format(t[t.use || "zh-CN"] ?? t.en_US, t.params); }; // 注入到上下文中去 diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/menuConfig.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/menuConfig.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/menuConfig.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/layouts/BasicLayout/menuConfig.js diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/pages/Test/index.css b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/pages/Test/index.css similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/pages/Test/index.css rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/pages/Test/index.css diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/pages/Test/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/pages/Test/index.jsx similarity index 99% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/pages/Test/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/pages/Test/index.jsx index 430f8aad9..e8bd227c3 100644 --- a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/pages/Test/index.jsx +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/pages/Test/index.jsx @@ -26,6 +26,8 @@ import utils, { RefsManager } from "../../utils"; import * as __$$i18n from "../../i18n"; +import __$$constants from "../../constants"; + import "./index.css"; const NextBlockCell = NextBlock.Cell; @@ -35,6 +37,10 @@ const AliAutoSearchTableDefault = AliAutoSearchTable.default; class Test$$Page extends React.Component { _context = this; + get constants() { + return __$$constants || {}; + } + constructor(props, context) { super(props); diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/routes.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/routes.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/routes.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/routes.js diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/react-app/demo5/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo5/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/react-app/demo5/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/react-app/demo5/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo5/schema.json5 diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/.editorconfig b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/.editorconfig similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/.editorconfig rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/.editorconfig diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/abc.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/abc.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/abc.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/abc.json diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/public/index.html b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/public/index.html similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/public/index.html rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/public/index.html diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/global.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/global.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/global.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/global.scss diff --git a/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/i18n.js new file mode 100644 index 000000000..1ae7c84b5 --- /dev/null +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/i18n.js @@ -0,0 +1,77 @@ +const i18nConfig = {}; + +let locale = + typeof navigator === "object" && typeof navigator.language === "string" + ? navigator.language + : "zh-CN"; + +const getLocale = () => locale; + +const setLocale = (target) => { + locale = target; +}; + +const isEmptyVariables = (variables) => + (Array.isArray(variables) && variables.length === 0) || + (typeof variables === "object" && + (!variables || Object.keys(variables).length === 0)); + +// 按低代码规范里面的要求进行变量替换 +const format = (msg, variables) => + typeof msg === "string" + ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? "") + : msg; + +const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { + const msg = + i18nConfig[locale]?.[id] ?? + i18nConfig[locale.replace("-", "_")]?.[id] ?? + defaultMessage; + if (msg == null) { + console.warn("[i18n]: unknown message id: %o (locale=%o)", id, locale); + return fallback === undefined ? `${id}` : fallback; + } + + return format(msg, variables); +}; + +const i18n = (id, params) => { + return i18nFormat({ id }, params); +}; + +// 将国际化的一些方法注入到目标对象&上下文中 +const _inject2 = (target) => { + target.i18n = i18n; + target.getLocale = getLocale; + target.setLocale = (locale) => { + setLocale(locale); + target.forceUpdate(); + }; + target._i18nText = (t) => { + // 优先取直接传过来的语料 + const localMsg = t[locale] ?? t[String(locale).replace("-", "_")]; + if (localMsg != null) { + return format(localMsg, t.params); + } + + // 其次用项目级别的 + const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); + if (projectMsg != null) { + return projectMsg; + } + + // 兜底用 use 指定的或默认语言的 + return format(t[t.use || "zh-CN"] ?? t.en_US, t.params); + }; + + // 注入到上下文中去 + if (target._context && target._context !== target) { + Object.assign(target._context, { + i18n, + getLocale, + setLocale: target.setLocale, + }); + } +}; + +export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/menuConfig.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/menuConfig.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/menuConfig.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/layouts/BasicLayout/menuConfig.js diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/pages/Test/index.css b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/pages/Test/index.css similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/pages/Test/index.css rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/pages/Test/index.css diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/pages/Test/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/pages/Test/index.jsx similarity index 98% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/pages/Test/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/pages/Test/index.jsx index 0d6584919..cec93d2c6 100644 --- a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/pages/Test/index.jsx +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/pages/Test/index.jsx @@ -14,6 +14,8 @@ import utils, { RefsManager } from "../../utils"; import * as __$$i18n from "../../i18n"; +import __$$constants from "../../constants"; + import "./index.css"; class Test$$Page extends React.Component { @@ -36,6 +38,10 @@ class Test$$Page extends React.Component { await this._dataSourceEngine.reloadDataSource(); }; + get constants() { + return __$$constants || {}; + } + constructor(props, context) { super(props); diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/routes.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/routes.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/routes.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/routes.js diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo6-literal-condition/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/react-app/demo6-literal-condition/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo6-literal-condition/schema.json5 diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.editorconfig b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.editorconfig similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.editorconfig rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.editorconfig diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/abc.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/abc.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/abc.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/abc.json diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/public/index.html b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/public/index.html similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/public/index.html rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/public/index.html diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/global.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/global.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/global.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/global.scss diff --git a/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/i18n.js new file mode 100644 index 000000000..1ae7c84b5 --- /dev/null +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/i18n.js @@ -0,0 +1,77 @@ +const i18nConfig = {}; + +let locale = + typeof navigator === "object" && typeof navigator.language === "string" + ? navigator.language + : "zh-CN"; + +const getLocale = () => locale; + +const setLocale = (target) => { + locale = target; +}; + +const isEmptyVariables = (variables) => + (Array.isArray(variables) && variables.length === 0) || + (typeof variables === "object" && + (!variables || Object.keys(variables).length === 0)); + +// 按低代码规范里面的要求进行变量替换 +const format = (msg, variables) => + typeof msg === "string" + ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? "") + : msg; + +const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { + const msg = + i18nConfig[locale]?.[id] ?? + i18nConfig[locale.replace("-", "_")]?.[id] ?? + defaultMessage; + if (msg == null) { + console.warn("[i18n]: unknown message id: %o (locale=%o)", id, locale); + return fallback === undefined ? `${id}` : fallback; + } + + return format(msg, variables); +}; + +const i18n = (id, params) => { + return i18nFormat({ id }, params); +}; + +// 将国际化的一些方法注入到目标对象&上下文中 +const _inject2 = (target) => { + target.i18n = i18n; + target.getLocale = getLocale; + target.setLocale = (locale) => { + setLocale(locale); + target.forceUpdate(); + }; + target._i18nText = (t) => { + // 优先取直接传过来的语料 + const localMsg = t[locale] ?? t[String(locale).replace("-", "_")]; + if (localMsg != null) { + return format(localMsg, t.params); + } + + // 其次用项目级别的 + const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); + if (projectMsg != null) { + return projectMsg; + } + + // 兜底用 use 指定的或默认语言的 + return format(t[t.use || "zh-CN"] ?? t.en_US, t.params); + }; + + // 注入到上下文中去 + if (target._context && target._context !== target) { + Object.assign(target._context, { + i18n, + getLocale, + setLocale: target.setLocale, + }); + } +}; + +export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/menuConfig.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/menuConfig.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/menuConfig.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/layouts/BasicLayout/menuConfig.js diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/pages/Test/index.css b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/pages/Test/index.css similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/pages/Test/index.css rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/pages/Test/index.css diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/pages/Test/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/pages/Test/index.jsx similarity index 99% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/pages/Test/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/pages/Test/index.jsx index 91e6d4cf2..186ea8577 100644 --- a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/pages/Test/index.jsx +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/pages/Test/index.jsx @@ -25,6 +25,8 @@ import utils, { RefsManager } from "../../utils"; import * as __$$i18n from "../../i18n"; +import __$$constants from "../../constants"; + import "./index.css"; const NextBlockCell = NextBlock.Cell; @@ -32,6 +34,10 @@ const NextBlockCell = NextBlock.Cell; class Test$$Page extends React.Component { _context = this; + get constants() { + return __$$constants || {}; + } + constructor(props, context) { super(props); diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/routes.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/routes.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/routes.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/routes.js diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo7-literal-condition2/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/react-app/demo7-literal-condition2/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo7-literal-condition2/schema.json5 diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.editorconfig b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.editorconfig similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.editorconfig rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.editorconfig diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/abc.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/abc.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/abc.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/abc.json diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/public/index.html b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/public/index.html similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/public/index.html rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/public/index.html diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/global.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/global.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/global.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/global.scss diff --git a/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/i18n.js new file mode 100644 index 000000000..1ae7c84b5 --- /dev/null +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/i18n.js @@ -0,0 +1,77 @@ +const i18nConfig = {}; + +let locale = + typeof navigator === "object" && typeof navigator.language === "string" + ? navigator.language + : "zh-CN"; + +const getLocale = () => locale; + +const setLocale = (target) => { + locale = target; +}; + +const isEmptyVariables = (variables) => + (Array.isArray(variables) && variables.length === 0) || + (typeof variables === "object" && + (!variables || Object.keys(variables).length === 0)); + +// 按低代码规范里面的要求进行变量替换 +const format = (msg, variables) => + typeof msg === "string" + ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? "") + : msg; + +const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { + const msg = + i18nConfig[locale]?.[id] ?? + i18nConfig[locale.replace("-", "_")]?.[id] ?? + defaultMessage; + if (msg == null) { + console.warn("[i18n]: unknown message id: %o (locale=%o)", id, locale); + return fallback === undefined ? `${id}` : fallback; + } + + return format(msg, variables); +}; + +const i18n = (id, params) => { + return i18nFormat({ id }, params); +}; + +// 将国际化的一些方法注入到目标对象&上下文中 +const _inject2 = (target) => { + target.i18n = i18n; + target.getLocale = getLocale; + target.setLocale = (locale) => { + setLocale(locale); + target.forceUpdate(); + }; + target._i18nText = (t) => { + // 优先取直接传过来的语料 + const localMsg = t[locale] ?? t[String(locale).replace("-", "_")]; + if (localMsg != null) { + return format(localMsg, t.params); + } + + // 其次用项目级别的 + const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); + if (projectMsg != null) { + return projectMsg; + } + + // 兜底用 use 指定的或默认语言的 + return format(t[t.use || "zh-CN"] ?? t.en_US, t.params); + }; + + // 注入到上下文中去 + if (target._context && target._context !== target) { + Object.assign(target._context, { + i18n, + getLocale, + setLocale: target.setLocale, + }); + } +}; + +export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/menuConfig.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/menuConfig.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/menuConfig.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/layouts/BasicLayout/menuConfig.js diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/pages/Example/index.css b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/pages/Example/index.css similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/pages/Example/index.css rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/pages/Example/index.css diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/pages/Example/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/pages/Example/index.jsx similarity index 96% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/pages/Example/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/pages/Example/index.jsx index 06bc59021..6c9993779 100644 --- a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/pages/Example/index.jsx +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/pages/Example/index.jsx @@ -12,6 +12,8 @@ import utils from "../../utils"; import * as __$$i18n from "../../i18n"; +import __$$constants from "../../constants"; + import "./index.css"; class Example$$Page extends React.Component { @@ -31,6 +33,10 @@ class Example$$Page extends React.Component { await this._dataSourceEngine.reloadDataSource(); }; + get constants() { + return __$$constants || {}; + } + constructor(props, context) { super(props); diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/routes.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/routes.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/routes.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/routes.js diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo8-datasource-prop/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/react-app/demo8-datasource-prop/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo8-datasource-prop/schema.json5 diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.editorconfig b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.editorconfig similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.editorconfig rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.editorconfig diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/abc.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/abc.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/abc.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/abc.json diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/public/index.html b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/public/index.html similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/public/index.html rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/public/index.html diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/components/Index/index.css b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/components/Index/index.css similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/components/Index/index.css rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/components/Index/index.css diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/components/Index/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/components/Index/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/components/Index/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/components/Index/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/global.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/global.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/global.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/global.scss diff --git a/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/i18n.js new file mode 100644 index 000000000..1ae7c84b5 --- /dev/null +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/i18n.js @@ -0,0 +1,77 @@ +const i18nConfig = {}; + +let locale = + typeof navigator === "object" && typeof navigator.language === "string" + ? navigator.language + : "zh-CN"; + +const getLocale = () => locale; + +const setLocale = (target) => { + locale = target; +}; + +const isEmptyVariables = (variables) => + (Array.isArray(variables) && variables.length === 0) || + (typeof variables === "object" && + (!variables || Object.keys(variables).length === 0)); + +// 按低代码规范里面的要求进行变量替换 +const format = (msg, variables) => + typeof msg === "string" + ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? "") + : msg; + +const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { + const msg = + i18nConfig[locale]?.[id] ?? + i18nConfig[locale.replace("-", "_")]?.[id] ?? + defaultMessage; + if (msg == null) { + console.warn("[i18n]: unknown message id: %o (locale=%o)", id, locale); + return fallback === undefined ? `${id}` : fallback; + } + + return format(msg, variables); +}; + +const i18n = (id, params) => { + return i18nFormat({ id }, params); +}; + +// 将国际化的一些方法注入到目标对象&上下文中 +const _inject2 = (target) => { + target.i18n = i18n; + target.getLocale = getLocale; + target.setLocale = (locale) => { + setLocale(locale); + target.forceUpdate(); + }; + target._i18nText = (t) => { + // 优先取直接传过来的语料 + const localMsg = t[locale] ?? t[String(locale).replace("-", "_")]; + if (localMsg != null) { + return format(localMsg, t.params); + } + + // 其次用项目级别的 + const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); + if (projectMsg != null) { + return projectMsg; + } + + // 兜底用 use 指定的或默认语言的 + return format(t[t.use || "zh-CN"] ?? t.en_US, t.params); + }; + + // 注入到上下文中去 + if (target._context && target._context !== target) { + Object.assign(target._context, { + i18n, + getLocale, + setLocale: target.setLocale, + }); + } +}; + +export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/menuConfig.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/menuConfig.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/menuConfig.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/layouts/BasicLayout/menuConfig.js diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/routes.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/routes.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/routes.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/routes.js diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo9-datasource-engine/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/react-app/demo9-datasource-engine/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo9-datasource-engine/schema.json5 diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/.editorconfig b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/.editorconfig similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/.editorconfig rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/.editorconfig diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/abc.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/abc.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/abc.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/abc.json diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/public/index.html b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/public/index.html similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/public/index.html rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/public/index.html diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/global.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/global.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/global.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/global.scss diff --git a/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/i18n.js new file mode 100644 index 000000000..1ae7c84b5 --- /dev/null +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/i18n.js @@ -0,0 +1,77 @@ +const i18nConfig = {}; + +let locale = + typeof navigator === "object" && typeof navigator.language === "string" + ? navigator.language + : "zh-CN"; + +const getLocale = () => locale; + +const setLocale = (target) => { + locale = target; +}; + +const isEmptyVariables = (variables) => + (Array.isArray(variables) && variables.length === 0) || + (typeof variables === "object" && + (!variables || Object.keys(variables).length === 0)); + +// 按低代码规范里面的要求进行变量替换 +const format = (msg, variables) => + typeof msg === "string" + ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? "") + : msg; + +const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { + const msg = + i18nConfig[locale]?.[id] ?? + i18nConfig[locale.replace("-", "_")]?.[id] ?? + defaultMessage; + if (msg == null) { + console.warn("[i18n]: unknown message id: %o (locale=%o)", id, locale); + return fallback === undefined ? `${id}` : fallback; + } + + return format(msg, variables); +}; + +const i18n = (id, params) => { + return i18nFormat({ id }, params); +}; + +// 将国际化的一些方法注入到目标对象&上下文中 +const _inject2 = (target) => { + target.i18n = i18n; + target.getLocale = getLocale; + target.setLocale = (locale) => { + setLocale(locale); + target.forceUpdate(); + }; + target._i18nText = (t) => { + // 优先取直接传过来的语料 + const localMsg = t[locale] ?? t[String(locale).replace("-", "_")]; + if (localMsg != null) { + return format(localMsg, t.params); + } + + // 其次用项目级别的 + const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); + if (projectMsg != null) { + return projectMsg; + } + + // 兜底用 use 指定的或默认语言的 + return format(t[t.use || "zh-CN"] ?? t.en_US, t.params); + }; + + // 注入到上下文中去 + if (target._context && target._context !== target) { + Object.assign(target._context, { + i18n, + getLocale, + setLocale: target.setLocale, + }); + } +}; + +export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/menuConfig.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/menuConfig.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/menuConfig.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/layouts/BasicLayout/menuConfig.js diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/pages/Test/index.css b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/pages/Test/index.css similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/pages/Test/index.css rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/pages/Test/index.css diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/pages/Test/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/pages/Test/index.jsx similarity index 99% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/pages/Test/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/pages/Test/index.jsx index 01a79b38e..3515731e2 100644 --- a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/pages/Test/index.jsx +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/pages/Test/index.jsx @@ -29,6 +29,8 @@ import utils, { RefsManager } from "../../utils"; import * as __$$i18n from "../../i18n"; +import __$$constants from "../../constants"; + import "./index.css"; const AliAutoDivDefault = AliAutoDiv.default; @@ -40,6 +42,10 @@ const NextBlockCell = NextBlock.Cell; class Test$$Page extends React.Component { _context = this; + get constants() { + return __$$constants || {}; + } + constructor(props, context) { super(props); diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/routes.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/routes.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/routes.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/routes.js diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo_10-jsslot/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_10-jsslot/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_10-jsslot/schema.json5 diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.editorconfig b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.editorconfig similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.editorconfig rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.editorconfig diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/abc.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/abc.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/abc.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/abc.json diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/public/index.html b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/public/index.html similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/public/index.html rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/public/index.html diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/global.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/global.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/global.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/global.scss diff --git a/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/i18n.js new file mode 100644 index 000000000..1ae7c84b5 --- /dev/null +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/i18n.js @@ -0,0 +1,77 @@ +const i18nConfig = {}; + +let locale = + typeof navigator === "object" && typeof navigator.language === "string" + ? navigator.language + : "zh-CN"; + +const getLocale = () => locale; + +const setLocale = (target) => { + locale = target; +}; + +const isEmptyVariables = (variables) => + (Array.isArray(variables) && variables.length === 0) || + (typeof variables === "object" && + (!variables || Object.keys(variables).length === 0)); + +// 按低代码规范里面的要求进行变量替换 +const format = (msg, variables) => + typeof msg === "string" + ? msg.replace(/\$\{(\w+)\}/g, (match, key) => variables?.[key] ?? "") + : msg; + +const i18nFormat = ({ id, defaultMessage, fallback }, variables) => { + const msg = + i18nConfig[locale]?.[id] ?? + i18nConfig[locale.replace("-", "_")]?.[id] ?? + defaultMessage; + if (msg == null) { + console.warn("[i18n]: unknown message id: %o (locale=%o)", id, locale); + return fallback === undefined ? `${id}` : fallback; + } + + return format(msg, variables); +}; + +const i18n = (id, params) => { + return i18nFormat({ id }, params); +}; + +// 将国际化的一些方法注入到目标对象&上下文中 +const _inject2 = (target) => { + target.i18n = i18n; + target.getLocale = getLocale; + target.setLocale = (locale) => { + setLocale(locale); + target.forceUpdate(); + }; + target._i18nText = (t) => { + // 优先取直接传过来的语料 + const localMsg = t[locale] ?? t[String(locale).replace("-", "_")]; + if (localMsg != null) { + return format(localMsg, t.params); + } + + // 其次用项目级别的 + const projectMsg = i18nFormat({ id: t.key, fallback: null }, t.params); + if (projectMsg != null) { + return projectMsg; + } + + // 兜底用 use 指定的或默认语言的 + return format(t[t.use || "zh-CN"] ?? t.en_US, t.params); + }; + + // 注入到上下文中去 + if (target._context && target._context !== target) { + Object.assign(target._context, { + i18n, + getLocale, + setLocale: target.setLocale, + }); + } +}; + +export { getLocale, setLocale, i18n, i18nFormat, _inject2 }; diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/index.jsx diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/menuConfig.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/menuConfig.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/menuConfig.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/layouts/BasicLayout/menuConfig.js diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/pages/Test/index.css b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/pages/Test/index.css similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/pages/Test/index.css rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/pages/Test/index.css diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/pages/Test/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/pages/Test/index.jsx similarity index 99% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/pages/Test/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/pages/Test/index.jsx index 8d9869ea6..c05477e56 100644 --- a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/pages/Test/index.jsx +++ b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/pages/Test/index.jsx @@ -29,6 +29,8 @@ import utils, { RefsManager } from "../../utils"; import * as __$$i18n from "../../i18n"; +import __$$constants from "../../constants"; + import "./index.css"; const AliAutoDivDefault = AliAutoDiv.default; @@ -40,6 +42,10 @@ const NextBlockCell = NextBlock.Cell; class Test$$Page extends React.Component { _context = this; + get constants() { + return __$$constants || {}; + } + constructor(props, context) { super(props); diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/routes.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/routes.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/routes.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/routes.js diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/react-app/demo_11-jsslot-2/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/react-app/demo_11-jsslot-2/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/react-app/demo_11-jsslot-2/schema.json5 diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/.editorconfig b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/.editorconfig similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/.editorconfig rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/.editorconfig diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/.eslintignore b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/.eslintignore similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/.eslintignore rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/.eslintignore diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/.eslintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/.eslintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/.eslintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/.eslintrc.js diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/.gitignore b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/.gitignore similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/.gitignore rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/.gitignore diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/.prettierignore b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/.prettierignore similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/.prettierignore rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/.prettierignore diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/.prettierrc.js b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/.prettierrc.js similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/.prettierrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/.prettierrc.js diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/.stylelintignore b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/.stylelintignore similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/.stylelintignore rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/.stylelintignore diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/.stylelintrc.js b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/.stylelintrc.js similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/.stylelintrc.js rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/.stylelintrc.js diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/README.md b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/README.md similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/README.md rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/README.md diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/abc.json b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/abc.json similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/abc.json rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/abc.json diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/build.json b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/build.json similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/build.json rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/build.json diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/jsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/jsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/jsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/jsconfig.json diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/package.json b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/package.json similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/package.json rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/package.json diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/public/index.html b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/public/index.html similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/public/index.html rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/public/index.html diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/app.js b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/app.js similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/app.js rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/app.js diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/constants.js b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/constants.js similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/constants.js rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/constants.js diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/global.scss b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/global.scss similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/global.scss rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/global.scss diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/i18n.js b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/i18n.js similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/i18n.js rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/i18n.js diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.jsx diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/Footer/index.module.scss diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.jsx diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/Logo/index.module.scss diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/components/PageNav/index.jsx diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/index.jsx diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/menuConfig.js b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/menuConfig.js similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/menuConfig.js rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/layouts/BasicLayout/menuConfig.js diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/pages/Test/index.css b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/pages/Test/index.css similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/pages/Test/index.css rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/pages/Test/index.css diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/pages/Test/index.jsx b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/pages/Test/index.jsx similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/pages/Test/index.jsx rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/pages/Test/index.jsx diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/routes.js b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/routes.js similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/routes.js rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/routes.js diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/utils.js b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/utils.js similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/src/utils.js rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/src/utils.js diff --git a/modules/code-generator/test-cases/react-module/demo1/expected/demo-project/tsconfig.json b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/tsconfig.json similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/expected/demo-project/tsconfig.json rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/expected/demo-project/tsconfig.json diff --git a/modules/code-generator/test-cases/react-module/demo1/schema.json5 b/modules/code-generator/tests/fixtures/test-cases/react-module/demo1/schema.json5 similarity index 100% rename from modules/code-generator/test-cases/react-module/demo1/schema.json5 rename to modules/code-generator/tests/fixtures/test-cases/react-module/demo1/schema.json5 diff --git a/modules/code-generator/tests/public/solutions/rax-app.test.ts b/modules/code-generator/tests/public/solutions/rax-app.test.ts index 1912b7b5d..6d96a8e89 100644 --- a/modules/code-generator/tests/public/solutions/rax-app.test.ts +++ b/modules/code-generator/tests/public/solutions/rax-app.test.ts @@ -17,7 +17,7 @@ import type { ProjectSchema } from '@alilc/lowcode-types'; jest.setTimeout(15 * 1000); -const TEST_CASES_DIR = path.join(__dirname, '../../../test-cases/rax-app'); +const TEST_CASES_DIR = path.join(__dirname, '../../fixtures/test-cases/rax-app'); const SHOULD_UPDATE_EXPECTED = process.env.UPDATE_EXPECTED === 'true'; getSubDirectoriesSync(TEST_CASES_DIR).forEach(defineTest); diff --git a/modules/code-generator/tests/public/solutions/react-app.test.ts b/modules/code-generator/tests/public/solutions/react-app.test.ts index bb9dc0ae5..aff7105ed 100644 --- a/modules/code-generator/tests/public/solutions/react-app.test.ts +++ b/modules/code-generator/tests/public/solutions/react-app.test.ts @@ -16,7 +16,7 @@ import type { ProjectSchema } from '@alilc/lowcode-types'; jest.setTimeout(15 * 1000); -const TEST_CASES_DIR = path.join(__dirname, '../../../test-cases/react-app'); +const TEST_CASES_DIR = path.join(__dirname, '../../fixtures/test-cases/react-app'); const SHOULD_UPDATE_EXPECTED = process.env.UPDATE_EXPECTED === 'true'; getSubDirectoriesSync(TEST_CASES_DIR).forEach(defineTest); diff --git a/modules/code-generator/tsconfig.json b/modules/code-generator/tsconfig.json index d9a27b0f2..cb0cbcb0d 100644 --- a/modules/code-generator/tsconfig.json +++ b/modules/code-generator/tsconfig.json @@ -4,5 +4,5 @@ "outDir": "lib" }, "include": ["src/**/*.ts"], - "exclude": ["./tests", "./test-cases", "../types", "node_modules"] + "exclude": ["./tests", "tests/fixtures/test-cases", "../types", "node_modules"] } diff --git a/package.json b/package.json index 768581f5b..7e70b38ae 100644 --- a/package.json +++ b/package.json @@ -46,9 +46,10 @@ "gulp": "^4.0.2", "husky": "^7.0.4", "lerna": "^4.0.0", - "typescript": "^4.5.5", + "typescript": "4.6.2", "yarn": "^1.22.17", - "rimraf": "^3.0.2" + "rimraf": "^3.0.2", + "@types/react-router": "5.1.18" }, "engines": { "node": ">=14.17.0 <18" diff --git a/packages/designer/jest.config.js b/packages/designer/jest.config.js index f8a7e9f98..70a1da03d 100644 --- a/packages/designer/jest.config.js +++ b/packages/designer/jest.config.js @@ -11,7 +11,7 @@ const jestConfig = { // }, // testMatch: ['**/node-children.test.ts'], // testMatch: ['**/history/history.test.ts'], - // testMatch: ['**/plugin/plugin-manager.test.ts'], + // testMatch: ['**/host-view.test.tsx'], // testMatch: ['(/tests?/.*(test))\\.[jt]s$'], transformIgnorePatterns: [ `/node_modules/(?!${esModules})/`, diff --git a/packages/designer/package.json b/packages/designer/package.json index aca5e7365..830d2fa04 100644 --- a/packages/designer/package.json +++ b/packages/designer/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-designer", - "version": "1.0.16", + "version": "1.0.17", "description": "Designer for Ali LowCode Engine", "main": "lib/index.js", "module": "es/index.js", @@ -15,10 +15,10 @@ }, "license": "MIT", "dependencies": { - "@alilc/lowcode-editor-core": "1.0.16", - "@alilc/lowcode-shell": "1.0.16", - "@alilc/lowcode-types": "1.0.16", - "@alilc/lowcode-utils": "1.0.16", + "@alilc/lowcode-editor-core": "1.0.17", + "@alilc/lowcode-shell": "1.0.17", + "@alilc/lowcode-types": "1.0.17", + "@alilc/lowcode-utils": "1.0.17", "classnames": "^2.2.6", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.5", diff --git a/packages/designer/src/builtin-simulator/host.ts b/packages/designer/src/builtin-simulator/host.ts index d12427074..edb823002 100644 --- a/packages/designer/src/builtin-simulator/host.ts +++ b/packages/designer/src/builtin-simulator/host.ts @@ -69,6 +69,7 @@ import { LiveEditing } from './live-editing/live-editing'; import { Project } from '../project'; import { Scroller } from '../designer/scroller'; import { isElementNode, isDOMNodeVisible } from '../utils/misc'; +import { debounce } from 'lodash'; export interface LibraryItem extends Package{ package: string; @@ -176,6 +177,8 @@ export class BuiltinSimulatorHost implements ISimulatorHost { return { appHelper: engineConfig.get('appHelper'), - i18n: this.project.i18n, }; }); + + this.i18nConsumer = new ResourceConsumer(() => this.project.i18n); + transactionManager.onStartTransaction(() => { this.stopAutoRepaintNode(); }, TransitionType.REPAINT); + // 防止批量调用 transaction 时，执行多次 rerender + const rerender = debounce(this.rerender.bind(this), 28); transactionManager.onEndTransaction(() => { - this.rerender(); + rerender(); this.enableAutoRepaintNode(); }, TransitionType.REPAINT); } @@ -251,6 +258,14 @@ export class BuiltinSimulatorHost implements ISimulatorHost { private _consuming?: () => void; + private _firstConsumed = false; + + private resolveFirst?: (resolve?: any) => void; + constructor(provider: () => T, private consumer?: RendererConsumer) { + makeObservable(this); this._providing = autorun(() => { this._data = provider(); }); @@ -46,7 +51,7 @@ export default class ResourceConsumer { } const rendererConsumer = this.consumer!; - consumer = data => rendererConsumer(consumerOrRenderer, data); + consumer = (data) => rendererConsumer(consumerOrRenderer, data); } else { consumer = consumerOrRenderer; } @@ -56,8 +61,8 @@ export default class ResourceConsumer { } await consumer(this._data); // TODO: catch error and report - if (this.resovleFirst) { - this.resovleFirst(); + if (this.resolveFirst) { + this.resolveFirst(); } else { this._firstConsumed = true; } @@ -74,16 +79,12 @@ export default class ResourceConsumer { this.emitter.removeAllListeners(); } - private _firstConsumed = false; - - private resovleFirst?: () => void; - waitFirstConsume(): Promise { if (this._firstConsumed) { return Promise.resolve(); } - return new Promise(resolve => { - this.resovleFirst = resolve; + return new Promise((resolve) => { + this.resolveFirst = resolve; }); } } diff --git a/packages/designer/src/designer/dragon.ts b/packages/designer/src/designer/dragon.ts index dfdb88bfe..d45d05c3c 100644 --- a/packages/designer/src/designer/dragon.ts +++ b/packages/designer/src/designer/dragon.ts @@ -408,7 +408,7 @@ export class Dragon { if (e) { const { isRGL, rglNode } = getRGL(e); /* istanbul ignore next */ - if (isRGL && this._canDrop) { + if (isRGL && this._canDrop && this._dragging) { const tarNode = dragObject.nodes[0]; if (rglNode.id !== tarNode.id) { // 避免死循环 diff --git a/packages/designer/src/document/node/props/prop.ts b/packages/designer/src/document/node/props/prop.ts index 87fcc5310..78349154f 100644 --- a/packages/designer/src/document/node/props/prop.ts +++ b/packages/designer/src/document/node/props/prop.ts @@ -173,7 +173,7 @@ export class Prop implements IPropParent { const values = this.items!.map((prop) => { return prop.export(stage); }); - if (values.every(val => val === undefined)) { + if (values.every((val) => val === undefined)) { return undefined; } return values; @@ -314,14 +314,21 @@ export class Prop implements IPropParent { @action setAsSlot(data: JSSlot) { this._type = 'slot'; - const slotSchema: SlotSchema = { - componentName: 'Slot', - title: data.title, - id: data.id, - name: data.name, - params: data.params, - children: data.value, - }; + let slotSchema: SlotSchema; + // 当 data.value 的结构为 { componentName: 'Slot' } 时，直接当成 slotSchema 使用 + if ((isPlainObject(data.value) && data.value?.componentName === 'Slot')) { + slotSchema = data.value as SlotSchema; + } else { + slotSchema = { + componentName: 'Slot', + title: data.title, + id: data.id, + name: data.name, + params: data.params, + children: data.value, + }; + } + if (this._slotNode) { this._slotNode.import(slotSchema); } else { diff --git a/packages/designer/src/locale/index.ts b/packages/designer/src/locale/index.ts index a912240fa..4cb3b53cf 100644 --- a/packages/designer/src/locale/index.ts +++ b/packages/designer/src/locale/index.ts @@ -1,10 +1,10 @@ import { createIntl } from '@alilc/lowcode-editor-core'; -import en_US from './en-US.json'; -import zh_CN from './zh-CN.json'; +import enUS from './en-US.json'; +import zhCN from './zh-CN.json'; const { intl, intlNode, getLocale, setLocale } = createIntl({ - 'en-US': en_US, - 'zh-CN': zh_CN, + 'en-US': enUS, + 'zh-CN': zhCN, }); export { intl, intlNode, getLocale, setLocale }; diff --git a/packages/designer/src/project/project.ts b/packages/designer/src/project/project.ts index 726b0706f..2442cc09d 100644 --- a/packages/designer/src/project/project.ts +++ b/packages/designer/src/project/project.ts @@ -1,7 +1,7 @@ import { EventEmitter } from 'events'; import { obx, computed, makeObservable, action } from '@alilc/lowcode-editor-core'; import { Designer } from '../designer'; -import { DocumentModel, isDocumentModel, isPageSchema } from '../document'; +import { DocumentModel, isDocumentModel } from '../document'; import { ProjectSchema, RootSchema, @@ -54,7 +54,7 @@ export class Project { } @obx.ref private _i18n: any = {}; - get i18n(): any { + @computed get i18n(): any { return this._i18n; } set i18n(value: any) { diff --git a/packages/designer/tests/builtin-simulator/host-view.test.tsx b/packages/designer/tests/builtin-simulator/host-view.test.tsx index ae3581df5..38ce43bb4 100644 --- a/packages/designer/tests/builtin-simulator/host-view.test.tsx +++ b/packages/designer/tests/builtin-simulator/host-view.test.tsx @@ -26,7 +26,7 @@ describe('host-view 测试', () => { designer = null; }); - it('host-view', () => { + it.skip('host-view', () => { const hostView = render(); }); }); diff --git a/packages/designer/tests/document/document-model/__snapshots__/document-model.test.ts.snap b/packages/designer/tests/document/document-model/__snapshots__/document-model.test.ts.snap index 6448ab03d..906313303 100644 --- a/packages/designer/tests/document/document-model/__snapshots__/document-model.test.ts.snap +++ b/packages/designer/tests/document/document-model/__snapshots__/document-model.test.ts.snap @@ -98,10 +98,10 @@ Object { "__style__": Object {}, "behavior": "NORMAL", "content": Object { - "en_US": "Title", + "en-US": "Title", "type": "i18n", - "use": "zh_CN", - "zh_CN": "个人信息", + "use": "zh-CN", + "zh-CN": "个人信息", }, "fieldId": "text_k1ow3h1j", "maxLine": 0, @@ -148,13 +148,13 @@ Object { "__useMediator": "value", "addonAfter": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "addonBefore": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "autoFocus": false, "autoHeight": false, @@ -166,10 +166,10 @@ Object { "hasLimitHint": false, "htmlType": "input", "label": Object { - "en_US": "TextField", + "en-US": "TextField", "type": "i18n", - "use": "zh_CN", - "zh_CN": "姓名", + "use": "zh-CN", + "zh-CN": "姓名", }, "labelAlign": "top", "labelColOffset": 0, @@ -177,25 +177,25 @@ Object { "labelTextAlign": "right", "labelTipsIcon": "", "labelTipsText": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "labelTipsTypes": "none", "placeholder": Object { - "en_US": "please input", + "en-US": "please input", "type": "i18n", - "use": "zh_CN", - "zh_CN": "请输入", + "use": "zh-CN", + "zh-CN": "请输入", }, "rows": 4, "size": "medium", "state": "", "tips": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "zh_CN": "", + "zh-CN": "", }, "trim": false, "validation": Array [ @@ -205,8 +205,8 @@ Object { ], "value": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "wrapperColOffset": 0, "wrapperColSpan": 0, @@ -226,13 +226,13 @@ Object { "__useMediator": "value", "addonAfter": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "addonBefore": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "autoFocus": false, "autoHeight": false, @@ -244,10 +244,10 @@ Object { "hasLimitHint": false, "htmlType": "input", "label": Object { - "en_US": "TextField", + "en-US": "TextField", "type": "i18n", - "use": "zh_CN", - "zh_CN": "英文名", + "use": "zh-CN", + "zh-CN": "英文名", }, "labelAlign": "top", "labelColOffset": 0, @@ -255,32 +255,32 @@ Object { "labelTextAlign": "right", "labelTipsIcon": "", "labelTipsText": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "labelTipsTypes": "none", "placeholder": Object { - "en_US": "please input", + "en-US": "please input", "type": "i18n", - "use": "zh_CN", - "zh_CN": "请输入", + "use": "zh-CN", + "zh-CN": "请输入", }, "rows": 4, "size": "medium", "state": "", "tips": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "zh_CN": "", + "zh-CN": "", }, "trim": false, "validation": Array [], "value": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "wrapperColOffset": 0, "wrapperColSpan": 0, @@ -300,13 +300,13 @@ Object { "__useMediator": "value", "addonAfter": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "addonBefore": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "autoFocus": false, "autoHeight": false, @@ -318,10 +318,10 @@ Object { "hasLimitHint": false, "htmlType": "input", "label": Object { - "en_US": "TextField", + "en-US": "TextField", "type": "i18n", - "use": "zh_CN", - "zh_CN": "职位", + "use": "zh-CN", + "zh-CN": "职位", }, "labelAlign": "top", "labelColOffset": 0, @@ -329,32 +329,32 @@ Object { "labelTextAlign": "right", "labelTipsIcon": "", "labelTipsText": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "labelTipsTypes": "none", "placeholder": Object { - "en_US": "please input", + "en-US": "please input", "type": "i18n", - "use": "zh_CN", - "zh_CN": "请输入", + "use": "zh-CN", + "zh-CN": "请输入", }, "rows": 4, "size": "medium", "state": "", "tips": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "zh_CN": "", + "zh-CN": "", }, "trim": false, "validation": Array [], "value": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "wrapperColOffset": 0, "wrapperColSpan": 0, @@ -390,13 +390,13 @@ Object { "__useMediator": "value", "addonAfter": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "addonBefore": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "autoFocus": false, "autoHeight": false, @@ -408,10 +408,10 @@ Object { "hasLimitHint": false, "htmlType": "input", "label": Object { - "en_US": "TextField", + "en-US": "TextField", "type": "i18n", - "use": "zh_CN", - "zh_CN": "花名", + "use": "zh-CN", + "zh-CN": "花名", }, "labelAlign": "top", "labelColOffset": 0, @@ -419,32 +419,32 @@ Object { "labelTextAlign": "right", "labelTipsIcon": "", "labelTipsText": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "labelTipsTypes": "none", "placeholder": Object { - "en_US": "please input", + "en-US": "please input", "type": "i18n", - "use": "zh_CN", - "zh_CN": "请输入", + "use": "zh-CN", + "zh-CN": "请输入", }, "rows": 4, "size": "medium", "state": "", "tips": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "zh_CN": "", + "zh-CN": "", }, "trim": false, "validation": Array [], "value": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "wrapperColOffset": 0, "wrapperColSpan": 0, @@ -471,9 +471,9 @@ Object { "sid": "opt_k1owc4t2", "text": Object { "__sid__": "param_k1owc4tb", - "en_US": "Option 1", + "en-US": "Option 1", "type": "i18n", - "zh_CN": "男", + "zh-CN": "男", }, "value": "M", }, @@ -483,9 +483,9 @@ Object { "sid": "opt_k1owc4t3", "text": Object { "__sid__": "param_k1owc4tf", - "en_US": "Option 2", + "en-US": "Option 2", "type": "i18n", - "zh_CN": "女", + "zh-CN": "女", }, "value": "F", }, @@ -498,10 +498,10 @@ Object { "hasClear": false, "hasSelectAll": false, "label": Object { - "en_US": "SelectField", + "en-US": "SelectField", "type": "i18n", - "use": "zh_CN", - "zh_CN": "性别", + "use": "zh-CN", + "zh-CN": "性别", }, "labelAlign": "top", "labelColOffset": 0, @@ -509,30 +509,30 @@ Object { "labelTextAlign": "right", "labelTipsIcon": "", "labelTipsText": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "labelTipsTypes": "none", "mode": "single", "notFoundContent": Object { "type": "i18n", - "use": "zh_CN", + "use": "zh-CN", }, "placeholder": Object { - "en_US": "please select", + "en-US": "please select", "type": "i18n", - "use": "zh_CN", - "zh_CN": "请选择", + "use": "zh-CN", + "zh-CN": "请选择", }, "searchDelay": 300, "showSearch": false, "size": "medium", "tips": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "zh_CN": "", + "zh-CN": "", }, "validation": Array [ Object { @@ -604,23 +604,23 @@ Object { "dividerNoInset": false, "extra": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "fieldId": "card_k1ow3h1l", "showHeadDivider": true, "showTitleBullet": true, "subTitle": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "title": Object { - "en_US": "Title", + "en-US": "Title", "type": "i18n", - "use": "zh_CN", - "zh_CN": "基本信息", + "use": "zh-CN", + "zh-CN": "基本信息", }, }, "title": "", @@ -642,13 +642,13 @@ Object { "__useMediator": "value", "addonAfter": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "addonBefore": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "autoFocus": false, "autoHeight": false, @@ -660,10 +660,10 @@ Object { "hasLimitHint": false, "htmlType": "input", "label": Object { - "en_US": "TextField", + "en-US": "TextField", "type": "i18n", - "use": "zh_CN", - "zh_CN": "所属部门", + "use": "zh-CN", + "zh-CN": "所属部门", }, "labelAlign": "top", "labelColOffset": 0, @@ -671,32 +671,32 @@ Object { "labelTextAlign": "right", "labelTipsIcon": "", "labelTipsText": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "labelTipsTypes": "none", "placeholder": Object { - "en_US": "please input", + "en-US": "please input", "type": "i18n", - "use": "zh_CN", - "zh_CN": "请输入", + "use": "zh-CN", + "zh-CN": "请输入", }, "rows": 4, "size": "medium", "state": "", "tips": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "zh_CN": "", + "zh-CN": "", }, "trim": false, "validation": Array [], "value": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "wrapperColOffset": 0, "wrapperColSpan": 0, @@ -720,13 +720,13 @@ Object { "__useMediator": "value", "addonAfter": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "addonBefore": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "autoFocus": false, "autoHeight": false, @@ -738,10 +738,10 @@ Object { "hasLimitHint": false, "htmlType": "input", "label": Object { - "en_US": "TextField", + "en-US": "TextField", "type": "i18n", - "use": "zh_CN", - "zh_CN": "主管", + "use": "zh-CN", + "zh-CN": "主管", }, "labelAlign": "top", "labelColOffset": 0, @@ -749,32 +749,32 @@ Object { "labelTextAlign": "right", "labelTipsIcon": "", "labelTipsText": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "labelTipsTypes": "none", "placeholder": Object { - "en_US": "please input", + "en-US": "please input", "type": "i18n", - "use": "zh_CN", - "zh_CN": "请输入", + "use": "zh-CN", + "zh-CN": "请输入", }, "rows": 4, "size": "medium", "state": "", "tips": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "zh_CN": "", + "zh-CN": "", }, "trim": false, "validation": Array [], "value": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "wrapperColOffset": 0, "wrapperColSpan": 0, @@ -810,13 +810,13 @@ Object { "__useMediator": "value", "addonAfter": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "addonBefore": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "autoFocus": false, "autoHeight": false, @@ -828,10 +828,10 @@ Object { "hasLimitHint": false, "htmlType": "input", "label": Object { - "en_US": "TextField", + "en-US": "TextField", "type": "i18n", - "use": "zh_CN", - "zh_CN": "HRG", + "use": "zh-CN", + "zh-CN": "HRG", }, "labelAlign": "top", "labelColOffset": 0, @@ -839,32 +839,32 @@ Object { "labelTextAlign": "right", "labelTipsIcon": "", "labelTipsText": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "labelTipsTypes": "none", "placeholder": Object { - "en_US": "please input", + "en-US": "please input", "type": "i18n", - "use": "zh_CN", - "zh_CN": "请输入", + "use": "zh-CN", + "zh-CN": "请输入", }, "rows": 4, "size": "medium", "state": "", "tips": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "zh_CN": "", + "zh-CN": "", }, "trim": false, "validation": Array [], "value": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "wrapperColOffset": 0, "wrapperColSpan": 0, @@ -930,23 +930,23 @@ Object { "dividerNoInset": false, "extra": Object { "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "fieldId": "card_k1ow3h1m", "showHeadDivider": true, "showTitleBullet": true, "subTitle": Object { - "en_US": "", + "en-US": "", "type": "i18n", - "use": "zh_CN", - "zh_CN": "", + "use": "zh-CN", + "zh-CN": "", }, "title": Object { - "en_US": "Title", + "en-US": "Title", "type": "i18n", - "use": "zh_CN", - "zh_CN": "部门信息", + "use": "zh-CN", + "zh-CN": "部门信息", }, }, "title": "", @@ -969,10 +969,10 @@ Object { "behavior": "NORMAL", "className": "button_kgaqfbm7", "content": Object { - "en_US": "Button", + "en-US": "Button", "type": "i18n", - "use": "zh_CN", - "zh_CN": "提交", + "use": "zh-CN", + "zh-CN": "提交", }, "fieldId": "button_k1ow3h1n", "loading": false, @@ -1012,10 +1012,10 @@ Object { "behavior": "NORMAL", "className": "button_kgaqfbm8", "content": Object { - "en_US": "Button", + "en-US": "Button", "type": "i18n", - "use": "zh_CN", - "zh_CN": "取消", + "use": "zh-CN", + "zh-CN": "取消", }, "fieldId": "button_k1ow3h1p", "greeting": Object { diff --git a/packages/designer/tests/fixtures/schema/form-with-modal.ts b/packages/designer/tests/fixtures/schema/form-with-modal.ts index 0e0b4bfbd..4c0fb9064 100644 --- a/packages/designer/tests/fixtures/schema/form-with-modal.ts +++ b/packages/designer/tests/fixtures/schema/form-with-modal.ts @@ -53,9 +53,9 @@ export default { props: { title: { type: 'i18n', - use: 'zh_CN', - en_US: 'Dialog Title', - zh_CN: 'Dialog标题', + use: 'zh-CN', + 'en-US': 'Dialog Title', + 'zh-CN': 'Dialog标题', }, visible: false, hasMask: true, @@ -66,15 +66,15 @@ export default { footerActions: 'cancel,ok', confirmText: { type: 'i18n', - use: 'zh_CN', - en_US: 'Confirm', - zh_CN: '确定', + use: 'zh-CN', + 'en-US': 'Confirm', + 'zh-CN': '确定', }, cancelText: { type: 'i18n', - use: 'zh_CN', - en_US: 'Cancel', - zh_CN: '取消', + use: 'zh-CN', + 'en-US': 'Cancel', + 'zh-CN': '取消', }, confirmStyle: 'primary', confirmState: '确定', @@ -106,9 +106,9 @@ export default { showTitle: false, behavior: 'NORMAL', content: { - use: 'zh_CN', - en_US: 'Title', - zh_CN: '个人信息', + use: 'zh-CN', + 'en-US': 'Title', + 'zh-CN': '个人信息', type: 'i18n', }, __style__: {}, @@ -179,22 +179,22 @@ export default { props: { __slot__title: false, subTitle: { - use: 'zh_CN', - en_US: '', - zh_CN: '', + use: 'zh-CN', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, __slot__subTitle: false, extra: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, className: 'card_kgaqfbm5', title: { - use: 'zh_CN', - en_US: 'Title', - zh_CN: '基本信息', + use: 'zh-CN', + 'en-US': 'Title', + 'zh-CN': '基本信息', type: 'i18n', }, __slot__extra: false, @@ -243,28 +243,28 @@ export default { hasClear: false, autoFocus: false, tips: { - en_US: '', - zh_CN: '', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, trim: false, labelTextAlign: 'right', placeholder: { - use: 'zh_CN', - en_US: 'please input', - zh_CN: '请输入', + use: 'zh-CN', + 'en-US': 'please input', + 'zh-CN': '请输入', type: 'i18n', }, state: '', behavior: 'NORMAL', value: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, addonBefore: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, validation: [ @@ -280,9 +280,9 @@ export default { autoHeight: false, labelColOffset: 0, label: { - use: 'zh_CN', - en_US: 'TextField', - zh_CN: '姓名', + use: 'zh-CN', + 'en-US': 'TextField', + 'zh-CN': '姓名', type: 'i18n', }, __category__: 'form', @@ -290,8 +290,8 @@ export default { wrapperColSpan: 0, rows: 4, addonAfter: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, wrapperColOffset: 0, @@ -302,9 +302,9 @@ export default { labelTipsIcon: '', labelTipsText: { type: 'i18n', - use: 'zh_CN', - en_US: null, - zh_CN: '', + use: 'zh-CN', + 'en-US': null, + 'zh-CN': '', }, }, condition: true, @@ -317,28 +317,28 @@ export default { hasClear: false, autoFocus: false, tips: { - en_US: '', - zh_CN: '', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, trim: false, labelTextAlign: 'right', placeholder: { - use: 'zh_CN', - en_US: 'please input', - zh_CN: '请输入', + use: 'zh-CN', + 'en-US': 'please input', + 'zh-CN': '请输入', type: 'i18n', }, state: '', behavior: 'NORMAL', value: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, addonBefore: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, validation: [], @@ -350,9 +350,9 @@ export default { autoHeight: false, labelColOffset: 0, label: { - use: 'zh_CN', - en_US: 'TextField', - zh_CN: '英文名', + use: 'zh-CN', + 'en-US': 'TextField', + 'zh-CN': '英文名', type: 'i18n', }, __category__: 'form', @@ -360,8 +360,8 @@ export default { wrapperColSpan: 0, rows: 4, addonAfter: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, wrapperColOffset: 0, @@ -372,9 +372,9 @@ export default { labelTipsIcon: '', labelTipsText: { type: 'i18n', - use: 'zh_CN', - en_US: null, - zh_CN: '', + use: 'zh-CN', + 'en-US': null, + 'zh-CN': '', }, }, condition: true, @@ -387,28 +387,28 @@ export default { hasClear: false, autoFocus: false, tips: { - en_US: '', - zh_CN: '', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, trim: false, labelTextAlign: 'right', placeholder: { - use: 'zh_CN', - en_US: 'please input', - zh_CN: '请输入', + use: 'zh-CN', + 'en-US': 'please input', + 'zh-CN': '请输入', type: 'i18n', }, state: '', behavior: 'NORMAL', value: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, addonBefore: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, validation: [], @@ -420,9 +420,9 @@ export default { autoHeight: false, labelColOffset: 0, label: { - use: 'zh_CN', - en_US: 'TextField', - zh_CN: '职位', + use: 'zh-CN', + 'en-US': 'TextField', + 'zh-CN': '职位', type: 'i18n', }, __category__: 'form', @@ -430,8 +430,8 @@ export default { wrapperColSpan: 0, rows: 4, addonAfter: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, wrapperColOffset: 0, @@ -442,9 +442,9 @@ export default { labelTipsIcon: '', labelTipsText: { type: 'i18n', - use: 'zh_CN', - en_US: null, - zh_CN: '', + use: 'zh-CN', + 'en-US': null, + 'zh-CN': '', }, }, condition: true, @@ -469,28 +469,28 @@ export default { hasClear: false, autoFocus: false, tips: { - en_US: '', - zh_CN: '', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, trim: false, labelTextAlign: 'right', placeholder: { - use: 'zh_CN', - en_US: 'please input', - zh_CN: '请输入', + use: 'zh-CN', + 'en-US': 'please input', + 'zh-CN': '请输入', type: 'i18n', }, state: '', behavior: 'NORMAL', value: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, addonBefore: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, validation: [], @@ -502,9 +502,9 @@ export default { autoHeight: false, labelColOffset: 0, label: { - use: 'zh_CN', - en_US: 'TextField', - zh_CN: '花名', + use: 'zh-CN', + 'en-US': 'TextField', + 'zh-CN': '花名', type: 'i18n', }, __category__: 'form', @@ -512,8 +512,8 @@ export default { wrapperColSpan: 0, rows: 4, addonAfter: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, wrapperColOffset: 0, @@ -524,9 +524,9 @@ export default { labelTipsIcon: '', labelTipsText: { type: 'i18n', - use: 'zh_CN', - en_US: null, - zh_CN: '', + use: 'zh-CN', + 'en-US': null, + 'zh-CN': '', }, }, condition: true, @@ -538,8 +538,8 @@ export default { fieldName: 'gender', hasClear: false, tips: { - en_US: '', - zh_CN: '', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, mode: 'single', @@ -547,9 +547,9 @@ export default { autoWidth: true, labelTextAlign: 'right', placeholder: { - use: 'zh_CN', - en_US: 'please select', - zh_CN: '请选择', + use: 'zh-CN', + 'en-US': 'please select', + 'zh-CN': '请选择', type: 'i18n', }, hasBorder: true, @@ -563,14 +563,14 @@ export default { __style__: {}, fieldId: 'select_k1ow3h1x', notFoundContent: { - use: 'zh_CN', + use: 'zh-CN', type: 'i18n', }, labelColOffset: 0, label: { - use: 'zh_CN', - en_US: 'SelectField', - zh_CN: '性别', + use: 'zh-CN', + 'en-US': 'SelectField', + 'zh-CN': '性别', type: 'i18n', }, __category__: 'form', @@ -586,8 +586,8 @@ export default { { defaultChecked: false, text: { - en_US: 'Option 1', - zh_CN: '男', + 'en-US': 'Option 1', + 'zh-CN': '男', type: 'i18n', __sid__: 'param_k1owc4tb', }, @@ -598,8 +598,8 @@ export default { { defaultChecked: false, text: { - en_US: 'Option 2', - zh_CN: '女', + 'en-US': 'Option 2', + 'zh-CN': '女', type: 'i18n', __sid__: 'param_k1owc4tf', }, @@ -613,9 +613,9 @@ export default { labelTipsIcon: '', labelTipsText: { type: 'i18n', - use: 'zh_CN', - en_US: null, - zh_CN: '', + use: 'zh-CN', + 'en-US': null, + 'zh-CN': '', }, searchDelay: 300, }, @@ -635,22 +635,22 @@ export default { props: { __slot__title: false, subTitle: { - use: 'zh_CN', - en_US: '', - zh_CN: '', + use: 'zh-CN', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, __slot__subTitle: false, extra: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, className: 'card_kgaqfbm6', title: { - use: 'zh_CN', - en_US: 'Title', - zh_CN: '部门信息', + use: 'zh-CN', + 'en-US': 'Title', + 'zh-CN': '部门信息', type: 'i18n', }, __slot__extra: false, @@ -677,28 +677,28 @@ export default { hasClear: false, autoFocus: false, tips: { - en_US: '', - zh_CN: '', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, trim: false, labelTextAlign: 'right', placeholder: { - use: 'zh_CN', - en_US: 'please input', - zh_CN: '请输入', + use: 'zh-CN', + 'en-US': 'please input', + 'zh-CN': '请输入', type: 'i18n', }, state: '', behavior: 'NORMAL', value: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, addonBefore: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, validation: [], @@ -710,9 +710,9 @@ export default { autoHeight: false, labelColOffset: 0, label: { - use: 'zh_CN', - en_US: 'TextField', - zh_CN: '所属部门', + use: 'zh-CN', + 'en-US': 'TextField', + 'zh-CN': '所属部门', type: 'i18n', }, __category__: 'form', @@ -720,8 +720,8 @@ export default { wrapperColSpan: 0, rows: 4, addonAfter: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, wrapperColOffset: 0, @@ -732,9 +732,9 @@ export default { labelTipsIcon: '', labelTipsText: { type: 'i18n', - use: 'zh_CN', - en_US: null, - zh_CN: '', + use: 'zh-CN', + 'en-US': null, + 'zh-CN': '', }, }, condition: true, @@ -769,28 +769,28 @@ export default { hasClear: false, autoFocus: false, tips: { - en_US: '', - zh_CN: '', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, trim: false, labelTextAlign: 'right', placeholder: { - use: 'zh_CN', - en_US: 'please input', - zh_CN: '请输入', + use: 'zh-CN', + 'en-US': 'please input', + 'zh-CN': '请输入', type: 'i18n', }, state: '', behavior: 'NORMAL', value: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, addonBefore: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, validation: [], @@ -802,9 +802,9 @@ export default { autoHeight: false, labelColOffset: 0, label: { - use: 'zh_CN', - en_US: 'TextField', - zh_CN: '主管', + use: 'zh-CN', + 'en-US': 'TextField', + 'zh-CN': '主管', type: 'i18n', }, __category__: 'form', @@ -812,8 +812,8 @@ export default { wrapperColSpan: 0, rows: 4, addonAfter: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, wrapperColOffset: 0, @@ -824,9 +824,9 @@ export default { labelTipsIcon: '', labelTipsText: { type: 'i18n', - use: 'zh_CN', - en_US: null, - zh_CN: '', + use: 'zh-CN', + 'en-US': null, + 'zh-CN': '', }, }, condition: true, @@ -851,28 +851,28 @@ export default { hasClear: false, autoFocus: false, tips: { - en_US: '', - zh_CN: '', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, trim: false, labelTextAlign: 'right', placeholder: { - use: 'zh_CN', - en_US: 'please input', - zh_CN: '请输入', + use: 'zh-CN', + 'en-US': 'please input', + 'zh-CN': '请输入', type: 'i18n', }, state: '', behavior: 'NORMAL', value: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, addonBefore: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, validation: [], @@ -884,9 +884,9 @@ export default { autoHeight: false, labelColOffset: 0, label: { - use: 'zh_CN', - en_US: 'TextField', - zh_CN: 'HRG', + use: 'zh-CN', + 'en-US': 'TextField', + 'zh-CN': 'HRG', type: 'i18n', }, __category__: 'form', @@ -894,8 +894,8 @@ export default { wrapperColSpan: 0, rows: 4, addonAfter: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, wrapperColOffset: 0, @@ -906,9 +906,9 @@ export default { labelTipsIcon: '', labelTipsText: { type: 'i18n', - use: 'zh_CN', - en_US: null, - zh_CN: '', + use: 'zh-CN', + 'en-US': null, + 'zh-CN': '', }, }, condition: true, @@ -963,9 +963,9 @@ export default { behavior: 'NORMAL', loading: false, content: { - use: 'zh_CN', - en_US: 'Button', - zh_CN: '提交', + use: 'zh-CN', + 'en-US': 'Button', + 'zh-CN': '提交', type: 'i18n', }, __style__: ':root {\n margin-right: 16px;\n width: 80px\n}', @@ -986,9 +986,9 @@ export default { behavior: 'NORMAL', loading: false, content: { - use: 'zh_CN', - en_US: 'Button', - zh_CN: '取消', + use: 'zh-CN', + 'en-US': 'Button', + 'zh-CN': '取消', type: 'i18n', }, __style__: ':root {\n width: 80px;\n}', diff --git a/packages/designer/tests/fixtures/schema/form.ts b/packages/designer/tests/fixtures/schema/form.ts index 6f61170f6..8da6faf9e 100644 --- a/packages/designer/tests/fixtures/schema/form.ts +++ b/packages/designer/tests/fixtures/schema/form.ts @@ -70,9 +70,9 @@ export default { showTitle: false, behavior: 'NORMAL', content: { - use: 'zh_CN', - en_US: 'Title', - zh_CN: '个人信息', + use: 'zh-CN', + 'en-US': 'Title', + 'zh-CN': '个人信息', type: 'i18n', }, __style__: {}, @@ -143,22 +143,22 @@ export default { props: { __slot__title: false, subTitle: { - use: 'zh_CN', - en_US: '', - zh_CN: '', + use: 'zh-CN', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, __slot__subTitle: false, extra: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, className: 'card_kgaqfbm5', title: { - use: 'zh_CN', - en_US: 'Title', - zh_CN: '基本信息', + use: 'zh-CN', + 'en-US': 'Title', + 'zh-CN': '基本信息', type: 'i18n', }, __slot__extra: false, @@ -207,28 +207,28 @@ export default { hasClear: false, autoFocus: false, tips: { - en_US: '', - zh_CN: '', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, trim: false, labelTextAlign: 'right', placeholder: { - use: 'zh_CN', - en_US: 'please input', - zh_CN: '请输入', + use: 'zh-CN', + 'en-US': 'please input', + 'zh-CN': '请输入', type: 'i18n', }, state: '', behavior: 'NORMAL', value: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, addonBefore: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, validation: [ @@ -244,9 +244,9 @@ export default { autoHeight: false, labelColOffset: 0, label: { - use: 'zh_CN', - en_US: 'TextField', - zh_CN: '姓名', + use: 'zh-CN', + 'en-US': 'TextField', + 'zh-CN': '姓名', type: 'i18n', }, __category__: 'form', @@ -254,8 +254,8 @@ export default { wrapperColSpan: 0, rows: 4, addonAfter: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, wrapperColOffset: 0, @@ -266,9 +266,9 @@ export default { labelTipsIcon: '', labelTipsText: { type: 'i18n', - use: 'zh_CN', - en_US: null, - zh_CN: '', + use: 'zh-CN', + 'en-US': null, + 'zh-CN': '', }, }, condition: true, @@ -281,28 +281,28 @@ export default { hasClear: false, autoFocus: false, tips: { - en_US: '', - zh_CN: '', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, trim: false, labelTextAlign: 'right', placeholder: { - use: 'zh_CN', - en_US: 'please input', - zh_CN: '请输入', + use: 'zh-CN', + 'en-US': 'please input', + 'zh-CN': '请输入', type: 'i18n', }, state: '', behavior: 'NORMAL', value: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, addonBefore: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, validation: [], @@ -314,9 +314,9 @@ export default { autoHeight: false, labelColOffset: 0, label: { - use: 'zh_CN', - en_US: 'TextField', - zh_CN: '英文名', + use: 'zh-CN', + 'en-US': 'TextField', + 'zh-CN': '英文名', type: 'i18n', }, __category__: 'form', @@ -324,8 +324,8 @@ export default { wrapperColSpan: 0, rows: 4, addonAfter: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, wrapperColOffset: 0, @@ -336,9 +336,9 @@ export default { labelTipsIcon: '', labelTipsText: { type: 'i18n', - use: 'zh_CN', - en_US: null, - zh_CN: '', + use: 'zh-CN', + 'en-US': null, + 'zh-CN': '', }, }, condition: true, @@ -351,28 +351,28 @@ export default { hasClear: false, autoFocus: false, tips: { - en_US: '', - zh_CN: '', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, trim: false, labelTextAlign: 'right', placeholder: { - use: 'zh_CN', - en_US: 'please input', - zh_CN: '请输入', + use: 'zh-CN', + 'en-US': 'please input', + 'zh-CN': '请输入', type: 'i18n', }, state: '', behavior: 'NORMAL', value: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, addonBefore: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, validation: [], @@ -384,9 +384,9 @@ export default { autoHeight: false, labelColOffset: 0, label: { - use: 'zh_CN', - en_US: 'TextField', - zh_CN: '职位', + use: 'zh-CN', + 'en-US': 'TextField', + 'zh-CN': '职位', type: 'i18n', }, __category__: 'form', @@ -394,8 +394,8 @@ export default { wrapperColSpan: 0, rows: 4, addonAfter: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, wrapperColOffset: 0, @@ -406,9 +406,9 @@ export default { labelTipsIcon: '', labelTipsText: { type: 'i18n', - use: 'zh_CN', - en_US: null, - zh_CN: '', + use: 'zh-CN', + 'en-US': null, + 'zh-CN': '', }, }, condition: true, @@ -433,28 +433,28 @@ export default { hasClear: false, autoFocus: false, tips: { - en_US: '', - zh_CN: '', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, trim: false, labelTextAlign: 'right', placeholder: { - use: 'zh_CN', - en_US: 'please input', - zh_CN: '请输入', + use: 'zh-CN', + 'en-US': 'please input', + 'zh-CN': '请输入', type: 'i18n', }, state: '', behavior: 'NORMAL', value: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, addonBefore: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, validation: [], @@ -466,9 +466,9 @@ export default { autoHeight: false, labelColOffset: 0, label: { - use: 'zh_CN', - en_US: 'TextField', - zh_CN: '花名', + use: 'zh-CN', + 'en-US': 'TextField', + 'zh-CN': '花名', type: 'i18n', }, __category__: 'form', @@ -476,8 +476,8 @@ export default { wrapperColSpan: 0, rows: 4, addonAfter: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, wrapperColOffset: 0, @@ -488,9 +488,9 @@ export default { labelTipsIcon: '', labelTipsText: { type: 'i18n', - use: 'zh_CN', - en_US: null, - zh_CN: '', + use: 'zh-CN', + 'en-US': null, + 'zh-CN': '', }, }, condition: true, @@ -502,8 +502,8 @@ export default { fieldName: 'gender', hasClear: false, tips: { - en_US: '', - zh_CN: '', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, mode: 'single', @@ -511,9 +511,9 @@ export default { autoWidth: true, labelTextAlign: 'right', placeholder: { - use: 'zh_CN', - en_US: 'please select', - zh_CN: '请选择', + use: 'zh-CN', + 'en-US': 'please select', + 'zh-CN': '请选择', type: 'i18n', }, hasBorder: true, @@ -527,14 +527,14 @@ export default { __style__: {}, fieldId: 'select_k1ow3h1x', notFoundContent: { - use: 'zh_CN', + use: 'zh-CN', type: 'i18n', }, labelColOffset: 0, label: { - use: 'zh_CN', - en_US: 'SelectField', - zh_CN: '性别', + use: 'zh-CN', + 'en-US': 'SelectField', + 'zh-CN': '性别', type: 'i18n', }, __category__: 'form', @@ -550,8 +550,8 @@ export default { { defaultChecked: false, text: { - en_US: 'Option 1', - zh_CN: '男', + 'en-US': 'Option 1', + 'zh-CN': '男', type: 'i18n', __sid__: 'param_k1owc4tb', }, @@ -562,8 +562,8 @@ export default { { defaultChecked: false, text: { - en_US: 'Option 2', - zh_CN: '女', + 'en-US': 'Option 2', + 'zh-CN': '女', type: 'i18n', __sid__: 'param_k1owc4tf', }, @@ -577,9 +577,9 @@ export default { labelTipsIcon: '', labelTipsText: { type: 'i18n', - use: 'zh_CN', - en_US: null, - zh_CN: '', + use: 'zh-CN', + 'en-US': null, + 'zh-CN': '', }, searchDelay: 300, }, @@ -599,22 +599,22 @@ export default { props: { __slot__title: false, subTitle: { - use: 'zh_CN', - en_US: '', - zh_CN: '', + use: 'zh-CN', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, __slot__subTitle: false, extra: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, className: 'card_kgaqfbm6', title: { - use: 'zh_CN', - en_US: 'Title', - zh_CN: '部门信息', + use: 'zh-CN', + 'en-US': 'Title', + 'zh-CN': '部门信息', type: 'i18n', }, __slot__extra: false, @@ -641,28 +641,28 @@ export default { hasClear: false, autoFocus: false, tips: { - en_US: '', - zh_CN: '', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, trim: false, labelTextAlign: 'right', placeholder: { - use: 'zh_CN', - en_US: 'please input', - zh_CN: '请输入', + use: 'zh-CN', + 'en-US': 'please input', + 'zh-CN': '请输入', type: 'i18n', }, state: '', behavior: 'NORMAL', value: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, addonBefore: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, validation: [], @@ -674,9 +674,9 @@ export default { autoHeight: false, labelColOffset: 0, label: { - use: 'zh_CN', - en_US: 'TextField', - zh_CN: '所属部门', + use: 'zh-CN', + 'en-US': 'TextField', + 'zh-CN': '所属部门', type: 'i18n', }, __category__: 'form', @@ -684,8 +684,8 @@ export default { wrapperColSpan: 0, rows: 4, addonAfter: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, wrapperColOffset: 0, @@ -696,9 +696,9 @@ export default { labelTipsIcon: '', labelTipsText: { type: 'i18n', - use: 'zh_CN', - en_US: null, - zh_CN: '', + use: 'zh-CN', + 'en-US': null, + 'zh-CN': '', }, }, condition: true, @@ -733,28 +733,28 @@ export default { hasClear: false, autoFocus: false, tips: { - en_US: '', - zh_CN: '', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, trim: false, labelTextAlign: 'right', placeholder: { - use: 'zh_CN', - en_US: 'please input', - zh_CN: '请输入', + use: 'zh-CN', + 'en-US': 'please input', + 'zh-CN': '请输入', type: 'i18n', }, state: '', behavior: 'NORMAL', value: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, addonBefore: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, validation: [], @@ -766,9 +766,9 @@ export default { autoHeight: false, labelColOffset: 0, label: { - use: 'zh_CN', - en_US: 'TextField', - zh_CN: '主管', + use: 'zh-CN', + 'en-US': 'TextField', + 'zh-CN': '主管', type: 'i18n', }, __category__: 'form', @@ -776,8 +776,8 @@ export default { wrapperColSpan: 0, rows: 4, addonAfter: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, wrapperColOffset: 0, @@ -788,9 +788,9 @@ export default { labelTipsIcon: '', labelTipsText: { type: 'i18n', - use: 'zh_CN', - en_US: null, - zh_CN: '', + use: 'zh-CN', + 'en-US': null, + 'zh-CN': '', }, }, condition: true, @@ -815,28 +815,28 @@ export default { hasClear: false, autoFocus: false, tips: { - en_US: '', - zh_CN: '', + 'en-US': '', + 'zh-CN': '', type: 'i18n', }, trim: false, labelTextAlign: 'right', placeholder: { - use: 'zh_CN', - en_US: 'please input', - zh_CN: '请输入', + use: 'zh-CN', + 'en-US': 'please input', + 'zh-CN': '请输入', type: 'i18n', }, state: '', behavior: 'NORMAL', value: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, addonBefore: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, validation: [], @@ -848,9 +848,9 @@ export default { autoHeight: false, labelColOffset: 0, label: { - use: 'zh_CN', - en_US: 'TextField', - zh_CN: 'HRG', + use: 'zh-CN', + 'en-US': 'TextField', + 'zh-CN': 'HRG', type: 'i18n', }, __category__: 'form', @@ -858,8 +858,8 @@ export default { wrapperColSpan: 0, rows: 4, addonAfter: { - use: 'zh_CN', - zh_CN: '', + use: 'zh-CN', + 'zh-CN': '', type: 'i18n', }, wrapperColOffset: 0, @@ -870,9 +870,9 @@ export default { labelTipsIcon: '', labelTipsText: { type: 'i18n', - use: 'zh_CN', - en_US: null, - zh_CN: '', + use: 'zh-CN', + 'en-US': null, + 'zh-CN': '', }, }, condition: true, @@ -927,9 +927,9 @@ export default { behavior: 'NORMAL', loading: false, content: { - use: 'zh_CN', - en_US: 'Button', - zh_CN: '提交', + use: 'zh-CN', + 'en-US': 'Button', + 'zh-CN': '提交', type: 'i18n', }, __style__: ':root {\n margin-right: 16px;\n width: 80px\n}', @@ -950,9 +950,9 @@ export default { behavior: 'NORMAL', loading: false, content: { - use: 'zh_CN', - en_US: 'Button', - zh_CN: '取消', + use: 'zh-CN', + 'en-US': 'Button', + 'zh-CN': '取消', type: 'i18n', }, __style__: ':root {\n width: 80px;\n}', diff --git a/packages/designer/tests/project/project.test.ts b/packages/designer/tests/project/project.test.ts index 1a5930c6a..6e4aeb8c0 100644 --- a/packages/designer/tests/project/project.test.ts +++ b/packages/designer/tests/project/project.test.ts @@ -255,12 +255,12 @@ describe('schema 生成节点模型测试', () => { expect(project).toBeTruthy(); project.i18n = formSchema.i18n; - expect(project.i18n).toBe(formSchema.i18n); + expect(project.i18n).toStrictEqual(formSchema.i18n); project.i18n = null; expect(project.i18n).toStrictEqual({}); project.set('i18n', formSchema.i18n); - expect(project.get('i18n')).toBe(formSchema.i18n); + expect(project.get('i18n')).toStrictEqual(formSchema.i18n); project.set('i18n', null); expect(project.get('i18n')).toStrictEqual({}); }); diff --git a/packages/editor-core/package.json b/packages/editor-core/package.json index 7ff7f8a86..208f932d6 100644 --- a/packages/editor-core/package.json +++ b/packages/editor-core/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-editor-core", - "version": "1.0.16", + "version": "1.0.17", "description": "Core Api for Ali lowCode engine", "license": "MIT", "main": "lib/index.js", @@ -14,8 +14,8 @@ }, "dependencies": { "@alifd/next": "^1.19.16", - "@alilc/lowcode-types": "1.0.16", - "@alilc/lowcode-utils": "1.0.16", + "@alilc/lowcode-types": "1.0.17", + "@alilc/lowcode-utils": "1.0.17", "classnames": "^2.2.6", "debug": "^4.1.1", "intl-messageformat": "^9.3.1", diff --git a/packages/editor-core/src/config.ts b/packages/editor-core/src/config.ts index b88dda6e6..ee44546c5 100644 --- a/packages/editor-core/src/config.ts +++ b/packages/editor-core/src/config.ts @@ -37,7 +37,7 @@ const VALID_ENGINE_OPTIONS = { }, locale: { type: 'string', - default: 'zh_CN', + default: 'zh-CN', description: '语言', }, renderEnv: { @@ -166,7 +166,7 @@ export interface EngineOptions { */ deviceClassName?: string; /** - * 语言，默认值：'zh_CN' + * 语言，默认值：'zh-CN' */ locale?: string; /** diff --git a/packages/editor-core/src/intl/index.ts b/packages/editor-core/src/intl/index.ts index 01cb452cd..1af991e69 100644 --- a/packages/editor-core/src/intl/index.ts +++ b/packages/editor-core/src/intl/index.ts @@ -2,7 +2,7 @@ import { ReactNode, Component, createElement } from 'react'; import { IntlMessageFormat } from 'intl-messageformat'; import { globalLocale } from './global-locale'; import { isI18nData } from '@alilc/lowcode-types'; -import { observer, computed } from '../utils'; +import { observer } from '../utils'; function generateTryLocales(locale: string) { const tries = [locale, locale.replace('-', '_')]; diff --git a/packages/editor-skeleton/package.json b/packages/editor-skeleton/package.json index 2ed3136dc..705c418b2 100644 --- a/packages/editor-skeleton/package.json +++ b/packages/editor-skeleton/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-editor-skeleton", - "version": "1.0.16", + "version": "1.0.17", "description": "alibaba lowcode editor skeleton", "main": "lib/index.js", "module": "es/index.js", @@ -18,10 +18,10 @@ ], "dependencies": { "@alifd/next": "^1.20.12", - "@alilc/lowcode-designer": "1.0.16", - "@alilc/lowcode-editor-core": "1.0.16", - "@alilc/lowcode-types": "1.0.16", - "@alilc/lowcode-utils": "1.0.16", + "@alilc/lowcode-designer": "1.0.17", + "@alilc/lowcode-editor-core": "1.0.17", + "@alilc/lowcode-types": "1.0.17", + "@alilc/lowcode-utils": "1.0.17", "classnames": "^2.2.6", "react": "^16.8.1", "react-dom": "^16.8.1" diff --git a/packages/editor-skeleton/src/components/settings/settings-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-pane.tsx index 1431358d1..fc084628a 100644 --- a/packages/editor-skeleton/src/components/settings/settings-pane.tsx +++ b/packages/editor-skeleton/src/components/settings/settings-pane.tsx @@ -67,19 +67,31 @@ class SettingFieldView extends Component , // hijack skeleton - }; -} \ No newline at end of file diff --git a/packages/engine/src/modules/utils.ts b/packages/engine/src/modules/utils.ts deleted file mode 100644 index 6d89e31e0..000000000 --- a/packages/engine/src/modules/utils.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { isFormEvent, compatibleLegaoSchema, getNodeSchemaById, transactionManager } from '@alilc/lowcode-utils'; -import { isNodeSchema } from '@alilc/lowcode-types'; -import { getConvertedExtraKey, getOriginalExtraKey } from '@alilc/lowcode-designer'; - -const utils = { - isNodeSchema, - isFormEvent, - compatibleLegaoSchema, - getNodeSchemaById, - getConvertedExtraKey, - getOriginalExtraKey, - executeTransaction: transactionManager.executeTransaction.bind(transactionManager), -}; - -export default utils; \ No newline at end of file diff --git a/packages/ignitor/package.json b/packages/ignitor/package.json index dd5801cc5..1da63595c 100644 --- a/packages/ignitor/package.json +++ b/packages/ignitor/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-ignitor", - "version": "1.0.16", + "version": "1.0.17", "description": "点火器，bootstrap lce project", "main": "lib/index.js", "private": true, diff --git a/packages/plugin-designer/package.json b/packages/plugin-designer/package.json index 4eb5b6d2d..5e06b8cd8 100644 --- a/packages/plugin-designer/package.json +++ b/packages/plugin-designer/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-plugin-designer", - "version": "1.0.16", + "version": "1.0.17", "description": "alibaba lowcode editor designer plugin", "files": [ "es", @@ -18,9 +18,9 @@ ], "author": "xiayang.xy", "dependencies": { - "@alilc/lowcode-designer": "1.0.16", - "@alilc/lowcode-editor-core": "1.0.16", - "@alilc/lowcode-utils": "1.0.16", + "@alilc/lowcode-designer": "1.0.17", + "@alilc/lowcode-editor-core": "1.0.17", + "@alilc/lowcode-utils": "1.0.17", "react": "^16.8.1", "react-dom": "^16.8.1" }, diff --git a/packages/plugin-outline-pane/package.json b/packages/plugin-outline-pane/package.json index 640b57730..a5129db9d 100644 --- a/packages/plugin-outline-pane/package.json +++ b/packages/plugin-outline-pane/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-plugin-outline-pane", - "version": "1.0.16", + "version": "1.0.17", "description": "Outline pane for Ali lowCode engine", "files": [ "es", @@ -13,10 +13,10 @@ }, "dependencies": { "@alifd/next": "^1.19.16", - "@alilc/lowcode-designer": "1.0.16", - "@alilc/lowcode-editor-core": "1.0.16", - "@alilc/lowcode-types": "1.0.16", - "@alilc/lowcode-utils": "1.0.16", + "@alilc/lowcode-designer": "1.0.17", + "@alilc/lowcode-editor-core": "1.0.17", + "@alilc/lowcode-types": "1.0.17", + "@alilc/lowcode-utils": "1.0.17", "classnames": "^2.2.6", "react": "^16", "react-dom": "^16.7.0", diff --git a/packages/plugin-outline-pane/src/locale/index.ts b/packages/plugin-outline-pane/src/locale/index.ts index a912240fa..4cb3b53cf 100644 --- a/packages/plugin-outline-pane/src/locale/index.ts +++ b/packages/plugin-outline-pane/src/locale/index.ts @@ -1,10 +1,10 @@ import { createIntl } from '@alilc/lowcode-editor-core'; -import en_US from './en-US.json'; -import zh_CN from './zh-CN.json'; +import enUS from './en-US.json'; +import zhCN from './zh-CN.json'; const { intl, intlNode, getLocale, setLocale } = createIntl({ - 'en-US': en_US, - 'zh-CN': zh_CN, + 'en-US': enUS, + 'zh-CN': zhCN, }); export { intl, intlNode, getLocale, setLocale }; diff --git a/packages/rax-renderer/package.json b/packages/rax-renderer/package.json index 85ff789d7..e98d8511f 100644 --- a/packages/rax-renderer/package.json +++ b/packages/rax-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-rax-renderer", - "version": "1.0.16", + "version": "1.0.17", "description": "Rax renderer for Ali lowCode engine", "main": "lib/index.js", "module": "es/index.js", @@ -30,8 +30,8 @@ "build": "build-scripts build" }, "dependencies": { - "@alilc/lowcode-renderer-core": "1.0.16", - "@alilc/lowcode-utils": "1.0.16", + "@alilc/lowcode-renderer-core": "1.0.17", + "@alilc/lowcode-utils": "1.0.17", "rax-find-dom-node": "^1.0.1" }, "devDependencies": { diff --git a/packages/rax-simulator-renderer/package.json b/packages/rax-simulator-renderer/package.json index ee543d391..87134571b 100644 --- a/packages/rax-simulator-renderer/package.json +++ b/packages/rax-simulator-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-rax-simulator-renderer", - "version": "1.0.16", + "version": "1.0.17", "description": "rax simulator renderer for alibaba lowcode designer", "main": "lib/index.js", "module": "es/index.js", @@ -13,10 +13,10 @@ "build:umd": "build-scripts build --config build.umd.json" }, "dependencies": { - "@alilc/lowcode-designer": "1.0.16", - "@alilc/lowcode-rax-renderer": "1.0.16", - "@alilc/lowcode-types": "1.0.16", - "@alilc/lowcode-utils": "1.0.16", + "@alilc/lowcode-designer": "1.0.17", + "@alilc/lowcode-rax-renderer": "1.0.17", + "@alilc/lowcode-types": "1.0.17", + "@alilc/lowcode-utils": "1.0.17", "classnames": "^2.2.6", "driver-universal": "^3.1.3", "history": "^5.0.0", diff --git a/packages/react-renderer/package.json b/packages/react-renderer/package.json index 5cb1986a3..7d1ebf112 100644 --- a/packages/react-renderer/package.json +++ b/packages/react-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-react-renderer", - "version": "1.0.16", + "version": "1.0.17", "description": "react renderer for ali lowcode engine", "main": "lib/index.js", "module": "es/index.js", @@ -22,7 +22,7 @@ ], "dependencies": { "@alifd/next": "^1.21.16", - "@alilc/lowcode-renderer-core": "1.0.16" + "@alilc/lowcode-renderer-core": "1.0.17" }, "devDependencies": { "@alib/build-scripts": "^0.1.18", diff --git a/packages/react-simulator-renderer/package.json b/packages/react-simulator-renderer/package.json index ec66b0aaa..c91dec079 100644 --- a/packages/react-simulator-renderer/package.json +++ b/packages/react-simulator-renderer/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-react-simulator-renderer", - "version": "1.0.16", + "version": "1.0.17", "description": "react simulator renderer for alibaba lowcode designer", "main": "lib/index.js", "module": "es/index.js", @@ -17,10 +17,10 @@ "test:cov": "build-scripts test --config build.test.json --jest-coverage" }, "dependencies": { - "@alilc/lowcode-designer": "1.0.16", - "@alilc/lowcode-react-renderer": "1.0.16", - "@alilc/lowcode-types": "1.0.16", - "@alilc/lowcode-utils": "1.0.16", + "@alilc/lowcode-designer": "1.0.17", + "@alilc/lowcode-react-renderer": "1.0.17", + "@alilc/lowcode-types": "1.0.17", + "@alilc/lowcode-utils": "1.0.17", "classnames": "^2.2.6", "mobx": "^6.3.0", "mobx-react": "^7.2.0", @@ -33,7 +33,7 @@ "@types/node": "^13.7.1", "@types/react": "^16", "@types/react-dom": "^16", - "@types/react-router": "^5.1.17", + "@types/react-router": "5.1.18", "build-plugin-component": "^0.2.11" }, "publishConfig": { diff --git a/packages/react-simulator-renderer/src/renderer-view.tsx b/packages/react-simulator-renderer/src/renderer-view.tsx index e68d9c401..f96590147 100644 --- a/packages/react-simulator-renderer/src/renderer-view.tsx +++ b/packages/react-simulator-renderer/src/renderer-view.tsx @@ -188,6 +188,8 @@ class Renderer extends Component<{ getNode={(id: string) => documentInstance.getNode(id) as Node} rendererName="PageRenderer" thisRequiredInJSE={host.thisRequiredInJSE} + notFoundComponent={host.notFoundComponent} + faultComponent={host.faultComponent} customCreateElement={(Component: any, props: any, children: any) => { const { __id, ...viewProps } = props; viewProps.componentId = __id; diff --git a/packages/react-simulator-renderer/src/renderer.ts b/packages/react-simulator-renderer/src/renderer.ts index 98cbbd621..bebdc49e6 100644 --- a/packages/react-simulator-renderer/src/renderer.ts +++ b/packages/react-simulator-renderer/src/renderer.ts @@ -31,7 +31,7 @@ const loader = new AssetLoader(); configure({ enforceActions: 'never' }); export class DocumentInstance { - public instancesMap = new Map(); + instancesMap = new Map(); get schema(): any { return this.document.export(TransformStage.Render); @@ -190,6 +190,7 @@ export class SimulatorRendererContainer implements BuiltinSimulatorRenderer { readonly history: MemoryHistory; @obx.ref private _documentInstances: DocumentInstance[] = []; + private _requestHandlersMap: any; get documentInstances() { return this._documentInstances; } @@ -203,7 +204,8 @@ export class SimulatorRendererContainer implements BuiltinSimulatorRenderer { this._layout = host.project.get('config').layout; // todo: split with others, not all should recompute - if (this._libraryMap !== host.libraryMap || this._componentsMap !== host.designer.componentsMap) { + if (this._libraryMap !== host.libraryMap + || this._componentsMap !== host.designer.componentsMap) { this._libraryMap = host.libraryMap || {}; this._componentsMap = host.designer.componentsMap; this.buildComponents(); @@ -246,7 +248,7 @@ export class SimulatorRendererContainer implements BuiltinSimulatorRenderer { initialEntries: [initialEntry], }); this.history = history; - history.listen((location, action) => { + history.listen((location) => { const docId = location.pathname.slice(1); docId && host.project.open(docId); }); @@ -285,15 +287,23 @@ export class SimulatorRendererContainer implements BuiltinSimulatorRenderer { constants: {}, requestHandlersMap: this._requestHandlersMap, }; + host.injectionConsumer.consume((data) => { // TODO: sync utils, i18n, contants,... config const newCtx = { ...this._appContext, }; - newCtx.utils.i18n.messages = data.i18n || {}; merge(newCtx, data.appHelper || {}); this._appContext = newCtx; }); + + host.i18nConsumer.consume((data) => { + const newCtx = { + ...this._appContext, + }; + newCtx.utils.i18n.messages = data || {}; + this._appContext = newCtx; + }); } @obx private _layout: any = null; @@ -310,7 +320,11 @@ export class SimulatorRendererContainer implements BuiltinSimulatorRenderer { private _libraryMap: { [key: string]: string } = {}; private buildComponents() { - this._components = buildComponents(this._libraryMap, this._componentsMap, this.createComponent.bind(this)); + this._components = buildComponents( + this._libraryMap, + this._componentsMap, + this.createComponent.bind(this), + ); this._components = { ...builtinComponents, ...this._components, @@ -505,8 +519,8 @@ export class SimulatorRendererContainer implements BuiltinSimulatorRenderer { } dispose() { - this.disposeFunctions.forEach(fn => fn()); - this.documentInstances.forEach(docInst => docInst.dispose()); + this.disposeFunctions.forEach((fn) => fn()); + this.documentInstances.forEach((docInst) => docInst.dispose()); untracked(() => { this._componentsMap = {}; this._components = null; @@ -540,7 +554,10 @@ function cacheReactKey(el: Element): Element { const SYMBOL_VNID = Symbol('_LCNodeId'); const SYMBOL_VDID = Symbol('_LCDocId'); -function getClosestNodeInstance(from: ReactInstance, specId?: string): NodeInstance | null { +function getClosestNodeInstance( + from: ReactInstance, + specId?: string, + ): NodeInstance | null { let el: any = from; if (el) { if (isElement(el)) { @@ -599,7 +616,7 @@ function getLowCodeComponentProps(props: any) { return props; } const newProps: any = {}; - Object.keys(props).forEach(k => { + Object.keys(props).forEach((k) => { if (['children', 'componentId', '__designMode', '_componentName', '_leaf'].includes(k)) { return; } @@ -608,4 +625,4 @@ function getLowCodeComponentProps(props: any) { return newProps; } -export default new SimulatorRendererContainer(); +export default new SimulatorRendererContainer(); \ No newline at end of file diff --git a/packages/react-simulator-renderer/test/schema/basic.ts b/packages/react-simulator-renderer/test/schema/basic.ts index c32d1d864..5dffd7267 100644 --- a/packages/react-simulator-renderer/test/schema/basic.ts +++ b/packages/react-simulator-renderer/test/schema/basic.ts @@ -34,11 +34,11 @@ export default { id: 'node_ockvuu8u916', props: { content: { - use: 'zh_CN', + use: 'zh-CN', type: 'JSExpression', - en_US: 'Tips content', + 'en-US': 'Tips content', value: '"我是一个简单的测试页面"', - zh_CN: '我是一个简单的测试页面', + 'zh-CN': '我是一个简单的测试页面', extType: 'i18n', }, fieldId: 'text_kvuu9gl2', diff --git a/packages/react-simulator-renderer/test/utils/host.ts b/packages/react-simulator-renderer/test/utils/host.ts index f5d54d112..f7ab34357 100644 --- a/packages/react-simulator-renderer/test/utils/host.ts +++ b/packages/react-simulator-renderer/test/utils/host.ts @@ -62,6 +62,10 @@ class Host { consume() {} } + i18nConsumer = { + consume() {} + } + /** 下列的函数或者方法是方便测试用 */ mockSchema = (schema: any) => { this.schema = schema; diff --git a/packages/renderer-core/package.json b/packages/renderer-core/package.json index 416e82074..6c818991f 100644 --- a/packages/renderer-core/package.json +++ b/packages/renderer-core/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-renderer-core", - "version": "1.0.16", + "version": "1.0.17", "description": "renderer core", "license": "MIT", "main": "lib/index.js", @@ -16,8 +16,8 @@ }, "dependencies": { "@alilc/lowcode-datasource-engine": "^1.0.0", - "@alilc/lowcode-types": "1.0.16", - "@alilc/lowcode-utils": "1.0.16", + "@alilc/lowcode-types": "1.0.17", + "@alilc/lowcode-utils": "1.0.17", "classnames": "^2.2.6", "debug": "^4.1.1", "fetch-jsonp": "^1.1.3", @@ -33,7 +33,7 @@ "devDependencies": { "@alib/build-scripts": "^0.1.18", "@alifd/next": "^1.26.0", - "@alilc/lowcode-designer": "1.0.16", + "@alilc/lowcode-designer": "1.0.17", "@alilc/lowcode-test-mate": "^1.0.1", "@babel/plugin-transform-typescript": "^7.16.8", "@testing-library/react": "^11.2.2", diff --git a/packages/renderer-core/src/hoc/leaf.tsx b/packages/renderer-core/src/hoc/leaf.tsx index fb5eb5293..c12860a0f 100644 --- a/packages/renderer-core/src/hoc/leaf.tsx +++ b/packages/renderer-core/src/hoc/leaf.tsx @@ -399,10 +399,7 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, { /** 监听参数变化 */ initOnPropsChangeEvent(leaf = this.leaf): void { - const dispose = leaf?.onPropChange?.((propChangeInfo: PropChangeOptions) => { - if (!this.autoRepaintNode) { - return; - } + const handlePropsChange = debounce((propChangeInfo: PropChangeOptions) => { const { key, newValue = null, @@ -450,6 +447,12 @@ export function leafWrapper(Comp: types.IBaseRenderComponent, { this.judgeMiniUnitRender(); }); + const dispose = leaf?.onPropChange?.((propChangeInfo: PropChangeOptions) => { + if (!this.autoRepaintNode) { + return; + } + handlePropsChange(propChangeInfo); + }); dispose && this.disposeFunctions.push(dispose); } diff --git a/packages/renderer-core/src/renderer/base.tsx b/packages/renderer-core/src/renderer/base.tsx index d64ff4196..afa3938e7 100644 --- a/packages/renderer-core/src/renderer/base.tsx +++ b/packages/renderer-core/src/renderer/base.tsx @@ -174,7 +174,7 @@ export default function baseRendererFactory(): IBaseRenderComponent { this.__compScopes = {}; this.__instanceMap = {}; this.__bindCustomMethods(props); - this.__initI18nAPIs(props); + this.__initI18nAPIs(); } // eslint-disable-next-line @typescript-eslint/no-unused-vars @@ -358,12 +358,12 @@ export default function baseRendererFactory(): IBaseRenderComponent { * init i18n apis * @PRIVATE */ - __initI18nAPIs = (props: IBaseRendererProps) => { + __initI18nAPIs = () => { this.i18n = (key: string, values = {}) => { - const { locale, messages } = props; + const { locale, messages } = this.props; return getI18n(key, values, locale, messages); }; - this.getLocale = () => props.locale; + this.getLocale = () => this.props.locale; this.setLocale = (loc: string) => { const setLocaleFn = this.appHelper?.utils?.i18n?.setLocale; if (!setLocaleFn || typeof setLocaleFn !== 'function') { @@ -823,7 +823,7 @@ export default function baseRendererFactory(): IBaseRenderComponent { } } - const handleI18nData = (innerProps: any) => innerProps[innerProps.use || 'zh_CN']; + const handleI18nData = (innerProps: any) => innerProps[innerProps.use || 'zh-CN']; // @LEGACY 兼容老平台设计态 i18n 数据 if (isI18nData(props)) { diff --git a/packages/renderer-core/src/types/index.ts b/packages/renderer-core/src/types/index.ts index 2a4c0975e..45e877ab5 100644 --- a/packages/renderer-core/src/types/index.ts +++ b/packages/renderer-core/src/types/index.ts @@ -98,10 +98,16 @@ export interface IRendererProps { id?: string | number; /** 语言 */ locale?: string; + /** + * 多语言语料 + * 配置规范参见《低代码搭建组件描述协议》https://lowcode-engine.cn/lowcode 中 2.6 国际化多语言支持 + * */ + messages?: Record; /** 主要用于设置渲染模块的全局上下文，里面定义的内容可以在低代码中通过 this 来访问，比如 this.utils */ appHelper?: IRendererAppHelper; /** - * 配置规范参见《中后台搭建组件描述协议》，主要在搭建场景中使用，用于提升用户搭建体验。 + * 配置规范参见《低代码搭建组件描述协议》https://lowcode-engine.cn/lowcode + * 主要在搭建场景中使用，用于提升用户搭建体验。 * * > 在生产环境下不需要设置 */ diff --git a/packages/shell/package.json b/packages/shell/package.json index b29ec0be6..9d0e0b62f 100644 --- a/packages/shell/package.json +++ b/packages/shell/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-shell", - "version": "1.0.16", + "version": "1.0.17", "description": "Shell Layer for AliLowCodeEngine", "main": "lib/index.js", "module": "es/index.js", @@ -15,11 +15,11 @@ }, "license": "MIT", "dependencies": { - "@alilc/lowcode-designer": "1.0.16", - "@alilc/lowcode-editor-core": "1.0.16", - "@alilc/lowcode-editor-skeleton": "1.0.16", - "@alilc/lowcode-types": "1.0.16", - "@alilc/lowcode-utils": "1.0.16", + "@alilc/lowcode-designer": "1.0.17", + "@alilc/lowcode-editor-core": "1.0.17", + "@alilc/lowcode-editor-skeleton": "1.0.17", + "@alilc/lowcode-types": "1.0.17", + "@alilc/lowcode-utils": "1.0.17", "classnames": "^2.2.6", "enzyme": "^3.11.0", "enzyme-adapter-react-16": "^1.15.5", diff --git a/packages/shell/src/common.tsx b/packages/shell/src/common.tsx new file mode 100644 index 000000000..d6511edef --- /dev/null +++ b/packages/shell/src/common.tsx @@ -0,0 +1,183 @@ +import { editorSymbol, skeletonSymbol, designerCabinSymbol } from './symbols'; +import { + isFormEvent as innerIsFormEvent, + compatibleLegaoSchema as innerCompatibleLegaoSchema, + getNodeSchemaById as innerGetNodeSchemaById, + transactionManager, +} from '@alilc/lowcode-utils'; +import { + isNodeSchema as innerIsNodeSchema, + NodeSchema, + TransitionType, +} from '@alilc/lowcode-types'; +import { + SettingField, + isSettingField, + Designer, + TransformStage, + LiveEditing, + isDragNodeDataObject, + isDragNodeObject, + isDragAnyObject, + DragObjectType, + isNode, + isShaken, + contains, + LocationDetailType, + isLocationChildrenDetail, + ScrollTarget, + getConvertedExtraKey as innerGetConvertedExtraKey, + getOriginalExtraKey as innerGetOriginalExtraKey, +} from '@alilc/lowcode-designer'; +import { + Skeleton as InnerSkeleton, + createSettingFieldView, + PopupContext, + PopupPipe, + Workbench as InnerWorkbench, +} from '@alilc/lowcode-editor-skeleton'; +import Dragon from './dragon'; +import { + Editor, + Title as InnerTitle, + Tip as InnerTip, + shallowIntl, + createIntl as innerCreateIntl, + intl, + createSetterContent, + obx, + observable, + makeObservable, + untracked, + computed, + observer, + globalLocale, +} from '@alilc/lowcode-editor-core'; +import { ReactNode } from 'react'; + + +const getDesignerCabin = (editor: Editor) => { + const designer = editor.get('designer') as Designer; + + return { + SettingField, + isSettingField, + dragon: Dragon.create(designer.dragon), + TransformStage, + LiveEditing, + DragObjectType, + isDragNodeDataObject, + isNode, + [designerCabinSymbol]: { + isDragNodeObject, + isDragAnyObject, + isShaken, + contains, + LocationDetailType, + isLocationChildrenDetail, + ScrollTarget, + isSettingField, + TransformStage, + SettingField, + LiveEditing, + DragObjectType, + isDragNodeDataObject, + isNode, + }, + }; +}; + +const getSkeletonCabin = (skeleton: InnerSkeleton) => { + return { + createSettingFieldView, + PopupContext, + PopupPipe, + Workbench: (props: any) => , // hijack skeleton + }; +}; + +class Utils { + isNodeSchema(data: any): data is NodeSchema { + return innerIsNodeSchema(data); + } + + isFormEvent(e: KeyboardEvent | MouseEvent): boolean { + return innerIsFormEvent(e); + } + + compatibleLegaoSchema(props: any): any { + return innerCompatibleLegaoSchema(props); + } + + getNodeSchemaById(schema: NodeSchema, nodeId: string): NodeSchema | undefined { + return innerGetNodeSchemaById(schema, nodeId); + } + + getConvertedExtraKey(key: string): string { + return innerGetConvertedExtraKey(key); + } + + getOriginalExtraKey(key: string): string { + return innerGetOriginalExtraKey(key); + } + + executeTransaction(fn: () => void, type: TransitionType = TransitionType.REPAINT): void { + transactionManager.executeTransaction(fn, type); + } + + createIntl(instance: string | object): { + intlNode(id: string, params?: object): ReactNode; + intl(id: string, params?: object): string; + getLocale(): string; + setLocale(locale: string): void; + } { + return innerCreateIntl(instance); + } +} + +export default class Common { + private readonly [editorSymbol]: Editor; + private readonly [skeletonSymbol]: InnerSkeleton; + private readonly __designerCabin: any; + private readonly __skeletonCabin: any; + private readonly __editorCabin: any; + private readonly __utils: Utils; + + constructor(editor: Editor, skeleton: InnerSkeleton) { + this[editorSymbol] = editor; + this[skeletonSymbol] = skeleton; + this.__designerCabin = getDesignerCabin(this[editorSymbol]); + this.__skeletonCabin = getSkeletonCabin(this[skeletonSymbol]); + this.__utils = new Utils(); + } + + get utils(): any { + return this.__utils; + } + + get editorCabin(): any { + return { + Title: InnerTitle, + Tip: InnerTip, + shallowIntl, + createIntl: innerCreateIntl, + intl, + createSetterContent, + obx, + observable, + makeObservable, + untracked, + computed, + observer, + globalLocale, + }; + } + + get designerCabin(): any { + return this.__designerCabin; + } + + get skeletonCabin(): any { + return this.__skeletonCabin; + } +} \ No newline at end of file diff --git a/packages/shell/src/index.ts b/packages/shell/src/index.ts index 07a0c83a7..8b6096e9b 100644 --- a/packages/shell/src/index.ts +++ b/packages/shell/src/index.ts @@ -1,5 +1,4 @@ import Detecting from './detecting'; -// import Dragon from './dragon'; import DocumentModel from './document-model'; import Event, { getEvent } from './event'; import History from './history'; @@ -15,6 +14,8 @@ import Skeleton from './skeleton'; import Dragon from './dragon'; import SettingPropEntry from './setting-prop-entry'; import SettingTopEntry from './setting-top-entry'; +import Common from './common'; + export * from './symbols'; /** @@ -27,7 +28,6 @@ export * from './symbols'; export { DocumentModel, Detecting, - // Dragon, Event, History, Material, @@ -42,5 +42,6 @@ export { SettingPropEntry, SettingTopEntry, Dragon, + Common, getEvent, }; \ No newline at end of file diff --git a/packages/shell/src/project.ts b/packages/shell/src/project.ts index ce1667bde..0bf555571 100644 --- a/packages/shell/src/project.ts +++ b/packages/shell/src/project.ts @@ -183,4 +183,14 @@ export default class Project { } return offFn; } + + /** + * 设置多语言语料 + * 数据格式参考 https://github.com/alibaba/lowcode-engine/blob/main/specs/lowcode-spec.md#2434%E5%9B%BD%E9%99%85%E5%8C%96%E5%A4%9A%E8%AF%AD%E8%A8%80%E7%B1%BB%E5%9E%8Baa + * @param value object + * @returns + */ + setI18n(value: object): void { + this[projectSymbol].set('i18n', value); + } } diff --git a/packages/types/package.json b/packages/types/package.json index 7e046d340..39d3e7c49 100644 --- a/packages/types/package.json +++ b/packages/types/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-types", - "version": "1.0.16", + "version": "1.0.17", "description": "Types for Ali lowCode engine", "files": [ "es", diff --git a/packages/types/src/field-config.ts b/packages/types/src/field-config.ts index 70a881fde..3fc0a8288 100644 --- a/packages/types/src/field-config.ts +++ b/packages/types/src/field-config.ts @@ -61,6 +61,11 @@ export interface FieldExtraProps { * @todo 待补充文档 */ liveTextEditing?: Omit; + + /** + * onChange 事件 + */ + onChange?: (value: any, field: any) => void; } /** diff --git a/packages/types/src/value-type.ts b/packages/types/src/value-type.ts index 933e9a698..a266cb9f3 100644 --- a/packages/types/src/value-type.ts +++ b/packages/types/src/value-type.ts @@ -128,8 +128,18 @@ export interface CompositeObject { [key: string]: CompositeValue; } +/** + * 为了避免把 { type: 'JSExpression', extType: 'function' } 误判为表达式，故增加如下逻辑。 + * + * 引擎中关于函数的表达： + * 开源版本：{ type: 'JSFunction', source: '', value: '' } + * 内部版本：{ type: 'JSExpression', source: '', value: '', extType: 'function' } + * 能力是对标的，不过开源的 react-renderer 只认识第一种，而内部只识别第二种（包括 Java 代码、RE）。 + * @param data + * @returns + */ export function isJSExpression(data: any): data is JSExpression { - return data && data.type === 'JSExpression'; + return data && data.type === 'JSExpression' && data.extType !== 'function'; } export function isJSFunction(x: any): x is JSFunction { diff --git a/packages/utils/package.json b/packages/utils/package.json index b6c3a7546..5555f8457 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -1,6 +1,6 @@ { "name": "@alilc/lowcode-utils", - "version": "1.0.16", + "version": "1.0.17", "description": "Utils for Ali lowCode engine", "files": [ "lib", @@ -14,7 +14,7 @@ }, "dependencies": { "@alifd/next": "^1.19.16", - "@alilc/lowcode-types": "1.0.16", + "@alilc/lowcode-types": "1.0.17", "lodash": "^4.17.21", "mobx": "^6.3.0", "react": "^16", diff --git a/packages/utils/src/index.ts b/packages/utils/src/index.ts index 42f157294..4f47402a1 100644 --- a/packages/utils/src/index.ts +++ b/packages/utils/src/index.ts @@ -26,4 +26,4 @@ export * from './node-helper'; export * from './clone-enumerable-property'; export * from './logger'; export * as css from './css-helper'; -export { transactionManager } from './start-transaction'; +export { transactionManager } from './transaction-manager'; diff --git a/packages/utils/src/misc.ts b/packages/utils/src/misc.ts index 87eea62f8..8a8211250 100644 --- a/packages/utils/src/misc.ts +++ b/packages/utils/src/misc.ts @@ -23,7 +23,7 @@ export function isUseI18NSetter(prototype: any, propName: string) { return false; } -export function convertToI18NObject(v: string | any, locale: string = 'zh_CN') { +export function convertToI18NObject(v: string | any, locale: string = 'zh-CN') { if (isI18NObject(v)) return v; return { type: 'i18n', use: locale, [locale]: v }; } diff --git a/packages/utils/src/start-transaction.ts b/packages/utils/src/transaction-manager.ts similarity index 100% rename from packages/utils/src/start-transaction.ts rename to packages/utils/src/transaction-manager.ts