项目初始化

datax-ui/src/views/factory/dataset/DataSetAdd.vue

@@ -59,7 +59,11 @@
                     <draggable group="col" :list="dimensionList">
                       <div v-for="(item, index) in dimensionList" :key="index" class="draggable-item">
                         <el-tag>{{ item.label ? item.label + '(' + item.tag + ')' : item.tag }}</el-tag>
-                        <span class="draggable-item-handle"><i class="el-icon-edit-outline"></i></span>
+                        <span class="draggable-item-handle" v-if="item.input">
+                          <el-input size="mini" placeholder="请输入内容" v-model="item.label" @blur="handleDimensionDelTagLabel(index, item)">
+                          </el-input>
+                        </span>
+                        <span class="draggable-item-handle" v-else @click="handleDimensionTagLabel(index, item)"><i class="el-icon-edit-outline"></i></span>
                         <span class="draggable-item-handle" @click="handleDimensionTagClose(index, item)"><i class="el-icon-delete"></i></span>
                       </div>
                     </draggable>
@@ -73,7 +77,11 @@
                     <draggable group="col" :list="measureList">
                       <div v-for="(item, index) in measureList" :key="index" class="draggable-item">
                         <el-tag>{{ item.label ? item.label + '(' + item.tag + ')' : item.tag }}</el-tag>
-                        <span class="draggable-item-handle"><i class="el-icon-edit-outline"></i></span>
+                        <span class="draggable-item-handle" v-if="item.input">
+                          <el-input size="mini" placeholder="请输入内容" v-model="item.label" @blur="handleMeasureDelTagLabel(index, item)">
+                          </el-input>
+                        </span>
+                        <span class="draggable-item-handle" v-else @click="handleMeasureTagLabel(index, item)"><i class="el-icon-edit-outline"></i></span>
                         <span class="draggable-item-handle" @click="handleMeasureTagClose(index, item)"><i class="el-icon-delete"></i></span>
                       </div>
                     </draggable>
