Skip to content

Commit 267f79c

Browse files
LeoYuanLeoYuan
committed
Merge branch 'develop'
2 parents 6fe774d + 30d4ba9 commit 267f79c

32 files changed

Lines changed: 188 additions & 140 deletions

File tree

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"lerna": "4.0.0",
3-
"version": "1.0.11",
3+
"version": "1.0.12",
44
"npmClient": "yarn",
55
"useWorkspaces": true,
66
"packages": [

‎packages/designer/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@alilc/lowcode-designer",
3-
"version": "1.0.11",
3+
"version": "1.0.12",
44
"description": "Designer for Ali LowCode Engine",
55
"main": "lib/index.js",
66
"module": "es/index.js",
@@ -15,10 +15,10 @@
1515
},
1616
"license": "MIT",
1717
"dependencies": {
18-
"@alilc/lowcode-editor-core": "1.0.11",
19-
"@alilc/lowcode-shell": "1.0.11",
20-
"@alilc/lowcode-types": "1.0.11",
21-
"@alilc/lowcode-utils": "1.0.11",
18+
"@alilc/lowcode-editor-core": "1.0.12",
19+
"@alilc/lowcode-shell": "1.0.12",
20+
"@alilc/lowcode-types": "1.0.12",
21+
"@alilc/lowcode-utils": "1.0.12",
2222
"classnames": "^2.2.6",
2323
"enzyme": "^3.11.0",
2424
"enzyme-adapter-react-16": "^1.15.5",

‎packages/designer/src/builtin-simulator/host.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
618618
'.next-calendar-table',
619619
'.editor-container', // 富文本组件
620620
];
621-
const ignoreSelectors = customizeIgnoreSelectors?.(defaultIgnoreSelectors) || defaultIgnoreSelectors;
621+
const ignoreSelectors = customizeIgnoreSelectors?.(defaultIgnoreSelectors, e) || defaultIgnoreSelectors;
622622
const ignoreSelectorsString = ignoreSelectors.join(',');
623623
// 提供了 customizeIgnoreSelectors 的情况下，忽略 isFormEvent() 判断
624624
if ((!customizeIgnoreSelectors && isFormEvent(e)) || target?.closest(ignoreSelectorsString)) {

‎packages/editor-core/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@alilc/lowcode-editor-core",
3-
"version": "1.0.11",
3+
"version": "1.0.12",
44
"description": "Core Api for Ali lowCode engine",
55
"license": "MIT",
66
"main": "lib/index.js",
@@ -14,8 +14,8 @@
1414
},
1515
"dependencies": {
1616
"@alifd/next": "^1.19.16",
17-
"@alilc/lowcode-types": "1.0.11",
18-
"@alilc/lowcode-utils": "1.0.11",
17+
"@alilc/lowcode-types": "1.0.12",
18+
"@alilc/lowcode-utils": "1.0.12",
1919
"classnames": "^2.2.6",
2020
"debug": "^4.1.1",
2121
"intl-messageformat": "^9.3.1",

‎packages/editor-core/src/config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ const VALID_ENGINE_OPTIONS = {
7373
customizeIgnoreSelectors: {
7474
type: 'function',
7575
default: undefined,
76-
description: '定制画布中点击被忽略的 selectors, eg. (defaultIgnoreSelectors: string[]) => string[]',
76+
description: '定制画布中点击被忽略的 selectors, eg. (defaultIgnoreSelectors: string[], e: MouseEvent) => string[]',
7777
},
7878
disableDefaultSettingPanel: {
7979
type: 'boolean',
@@ -192,7 +192,7 @@ export interface EngineOptions {
192192
/**
193193
* 定制画布中点击被忽略的 selectors，默认值：undefined
194194
*/
195-
customizeIgnoreSelectors?: (defaultIgnoreSelectors: string[]) => string[];
195+
customizeIgnoreSelectors?: (defaultIgnoreSelectors: string[], e: MouseEvent) => string[];
196196
/**
197197
* 禁止默认的设置面板，默认值：false
198198
*/

‎packages/editor-skeleton/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@alilc/lowcode-editor-skeleton",
3-
"version": "1.0.11",
3+
"version": "1.0.12",
44
"description": "alibaba lowcode editor skeleton",
55
"main": "lib/index.js",
66
"module": "es/index.js",
@@ -18,10 +18,10 @@
1818
],
1919
"dependencies": {
2020
"@alifd/next": "^1.20.12",
21-
"@alilc/lowcode-designer": "1.0.11",
22-
"@alilc/lowcode-editor-core": "1.0.11",
23-
"@alilc/lowcode-types": "1.0.11",
24-
"@alilc/lowcode-utils": "1.0.11",
21+
"@alilc/lowcode-designer": "1.0.12",
22+
"@alilc/lowcode-editor-core": "1.0.12",
23+
"@alilc/lowcode-types": "1.0.12",
24+
"@alilc/lowcode-utils": "1.0.12",
2525
"classnames": "^2.2.6",
2626
"react": "^16.8.1",
2727
"react-dom": "^16.8.1"

‎packages/engine/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@alilc/lowcode-engine",
3-
"version": "1.0.11",
3+
"version": "1.0.12",
44
"description": "An enterprise-class low-code technology stack with scale-out design / 一套面向扩展设计的企业级低代码技术体系",
55
"main": "lib/engine-core.js",
66
"module": "es/engine-core.js",
@@ -19,14 +19,14 @@
1919
"license": "MIT",
2020
"dependencies": {
2121
"@alifd/next": "^1.19.12",
22-
"@alilc/lowcode-designer": "1.0.11",
23-
"@alilc/lowcode-editor-core": "1.0.11",
24-
"@alilc/lowcode-editor-skeleton": "1.0.11",
22+
"@alilc/lowcode-designer": "1.0.12",
23+
"@alilc/lowcode-editor-core": "1.0.12",
24+
"@alilc/lowcode-editor-skeleton": "1.0.12",
2525
"@alilc/lowcode-engine-ext": "^1.0.0",
26-
"@alilc/lowcode-plugin-designer": "1.0.11",
27-
"@alilc/lowcode-plugin-outline-pane": "1.0.11",
28-
"@alilc/lowcode-shell": "1.0.11",
29-
"@alilc/lowcode-utils": "1.0.11",
26+
"@alilc/lowcode-plugin-designer": "1.0.12",
27+
"@alilc/lowcode-plugin-outline-pane": "1.0.12",
28+
"@alilc/lowcode-shell": "1.0.12",
29+
"@alilc/lowcode-utils": "1.0.12",
3030
"react": "^16.8.1",
3131
"react-dom": "^16.8.1"
3232
},

‎packages/ignitor/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-ignitor",
3-
"version": "1.0.11",
3+
"version": "1.0.12",
44
"description": "点火器，bootstrap lce project",
55
"main": "lib/index.js",
66
"private": true,

‎packages/plugin-designer/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@alilc/lowcode-plugin-designer",
3-
"version": "1.0.11",
3+
"version": "1.0.12",
44
"description": "alibaba lowcode editor designer plugin",
55
"files": [
66
"es",
@@ -18,9 +18,9 @@
1818
],
1919
"author": "xiayang.xy",
2020
"dependencies": {
21-
"@alilc/lowcode-designer": "1.0.11",
22-
"@alilc/lowcode-editor-core": "1.0.11",
23-
"@alilc/lowcode-utils": "1.0.11",
21+
"@alilc/lowcode-designer": "1.0.12",
22+
"@alilc/lowcode-editor-core": "1.0.12",
23+
"@alilc/lowcode-utils": "1.0.12",
2424
"react": "^16.8.1",
2525
"react-dom": "^16.8.1"
2626
},

‎packages/plugin-outline-pane/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@alilc/lowcode-plugin-outline-pane",
3-
"version": "1.0.11",
3+
"version": "1.0.12",
44
"description": "Outline pane for Ali lowCode engine",
55
"files": [
66
"es",
@@ -13,10 +13,10 @@
1313
},
1414
"dependencies": {
1515
"@alifd/next": "^1.19.16",
16-
"@alilc/lowcode-designer": "1.0.11",
17-
"@alilc/lowcode-editor-core": "1.0.11",
18-
"@alilc/lowcode-types": "1.0.11",
19-
"@alilc/lowcode-utils": "1.0.11",
16+
"@alilc/lowcode-designer": "1.0.12",
17+
"@alilc/lowcode-editor-core": "1.0.12",
18+
"@alilc/lowcode-types": "1.0.12",
19+
"@alilc/lowcode-utils": "1.0.12",
2020
"classnames": "^2.2.6",
2121
"react": "^16",
2222
"react-dom": "^16.7.0"

0 commit comments

Comments
 (0)