Skip to content

Commit f0d8b85

Browse files
LeoYuanLeoYuan
committed
Merge branch 'release/1.0.6'
2 parents 353dc9f + 835059d commit f0d8b85

File tree

55 files changed

+3060
-740
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+3060
-740
lines changed

‎.eslintrc.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
module.exports = {
22
extends: 'eslint-config-ali/typescript/react',
3+
parserOptions: {
4+
project: [], // for lint performance
5+
createDefaultProgram: false, // for lint performance
6+
},
37
rules: {
48
'react/no-multi-comp': 0,
59
'no-unused-expressions': 0,
@@ -34,5 +38,7 @@ module.exports = {
3438
"@typescript-eslint/method-signature-style": 0,
3539
"@typescript-eslint/consistent-type-assertions": 0,
3640
"@typescript-eslint/no-useless-constructor": 0,
41+
'@typescript-eslint/dot-notation': 0, // for lint performance
42+
'@typescript-eslint/restrict-plus-operands': 0, // for lint performance
3743
}
3844
};

‎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.5",
3+
"version": "1.0.6",
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.5",
3+
"version": "1.0.6",
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.5",
19-
"@alilc/lowcode-shell": "1.0.5",
20-
"@alilc/lowcode-types": "1.0.5",
21-
"@alilc/lowcode-utils": "1.0.5",
18+
"@alilc/lowcode-editor-core": "1.0.6",
19+
"@alilc/lowcode-shell": "1.0.6",
20+
"@alilc/lowcode-types": "1.0.6",
21+
"@alilc/lowcode-utils": "1.0.6",
2222
"classnames": "^2.2.6",
2323
"enzyme": "^3.11.0",
2424
"enzyme-adapter-react-16": "^1.15.5",

‎packages/designer/src/project/project.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export class Project {
5252
/**
5353
* 获取项目整体 schema
5454
*/
55-
getSchema(stage: TransformStage = TransformStage.Render): ProjectSchema {
55+
getSchema(stage: TransformStage = TransformStage.Save): ProjectSchema {
5656
return {
5757
...this.data,
5858
// TODO: future change this filter

‎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.5",
3+
"version": "1.0.6",
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.5",
18-
"@alilc/lowcode-utils": "1.0.5",
17+
"@alilc/lowcode-types": "1.0.6",
18+
"@alilc/lowcode-utils": "1.0.6",
1919
"classnames": "^2.2.6",
2020
"debug": "^4.1.1",
2121
"intl-messageformat": "^9.3.1",

‎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.5",
3+
"version": "1.0.6",
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.5",
22-
"@alilc/lowcode-editor-core": "1.0.5",
23-
"@alilc/lowcode-types": "1.0.5",
24-
"@alilc/lowcode-utils": "1.0.5",
21+
"@alilc/lowcode-designer": "1.0.6",
22+
"@alilc/lowcode-editor-core": "1.0.6",
23+
"@alilc/lowcode-types": "1.0.6",
24+
"@alilc/lowcode-utils": "1.0.6",
2525
"classnames": "^2.2.6",
2626
"react": "^16.8.1",
2727
"react-dom": "^16.8.1"

‎packages/editor-skeleton/src/layouts/workbench.less‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,7 @@ body {
314314
display: none;
315315
flex-shrink: 0;
316316
position: relative;
317+
z-index: 820;
317318
&.lc-area-visible {
318319
display: block;
319320
}

‎packages/engine/build.plugin.js‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
1+
const { execSync } = require('child_process');
12
const TsconfigPathsPlugin = require('tsconfig-paths-webpack-plugin');
2-
const fse = require('fs-extra');
3-
// read from lerna
4-
const lernaConfig = JSON.parse(fse.readFileSync('../../lerna.json', 'utf8'));
5-
const { version } = lernaConfig;
3+
4+
function getReleaseVersion() {
5+
const gitBranchName = execSync('git rev-parse --abbrev-ref HEAD', { encoding: 'utf-8' });
6+
const reBranchVersion = /^(?:[\w-]+\/)(\d+\.\d+\.\d+)$/im;
7+
const match = reBranchVersion.exec(gitBranchName);
8+
if (!match) {
9+
throw new Error(`[engine] gitBranchName: ${gitBranchName} is not valid`);
10+
}
11+
12+
return match[1];
13+
}
14+
15+
const version = getReleaseVersion();
616

717
module.exports = ({ context, onGetWebpackConfig }) => {
818
onGetWebpackConfig((config) => {

‎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.5",
3+
"version": "1.0.6",
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.5",
23-
"@alilc/lowcode-editor-core": "1.0.5",
24-
"@alilc/lowcode-editor-skeleton": "1.0.5",
22+
"@alilc/lowcode-designer": "1.0.6",
23+
"@alilc/lowcode-editor-core": "1.0.6",
24+
"@alilc/lowcode-editor-skeleton": "1.0.6",
2525
"@alilc/lowcode-engine-ext": "^1.0.0",
26-
"@alilc/lowcode-plugin-designer": "1.0.5",
27-
"@alilc/lowcode-plugin-outline-pane": "1.0.5",
28-
"@alilc/lowcode-shell": "1.0.5",
29-
"@alilc/lowcode-utils": "1.0.5",
26+
"@alilc/lowcode-plugin-designer": "1.0.6",
27+
"@alilc/lowcode-plugin-outline-pane": "1.0.6",
28+
"@alilc/lowcode-shell": "1.0.6",
29+
"@alilc/lowcode-utils": "1.0.6",
3030
"react": "^16.8.1",
3131
"react-dom": "^16.8.1"
3232
},

‎packages/engine/scripts/version.js‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)