Skip to content

Commit 6f69efc

Browse files
committed
Merge branch 'develop' into release/1.3.3-beta
2 parents 2471bf3 + deb50d1 commit 6f69efc

File tree

10 files changed

+57
-20
lines changed

10 files changed

+57
-20
lines changed

docs/docs/api/skeleton.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ sidebar_position: 10
1111

1212
![image.png](https://img.alicdn.com/imgextra/i4/O1CN01eVA0U41xYRP3e5zo0_!!6000000006455-2-tps-1780-996.png)
1313

14-
页面上可以扩展的区域共 5 个,具体如下:
15-
![image.png](https://img.alicdn.com/imgextra/i3/O1CN014d2AcS1D5c9TshEiQ_!!6000000000165-2-tps-1892-974.png)
14+
页面上可以扩展的区域共 6 个,具体如下:
15+
![image](https://github.com/alibaba/lowcode-engine/assets/11935995/ba4641dd-d346-4ef7-8b71-8ca211e6eaf4)
16+
1617
### 基本概念
1718
#### 扩展区域位置 (area)
1819
##### topArea
@@ -41,6 +42,11 @@ sidebar_position: 10
4142
##### rightArea
4243

4344
右侧区域,常用于组件的配置。常见的扩展有:统一处理组件的配置项,例如统一删除某一个配置项,统一添加某一个配置项的。
45+
46+
##### bottomArea
47+
48+
底部扩展区域。
49+
4450
##### toolbar
4551

4652
跟 topArea 类似,按需放置面板插件~

docs/docs/guide/appendix/npms.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ sidebar_position: 3
4343
| @alilc/lowcode-materials | [https://github.com/alibaba/lowcode-materials](https://github.com/alibaba/lowcode-materials) | packages/fusion-lowcode-materials |
4444
| @alilc/antd-lowcode-materials | [https://github.com/alibaba/lowcode-materials](https://github.com/alibaba/lowcode-materials) | packages/antd-lowcode-materials |
4545
| @alifd/layout(原 @alifd/pro-layout 升级后的版本) | [https://github.com/alibaba-fusion/layout](https://github.com/alibaba-fusion/layout) | |
46-
| | | |
46+
| @alilc/lowcode-engine-docs | [https://github.com/alibaba/lowcode-engine](https://github.com/alibaba/lowcode-engine) | docs |
4747
| | | |

docs/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@alilc/lowcode-engine-docs",
3-
"version": "1.2.35",
3+
"version": "1.2.36",
44
"description": "低代码引擎版本化文档",
55
"license": "MIT",
66
"files": [

packages/engine/README-zh_CN.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,20 @@ lowcode-engine 启动后,提供了几个 umd 文件,可以结合 [lowcode-de
160160
## 🤝 参与共建
161161

162162
请先阅读:
163-
1. [如何配置引擎调试环境?](https://lowcode-engine.cn/site/docs/participate/prepare)
163+
1. [如何配置引擎调试环境?](https://lowcode-engine.cn/site/docs/participate)
164164
2. [关于引擎的研发协作流程](https://lowcode-engine.cn/site/docs/participate/flow)
165-
3. [引擎的工程化配置](https://lowcode-engine.cn/site/docs/participate/config)
166165

167166
> 强烈推荐阅读 [《提问的智慧》](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way)[《如何向开源社区提问题》](https://github.com/seajs/seajs/issues/545)[《如何有效地报告 Bug》](http://www.chiark.greenend.org.uk/%7Esgtatham/bugs-cn.html)[《如何向开源项目提交无法解答的问题》](https://zhuanlan.zhihu.com/p/25795393),更好的问题更容易获得帮助。(此段参考 [antd](https://github.com/ant-design/ant-design)
168167
169168
关于提交 PR:
170169
请将目标合并分支设置为 **develop**,不要指定 **main** 分支,在发布正式版本后,develop 分支将会合入 main 分支。
171170

171+
## ⭐️ Star 历史
172+
173+
<a href="https://star-history.com/#alibaba/lowcode-engine">
174+
<img src="https://api.star-history.com/svg?repos=alibaba/lowcode-engine&type=Date" alt="Star History Chart" width="100%" />
175+
</a>
176+
172177
## ❤️ 致谢
173178

174179
感谢所有为引擎项目贡献力量的同学们~

packages/engine/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,8 @@ After lowcode-engine is started, several umd files are provided, which can be de
160160
## 🤝 Participation
161161

162162
Please read first:
163-
1. [How to configure the engine debugging environment? ](https://lowcode-engine.cn/site/docs/participate/prepare)
163+
1. [How to configure the engine debugging environment? ](https://lowcode-engine.cn/site/docs/participate)
164164
2. [About the R&D collaboration process of the engine](https://lowcode-engine.cn/site/docs/participate/flow)
165-
3. [Engineering Configuration of Engine](https://lowcode-engine.cn/site/docs/participate/config)
166165

167166
> Strongly recommend reading ["The Wisdom of Asking Questions"](https://github.com/ryanhanwu/How-To-Ask-Questions-The-Smart-Way), ["How to Ask Questions to the Open Source Community"](https: //github.com/seajs/seajs/issues/545) and [How to Report Bugs Effectively](http://www.chiark.greenend.org.uk/%7Esgtatham/bugs-cn.html), [ "How to Submit Unanswerable Questions to Open Source Projects"](https://zhuanlan.zhihu.com/p/25795393), better questions are easier to get help. (This paragraph refers to [antd](https://github.com/ant-design/ant-design))
168167

packages/plugin-outline-pane/src/controllers/tree-node.ts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ enum EVENT_NAMES {
3737
expandableChanged = 'expandableChanged',
3838

3939
conditionChanged = 'conditionChanged',
40+
41+
loopChanged = 'loopChanged',
4042
}
4143

4244
export default class TreeNode {
@@ -160,6 +162,10 @@ export default class TreeNode {
160162
return this.node.hasCondition() && !this.node.conditionGroup;
161163
}
162164

165+
get loop(): boolean {
166+
return this.node.hasLoop();
167+
}
168+
163169
get children(): TreeNode[] | null {
164170
return this.node.children?.map((node) => this.tree.getTreeNode(node)) || null;
165171
}
@@ -222,6 +228,14 @@ export default class TreeNode {
222228
};
223229
}
224230

231+
onLoopChanged(fn: (treeNode: TreeNode) => void): IPublicTypeDisposable {
232+
this.event.on(EVENT_NAMES.loopChanged, fn);
233+
234+
return () => {
235+
this.event.off(EVENT_NAMES.loopChanged, fn);
236+
};
237+
}
238+
225239
onExpandableChanged(fn: (expandable: boolean) => void): IPublicTypeDisposable {
226240
this.event.on(EVENT_NAMES.expandableChanged, fn);
227241
return () => {
@@ -244,6 +258,10 @@ export default class TreeNode {
244258
this.event.emit(EVENT_NAMES.conditionChanged, this.condition);
245259
}
246260

261+
notifyLoopChanged(): void {
262+
this.event.emit(EVENT_NAMES.loopChanged, this.loop);
263+
}
264+
247265
setHidden(flag: boolean) {
248266
if (this.node.conditionGroup) {
249267
return;

packages/plugin-outline-pane/src/controllers/tree.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@ export class Tree {
3636

3737
doc?.onChangeNodeProp((info: IPublicTypePropChangeOptions) => {
3838
const { node, key } = info;
39+
const treeNode = this.getTreeNodeById(node.id);
3940
if (key === '___title___') {
40-
const treeNode = this.getTreeNodeById(node.id);
4141
treeNode?.notifyTitleLabelChanged();
4242
} else if (key === '___condition___') {
43-
const treeNode = this.getTreeNodeById(node.id);
4443
treeNode?.notifyConditionChanged();
44+
} else if (key === '___loop___') {
45+
treeNode?.notifyLoopChanged();
4546
}
4647
});
4748

packages/plugin-outline-pane/src/views/tree-title.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export default class TreeTitle extends PureComponent<{
2828
editing: boolean;
2929
title: string;
3030
condition?: boolean;
31+
loop?: boolean;
3132
visible?: boolean;
3233
filterWorking: boolean;
3334
keywords: string;
@@ -89,6 +90,7 @@ export default class TreeTitle extends PureComponent<{
8990
editing: false,
9091
title: treeNode.titleLabel,
9192
condition: treeNode.condition,
93+
loop: treeNode.loop,
9294
visible: !treeNode.hidden,
9395
});
9496
treeNode.onTitleLabelChanged(() => {
@@ -101,6 +103,11 @@ export default class TreeTitle extends PureComponent<{
101103
condition: treeNode.condition,
102104
});
103105
});
106+
treeNode.onLoopChanged(() => {
107+
this.setState({
108+
loop: treeNode.loop,
109+
});
110+
});
104111
treeNode.onHiddenChanged((hidden: boolean) => {
105112
this.setState({
106113
visible: !hidden,
@@ -207,7 +214,7 @@ export default class TreeTitle extends PureComponent<{
207214
<Tip>{intlNode('Slot for {prop}', { prop: node.slotFor.key })}</Tip>
208215
</a>
209216
)}
210-
{node.hasLoop() && (
217+
{this.state.loop && (
211218
<a className="tree-node-tag loop">
212219
{/* todo: click todo something */}
213220
<IconLoop />

packages/renderer-core/tests/renderer/__snapshots__/renderer.test.tsx.snap

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -259,10 +259,11 @@ exports[`Base Render renderComp 1`] = `
259259
"hidden": undefined,
260260
}
261261
}
262+
aria-expanded="false"
263+
aria-label="select"
262264
autoComplete="off"
263265
disabled={false}
264266
height="100%"
265-
maxLength={null}
266267
onBlur={[Function]}
267268
onChange={[Function]}
268269
onCompositionEnd={[Function]}
@@ -378,10 +379,11 @@ exports[`Base Render renderComp 1`] = `
378379
"hidden": undefined,
379380
}
380381
}
382+
aria-expanded="false"
383+
aria-label="select"
381384
autoComplete="off"
382385
disabled={false}
383386
height="100%"
384-
maxLength={null}
385387
onBlur={[Function]}
386388
onChange={[Function]}
387389
onCompositionEnd={[Function]}
@@ -485,7 +487,6 @@ exports[`Base Render renderComp 1`] = `
485487
autoComplete="off"
486488
disabled={false}
487489
height="100%"
488-
maxLength={null}
489490
onBlur={[Function]}
490491
onChange={[Function]}
491492
onCompositionEnd={[Function]}
@@ -988,7 +989,6 @@ exports[`Base Render renderComp 1`] = `
988989
autoComplete="off"
989990
disabled={false}
990991
height="100%"
991-
maxLength={null}
992992
onBlur={[Function]}
993993
onChange={[Function]}
994994
onCompositionEnd={[Function]}
@@ -1048,10 +1048,11 @@ exports[`Base Render renderComp 1`] = `
10481048
"hidden": undefined,
10491049
}
10501050
}
1051+
aria-expanded="false"
1052+
aria-label="select"
10511053
autoComplete="off"
10521054
disabled={false}
10531055
height="100%"
1054-
maxLength={null}
10551056
name="error"
10561057
onBlur={[Function]}
10571058
onChange={[Function]}

packages/shell/src/api/commonUI.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export class CommonUI implements IPublicApiCommonUI {
1919
Card = Card;
2020
Checkbox = Checkbox;
2121
DatePicker = DatePicker;
22-
Dialog = Dialog;
22+
Dialog = Dialog as any;
2323
Dropdown = Dropdown;
2424
Form = Form;
2525
Icon = Icon;
@@ -31,15 +31,15 @@ export class CommonUI implements IPublicApiCommonUI {
3131
Radio = Radio;
3232
Search = Search;
3333
Select = Select;
34-
SplitButton = SplitButton;
34+
SplitButton = SplitButton as any;
3535
Step = Step;
36-
Switch = Switch;
36+
Switch = Switch as any;
3737
Tab = Tab;
3838
Table = Table;
3939
Tree = Tree;
4040
TreeSelect = TreeSelect;
4141
Upload = Upload;
42-
Divider = Divider;
42+
Divider = Divider as any;
4343

4444
ContextMenu: ((props: {
4545
menus: IPublicTypeContextMenuAction[];

0 commit comments

Comments
 (0)