cloud-web-corejs 1.0.54-dev.327 → 1.0.54-dev.329

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

@@ -242,7 +242,7 @@
       <div>
         <template v-for="(fieldWidget,index) in obj.column.params.widgetList">
           <component
-            v-if="!!fieldSchemaMap[obj.row._X_ROW_KEY]"
+            v-if="!!fieldSchemaMap[obj.row._X_ROW_KEY] && !!obj.row._X_ROW_KEY"
             :is="getColumnWidgetName(fieldWidget)"
             v-bind="getRowWidgetOption(obj,fieldWidget)"
             :form-model="globalModel.formModel"
@@ -252,7 +252,7 @@
             :columnConfig="obj.column.params.columnConfig"
             :subFormRowIndex="obj.rowIndex"
             :subFormRowId="obj.row._X_ROW_KEY"
-            formItemProp="false"
+            :formItemProp="getColumnProp2(fieldWidget, obj)"
             :tableParam="obj"
           >
             <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">

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

@@ -1488,46 +1488,88 @@ modules = {
         this.removeTreeRow({ row });
         return;
       }
+       delete this.fieldSchemaMap[row._X_ROW_KEY]
       let $grid = this.getGridTable();
       $grid.remove(row);
       let tableData = $grid.getTableData();
       let isEditTable = this.widget.options.isEditTable;
       let fullData = !isEditTable ? tableData.fullData : tableData.tableData;
-      await this.$nextTick(() => {
-        this.formModel[this.fieldKeyName] = fullData;
-        this.fieldModel = fullData;
-      });
+      this.formModel[this.fieldKeyName] = fullData;
+      this.fieldModel = fullData;
       this.$nextTick(() => {
         this.handleWbs();
       });
