cloud-web-corejs-haier 1.0.43 → 1.0.45

package/src/components/xform/form-designer/form-widget/container-widget/data-table-widget.vue

@@ -190,6 +190,7 @@ import TableCellWidget from '../../../../../components/xform/form-designer/form-
 import FieldComponents from '../../../../../components/xform/form-designer/form-widget/field-widget/index';
 import Draggable from 'vuedraggable';
 import dataTableMixin from './data-table-mixin.js';
+import { enrichTableColumnsWithLabelIcon } from '../../../utils/tableColumnHelper';
 
 export default {
   name: 'data-table-widget',
@@ -200,6 +201,15 @@ export default {
     ...FieldComponents
   },
   mixins: [dataTableMixin],
+  computed: {
+    columns() {
+      const baseColumns = dataTableMixin.computed.columns.call(this);
+      return enrichTableColumnsWithLabelIcon(
+        baseColumns,
+        this.widget.options.tableColumns || []
+      );
+    },
+  },
   created() {
     if(this.widget.options.isNotQueryAllPage===undefined)this.widget.options.isNotQueryAllPage = false;
   }

package/src/components/xform/form-designer/form-widget/container-widget/detail-pane-widget.vue

@@ -5,6 +5,7 @@
                :key="widget.id" @click.native.stop="selectWidget(widget)" :visible="!widget.options.hidden">
     <template #button>
 <!--      <el-button class="button-sty" icon="el-icon-search" v-if="widget.options.tableRef">新增</el-button>-->
+
       <div class="grid-cell">
         <draggable
           :list="widget.buttonWidgetList"
@@ -21,7 +22,7 @@
                   :is="subWidget.type + '-widget'"
                   :widget="subWidget"
                   :designer="designer"
-                  :key="subWidget.id"
+                   :key="subWidget.id"
                   :parent-list="widget.buttonWidgetList"
                   :index-of-parent-list="swIdx"
                   :parent-widget="widget"
@@ -145,7 +146,7 @@ export default {
   methods: {
     checkContainerMove(evt) {
       return true;
-    }
+    },
   }
 }
 </script>

package/src/components/xform/form-designer/form-widget/dialog/formDialog.vue

@@ -34,7 +34,7 @@
         <i class="el-icon-close el-icon"></i>
         {{ $t2("取 消", "system.button.cancel2") }}
       </el-button>
-      <el-button type="primary" @click="dialogSubmit" class="button-sty">
+      <el-button type="primary" @click="dialogSubmit" class="button-sty" v-if="confirmButtonVisible">
         <i class="el-icon-check el-icon"></i>
         {{ $t2("确 定", "system.button.confirm2") }}
       </el-button>
@@ -77,6 +77,7 @@ export default {
       currentLayoutType: null,
       dataId: null,
       formConfig: {},
+      confirmButtonVisible: true
     };
   },
   computed: {
@@ -191,6 +192,9 @@ export default {
         this.close();
       }
     },
+    setConfirmButtonHidden(val){
+      this.confirmButtonVisible = val || false;
+    }
   },
 };
 </script>