@dative-gpi/foundation-shared-components 1.0.104 → 1.0.105

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/components/deviceOrganisations/FSStatusCard.vue +7 -9
  2. package/package.json +4 -4
package/components/deviceOrganisations/FSStatusCard.vue CHANGED
@@ -10,7 +10,7 @@
10
10
  <FSChip
11
11
  :prependIcon="$props.statusGroup.icon"
12
12
  :color="$props.statusGroup.color"
13
- :label="statusLabel"
13
+ :label="$props.modelStatus.label"
14
14
  />
15
15
  <FSCol
16
16
  v-if="$props.statusGroup.value"
@@ -27,7 +27,7 @@
27
27
  font="text-button"
28
28
  :color="$props.statusGroup.color"
29
29
  >
30
- {{ statusValue }} {{ $props.statusGroup.unit }}
30
+ {{ statusValue }}
31
31
  </FSText>
32
32
  </FSCol>
33
33
  <FSText
@@ -78,15 +78,14 @@ export default defineComponent({
78
78
  setup(props) {
79
79
  const { epochToLongTimeFormat } = useDateFormat();
80
80
 
81
- const statusLabel = computed((): string => {
82
- return props.statusGroup.label || props.modelStatus.label;
83
- });
84
-
85
81
  const statusValue = computed((): string => {
82
+ if (props.statusGroup.label) {
83
+ return props.statusGroup.label;
84
+ }
86
85
  if (props.statusGroup.value && !isNaN(parseFloat(props.statusGroup.value))) {
87
- return parseFloat(props.statusGroup.value).toLocaleString("fullwide", { maximumFractionDigits: 2 });
86
+ return `${parseFloat(props.statusGroup.value).toLocaleString("fullwide", { maximumFractionDigits: 2 })} ${props.statusGroup.unit}`;
88
87
  }
89
- return props.statusGroup.value || "";
88
+ return `${props.statusGroup.value} ${props.statusGroup.unit}`;
90
89
  });
91
90
 
92
91
  const deviceTimestamp = computed((): string => {
@@ -98,7 +97,6 @@ export default defineComponent({
98
97
 
99
98
  return {
100
99
  deviceTimestamp,
101
- statusLabel,
102
100
  statusValue
103
101
  };
104
102
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@dative-gpi/foundation-shared-components",
3
3
  "sideEffects": false,
4
- "version": "1.0.104",
4
+ "version": "1.0.105",
5
5
  "description": "",
6
6
  "publishConfig": {
7
7
  "access": "public"
@@ -10,8 +10,8 @@
10
10
  "author": "",
11
11
  "license": "ISC",
12
12
  "dependencies": {
13
- "@dative-gpi/foundation-shared-domain": "1.0.104",
14
- "@dative-gpi/foundation-shared-services": "1.0.104"
13
+ "@dative-gpi/foundation-shared-domain": "1.0.105",
14
+ "@dative-gpi/foundation-shared-services": "1.0.105"
15
15
  },
16
16
  "peerDependencies": {
17
17
  "@dative-gpi/bones-ui": "^1.0.0",
@@ -35,5 +35,5 @@
35
35
  "sass": "1.71.1",
36
36
  "sass-loader": "13.3.2"
37
37
  },
38
- "gitHead": "202a5698984d4ace15ebc4c8d41a55b4ab43ce70"
38
+ "gitHead": "10e4ece3df98871b0af99934e5aa86a0e7ae801b"
39
39
  }