Procházet zdrojové kódy

Merge branch 'dataType' of git.sagacloud.cn:web/adm into dataType

zhangyu před 4 roky
rodič
revize
d16e996384

+ 2 - 2
src/components/ready/buildfloor/addBuild.vue

@@ -30,12 +30,12 @@
             <el-input
               :disabled="!item.editable"
               v-if="item.dataType == 'STRING'"
-              v-model="form[item.Path]"/>
+              v-model.trim="form[item.Path]"/>
 
             <el-input
               v-else-if="item.dataType == 'INTEGER' || item.dataType == 'DOUBLE'"
               type="number"
-              v-model="form[item.Path]">
+              v-model.trim="form[item.Path]">
               <template slot="append" v-if="item.Unit">{{ item.Unit }}</template>
             </el-input>
 

+ 7 - 7
src/components/ready/buildfloor/formItems.vue

@@ -9,13 +9,13 @@
           :class="{FloorTypeSelect:item.dataType == 'ENUM'||item.unit}">
 
           <el-input
-            v-model="form[item.path]"
+            v-model.trim="form[item.path]"
             v-if="item.infoPointCode == 'bimLocation' || item.infoPointCode =='modelId'"
             disabled/>
 
           <!--二维码相关-->
           <span v-else-if="item.infoPointCode == 'DefaultQRCode' ">
-            <el-input v-if="!form[item.path]" v-model="form[item.path]" disabled/>
+            <el-input v-if="!form[item.path]" v-model.trim="form[item.path]" disabled/>
             <el-popover v-else placement="right" width="210" trigger="click">
               <div style="overflow:hidden;">
                 <img
@@ -28,7 +28,7 @@
           </span>
 
           <span v-else-if="item.infoPointCode == 'QRCodePic' ">
-            <el-input v-if="!form[item.path]" v-model="form[item.path]" disabled/>
+            <el-input v-if="!form[item.path]" v-model.trim="form[item.path]" disabled/>
             <el-popover v-else placement="right" width="210" trigger="click">
               <div style="overflow:hidden;">
                 <img
@@ -42,7 +42,7 @@
 
           <!--/二维码相关-->
           <span v-else-if="item.dataType == 'STRING'">
-            <el-input v-model="form[item.path]"
+            <el-input v-model.trim="form[item.path]"
                       :disabled="!item.editable"
                       :placeholder="(item.dataType == 'STRING' && item.path==='localId') ? '填写示例:F1、B1?':'' "/>
               <div v-if="item.dataType == 'STRING' && item.path==='localId' && isShowTitle"
@@ -51,7 +51,7 @@
               </div>
           </span>
 
-          <el-input v-model="form[item.path]" v-else-if="item.dataType == 'INTEGER'||item.dataType == 'DOUBLE'"
+          <el-input v-model.trim="form[item.path]" v-else-if="item.dataType == 'INTEGER'||item.dataType == 'DOUBLE'"
                     type="number">
             <template slot="append" v-if="item.unit">{{ item.unit }}</template>
           </el-input>
@@ -59,14 +59,14 @@
           <el-select v-model="form[item.path]" placeholder="请选择" v-else-if="item.dataType == 'ENUM'">
             <el-option v-for="op in item.options" :key="op.code" :label="op.name" :value="op.code"></el-option>
           </el-select>
-          <el-input v-model="form[item.path]" v-else :placeholder="item.dataType?'':'字典无输入类型'"></el-input>
+          <el-input v-model.trim="form[item.path]" v-else :placeholder="item.dataType?'':'字典无输入类型'"></el-input>
         </el-form-item>
       </div>
     </el-form>
   </div>
 </template>
 <script>
-import { getDataDictionary } from "@/api/dict";
+import {getDataDictionary} from "@/api/dict";
 
 export default {
   props: {