cloud-web-corejs 1.0.54-dev.121 → 1.0.54-dev.123

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.121",
+  "version": "1.0.54-dev.123",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/table/tableFormMixin.js

@@ -33,16 +33,18 @@ modules = {
       let formData = this.formData;
       let advancedFormData = {};
       $grid.searchColumns.forEach((form1Field) => {
+        let nullValue = this.getNullValue(form1Field);
         if (!form1Field.common) {
           let value = formData[form1Field.field];
           if (value !== null && value !== undefined) {
             advancedFormData[form1Field.field] = value;
           } else {
-            advancedFormData[form1Field.field] = null;
+            advancedFormData[form1Field.field] = nullValue;
           }
         }
       });
       this.advancedFormData = advancedFormData;
+      debugger
       this.formDataClone = this.$baseLodash.cloneDeep(this.formData);
       this.showAdvancedSearch = true;
     },
@@ -53,13 +55,14 @@ modules = {
       let advancedFormData = this.advancedFormData;
       $grid.searchColumns.forEach((form1Field) => {
         let field = form1Field.field;
+        let nullValue = this.getNullValue(form1Field);
         if (!form1Field.common) {
           let value = advancedFormData[field];
           if (!!form1Field.slot && formData[field] !== formDataClone[field]) {
           } else if (value !== null && value !== undefined) {
             formData[field] = value;
           } else {
-            formData[field] = null;
+            formData[field] = nullValue;
           }
         }
       });
@@ -70,9 +73,10 @@ modules = {
       let formData = this.formData;
       let advancedFormData = this.advancedFormData;
       $grid.searchColumns.forEach((form1Field) => {
+        let nullValue = this.getNullValue(form1Field);
         if (!form1Field.common) {
-          formData[form1Field.field] = null;
-          advancedFormData[form1Field.field] = null;
+          formData[form1Field.field] = nullValue;
+          advancedFormData[form1Field.field] = nullValue;
         }
       });
       this.$emit("advancedClear");
@@ -94,6 +98,33 @@ modules = {
         this.handleSyncFun();
       }, s);
     },
+    getNullValue(item) {
+      let type = item.type;
+      let widgetType = item.widgetType;
+      let widgetConfig = item.widgetConfig || {};
+      let value = null;
+      if (type == "inputBatch") {
+        value = [];
+      } else if (type == "time" && widgetConfig.isRange) {
+        value = [];
+      } else if (type == "date") {
+        if (widgetConfig.isRange) {
+          value = [];
+        } else if (
+          [
+            "dates",
+            "months",
+            "years",
+            "datetimerange",
+            "daterange",
+            "monthrange",
+          ].includes(widgetType)
+        ) {
+          value = [];
+        }
+      }
+      return value;
+    },
     handleSyncFun() {
       let requests = [];
       let $grid = this.$parent;
@@ -202,11 +233,10 @@ modules = {
       // this.$set(this, "formData", {});
       // this.$set(this, "advancedFormData", {});
       searchColumns.forEach((form1Field) => {
-        let defaultValue = null;
+        let nullValue = this.getNullValue(form1Field);
+        let defaultValue = nullValue;
         if (form1Field.defaultValueEnabled !== false) {
-          defaultValue = form1Field.defaultValue ?? null;
-        } else {
-          defaultValue = null;
+          defaultValue = form1Field.defaultValue ?? nullValue;
         }
         let currentData = formData;
         this.$set(currentData, form1Field.field, defaultValue);

package/src/components/xform/form-designer/setting-panel/property-editor/required-editor.vue

@@ -1,29 +1,32 @@
 <template>
-  <el-form-item :label="i18nt('designer.setting.required')" v-show="showProperty()">
+  <el-form-item
+    :label="i18nt('designer.setting.required')"
+    v-show="showProperty()"
+  >
     <el-switch v-model="optionModel.required"></el-switch>
   </el-form-item>
 </template>
 
 <script>
-  import i18n from "../../../../../components/xform/utils/i18n"
+import i18n from "../../../../../components/xform/utils/i18n";
 
-  export default {
-    name: "required-editor",
-    mixins: [i18n],
-    props: {
-      designer: Object,
-      selectedWidget: Object,
-      optionModel: Object,
+export default {
+  name: "required-editor",
+  mixins: [i18n],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  methods: {
+    showProperty() {
+      let widgetRef = this.designer.vueInstance.getWidgetRef(
+        this.selectedWidget.options.name
+      );
+      return widgetRef?.$attrs["table-condition"] !== true;
     },
-    methods:{
-      showProperty(){
-        let widgetRef = this.designer.formWidget.getWidgetRef(this.selectedWidget.options.name);
-        return widgetRef.$attrs && $attrs.$attrs['table-condition']!==true;
-      }
-    }
-  }
+  },
+};
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -12,7 +12,6 @@ import {
   generateId,
 } from "../../../../components/xform/utils/util";
 import { tableTreeMixins } from "../../../../mixins/tableTree/index.js";
-import ItemEdit from "@/views/user/form/form_template/itemEdit.vue";
 
 let modules = {};
 const baseRefUtil = {
@@ -507,11 +506,10 @@ modules = {
 
         let getDateItem = (widget) => {
           let options = widget.options;
-
+          
           let dateConfig = {
             format: options.format,
             valueFormat: options.valueFormat,
-            isRange: widget.type == "time-range",
           };
           let typeMap = {
             input: { type: "input" },
@@ -522,15 +520,15 @@ modules = {
               widgetType: options.type,
               widgetConfig: dateConfig,
             },
-            time: { type: "time", isRange: false, widgetConfig: dateConfig },
+            time: { type: "time", widgetConfig: dateConfig },
             "date-range": {
               type: "date",
               widgetType: "daterange",
-              widgetConfig: dateConfig,
+              widgetConfig: { ...dateConfig, isRange: true }
             },
             "time-range": {
               type: "time",
-              widgetConfig: dateConfig,
+              widgetConfig: { ...dateConfig, isRange: true }
             },
           };
           let item = typeMap[widget.type] || {};