简柏林 / thingskit-front · Commits

Commit a6bcf7a53a5281deecd186832aa754bf28a7ebad

Authored by xp.Huang
2 parents 50bc5aed 4b4faefe

Merge branch 'ww' into 'main' 

fix: textComponent not render unit

See merge request huang/yun-teng-iot-front!314
Inline Side-by-side
Showing 4 changed files with 39 additions and 10 deletions
... ... @@ -144,7 +144,9 @@
144 144 </div>
145 145 <Tooltip
146 146 placement="top"
147   - :title="dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT)"
  147 + :title="props.value?.updateTime
  148 + ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
  149 + : '暂无更新时间'"
148 150 >
149 151 <div
150 152 class="text-xs text-center truncate p-5"
... ... @@ -152,7 +154,9 @@
152 154 >
153 155 <span class="mr-2">更新时间:</span>
154 156 <span>
155   - {{ dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT) }}
  157 + {{ props.value?.updateTime
  158 + ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
  159 + : '暂无更新时间' }}
156 160 </span>
157 161 </div>
158 162 </Tooltip>
... ...
... ... @@ -153,7 +153,11 @@
153 153 </div>
154 154 <Tooltip
155 155 placement="top"
156   - :title="dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT)"
  156 + :title="
  157 + props.value?.updateTime
  158 + ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
  159 + : '暂无更新时间'
  160 + "
157 161 >
158 162 <div
159 163 class="text-center text-xs truncate p-5"
... ... @@ -161,7 +165,11 @@
161 165 >
162 166 <span class="mr-1">更新时间:</span>
163 167 <span>
164   - {{ dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT) }}
  168 + {{
  169 + props.value?.updateTime
  170 + ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
  171 + : '暂无更新时间'
  172 + }}
165 173 </span>
166 174 </div>
167 175 </Tooltip>
... ...
... ... @@ -69,15 +69,23 @@
69 69 <!-- <Image :style="{ width: `${getWidth}px` }" :src="getImagBase64" /> -->
70 70 <div
71 71 class="w-full text-center truncate p-5"
72   - :style="{ fontSize: fontSize({ radio: getRadio, basic: 12, max: 16 }), color: '#999' }"
  72 + :style="{ fontSize: fontSize({ radio: getRadio, basic: 12, max: 12 }), color: '#999' }"
73 73 >
74 74 <Tooltip
75 75 placement="top"
76   - :title="dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT)"
  76 + :title="
  77 + props.value?.updateTime
  78 + ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
  79 + : '暂无更新时间'
  80 + "
77 81 >
78   - <span>更新时间:</span>
  82 + <span class="mr-1">更新时间:</span>
79 83 <span class="truncate">
80   - {{ dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT) }}
  84 + {{
  85 + props.value?.updateTime
  86 + ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
  87 + : '暂无更新时间'
  88 + }}
81 89 </span>
82 90 </Tooltip>
83 91 </div>
... ...
... ... @@ -75,6 +75,7 @@
75 75 <Statistic
76 76 :value="props.value.value || 0"
77 77 class="truncate"
  78 + :suffix="getShowUnit ? props.value.unit : ''"
78 79 :value-style="{
79 80 fontSize: fontSize({ radio: getRadio, basic: 24, min: 16 }),
80 81 color: props.value.fontColor,
... ... @@ -94,7 +95,11 @@
94 95 <Tooltip
95 96 v-if="getShowUpdate"
96 97 placement="top"
97   - :title="dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT)"
  98 + :title="
  99 + props.value?.updateTime
  100 + ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
  101 + : '暂无更新时间'
  102 + "
98 103 >
99 104 <div class="text-center text-xs truncate p-5" style="color: #999">
100 105 <div
... ... @@ -103,7 +108,11 @@
103 108 >
104 109 <span class="mr-1">更新时间:</span>
105 110 <span class="truncate">
106   - {{ dateUtil(props?.value?.updateTime || new Date()).format(DEFAULT_DATE_FORMAT) }}
  111 + {{
  112 + props.value?.updateTime
  113 + ? dateUtil(props?.value?.updateTime).format(DEFAULT_DATE_FORMAT)
  114 + : '暂无更新时间'
  115 + }}
107 116 </span>
108 117 </div>
109 118 </div>
... ...