Merge pull request #5032 from dataease/v1.18.6-rc1

V1.18.6 rc1
2023-04-14 11:17:07 +08:00 · 2023-04-14 11:17:07 +08:00 · 0c34c473de
commit 0c34c473de
parent 5f60347adc 698dc63c5b
15 changed files with 70 additions and 34 deletions
--- a/backend/src/main/java/io/dataease/commons/utils/ExcelUtils.java
+++ b/backend/src/main/java/io/dataease/commons/utils/ExcelUtils.java
@ -8,6 +8,8 @@ import io.dataease.commons.model.excel.ExcelSheetModel;

 import java.util.List;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;

 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@ -29,6 +31,9 @@ public class ExcelUtils {
            List<List<String>> details = sheet.getData();
            details.add(0, sheet.getHeads());
            String sheetName = sheet.getSheetName();
+            Pattern pattern = Pattern.compile("[\\s\\\\/:\\*\\?\\\"<>\\|]");
+            Matcher matcher = pattern.matcher(sheetName);
+            sheetName = matcher.replaceAll("-");
            Sheet curSheet = wb.createSheet(sheetName);
            if (StringUtils.isBlank(fileName)) {
                String cName = sheetName + suffix;
--- a/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java
+++ b/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java
@ -63,7 +63,7 @@ public class ViewExportExcel {
        String panelStyle = panelDto.getPanelStyle();
        Map map = gson.fromJson(panelStyle, Map.class);
        Map panelMap = (LinkedTreeMap) map.get("panel");
-        double resultCount = Double.parseDouble(panelMap.get("resultCount").toString());
+        double resultCount = ObjectUtils.isEmpty(panelMap.get("resultCount")) ? 1000 : Double.parseDouble(panelMap.get("resultCount").toString());
        String resultMode = null;
        if (ObjectUtils.isNotEmpty(panelMap.get("resultMode"))) {
            resultMode = panelMap.get("resultMode").toString();
--- a/frontend/src/components/canvas/customComponent/UserView.vue
+++ b/frontend/src/components/canvas/customComponent/UserView.vue
@ -141,7 +141,7 @@
        style="position: absolute;right: 70px;top:15px"
      >
        <el-button
-          v-if="showChartInfoType==='enlarge' && hasDataPermission('export',panelInfo.privileges)&& showChartInfo && showChartInfo.type !== 'symbol-map'"
+          v-if="showChartInfoType==='enlarge' && hasDataPermission('export',panelInfo.privileges)&& showChartInfo && !equalsAny(showChartInfo.type, 'symbol-map', 'flow-map')"
          class="el-icon-picture-outline"
          size="mini"
          :disabled="imageDownloading"
@ -218,6 +218,7 @@ import Vue from 'vue'
 import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter'
 import UserViewDialog from '@/components/canvas/customComponent/UserViewDialog'
 import UserViewMobileDialog from '@/components/canvas/customComponent/UserViewMobileDialog'
+import { equalsAny } from '@/utils/StringUtils'

 export default {
  name: 'UserView',
@ -577,6 +578,7 @@ export default {
    }
  },
  methods: {
+    equalsAny,
    tabSwitch(tabCanvasId) {
      if (this.charViewS2ShowFlag && tabCanvasId === this.canvasId && this.$refs[this.element.propValue.id]) {
        this.$refs[this.element.propValue.id].chartResize()
--- a/frontend/src/icons/svg/buddle-map.svg
+++ b/frontend/src/icons/svg/buddle-map.svg
--- a/frontend/src/icons/svg/buddle-map_mini.svg
+++ b/frontend/src/icons/svg/buddle-map_mini.svg
--- a/frontend/src/icons/svg/map.svg
+++ b/frontend/src/icons/svg/map.svg
--- a/frontend/src/icons/svg/map_mini.svg
+++ b/frontend/src/icons/svg/map_mini.svg
--- a/frontend/src/views/chart/chart/common/common_antv.js
+++ b/frontend/src/views/chart/chart/common/common_antv.js
@ -364,7 +364,7 @@ export function getTooltip(chart) {
                  res = valueFormatter(param.value, formatterItem)
                }
              }
-            } else if (includesAny(chart.type, 'bar', 'line', 'scatter', 'radar', 'area') && !chart.type.includes('group')) {
+            } else if (includesAny(chart.type, 'bar', 'scatter', 'radar', 'area') && !chart.type.includes('group')) {
              obj = { name: param.category, value: param.value }
              for (let i = 0; i < yAxis.length; i++) {
                const f = yAxis[i]
@ -377,6 +377,20 @@ export function getTooltip(chart) {
                  break
                }
              }
+            } else if (chart.type === 'line') {
+              obj = { name: param.category, value: param.value }
+              const xAxisExt = JSON.parse(chart.xaxisExt)
+              for (let i = 0; i < yAxis.length; i++) {
+                const f = yAxis[i]
+                if (f.name === param.category || (yAxis.length && xAxisExt.length)) {
+                  if (f.formatterCfg) {
+                    res = valueFormatter(param.value, f.formatterCfg)
+                  } else {
+                    res = valueFormatter(param.value, formatterItem)
+                  }
+                  break
+                }
+              }
            } else if (chart.type.includes('group')) {
              if (chart.type === 'bar-group') {
                obj = { name: param.category, value: param.value }
--- a/frontend/src/views/chart/chart/util.js
+++ b/frontend/src/views/chart/chart/util.js
@ -3220,7 +3220,7 @@ export const TYPE_CONFIGS = [
    category: 'chart.chart_type_space',
    value: 'map',
    title: 'chart.chart_map',
-    icon: 'map',
+    icon: 'map_mini',
    properties: [
      'color-selector',
      'label-selector',
@ -3367,19 +3367,21 @@ export function getColors(chart, colors, reset) {
    }
  } else if (equalsAny(chart.type, 'bar-group', 'line')) {
    // 拿到data中的category，并去重，然后构建seriesColor
-    const data = chart.data.data
-    const s = []
-    data.forEach((cur) => {
-      if (s.indexOf(cur.category) < 0) {
-        s.push(cur.category)
-      }
-    })
-    for (let i = 0; i < s.length; i++) {
-      seriesColors.push({
-        name: s[i],
-        color: colors[i % colors.length],
-        isCustom: false
+    if (chart.data) {
+      const data = chart.data.data
+      const s = []
+      data.forEach((cur) => {
+        if (s.indexOf(cur.category) < 0) {
+          s.push(cur.category)
+        }
      })
+      for (let i = 0; i < s.length; i++) {
+        seriesColors.push({
+          name: s[i],
+          color: colors[i % colors.length],
+          isCustom: false
+        })
+      }
    }
  } else {
    if (chart.data) {
--- a/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue
+++ b/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue
@ -243,7 +243,7 @@ export default {
    fieldOptions() {
      const xaxis = this.view.xaxis
      const yaxis = this.view.yaxis
-      const locationIds = this.view.viewFields.filter(item => item.busiType === 'locationXaxis' || item.busiType === 'locationYaxis').map(item => item.id)
+      const locationIds = this.view.viewFields ? this.view.viewFields.filter(item => item.busiType === 'locationXaxis' || item.busiType === 'locationYaxis').map(item => item.id) : []
      const xIds = xaxis ? xaxis.map(item => item.id) : []
      const yIds = yaxis ? yaxis.map(item => item.id) : []
      const disableIds = [...xIds, ...yIds, ...locationIds]
--- a/frontend/src/views/chart/view/ChartType.vue
+++ b/frontend/src/views/chart/view/ChartType.vue
@ -19,7 +19,6 @@
            v-for="(item, idx) in container"
            :key="idx"
            style="position: relative;display: block;"
-            :style="{'top': item.isPlugin ? '5px' : '0'}"
          >
            <el-radio
              v-if="item.placeholder"
--- a/frontend/src/views/dataset/Form.vue
+++ b/frontend/src/views/dataset/Form.vue
@ -1,6 +1,6 @@
 <template>
  <div class="de-dataset-form">
-    <div class="top">
+    <div class="top" v-loading="loading">
      <span class="name">
        <i
          class="el-icon-arrow-left"
@ -43,7 +43,6 @@
        <deBtn
          :disabled="['db', 'excel', 'api'].includes(datasetType) && !tableNum"
          type="primary"
-          :loading="loading"
          @click="datasetSave"
        >{{
          $t('commons.save')
@ -58,6 +57,7 @@
        :origin-name="originName"
        :name-list="nameList"
        @setTableNum="(val) => (tableNum = val)"
+        @datasourceLoading="(val) => loading = val"
      />
    </div>
  </div>
@ -80,9 +80,9 @@ export default {
    return {
      originName: '',
      tableNum: 0,
+      loading: false,
      showInput: false,
      editType: '',
-      loading: false,
      selectDatasets: [],
      tData: [],
      datasetType: '',
@ -185,7 +185,6 @@ export default {
          return
        }
      }
-      this.loading = true
      this.$refs.addDataset.save()
    },
    handleClick() {
@ -219,6 +218,7 @@ export default {
      )
    },
    initTable(id) {
+      this.loading = true
      post('/dataset/table/getWithPermission/' + id, null)
        .then((response) => {
          const { sceneId: id, id: tableId, name } = response.data || {}
@ -234,7 +234,10 @@ export default {
            this.table.editType = +this.editType
          }
        })
-        .catch(() => {})
+        .catch(() => { })
+        .finally(() => {
+          this.loading = false
+        })
    },
    switchComponent(c) {
      switch (c) {
--- a/frontend/src/views/dataset/add/AddSQL.vue
+++ b/frontend/src/views/dataset/add/AddSQL.vue
@ -905,6 +905,7 @@ export default {
    initTableInfo() {
      const tableId = this.param.tableId || this.$route.query.id
      if (tableId) {
+        this.$emit('datasourceLoading', true)
        getTable(tableId).then((response) => {
          const table = response.data
          this.dataSource = table.dataSourceId
@ -919,6 +920,8 @@ export default {
            ).sql
          }
          this.variables = JSON.parse(table.sqlVariableDetails)
+        }).finally(() => {
+          this.$emit('datasourceLoading', false)
        })
      }
    },
--- a/frontend/src/views/dataset/data/FieldEdit.vue
+++ b/frontend/src/views/dataset/data/FieldEdit.vue
@ -722,6 +722,7 @@
      :visible.sync="editCalcField"
      class="de-dialog-form de-center-dialog"
      width="980px"
+      :before-close="closeCalcField"
      :title="
        currEditField.id
          ? $t('dataset.edit_calc_field')
@ -730,6 +731,7 @@
      append-to-body
    >
      <calc-field-edit
+        ref="calcFieldEdit"
        :param="param"
        :table-fields="tableFields"
        :field="currEditField"
@ -893,6 +895,7 @@ export default {

    closeCalcField() {
      this.editCalcField = false
+      this.$refs.calcFieldEdit.resetField()
      this.initField()
    },

--- a/frontend/src/views/system/user/UserEditer.vue
+++ b/frontend/src/views/system/user/UserEditer.vue
@ -420,8 +420,11 @@ export default {
        return
      }
      const regep = new RegExp(/^1[3-9]\d{9}$/)
-
-      if (!regep.test(value)) {
+      let phoneNumber = value
+      if (value.length > 3 && value.startsWith('+86')) {
+        phoneNumber = value.substr(3)
+      }
+      if (!regep.test(phoneNumber)) {
        const msg = this.$t('user.phone_format')
        callback(new Error(msg))
      } else {