cloud-web-corejs 1.0.128 → 1.0.130

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

@@ -206,15 +206,18 @@
           </component>
         </template>-->
     <template #widget="obj">
-      <template
-        v-if="!!fieldSchemaMap[obj.row._X_ROW_KEY] && fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id]">
+      <template v-if="!!getTableColumnWidget(obj)">
         <template v-if="obj.column.params.widget.type == 'status'">
-          <template
-            v-for="(item,index) in fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id].options.statusParam">
-            <span
-              v-if="obj.row[getFieldKeyName(fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id])]===item.value"
-              :key="fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id].id+'-'+index" class="list-tag"
-              :class="item.type">{{ getI18nLabel(item.label) }}</span>
+          <template v-for="(item,index) in getTableColumnWidget(obj).options.statusParam">
+            <template v-if="isShowColumnStatusWidget(obj,item)">
+              <span
+              v-if="getTableColumnWidget(obj).options.formScriptEnabled || getTableColumnWidget(obj).options.commonAttributeEnabled"
+              :key="getTableColumnWidget(obj).id+'-'+index">{{ getI18nLabel(item[getTableColumnStatusWidgetLabelKey(obj)]) }}</span>
+              <span
+              v-else
+              :key="getTableColumnWidget(obj).id+'-'+index" class="list-tag"
+              :class="item.type">{{ getI18nLabel(item[getTableColumnStatusWidgetLabelKey(obj)]) }}</span>
+            </template>
           </template>
         </template>
         <component
@@ -242,7 +245,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 +255,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">