This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch dataset-trans
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit b6124d53b8f1cd91c4cb7a841837aad0d76498b6
Merge: f8a59df d17f801
Author: 100pah <sushuang0...@gmail.com>
AuthorDate: Fri Jul 31 16:37:15 2020 +0800
Merge branch 'next' into dataset-trans
# Conflicts:
# src/echarts.ts
.eslintignore | 3 +-
build/build-i18n.js | 91 ++++++
build/build.js | 33 +-
build/config.js | 7 +-
build/ec-lang-rollup-plugin.js | 80 -----
build/release.js | 43 ++-
src/langEN.ts => i18n/langEN-obj.js | 32 +-
src/langEN.ts => i18n/langEN.js | 28 +-
i18n/langES-obj.js | 111 +++++++
i18n/langES.js | 107 +++++++
i18n/langFI-obj.js | 111 +++++++
i18n/langFI.js | 107 +++++++
i18n/langFR-obj.js | 172 +++++++++++
i18n/langFR.js | 168 +++++++++++
i18n/langTH-obj.js | 111 +++++++
i18n/langTH.js | 107 +++++++
src/lang.ts => i18n/langZH-obj.js | 30 +-
src/lang.ts => i18n/langZH.js | 26 +-
package.json | 3 +-
src/action/changeAxisOrder.ts | 3 +
src/chart/bar/BarView.ts | 365 +++++++++++++----------
src/component/axis/AxisBuilder.ts | 5 +-
src/component/legend/LegendModel.ts | 32 +-
src/component/timeline/SliderTimelineView.ts | 1 +
src/component/toolbox/ToolboxModel.ts | 10 +-
src/component/toolbox/feature/Brush.ts | 41 +--
src/component/toolbox/feature/DataView.ts | 43 +--
src/component/toolbox/feature/DataZoom.ts | 28 +-
src/component/toolbox/feature/MagicType.ts | 44 +--
src/component/toolbox/feature/Restore.ts | 21 +-
src/component/toolbox/feature/SaveAsImage.ts | 34 ++-
src/component/toolbox/featureManager.ts | 3 +-
src/coord/Axis.ts | 10 +-
src/coord/axisHelper.ts | 1 +
src/coord/cartesian/defaultAxisExtentFromData.ts | 8 +-
src/echarts.ts | 13 +-
src/{ => i18n}/langEN.ts | 2 +-
src/i18n/langES.ts | 80 +++++
src/i18n/langFI.ts | 80 +++++
src/i18n/langFR.ts | 142 +++++++++
src/i18n/langTH.ts | 80 +++++
src/{lang.ts => i18n/langZH.ts} | 38 ++-
src/langES.ts | 68 -----
src/langFI.ts | 68 -----
src/langTH.ts | 68 -----
src/locale.ts | 79 +++++
src/model/Global.ts | 14 +
src/scale/Ordinal.ts | 33 +-
src/scale/Scale.ts | 7 +
src/scale/Time.ts | 101 +++++--
src/util/format.ts | 21 +-
src/util/graphic.ts | 59 +++-
src/util/log.ts | 22 +-
src/util/time.ts | 70 +++--
src/visual/aria.ts | 9 +-
test/bar-race.html | 75 +++--
test/lang.html | 188 ++++++++++++
test/timeZone.html | 11 +-
58 files changed, 2568 insertions(+), 779 deletions(-)
diff --cc src/echarts.ts
index fa991fd,b69a478..a16d89f
--- a/src/echarts.ts
+++ b/src/echarts.ts
@@@ -100,7 -100,7 +100,8 @@@ import { handleLegacySelectEvents } fro
// At least canvas renderer.
import 'zrender/src/canvas/canvas';
+import { registerExternalTransform } from './data/helper/transform';
+ import { createLocaleObject, SYSTEM_LANG, LocaleOption } from './locale';
declare let global: any;
type ModelFinder = modelUtil.ModelFinder;
diff --cc src/util/log.ts
index 3aaab2d,8bb7d69..e50fb6d
--- a/src/util/log.ts
+++ b/src/util/log.ts
@@@ -18,10 -18,27 +18,28 @@@
*/
import { Dictionary } from './types';
+import { map, isString, isFunction, eqNaN, isRegExp } from
'zrender/src/core/util';
+ const ECHARTS_PREFIX = '[ECharts] ';
const storedLogs: Dictionary<boolean> = {};
+ const hasConsole = typeof console !== 'undefined'
+ // eslint-disable-next-line
+ && console.warn && console.log;
+
+ export function log(str: string) {
+ if (hasConsole) {
+ // eslint-disable-next-line
+ console.log(ECHARTS_PREFIX + str);
+ }
+ }
+
+ export function warn(str: string) {
+ if (hasConsole) {
+ console.warn(ECHARTS_PREFIX + str);
+ }
+ }
+
export function deprecateLog(str: string) {
if (__DEV__) {
if (storedLogs[str]) { // Not display duplicate message.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@echarts.apache.org
For additional commands, e-mail: commits-h...@echarts.apache.org
