new event view

coms/jenga/block/base/action/BlockActionObject.jsx

@@ -14,7 +14,8 @@ import {
   getParentBlock,
   getChildIndex,
   getEventNodeById,
-  getActionBlockObjNode
+  getActionBlockObjNode,
+  getBlockObj
 } from 'stores/funcs/newEvent'
 import {
   nodeIsFunctionGroup,
@@ -164,7 +165,7 @@ export default class BlockActionObject extends React.Component {
     let nodeId = this.props.eventNodeId || this.curEventNodeId
     let node = getEventNodeById(nodeId)
     // 对象改变
-    let preObj = this.getBlockObj(block)
+    let preObj = getBlockObj(block)
     let preObject = getActionBlockObjNode({
       obj: preObj,
       nodeId
@@ -321,52 +322,12 @@ export default class BlockActionObject extends React.Component {
     return { icon, type }
   }
 
-  getBlockObj(block) {
-    let obj
-    if (block) {
-      if (block.isCurObj) {
-        obj = 'curObj'
-      } else {
-        switch (block.op) {
-          case BLOCK_OP_TYPE.SET:
-            if (block.args && block.args[0] && block.args[0].val) {
-              let _val = block.args[0].val
-              if (Array.isArray(_val) && _val[0]) {
-                obj = _val[0]
-              }
-            }
-            break
-          case BLOCK_OP_TYPE.CALL:
-            if (block.val && Array.isArray(block.val)) {
-              obj = block.val[0]
-            }
-            break
-          case BLOCK_OP_TYPE.LET:
-            if (block.args && block.args[0]) {
-              let tempBlock = block.args[0]
-              if (
-                tempBlock.op === BLOCK_OP_TYPE.CALL &&
-                tempBlock.val &&
-                Array.isArray(tempBlock.val)
-              ) {
-                obj = tempBlock.val[0]
-              }
-            }
-            break
-          default:
-            obj = block.val
-        }
-      }
-    }
-    return obj
-  }
-
   getObject() {
     let _obj
     let nodeId = this.props.eventNodeId || this.curEventNodeId
     let curBlock = getEventBlockByBid(this.props.bid, nodeId)
     if (curBlock) {
-      _obj = this.getBlockObj(curBlock)
+      _obj = getBlockObj(curBlock)
     }
     return _obj
   }