This is an automated email from the ASF dual-hosted git repository.
shenyi pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
The following commit(s) were added to refs/heads/next by this push:
new 6c7802e export necessary method for usage in gl.
6c7802e is described below
commit 6c7802e7914555f010861528a3fb89d6d8bbc488
Author: pissang <[email protected]>
AuthorDate: Mon Sep 21 14:31:19 2020 +0800
export necessary method for usage in gl.
---
src/component/marker/MarkerView.ts | 2 +-
src/coord/calendar/Calendar.ts | 3 +--
src/coord/geo/geoJSONLoader.ts | 2 +-
src/export.ts | 3 ++-
src/util/layout.ts | 2 +-
src/util/model.ts | 9 +++++----
6 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/component/marker/MarkerView.ts
b/src/component/marker/MarkerView.ts
index 64202a8..56b8a04 100644
--- a/src/component/marker/MarkerView.ts
+++ b/src/component/marker/MarkerView.ts
@@ -24,7 +24,7 @@ import GlobalModel from '../../model/Global';
import ExtensionAPI from '../../ExtensionAPI';
import { makeInner } from '../../util/model';
import SeriesModel from '../../model/Series';
-import { Group } from 'zrender/src/export';
+import Group from 'zrender/src/graphic/Group';
import { enterBlur } from '../../util/states';
const inner = makeInner<{
diff --git a/src/coord/calendar/Calendar.ts b/src/coord/calendar/Calendar.ts
index 646ab7b..ad3d4a1 100644
--- a/src/coord/calendar/Calendar.ts
+++ b/src/coord/calendar/Calendar.ts
@@ -20,7 +20,7 @@
import * as zrUtil from 'zrender/src/core/util';
import * as layout from '../../util/layout';
import * as numberUtil from '../../util/number';
-import { BoundingRect } from 'zrender/src/export';
+import BoundingRect, {RectLike} from 'zrender/src/core/BoundingRect';
import CalendarModel from './CalendarModel';
import GlobalModel from '../../model/Global';
import ExtensionAPI from '../../ExtensionAPI';
@@ -35,7 +35,6 @@ import { ParsedModelFinder } from '../../util/model';
import { CoordinateSystem, CoordinateSystemMaster } from '../CoordinateSystem';
import SeriesModel from '../../model/Series';
import CoordinateSystemManager from '../../CoordinateSystem';
-import { RectLike } from 'zrender/src/core/BoundingRect';
// (24*60*60*1000)
const PROXIMATE_ONE_DAY = 86400000;
diff --git a/src/coord/geo/geoJSONLoader.ts b/src/coord/geo/geoJSONLoader.ts
index 3fa11fe..93e5c9e 100644
--- a/src/coord/geo/geoJSONLoader.ts
+++ b/src/coord/geo/geoJSONLoader.ts
@@ -27,7 +27,7 @@ import fixTextCoord from './fix/textCoord';
import fixGeoCoord from './fix/geoCoord';
import fixDiaoyuIsland from './fix/diaoyuIsland';
import { GeoJSONMapRecord } from './mapDataStorage';
-import { BoundingRect } from 'zrender/src/export';
+import BoundingRect from 'zrender/src/core/BoundingRect';
import Region from './Region';
type MapRecordInner = {
diff --git a/src/export.ts b/src/export.ts
index 1020eb0..0ce9971 100644
--- a/src/export.ts
+++ b/src/export.ts
@@ -34,6 +34,8 @@ import {throttle} from './util/throttle';
import * as ecHelper from './helper';
import parseGeoJSON from './coord/geo/parseGeoJson';
+// Only for GL
+export {brushSingle as innerDrawElementOnCanvas} from
'zrender/src/canvas/graphic';
export {zrender};
export {default as List} from './data/List';
@@ -49,7 +51,6 @@ export {default as env} from 'zrender/src/core/env';
export {parseGeoJSON};
export const parseGeoJson = parseGeoJSON;
-
export const number = {};
zrUtil.each(
[
diff --git a/src/util/layout.ts b/src/util/layout.ts
index 31e0fac..f13fd5c 100644
--- a/src/util/layout.ts
+++ b/src/util/layout.ts
@@ -24,7 +24,7 @@ import BoundingRect from 'zrender/src/core/BoundingRect';
import {parsePercent} from './number';
import * as formatUtil from './format';
import { BoxLayoutOptionMixin, ComponentLayoutMode } from './types';
-import { Group } from 'zrender/src/export';
+import Group from 'zrender/src/graphic/Group';
import Element from 'zrender/src/Element';
import { Dictionary } from 'zrender/src/core/types';
diff --git a/src/util/model.ts b/src/util/model.ts
index c09a154..edbc337 100644
--- a/src/util/model.ts
+++ b/src/util/model.ts
@@ -862,24 +862,25 @@ export const MULTIPLE_REFERRING: QueryReferringOpt = {
useDefault: false, enable
export type QueryReferringOpt = {
// Whether to use the first componet as the default if none of
index/id/name are specified.
- useDefault: boolean;
+ useDefault?: boolean;
// Whether to enable `'all'` on index option.
- enableAll: boolean;
+ enableAll?: boolean;
// Whether to enable `'none'`/`false` on index option.
- enableNone: boolean;
+ enableNone?: boolean;
};
export function queryReferringComponents(
ecModel: GlobalModel,
mainType: ComponentMainType,
userOption: QueryReferringUserOption,
- opt: QueryReferringOpt
+ opt?: QueryReferringOpt
): {
// Always be array rather than null/undefined, which is convenient to use.
models: ComponentModel[];
// Whether there is indexOption/id/name specified
specified: boolean;
} {
+ opt = opt || SINGLE_REFERRING as QueryReferringOpt;
let indexOption = userOption.index;
let idOption = userOption.id;
let nameOption = userOption.name;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
