Merge remote-tracking branch 'origin/master'

src/views/emport/field/index.vue

@@ -55,8 +55,9 @@
                     <el-input v-model="metaFieldDialog.data.fieldName" size="small"/>
                 </el-form-item>
                 <el-form-item label="字段类型" prop="fieldType" required>
-                    <el-select v-model="metaFieldDialog.data.fieldType" size="small" style="width: 160px">
-                    </el-select>
+                    <el-input v-model="metaFieldDialog.data.fieldType" size="small" placeholder="例如 VARCHAR2(64) ,NUMBER(8,1), DATE(7)等等"/>
+<!--                    <el-select v-model="metaFieldDialog.data.fieldType" size="small" style="width: 160px">
+                    </el-select>-->
                 </el-form-item>
                 <el-form-item label="指标名称" prop="fieldComment" required>
                     <el-input v-model="metaFieldDialog.data.fieldComment" size="small"/>