Merge branch 'master-v32-lushangqing' into 'master'

故障联调 表格多选居中及节点名称去掉空格



See merge request !266

@@ -2,7 +2,7 @@
     <!--  表格-->
     <!--  表格-->
     <el-table :border="showBorder" v-loading="loading" :size="size" ref="multipleTable"  @selection-change="handleSelectionChange"  :data="dataList" stripe header-row-class-name="tbl-header-class" :height="height"
     <el-table :border="showBorder" v-loading="loading" :size="size" ref="multipleTable"  @selection-change="handleSelectionChange"  :data="dataList" stripe header-row-class-name="tbl-header-class" :height="height"
               style="width: 100%;margin: 0px 0px;">
               style="width: 100%;margin: 0px 0px;">
-        <el-table-column v-if="showSelection && columns.length > 0"  type="selection" width="55" />
+        <el-table-column v-if="showSelection && columns.length > 0" align="center"  type="selection" width="55" />
         <el-table-column v-if="showIndex && columns.length > 0" type="index" :label="indexLabel" align="center" width="50"/>
         <el-table-column v-if="showIndex && columns.length > 0" type="index" :label="indexLabel" align="center" width="50"/>
 
 
         <el-table-column v-for="item in columns" :prop="item.prop" :label="item.label" :sortable="item.sortable  == undefined ? false : item.sortable"  :align="item.align == undefined ? 'center' : item.align "
         <el-table-column v-for="item in columns" :prop="item.prop" :label="item.label" :sortable="item.sortable  == undefined ? false : item.sortable"  :align="item.align == undefined ? 'center' : item.align "

@@ -152,7 +152,7 @@
                     </el-row>
                     </el-row>
                     <el-row v-if="flag" class="flex-div-start" style="margin-bottom: 10px;margin-top: 10px;padding-top:10px;border-top:1px solid #ebeef5" >
                     <el-row v-if="flag" class="flex-div-start" style="margin-bottom: 10px;margin-top: 10px;padding-top:10px;border-top:1px solid #ebeef5" >
                         <span>节点名称</span>
                         <span>节点名称</span>
-                        <el-input style="flex:1;margin-left:10px;"  class="margin-right-10" maxlength="50" v-model="nodeName" placeholder="输入节点名称" />
+                        <el-input style="flex:1;margin-left:10px;"  class="margin-right-10" maxlength="50" v-model.trim="nodeName" placeholder="输入节点名称" />
                     </el-row>
                     </el-row>
                     <el-row class="margin-bottom-50">
                     <el-row class="margin-bottom-50">
                         <el-col :span="24" :class="[{'table-height':!flag},{'table-height-45':flag}]">
                         <el-col :span="24" :class="[{'table-height':!flag},{'table-height-45':flag}]">