Merge branch 'dev-2.1' of https://github.com/iMobileforJavaScript/iTablet into dev-2.1

Author: xiezhiyan

src/containers/workspace/components/PlotAnimationView/PlotAnimationView.js

@@ -11,7 +11,7 @@ import {
 import { ConstToolType, TouchType } from '../../../../constants'
 import { TableList } from '../../../../components'
 import { color } from '../../../../styles'
-import { Toast, scaleSize, setSpText } from '../../../../utils'
+import { scaleSize, setSpText } from '../../../../utils'
 import { getLanguage } from '../../../../language/index'
 // import { getPublicAssets } from '../../../../assets'
 import { getThemeAssets } from '../../../../assets'
@@ -69,12 +69,6 @@ export default class PlotAnimationView extends React.Component {
       this.props.layerName,
       this.props.geoId,
     )
-    if (type == -1) {
-      Toast.show(getLanguage(global.language).Prompt.PLEASE_SELECT_PLOT_SYMBOL)
-      this.cancle()
-      return
-    }
-
     let data = this.getData()
     let subData = []
     switch (type) {

src/containers/workspace/pages/mapView/MapView.js

@@ -529,7 +529,7 @@ export default class MapView extends React.Component {
     this._addMap()
   }
 
-  geometrySelected = event => {
+  geometrySelected = async event => {
     this.props.setSelection &&
       this.props.setSelection([
         {
@@ -587,13 +587,23 @@ export default class MapView extends React.Component {
         break
       }
       case ConstToolType.PLOT_ANIMATION_START: {
-        let type = ConstToolType.PLOT_ANIMATION_NODE_CREATE
-        this.toolBox.setVisible(true, type, {
-          isFullScreen: true,
-          height: ConstToolType.TOOLBAR_HEIGHT[5],
-          containerType: 'createPlotAnimation',
-          cb: () => {},
-        })
+        let type = await SMap.getGeometryTypeById(
+          event.layerInfo.name,
+          event.id,
+        )
+        if (type == -1) {
+          Toast.show(
+            getLanguage(global.language).Prompt.PLEASE_SELECT_PLOT_SYMBOL,
+          )
+        } else {
+          let type = ConstToolType.PLOT_ANIMATION_NODE_CREATE
+          this.toolBox.setVisible(true, type, {
+            isFullScreen: true,
+            height: ConstToolType.TOOLBAR_HEIGHT[5],
+            containerType: 'createPlotAnimation',
+            cb: () => {},
+          })
+        }
         break
       }
       default: