From 72e30a8c93d04dfbdc133c2041e6ae81e9161194 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 4 Jun 2021 14:43:05 +0800
Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E7=BB=84=E4=BB=B6=E9=BB=98=E8=AE=A4=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/widget/serviceImpl/ButtonSureServiceImpl.js  | 2 +-
 .../components/widget/serviceImpl/NumberSelectServiceImpl.js    | 2 +-
 .../src/components/widget/serviceImpl/TextInputServiceImpl.js   | 2 +-
 .../src/components/widget/serviceImpl/TextSelectServiceImpl.js  | 2 +-
 .../components/widget/serviceImpl/TimeDateRangeServiceImpl.js   | 2 +-
 .../src/components/widget/serviceImpl/TimeDateServiceImpl.js    | 2 +-
 .../src/components/widget/serviceImpl/TimeMonthServiceImpl.js   | 2 +-
 .../src/components/widget/serviceImpl/TimeQuarterServiceImpl.js | 2 +-
 .../src/components/widget/serviceImpl/TimeYearServiceImpl.js    | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/widget/serviceImpl/ButtonSureServiceImpl.js b/frontend/src/components/widget/serviceImpl/ButtonSureServiceImpl.js
index c14bfd0801..f09e501732 100644
--- a/frontend/src/components/widget/serviceImpl/ButtonSureServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/ButtonSureServiceImpl.js
@@ -10,7 +10,7 @@ const drawPanel = {
   type: 'custom',
   style: {
     width: 300,
-    height: 35,
+    height: 47,
     fontSize: 14,
     fontWeight: 500,
     lineHeight: '',
diff --git a/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js b/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js
index 96326c80ca..71069364de 100644
--- a/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js
@@ -26,7 +26,7 @@ const drawPanel = {
   type: 'custom',
   style: {
     width: 300,
-    height: 35,
+    height: 47,
     fontSize: 14,
     fontWeight: 500,
     lineHeight: '',
diff --git a/frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js b/frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js
index c3de32cb38..763c1b54e3 100644
--- a/frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js
@@ -22,7 +22,7 @@ const drawPanel = {
   type: 'custom',
   style: {
     width: 300,
-    height: 35,
+    height: 47,
     fontSize: 14,
     fontWeight: 500,
     lineHeight: '',
diff --git a/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js b/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js
index 48f8f81b53..61d378baea 100644
--- a/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js
@@ -27,7 +27,7 @@ const drawPanel = {
   type: 'custom',
   style: {
     width: 300,
-    height: 35,
+    height: 47,
     fontSize: 14,
     fontWeight: 500,
     lineHeight: '',
diff --git a/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js
index 9fe15ef3f0..5c6f574448 100644
--- a/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js
@@ -24,7 +24,7 @@ const drawPanel = {
   type: 'custom',
   style: {
     width: 300,
-    height: 35,
+    height: 47,
     fontSize: 14,
     fontWeight: 500,
     lineHeight: '',
diff --git a/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js
index b2a0385052..1e48393ed9 100644
--- a/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js
@@ -22,7 +22,7 @@ const drawPanel = {
   type: 'custom',
   style: {
     width: 300,
-    height: 35,
+    height: 47,
     fontSize: 14,
     fontWeight: 500,
     lineHeight: '',
diff --git a/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js
index 928eacae3e..beea3d0b01 100644
--- a/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js
@@ -22,7 +22,7 @@ const drawPanel = {
   type: 'custom',
   style: {
     width: 300,
-    height: 35,
+    height: 47,
     fontSize: 14,
     fontWeight: 500,
     lineHeight: '',
diff --git a/frontend/src/components/widget/serviceImpl/TimeQuarterServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeQuarterServiceImpl.js
index afa531ed46..d03dc41d49 100644
--- a/frontend/src/components/widget/serviceImpl/TimeQuarterServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeQuarterServiceImpl.js
@@ -20,7 +20,7 @@ const drawPanel = {
   type: 'custom',
   style: {
     width: 300,
-    height: 35,
+    height: 47,
     fontSize: 14,
     fontWeight: 500,
     lineHeight: '',
diff --git a/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js
index 042a9a945a..3eb7836690 100644
--- a/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js
@@ -22,7 +22,7 @@ const drawPanel = {
   type: 'custom',
   style: {
     width: 300,
-    height: 35,
+    height: 47,
     fontSize: 14,
     fontWeight: 500,
     lineHeight: '',

From fb07c111c5a30c6c4258a19e8aa8e46290e52568 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 4 Jun 2021 15:11:06 +0800
Subject: [PATCH 2/4] =?UTF-8?q?feat(fix):=E6=A8=A1=E7=89=88=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86form=E6=A0=A1=E9=AA=8Cfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/template/index.vue | 23 ++++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/frontend/src/views/panel/template/index.vue b/frontend/src/views/panel/template/index.vue
index 41b19b0b0f..01ec18bf26 100644
--- a/frontend/src/views/panel/template/index.vue
+++ b/frontend/src/views/panel/template/index.vue
@@ -139,17 +139,24 @@ export default {
       this.showTemplateEditDialog('edit', templateInfo)
     },
     saveTemplateEdit(templateEditForm) {
-      save(templateEditForm).then(response => {
-        this.$message({
-          message: this.$t('commons.save_success'),
-          type: 'success',
-          showClose: true
-        })
-        this.editTemplate = false
-        this.getTree()
+      this.$refs['templateEditForm'].validate((valid) => {
+        if (valid) {
+          save(templateEditForm).then(response => {
+            this.close()
+            this.$message({
+              message: this.$t('commons.save_success'),
+              type: 'success',
+              showClose: true
+            })
+            this.getTree()
+          })
+        } else {
+          return false
+        }
       })
     },
     close() {
+      this.$refs['templateEditForm'].resetFields()
       this.editTemplate = false
     },
     getTree() {

From 8e272cf85ab43aaef5e751817fffb439fbd044f5 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 4 Jun 2021 15:14:29 +0800
Subject: [PATCH 3/4] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=E5=85=88=E5=BC=BA?=
 =?UTF-8?q?=E5=88=B6=E5=B1=95=E7=A4=BAecharts=20y=E8=BD=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/chart/chart.js | 42 ++++++++++++-------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index 5710602587..f4a9a12c7f 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -104,9 +104,9 @@ export const BASE_BAR = {
       fontWeight: 'normal'
     }
   },
-  // grid: {
-  //   containLabel: true
-  // },
+  grid: {
+    containLabel: true
+  },
   tooltip: {},
   legend: {
     show: true,
@@ -136,9 +136,9 @@ export const HORIZONTAL_BAR = {
       fontWeight: 'normal'
     }
   },
-  // grid: {
-  //   containLabel: true
-  // },
+  grid: {
+    containLabel: true
+  },
   tooltip: {},
   legend: {
     show: true,
@@ -169,9 +169,9 @@ export const BASE_LINE = {
       fontWeight: 'normal'
     }
   },
-  // grid: {
-  //   containLabel: true
-  // },
+  grid: {
+    containLabel: true
+  },
   tooltip: {},
   legend: {
     show: true,
@@ -203,9 +203,9 @@ export const BASE_PIE = {
       fontWeight: 'normal'
     }
   },
-  // grid: {
-  //   containLabel: true
-  // },
+  grid: {
+    containLabel: true
+  },
   tooltip: {},
   legend: {
     show: true,
@@ -239,9 +239,9 @@ export const BASE_FUNNEL = {
       fontWeight: 'normal'
     }
   },
-  // grid: {
-  //   containLabel: true
-  // },
+  grid: {
+    containLabel: true
+  },
   tooltip: {
     trigger: 'item'
   },
@@ -298,9 +298,9 @@ export const BASE_RADAR = {
       fontWeight: 'normal'
     }
   },
-  // grid: {
-  //   containLabel: true
-  // },
+  grid: {
+    containLabel: true
+  },
   tooltip: {},
   legend: {
     show: true,
@@ -336,9 +336,9 @@ export const BASE_GAUGE = {
       fontWeight: 'normal'
     }
   },
-  // grid: {
-  //   containLabel: true
-  // },
+  grid: {
+    containLabel: true
+  },
   tooltip: {},
   legend: {
     show: true,

From 4db81f9d85632b33823175b16fa66589ddab213a Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 4 Jun 2021 15:34:11 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E9=9B=86):=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E5=AD=97=E6=AE=B5=E7=BC=96=E8=BE=91=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=8E=9F=E5=A7=8B=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                       |  3 ++-
 frontend/src/lang/tw.js                       |  3 ++-
 frontend/src/lang/zh.js                       |  3 ++-
 frontend/src/views/dataset/data/FieldEdit.vue | 21 ++++++++++++++++++-
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 593265b28b..dc2027d4c3 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -827,7 +827,8 @@ export default {
     edit_field: 'Edit Field',
     preview_100_data: 'Show 100 lines data',
     invalid_table_check: 'Please sync data first.',
-    parse_error: 'Parse Error'
+    parse_error: 'Parse Error',
+    origin_field_type: 'Origin Type'
   },
   datasource: {
     datasource: 'Data Source',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 39c0895cf3..128ede0771 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -827,7 +827,8 @@ export default {
     edit_field: '編輯自斷',
     preview_100_data: '顯示前100行數據',
     invalid_table_check: '非直連數據集請先完成數據同步',
-    parse_error: '解析錯誤'
+    parse_error: '解析錯誤',
+    origin_field_type: '原始類型'
   },
   datasource: {
     datasource: '數據源',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 3f1a919644..c1791c934c 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -827,7 +827,8 @@ export default {
     edit_field: '编辑字段',
     preview_100_data: '显示前100行数据',
     invalid_table_check: '非直连数据集请先完成数据同步',
-    parse_error: '解析错误'
+    parse_error: '解析错误',
+    origin_field_type: '原始类型'
   },
   datasource: {
     datasource: '数据源',
diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue
index d3be80d2f7..60bd2f0e42 100644
--- a/frontend/src/views/dataset/data/FieldEdit.vue
+++ b/frontend/src/views/dataset/data/FieldEdit.vue
@@ -12,7 +12,7 @@
     </el-row>
     <el-divider />
     <el-table :data="tableFields" size="mini" :max-height="maxHeight">
-      <el-table-column property="type" :label="$t('dataset.field_type')" width="180">
+      <el-table-column property="deType" :label="$t('dataset.field_type')" width="140">
         <template slot-scope="scope">
           <el-select v-model="scope.row.deType" size="mini" style="display: inline-block;width: 26px;">
             <el-option
@@ -46,6 +46,25 @@
           </span>
         </template>
       </el-table-column>
+      <el-table-column property="deExtractType" :label="$t('dataset.origin_field_type')" width="140">
+        <template slot-scope="scope">
+          <span>
+            <span v-if="scope.row.deExtractType === 0">
+              <svg-icon v-if="scope.row.deExtractType === 0" icon-class="field_text" class="field-icon-text" />
+              <span class="field-class">{{ $t('dataset.text') }}</span>
+            </span>
+            <span v-if="scope.row.deExtractType === 1">
+              <svg-icon v-if="scope.row.deExtractType === 1" icon-class="field_time" class="field-icon-time" />
+              <span class="field-class">{{ $t('dataset.time') }}</span>
+            </span>
+            <span v-if="scope.row.deExtractType === 2 || scope.row.deExtractType === 3">
+              <svg-icon v-if="scope.row.deExtractType === 2 || scope.row.deExtractType === 3" icon-class="field_value" class="field-icon-value" />
+              <span v-if="scope.row.deExtractType === 2" class="field-class">{{ $t('dataset.value') }}</span>
+              <span v-if="scope.row.deExtractType === 3" class="field-class">{{ $t('dataset.value') + '(' + $t('dataset.float') + ')' }}</span>
+            </span>
+          </span>
+        </template>
+      </el-table-column>
       <el-table-column property="name" :label="$t('dataset.field_name')" width="180">
         <template slot-scope="scope">
           <el-input v-model="scope.row.name" size="mini" />