-      this.deleteRowWidgets(row);
+      // this.deleteRowWidgets(row);
+    },
+    isSingerlSearch(widget){
+      let widgetType = widget?.type;
+      let result = widgetType === "singerSearch" || (widgetType === 'vabsearch' && !widget.options.multipleChoices)
+      return result
+    },
+    getColumnNullValue(widget){
+      if(!widget)return null
+      let nullValue = null;
+      let widgetType = widget.type;
+      let multiWidgetTypes = ["checkbox","time-range","baseAttachment","vabUpload","project-tag"];
+
+      let defaultValue = widget.options.defaultValue;
+      if (defaultValue !== undefined && defaultValue !== null && defaultValue !== "") {
+          nullValue = defaultValue;
+      } else if (widgetType === 'select' && widget.options.multiple) {
+        nullValue = [];
+      } else if (widgetType === 'date' && widget.options.type == "dates") {
+        nullValue = [];
+      }else if (widgetType === 'vabsearch' && widget.options.multipleChoices) {
+        nullValue = [];
+      } else if (multiWidgetTypes.includes(widgetType)){
+        nullValue = [];
+      }
+      return nullValue;
+    },
+    getIsFormWidget(widget){
+      let widgetTypes = ["baseAttachment"];
+      let result = false;
+      if(widget.formItemFlag){
+        result = true;
+      }
+      return result;
+    },
+    handleWidgetNullValue(widget,newData){
+      if(!widget || !newData)return
+      if(this.getIsFormWidget(widget)){
+        let field = this.getFieldKeyName(widget)
+        let nullValue = newData.hasOwnProperty(field) ? null : this.getColumnNullValue(widget);
+        newData[field] = nullValue;
+        if(this.isSingerlSearch(widget)){
+          let vabSearchName = widget.options.vabSearchName;
+          if (vabSearchName) newData[vabSearchName] = null;
+        }
+      }
     },
     createNewTableData(isEdit) {
       let newData = {};
       this.loodHandleColumns(this.widget.options.tableColumns, (item) => {
         if (!item.children?.length && item.prop && item.label) {
           let formatS = !isEdit ? item.formatS : item.editFormatS;
-          let columnOption = !isEdit
-            ? item.columnOption
-            : item.editColumnOption;
-          if (formatS == "editSearch") {
-            newData[item.prop] = null;
-            let vabSearchName = item?.columnOption?.vabSearchName;
-            if (vabSearchName) newData[vabSearchName] = null;
-          }
-          if (formatS == "editAttachment") {
-            newData[item.prop] = [];
-          } else {
-            newData[item.prop] = null;
-            if (
-              columnOption &&
-              columnOption.defaultValue !== undefined &&
-              columnOption.defaultValue !== null &&
-              columnOption.defaultValue !== ""
-            ) {
-              newData[item.prop] = columnOption.defaultValue;
+            let widget = null;
+            if(isEdit){
+              widget = item.editWidget || item.widget;
+            }else {
+              widget = item.widget;
+            }
+            if (formatS == "widgetRender") {
+              if(item.widgetList){
+                loopHandleWidget(item.widgetList, (w, p) => {
+                  this.handleWidgetNullValue(w, newData);
+                });
+              }
+            }else {
+              if(widget){
+                this.handleWidgetNullValue(widget, newData);
+              }else {
+                newData[item.prop] = null
+              }
             }
-          }
         }
       });
 
@@ -1559,6 +1601,7 @@ modules = {
       return newData;
     },
     addTableData(rows, field) {
+      debugger
       let $grid = this.getGridTable();
       let formDataModel = this.formModel;
       let tableRows = formDataModel[this.fieldKeyName] || [];
@@ -1701,6 +1744,17 @@ modules = {
       }
       return { columnSelectedWidget, columnEditFields };
     },
+    getColumnProp2(fieldWidget, obj) {
+      let fieldKeyName = this.getFieldKeyName(this.widget);
+      let property = this.getFieldKeyName(fieldWidget);
+      if (this.isVabsearchFlagWidget(fieldWidget)) {
+        property = fieldWidget.options.vabSearchName || property;
+      }
+      let rowIndex = Math.max(obj.rowIndex, 0);
+
+      let propName = fieldKeyName + "." + rowIndex + "." + property;
+      return propName
+    },
     getColumnProp(widget, obj, isEdit) {
       if (!widget) {
         return "false";
@@ -1708,26 +1762,39 @@ modules = {
       /*if(isEdit){
         return "false"
       }*/
-
-      let fieldKeyName = this.getFieldKeyName(widget);
-      let rowIndex = Math.max(obj.rowIndex, 0);
       let isQueryTable = this.widget.options.isQueryTable || false;
       if (isEdit || !isQueryTable) {
-        let propName =
-          fieldKeyName + "." + rowIndex + "." + obj.column.property;
-        let lineWidget = !isEdit
+        let sourceWidgetId = isEdit?obj.column.params.editWidget.id:obj.column.params.widget.id;
+        if(!this.fieldSchemaMap[obj.row._X_ROW_KEY])return "false"
+        let fieldWidget = this.fieldSchemaMap[obj.row._X_ROW_KEY][sourceWidgetId]
+        if (!fieldWidget) {
+          return "false";
+        }
+
+        let fieldKeyName = this.getFieldKeyName(widget);
+        let rowIndex = Math.max(obj.rowIndex, 0);
+
+        let property = this.getFieldKeyName(fieldWidget);
+        if(obj.row[property] && Array.isArray(obj.row[property])){
+          return "false"
+        }
+        // let property = obj.column.property
+        if (this.isVabsearchFlagWidget(fieldWidget)) {
+          property = fieldWidget.options.vabSearchName || property;
+        }
+        let propName = fieldKeyName + "." + rowIndex + "." + property;
+        /* let lineWidget = !isEdit
           ? obj.column.params.widget
           : obj.column.params.editWidget;
         if (!lineWidget) {
           return "false";
-        }
-        if (this.isVabsearchFlagWidget(lineWidget)) {
+        } */
+        /* if (this.isVabsearchFlagWidget(lineWidget)) {
           let fieldName =
             lineWidget.options.vabSearchName ||
             this.getFieldKeyName(lineWidget);
           propName = fieldKeyName + "." + rowIndex + "." + fieldName;
-        }
-
+        } */
         return propName;
       } else {
         return "false";