@@ -260,12 +268,24 @@ export default {
       })
     },
     handleDimensionTagClose (index, tag) {
-      this.dimensionList.splice(index, 1)
-      this.columnList.push(tag)
+        this.dimensionList.splice(index, 1)
+        this.columnList.push(tag)
     },
     handleMeasureTagClose (index, tag) {
-      this.measureList.splice(index, 1)
-      this.columnList.push(tag)
+        this.measureList.splice(index, 1)
+        this.columnList.push(tag)
+    },
+    handleDimensionTagLabel (index, tag) {
+        this.$set(this.dimensionList, index, Object.assign({}, tag, { input: true }))
+    },
+    handleDimensionDelTagLabel (index, tag) {
+        this.$delete(tag, 'input')
+    },
+    handleMeasureTagLabel (index, tag) {
+        this.$set(this.measureList, index, Object.assign({}, tag, { input: true }))
+    },
+    handleMeasureDelTagLabel (index, tag) {
+        this.$delete(tag, 'input')
     },
     dataPreview () {
       if (!this.form.sourceId) {
@@ -347,7 +367,8 @@ export default {
   cursor: move;
 }
 .draggable-item {
-  margin: 0 5px;
+  cursor: move;
+  margin: 5px 5px;
   display: inline-block;
   border: 1px solid #ebecef;
   height: 32px;

datax-ui/src/views/factory/dataset/DataSetDetail.vue

@@ -260,7 +260,8 @@ export default {
   cursor: move;
 }
 .draggable-item {
-  margin: 0 5px;
+  cursor: move;
+  margin: 5px 5px;
   display: inline-block;
   border: 1px solid #ebecef;
   height: 32px;

datax-ui/src/views/factory/dataset/DataSetEdit.vue

@@ -59,7 +59,11 @@
                     <draggable group="col" :list="dimensionList">
                       <div v-for="(item, index) in dimensionList" :key="index" class="draggable-item">
                         <el-tag>{{ item.label ? item.label + '(' + item.tag + ')' : item.tag }}</el-tag>
-                        <span class="draggable-item-handle"><i class="el-icon-edit-outline"></i></span>
+                        <span class="draggable-item-handle" v-if="item.input">
+                          <el-input size="mini" placeholder="请输入内容" v-model="item.label" @blur="handleDimensionDelTagLabel(index, item)">
+                          </el-input>
+                        </span>
+                        <span class="draggable-item-handle" v-else @click="handleDimensionTagLabel(index, item)"><i class="el-icon-edit-outline"></i></span>
                         <span class="draggable-item-handle" @click="handleDimensionTagClose(index, item)"><i class="el-icon-delete"></i></span>
                       </div>
                     </draggable>
@@ -73,7 +77,11 @@
                     <draggable group="col" :list="measureList">
                       <div v-for="(item, index) in measureList" :key="index" class="draggable-item">
                         <el-tag>{{ item.label ? item.label + '(' + item.tag + ')' : item.tag }}</el-tag>
-                        <span class="draggable-item-handle"><i class="el-icon-edit-outline"></i></span>
+                        <span class="draggable-item-handle" v-if="item.input">
+                          <el-input size="mini" placeholder="请输入内容" v-model="item.label" @blur="handleMeasureDelTagLabel(index, item)">
+                          </el-input>
+                        </span>
+                        <span class="draggable-item-handle" v-else @click="handleMeasureTagLabel(index, item)"><i class="el-icon-edit-outline"></i></span>
                         <span class="draggable-item-handle" @click="handleMeasureTagClose(index, item)"><i class="el-icon-delete"></i></span>
                       </div>
                     </draggable>
@@ -282,6 +290,18 @@ export default {
       this.measureList.splice(index, 1)
       this.columnList.push(tag)
     },
+    handleDimensionTagLabel (index, tag) {
+      this.$set(this.dimensionList, index, Object.assign({}, tag, { input: true }))
+    },
+    handleDimensionDelTagLabel (index, tag) {
+      this.$delete(tag, 'input')
+    },
+    handleMeasureTagLabel (index, tag) {
+      this.$set(this.measureList, index, Object.assign({}, tag, { input: true }))
+    },
+    handleMeasureDelTagLabel (index, tag) {
+        this.$delete(tag, 'input')
+    },
     dataPreview () {
       if (!this.form.sourceId) {
         return
@@ -362,7 +382,8 @@ export default {
   cursor: move;
 }
 .draggable-item {
-  margin: 0 5px;
+  cursor: move;
+  margin: 5px 5px;
   display: inline-block;
   border: 1px solid #ebecef;
   height: 32px;

datax-ui/src/views/factory/datasource/DataSourceAdd.vue

@@ -50,7 +50,7 @@
                 <el-form-item label="服务名" prop="sid" v-if="form.dbType === '3' || form.dbType === '4'">
                   <el-input v-model="form2.sid" placeholder="请输入服务名" />
                 </el-form-item>
-                <el-form-item label="数据库" prop="dbName" v-if="form.dbType !== '3' || form.dbType !== '4'">
+                <el-form-item label="数据库" prop="dbName" v-if="form.dbType !== '3' && form.dbType !== '4'">
                   <el-input v-model="form2.dbName" placeholder="请输入数据库" />
                 </el-form-item>
                 <el-form-item label="用户名" prop="username">
@@ -138,6 +138,9 @@ export default {
         port: [
           { required: true, message: '端口不能为空', trigger: 'blur' }
         ],
+        sid: [
+          { required: true, message: '服务名不能为空', trigger: 'blur' }
+        ],
         dbName: [
           { required: true, message: '数据库不能为空', trigger: 'blur' }
         ],

datax-ui/src/views/factory/datasource/DataSourceEdit.vue

@@ -50,7 +50,7 @@
               <el-form-item label="服务名" prop="sid" v-if="form.dbType === '3' || form.dbType === '4'">
                 <el-input v-model="form2.sid" placeholder="请输入服务名" />
               </el-form-item>
-              <el-form-item label="数据库" prop="dbName" v-if="form.dbType !== '3' || form.dbType !== '4'">
+              <el-form-item label="数据库" prop="dbName" v-if="form.dbType !== '3' && form.dbType !== '4'">
                 <el-input v-model="form2.dbName" placeholder="请输入数据库" />
               </el-form-item>
               <el-form-item label="用户名" prop="username">
@@ -124,6 +124,9 @@ export default {
         port: [
           { required: true, message: '端口不能为空', trigger: 'blur' }
         ],
+        sid: [
+          { required: true, message: '服务名不能为空', trigger: 'blur' }
+        ],
         dbName: [
           { required: true, message: '数据库不能为空', trigger: 'blur' }
         ],