feat(thick-ray): change curve to an option of type

liweixsh · Oct 12, 2019 · 1c40407 · 1c40407
1 parent f04625b
commit 1c40407
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/docs/dist/react-bmap.min.js b/docs/dist/react-bmap.min.js
diff --git a/docs/examples/build/app.js b/docs/examples/build/app.js
@@ -36706,6 +36706,8 @@ var ThickRay = function (_Component) {
             var lineData = [];
             var pointData = [];
 
+            var isCurve = Boolean(this.props.type === 'curve');
+
             if (this.props.data) {
                 var points = [];
                 var projection = map.getMapType().getProjection();
@@ -36735,7 +36737,7 @@ var ThickRay = function (_Component) {
                         strokeStyle: item.color,
                         geometry: {
                             type: 'LineString',
-                            coordinates: curve
+                            coordinates: isCurve ? curve : [[fromCenter.lng, fromCenter.lat], [toCenter.lng, toCenter.lat]]
                         },
                         count: item.count,
                         lineWidth: lineWidth
@@ -38159,6 +38161,7 @@ var App = function (_Component) {
                 _react2.default.createElement(_src.ThickRay, {
                     showFromPoint: false,
                     showToPoint: true,
+                    type: 'curve',
                     data: [{
                         color: 'red',
                         from: {

diff --git a/docs/examples/components/thick-ray.js b/docs/examples/components/thick-ray.js
@@ -14,6 +14,7 @@ export default class App extends Component {
             <ThickRay 
                 showFromPoint={false}
                 showToPoint={true}
+                type="curve"
                 data={[
                 {
                     color: 'red',

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-bmap",
-  "version": "1.0.105",
+  "version": "1.0.106",
   "description": "react-bmap",
   "main": "lib/index.js",
   "contributors": [

diff --git a/src/components/thick-ray.js b/src/components/thick-ray.js
@@ -72,6 +72,7 @@ export default class ThickRay extends Component {
         var lineData = [];
         var pointData = [];
 
+        let isCurve = Boolean(this.props.type === 'curve');
 
         if (this.props.data) {
             var points = [];
@@ -102,7 +103,7 @@ export default class ThickRay extends Component {
                     strokeStyle: item.color,
                     geometry: {
                         type: 'LineString',
-                        coordinates: curve
+                        coordinates: isCurve ? curve : [[fromCenter.lng,fromCenter.lat],[toCenter.lng, toCenter.lat]]
                     },
                     count: item.count,
                     lineWidth: lineWidth