项目初始化

datax-modules/data-factory-service-parent/data-factory-service-api/src/main/java/cn/datax/service/data/factory/api/dto/ColumnParse.java

@@ -9,6 +9,6 @@ public class ColumnParse implements Serializable {
 
     private static final long serialVersionUID=1L;
 
-    private String tag;
-    private String label;
+    private String col;
+    private String alias;
 }

datax-ui/src/views/chartboard/chart/make.vue

@@ -46,7 +46,7 @@
             <el-divider content-position="left">行维</el-divider>
             <el-col>
               <div class="draggable-wrapper">
-                <draggable :options="{sort: false, ghostClass: 'ghost', group: {name: 'dimensions'}}" v-model="form.keys">
+                <draggable group="dimensions" :list="form.keys">
                   <el-tag v-for="(item, index) in form.keys" :key="index" class="draggable-item" closable @close="handleKeyTagClose(index, item)">
                     {{ item.alias ? item.alias : item.col }}
                   </el-tag>
@@ -58,7 +58,7 @@
             <el-divider content-position="left">列维</el-divider>
             <el-col>
               <div class="draggable-wrapper">
-                <draggable :options="{sort: false, ghostClass: 'ghost', group: {name: 'dimensions'}}" v-model="form.groups">
+                <draggable group="dimensions" :list="form.groups">
                   <el-tag v-for="(item, index) in form.groups" :key="index" class="draggable-item" closable @close="handleGroupTagClose(index, item)">
                     {{ item.alias ? item.alias : item.col }}
                   </el-tag>
@@ -70,17 +70,16 @@
             <el-divider content-position="left">指标</el-divider>
             <el-col>
               <div class="draggable-wrapper">
-                <draggable :options="{sort: false, ghostClass: 'ghost', group: {name: 'measures'}}" v-model="form.values" @change="handleValueDragChange">
+                <draggable group="measures" :list="form.values" @change="handleValueDragChange">
                   <div v-for="(item, index) in form.values" :key="index" class="draggable-item">
-<!--                    <el-tag>{{ item.alias ? item.alias : item.col }}</el-tag>-->
                     <el-tag>{{ item.alias ? item.aggregate_type + '(' + item.col + ') -> ' + item.alias : item.aggregate_type + '(' + item.col + ')' }}</el-tag>
                     <span class="draggable-item-handle" v-if="item.radio">
                       <el-radio-group size="mini" v-model="item.aggregate_type" @change="((label)=>{handleValueChangeTagType(label, index, item)})">
-                        <el-radio label="sum">求和</el-radio>
-                        <el-radio label="count">计数</el-radio>
-                        <el-radio label="avg">平均值</el-radio>
-                        <el-radio label="max">最大值</el-radio>
-                        <el-radio label="min">最小值</el-radio>
+                        <el-radio label="sum" size="mini">求和</el-radio>
+                        <el-radio label="count" size="mini">计数</el-radio>
+                        <el-radio label="avg" size="mini">平均值</el-radio>
+                        <el-radio label="max" size="mini">最大值</el-radio>
+                        <el-radio label="min" size="mini">最小值</el-radio>
                       </el-radio-group>
                     </span>
                     <span class="draggable-item-handle" v-else @click="handleValueTagType(index, item)"><i class="el-icon-edit-outline"></i></span>
@@ -177,15 +176,14 @@ export default {
     },
     handleValueDragChange (tag) {
       if (tag.added) {
-        this.$set(tag, 'aggregate_type', 'sum')
+        this.$set(tag.added.element, 'aggregate_type', 'sum')
       }
     },
     handleValueChangeTagType (label, index, tag) {
       this.$delete(tag, 'radio')
     },
     handleValueTagType (index, tag) {
-      this.$set(this.measures, index, Object.assign({}, tag, { radio: true }))
-      // this.$set(this.measures, index, Object.assign({}, tag, { radio: true, aggregate_type: 'sum' }))
+      this.$set(tag, 'radio', true)
     },
     handleValueTagClose (index, tag) {
       this.form.values.splice(index, 1)

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

@@ -63,7 +63,7 @@
                           <el-input size="mini" placeholder="请输入内容" v-model="item.alias" @blur="handleDelTagLabel(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" v-else @click="handleTagLabel(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>
@@ -81,7 +81,7 @@
                           <el-input size="mini" placeholder="请输入内容" v-model="item.alias" @blur="handleDelTagLabel(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" v-else @click="handleTagLabel(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>
@@ -268,23 +268,20 @@ export default {
       })
     },
     handleDimensionTagClose (index, tag) {
-        this.dimensionList.splice(index, 1)
-        tag.alias = ''
-        this.columnList.push(tag)
+      this.dimensionList.splice(index, 1)
+      tag.alias = ''
+      this.columnList.push(tag)
     },
     handleMeasureTagClose (index, tag) {
-        this.measureList.splice(index, 1)
-        tag.alias = ''
-        this.columnList.push(tag)
+      this.measureList.splice(index, 1)
+      tag.alias = ''
+      this.columnList.push(tag)
     },
-    handleDimensionTagLabel (index, tag) {
-        this.$set(this.dimensionList, index, Object.assign({}, tag, { input: true }))
-    },
-    handleMeasureTagLabel (index, tag) {
-        this.$set(this.measureList, index, Object.assign({}, tag, { input: true }))
+    handleTagLabel (index, tag) {
+      this.$set(tag, 'input', true)
     },
     handleDelTagLabel (index, tag) {
-        this.$delete(tag, 'input')
+      this.$delete(tag, 'input')
     },
     dataPreview () {
       if (!this.form.sourceId) {

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

@@ -63,7 +63,7 @@
                           <el-input size="mini" placeholder="请输入内容" v-model="item.alias" @blur="handleDelTagLabel(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" v-else @click="handleTagLabel(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>
@@ -81,7 +81,7 @@
                           <el-input size="mini" placeholder="请输入内容" v-model="item.alias" @blur="handleDelTagLabel(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" v-else @click="handleTagLabel(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>
@@ -292,11 +292,8 @@ export default {
       tag.alias = ''
       this.columnList.push(tag)
     },
-    handleDimensionTagLabel (index, tag) {
-      this.$set(this.dimensionList, index, Object.assign({}, tag, { input: true }))
-    },
-    handleMeasureTagLabel (index, tag) {
-      this.$set(this.measureList, index, Object.assign({}, tag, { input: true }))
+    handleTagLabel (index, tag) {
+      this.$set(tag, 'input', true)
     },
     handleDelTagLabel (index, tag) {
       this.$delete(tag, 'input')