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

package/src/components/xform/form-designer/form-widget/field-widget/form-item-wrapper.vue

@@ -12,7 +12,7 @@
   <div class="field-wrapper" :class="{'design-time-bottom-margin': !!this.designer}"
        v-show="!field.options.hidden || (designState === true)">
     <div>
-      <template v-if="formItemProp=='false'">
+      <template v-if="formItemProp==='false'">
         <template v-if="!field.options.hidden">
           <template v-if="isShowWidget()">
             <slot></slot>
@@ -211,6 +211,10 @@ export default {
   created() {
     //
     this.initShowType();
+    /* let propName = this.formItemProp;
+    if(propName){
+      debugger
+    } */
   },
   methods: {
     isSubFormItem() {
@@ -283,7 +287,7 @@ export default {
         return this.formItemProp;
       }
       let o = this.field.options.name;
-      return (
+      let propName = (
         (o
           = (this.field.options.keyNameEnabled
             && this.field.options.keyName)
@@ -298,6 +302,11 @@ export default {
               ? this.getObjectName() + "." + o
               : o
       );
+      /* if(this.$parent.tableParam){
+          debugger
+        } */
+        
+      return propName
     },
     getI18nLabel(label, path, param) {
       return !this.designState && label ? this.$t2(label, path, param) : label;

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"

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

@@ -1493,14 +1493,13 @@ modules = {
       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);
     },
     createNewTableData(isEdit) {
       let newData = {};
@@ -1701,6 +1700,20 @@ 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;
+      if(rowIndex){
+        debugger
+      }
+      return propName
+    },
     getColumnProp(widget, obj, isEdit) {
       if (!widget) {
         return "false";
@@ -1709,24 +1722,37 @@ modules = {
         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 (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 {