Compare commits

..

14 Commits

Author SHA1 Message Date
GitHub Action
c8350a4095 chore(release): publish 1.3.3-beta.1 2024-03-01 01:41:54 +00:00
liujuping
33902e0109 feat(hotkey): Add mount method to Hotkey class 2024-03-01 09:35:33 +08:00
GitHub Action
202159cfd0 chore(docs): publish documentation 2024-03-01 09:35:33 +08:00
zzzhrookie
a5e1106160 docs(chore): fix incorrect module name 2024-03-01 09:35:33 +08:00
zzzhrookie
42480f4d68 docs(chore): replace English parentheses with Chinese ones 2024-03-01 09:35:32 +08:00
zzzhrookie
f84d4e7901 docs(chore): update command for developing docs 2024-03-01 09:35:32 +08:00
zzzhrookie
cc36ba152d docs(chore): fix incorrect link redirects within lowcode-spec.md 2024-03-01 09:35:32 +08:00
DiscoverForever
abb0ce001c docs: fix incorrect word, change "搜搜" to "搜索"
修复readme中的错别字,"搜搜"修改为"搜索"。
2024-03-01 09:35:32 +08:00
GitHub Action
3ab64227d5 chore(docs): publish documentation 2024-03-01 09:35:31 +08:00
刘菊萍(絮黎)
f8651ce0d5 Update commonUI.md 2024-03-01 09:35:31 +08:00
GitHub Action
bd4b735f3b chore(release): publish 1.3.3-beta.0 2024-02-27 05:59:07 +00:00
liujuping
0d92011863 chore: update ts defined 2024-02-27 11:05:03 +08:00
GitHub Action
dbd9382117 chore(docs): publish documentation 2024-02-26 07:02:35 +00:00
刘菊萍(絮黎)
1e72c43459 Update command.md 2024-02-26 15:01:45 +08:00
106 changed files with 344 additions and 783 deletions

2
.github/CODEOWNERS vendored
View File

@ -2,7 +2,7 @@
# These owners will be the default owners for everything in
# the repo. Unless a later match takes precedence
* @liujuping @1ncounter
* @liujuping @JackLian
/modules/material-parser @akirakai
/modules/code-generator @qingniaotonghua

View File

@ -12,7 +12,7 @@ jobs:
runs-on: ubuntu-latest
if: >-
contains(github.ref, 'refs/heads/release/') &&
(github.actor == '1ncounter' || github.actor == 'liujuping')
(github.actor == 'JackLian' || github.actor == 'liujuping')
steps:
- uses: actions/checkout@v2
- name: Setup Node.js

View File

@ -36,7 +36,7 @@ $ yarn build
## 功能
- [x] 支持本地离线搜
- [x] 支持本地离线搜
- [x] 版本化文档管理
- [x] 离线静态部署
- [x] 主题fork 宜搭开发者中心)

View File

