Skip to content

Commit

Permalink
Merge pull request #15619 from apache/release-dev
Browse files Browse the repository at this point in the history
release 5.2.0
  • Loading branch information
100pah authored Aug 28, 2021
2 parents 5fb2fab + fd9bf4a commit 41b7769
Show file tree
Hide file tree
Showing 17 changed files with 50,780 additions and 45,660 deletions.
12,552 changes: 6,509 additions & 6,043 deletions dist/echarts.common.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/echarts.common.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/echarts.common.min.js

Large diffs are not rendered by default.

36,040 changes: 19,094 additions & 16,946 deletions dist/echarts.esm.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/echarts.esm.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/echarts.esm.min.js

Large diffs are not rendered by default.

36,041 changes: 19,095 additions & 16,946 deletions dist/echarts.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/echarts.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/echarts.min.js

Large diffs are not rendered by default.

11,727 changes: 6,022 additions & 5,705 deletions dist/echarts.simple.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/echarts.simple.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/echarts.simple.min.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "echarts",
"version": "5.1.2",
"version": "5.2.0",
"description": "Apache ECharts is a powerful, interactive charting and data visualization library for browser",
"license": "Apache-2.0",
"keywords": [
Expand Down Expand Up @@ -64,7 +64,7 @@
},
"dependencies": {
"tslib": "2.3.0",
"zrender": "npm:zrender-nightly@^5.1.2-dev.20210720"
"zrender": "5.2.0"
},
"devDependencies": {
"@babel/code-frame": "7.10.4",
Expand Down
4 changes: 2 additions & 2 deletions src/core/echarts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@ type ModelFinder = modelUtil.ModelFinder;

const hasWindow = typeof window !== 'undefined';

export const version = '5.1.2';
export const version = '5.2.0';

export const dependencies = {
zrender: '5.1.1'
zrender: '5.2.0'
};

const TEST_FRAME_REMAIN_TIME = 1;
Expand Down
20 changes: 20 additions & 0 deletions src/label/installLabelLayout.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@

/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

import { EChartsExtensionInstallRegisters } from '../extension';
import { makeInner } from '../util/model';
import LabelManager from './LabelManager';
Expand Down
20 changes: 20 additions & 0 deletions src/label/sectorLabel.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@

/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/

import {calculateTextPosition, TextPositionCalculationResult} from 'zrender/src/contain/text';
import { RectLike } from 'zrender/src/core/BoundingRect';
import {BuiltinTextPosition, TextAlign, TextVerticalAlign} from 'zrender/src/core/types';
Expand Down

0 comments on commit 41b7769

Please sign in to comment.