Merge branch 'dev' of github.com:MapGIS/WebClient-JavaScript into dev · MapGIS/WebClient-JavaScript@c2238c1 · GitHub

MapGIS / WebClient-JavaScript Public

• Notifications You must be signed in to change notification settings
• Fork 45
• Star 186

• Code
• Issues 4
• Pull requests 1
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit c2238c1

Browse filesBrowse the repository at this point in the historyBrowse files

zhaokai

committed

Merge branch 'dev' of github.com:MapGIS/WebClient-JavaScript into dev

2 parents 8f4e43c + 5beabc7 commit c2238c1
Copy full SHA for c2238c1

2 files changed

+7-7Lines changed: 7 additions & 7 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• src/service/base/style
  • LineStyle.js
  • MarkerStyle.js

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎src/service/base/style/LineStyle.js‎

Copy file name to clipboardExpand all lines: src/service/base/style/LineStyle.js

+4-4Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
@@ -1,7 +1,7 @@
1		- import { extend } from '../../common/Util';
	1	+ import { extend } from '../../common';
2	2	import { mapgis } from '../common/base';
3	3	import { VectorStyle } from './VectorStyle';
4		- import { LineCap, LineJoin } from './Enum';
	4	+ import { Cap, Join } from './Enum';
5	5	import { Shadow } from './Shadow';
6	6	import { Graphic } from './Graphic';
7	7
@@ -23,8 +23,8 @@ export default class LineStyle extends VectorStyle {
23	23	const {
24	24	width = 1,
25	25	dashArray,
26		- cap = LineCap.butt,
27		- join = LineJoin.miter,
	26	+ cap = Cap.butt,
	27	+ join = Join.miter,
28	28	shadow,
29	29	symbol
30	30	} = options;

Collapse file

‎src/service/base/style/MarkerStyle.js‎

Copy file name to clipboardExpand all lines: src/service/base/style/MarkerStyle.js

+3-3Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -13,7 +13,7 @@ const DefaultMarkerImagePlotting =
13	13	* @param {Number} [symbol] 符号样式
14	14	* @param {Number} [size] 符号大小
15	15	*/
16		- export default class MarkerSymbol extends Symbol {
	16	+ export default class MarkerStyle extends Symbol {
17	17	constructor(option) {
18	18	super();
19	19	var options = option ? option : {};
@@ -114,5 +114,5 @@ export default class MarkerSymbol extends Symbol {
114	114	}
115	115	}
116	116
117		- export { MarkerSymbol };
118		- mapgis.symbols.MarkerSymbol = MarkerSymbol;
	117	+ export { MarkerStyle };
	118	+ mapgis.symbols.MarkerStyle = MarkerStyle;

0 commit comments

Comments

0 (0)