@ -25,8 +25,7 @@ sidebar_position: 10
注册一个新命令及其处理函数。
```
typescriptCopy code
```typescript
/**
* 注册一个新的命令及其处理程序。
* @param command {IPublicTypeCommand} - 要注册的命令。
@ -38,8 +37,7 @@ registerCommand(command: IPublicTypeCommand): void;
注销一个已存在的命令。
```
typescriptCopy code
```typescript
/**
* 注销一个已存在的命令。
* @param name {string} - 要注销的命令的名称。
@ -51,8 +49,7 @@ unregisterCommand(name: string): void;
根据名称和提供的参数执行命令,确保参数符合命令的定义。
```
typescriptCopy code
```typescript
/**
* 根据名称和提供的参数执行命令。
* @param name {string} - 要执行的命令的名称。
@ -65,8 +62,7 @@ executeCommand(name: string, args?: IPublicTypeCommandHandlerArgs): void;
批量执行命令,在所有命令执行后进行重绘,历史记录中只记录一次。
```
typescriptCopy code
```typescript
/**
* 批量执行命令,随后进行重绘,历史记录中只记录一次。
* @param commands {Array} - 命令对象的数组,包含名称和可选参数。
@ -78,8 +74,7 @@ batchExecuteCommand(commands: { name: string; args?: IPublicTypeCommandHandlerAr
列出所有已注册的命令。
```
typescriptCopy code
```typescript
/**
* 列出所有已注册的命令。
* @returns {IPublicTypeListCommand[]} - 已注册命令的数组。
@ -91,8 +86,7 @@ listCommands(): IPublicTypeListCommand[];
为命令执行过程中的错误注册错误处理回调函数。
```
typescriptCopy code
```typescript
/**
* 为命令执行过程中的错误注册一个回调函数。
* @param callback {(name: string, error: Error) => void} - 错误处理的回调函数。

View File

@ -3,6 +3,8 @@ title: commonUI - UI 组件库
sidebar_position: 10
---
> **@since** v1.3.0
## 简介
CommonUI API 是一个专为低代码引擎设计的组件 UI 库,使用它开发的插件,可以保证在不同项目和主题切换中能够保持一致性和兼容性。

View File

@ -32,6 +32,19 @@ bind(
- [IPublicTypeHotkeyCallback](https://github.com/alibaba/lowcode-engine/blob/main/packages/types/src/shell/type/hotkey-callback.ts)
- [IPublicTypeDisposable](https://github.com/alibaba/lowcode-engine/blob/main/packages/types/src/shell/type/disposable.ts)
### mount
给指定窗口绑定快捷键
```typescript
/**
* 给指定窗口绑定快捷键
* @param window 窗口的 window 对象
*/
mount(window: Window): IPublicTypeDisposable;
```
## 使用示例
### 基础示例

View File

@ -20,7 +20,7 @@ sidebar_position: 1
[在 Demo 中](https://lowcode-engine.cn/demo/demo-general/index.html),右上角有渲染模块的示例使用方式:
![Mar-13-2022 16-52-49.gif](https://img.alicdn.com/imgextra/i2/O1CN01PRsEl61o7Zct5fJML_!!6000000005178-1-tps-1534-514.gif)
基于官方提供的渲染模块 [@alifd/lowcode-react-renderer](https://github.com/alibaba/lowcode-engine/tree/main/packages/react-renderer),你可以在 React 上下文渲染低代码编辑器产出的页面。
基于官方提供的渲染模块 [@alilc/lowcode-react-renderer](https://github.com/alibaba/lowcode-engine/tree/main/packages/react-renderer),你可以在 React 上下文渲染低代码编辑器产出的页面。
### 构造渲染模块所需数据

View File

@ -70,7 +70,7 @@ npm start
在 lowcode-engine 目录下执行下面命令
```
cd docs
npm install
npm start
```

View File

@ -20,7 +20,7 @@ sidebar_position: 0
### 1.2 协议草案起草人
- 撰写:月飞、康为、林熠
- 审阅:大果、潕量、九神、元彦、戊子、屹凡、金禅、前道、天晟、戊子、游鹿、光弘、力皓
- 审阅:大果、潕量、九神、元彦、戊子、屹凡、金禅、前道、天晟、游鹿、光弘、力皓
### 1.3 版本号
@ -94,7 +94,7 @@ sidebar_position: 0
### 1.9 使用范围
本协议描述的是低代码搭建平台产物(应用、页面、区块、组件)的 schema 结构,以及实现其数据状态更新(内置 api)、能力扩展、国际化等方面完整,只在低代码搭建场景下可用;
本协议描述的是低代码搭建平台产物(应用、页面、区块、组件)的 schema 结构,以及实现其数据状态更新(内置 api、能力扩展、国际化等方面完整,只在低代码搭建场景下可用;
### 1.10 协议目标
@ -430,7 +430,7 @@ import { Input as CustomInput } from '@ali/custom/lib/input';
| 参数 | 说明 | 类型 | 支持变量 | 默认值 | 备注 |
| ----------- | ---------------------- | -------------------------------------- | -------- | ------ | ----------------------------------------------------------------------------------------------------------- |
| list[] | 数据源列表 | **ComponentDataSourceItem**[] | - | - | 成为为单个请求配置, 内容定义详见 [ComponentDataSourceItem 对象描述](#2314-componentdatasourceitem-对象描述) |
| dataHandler | 所有请求数据的处理函数 | Function | - | - | 详见 [dataHandler Function 描述](#2317-datahandler-function 描述) |
| dataHandler | 所有请求数据的处理函数 | Function | - | - | 详见 [dataHandler Function 描述](#2317-datahandler-function-描述) |
##### 2.3.1.4 ComponentDataSourceItem 对象描述
@ -447,7 +447,7 @@ import { Input as CustomInput } from '@ali/custom/lib/input';
| errorHandler | request 失败后的回调函数 | Function | - | - | 参数:请求出错 promise 的 error 内容 |
| options {} | 请求参数 | **ComponentDataSourceItemOptions**| - | - | 每种请求类型对应不同参数,详见 | 每种请求类型对应不同参数,详见 [ComponentDataSourceItemOptions 对象描述](#2315-componentdatasourceitemoptions-对象描述) |
**关于 dataHandler errorHandler 的细节说明:**
**关于 dataHandler errorHandler 的细节说明:**
request 返回的是一个 promisedataHandler 和 errorHandler 遵循 Promise 对象的 then 方法,实际使用方式如下:
@ -560,7 +560,7 @@ try {
| 参数 | 说明 | 类型 | 支持变量 | 默认值 | 备注 |
| ------------- | ---------------------- | ---------------- | -------- | ----------------- | ---------------------------------------------------------------------------------------------------------- |
| id | 组件唯一标识 | String | - | | 可选,组件 id 由引擎随机生成UUID并保证唯一性消费方为上层应用平台在组件发生移动等场景需保持 id 不变 |
| componentName | 组件名称 | String | - | Div | 必填,首字母大写,同 [componentsMap](#22-组件映射关系 a) 中的要求 |
| componentName | 组件名称 | String | - | Div | 必填,首字母大写,同 [componentsMap](#22-组件映射关系a) 中的要求 |
| props {} | 组件属性对象 | **Props**| - | {} | 必填,详见 | 必填,详见 [Props 结构描述](#2311-props-结构描述) |
| condition | 渲染条件 | Boolean | ✅ | true | 选填,根据表达式结果判断是否渲染物料;支持变量表达式 |
| loop | 循环数据 | Array | ✅ | - | 选填,默认不进行循环渲染;支持变量表达式 |
@ -797,7 +797,7 @@ try {
| 参数 | 说明 | 值类型 | 默认值 | 备注 |
| ------ | ---------- | --------------------- | -------- | -------------------------------------------------------------- |
| type | 值类型描述 | String | 'JSSlot' | 固定值 |
| value | 具体的值 | NodeSchema \| NodeSchema[] | null | 内容为 NodeSchema 类型,详见[组件结构描述](#232-组件结构描述 a) |
| value | 具体的值 | NodeSchema \| NodeSchema[] | null | 内容为 NodeSchema 类型,详见[组件结构描述](#232-组件结构描述A) |
| params | 函数的参数 | String[] | null | 函数的入参,其子节点可以通过 `this[参数名]` 来获取对应的参数。 |
@ -1124,7 +1124,7 @@ this.setState((prevState) => ({ count: prevState.count + 1 }));
| utils[] | 工具类扩展映射关系 | **UtilItem**[] | - | |
| *UtilItem*.name | 工具类扩展项名称 | String | - | |
| *UtilItem*.type | 工具类扩展项类型 | 枚举, `'npm'` (代表公网 npm 类型) / `'tnpm'` (代表阿里巴巴内部 npm 类型) / `'function'` (代表 Javascript 函数类型) | - | |
| *UtilItem*.content | 工具类扩展项内容 | [ComponentMap 类型](#22-组件映射关系 a) 或 [JSFunction](#2432事件函数类型 a) | - | |
| *UtilItem*.content | 工具类扩展项内容 | [ComponentMap 类型](#22-组件映射关系a) 或 [JSFunction](#2342事件函数类型a) | - | |
描述示例:

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-engine-docs",
"version": "1.2.31",
"version": "1.2.34",
"description": "低代码引擎版本化文档",
"license": "MIT",
"files": [

View File

@ -1,6 +1,6 @@
{
"lerna": "4.0.0",
"version": "1.3.2",
"version": "1.3.3-beta.1",
"npmClient": "yarn",
"useWorkspaces": true,
"packages": [

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-designer",
"version": "1.3.2",
"version": "1.3.3-beta.1",
"description": "Designer for Ali LowCode Engine",
"main": "lib/index.js",
"module": "es/index.js",
@ -15,9 +15,9 @@
},
"license": "MIT",
"dependencies": {
"@alilc/lowcode-editor-core": "1.3.2",
"@alilc/lowcode-types": "1.3.2",
"@alilc/lowcode-utils": "1.3.2",
"@alilc/lowcode-editor-core": "1.3.3-beta.1",
"@alilc/lowcode-types": "1.3.3-beta.1",
"@alilc/lowcode-utils": "1.3.3-beta.1",
"classnames": "^2.2.6",
"react": "^16",
"react-dom": "^16.7.0",

View File

@ -5,18 +5,6 @@ import { Menu } from '@alifd/next';
import { engineConfig } from '@alilc/lowcode-editor-core';
import './context-menu-actions.scss';
export interface IContextMenuActions {
actions: IPublicTypeContextMenuAction[];
adjustMenuLayoutFn: (actions: IPublicTypeContextMenuItem[]) => IPublicTypeContextMenuItem[];
addMenuAction: IPublicApiMaterial['addContextMenuOption'];
removeMenuAction: IPublicApiMaterial['removeContextMenuOption'];
adjustMenuLayout: IPublicApiMaterial['adjustContextMenuLayout'];
}
let adjustMenuLayoutFn: Function = (actions: IPublicTypeContextMenuAction[]) => actions;
export class GlobalContextMenuActions {
@ -116,7 +104,7 @@ export class GlobalContextMenuActions {
const globalContextMenuActions = new GlobalContextMenuActions();
export class ContextMenuActions implements IContextMenuActions {
export class ContextMenuActions {
actions: IPublicTypeContextMenuAction[] = [];
designer: IDesigner;
@ -204,30 +192,32 @@ export class ContextMenuActions implements IContextMenuActions {
originalEvent.stopPropagation();
originalEvent.preventDefault();
// 如果右键的节点不在 当前选中的节点中,选中该节点
if (!designer.currentSelection.has(node.id)) {
designer.currentSelection.select(node.id);
if (!designer.currentSelection?.has(node.id)) {
designer.currentSelection?.select(node.id);
}
const nodes = designer.currentSelection.getNodes();
const nodes = designer.currentSelection?.getNodes();
this.handleContextMenu(nodes, originalEvent);
}),
);
}
addMenuAction(action: IPublicTypeContextMenuAction) {
addMenuAction: IPublicApiMaterial['addContextMenuOption'] = (action: IPublicTypeContextMenuAction) => {
this.actions.push({
type: IPublicEnumContextMenuType.MENU_ITEM,
...action,
});
}
};
removeMenuAction(name: string) {
removeMenuAction: IPublicApiMaterial['removeContextMenuOption'] = (name: string) => {
const i = this.actions.findIndex((action) => action.name === name);
if (i > -1) {
this.actions.splice(i, 1);
}
}
};
adjustMenuLayout(fn: (actions: IPublicTypeContextMenuItem[]) => IPublicTypeContextMenuItem[]) {
adjustMenuLayout: IPublicApiMaterial['adjustContextMenuLayout'] = (fn: (actions: IPublicTypeContextMenuItem[]) => IPublicTypeContextMenuItem[]) => {
adjustMenuLayoutFn = fn;
}
}
};
}
export interface IContextMenuActions extends ContextMenuActions {}

View File

@ -1,16 +1,16 @@
import { Component } from 'react';
import classNames from 'classnames';
import BuiltinDragGhostComponent from './drag-ghost';
import { Designer, DesignerProps } from './designer';
import { Designer, DesignerProps, IDesigner } from './designer';
import { ProjectView } from '../project';
import './designer.less';
type IProps = DesignerProps & {
designer?: Designer;
designer?: IDesigner;
};
export class DesignerView extends Component<IProps> {
readonly designer: Designer;
readonly designer: IDesigner;
readonly viewName: string | undefined;
constructor(props: IProps) {

View File

@ -6,7 +6,6 @@ import {
IPublicTypeComponentAction,
IPublicTypeNpmInfo,
IPublicModelEditor,
IPublicTypeCompositeObject,
IPublicTypePropsList,
IPublicTypeNodeSchema,
IPublicTypePropsTransducer,
@ -17,15 +16,16 @@ import {
IPublicTypeLocationData,
IPublicEnumTransformStage,
IPublicModelLocateEvent,
IPublicTypePropsMap,
} from '@alilc/lowcode-types';
import { mergeAssets, IPublicTypeAssetsJson, isNodeSchema, isDragNodeObject, isDragNodeDataObject, isLocationChildrenDetail, Logger } from '@alilc/lowcode-utils';
import { IProject, Project } from '../project';
import { Node, DocumentModel, insertChildren, INode, ISelection } from '../document';
import { Node, DocumentModel, insertChildren, INode } from '../document';
import { ComponentMeta, IComponentMeta } from '../component-meta';
import { INodeSelector, Component } from '../simulator';
import { Scroller } from './scroller';
import { Dragon, IDragon } from './dragon';
import { ActiveTracker, IActiveTracker } from './active-tracker';
import { ActiveTracker } from './active-tracker';
import { Detecting } from './detecting';
import { DropLocation } from './location';
import { OffsetObserver, createOffsetObserver } from './offset-observer';
@ -47,7 +47,7 @@ export interface DesignerProps {
viewName?: string;
simulatorProps?: Record<string, any> | ((document: DocumentModel) => object);
simulatorComponent?: ComponentType<any>;
dragGhostComponent?: ComponentType<any>;
dragGhostComponent?: ComponentType<{ designer: IDesigner }>;
suspensed?: boolean;
componentMetadatas?: IPublicTypeComponentMetadata[];
globalComponentActions?: IPublicTypeComponentAction[];
@ -60,70 +60,10 @@ export interface DesignerProps {
) => void;
}
export interface IDesigner {
readonly shellModelFactory: IShellModelFactory;
viewName: string | undefined;
readonly project: IProject;
get dragon(): IDragon;
get activeTracker(): IActiveTracker;
get componentActions(): ComponentActions;
get contextMenuActions(): ContextMenuActions;
get editor(): IPublicModelEditor;
get detecting(): Detecting;
get simulatorComponent(): ComponentType<any> | undefined;
get currentSelection(): ISelection;
createScroller(scrollable: IPublicTypeScrollable): IPublicModelScroller;
refreshComponentMetasMap(): void;
createOffsetObserver(nodeInstance: INodeSelector): OffsetObserver | null;
/**
* dragon
*/
createLocation(locationData: IPublicTypeLocationData<INode>): DropLocation;
get componentsMap(): { [key: string]: IPublicTypeNpmInfo | Component };
loadIncrementalAssets(incrementalAssets: IPublicTypeAssetsJson): Promise<void>;
getComponentMeta(
componentName: string,
generateMetadata?: () => IPublicTypeComponentMetadata | null,
): IComponentMeta;
clearLocation(): void;
createComponentMeta(data: IPublicTypeComponentMetadata): IComponentMeta | null;
getComponentMetasMap(): Map<string, IComponentMeta>;
addPropsReducer(reducer: IPublicTypePropsTransducer, stage: IPublicEnumTransformStage): void;
postEvent(event: string, ...args: any[]): void;
transformProps(props: IPublicTypeCompositeObject | IPublicTypePropsList, node: Node, stage: IPublicEnumTransformStage): IPublicTypeCompositeObject | IPublicTypePropsList;
createSettingEntry(nodes: INode[]): ISettingTopEntry;
autorun(effect: (reaction: IReactionPublic) => void, options?: IReactionOptions<any, any>): IReactionDisposer;
}
export class Designer implements IDesigner {
export class Designer {
dragon: IDragon;
viewName: string | undefined;
readonly viewName: string | undefined;
readonly componentActions = new ComponentActions();
@ -423,7 +363,7 @@ export class Designer implements IDesigner {
if (props.simulatorProps !== this.props.simulatorProps) {
this._simulatorProps = props.simulatorProps;
// 重新 setupSelection
if (props.simulatorProps?.designMode !== this.props.simulatorProps?.designMode) {
if ((props.simulatorProps as any)?.designMode !== (this.props.simulatorProps as any)?.designMode) {
this.setupSelection();
}
}
@ -612,7 +552,7 @@ export class Designer implements IDesigner {
return maps;
}
transformProps(props: IPublicTypeCompositeObject | IPublicTypePropsList, node: Node, stage: IPublicEnumTransformStage) {
transformProps(props: IPublicTypePropsMap | IPublicTypePropsList, node: Node, stage: IPublicEnumTransformStage): IPublicTypePropsMap | IPublicTypePropsList {
if (Array.isArray(props)) {
// current not support, make this future
return props;
@ -623,7 +563,7 @@ export class Designer implements IDesigner {
return props;
}
return reducers.reduce((xprops, reducer) => {
return reducers.reduce((xprops, reducer: IPublicTypePropsTransducer) => {
try {
return reducer(xprops, node.internalToShellNode() as any, { stage });
} catch (e) {
@ -655,3 +595,5 @@ export class Designer implements IDesigner {
// TODO:
}
}
export interface IDesigner extends Designer {}

View File

@ -95,17 +95,13 @@ function isDragEvent(e: any): e is DragEvent {
return e?.type?.startsWith('drag');
}
export interface IDragon extends IPublicModelDragon<
INode,
ILocateEvent
> {
emitter: IEventBus;
}
/**
* Drag-on
*/
export class Dragon implements IDragon {
export class Dragon implements IPublicModelDragon<
INode,
ILocateEvent
> {
private sensors: IPublicModelSensor[] = [];
private nodeInstPointerEvents: boolean;
@ -637,3 +633,5 @@ export class Dragon implements IDragon {
};
}
}
export interface IDragon extends Dragon { }

View File

@ -28,11 +28,11 @@ export class OffsetObserver {
@obx private _bottom = 0;
@computed get height() {
return this.isRoot ? this.viewport.height : this._height * this.scale;
return this.isRoot ? this.viewport?.height : this._height * this.scale;
}
@computed get width() {
return this.isRoot ? this.viewport.width : this._width * this.scale;
return this.isRoot ? this.viewport?.width : this._width * this.scale;
}
@computed get top() {
@ -44,51 +44,51 @@ export class OffsetObserver {
}
@computed get bottom() {
return this.isRoot ? this.viewport.height : this._bottom * this.scale;
return this.isRoot ? this.viewport?.height : this._bottom * this.scale;
}
@computed get right() {
return this.isRoot ? this.viewport.width : this._right * this.scale;
return this.isRoot ? this.viewport?.width : this._right * this.scale;
}
@obx hasOffset = false;
@computed get offsetLeft() {
if (this.isRoot) {
return this.viewport.scrollX * this.scale;
return (this.viewport?.scrollX || 0) * this.scale;
}
if (!this.viewport.scrolling || this.lastOffsetLeft == null) {
this.lastOffsetLeft = this.left + this.viewport.scrollX * this.scale;
if (!this.viewport?.scrolling || this.lastOffsetLeft == null) {
this.lastOffsetLeft = this.left + (this.viewport?.scrollX || 0) * this.scale;
}
return this.lastOffsetLeft;
}
@computed get offsetTop() {
if (this.isRoot) {
return this.viewport.scrollY * this.scale;
return (this.viewport?.scrollY || 0) * this.scale;
}
if (!this.viewport.scrolling || this.lastOffsetTop == null) {
this.lastOffsetTop = this.top + this.viewport.scrollY * this.scale;
if (!this.viewport?.scrolling || this.lastOffsetTop == null) {
this.lastOffsetTop = this.top + (this.viewport?.scrollY || 0) * this.scale;
}
return this.lastOffsetTop;
}
@computed get offsetHeight() {
if (!this.viewport.scrolling || this.lastOffsetHeight == null) {
this.lastOffsetHeight = this.isRoot ? this.viewport.height : this.height;
if (!this.viewport?.scrolling || this.lastOffsetHeight == null) {
this.lastOffsetHeight = this.isRoot ? (this.viewport?.height || 0) : this.height;
}
return this.lastOffsetHeight;
}
@computed get offsetWidth() {
if (!this.viewport.scrolling || this.lastOffsetWidth == null) {
this.lastOffsetWidth = this.isRoot ? this.viewport.width : this.width;
if (!(this.viewport?.scrolling || 0) || this.lastOffsetWidth == null) {
this.lastOffsetWidth = this.isRoot ? (this.viewport?.width || 0) : this.width;
}
return this.lastOffsetWidth;
}
@computed get scale() {
return this.viewport.scale;
return this.viewport?.scale || 0;
}
private pid: number | undefined;
@ -124,11 +124,11 @@ export class OffsetObserver {
return;
}
const rect = host.computeComponentInstanceRect(instance!, node.componentMeta.rootSelector);
const rect = host?.computeComponentInstanceRect(instance!, node.componentMeta.rootSelector);
if (!rect) {
this.hasOffset = false;
} else if (!this.viewport.scrolling || !this.hasOffset) {
} else if (!this.viewport?.scrolling || !this.hasOffset) {
this._height = rect.height;
this._width = rect.width;
this._left = rect.left;

View File

@ -56,104 +56,30 @@ export type GetDataType<T, NodeType> = T extends undefined
: any
: T;
export interface IDocumentModel extends Omit<IPublicModelDocumentModel<
ISelection,
IHistory,
INode,
IDropLocation,
IModalNodesManager,
IProject
export class DocumentModel implements Omit<IPublicModelDocumentModel<
ISelection,
IHistory,
INode,
IDropLocation,
IModalNodesManager,
IProject
>,
'detecting' |
'checkNesting' |
'getNodeById' |
// 以下属性在内部的 document 中不存在
'exportSchema' |
'importSchema' |
'onAddNode' |
'onRemoveNode' |
'onChangeDetecting' |
'onChangeSelection' |
'onChangeNodeProp' |
'onImportSchema' |
'isDetectingNode' |
'onFocusNodeChanged' |
'onDropLocationChanged'
'detecting' |
'checkNesting' |
'getNodeById' |
// 以下属性在内部的 document 中不存在
'exportSchema' |
'importSchema' |
'onAddNode' |
'onRemoveNode' |
'onChangeDetecting' |
'onChangeSelection' |
'onChangeNodeProp' |
'onImportSchema' |
'isDetectingNode' |
'onFocusNodeChanged' |
'onDropLocationChanged'
> {
readonly designer: IDesigner;
selection: ISelection;
get rootNode(): INode | null;
get simulator(): ISimulatorHost | null;
get active(): boolean;
get nodesMap(): Map<string, INode>;
/**
*
*/
get suspensed(): boolean;
get fileName(): string;
get currentRoot(): INode | null;
isBlank(): boolean;
/**
* id
*/
getNode(id: string): INode | null;
getRoot(): INode | null;
getHistory(): IHistory;
checkNesting(
dropTarget: INode,
dragObject: IPublicTypeDragNodeObject | IPublicTypeNodeSchema | INode | IPublicTypeDragNodeDataObject,
): boolean;
getNodeCount(): number;
nextId(possibleId: string | undefined): string;
import(schema: IPublicTypeRootSchema, checkId?: boolean): void;
export(stage: IPublicEnumTransformStage): IPublicTypeRootSchema | undefined;
onNodeCreate(func: (node: INode) => void): IPublicTypeDisposable;
onNodeDestroy(func: (node: INode) => void): IPublicTypeDisposable;
onChangeNodeVisible(fn: (node: INode, visible: boolean) => void): IPublicTypeDisposable;
addWillPurge(node: INode): void;
removeWillPurge(node: INode): void;
getComponentMeta(componentName: string): IComponentMeta;
insertNodes(parent: INode, thing: INode[] | IPublicTypeNodeData[], at?: number | null, copy?: boolean): INode[];
open(): IDocumentModel;
remove(): void;
suspense(): void;
close(): void;
unlinkNode(node: INode): void;
destroyNode(node: INode): void;
}
export class DocumentModel implements IDocumentModel {
/**
* Page/Component/Block
*/
@ -322,7 +248,7 @@ export class DocumentModel implements IDocumentModel {
// 兼容 vision
this.id = project.getSchema()?.id || this.id;
this.rootNode = this.createNode(
this.rootNode = this.createNode<IRootNode, IPublicTypeRootSchema>(
schema || {
componentName: 'Page',
id: 'root',
@ -425,7 +351,7 @@ export class DocumentModel implements IDocumentModel {
* schema
*/
@action
createNode<T extends INode = INode, C = undefined>(data: GetDataType<C, T>): T {
createNode<T = INode, S = IPublicTypeNodeSchema>(data: S): T {
let schema: any;
if (isDOMText(data) || isJSExpression(data)) {
schema = {
@ -529,7 +455,7 @@ export class DocumentModel implements IDocumentModel {
return null;
}
const wrapper = this.createNode(schema);
if (wrapper.isParental()) {
if (wrapper?.isParental()) {
const first = nodes[0];
// TODO: check nesting rules x 2
insertChild(first.parent!, wrapper, first.index);
@ -538,7 +464,7 @@ export class DocumentModel implements IDocumentModel {
return wrapper;
}
this.removeNode(wrapper);
wrapper && this.removeNode(wrapper);
return null;
}
@ -928,3 +854,5 @@ export function isDocumentModel(obj: any): obj is IDocumentModel {
export function isPageSchema(obj: any): obj is IPublicTypePageSchema {
return obj?.componentName === 'Page';
}
export interface IDocumentModel extends DocumentModel {}

View File

@ -10,63 +10,12 @@ export interface IOnChangeOptions {
node: Node;
}
export interface INodeChildren extends Omit<IPublicModelNodeChildren<INode>,
'importSchema' |
'exportSchema' |
'isEmpty' |
'notEmpty'
export class NodeChildren implements Omit<IPublicModelNodeChildren<INode>,
'importSchema' |
'exportSchema' |
'isEmpty' |
'notEmpty'
> {
children: INode[];
get owner(): INode;
get length(): number;
unlinkChild(node: INode): void;
/**
*
*/
internalDelete(
node: INode,
purge: boolean,
useMutator: boolean,
options: NodeRemoveOptions
): boolean;
/**
*
*/
internalInsert(node: INode, at?: number | null, useMutator?: boolean): void;
import(data?: IPublicTypeNodeData | IPublicTypeNodeData[], checkId?: boolean): void;
/**
* schema
*/
export(stage: IPublicEnumTransformStage): IPublicTypeNodeData[];
/** following methods are overriding super interface, using different param types */
/** overriding methods start */
forEach(fn: (item: INode, index: number) => void): void;
/**
*
*/
get(index: number): INode | null;
isEmpty(): boolean;
notEmpty(): boolean;
internalInitParent(): void;
onChange(fn: (info?: IOnChangeOptions) => void): IPublicTypeDisposable;
/** overriding methods end */
}
export class NodeChildren implements INodeChildren {
@obx.shallow children: INode[];
private emitter: IEventBus = createModuleEventBus('NodeChildren');
@ -99,11 +48,10 @@ export class NodeChildren implements INodeChildren {
constructor(
readonly owner: INode,
data: IPublicTypeNodeData | IPublicTypeNodeData[],
options: any = {},
) {
makeObservable(this);
this.children = (Array.isArray(data) ? data : [data]).filter(child => !!child).map((child) => {
return this.owner.document?.createNode(child, options.checkId);
return this.owner.document?.createNode(child);
});
}
@ -142,9 +90,12 @@ export class NodeChildren implements INodeChildren {
node = child;
node.import(item);
} else {
node = this.owner.document?.createNode(item, checkId);
node = this.owner.document?.createNode(item);
}
if (node) {
children[i] = node;
}
children[i] = node;
}
this.children = children;
@ -176,13 +127,13 @@ export class NodeChildren implements INodeChildren {
/**
*
*/
purge(useMutator = true) {
purge() {
if (this.purged) {
return;
}
this.purged = true;
this.children.forEach((child) => {
child.purge(useMutator);
child.purge();
});
}
@ -212,7 +163,7 @@ export class NodeChildren implements INodeChildren {
node.internalPurgeStart();
if (node.isParentalNode) {
foreachReverse(
node.children,
node.children!,
(subNode: Node) => {
subNode.remove(useMutator, purge, options);
},
@ -459,11 +410,11 @@ export class NodeChildren implements INodeChildren {
const items = adder(this.children);
if (items && items.length > 0) {
items.forEach((child: IPublicTypeNodeData) => {
const node: INode = this.owner.document?.createNode(child);
this.children.push(node);
node.internalSetParent(this.owner);
const node: INode | null = this.owner.document?.createNode(child);
node && this.children.push(node);
node?.internalSetParent(this.owner);
/* istanbul ignore next */
const editor = node.document?.designer.editor;
const editor = node?.document?.designer.editor;
editor?.eventBus.emit('node.add', { node });
});
changed = true;
@ -504,7 +455,7 @@ export class NodeChildren implements INodeChildren {
try {
callbacks?.onSubtreeModified.call(
node.internalToShellNode(),
owner.internalToShellNode(),
owner.internalToShellNode()!,
options,
);
} catch (e) {
@ -517,3 +468,5 @@ export class NodeChildren implements INodeChildren {
}
}
}
export interface INodeChildren extends NodeChildren {}

View File

@ -13,7 +13,6 @@ import {
GlobalEvent,
IPublicTypeComponentAction,
IPublicModelNode,
IPublicModelExclusiveGroup,
IPublicEnumTransformStage,
IPublicTypeDisposable,
IBaseModelNode,
@ -37,132 +36,7 @@ export interface NodeStatus {
inPlaceEditing: boolean;
}
export interface IBaseNode<Schema extends IPublicTypeNodeSchema = IPublicTypeNodeSchema> extends Omit<IBaseModelNode<
IDocumentModel,
IBaseNode,
INodeChildren,
IComponentMeta,
ISettingTopEntry,
IProps,
IProp,
IExclusiveGroup
>,
'isRoot' |
'isPage' |
'isComponent' |
'isModal' |
'isSlot' |
'isParental' |
'isLeaf' |
'settingEntry' |
// 在内部的 node 模型中不存在
'getExtraPropValue' |
'setExtraPropValue' |
'exportSchema' |
'visible' |
'importSchema' |
// 内外实现有差异
'isContainer' |
'isEmpty'
> {
isNode: boolean;
get componentMeta(): IComponentMeta;
get settingEntry(): ISettingTopEntry;
get isPurged(): boolean;
get index(): number | undefined;
get isPurging(): boolean;
getId(): string;
getParent(): INode | null;
/**
* 使
* @param useMutator
*/
internalSetParent(parent: INode | null, useMutator?: boolean): void;
setConditionGroup(grp: IPublicModelExclusiveGroup | string | null): void;
internalToShellNode(): IPublicModelNode | null;
internalPurgeStart(): void;
unlinkSlot(slotNode: INode): void;
/**
* schema
*/
export<T = Schema>(stage: IPublicEnumTransformStage, options?: any): T;
emitPropChange(val: IPublicTypePropChangeOptions): void;
import(data: Schema, checkId?: boolean): void;
internalSetSlotFor(slotFor: Prop | null | undefined): void;
addSlot(slotNode: INode): void;
onVisibleChange(func: (flag: boolean) => any): () => void;
getSuitablePlace(node: INode, ref: any): any;
onChildrenChange(fn: (param?: { type: string; node: INode }) => void): IPublicTypeDisposable | undefined;
onPropChange(func: (info: IPublicTypePropChangeOptions) => void): IPublicTypeDisposable;
isModal(): boolean;
isRoot(): boolean;
isPage(): boolean;
isComponent(): boolean;
isSlot(): boolean;
isParental(): boolean;
isLeaf(): boolean;
isContainer(): boolean;
isEmpty(): boolean;
remove(
useMutator?: boolean,
purge?: boolean,
options?: NodeRemoveOptions,
): void;
didDropIn(dragment: INode): void;
didDropOut(dragment: INode): void;
purge(): void;
removeSlot(slotNode: INode): boolean;
setVisible(flag: boolean): void;
getVisible(): boolean;
getChildren(): INodeChildren | null;
clearPropValue(path: string | number): void;
setProps(props?: IPublicTypePropsMap | IPublicTypePropsList | Props | null): void;
mergeProps(props: IPublicTypePropsMap): void;
/** 是否可以选中 */
canSelect(): boolean;
}
export interface IBaseNode extends Node {}
/**
*
@ -212,7 +86,34 @@ export interface IBaseNode<Schema extends IPublicTypeNodeSchema = IPublicTypeNod
* isLocked
* hidden
*/
export class Node<Schema extends IPublicTypeNodeSchema = IPublicTypeNodeSchema> implements IBaseNode {
export class Node<Schema extends IPublicTypeNodeSchema = IPublicTypeNodeSchema> implements Omit<IBaseModelNode<
IDocumentModel,
IBaseNode,
INodeChildren,
IComponentMeta,
ISettingTopEntry,
IProps,
IProp,
IExclusiveGroup
>,
'isRoot' |
'isPage' |
'isComponent' |
'isModal' |
'isSlot' |
'isParental' |
'isLeaf' |
'settingEntry' |
// 在内部的 node 模型中不存在
'getExtraPropValue' |
'setExtraPropValue' |
'exportSchema' |
'visible' |
'importSchema' |
// 内外实现有差异
'isContainer' |
'isEmpty'
> {
private emitter: IEventBus;
/**
@ -690,7 +591,7 @@ export class Node<Schema extends IPublicTypeNodeSchema = IPublicTypeNodeSchema>
}
/* istanbul ignore next */
setConditionGroup(grp: IPublicModelExclusiveGroup | string | null) {
setConditionGroup(grp: IExclusiveGroup | string | null) {
let _grp: IExclusiveGroup | null = null;
if (!grp) {
this.getExtraProp('conditionGroup', false)?.remove();
@ -1389,11 +1290,11 @@ export interface LeafNode extends Node {
export type IPublicTypePropChangeOptions = Omit<GlobalEvent.Node.Prop.ChangeOptions, 'node'>;
export type ISlotNode = IBaseNode<IPublicTypeSlotSchema>;
export type IPageNode = IBaseNode<IPublicTypePageSchema>;
export type IComponentNode = IBaseNode<IPublicTypeComponentSchema>;
export type IRootNode = IPageNode | IComponentNode;
export type INode = IPageNode | ISlotNode | IComponentNode | IRootNode;
export interface ISlotNode extends Node<IPublicTypeSlotSchema> {}
export interface IPageNode extends Node<IPublicTypePageSchema> {}
export interface IComponentNode extends Node<IPublicTypeComponentSchema> {}
export interface IRootNode extends Node<IPublicTypePageSchema | IPublicTypeComponentSchema> {}
export interface INode extends Node<IPublicTypePageSchema | IPublicTypeSlotSchema | IPublicTypeComponentSchema | IPublicTypeNodeSchema> {}
export function isRootNode(node: INode): node is IRootNode {
return node && node.isRootNode;
@ -1505,7 +1406,7 @@ export function insertChild(
export function insertChildren(
container: INode,
nodes: INode[] | IPublicTypeNodeData[],
nodes: INode[] | IPublicTypeNodeData[] | IPublicModelNode[],
at?: number | null,
copy?: boolean,
): INode[] {

View File

@ -1,6 +1,6 @@
import { untracked, computed, obx, engineConfig, action, makeObservable, mobx, runInAction } from '@alilc/lowcode-editor-core';
import { GlobalEvent, IPublicEnumTransformStage } from '@alilc/lowcode-types';
import type { IPublicTypeCompositeValue, IPublicTypeJSSlot, IPublicTypeSlotSchema, IPublicModelProp } from '@alilc/lowcode-types';
import type { IPublicTypeCompositeValue, IPublicTypeJSSlot, IPublicTypeSlotSchema, IPublicModelProp, IPublicTypeNodeData } from '@alilc/lowcode-types';
import { uniqueId, isPlainObject, hasOwnProperty, compatStage, isJSExpression, isJSSlot, isNodeSchema } from '@alilc/lowcode-utils';
import { valueToSource } from './value-to-source';
import { IPropParent } from './props';
@ -227,7 +227,7 @@ export class Prop implements IProp, IPropParent {
constructor(
public parent: IPropParent,
value: IPublicTypeCompositeValue | UNSET = UNSET,
value: IPublicTypeCompositeValue | IPublicTypeNodeData | IPublicTypeNodeData[] | UNSET = UNSET,
key?: string | number,
spread = false,
options = {},
@ -351,7 +351,7 @@ export class Prop implements IProp, IPropParent {
* set value, val should be JSON Object
*/
@action
setValue(val: IPublicTypeCompositeValue) {
setValue(val: IPublicTypeCompositeValue | IPublicTypeNodeData | IPublicTypeNodeData[]) {
if (val === this._value) return;
const oldValue = this._value;
this._value = val;

View File

@ -37,30 +37,9 @@ export interface IPropParent {
delete(prop: IProp): void;
}
export interface IProps extends Omit<IBaseModelProps<IProp>, | 'getExtraProp' | 'getExtraPropValue' | 'setExtraPropValue' | 'node'>, IPropParent {
export interface IProps extends Props {}
/**
* props node
*/
getNode(): INode;
get(path: string, createIfNone?: boolean): IProp | null;
export(stage?: IPublicEnumTransformStage): {
props?: IPublicTypePropsMap | IPublicTypePropsList;
extras?: ExtrasObject;
};
merge(value: IPublicTypePropsMap, extras?: IPublicTypePropsMap): void;
purge(): void;
query(path: string, createIfNone: boolean): IProp | null;
import(value?: IPublicTypePropsMap | IPublicTypePropsList | null, extras?: ExtrasObject): void;
}
export class Props implements IProps, IPropParent {
export class Props implements Omit<IBaseModelProps<IProp>, | 'getExtraProp' | 'getExtraPropValue' | 'setExtraPropValue' | 'node'>, IPropParent {
readonly id = uniqueId('props');
@obx.shallow private items: IProp[] = [];

View File

@ -20,6 +20,7 @@ import {
IPublicEnumPluginRegisterLevel,
IPublicModelWindow,
IPublicApiCommonUI,
IPublicApiCommand,
} from '@alilc/lowcode-types';
import {
IPluginContextOptions,
@ -48,6 +49,7 @@ export default class PluginContext implements
editorWindow: IPublicModelWindow;
commonUI: IPublicApiCommonUI;
isPluginRegisteredInWorkspace: false;
command: IPublicApiCommand;
constructor(
options: IPluginContextOptions,

View File

@ -68,7 +68,7 @@ export interface IProject extends Omit<IBaseApiProject<
onCurrentDocumentChange(fn: (doc: IDocumentModel) => void): () => void;
onSimulatorReady(fn: (args: any) => void): () => void;
onSimulatorReady(fn: (simulator: ISimulatorHost) => void): () => void;
onRendererReady(fn: () => void): () => void;

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-editor-core",
"version": "1.3.2",
"version": "1.3.3-beta.1",
"description": "Core Api for Ali lowCode engine",
"license": "MIT",
"main": "lib/index.js",
@ -16,8 +16,8 @@
},
"dependencies": {
"@alifd/next": "^1.19.16",
"@alilc/lowcode-types": "1.3.2",
"@alilc/lowcode-utils": "1.3.2",
"@alilc/lowcode-types": "1.3.3-beta.1",
"@alilc/lowcode-utils": "1.3.3-beta.1",
"classnames": "^2.2.6",
"debug": "^4.1.1",
"intl-messageformat": "^9.3.1",

View File

@ -1,18 +1,12 @@
import { IPublicApiCommand, IPublicEnumTransitionType, IPublicModelPluginContext, IPublicTypeCommand, IPublicTypeCommandHandlerArgs, IPublicTypeListCommand } from '@alilc/lowcode-types';
import { checkPropTypes } from '@alilc/lowcode-utils';
export interface ICommand extends Omit<IPublicApiCommand, 'registerCommand' | 'batchExecuteCommand'> {
registerCommand(command: IPublicTypeCommand, options?: {
commandScope?: string;
}): void;
batchExecuteCommand(commands: { name: string; args: IPublicTypeCommandHandlerArgs }[], pluginContext?: IPublicModelPluginContext): void;
}
export interface ICommand extends Command {}
export interface ICommandOptions {
commandScope?: string;
}
export class Command implements ICommand {
export class Command implements Omit<IPublicApiCommand, 'registerCommand' | 'batchExecuteCommand'> {
private commands: Map<string, IPublicTypeCommand> = new Map();
private commandErrors: Function[] = [];

View File

@ -1,6 +1,6 @@
import { isEqual } from 'lodash';
import { globalContext } from './di';
import { IPublicTypeHotkeyCallback, IPublicTypeHotkeyCallbackConfig, IPublicTypeHotkeyCallbacks, IPublicApiHotkey } from '@alilc/lowcode-types';
import { IPublicTypeHotkeyCallback, IPublicTypeHotkeyCallbackConfig, IPublicTypeHotkeyCallbacks, IPublicApiHotkey, IPublicTypeDisposable } from '@alilc/lowcode-types';
interface KeyMap {
[key: number]: string;
@ -339,11 +339,10 @@ function fireCallback(callback: IPublicTypeHotkeyCallback, e: KeyboardEvent, com
}
}
export interface IHotKey extends Omit<IPublicApiHotkey, 'bind' | 'callbacks'> {
activate(activate: boolean): void;
export interface IHotKey extends Hotkey {
}
export class Hotkey implements IHotKey {
export class Hotkey implements Omit<IPublicApiHotkey, 'bind' | 'callbacks'> {
callBacks: IPublicTypeHotkeyCallbacks = {};
private directMap: HotkeyDirectMap = {};
@ -368,7 +367,7 @@ export class Hotkey implements IHotKey {
this.isActivate = activate;
}
mount(window: Window) {
mount(window: Window): IPublicTypeDisposable {
const { document } = window;
const handleKeyEvent = this.handleKeyEvent.bind(this);
document.addEventListener('keypress', handleKeyEvent, false);
@ -542,6 +541,8 @@ export class Hotkey implements IHotKey {
}
private handleKeyEvent(e: KeyboardEvent): void {
console.log(e);
// debugger;
if (!this.isActivate) {
return;
}

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-editor-skeleton",
"version": "1.3.2",
"version": "1.3.3-beta.1",
"description": "alibaba lowcode editor skeleton",
"main": "lib/index.js",
"module": "es/index.js",
@ -19,10 +19,10 @@
],
"dependencies": {
"@alifd/next": "^1.20.12",
"@alilc/lowcode-designer": "1.3.2",
"@alilc/lowcode-editor-core": "1.3.2",
"@alilc/lowcode-types": "1.3.2",
"@alilc/lowcode-utils": "1.3.2",
"@alilc/lowcode-designer": "1.3.3-beta.1",
"@alilc/lowcode-editor-core": "1.3.3-beta.1",
"@alilc/lowcode-types": "1.3.3-beta.1",
"@alilc/lowcode-utils": "1.3.3-beta.1",
"classnames": "^2.2.6",
"react": "^16.8.1",
"react-dom": "^16.8.1"

View File

@ -44,72 +44,27 @@ export enum SkeletonEvents {
WIDGET_ENABLE = 'skeleton.widget.enable',
}
export interface ISkeleton extends Omit<IPublicApiSkeleton,
'showPanel' |
'hidePanel' |
'showWidget' |
'enableWidget' |
'hideWidget' |
'disableWidget' |
'showArea' |
'onShowPanel' |
'onHidePanel' |
'onShowWidget' |
'onHideWidget' |
'remove' |
'hideArea' |
'add'
export interface ISkeleton extends Skeleton {}
export class Skeleton implements Omit<IPublicApiSkeleton,
'showPanel' |
'hidePanel' |
'showWidget' |
'enableWidget' |
'hideWidget' |
'disableWidget' |
'showArea' |
'onShowPanel' |
'onHidePanel' |
'onShowWidget' |
'onHideWidget' |
'remove' |
'hideArea' |
'add' |
'getAreaItems' |
'onDisableWidget' |
'onEnableWidget'
> {
editor: IEditor;
readonly leftArea: Area<DockConfig | PanelDockConfig | DialogDockConfig>;
readonly topArea: Area<DockConfig | DividerConfig | PanelDockConfig | DialogDockConfig>;
readonly subTopArea: Area<DockConfig | DividerConfig | PanelDockConfig | DialogDockConfig>;
readonly toolbar: Area<DockConfig | DividerConfig | PanelDockConfig | DialogDockConfig>;
readonly leftFixedArea: Area<IPublicTypePanelConfig, Panel>;
readonly leftFloatArea: Area<IPublicTypePanelConfig, Panel>;
readonly rightArea: Area<IPublicTypePanelConfig, Panel>;
readonly mainArea: Area<WidgetConfig | IPublicTypePanelConfig, Widget | Panel>;
readonly bottomArea: Area<IPublicTypePanelConfig, Panel>;
readonly stages: Area<StageConfig, Stage>;
readonly widgets: IWidget[];
readonly focusTracker: FocusTracker;
getPanel(name: string): Panel | undefined;
getWidget(name: string): IWidget | undefined;
buildFromConfig(config?: EditorConfig, components?: PluginClassSet): void;
createStage(config: any): string | undefined;
getStage(name: string): Stage | null;
createContainer(
name: string,
handle: (item: any) => any,
exclusive?: boolean,
checkVisible?: () => boolean,
defaultSetCurrent?: boolean,
): WidgetContainer;
createPanel(config: IPublicTypePanelConfig): Panel;
add(config: IPublicTypeSkeletonConfig, extraConfig?: Record<string, any>): IWidget | Widget | Panel | Stage | Dock | PanelDock | undefined;
}
export class Skeleton implements ISkeleton {
private panels = new Map<string, Panel>();
private configTransducers: IPublicTypeConfigTransducer[] = [];
@ -431,7 +386,7 @@ export class Skeleton implements ISkeleton {
}
const { content, ...restConfig } = config;
if (content) {
if (isPlainObject(content) && !isValidElement(content)) {
if (isPlainObject<IPublicTypePanelConfig>(content) && !isValidElement(content)) {
Object.keys(content).forEach((key) => {
if (/props$/i.test(key) && restConfig[key]) {
restConfig[key] = {

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-engine",
"version": "1.3.2",
"version": "1.3.3-beta.1",
"description": "An enterprise-class low-code technology stack with scale-out design / 一套面向扩展设计的企业级低代码技术体系",
"main": "lib/engine-core.js",
"module": "es/engine-core.js",
@ -19,16 +19,16 @@
"license": "MIT",
"dependencies": {
"@alifd/next": "^1.19.12",
"@alilc/lowcode-designer": "1.3.2",
"@alilc/lowcode-editor-core": "1.3.2",
"@alilc/lowcode-editor-skeleton": "1.3.2",
"@alilc/lowcode-designer": "1.3.3-beta.1",
"@alilc/lowcode-editor-core": "1.3.3-beta.1",
"@alilc/lowcode-editor-skeleton": "1.3.3-beta.1",
"@alilc/lowcode-engine-ext": "^1.0.0",
"@alilc/lowcode-plugin-command": "1.3.2",
"@alilc/lowcode-plugin-designer": "1.3.2",
"@alilc/lowcode-plugin-outline-pane": "1.3.2",
"@alilc/lowcode-shell": "1.3.2",
"@alilc/lowcode-utils": "1.3.2",
"@alilc/lowcode-workspace": "1.3.2",
"@alilc/lowcode-plugin-command": "1.3.3-beta.1",
"@alilc/lowcode-plugin-designer": "1.3.3-beta.1",
"@alilc/lowcode-plugin-outline-pane": "1.3.3-beta.1",
"@alilc/lowcode-shell": "1.3.3-beta.1",
"@alilc/lowcode-utils": "1.3.3-beta.1",
"@alilc/lowcode-workspace": "1.3.3-beta.1",
"react": "^16.8.1",
"react-dom": "^16.8.1"
},

View File

@ -229,7 +229,7 @@ export async function init(
document.body.appendChild(engineContainer);
} else {
engineOptions = options;
engineContainer = container;
engineContainer = container!;
if (!container) {
engineContainer = document.createElement('div');
engineContainer.id = 'engine';

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-ignitor",
"version": "1.3.2",
"version": "1.3.3-beta.1",
"description": "点火器bootstrap lce project",
"main": "lib/index.js",
"private": true,

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-plugin-command",
"version": "1.3.2",
"version": "1.3.3-beta.1",
"description": "> TODO: description",
"author": "liujuping <liujup@foxmail.com>",
"homepage": "https://github.com/alibaba/lowcode-engine#readme",
@ -30,8 +30,8 @@
"url": "https://github.com/alibaba/lowcode-engine/issues"
},
"dependencies": {
"@alilc/lowcode-types": "1.3.2",
"@alilc/lowcode-utils": "1.3.2"
"@alilc/lowcode-types": "1.3.3-beta.1",
"@alilc/lowcode-utils": "1.3.3-beta.1"
},
"devDependencies": {
"@alib/build-scripts": "^0.1.18"

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-plugin-designer",
"version": "1.3.2",
"version": "1.3.3-beta.1",
"description": "alibaba lowcode editor designer plugin",
"files": [
"es",
@ -18,9 +18,9 @@
],
"author": "xiayang.xy",
"dependencies": {
"@alilc/lowcode-designer": "1.3.2",
"@alilc/lowcode-editor-core": "1.3.2",
"@alilc/lowcode-utils": "1.3.2",
"@alilc/lowcode-designer": "1.3.3-beta.1",
"@alilc/lowcode-editor-core": "1.3.3-beta.1",
"@alilc/lowcode-utils": "1.3.3-beta.1",
"react": "^16.8.1",
"react-dom": "^16.8.1"
},

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-plugin-outline-pane",
"version": "1.3.2",
"version": "1.3.3-beta.1",
"description": "Outline pane for Ali lowCode engine",
"files": [
"es",
@ -13,8 +13,8 @@
},
"dependencies": {
"@alifd/next": "^1.19.16",
"@alilc/lowcode-types": "1.3.2",
"@alilc/lowcode-utils": "1.3.2",
"@alilc/lowcode-types": "1.3.3-beta.1",
"@alilc/lowcode-utils": "1.3.3-beta.1",
"classnames": "^2.2.6",
"react": "^16",
"react-dom": "^16.7.0",

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-react-renderer",
"version": "1.3.2",
"version": "1.3.3-beta.1",
"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.3.2"
"@alilc/lowcode-renderer-core": "1.3.3-beta.1"
},
"devDependencies": {
"@alib/build-scripts": "^0.1.18",

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-react-simulator-renderer",
"version": "1.3.2",
"version": "1.3.3-beta.1",
"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.3.2",
"@alilc/lowcode-react-renderer": "1.3.2",
"@alilc/lowcode-types": "1.3.2",
"@alilc/lowcode-utils": "1.3.2",
"@alilc/lowcode-designer": "1.3.3-beta.1",
"@alilc/lowcode-react-renderer": "1.3.3-beta.1",
"@alilc/lowcode-types": "1.3.3-beta.1",
"@alilc/lowcode-utils": "1.3.3-beta.1",
"classnames": "^2.2.6",
"mobx": "^6.3.0",
"mobx-react": "^7.2.0",

View File

@ -1,29 +1,32 @@
interface UtilsMetadata {
name: string;
npm: {
package: string;
version?: string;
exportName: string;
subName?: string;
destructuring?: boolean;
main?: string;
};
}
// interface UtilsMetadata {
// name: string;
// npm: {
// package: string;
// version?: string;
// exportName: string;
// subName?: string;
// destructuring?: boolean;
// main?: string;
// };
// }
interface LibrayMap {
[key: string]: string;
}
// invalid code
export function getProjectUtils(librayMap: LibrayMap, utilsMetadata: UtilsMetadata[]) {
const projectUtils: { [packageName: string]: any } = {};
if (utilsMetadata) {
utilsMetadata.forEach(meta => {
if (librayMap[meta?.npm.package]) {
const lib = window[librayMap[meta?.npm.package]];
}
});
}
}
// interface LibrayMap {
// [key: string]: string;
// }
// export function getProjectUtils(librayMap: LibrayMap, utilsMetadata: UtilsMetadata[]) {
// const projectUtils: { [packageName: string]: any } = {};
// if (utilsMetadata) {
// utilsMetadata.forEach(meta => {
// if (librayMap[meta?.npm.package]) {
// const lib = window[librayMap[meta?.npm.package] as any];
// }
// });
// }
// }
/**
* judges if current simulator renderer deteched or not

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-renderer-core",
"version": "1.3.2",
"version": "1.3.3-beta.1",
"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.3.2",
"@alilc/lowcode-utils": "1.3.2",
"@alilc/lowcode-types": "1.3.3-beta.1",
"@alilc/lowcode-utils": "1.3.3-beta.1",
"classnames": "^2.2.6",
"debug": "^4.1.1",
"fetch-jsonp": "^1.1.3",
@ -32,7 +32,7 @@
"devDependencies": {
"@alib/build-scripts": "^0.1.18",
"@alifd/next": "^1.26.0",
"@alilc/lowcode-designer": "1.3.2",
"@alilc/lowcode-designer": "1.3.3-beta.1",
"@babel/plugin-transform-typescript": "^7.16.8",
"@testing-library/react": "^11.2.2",
"@types/classnames": "^2.2.11",

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-shell",
"version": "1.3.2",
"version": "1.3.3-beta.1",
"description": "Shell Layer for AliLowCodeEngine",
"main": "lib/index.js",
"module": "es/index.js",
@ -13,12 +13,12 @@
},
"license": "MIT",
"dependencies": {
"@alilc/lowcode-designer": "1.3.2",
"@alilc/lowcode-editor-core": "1.3.2",
"@alilc/lowcode-editor-skeleton": "1.3.2",
"@alilc/lowcode-types": "1.3.2",
"@alilc/lowcode-utils": "1.3.2",
"@alilc/lowcode-workspace": "1.3.2",
"@alilc/lowcode-designer": "1.3.3-beta.1",
"@alilc/lowcode-editor-core": "1.3.3-beta.1",
"@alilc/lowcode-editor-skeleton": "1.3.3-beta.1",
"@alilc/lowcode-types": "1.3.3-beta.1",
"@alilc/lowcode-utils": "1.3.3-beta.1",
"@alilc/lowcode-workspace": "1.3.3-beta.1",
"classnames": "^2.2.6",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.5",

View File

@ -50,4 +50,12 @@ export class Hotkey implements IPublicApiHotkey {
this[hotkeySymbol].unbind(combos, callback, action);
};
}
/**
*
* @param window window
*/
mount(window: Window) {
return this[hotkeySymbol].mount(window);
}
}

View File

@ -1,4 +1,4 @@
import { IPublicApiWorkspace, IPublicResourceList, IPublicTypeDisposable, IPublicTypeResourceType } from '@alilc/lowcode-types';
import { IPublicApiWorkspace, IPublicModelResource, IPublicResourceList, IPublicTypeDisposable, IPublicTypeResourceType } from '@alilc/lowcode-types';
import { IWorkspace } from '@alilc/lowcode-workspace';
import { resourceSymbol, workspaceSymbol } from '../symbols';
import { Resource as ShellResource, Window as ShellWindow } from '../model';
@ -13,7 +13,7 @@ export class Workspace implements IPublicApiWorkspace {
}
get resourceList() {
return this[workspaceSymbol].getResourceList().map((d) => new ShellResource(d));
return this[workspaceSymbol].getResourceList().map((d) => new ShellResource(d) as IPublicModelResource);
}
setResourceList(resourceList: IPublicResourceList) {

View File

@ -46,7 +46,7 @@ export class Resource implements IPublicModelResource {
}
get children() {
return this[resourceSymbol].children.map((child) => new Resource(child));
return this[resourceSymbol].children.map((child) => new Resource(child) as IPublicModelResource);
}
get viewName() {

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-types",
"version": "1.3.2",
"version": "1.3.3-beta.1",
"description": "Types for Ali lowCode engine",
"files": [
"es",

View File

@ -1,5 +1,5 @@
import { Component, ReactNode } from 'react';
import { Component, ReactElement, ReactNode } from 'react';
import { IPublicTypeI18nData, IPublicTypeNodeSchema, IPublicTypeTitleContent } from '../type';
import { IPublicEnumTransitionType } from '../enum';
@ -73,7 +73,7 @@ export interface IPublicApiCommonUtils {
/**
* i18n
*/
intl(data: IPublicTypeI18nData | string, params?: object): string;
intl(data: IPublicTypeI18nData | string | undefined | ReactElement, params?: object): string;
}
export interface IPublicApiCommonSkeletonCabin {

View File

@ -22,4 +22,10 @@ export interface IPublicApiHotkey {
callback: IPublicTypeHotkeyCallback,
action?: string,
): IPublicTypeDisposable;
/**
*
* @param window window
*/
mount(window: Window): IPublicTypeDisposable;
}

View File

@ -108,7 +108,7 @@ export interface IPublicModelDocumentModel<
* @param data
* @returns
*/
createNode<T = Node>(data: IPublicTypeNodeSchema): T | null;
createNode<T = Node, S = IPublicTypeNodeSchema>(data: S): T | null;
/**
* /id

View File

@ -1,5 +1,5 @@
import { IPublicEnumTransformStage } from '../enum';
import { IPublicTypeCompositeValue } from '../type';
import { IPublicTypeCompositeValue, IPublicTypeNodeData } from '../type';
import { IPublicModelNode } from './';
export interface IPublicModelProp<
@ -48,7 +48,7 @@ export interface IPublicModelProp<
* set value for this prop
* @param val
*/
setValue(val: IPublicTypeCompositeValue): void;
setValue(val: IPublicTypeCompositeValue | IPublicTypeNodeData | IPublicTypeNodeData[]): void;
/**
*

View File

@ -1,4 +1,4 @@
import { ReactElement } from 'react';
import { ComponentType, ReactElement } from 'react';
export interface IBaseModelResource<
Resource
@ -7,7 +7,7 @@ export interface IBaseModelResource<
get id(): string | undefined;
get icon(): ReactElement | undefined;
get icon(): ReactElement | undefined | ComponentType;
get options(): Record<string, any>;

View File

@ -102,7 +102,7 @@ export interface IPublicTypeFilterItem {
}
export interface IPublicTypeAutorunItem {
name: string;
autorun: (target: IPublicModelSettingField | null) => any;
autorun: (target: IPublicModelSettingField | null | undefined) => any;
}
// thinkof Array

View File

@ -1,11 +1,11 @@
import { IPublicEnumTransformStage } from '../enum';
import { IPublicModelNode } from '../model';
import { IPublicTypeCompositeObject } from './';
import { IPublicTypePropsMap } from './';
export type IPublicTypePropsTransducer = (
props: IPublicTypeCompositeObject,
props: IPublicTypePropsMap,
node: IPublicModelNode,
ctx?: {
stage: IPublicEnumTransformStage;
},
) => IPublicTypeCompositeObject;
) => IPublicTypePropsMap;

View File

@ -36,7 +36,7 @@ export interface IPublicTypeWidgetBaseConfig {
*/
area?: IPublicTypeWidgetConfigArea;
props?: Record<string, any>;
content?: string | ReactElement | ComponentType<any> | IPublicTypePanelConfig[];
content?: string | ReactElement | ComponentType<any> | IPublicTypePanelConfig[] | IPublicTypePanelConfig;
contentProps?: Record<string, any>;
/**

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-utils",
"version": "1.3.2",
"version": "1.3.3-beta.1",
"description": "Utils for Ali lowCode engine",
"files": [
"lib",
@ -14,7 +14,7 @@
},
"dependencies": {
"@alifd/next": "^1.19.16",
"@alilc/lowcode-types": "1.3.2",
"@alilc/lowcode-types": "1.3.3-beta.1",
"lodash": "^4.17.21",
"mobx": "^6.3.0",
"prop-types": "^15.8.1",

View File

@ -1,6 +1,6 @@
import { isObject } from './is-object';
export function isPlainObject(value: any): value is any {
export function isPlainObject<T extends object = object>(value: any): value is T {
if (!isObject(value)) {
return false;
}

View File

@ -1,6 +1,6 @@
{
"name": "@alilc/lowcode-workspace",
"version": "1.3.2",
"version": "1.3.3-beta.1",
"description": "Shell Layer for AliLowCodeEngine",
"main": "lib/index.js",
"module": "es/index.js",
@ -15,11 +15,11 @@
},
"license": "MIT",
"dependencies": {
"@alilc/lowcode-designer": "1.3.2",
"@alilc/lowcode-editor-core": "1.3.2",
"@alilc/lowcode-editor-skeleton": "1.3.2",
"@alilc/lowcode-types": "1.3.2",
"@alilc/lowcode-utils": "1.3.2",
"@alilc/lowcode-designer": "1.3.3-beta.1",
"@alilc/lowcode-editor-core": "1.3.3-beta.1",
"@alilc/lowcode-editor-skeleton": "1.3.3-beta.1",
"@alilc/lowcode-types": "1.3.3-beta.1",
"@alilc/lowcode-utils": "1.3.3-beta.1",
"classnames": "^2.2.6",
"enzyme": "^3.11.0",
"enzyme-adapter-react-16": "^1.15.5",

Some files were not shown because too many files have changed in this diff Show More