Merge branch 'zyl' of http://xny.yj-3d.com:3000/zhouyulong/electron-4 into zyl

src/renderer/src/views/TS/components/eventParams.vue

@@ -106,8 +106,10 @@ const handleChange = (val, key) => {
 }
 const updateEvent = () => {
   // console.log(detail.value)
-  let obj = eventObj.value
+  let obj = JSON.parse(JSON.stringify(eventObj.value))
   let durationS = eventObj.value.duration_time
+  // console.log("eventObj.value", eventObj.value)
+  // console.log("eventObj.value", durationS)
   if (!durationS)
     durationS = (eventObj.value.endTime - eventObj.value.startTime) / 1000
   switch (eventObj.value.callback) {

src/renderer/src/views/TS/components/rightOperate.ts

@@ -164,11 +164,20 @@ export const useRightOperate = () => {
             })
             let eventIds = []
             source_ids.forEach(item => {
-              let entity = (window as any).earth_ts.entityMap.get(item)
-              if (entity) {
-                entity.remove();
-                (window as any)._entityMap.delete(entity.options.id)
-              }
+              let keys = Array.from((window as any)._entityMap.keys())
+              keys.forEach(keyI => {
+                // @ts-ignore
+                if (keyI.indexOf(item) > -1) {
+                  let entity = (window as any)._entityMap.get(keyI)
+                  console.log("keyI", keyI)
+                  // return
+                  if (entity) {
+                    entity.remove();
+                    (window as any)._entityMap.delete(entity.options.id)
+                  }
+                }
+              })
+
               //关闭资源的编辑框，删除相关的事件
               // eventBus.emit("destroyComponent", item);
               let arr = window['tsObj']._Store.getTaskByProperty(item, "sourceId", "id")

src/renderer/src/views/TS/deduction.vue

@@ -255,6 +255,7 @@ let pauseTrajectoryMotion = () => {
         let TrajectoryMotionObject = window['_entityMap'].get(TrajectoryMotionMapKey);
         if (props.TSOBJ._Clock._status == 'play') {
           TrajectoryMotionObject.state = true
+          TrajectoryMotionObject.speed = TrajectoryMotionObject.oldSpeed * props.TSOBJ._Store._multiplier
         } else {
           TrajectoryMotionObject.state = false
           if (props.TSOBJ._Clock._status == 'stop') {
@@ -270,7 +271,7 @@ let pauseTrajectoryMotion = () => {
           console.log("通过当前时间戳和时间间隔计算出剩余间隔次数", offsetSecond)
           let nums = Math.ceil(offsetSecond / task.detail.times)
           let restNums = (task.detail.numbers - nums)
-          entity.flicker(task.detail.times * 1000, restNums)
+          entity.flicker(task.detail.times * 1000 / props.TSOBJ._Store._multiplier, restNums)
         } else {
           entity && entity.flicker(1, 1)
         }
@@ -371,6 +372,7 @@ const handleDrag = (newLeft: number) => {
         tsEntitys.show = true
         // TrajectoryMotionObject.speed = TrajectoryMotionObject.oldSpeed
         console.log(window['tsObj']._Store._currentTimestamp - task.startTime)
+        TrajectoryMotionObject.speed = TrajectoryMotionObject.oldSpeed
         TrajectoryMotionObject.setMovePositionByTime((window['tsObj']._Store._currentTimestamp - task.startTime) / 1000)
         break;
       default:

src/renderer/src/views/TS/sdk/Store.ts

@@ -40,6 +40,7 @@ export class Store {
     let index = option.wheel % 3
     this._scales.preMainIndex = preMainIndex - 1
     this._scales.distanceOfTicTiny = this._scales.distanceOfTicTinyRange[index]
+    this._scales.distanceOfTicMain = this._scales.numOfMain * this._scales.distanceOfTicTiny
     console.log("this._scales.preMainIndex", this._scales.preMainIndex)
     console.log("this._scales.preMains", this._scales.preMains)
     console.log("this._scales.preMains", this._scales.preMains[this._scales.preMainIndex])

src/renderer/src/views/TS/sdk/index.ts

@@ -31,7 +31,7 @@ export class TS extends Tools {
     // console.log("renderLabel", nums)
     let allTimeLabels = []
     for (let i = 0; i < all; i++) {
-      let timeOfMain = this._Store.getScale('preMains')[this._Store.getScale('preMainIndex') - 1]
+      let timeOfMain = this._Store.getScale('preMains')[this._Store.getScale('preMainIndex')]
       // console.log("timeOfMain", this._Store.getScale('preMains'))
       console.log("timeOfMain", timeOfMain)
       // console.log("timeOfMain", this._Store.getScale('preMainIndex'))