Merge remote-tracking branch 'origin/main' into main

2021-06-04 15:47:48 +08:00 · 2021-06-04 15:47:48 +08:00 · 264032f9a4
commit 264032f9a4
parent e0136d7530 4db81f9d85
15 changed files with 71 additions and 42 deletions
--- 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: '',
--- 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: '',
--- 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: '',
--- 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: '',
--- 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: '',
--- 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: '',
--- 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: '',
--- 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: '',
--- 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: '',
--- 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',
--- 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: '數據源',
--- 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: '数据源',
--- 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,
--- 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" />
--- 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() {