Merge branch '1.2.2' of http://git.platomix.net/yangfan/workflow into 1.2.2

src/components/Generator/components/InputTable/index.vue

@@ -496,8 +496,8 @@ export default {
       const checkCol = (col) => col.required && !this.checkData(col) && (res = col.valid = false)
       this.tableFormData.forEach((row) => row.forEach(checkCol))
       // 将新增数据过滤出来返回给主表
-      let filterData = this.filterAddData(this.tableFormData)
-      return res ? filterData.map((row) => row.reduce((p, c) => ((p[c.__vModel__] = c.value), p), {})) : false
+      // let filterData = this.filterAddData(this.tableFormData)
+      return res ? this.tableFormData.map((row) => row.reduce((p, c) => ((p[c.__vModel__] = c.value), p), {})) : false
     },
     /**
      * 校验表格数据必填项

src/views/basic/dynamicModel/list/index.vue

@@ -266,7 +266,7 @@
           <template v-slot:toolbar_buttons>
             <div class="JNPF-common-head" v-if="columnData.type != 5">
               <div v-for="(item, i) in columnData.btnsList" :key="i">
-                <el-button size="mini" v-if="item.value !== 'journal'" :type="i === 0 ? 'primary' : 'text'" :icon="item.icon" @click="headBtnsHandel(item.value, item.importStatus)" :key="i">
+                <el-button style="margin-right: 5px" size="mini" v-if="item.value !== 'journal'" :type="i === 0 ? 'primary' : 'text'" :icon="item.icon" @click="headBtnsHandel(item.value, item.importStatus)" :key="i">
                   {{ item.label }}
                 </el-button>
                 <el-dropdown v-else @command="handleCommand">
@@ -3095,6 +3095,7 @@ export default {
   cursor: pointer;
   color: #1890ff;
   font-size: 12px;
+  line-height: 30px;
 }
 .el-icon-arrow-down {
   font-size: 12px;