@dative-gpi/foundation-shared-components 1.0.25 → 1.0.27

package/components/fields/FSMagicConfigField.vue

@@ -68,7 +68,7 @@ export default defineComponent({
       required: false,
       default: null
     },
-    value: {
+    modelValue: {
       type: String as PropType<string | null>,
       required: false,
       default: null
@@ -84,7 +84,7 @@ export default defineComponent({
       default: true
     }
   },
-  emits: ["click:remove", "click:add", "update:value", "update:labelDefault", "update:translations"],
+  emits: ["click:remove", "click:add", "update:modelValue", "update:labelDefault", "update:translations"],
   setup(props, { emit }) {
     const { get } = useMagicFieldProvider();
 
@@ -107,38 +107,45 @@ export default defineComponent({
     });
 
     const valueToInput = computed((): any => {
+      if (props.modelValue == null) {
+        return null;
+      }
+
       switch (props.type) {
         case MagicFieldType.NumberField:
         case MagicFieldType.DateTimeField:
         case MagicFieldType.TimeField:
-          if (props.value == null || isNaN(parseFloat(props.value))) {
+          if (isNaN(parseFloat(props.modelValue))) {
             return null;
           }
-          return parseFloat(props.value);
+          return parseFloat(props.modelValue);
         case MagicFieldType.Switch: 
-          if (props.value == null) {
-            return null;
-          }
-          return props.value === "true";
+          return props.modelValue === "true";
+        case MagicFieldType.TimeStepField:
+          return JSON.parse(props.modelValue);
         default:
-          return props.value;
+          return props.modelValue;
       }
     });
 
     const inputToValue = (value: any) => {
+
+      if (value == null) {
+        emit("update:modelValue", null);
+      }
+
       switch (props.type) {
         case MagicFieldType.NumberField:
         case MagicFieldType.Switch: 
         case MagicFieldType.DateTimeField:
         case MagicFieldType.TimeField:
-          if (value == null) {
-            emit("update:value", null);
-            break;
-          }
-          emit("update:value", value.toString());
+          emit("update:modelValue", value.toString());
+          break;
+        case MagicFieldType.TimeStepField:
+          emit("update:modelValue", JSON.stringify(value));
           break;
         default:
-          emit("update:value", value);
+          emit("update:modelValue", value);
           break;
       }
     };

package/components/fields/FSMagicField.vue

@@ -115,28 +115,32 @@ export default defineComponent({
     })));
 
     const valueToInput = computed((): any => {
+      if (props.modelValue == null) {
+        return null;
+      }
+
       switch (props.type) {
         case MagicFieldType.NumberField:
         case MagicFieldType.DateTimeField:
         case MagicFieldType.TimeField:
-          if (props.modelValue == null || isNaN(parseFloat(props.modelValue))) {
+          if (isNaN(parseFloat(props.modelValue))) {
             return null;
           }
           return parseFloat(props.modelValue);
         case MagicFieldType.Switch: 
-          if (props.modelValue == null) {
-            return null;
-          }
           return props.modelValue === "true";
+        case MagicFieldType.TimeStepField:
+          return JSON.parse(props.modelValue);
         default:
           return props.modelValue;
       }
     });
 
-    const asString = (value: any): string | null => {
+    const asString = (value: string): string | null => {
       if (value == null) {
-        return null;
+        return "";
       }
+      
       switch (props.type) {
         case MagicFieldType.NumberField:
           return value.toString();
@@ -146,29 +150,31 @@ export default defineComponent({
           }
           return $tr("ui.magic-field.false", "False");
         case MagicFieldType.DateTimeField:
-          return epochToShortTimeFormat(value);
+          return epochToShortTimeFormat(parseFloat(value));
         case MagicFieldType.TimeField:
-          return getTimeBestString(value);
+          return getTimeBestString(parseFloat(value));
         case MagicFieldType.TimeStepField:
-          return timeStepToString(value);
+          return timeStepToString(JSON.parse(value));
         default:
           return value;
       }
     }
 
     const inputToValue = (value: any) => {
+      if (value == null) {
+        emit("update:modelValue", null);
+      }
+
       switch (props.type) {
         case MagicFieldType.NumberField:
         case MagicFieldType.Switch: 
         case MagicFieldType.DateTimeField:
         case MagicFieldType.TimeField:
-          if (value == null) {
-            emit("update:modelValue", null);
-            break;
-          }
           emit("update:modelValue", value.toString());
           break;
         case MagicFieldType.TimeStepField:
+          emit("update:modelValue", JSON.stringify(value));
+          break;
         default:
           emit("update:modelValue", value);
           break;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "1.0.25",
+  "version": "1.0.27",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.25",
-    "@dative-gpi/foundation-shared-services": "1.0.25"
+    "@dative-gpi/foundation-shared-domain": "1.0.27",
+    "@dative-gpi/foundation-shared-services": "1.0.27"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^0.0.75",
@@ -35,5 +35,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "7ff4002ce8df7266ce8cce3c7bdcbf5034c6c846"
+  "gitHead": "3410229c1697c7402bf50dde63df3a4d81de9ae8"
 }