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

Author: zhaokai

src/service/base/style/LineStyle.js

@@ -1,7 +1,7 @@
-import { extend } from '../../common/Util';
+import { extend } from '../../common';
 import { mapgis } from '../common/base';
 import { VectorStyle } from './VectorStyle';
-import { LineCap, LineJoin } from './Enum';
+import { Cap, Join } from './Enum';
 import { Shadow } from './Shadow';
 import { Graphic } from './Graphic';
 
@@ -23,8 +23,8 @@ export default class LineStyle extends VectorStyle {
         const {
             width = 1,
             dashArray,
-            cap = LineCap.butt,
-            join = LineJoin.miter,
+            cap = Cap.butt,
+            join = Join.miter,
             shadow,
             symbol
         } = options;

src/service/base/style/MarkerStyle.js

@@ -13,7 +13,7 @@ const DefaultMarkerImagePlotting =
  * @param {Number} [symbol] 符号样式
  * @param {Number} [size] 符号大小
  */
-export default class MarkerSymbol extends Symbol {
+export default class MarkerStyle extends Symbol {
     constructor(option) {
         super();
         var options = option ? option : {};
@@ -114,5 +114,5 @@ export default class MarkerSymbol extends Symbol {
     }
 }
 
-export { MarkerSymbol };
-mapgis.symbols.MarkerSymbol = MarkerSymbol;
+export { MarkerStyle };
+mapgis.symbols.MarkerStyle = MarkerStyle;