@operato/scene-manufacturing 1.3.20 → 1.3.27

package/src/tact-timer.ts

@@ -40,23 +40,23 @@ const NATURE: ComponentNature = {
     },
     {
       type: 'color',
-      label: 'increase-progress-color',
-      name: 'increaseProgressColor'
+      label: 'before-due-progress-color',
+      name: 'beforeDueProgressColor'
     },
     {
       type: 'color',
-      label: 'decrease-progress-color',
-      name: 'decreaseProgressColor'
+      label: 'over-due-progress-color',
+      name: 'overDueProgressColor'
     },
     {
       type: 'color',
-      label: 'increase-font-color',
-      name: 'increaseFontColor'
+      label: 'before-due-font-color',
+      name: 'beforeDueFontColor'
     },
     {
       type: 'color',
-      label: 'decrese-font-color',
-      name: 'decreaseFontColor'
+      label: 'over-due-font-color',
+      name: 'overDueFontColor'
     },
     {
       type: 'color',
@@ -107,29 +107,34 @@ export default class TactTimer extends RectPath(Shape) {
       return
     }
 
-    const { autoStart } = this.state
+    const { autoStart, started } = this.state
 
-    if (autoStart) {
+    if (autoStart || started) {
       this.start()
     }
   }
 
   start() {
-    const { startTime, endTime } = this.state
+    const { startTime, endTime, hidden } = this.state
     const start = this.parseTime(startTime)
     const end = this.parseTime(endTime)
 
-    if (start && end) {
+    if (start && end && !hidden) {
       this._due = end.getTime()
       this._start = start.getTime()
       this.counting()
     }
   }
 
+  stop() {
+    this.started = false
+  }
+
   onchange(after: Properties) {
-    if ('startTime' in after || 'endTime' in after) {
+    if ('startTime' in after || 'endTime' in after || 'hidden' in after) {
       this.start()
     }
+
     if ('maskColor' in after) {
       delete this.imageElement
     }
@@ -148,14 +153,17 @@ export default class TactTimer extends RectPath(Shape) {
   }
 
   counting() {
-    if (this.disposed) {
+    const { hidden, started } = this.state
+    if (this.disposed || hidden || !started) {
       return
     }
 
     requestAnimationFrame(() => {
-      const { showTimer } = this.state
+      const { showTimer, beforeDueFontColor, overDueFontColor, fontColor } = this.state
       const countdown = this.countdown
 
+      this.setState('fontColor', (this.countdown > 0 ? beforeDueFontColor : overDueFontColor) || fontColor)
+
       if (showTimer) {
         const text = format(Math.abs(countdown), this.getState('format'))
         this.text = text
@@ -180,10 +188,10 @@ export default class TactTimer extends RectPath(Shape) {
       round = 0,
       fontColor,
       maskColor,
-      increaseFontColor,
-      decreaseFontColor,
-      increaseProgressColor = 'transparent',
-      decreaseProgressColor = 'transparent',
+      beforeDueFontColor,
+      overDueFontColor,
+      beforeDueProgressColor = 'transparent',
+      overDueProgressColor = 'transparent',
       underThresholdColor = 'transparent',
       progressDirection = 'increase',
       progressThreshold = 0,
@@ -222,19 +230,19 @@ export default class TactTimer extends RectPath(Shape) {
       context.fillStyle = increase
         ? underThreshold
           ? underThresholdColor
-          : increaseProgressColor
-        : decreaseProgressColor
+          : beforeDueProgressColor
+        : overDueProgressColor
       context.fill()
 
       context.beginPath()
     }
 
     const image = this.getImageElement()
-    this.drawImage(context, image!, left, top, width, height)
+    this.drawImage(context, image!, left - 2, top - 2, width + 4, height + 4)
 
     context.roundRect(left, top, width, height, round)
 
-    this.setState('fontColor', (increase ? increaseFontColor : decreaseFontColor) || fontColor)
+    this.setState('fontColor', (increase ? beforeDueFontColor : overDueFontColor) || fontColor)
   }
 
   postrender(context: CanvasRenderingContext2D) {
@@ -294,6 +302,19 @@ export default class TactTimer extends RectPath(Shape) {
       })
     }
   }
+
+  get started() {
+    return this.getState('started')
+  }
+
+  set started(started) {
+    if (this.started !== started) {
+      this.setState('started', started)
+      if (started) {
+        this.start()
+      }
+    }
+  }
 }
 
 Component.register('tact-timer', TactTimer)

package/translations/en.json

@@ -1,14 +1,15 @@
 {
-  "label.decrease-progress-color": "Decrease Progress Color",
-  "label.decrese-font-color": "Decrease Font Color",
-  "label.format": "Format",
-  "label.increase-font-color": "Increase Font Color",
-  "label.increase-progress-color": "Increase Progress Color",
-  "label.progress-direction": "Progress Direction",
-  "label.progress-threshold": "Progress Threshold",
-  "label.tact-time": "Tact Time",
-  "label.under-threshold-color": "Under Threshold Color",
-  "label.show-progress": "show progress",
+  "component.tact-timer": "tact timer",
+  "label.before-due-progress-color": "before due progress color",
+  "label.before-due-font-color": "before due font color",
+  "label.over-due-progress-color": "over due progress color",
+  "label.over-due-font-color": "over due font color",
+  "label.format": "format",
+  "label.progress-direction": "progress direction",
+  "label.progress-threshold": "progress threshold",
+  "label.tact-time": "tact time",
+  "label.under-threshold-color": "under threshold color",
+  "label.show-progress": "show progress color",
   "label.show-timer": "show timer",
   "label.start-time": "start time",
   "label.end-time": "end time",

package/translations/ja.json

@@ -1,16 +1,17 @@
 {
-  "label.decrease-progress-color": "進行色の減少",
-  "label.decrese-font-color": "フォント色の減少",
+  "component.tact-timer": "工程標準時間タイマー",
+  "label.before-due-progress-color": "期限前進行色",
+  "label.before-due-font-color": "期限前フォント色",
+  "label.over-due-progress-color": "期限後進行色",
+  "label.over-due-font-color": "期限後フォント色",
   "label.format": "フォーマット",
-  "label.increase-font-color": "フォント色の増加",
-  "label.increase-progress-color": "進行色の増加",
   "label.progress-direction": "進行方向",
-  "label.progress-threshold": "進行閾値",
-  "label.tact-time": "標準所要時間",
-  "label.under-threshold-color": "閾値以下の色",
-  "label.show-progress": "進捗を表示",
+  "label.progress-threshold": "進行しきい値",
+  "label.tact-time": "tact time",
+  "label.under-threshold-color": "しきい値以下の色",
+  "label.show-progress": "進行色を表示",
   "label.show-timer": "タイマーを表示",
   "label.start-time": "開始時間",
   "label.end-time": "終了時間",
-  "label.tact-timer-mask-color": "マスクの色"
+  "label.tact-timer-mask-color": "マスク色"
 }

package/translations/ko.json

@@ -1,9 +1,10 @@
 {
-  "label.decrease-progress-color": "감소 진행색상",
-  "label.decrese-font-color": "감소 폰트색상",
+  "component.tact-timer": "공정표준시간 타이머",
+  "label.before-due-progress-color": "만기이전 진행색상",
+  "label.before-due-font-color": "만기이전 폰트색상",
+  "label.over-due-progress-color": "만기이후 진행색상",
+  "label.over-due-font-color": "만기이후 폰트색상",
   "label.format": "포맷",
-  "label.increase-font-color": "증가 폰트색상",
-  "label.increase-progress-color": "증가 진행색상",
   "label.progress-direction": "진행 방향",
   "label.progress-threshold": "진행 임계값",
   "label.tact-time": "tact time",

package/translations/ms.json

@@ -1,15 +1,16 @@
 {
-  "label.decrease-progress-color": "warna kemajuan menurun",
-  "label.decrese-font-color": "warna fon menurun",
+  "component.tact-timer": "pemasa masa standard proses",
+  "label.before-due-progress-color": "warna kemajuan sebelum tarikh akhir",
+  "label.before-due-font-color": "warna fon sebelum tarikh akhir",
+  "label.over-due-progress-color": "warna kemajuan selepas tarikh akhir",
+  "label.over-due-font-color": "warna fon selepas tarikh akhir",
   "label.format": "format",
-  "label.increase-font-color": "warna fon meningkat",
-  "label.increase-progress-color": "warna kemajuan meningkat",
   "label.progress-direction": "arah kemajuan",
   "label.progress-threshold": "ambang kemajuan",
-  "label.tact-time": "masa standard",
-  "label.under-threshold-color": "warna bawah ambang",
-  "label.show-progress": "tunjuk kemajuan",
-  "label.show-timer": "tunjuk pemasa",
+  "label.tact-time": "tact time",
+  "label.under-threshold-color": "warna di bawah ambang",
+  "label.show-progress": "tunjukkan warna kemajuan",
+  "label.show-timer": "tunjukkan pemasa",
   "label.start-time": "masa mula",
   "label.end-time": "masa tamat",
   "label.tact-timer-mask-color": "warna topeng"

package/translations/zh.json

@@ -1,16 +1,17 @@
 {
-  "label.decrease-progress-color": "减少进度颜色",
-  "label.decrese-font-color": "减少字体颜色",
+  "component.tact-timer": "工艺标准时间计时器",
+  "label.before-due-progress-color": "到期前进度颜色",
+  "label.before-due-font-color": "到期前字体颜色",
+  "label.over-due-progress-color": "到期后进度颜色",
+  "label.over-due-font-color": "到期后字体颜色",
   "label.format": "格式",
-  "label.increase-font-color": "增加字体颜色",
-  "label.increase-progress-color": "增加进度颜色",
   "label.progress-direction": "进度方向",
   "label.progress-threshold": "进度阈值",
-  "label.tact-time": "标准耗时",
+  "label.tact-time": "tact time",
   "label.under-threshold-color": "低于阈值颜色",
-  "label.show-progress": "显示进度",
+  "label.show-progress": "显示进度颜色",
   "label.show-timer": "显示计时器",
   "label.start-time": "开始时间",
-  "label.end-time": "完成时间",
-  "label.tact-timer-mask-color": "遮罩颜色"
+  "label.end-time": "结束时间",
+  "label.tact-timer-mask-color": "掩码颜色"
 }