Jelajahi Sumber

time fix on acitivty

luis 7 tahun lalu
induk
melakukan
575313882d

+ 8 - 13
browser/vue-flow/src/components/flow/node-activity.vue

@@ -58,6 +58,10 @@ export default {
       const s = new Date(Date.parse(this.activity.startTime))
       if (!dateIsValid(s)) { return null }
       let intervalms = this.finishTime - s
+      if (intervalms < 0) {
+        intervalms = 0
+        console.log('got time smallr')
+      }
       const min = Math.floor(intervalms / 60000)
       const sec = (intervalms / 1000) % 60
 
@@ -66,19 +70,10 @@ export default {
   },
   watch: {
     activity (val, oldVal) {
-      const finish = new Date(Date.parse(val.endTime))
+      this.finishTime = null
+      this.updateTime()
+      /* const finish = new Date(Date.parse(val.endTime))
       if (dateIsValid(finish)) {
-        this.finishTime = null
-      }
-
-      /* const startTime = new Date(Date.parse(val.startTime))
-      const endTime = new Date(Date.parse(val.endtime))
-      if (!dateIsValid(startTime) || !dateIsValid(endTime)) {
-        console.log('Date is valid', dateIsValid(startTime), 'end:', dateIsValid(endTime))
-        // reset timer
-        this.finishTime = null
-        clearTimeout(this._timeOut)
-        this._timeOut = setTimeout(this.updateTime, 999)
       } */
     }
   },
@@ -95,7 +90,7 @@ export default {
         this.finishTime = finish
         return
       }
-      this.finishTime = new Date()
+      this.finishTime = new Date(new Date().getTime() + 1000)
       this._timeOut = setTimeout(this.updateTime, 999)
     }
 

+ 11 - 0
browser/vue-flow/src/components/panel-inspector.vue

@@ -30,10 +30,12 @@
           <div class="property">[{{ nodeInspect.id }}]</div>
           <label>src</label>
           <div class="property">{{ nodeInspect.src }}</div>
+          <!--
           <label>Description</label>
           <div class="property">Bogus description</div>
           <label>Help</label>
           <div class="property">Connect to input a thing and goes to output another thing</div>
+          -->
         </div>
         <div class="flow-inspector__area flow-inspector--inputs">
           <h3>Inputs defaults:</h3>
@@ -64,6 +66,15 @@
             <label>Error</label>
             <div class="property">{{ activity && activity[nodeInspect.id] && activity[nodeInspect.id].error }}</div>
           </div>
+          <div
+            v-if="activity && activity[nodeInspect.id]"
+            class="flow-inspector--properties-time">
+            <label>Time:</label>
+            <div class="property">
+              {{ activity[nodeInspect.id].startTime }} -- {{ activity[nodeInspect.id].endTime }}
+            </div>
+          </div>
+
         </div>
         <!-- PARAMETERS -->
         <div class="flow-inspector--params flow-inspector__area" v-if="nodeInspect.prop" >