free-fe-core-modules 0.1.32 → 0.1.34

package/free-field/Fields/Date.js

@@ -75,7 +75,13 @@ export default defineComponent({
       (l) => l.locale === (vm.ctx.config.locale || vm.ctx.config.defaultLocale),
     )?.calendar;
 
-    const localDate = computed(() => vm.$filter('normalDate', fieldData.value));
+    const normalizeDateValue = (value) => {
+      if (value === void 0 || value === null || value === '') return '';
+
+      return vm.$filter('normalDate', value) || '';
+    };
+
+    const localDate = computed(() => normalizeDateValue(fieldData.value));
 
     const showPopup = ref(false);
 
@@ -94,7 +100,7 @@ export default defineComponent({
       class: 'full-width',
       modelValue: localDate.value,
       'onUpdate:modelValue': (v) => {
-        setFieldData(v, emit);
+        setFieldData(normalizeDateValue(v), emit);
       },
     }, {
       default: () => h(QPopupProxy, {
@@ -113,7 +119,7 @@ export default defineComponent({
           locale,
 
           'onUpdate:modelValue': (v) => {
-            setFieldData(v, emit);
+            setFieldData(normalizeDateValue(v), emit);
 
             // TODO: not working, should close the popup but not
             showPopup.value = false;
@@ -129,7 +135,7 @@ export default defineComponent({
 
     const readonlyNode = () => h(ReadonlyContent, {
       Field: props.Field,
-      Content: fieldData.value,
+      Content: localDate.value,
     });
 
     const {

package/free-field/Fields/DateRange.js

@@ -46,6 +46,12 @@ export default defineComponent({
 
     const { fieldData, setFieldData, inputControlSettings } = useFreeField(props);
 
+    const normalizeDateValue = (value) => {
+      if (value === void 0 || value === null || value === '') return '';
+
+      return vm.$filter('normalDate', value) || '';
+    };
+
     const updateFieldDate = () => {
       setFieldData([min.value, max.value].join(props.Field.Separator || '~'), emit);
     };
@@ -58,13 +64,18 @@ export default defineComponent({
 
     watchEffect(() => {
       const yl = (fieldData.value || '').split(props.Field.Separator || '~');
-      min.value = yl[0] && yl[0].trim();
-      max.value = yl[1] && yl[1].trim();
+      min.value = normalizeDateValue(yl[0] && yl[0].trim());
+      max.value = normalizeDateValue(yl[1] && yl[1].trim());
+    });
+
+    const readonlyContent = computed(() => {
+      const separator = props.Field.Separator || '~';
+      return [min.value, max.value].join(separator);
     });
 
     const readonlyNode = () => h(ReadonlyContent, {
       Field: props.Field,
-      Content: fieldData.value,
+      Content: readonlyContent.value,
     });
 
     const before = (props.Field.Label !== void 0) ? () => h(freeFieldLabel, {
@@ -132,7 +143,7 @@ export default defineComponent({
 
       modelValue: min.value,
       'onUpdate:modelValue': (v) => {
-        min.value = v;
+        min.value = normalizeDateValue(v);
         emit('input', v);
       },
     }, {
@@ -152,7 +163,7 @@ export default defineComponent({
           locale,
 
           'onUpdate:modelValue': (v) => {
-            min.value = v;
+            min.value = normalizeDateValue(v);
 
             // TODO: not working, should close the popup but not
             showMinPopup.value = false;
@@ -181,7 +192,7 @@ export default defineComponent({
 
       modelValue: max.value,
       'onUpdate:modelValue': (v) => {
-        max.value = v;
+        max.value = normalizeDateValue(v);
         emit('input', v);
       },
     }, {
@@ -201,7 +212,7 @@ export default defineComponent({
           locale,
 
           'onUpdate:modelValue': (v) => {
-            max.value = v;
+            max.value = normalizeDateValue(v);
 
             // TODO: not working, should close the popup but not
             showMaxPopup.value = false;

package/free-field/Fields/PermissionEditor.vue

@@ -120,7 +120,7 @@ export default defineComponent({
           && !Array.isArray(service)
           && ['scope'].indexOf(service) < 0
         ) {
-          children.push({ Name: sk, Index: props.Service[sk].Index || 0 });
+          children.push({ Name: sk, Index: props.Service[sk] ? (props.Service[sk].Index || 0) : 0 });
         }
       }
       return children.sort(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-fe-core-modules",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "main": "index.js",
   "repository": "https://github.com/freeeis/free-fe-core-modules.git",
   "author": "zhiquan",