From 718585f3a069a9d5aa7618a07469fbad0b6a0773 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Sat, 28 May 2022 10:49:49 +0800
Subject: [PATCH 01/17] =?UTF-8?q?fix:=20excel=20=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E3=80=81=E8=BF=BD=E5=8A=A0=E4=B8=8D=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/dataset/DataSetTableService.java | 4 +++-
 .../java/io/dataease/service/dataset/ExtractDataService.java  | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 753420b979..e47240e1ba 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -53,6 +53,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -146,6 +147,7 @@ public class DataSetTableService {
         }
     }
 
+    @Transactional(propagation = Propagation.NOT_SUPPORTED)
     @DeCleaner(value = DePermissionType.DATASET, key = "sceneId")
     public void saveExcel(DataSetTableRequest datasetTable) throws Exception {
         List<String> datasetIdList = new ArrayList<>();
@@ -357,7 +359,7 @@ public class DataSetTableService {
     public List<DatasetTable> list(List<String> datasetIds) {
         DatasetTableExample example = new DatasetTableExample();
         example.createCriteria().andIdIn(datasetIds);
-        return datasetTableMapper.selectByExample(example);
+        return datasetTableMapper.selectByExampleWithBLOBs(example);
     }
 
     public List<DataSetTableDTO> listAndGroup(DataSetTableRequest dataSetTableRequest) {
diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index 8be0a597d3..79bc9c6476 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -432,7 +432,8 @@ public class ExtractDataService {
     }
 
     private void extractApiData(DatasetTable datasetTable, Datasource datasource, List<DatasetTableField> datasetTableFields, String extractType) throws Exception {
-        List<ApiDefinition> lists = new Gson().fromJson(datasource.getConfiguration(), new TypeToken<ArrayList<ApiDefinition>>(){}.getType());
+        List<ApiDefinition> lists = new Gson().fromJson(datasource.getConfiguration(), new TypeToken<ArrayList<ApiDefinition>>() {
+        }.getType());
         lists = lists.stream().filter(item -> item.getName().equalsIgnoreCase(new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getTable())).collect(Collectors.toList());
         if (CollectionUtils.isEmpty(lists)) {
             throw new Exception("未找到API数据表");

From ec9f4c59c6e2ffc251c916e2c417d244aa549b72 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Sat, 28 May 2022 12:13:59 +0800
Subject: [PATCH 02/17] =?UTF-8?q?fix:=20=E7=BD=91=E9=A1=B5=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E7=BC=96=E8=BE=91=E7=8A=B6=E6=80=81=E9=81=AE=E7=BD=A9?=
 =?UTF-8?q?=E6=9C=AA=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/DeDrag/index.vue                      | 2 +-
 .../src/components/canvas/custom-component/DeStreamMedia.vue  | 4 ++--
 .../panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue   | 2 +-
 frontend/src/views/panel/edit/index.vue                       | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index 0c3b8a8293..bf683a80d9 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -759,7 +759,7 @@ export default {
     elementMouseDown(e) {
       // private 设置当前组件数据及状态
       this.$store.commit('setClickComponentStatus', true)
-      if (this.element.component !== 'v-text' && this.element.component !== 'de-rich-text' && this.element.component !== 'rect-shape' && this.element.component !== 'de-input-search' && this.element.component !== 'de-select-grid' && this.element.component !== 'de-number-range' && this.element.component !== 'de-date') {
+      if (this.element.component !== 'de-frame' && this.element.component !== 'v-text' && this.element.component !== 'de-rich-text' && this.element.component !== 'rect-shape' && this.element.component !== 'de-input-search' && this.element.component !== 'de-select-grid' && this.element.component !== 'de-number-range' && this.element.component !== 'de-date') {
         e.preventDefault()
       }
       // 阻止冒泡事件
diff --git a/frontend/src/components/canvas/custom-component/DeStreamMedia.vue b/frontend/src/components/canvas/custom-component/DeStreamMedia.vue
index 23ec89cc24..dfc68d2a41 100644
--- a/frontend/src/components/canvas/custom-component/DeStreamMedia.vue
+++ b/frontend/src/components/canvas/custom-component/DeStreamMedia.vue
@@ -2,7 +2,7 @@
   <el-row ref="mainPlayer" style="width: 100%;height: 100%">
     <div v-if="element.streamMediaLinks[element.streamMediaLinks.videoType].url" class="video-container">
       <video :ref="'player-'+element.id" class="centered-video" name="centeredVideo" :loop="pOption.loop" :controls="inScreen" muted />
-      <div v-if="editMode==='edit'" class="stream-mask edit-mask" />
+      <div v-if="editMode==='edit'" class="stream-mask edit-mask-stream" />
       <div v-if="mobileLayoutStatus" class="stream-mask">
         <span style="opacity: 0.7;">
           <span style="color: lightgray;">{{ $t('panel.stream_mobile_tips') }}</span>
@@ -177,7 +177,7 @@ export default {
     justify-content: center;
   }
 
-  .edit-mask{
+  .edit-mask-stream{
     opacity: 0;
   }
 
diff --git a/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue b/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
index 16b5dd6242..e6a6bad477 100644
--- a/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
+++ b/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
@@ -158,7 +158,7 @@ export default {
     },
     chartBackground() {
       let style = {}
-      if (this.subjectItemDetails) {
+      if (this.subjectItemDetails && this.subjectItemDetails.chart.customStyle.background) {
         style = {
           background: this.subjectItemDetails.chart.customStyle.background.color,
           opacity: this.subjectItemDetails.chart.customStyle.background.alpha / 100
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 8f8ac300e1..0516c57943 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -274,6 +274,7 @@
       <Preview
         v-if="previewVisible"
         :in-screen="!previewVisible"
+        :panel-info="panelInfo"
         :show-type="canvasStyleData.selfAdaption?'full':'width'"
         :canvas-style-data="canvasStyleData"
         :component-data="componentData"

From acecae5d7ad26330ac90f4bf5e84e5d7daf3675f Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Sat, 28 May 2022 13:13:24 +0800
Subject: [PATCH 03/17] =?UTF-8?q?feat:=20=E7=AC=A6=E5=8F=B7=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E6=8F=92=E4=BB=B6=E8=AE=B0=E5=BD=95sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/db/migration/V35__1.11.sql | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/backend/src/main/resources/db/migration/V35__1.11.sql b/backend/src/main/resources/db/migration/V35__1.11.sql
index f8681985aa..8d60fec0e5 100644
--- a/backend/src/main/resources/db/migration/V35__1.11.sql
+++ b/backend/src/main/resources/db/migration/V35__1.11.sql
@@ -57,6 +57,8 @@ UPDATE `chart_view` SET `view_fields` = '[]';
 ALTER TABLE `chart_view_cache` ADD COLUMN `view_fields` LONGTEXT COMMENT '视图字段集合';
 UPDATE `chart_view_cache` SET `view_fields` = '[]';
 
+INSERT INTO `my_plugin`(`plugin_id`, `name`, `store`, `free`, `cost`, `category`, `descript`, `version`, `install_type`, `creator`, `load_mybatis`, `release_time`, `install_time`, `module_name`, `icon`, `ds_type`) VALUES (11, '符号地图插件', 'default', 0, 10000, 'view', '请购买正式许可', '1.0-SNAPSHOT', NULL, 'DATAEASE', 0, NULL, 1652174790928, 'view-symbolmap-backend', NULL, NULL);
+
 
 INSERT INTO `my_plugin` (`name`, `store`, `free`, `cost`, `category`, `descript`, `version`, `creator`, `load_mybatis`,
                          `install_time`, `module_name`, `ds_type`)

From 6fd3ccf91b0038744bdccb809cbf98dd1a9b7517 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Sat, 28 May 2022 21:35:06 +0800
Subject: [PATCH 04/17] =?UTF-8?q?fix:=20=E6=81=A2=E5=A4=8D=E5=9B=A0?=
 =?UTF-8?q?=E4=B8=BA=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=9A=84api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/DataSetGroupController.java       | 17 +++--
 .../datasource/DatasourceController.java      | 23 ++++---
 .../datasource/request/DeleteDsRequest.java   | 16 -----
 frontend/src/api/dataset/dataset.js           |  7 +-
 frontend/src/api/system/datasource.js         |  7 +-
 frontend/src/views/dataset/group/Group.vue    |  3 +-
 .../src/views/system/datasource/DsTree.vue    | 65 ++++++++++---------
 7 files changed, 59 insertions(+), 79 deletions(-)
 delete mode 100644 backend/src/main/java/io/dataease/controller/datasource/request/DeleteDsRequest.java

diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java
index 7379928d79..d6d8620060 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java
@@ -7,8 +7,10 @@ import io.dataease.auth.annotation.DePermissions;
 import io.dataease.commons.constants.DePermissionType;
 import io.dataease.commons.constants.ResourceAuthLevel;
 import io.dataease.commons.constants.SysLogConstants;
+import io.dataease.commons.utils.DeLogUtils;
 import io.dataease.controller.dataset.request.DeleteGroupRequest;
 import io.dataease.controller.request.dataset.DataSetGroupRequest;
+import io.dataease.dto.SysLogDTO;
 import io.dataease.dto.dataset.DataSetGroupDTO;
 import io.dataease.plugins.common.base.domain.DatasetGroup;
 import io.dataease.service.dataset.DataSetGroupService;
@@ -60,15 +62,12 @@ public class DataSetGroupController {
 
     @DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
     @ApiOperation("删除")
-    @PostMapping("/delete")
-    @DeLog(
-        operatetype = SysLogConstants.OPERATE_TYPE.DELETE,
-        sourcetype = SysLogConstants.SOURCE_TYPE.DATASET,
-        positionIndex = 0,positionKey = "pid",
-        value = "id"
-    )
-    public void tree(@RequestBody DeleteGroupRequest request) throws Exception {
-        dataSetGroupService.delete(request.getId());
+    @PostMapping("/delete/{id}")
+    public void delete(@PathVariable String id) throws Exception {
+        DatasetGroup datasetGroup = dataSetGroupService.getScene(id);
+        SysLogDTO sysLogDTO = DeLogUtils.buildLog(SysLogConstants.OPERATE_TYPE.DELETE, SysLogConstants.SOURCE_TYPE.DATASET, id, datasetGroup.getPid(), null, null);
+        dataSetGroupService.delete(id);
+        DeLogUtils.save(sysLogDTO);
     }
 
     @ApiIgnore
diff --git a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
index c8de6b1d16..060d9b4e60 100644
--- a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
+++ b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
@@ -4,7 +4,8 @@ import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.auth.annotation.DeLog;
 import io.dataease.auth.annotation.DePermission;
 import io.dataease.commons.constants.SysLogConstants;
-import io.dataease.controller.datasource.request.DeleteDsRequest;
+import io.dataease.commons.utils.DeLogUtils;
+import io.dataease.dto.SysLogDTO;
 import io.dataease.plugins.common.base.domain.Datasource;
 import io.dataease.commons.constants.DePermissionType;
 import io.dataease.commons.constants.ResourceAuthLevel;
@@ -14,13 +15,12 @@ import io.dataease.controller.datasource.request.UpdataDsRequest;
 import io.dataease.controller.request.DatasourceUnionRequest;
 import io.dataease.controller.request.datasource.ApiDefinition;
 import io.dataease.dto.datasource.DBTableDTO;
-import io.dataease.plugins.common.dto.datasource.DataSourceType;
 import io.dataease.service.datasource.DatasourceService;
 import io.dataease.dto.DatasourceDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.pentaho.di.core.database.DataSourceProviderInterface;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -90,15 +90,14 @@ public class DatasourceController {
     @RequiresPermissions("datasource:read")
     @DePermission(type = DePermissionType.DATASOURCE, level = ResourceAuthLevel.DATASOURCE_LEVEL_MANAGE, value = "id")
     @ApiOperation("删除数据源")
-    @PostMapping("/delete")
-    @DeLog(
-        operatetype = SysLogConstants.OPERATE_TYPE.DELETE,
-        sourcetype = SysLogConstants.SOURCE_TYPE.DATASOURCE,
-        positionIndex = 0,positionKey = "type",
-        value = "id"
-    )
-    public ResultHolder deleteDatasource(@RequestBody DeleteDsRequest request) throws Exception {
-        return datasourceService.deleteDatasource(request.getId());
+    @PostMapping("/delete/{datasourceID}")
+    public ResultHolder deleteDatasource(@PathVariable(value = "datasourceID") String datasourceID) throws Exception {
+        Datasource datasource = datasourceService.get(datasourceID);
+        SysLogDTO sysLogDTO = DeLogUtils.buildLog(SysLogConstants.OPERATE_TYPE.DELETE, SysLogConstants.SOURCE_TYPE.DATASOURCE, datasourceID, datasource.getType(), null, null);
+        ResultHolder resultHolder = datasourceService.deleteDatasource(datasourceID);
+        if (ObjectUtils.isNotEmpty(resultHolder) && resultHolder.isSuccess())
+            DeLogUtils.save(sysLogDTO);
+        return resultHolder;
     }
 
     @RequiresPermissions("datasource:read")
diff --git a/backend/src/main/java/io/dataease/controller/datasource/request/DeleteDsRequest.java b/backend/src/main/java/io/dataease/controller/datasource/request/DeleteDsRequest.java
deleted file mode 100644
index c31818bbf8..0000000000
--- a/backend/src/main/java/io/dataease/controller/datasource/request/DeleteDsRequest.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.dataease.controller.datasource.request;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class DeleteDsRequest implements Serializable {
-
-    @ApiModelProperty(value = "ID",required = true)
-    private String id;
-
-    @ApiModelProperty(value = "类型", required = true)
-    private String type;
-}
diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js
index 0a18529a89..5a8d5d891b 100644
--- a/frontend/src/api/dataset/dataset.js
+++ b/frontend/src/api/dataset/dataset.js
@@ -26,12 +26,11 @@ export function addGroup(data) {
   })
 }
 
-export function delGroup(data) {
+export function delGroup(groupId) {
   return request({
-    url: '/dataset/group/delete',
+    url: '/dataset/group/delete/' + groupId,
     loading: true,
-    method: 'post',
-    data
+    method: 'post'
   })
 }
 
diff --git a/frontend/src/api/system/datasource.js b/frontend/src/api/system/datasource.js
index f7ff85e801..346bdadbf4 100644
--- a/frontend/src/api/system/datasource.js
+++ b/frontend/src/api/system/datasource.js
@@ -61,12 +61,11 @@ export function editDs(data) {
   })
 }
 
-export function delDs(data) {
+export function delDs(id) {
   return request({
-    url: 'datasource/delete',
+    url: 'datasource/delete/' + id,
     loading: true,
-    method: 'post',
-    data
+    method: 'post'
   })
 }
 
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index 5f31e07346..91b952da3d 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -461,8 +461,7 @@ export default {
         cancelButtonText: this.$t('dataset.cancel'),
         type: 'warning'
       }).then(() => {
-        const param = { id: data.id, pid: data.pid }
-        delGroup(param).then(response => {
+        delGroup(data.id).then(response => {
           this.$message({
             type: 'success',
             message: this.$t('dataset.delete_success'),
diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue
index aa0b557a72..98e9c4e011 100644
--- a/frontend/src/views/system/datasource/DsTree.vue
+++ b/frontend/src/views/system/datasource/DsTree.vue
@@ -2,13 +2,12 @@
   <el-col class="tree-style">
     <el-col>
       <el-row>
-        <el-tabs v-model="showView" @tab-click="changeTab" type="card">
-          <el-tab-pane v-for="(item, index) in editableTabs" :key="item.name" :label="item.title" :name="item.name">
-          </el-tab-pane>
+        <el-tabs v-model="showView" type="card" @tab-click="changeTab">
+          <el-tab-pane v-for="(item, index) in editableTabs" :key="item.name" :label="item.title" :name="item.name" />
         </el-tabs>
       </el-row>
       <el-row>
-        <el-button icon="el-icon-plus" type="text" size="mini" style="float: left;" @click="addFolder"/>
+        <el-button icon="el-icon-plus" type="text" size="mini" style="float: left;" @click="addFolder" />
       </el-row>
       <el-row>
         <el-form>
@@ -39,16 +38,16 @@
             <span slot-scope="{ node, data }" class="custom-tree-node-list father">
               <span style="display: flex;flex: 1;width: 0;">
                 <span v-if="data.type !== 'folder' && data.status !== 'Error' && data.status !== 'Warning'">
-                  <svg-icon icon-class="datasource" class="ds-icon-scene"/>
+                  <svg-icon icon-class="datasource" class="ds-icon-scene" />
                 </span>
                 <span v-if="data.status === 'Error'">
-                  <svg-icon icon-class="exclamationmark" class="ds-icon-scene"/>
+                  <svg-icon icon-class="exclamationmark" class="ds-icon-scene" />
                 </span>
                 <span v-if="data.status === 'Warning'">
-                  <svg-icon icon-class="exclamationmark2" class="ds-icon-scene"/>
+                  <svg-icon icon-class="exclamationmark2" class="ds-icon-scene" />
                 </span>
                 <span v-if="data.type === 'folder'">
-                  <i class="el-icon-folder"/>
+                  <i class="el-icon-folder" />
                 </span>
                 <span
                   v-if=" data.status === 'Error'"
@@ -109,10 +108,10 @@
       <el-dialog v-dialogDrag :title="dialogTitle" :visible="editDriver" :show-close="false" width="50%" append-to-body>
         <el-form ref="driverForm" :model="driverForm" label-position="right" label-width="100px" :rules="rule">
           <el-form-item :label="$t('commons.name')" prop="name">
-            <el-input v-model="driverForm.name"/>
+            <el-input v-model="driverForm.name" />
           </el-form-item>
           <el-form-item :label="$t('commons.description')">
-            <el-input v-model="driverForm.desc"/>
+            <el-input v-model="driverForm.desc" />
           </el-form-item>
           <el-form-item :label="$t('datasource.type')" prop="type">
             <el-select
@@ -138,14 +137,13 @@
         </div>
       </el-dialog>
 
-
     </el-col>
   </el-col>
 </template>
 <script>
 
-import {mapGetters} from 'vuex'
-import i18n from "@/lang";
+import { mapGetters } from 'vuex'
+import i18n from '@/lang'
 import {
   listDatasource,
   listDatasourceByType,
@@ -156,7 +154,7 @@ import {
   delDriver,
   listDriverByType
 } from '@/api/system/datasource'
-import {ApplicationContext} from "@/utils/ApplicationContext";
+import { ApplicationContext } from '@/utils/ApplicationContext'
 
 export default {
   name: 'DsTree',
@@ -184,11 +182,11 @@ export default {
       },
       disabledModifyType: false,
       rule: {
-        name: [{required: true, message: i18n.t('datasource.input_name'), trigger: 'blur'},
-          {min: 2, max: 50, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur'}],
-        desc: [{required: true, message: i18n.t('datasource.input_name'), trigger: 'blur'},
-          {min: 2, max: 200, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur'}],
-        type: [{required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'blur'}]
+        name: [{ required: true, message: i18n.t('datasource.input_name'), trigger: 'blur' },
+          { min: 2, max: 50, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur' }],
+        desc: [{ required: true, message: i18n.t('datasource.input_name'), trigger: 'blur' },
+          { min: 2, max: 200, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur' }],
+        type: [{ required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'blur' }]
       },
       editableTabs: [{
         title: i18n.t('commons.datasource'),
@@ -215,7 +213,6 @@ export default {
         name: 'Driver'
       })
     }
-
   },
   methods: {
     filterNode(value, data) {
@@ -244,11 +241,11 @@ export default {
     datasourceTypes() {
       listDatasourceType().then(res => {
         this.dsTypes = res.data
-          this.dsTypes.forEach(item => {
-            if(item.isJdbc){
-              this.dsTypesForDriver.push(item)
-            }
-          })
+        this.dsTypes.forEach(item => {
+          if (item.isJdbc) {
+            this.dsTypesForDriver.push(item)
+          }
+        })
       })
     },
     refreshType(datasource) {
@@ -327,7 +324,7 @@ export default {
         this.editDriver = true
         // this.switchMain(switchMain'DriverForm', {}, this.tData, this.dsTypes)
       } else {
-        this.switchMain('DsForm', {type: data.id}, this.tData, this.dsTypes)
+        this.switchMain('DsForm', { type: data.id }, this.tData, this.dsTypes)
       }
     },
     nodeClick(node, data) {
@@ -336,7 +333,7 @@ export default {
     },
 
     clickFileMore(param) {
-      const {optType, data} = param
+      const { optType, data } = param
       switch (optType) {
         case 'edit':
           this.edit(data)
@@ -349,13 +346,13 @@ export default {
       }
     },
     beforeClickFile(optType, data, node) {
-      return {optType, data, node}
+      return { optType, data, node }
     },
     edit(row) {
       this.switchMain('DsForm', row, this.tData, this.dsTypes)
     },
     showInfo(row) {
-      const param = {...row.data, ...{showModel: 'show'}}
+      const param = { ...row.data, ...{ showModel: 'show' }}
       if (this.showView === 'Datasource') {
         this.switchMain('DsForm', param, this.tData, this.dsTypes)
       } else {
@@ -368,8 +365,12 @@ export default {
         cancelButtonText: this.$t('commons.cancel'),
         type: 'warning'
       }).then(() => {
-        const parma = {type: datasource.type, id: datasource.id}
-        const method = this.showView === 'Datasource' ? delDs : delDriver
+        let method = delDriver
+        let parma = { type: datasource.type, id: datasource.id }
+        if (this.showView === 'Datasource') {
+          method = delDs
+          parma = datasource.id
+        }
         method(parma).then(res => {
           if (res.success) {
             this.$success(this.$t('commons.delete_success'))
@@ -437,7 +438,7 @@ export default {
           return false
         }
       })
-    },
+    }
   }
 }
 </script>

From 215d262bbf7fa00bed084a20018e105bfb6c8722 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Sat, 28 May 2022 21:42:53 +0800
Subject: [PATCH 05/17] =?UTF-8?q?fix:=20=E6=9A=82=E6=97=B6=E5=B1=8F?=
 =?UTF-8?q?=E8=94=BD=E8=A7=86=E5=9B=BE=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/service/sys/log/LogService.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/service/sys/log/LogService.java b/backend/src/main/java/io/dataease/service/sys/log/LogService.java
index 634f6f3305..b3687f1cbc 100644
--- a/backend/src/main/java/io/dataease/service/sys/log/LogService.java
+++ b/backend/src/main/java/io/dataease/service/sys/log/LogService.java
@@ -48,7 +48,10 @@ public class LogService {
 
 
     // 排除驱动和驱动文件的公共操作的资源类型
-    private static Integer[] COMMON_SOURCE = {1, 2,3,4,6,7,8,9};
+    // 暂时屏蔽视图日志
+    // private static Integer[] COMMON_SOURCE = {1, 2,3,4,6,7,8,9};
+
+    private static Integer[] COMMON_SOURCE = {1, 2,3,6,7,8,9};
 
     // 增 改 删  针对公共资源的操作
     private static Integer[] COMMON_SOURCE_OPERATE = {1 ,2 , 3};

From 0b468cc22b1800c2005e9d7a2a525da8a0e1551c Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Sat, 28 May 2022 21:57:46 +0800
Subject: [PATCH 06/17] =?UTF-8?q?fix:=20API=20=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasource/DatasourceController.java      |  2 +-
 .../request/datasource/ApiDefinition.java     |  5 ++-
 .../datasource/ApiDefinitionRequest.java      |  6 ++-
 .../java/io/dataease/dto/DatasourceDTO.java   |  6 ++-
 .../provider/datasource/ApiProvider.java      | 33 ++++++--------
 .../service/datasource/DatasourceService.java | 43 ++++++++++---------
 6 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
index c8de6b1d16..f39c51ebc3 100644
--- a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
+++ b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
@@ -61,7 +61,7 @@ public class DatasourceController {
 
     @ApiIgnore
     @PostMapping("/validate")
-    public ResultHolder validate(@RequestBody DatasourceDTO datasource) throws Exception {
+    public ResultHolder validate(@RequestBody Datasource datasource) throws Exception {
         return datasourceService.validate(datasource);
     }
 
diff --git a/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java b/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java
index 5fb024cbab..7885b80684 100644
--- a/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java
+++ b/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinition.java
@@ -6,6 +6,7 @@ import lombok.Data;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class ApiDefinition {
@@ -14,8 +15,8 @@ public class ApiDefinition {
     private String url;
     private String method = "GET";
     private List<DatasetTableField> fields;
-    private String request;
+    private ApiDefinitionRequest request;
     private String dataPath;
     private String status;
-    private List<JsonObject> datas = new ArrayList<>();
+    private List<Map<String,String>> datas = new ArrayList<>();
 }
diff --git a/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinitionRequest.java b/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinitionRequest.java
index 59dc793ff9..ef07542903 100644
--- a/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinitionRequest.java
+++ b/backend/src/main/java/io/dataease/controller/request/datasource/ApiDefinitionRequest.java
@@ -3,12 +3,14 @@ package io.dataease.controller.request.datasource;
 import com.google.gson.JsonObject;
 import lombok.Data;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Data
 public class ApiDefinitionRequest {
-    private List<JsonObject> headers = new ArrayList<>();
-    private JsonObject body = new JsonObject();
+    private List<Map<String, String>> headers = new ArrayList<>();
+    private Map<String, Object> body = new HashMap<>();
     private AuthManager authManager = new AuthManager();
 
 
diff --git a/backend/src/main/java/io/dataease/dto/DatasourceDTO.java b/backend/src/main/java/io/dataease/dto/DatasourceDTO.java
index 81a76a54c6..47d39bd4cf 100644
--- a/backend/src/main/java/io/dataease/dto/DatasourceDTO.java
+++ b/backend/src/main/java/io/dataease/dto/DatasourceDTO.java
@@ -1,11 +1,13 @@
 package io.dataease.dto;
 
-import com.google.gson.JsonArray;
+import io.dataease.controller.request.datasource.ApiDefinition;
 import io.dataease.plugins.common.base.domain.Datasource;
 import io.dataease.plugins.common.constants.DatasourceCalculationMode;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Author: wangjiahao
  * Date: 2021-05-18
@@ -16,7 +18,7 @@ public class DatasourceDTO extends Datasource {
 
     @ApiModelProperty("权限")
     private String privileges;
-    private JsonArray apiConfiguration;
+    private List<ApiDefinition> apiConfiguration;
     private String typeDesc;
     private DatasourceCalculationMode calculationMode;
 }
diff --git a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
index a46ef243f4..d588d617d8 100644
--- a/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
+++ b/backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
@@ -1,8 +1,6 @@
 package io.dataease.provider.datasource;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
+import com.google.gson.*;
 import com.google.gson.reflect.TypeToken;
 import io.dataease.plugins.common.dto.datasource.TableDesc;
 import io.dataease.plugins.common.dto.datasource.TableField;
@@ -22,7 +20,6 @@ import org.springframework.stereotype.Service;
 
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Service("apiProvider")
 public class ApiProvider extends Provider {
@@ -122,11 +119,10 @@ public class ApiProvider extends Provider {
     static public String execHttpRequest(ApiDefinition apiDefinition) throws Exception {
         String response = "";
         HttpClientConfig httpClientConfig = new HttpClientConfig();
-        ApiDefinitionRequest apiDefinitionRequest = new Gson().fromJson(apiDefinition.getRequest(), ApiDefinitionRequest.class);
-        //headers
-        for (JsonObject header : apiDefinitionRequest.getHeaders()) {
-            if (header.get("name") != null && StringUtils.isNotEmpty(header.get("name").getAsString()) && header.get("value") != null && StringUtils.isNotEmpty(header.get("value").getAsString())) {
-                httpClientConfig.addHeader(header.get("name").getAsString(), header.get("value").getAsString());
+        ApiDefinitionRequest apiDefinitionRequest = apiDefinition.getRequest();
+        for (Map header : apiDefinitionRequest.getHeaders()) {
+            if (header.get("name") != null && StringUtils.isNotEmpty(header.get("name").toString()) && header.get("value") != null && StringUtils.isNotEmpty(header.get("value").toString())) {
+                httpClientConfig.addHeader(header.get("name").toString(), header.get("value").toString());
             }
         }
 
@@ -147,18 +143,18 @@ public class ApiProvider extends Provider {
                 if (apiDefinitionRequest.getBody().get("type") == null) {
                     throw new Exception("请求类型不能为空");
                 }
-                String type = apiDefinitionRequest.getBody().get("type").getAsString();
+                String type = apiDefinitionRequest.getBody().get("type").toString();
                 if (StringUtils.equalsAny(type, "JSON", "XML", "Raw")) {
                     String raw = null;
                     if (apiDefinitionRequest.getBody().get("raw") != null) {
-                        raw = apiDefinitionRequest.getBody().get("raw").getAsString();
+                        raw = apiDefinitionRequest.getBody().get("raw").toString();
                         response = HttpClientUtil.post(apiDefinition.getUrl(), raw, httpClientConfig);
                     }
                 }
                 if (StringUtils.equalsAny(type, "Form_Data", "WWW_FORM")) {
                     if (apiDefinitionRequest.getBody().get("kvs") != null) {
                         Map<String, String> body = new HashMap<>();
-                        JsonArray kvsArr = apiDefinitionRequest.getBody().getAsJsonArray("kvs");
+                        JsonArray kvsArr = JsonParser.parseString(apiDefinitionRequest.getBody().get("kvs").toString()).getAsJsonArray();
                         for (int i = 0; i < kvsArr.size(); i++) {
                             JsonObject kv = kvsArr.get(i).getAsJsonObject();
                             if (kv.get("name") != null) {
@@ -191,7 +187,7 @@ public class ApiProvider extends Provider {
             throw new Exception("jsonPath 路径错误：" + e.getMessage());
         }
 
-        List<JsonObject> dataList = new ArrayList<>();
+        List<Map<String,String>> dataList = new ArrayList<>();
         List<DatasetTableField> fields = new ArrayList<>();
         Set<String> fieldKeys = new HashSet<>();
         //第一遍获取 field
@@ -213,11 +209,11 @@ public class ApiProvider extends Provider {
         }
         //第二遍获取 data
         for (LinkedHashMap data : datas) {
-            JsonObject jsonObject = new JsonObject();
+            Map<String,String> mapData = new HashMap<>();
             for (String key : fieldKeys) {
-                jsonObject.addProperty(key, Optional.ofNullable(data.get(key)).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " "));
+                mapData.put(key, Optional.ofNullable(data.get(key)).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " "));
             }
-            dataList.add(jsonObject);
+            dataList.add(mapData);
         }
         apiDefinition.setDatas(dataList);
         apiDefinition.setFields(fields);
@@ -248,9 +244,8 @@ public class ApiProvider extends Provider {
 
     private ApiDefinition checkApiDefinition(DatasourceRequest datasourceRequest) throws Exception {
         List<ApiDefinition> apiDefinitionList = new ArrayList<>();
-        List<ApiDefinition> apiDefinitionListTemp = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), new TypeToken<List<ApiDefinition>>() {
-        }.getType());
-        if (CollectionUtils.isEmpty(apiDefinitionListTemp)) {
+        List<ApiDefinition> apiDefinitionListTemp = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), new TypeToken<List<ApiDefinition>>() {}.getType());
+        if (CollectionUtils.isNotEmpty(apiDefinitionListTemp)) {
             for (ApiDefinition apiDefinition : apiDefinitionListTemp) {
                 if (apiDefinition.getName().equalsIgnoreCase(datasourceRequest.getTable())) {
                     apiDefinitionList.add(apiDefinition);
diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
index e1562c49ae..7fc5e98756 100644
--- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
+++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
@@ -7,6 +7,7 @@ import com.google.gson.JsonParser;
 import com.google.gson.reflect.TypeToken;
 import io.dataease.auth.annotation.DeCleaner;
 import io.dataease.commons.constants.RedisConstants;
+import io.dataease.commons.utils.BeanUtils;
 import io.dataease.ext.ExtDataSourceMapper;
 import io.dataease.ext.query.GridExample;
 import io.dataease.commons.constants.DePermissionType;
@@ -144,16 +145,15 @@ public class DatasourceService {
                 datasourceDTO.setConfiguration(datasourceDTO.getConfiguration());
             }
             if (datasourceDTO.getType().equalsIgnoreCase(DatasourceTypes.api.toString())) {
-                JsonArray apiDefinitionList = JsonParser.parseString(datasourceDTO.getConfiguration()).getAsJsonArray();
-                JsonArray apiDefinitionListWithStatus = new JsonArray();
+               List<ApiDefinition> apiDefinitionList = new Gson().fromJson(datasourceDTO.getConfiguration(), new TypeToken<ArrayList<ApiDefinition>>() {}.getType());
+                List<ApiDefinition> apiDefinitionListWithStatus = new ArrayList<>();
                 int success = 0;
                 if (StringUtils.isNotEmpty(datasourceDTO.getStatus())) {
                     JsonObject apiItemStatuses = JsonParser.parseString(datasourceDTO.getStatus()).getAsJsonObject();
-                    for (Object apiDefinition : apiDefinitionList) {
-                        String status = apiItemStatuses.get(JsonParser.parseString(apiDefinition.toString()).getAsJsonObject().get("name").getAsString()).getAsString();
-                        JsonObject object = JsonParser.parseString(apiDefinition.toString()).getAsJsonObject();
-                        object.addProperty("status", status);
-                        apiDefinitionListWithStatus.add(object);
+                    for (ApiDefinition apiDefinition : apiDefinitionList) {
+                        String status = apiItemStatuses.get(apiDefinition.getName()).getAsString();
+                        apiDefinition.setStatus(status);
+                        apiDefinitionListWithStatus.add(apiDefinition);
                         if (StringUtils.isNotEmpty(status) && status.equalsIgnoreCase("Success")) {
                             success++;
                         }
@@ -232,40 +232,41 @@ public class DatasourceService {
         }
     }
 
-    public ResultHolder validate(DatasourceDTO datasource) throws Exception {
+    public ResultHolder validate(Datasource datasource) throws Exception {
+        DatasourceDTO datasourceDTO = new DatasourceDTO();
+        BeanUtils.copyBean(datasourceDTO, datasource);
         try {
             Provider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
             DatasourceRequest datasourceRequest = new DatasourceRequest();
             datasourceRequest.setDatasource(datasource);
             String datasourceStatus = datasourceProvider.checkStatus(datasourceRequest);
             if (datasource.getType().equalsIgnoreCase("api")) {
-                Gson gson = new Gson();
                 int success = 0;
-                JsonArray apiDefinitionList = JsonParser.parseString(datasource.getConfiguration()).getAsJsonArray();
-                JsonArray apiDefinitionListWithStatus = new JsonArray();
+                List<ApiDefinition> apiDefinitionList = new Gson().fromJson(datasource.getConfiguration(), new TypeToken<List<ApiDefinition>>() {}.getType());
+                List<ApiDefinition> apiDefinitionListWithStatus = new ArrayList<>();
+
                 if (StringUtils.isNotEmpty(datasourceStatus)) {
                     JsonObject apiItemStatuses = JsonParser.parseString(datasourceStatus).getAsJsonObject();
-                    for (Object apiDefinition : apiDefinitionList) {
-                        String status = apiItemStatuses.get(JsonParser.parseString(apiDefinition.toString()).getAsJsonObject().get("name").getAsString()).getAsString();
-                        JsonObject object = JsonParser.parseString(apiDefinition.toString()).getAsJsonObject();
-                        object.addProperty("status", status);
-                        apiDefinitionListWithStatus.add(object);
+                    for (ApiDefinition apiDefinition : apiDefinitionList) {
+                        String status = apiItemStatuses.get(apiDefinition.getName()).getAsString();
+                        apiDefinition.setStatus(status);
+                        apiDefinitionListWithStatus.add(apiDefinition);
                         if (StringUtils.isNotEmpty(status) && status.equalsIgnoreCase("Success")) {
                             success++;
                         }
                     }
                 }
 
-                datasource.setApiConfiguration(apiDefinitionListWithStatus);
+                datasourceDTO.setApiConfiguration(apiDefinitionListWithStatus);
                 if (success == apiDefinitionList.size()) {
-                    return ResultHolder.success(datasource);
+                    return ResultHolder.success(datasourceDTO);
                 }
                 if (success > 0 && success < apiDefinitionList.size()) {
-                    return ResultHolder.error("Datasource has invalid tables", datasource);
+                    return ResultHolder.error("Datasource has invalid tables", datasourceDTO);
                 }
-                return ResultHolder.error("Datasource is invalid.", datasource);
+                return ResultHolder.error("Datasource is invalid.", datasourceDTO);
             }
-            return ResultHolder.success(datasource);
+            return ResultHolder.success(datasourceDTO);
         } catch (Exception e) {
             return ResultHolder.error("Datasource is invalid: " + e.getMessage());
         }

From 9572a0fb582866af71c0ad9013046fe79a80c782 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Sat, 28 May 2022 22:21:28 +0800
Subject: [PATCH 07/17] =?UTF-8?q?fix:=20API=20=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/datasource/DsConfiguration.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/views/system/datasource/DsConfiguration.vue b/frontend/src/views/system/datasource/DsConfiguration.vue
index 4d2d421fbb..f2b7a8478d 100644
--- a/frontend/src/views/system/datasource/DsConfiguration.vue
+++ b/frontend/src/views/system/datasource/DsConfiguration.vue
@@ -463,7 +463,6 @@ export default {
         this.$refs.apiItem.validate(valid => {
           if (valid) {
             const data = JSON.parse(JSON.stringify(this.apiItem))
-            data.request = JSON.stringify(data.request)
             this.loading = true
             this.disabledNext = true
             checkApiDatasource(data).then(res => {

From 792a86667fd68496a39ac8d49161463bd2722cc8 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Sun, 29 May 2022 09:41:09 +0800
Subject: [PATCH 08/17] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=BF=A1=E6=81=AF=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/controller/sys/SysUserController.java     | 3 ++-
 .../src/main/java/io/dataease/service/sys/SysUserService.java  | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java
index 53d488862b..05eeeb75ee 100644
--- a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java
+++ b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java
@@ -26,6 +26,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.apache.shiro.authz.annotation.RequiresRoles;
 import org.springframework.web.bind.annotation.*;
@@ -148,7 +149,7 @@ public class SysUserController {
             DataEaseException.throwException(Translator.get("i18n_wrong_content"));
         }
         // 再次验证，匹配格式
-        if (!request.getPhone().isEmpty() && !request.getPhone().matches("^1[3|4|5|7|8][0-9]{9}$")) {
+        if (StringUtils.isNotBlank(request.getPhone()) && !request.getPhone().matches("^1[3|4|5|7|8][0-9]{9}$")) {
             DataEaseException.throwException(Translator.get("i18n_wrong_tel"));
         }
         if (!request.getEmail().matches("^[a-zA-Z0-9_._-]+@[a-zA-Z0-9_-]+(\\.[a-zA-Z0-9_-]+)+$")) {
diff --git a/backend/src/main/java/io/dataease/service/sys/SysUserService.java b/backend/src/main/java/io/dataease/service/sys/SysUserService.java
index 80025e9252..20a8ac5fd2 100644
--- a/backend/src/main/java/io/dataease/service/sys/SysUserService.java
+++ b/backend/src/main/java/io/dataease/service/sys/SysUserService.java
@@ -219,6 +219,8 @@ public class SysUserService {
     @CacheEvict(value = AuthConstants.USER_CACHE_NAME, key = "'user' + #request.userId")
     @Transactional
     public int updatePersonBasicInfo(SysUserCreateRequest request) {
+        checkEmail(request);
+        checkNickName(request);
         SysUser user = new SysUser();
         long now = System.currentTimeMillis();
         user.setUserId(request.getUserId());

From f1be625f7fdd3069d82b4866b1a4451568a1b6eb Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Sun, 29 May 2022 10:00:46 +0800
Subject: [PATCH 09/17] =?UTF-8?q?style:=20=E7=A6=81=E6=AD=A2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E4=B8=AD=E4=BF=AE=E6=94=B9=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E6=8E=A7=E4=BB=B6=E6=A0=B7=E5=BC=8F=EF=BC=8C=E6=81=A2=E5=A4=8D?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E6=95=B0=E6=8D=AE=E9=9B=86form=E4=B8=AD?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/system/datasource/DriverForm.vue    | 102 +++++++------
 .../src/views/system/datasource/DsForm.vue    | 137 ++++++++++--------
 2 files changed, 123 insertions(+), 116 deletions(-)

diff --git a/frontend/src/views/system/datasource/DriverForm.vue b/frontend/src/views/system/datasource/DriverForm.vue
index 9b5c2fdd4b..4a8f04b38a 100644
--- a/frontend/src/views/system/datasource/DriverForm.vue
+++ b/frontend/src/views/system/datasource/DriverForm.vue
@@ -1,16 +1,15 @@
 <template>
   <layout-content>
     <template v-slot:header>
-      <el-icon name="back" class="back-button" @click.native="backToList"/>
+      <el-icon name="back" class="back-button" @click.native="backToList" />
       {{
         params && params.id && params.showModel && params.showModel === 'show' && !canEdit ? $t('driver.show_info') : $t('driver.modify')
       }}
-      <el-button v-if="canEdit"  size="mini"   style="float: right;"type="primary" @click="save">{{ $t('commons.save') }}
+      <el-button v-if="canEdit" size="mini" style="float: right;"type="primary" @click="save">{{ $t('commons.save') }}
       </el-button>
-      <el-button v-else size="mini"  style="float: right;" type="primary" @click="changeEdit">{{ $t('commons.edit') }}
+      <el-button v-else size="mini" style="float: right;" type="primary" @click="changeEdit">{{ $t('commons.edit') }}
       </el-button>
 
-
     </template>
     <div>
 
@@ -24,16 +23,17 @@
         label-position="right"
       >
         <el-form-item :label="$t('commons.name')" prop="name">
-          <el-input v-model="driverForm.name" autocomplete="off"/>
+          <el-input v-model="driverForm.name" autocomplete="off" />
         </el-form-item>
         <el-form-item :label="$t('commons.description')">
-          <el-input v-model="driverForm.desc" autocomplete="off"/>
+          <el-input v-model="driverForm.desc" autocomplete="off" />
         </el-form-item>
         <el-form-item :label="$t('datasource.type')" prop="type">
           <el-select
             v-model="driverForm.type"
             :placeholder="$t('datasource.please_choose_type')"
             class="select-width"
+            style="width: 100%"
             disabled
             filterable
           >
@@ -46,27 +46,26 @@
           </el-select>
         </el-form-item>
 
-<!--        <el-form-item :label="$t('driver.driver')" >-->
-<!--          <el-select-->
-<!--            v-model="driverForm.driverClass"-->
-<!--            :placeholder="$t('driver.please_choose_driver')"-->
-<!--            class="select-width"-->
-<!--            filterable-->
-<!--          >-->
-<!--            <el-option-->
-<!--              v-for="item in driverClassList"-->
-<!--              :key="item"-->
-<!--              :label="item"-->
-<!--              :value="item"-->
-<!--            />-->
-<!--          </el-select>-->
-<!--        </el-form-item>-->
+        <!--        <el-form-item :label="$t('driver.driver')" >-->
+        <!--          <el-select-->
+        <!--            v-model="driverForm.driverClass"-->
+        <!--            :placeholder="$t('driver.please_choose_driver')"-->
+        <!--            class="select-width"-->
+        <!--            filterable-->
+        <!--          >-->
+        <!--            <el-option-->
+        <!--              v-for="item in driverClassList"-->
+        <!--              :key="item"-->
+        <!--              :label="item"-->
+        <!--              :value="item"-->
+        <!--            />-->
+        <!--          </el-select>-->
+        <!--        </el-form-item>-->
 
         <el-form-item :label="$t('driver.driver')" prop="driverClass">
-          <el-input v-model="driverForm.driverClass" autocomplete="off"/>
+          <el-input v-model="driverForm.driverClass" autocomplete="off" />
         </el-form-item>
 
-
       </el-form>
 
       <el-upload
@@ -83,16 +82,16 @@
         :headers="headers"
         style="float: right;"
       >
-        <el-button size="mini" type="primary"  style="float: right;" :disabled="uploading">
+        <el-button size="mini" type="primary" style="float: right;" :disabled="uploading">
           <span v-if="!uploading" style="font-size: 12px;">{{ $t('dataset.upload_file') }}</span>
           <span v-if="uploading" style="font-size: 12px;"><i class="el-icon-loading" /> {{ $t('dataset.uploading') }}</span>
         </el-button>
       </el-upload>
-    <fu-table :data="driverFiles">
-      <el-table-column prop="fileName" :label="$t('driver.file_name')"/>
-<!--      <el-table-column prop="version" :label="$t('driver.version')"/>-->
-      <fu-table-operations :buttons="buttons" :label="$t('commons.operating')" fix/>
-    </fu-table>
+      <fu-table :data="driverFiles">
+        <el-table-column prop="fileName" :label="$t('driver.file_name')" />
+        <!--      <el-table-column prop="version" :label="$t('driver.version')"/>-->
+        <fu-table-operations :buttons="buttons" :label="$t('commons.operating')" fix />
+      </fu-table>
 
     </div>
   </layout-content>
@@ -102,13 +101,13 @@
 import LayoutContent from '@/components/business/LayoutContent'
 import i18n from '@/lang/index'
 import ApiHttpRequestForm from '@/views/system/datasource/ApiHttpRequestForm'
-import DsConfiguration from "@/views/system/datasource/DsConfiguration";
+import DsConfiguration from '@/views/system/datasource/DsConfiguration'
 import PluginCom from '@/views/system/plugin/PluginCom'
-import {deleteDriverFile, listDriverDetails, updateDriver} from "@/api/system/datasource";
-import {delUser} from "@/api/system/user";
-import {$alert} from "@/utils/message";
-import store from "@/store";
-import {getToken} from "@/utils/auth";
+import { deleteDriverFile, listDriverDetails, updateDriver } from '@/api/system/datasource'
+import { delUser } from '@/api/system/user'
+import { $alert } from '@/utils/message'
+import store from '@/store'
+import { getToken } from '@/utils/auth'
 
 const token = getToken()
 
@@ -138,7 +137,7 @@ export default {
     return {
       disabled: false,
       driverForm: {
-        id:'',
+        id: '',
         name: '',
         desc: '',
         type: '',
@@ -147,12 +146,12 @@ export default {
       datasourceType: {},
       driverClassList: [],
       rule: {
-        name: [{required: true, message: i18n.t('datasource.input_name'), trigger: 'blur'},
-          {min: 2, max: 50, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur'}],
-        desc: [{required: true, message: i18n.t('datasource.input_name'), trigger: 'blur'},
-          {min: 2, max: 200, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur'}],
-        type: [{required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'blur'}],
-        driverClass: [{required: true, message: i18n.t('driver.please_set_driverClass'), trigger: 'blur'}]
+        name: [{ required: true, message: i18n.t('datasource.input_name'), trigger: 'blur' },
+          { min: 2, max: 50, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur' }],
+        desc: [{ required: true, message: i18n.t('datasource.input_name'), trigger: 'blur' },
+          { min: 2, max: 200, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur' }],
+        type: [{ required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'blur' }],
+        driverClass: [{ required: true, message: i18n.t('driver.please_set_driverClass'), trigger: 'blur' }]
       },
       canEdit: false,
       driverFiles: [],
@@ -179,7 +178,6 @@ export default {
   mounted() {
   },
 
-
   methods: {
     beforeUpload(file) {
       this.uploading = true
@@ -191,7 +189,7 @@ export default {
     uploadFail(response, file, fileList) {
       let myError = response.toString()
       myError = myError.replace('Error: ', '')
-      if(myError.indexOf('AuthenticationException') >= 0){
+      if (myError.indexOf('AuthenticationException') >= 0) {
         const message = i18n.t('login.tokenError')
         $alert(message, () => {
           store.dispatch('user/logout').then(() => {
@@ -211,13 +209,13 @@ export default {
         showClose: true
       })
     },
-    deleteDriverFile(row){
+    deleteDriverFile(row) {
       deleteDriverFile(row).then(res => {
         this.$success(this.$t('commons.delete_success'))
         this.listDriverDetails()
       })
     },
-    listDriverDetails(){
+    listDriverDetails() {
       listDriverDetails(this.driverForm.id).then(res => {
         this.driverFiles = res.data
         this.driverClassList = []
@@ -231,11 +229,11 @@ export default {
       this.formType = 'modify'
       this.disabled = this.params && this.params.id && this.params.showModel && this.params.showModel === 'show' && !this.canEdit
     },
-    save(){
+    save() {
       this.$refs.driverForm.validate(valid => {
-          if (!valid) {
-            return false
-          }
+        if (!valid) {
+          return false
+        }
         updateDriver(this.driverForm).then(res => {
           this.$success(i18n.t('commons.success'))
           this.canEdit = false
@@ -256,13 +254,13 @@ export default {
 }
 </script>
 <style scoped>
-.el-input {
+/* .el-input {
   width: 300px;
 }
 
 .el-select {
   width: 300px;
-}
+} */
 
 .ms-http-input {
   width: 500px;
diff --git a/frontend/src/views/system/datasource/DsForm.vue b/frontend/src/views/system/datasource/DsForm.vue
index 693bcfa323..1b0dddac48 100644
--- a/frontend/src/views/system/datasource/DsForm.vue
+++ b/frontend/src/views/system/datasource/DsForm.vue
@@ -1,7 +1,7 @@
 <template>
   <layout-content :header="formType=='add' ? $t('datasource.create') : $t('datasource.modify')">
     <template v-slot:header>
-      <el-icon name="back" class="back-button" @click.native="backToList"/>
+      <el-icon name="back" class="back-button" @click.native="backToList" />
       {{
         params && params.id && params.showModel && params.showModel === 'show' && !canEdit ? $t('datasource.show_info') : formType == 'add' ? $t('datasource.create') : $t('datasource.modify')
       }}
@@ -18,19 +18,20 @@
         label-position="right"
       >
         <el-form-item :label="$t('commons.name')" prop="name">
-          <el-input v-model="form.name" autocomplete="off"/>
+          <el-input v-model="form.name" autocomplete="off" />
         </el-form-item>
         <el-form-item :label="$t('commons.description')" prop="desc">
-          <el-input v-model="form.desc" autocomplete="off"/>
+          <el-input v-model="form.desc" autocomplete="off" />
         </el-form-item>
         <el-form-item :label="$t('datasource.type')" prop="type">
           <el-select
             v-model="form.type"
             :placeholder="$t('datasource.please_choose_type')"
             class="select-width"
+            style="width: 100%"
             :disabled="formType=='modify' || (formType==='add' && params && !!params.type)"
-            @change="changeType()"
             filterable
+            @change="changeType()"
           >
             <el-option
               v-for="item in dsTypes"
@@ -41,11 +42,12 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item  v-if="datasourceType.isJdbc" :label="$t('driver.driver')">
+        <el-form-item v-if="datasourceType.isJdbc" :label="$t('driver.driver')">
           <el-select
             v-model="form.configuration.customDriver"
             :placeholder="$t('driver.please_choose_driver')"
             class="select-width"
+            style="width: 100%"
             filterable
           >
             <el-option
@@ -58,27 +60,35 @@
           </el-select>
         </el-form-item>
 
-      <ds-configuration ref="dsConfig" v-if="!datasourceType.isPlugin" :datasource-type='datasourceType' :form="form" :disabled="params && params.id && params.showModel && params.showModel === 'show' && !canEdit"></ds-configuration>
-      <plugin-com ref="pluginDsConfig" v-if="datasourceType.isPlugin"  :component-name="datasourceType.type" :obj="{form, disabled }" />
-
+        <ds-configuration v-if="!datasourceType.isPlugin" ref="dsConfig" :datasource-type="datasourceType" :form="form" :disabled="params && params.id && params.showModel && params.showModel === 'show' && !canEdit" />
+        <plugin-com v-if="datasourceType.isPlugin" ref="pluginDsConfig" :component-name="datasourceType.type" :obj="{form, disabled }" />
 
       </el-form>
 
-
       <div v-if="canEdit" slot="footer" class="dialog-footer">
-        <el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
-                   @click="validaDatasource">{{ $t('commons.validate') }}
+        <el-button
+          v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
+          @click="validaDatasource"
+        >{{ $t('commons.validate') }}
         </el-button>
-        <el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)" type="primary"
-                   @click="save">{{ $t('commons.save') }}
+        <el-button
+          v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
+          type="primary"
+          @click="save"
+        >{{ $t('commons.save') }}
         </el-button>
       </div>
       <div v-else slot="footer" class="dialog-footer">
-        <el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
-                   @click="validaDatasource">{{ $t('commons.validate') }}
+        <el-button
+          v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
+          @click="validaDatasource"
+        >{{ $t('commons.validate') }}
         </el-button>
-        <el-button v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)" type="primary"
-                   @click="changeEdit">{{ $t('commons.edit') }}
+        <el-button
+          v-if="formType==='add'?true: hasDataPermission('manage',params.privileges)"
+          type="primary"
+          @click="changeEdit"
+        >{{ $t('commons.edit') }}
         </el-button>
       </div>
     </div>
@@ -96,10 +106,10 @@ import {
   checkApiDatasource,
   listDriverByType
 } from '@/api/system/datasource'
-import {$confirm} from '@/utils/message'
+import { $confirm } from '@/utils/message'
 import i18n from '@/lang/index'
 import ApiHttpRequestForm from '@/views/system/datasource/ApiHttpRequestForm'
-import DsConfiguration from "@/views/system/datasource/DsConfiguration";
+import DsConfiguration from '@/views/system/datasource/DsConfiguration'
 import PluginCom from '@/views/system/plugin/PluginCom'
 
 export default {
@@ -143,10 +153,10 @@ export default {
       },
       datasourceType: {},
       rule: {
-        name: [{required: true, message: i18n.t('datasource.input_name'), trigger: 'blur'},
-          {min: 2, max: 25, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur'}],
-        desc: [{min: 2, max: 50, message: i18n.t('datasource.input_limit_2_50'), trigger: 'blur'}],
-        type: [{required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'blur'}],
+        name: [{ required: true, message: i18n.t('datasource.input_name'), trigger: 'blur' },
+          { min: 2, max: 25, message: i18n.t('datasource.input_limit_2_25', [2, 25]), trigger: 'blur' }],
+        desc: [{ min: 2, max: 50, message: i18n.t('datasource.input_limit_2_50'), trigger: 'blur' }],
+        type: [{ required: true, message: i18n.t('datasource.please_choose_type'), trigger: 'blur' }],
         'configuration.dataBase': [{
           required: true,
           message: i18n.t('datasource.please_input_data_base'),
@@ -167,9 +177,9 @@ export default {
           message: i18n.t('datasource.please_input_password'),
           trigger: 'blur'
         }],
-        'configuration.host': [{required: true, message: i18n.t('datasource.please_input_host'), trigger: 'blur'}],
-        'configuration.url': [{required: true, message: i18n.t('datasource.please_input_url'), trigger: 'blur'}],
-        'configuration.port': [{required: true, message: i18n.t('datasource.please_input_port'), trigger: 'blur'}],
+        'configuration.host': [{ required: true, message: i18n.t('datasource.please_input_host'), trigger: 'blur' }],
+        'configuration.url': [{ required: true, message: i18n.t('datasource.please_input_url'), trigger: 'blur' }],
+        'configuration.port': [{ required: true, message: i18n.t('datasource.please_input_port'), trigger: 'blur' }],
         'configuration.initialPoolSize': [{
           required: true,
           message: i18n.t('datasource.please_input_initial_pool_size'),
@@ -200,8 +210,8 @@ export default {
           message: i18n.t('datasource.please_input_connect_timeout'),
           trigger: 'blur'
         }],
-        'url': [{required: true, message: i18n.t('datasource.please_input_url'), trigger: 'blur'}],
-        'dataPath': [{required: true, message: i18n.t('datasource.please_input_dataPath'), trigger: 'blur'}]
+        'url': [{ required: true, message: i18n.t('datasource.please_input_url'), trigger: 'blur' }],
+        'dataPath': [{ required: true, message: i18n.t('datasource.please_input_dataPath'), trigger: 'blur' }]
       },
       schemas: [],
       canEdit: false,
@@ -216,9 +226,9 @@ export default {
         request: {
           headers: [{}],
           body: {
-            "type": "",
-            "raw": "",
-            "kvs": []
+            'type': '',
+            'raw': '',
+            'kvs': []
           }
         },
         fields: []
@@ -232,25 +242,25 @@ export default {
         request: {
           headers: [],
           body: {
-            "type": "",
-            "raw": "",
-            "kvs": []
+            'type': '',
+            'raw': '',
+            'kvs': []
           },
           authManager: {}
         },
         fields: []
       },
-      reqOptions: [{id: 'GET', label: 'GET'}, {id: 'POST', label: 'POST'}],
+      reqOptions: [{ id: 'GET', label: 'GET' }, { id: 'POST', label: 'POST' }],
       loading: false,
-      responseData: {type: 'HTTP', responseResult: {}, subRequestResults: []},
+      responseData: { type: 'HTTP', responseResult: {}, subRequestResults: [] },
       api_table_title: '',
       api_step2_active_name: 'first',
       fieldTypes: [
-        {label: this.$t('dataset.text'), value: 0},
-        {label: this.$t('dataset.time'), value: 1},
-        {label: this.$t('dataset.value'), value: 2},
-        {label: this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')', value: 3},
-        {label: this.$t('dataset.location'), value: 5}
+        { label: this.$t('dataset.text'), value: 0 },
+        { label: this.$t('dataset.time'), value: 1 },
+        { label: this.$t('dataset.value'), value: 2 },
+        { label: this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')', value: 3 },
+        { label: this.$t('dataset.location'), value: 5 }
       ],
       height: 500,
       disabledNext: false,
@@ -288,7 +298,6 @@ export default {
         connectTimeout: 5,
         customDriver: 'default'
       }
-
     },
     changeEdit() {
       this.canEdit = true
@@ -328,15 +337,15 @@ export default {
         return
       }
       let repeat = false
-      let repeatDsName = []
+      const repeatDsName = []
       this.tData.forEach(item => {
         if (item.id === this.form.type) {
           item.children.forEach(child => {
             if (this.formType === 'modify' && child.id === this.form.id) {
               return
             }
-            let configuration = JSON.parse(child.configuration)
-            if(!configuration){
+            const configuration = JSON.parse(child.configuration)
+            if (!configuration) {
               return
             }
             switch (this.form.type) {
@@ -378,16 +387,16 @@ export default {
         }
       })
 
-      let status = null;
-      if(this.datasourceType.isPlugin){
-        status = this.$refs['pluginDsConfig'].callPluginInner({methodName: 'validate'})
-      }else {
+      let status = null
+      if (this.datasourceType.isPlugin) {
+        status = this.$refs['pluginDsConfig'].callPluginInner({ methodName: 'validate' })
+      } else {
         this.$refs['dsConfig'].$refs['DsConfig'].validate(valid => {
           status = valid
         })
       }
-      if(!status){
-        return;
+      if (!status) {
+        return
       }
 
       this.$refs.dsForm.validate(valid => {
@@ -462,19 +471,19 @@ export default {
         this.$message.error(i18n.t('datasource.port_no_less_then_0'))
         return
       }
-      let status = null;
-      if(this.datasourceType.isPlugin){
-        status = this.$refs['pluginDsConfig'].callPluginInner({methodName: 'validate'})
-      }else {
+      let status = null
+      if (this.datasourceType.isPlugin) {
+        status = this.$refs['pluginDsConfig'].callPluginInner({ methodName: 'validate' })
+      } else {
         this.$refs['dsConfig'].$refs['DsConfig'].validate(valid => {
           status = valid
-          if(!valid){
+          if (!valid) {
             return
           }
         })
       }
-      if(!status){
-        return;
+      if (!status) {
+        return
       }
       this.$refs.dsForm.validate(valid => {
         if (valid) {
@@ -523,15 +532,15 @@ export default {
     changeType(init) {
       for (let i = 0; i < this.dsTypes.length; i++) {
         if (this.dsTypes[i].type === this.form.type) {
-          if(this.form.type !== 'api' && !init){
+          if (this.form.type !== 'api' && !init) {
             this.form.configuration.extraParams = this.dsTypes[i].extraParams
             this.form.configuration.customDriver = 'default'
           }
           this.datasourceType = this.dsTypes[i]
-          if(this.datasourceType.isJdbc){
+          if (this.datasourceType.isJdbc) {
             listDriverByType(this.datasourceType.type).then(res => {
               this.driverList = []
-              this.driverList.push({id: 'default', name: 'Default', driverClass:'Default'})
+              this.driverList.push({ id: 'default', name: 'Default', driverClass: 'Default' })
               this.driverList = this.driverList.concat(res.data)
             })
           }
@@ -554,7 +563,7 @@ export default {
             }
           })
         } else {
-          let index = this.form.apiConfiguration.indexOf(this.apiItem)
+          const index = this.form.apiConfiguration.indexOf(this.apiItem)
           for (let i = 0; i < this.form.apiConfiguration.length; i++) {
             if (i !== index && this.form.apiConfiguration[i].name === this.apiItem.name) {
               hasRepeatName = true
@@ -652,13 +661,13 @@ export default {
 }
 </script>
 <style scoped>
-.el-input {
+/* .el-input {
   width: 300px;
 }
 
 .el-select {
   width: 300px;
-}
+} */
 
 .ms-http-input {
   width: 500px;

From b63ffb451363cb08819cb10e7173400ff148d99b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Sun, 29 May 2022 11:01:22 +0800
Subject: [PATCH 10/17] =?UTF-8?q?fix:=20=E6=8E=A5=E5=8F=97=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E8=AE=BE=E7=BD=AE=E8=81=94=E5=8A=A8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/msg/setting.vue | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/frontend/src/views/msg/setting.vue b/frontend/src/views/msg/setting.vue
index 751b1d0339..3c67fb69b7 100644
--- a/frontend/src/views/msg/setting.vue
+++ b/frontend/src/views/msg/setting.vue
@@ -24,9 +24,7 @@
 
               <div>
                 <span v-for="channel in msg_channels" :key="channel.msgChannelId" class="auth-span">
-                  <!-- <a href="javascript:;" @click="clickAuth(node,channel)">
-                    <svg-icon style="width: 25px;height: 25px" :icon-class="checkBoxStatus(node, channel)?'lock_open':'lock_closed'" />
-                  </a> -->
+
                   <el-checkbox v-if="data.children && data.children.length > 0" v-model="data.check_all_map[channel.msgChannelId]" :indeterminate="data.indeterminate_map[channel.msgChannelId]" @change="parentBoxChange(node, channel)" />
                   <el-checkbox v-else v-model="data.check_map[channel.msgChannelId]" @change="childBoxChange(node, channel)" />
 
@@ -150,17 +148,7 @@ export default {
       const nodeId = node.id
       return this.setting_data[nodeId] && this.setting_data[nodeId].some(item => item.channelId === channel.msgChannelId && item.enable)
     },
-    clickAuth(node, channel) {
-      // const status = this.checkBoxStatus(nodeId, channel)
-      const param = {
-        typeId: node.data.id,
-        channelId: channel.msgChannelId
-      }
-      updateSetting(param).then(res => {
-        this.loadSettingData()
-        // node.checked = true
-      })
-    },
+
     nodeClick(data, node) {
     },
     getAllKidId(node, ids) {
@@ -190,7 +178,7 @@ export default {
         enable
       }
       batchUpdate(param).then(res => {
-        this.loadSettingData()
+        this.loadSettingData(this.loadTreeData)
       })
     },
     childBoxChange(node, channel) {
@@ -224,7 +212,7 @@ export default {
         channelId: channelId
       }
       updateSetting(param).then(res => {
-        this.loadSettingData()
+        this.loadSettingData(this.loadTreeData)
       })
     }
   }

From 127caff11eadb726ef971790a0cb74502de63fb3 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Sun, 29 May 2022 13:37:26 +0800
Subject: [PATCH 11/17] =?UTF-8?q?fix:=20=E7=BA=AF=E5=86=85=E7=BD=91?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E4=B8=BB=E9=A2=98=E5=88=87=E6=8D=A2=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/plugins/server/PluginCommonServer.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/plugins/server/PluginCommonServer.java b/backend/src/main/java/io/dataease/plugins/server/PluginCommonServer.java
index 03d1e3bca7..214a23e2b6 100644
--- a/backend/src/main/java/io/dataease/plugins/server/PluginCommonServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/PluginCommonServer.java
@@ -126,7 +126,8 @@ public class PluginCommonServer {
                         os.write(buffer, 0, i);
                         i = bis.read(buffer);
                     }
-                    response.setContentType("image/svg+xml");
+                    if (suffix.indexOf("svg") != -1)
+                        response.setContentType("image/svg+xml");
                     os.flush();
                 }catch (Exception e) {
                     e.printStackTrace();

From a4a665203db33ae52afce251c65bc06847973e7a Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 30 May 2022 01:11:53 +0800
Subject: [PATCH 12/17] =?UTF-8?q?fix:=20=E6=9B=BF=E6=8D=A2excel=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=BD=B1=E5=93=8D=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/dto/dataset/ExcelSheetData.java  |  4 ++
 .../service/dataset/DataSetTableService.java  | 65 +++++++++++++++----
 frontend/src/lang/en.js                       |  3 +-
 frontend/src/lang/tw.js                       |  3 +-
 frontend/src/lang/zh.js                       |  3 +-
 frontend/src/views/dataset/add/AddExcel.vue   | 15 ++++-
 6 files changed, 76 insertions(+), 17 deletions(-)

diff --git a/backend/src/main/java/io/dataease/dto/dataset/ExcelSheetData.java b/backend/src/main/java/io/dataease/dto/dataset/ExcelSheetData.java
index 77e92f703f..9380de31f9 100644
--- a/backend/src/main/java/io/dataease/dto/dataset/ExcelSheetData.java
+++ b/backend/src/main/java/io/dataease/dto/dataset/ExcelSheetData.java
@@ -3,6 +3,7 @@ package io.dataease.dto.dataset;
 import io.dataease.plugins.common.dto.datasource.TableField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 import java.util.Map;
@@ -29,4 +30,7 @@ public class ExcelSheetData {
     private String path;
     @ApiModelProperty("字段MD5")
     private String fieldsMd5;
+    @ApiModelProperty("字段变更")
+    private Boolean changeFiled = false;
+    private Boolean effectExtField = false;
 }
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index e47240e1ba..52972307a8 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -66,6 +66,8 @@ import java.text.MessageFormat;
 import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static io.dataease.commons.constants.ColumnPermissionConstants.Desensitization_desc;
@@ -1890,9 +1892,9 @@ public class DataSetTableService {
         List<ExcelSheetData> excelSheetDataList = parseExcel2(filename, file.getInputStream(), true);
         List<ExcelSheetData> retrunSheetDataList = new ArrayList<>();
 
-        if (StringUtils.isNotEmpty(tableId) && editType == 1) {
-            List<DatasetTableField> datasetTableFields = dataSetTableFieldsService.getFieldsByTableId(tableId)
-                    .stream().filter(datasetTableField -> datasetTableField.getExtField() == 0).collect(Collectors.toList());
+        if (StringUtils.isNotEmpty(tableId)) {
+            List<DatasetTableField> fields = dataSetTableFieldsService.getFieldsByTableId(tableId);
+            List<DatasetTableField> datasetTableFields = fields.stream().filter(datasetTableField -> datasetTableField.getExtField() == 0).collect(Collectors.toList());
             datasetTableFields.sort((o1, o2) -> {
                 if (o1.getColumnIndex() == null) {
                     return -1;
@@ -1904,18 +1906,57 @@ public class DataSetTableService {
             });
 
             List<String> oldFields = datasetTableFields.stream().map(DatasetTableField::getOriginName).collect(Collectors.toList());
-            for (ExcelSheetData excelSheetData : excelSheetDataList) {
-                List<TableField> fields = excelSheetData.getFields();
-                List<String> newFields = fields.stream().map(TableField::getRemarks).collect(Collectors.toList());
-                if (oldFields.equals(newFields)) {
+
+            if(editType == 1){
+                for (ExcelSheetData excelSheetData : excelSheetDataList) {
+                    List<TableField> tableFields = excelSheetData.getFields();
+                    List<String> newFields = tableFields.stream().map(TableField::getRemarks).collect(Collectors.toList());
+                    if (oldFields.equals(newFields)) {
+                        retrunSheetDataList.add(excelSheetData);
+                    }
+                }
+                if (retrunSheetDataList.size() == 0) {
+                    DataEaseException.throwException(Translator.get("i18n_excel_column_change"));
+                }
+            }else {
+                List<DatasetTableField> extFields = fields.stream().filter(datasetTableField -> datasetTableField.getExtField() > 0).collect(Collectors.toList());
+                List<String> extFieldsRefIds = new ArrayList<>();
+                for (DatasetTableField extField : extFields) {
+                    String originField = extField.getOriginName().replaceAll("[\\t\\n\\r]]", "");
+                    String regex = "\\[(.*?)]";
+                    Pattern pattern = Pattern.compile(regex);
+                    Matcher matcher = pattern.matcher(originField);
+                    while (matcher.find()) {
+                        String id = matcher.group(1);
+                        if(!extFieldsRefIds.contains(id)){
+                            extFieldsRefIds.add(id);
+                        }
+                    }
+                }
+                List<String> extFieldsRefNames = datasetTableFields.stream().filter(datasetTableField -> extFieldsRefIds.contains(datasetTableField.getId())).map(DatasetTableField::getOriginName).collect(Collectors.toList());
+                for (ExcelSheetData excelSheetData : excelSheetDataList) {
+                    List<TableField> tableFields = excelSheetData.getFields();
+                    List<String> newFields = tableFields.stream().map(TableField::getRemarks).collect(Collectors.toList());
+                    if (oldFields.equals(newFields)) {
+                        excelSheetData.setChangeFiled(false);
+                    }else {
+                        excelSheetData.setChangeFiled(true);
+                    }
+                    boolean effectExtField = false;
+                    for (String extFieldsRefName : extFieldsRefNames) {
+                        if(!newFields.contains(extFieldsRefName)){
+                            effectExtField = true;
+                        }
+                    }
+                    excelSheetData.setEffectExtField(effectExtField);
+
                     retrunSheetDataList.add(excelSheetData);
                 }
+                if (retrunSheetDataList.size() == 0) {
+                    DataEaseException.throwException(Translator.get("i18n_excel_column_change"));
+                }
             }
-
-            if (retrunSheetDataList.size() == 0) {
-                DataEaseException.throwException(Translator.get("i18n_excel_column_change"));
-            }
-        } else {
+        }else {
             retrunSheetDataList = excelSheetDataList;
         }
         retrunSheetDataList = retrunSheetDataList.stream()
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 0847bfb01d..fafa49afef 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1249,7 +1249,8 @@ export default {
       exec: 'Execute Once',
       confirm_exec: 'Manual trigger execution？',
       change_success: 'State switch successful',
-      excel_replace_msg: 'Calculation fields, custom datasets, associated datasets, dashboards, etc. may be affected. Confirm the replacement？'
+      excel_replace_msg: 'Calculation fields, custom datasets, associated datasets, dashboards, etc. may be affected. Confirm the replacement？',
+      effect_ext_field: 'Affect calculated fields'
     },
     field_group_type: 'Type',
     location: 'Location',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index f5ed387650..1b9fa015a8 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1249,7 +1249,8 @@ export default {
       exec: '執行一次',
       confirm_exec: '手動觸發執行？',
       change_success: '狀態切換成功',
-      excel_replace_msg: '可能會影響計算欄位、自定義數据集、關聯數据集、儀錶板等，確認替換？'
+      excel_replace_msg: '可能會影響計算欄位、自定義數据集、關聯數据集、儀錶板等，確認替換？',
+      effect_ext_field: '會影響計算欄位'
     },
     field_group_type: '分類',
     location: '地理位置',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 261b63bb54..b07eba1603 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1250,7 +1250,8 @@ export default {
       exec: '执行一次',
       confirm_exec: '手动触发执行？',
       change_success: '状态切换成功',
-      excel_replace_msg: '可能会影响计算字段、自定义数据集、关联数据集、仪表板等，确认替换？'
+      excel_replace_msg: '可能会影响自定义数据集、关联数据集、仪表板等，确认替换？',
+      effect_ext_field: '会影响计算字段'
     },
     field_group_type: '分类',
     location: '地理位置',
diff --git a/frontend/src/views/dataset/add/AddExcel.vue b/frontend/src/views/dataset/add/AddExcel.vue
index 8c03010a88..0b013ae397 100644
--- a/frontend/src/views/dataset/add/AddExcel.vue
+++ b/frontend/src/views/dataset/add/AddExcel.vue
@@ -310,6 +310,8 @@ export default {
       var validate = true
       var selectedSheet = []
       var sheetFileMd5 = []
+      var effectExtField = false
+      var changeFiled = false
       var selectNode = this.$refs.tree.getCheckedNodes()
       for (var i = 0; i < selectNode.length; i++) {
         if (selectNode[i].sheet) {
@@ -331,6 +333,12 @@ export default {
             })
             return
           }
+          if(selectNode[i].effectExtField){
+            effectExtField = true
+          }
+          if(selectNode[i].changeFiled){
+            changeFiled = true
+          }
           selectedSheet.push(selectNode[i])
           sheetFileMd5.push(selectNode[i].fieldsMd5)
         }
@@ -366,8 +374,11 @@ export default {
           editType: this.param.editType ? this.param.editType : 0
         }
       }
-      if (this.param.editType === 0 && this.param.tableId) {
-        $confirm(i18n.t('dataset.task.excel_replace_msg'), () => {
+
+      if (this.param.editType === 0 && this.param.tableId && (effectExtField || changeFiled)) {
+
+        var msg = effectExtField ? i18n.t('dataset.task.effect_ext_field') + ', ' + i18n.t('dataset.task.excel_replace_msg') : i18n.t('dataset.task.excel_replace_msg')
+        $confirm(msg, () => {
           this.saveExcelData(sheetFileMd5, table)
         })
       }else {

From 966d7f90a7283ded1063bc5f6929dd19469733c6 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 30 May 2022 10:06:50 +0800
Subject: [PATCH 13/17] =?UTF-8?q?fix:=20=E6=93=8D=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E5=A4=9A=E4=B8=AA=E6=93=8D=E4=BD=9C=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E7=BB=93=E6=9E=9C=E9=9B=86=E9=80=BB=E8=BE=91=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/service/sys/log/LogService.java  | 50 ++++++++-----------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/sys/log/LogService.java b/backend/src/main/java/io/dataease/service/sys/log/LogService.java
index b3687f1cbc..9d17948db8 100644
--- a/backend/src/main/java/io/dataease/service/sys/log/LogService.java
+++ b/backend/src/main/java/io/dataease/service/sys/log/LogService.java
@@ -26,6 +26,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.ss.usermodel.*;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.OutputStream;
@@ -46,15 +47,14 @@ public class LogService {
     private static Integer[] driver_file_ope = {11, 3};
 
 
-
     // 排除驱动和驱动文件的公共操作的资源类型
     // 暂时屏蔽视图日志
     // private static Integer[] COMMON_SOURCE = {1, 2,3,4,6,7,8,9};
 
-    private static Integer[] COMMON_SOURCE = {1, 2,3,6,7,8,9};
+    private static Integer[] COMMON_SOURCE = {1, 2, 3, 6, 7, 8, 9};
 
     // 增 改 删  针对公共资源的操作
-    private static Integer[] COMMON_SOURCE_OPERATE = {1 ,2 , 3};
+    private static Integer[] COMMON_SOURCE_OPERATE = {1, 2, 3};
 
     // 授权相关操作
     private static Integer[] AUTH_OPERATE = {6, 7};
@@ -63,10 +63,6 @@ public class LogService {
     private static Integer[] AUTH_SOURCE = {1, 2, 3, 11};
 
 
-
-
-
-
     @Resource
     private SysLogMapper sysLogMapper;
 
@@ -77,7 +73,6 @@ public class LogService {
     private LogManager logManager;
 
 
-
     public List<SysLogGridDTO> query(BaseGridRequest request) {
         request = detailRequest(request);
 
@@ -90,8 +85,8 @@ public class LogService {
     private BaseGridRequest detailRequest(BaseGridRequest request) {
         List<ConditionEntity> conditions = request.getConditions();
         if (CollectionUtils.isNotEmpty(conditions)) {
-            ConditionEntity optypeCondition = null;
-            ConditionEntity sourceCondition = null;
+
+            ConditionEntity uninCondition = null;
             int matchIndex = -1;
             for (int i = 0; i < conditions.size(); i++) {
                 ConditionEntity conditionEntity = conditions.get(i);
@@ -100,23 +95,21 @@ public class LogService {
 
                 if (StringUtils.isNotBlank(field) && StringUtils.equals("optype", field) && ObjectUtils.isNotEmpty(value)) {
                     matchIndex = i;
-                    optypeCondition = new ConditionEntity();
-                    sourceCondition = new ConditionEntity();
+                    uninCondition = new ConditionEntity();
+
                     List<String> values = (List<String>) value;
-                    sourceCondition.setField("source_type");
-                    optypeCondition.setField("operate_type");
-                    List<Integer> opValue = values.stream().map(v -> Integer.parseInt(v.split("-")[0])).collect(Collectors.toList());
-                    List<Integer> soValue = values.stream().map(v -> Integer.parseInt(v.split("-")[1])).collect(Collectors.toList());
-                    optypeCondition.setValue(opValue);
-                    sourceCondition.setValue(soValue);
-                    optypeCondition.setOperator(conditionEntity.getOperator());
-                    sourceCondition.setOperator(conditionEntity.getOperator());
+                    uninCondition.setField("concat(operate_type, '-de-', source_type)");
+
+                    List<String> uninValue = values.stream().map(v -> v.replace("-", "-de-")).collect(Collectors.toList());
+
+                    uninCondition.setValue(uninValue);
+                    uninCondition.setOperator(conditionEntity.getOperator());
                 }
             }
-            if (matchIndex >= 0 ) {
+            if (matchIndex >= 0) {
                 conditions.remove(matchIndex);
-                if (ObjectUtils.isNotEmpty(optypeCondition))conditions.add(optypeCondition);
-                if (ObjectUtils.isNotEmpty(sourceCondition))conditions.add(sourceCondition);
+
+                if (ObjectUtils.isNotEmpty(uninCondition)) conditions.add(uninCondition);
             }
         }
         return request;
@@ -140,7 +133,7 @@ public class LogService {
                 String operateTypeName = SysLogConstants.operateTypeName(operateVal);
                 FolderItem folderItem = new FolderItem();
                 folderItem.setId(operateVal + "-" + sourceVal);
-                folderItem.setName( Translator.get(operateTypeName) + Translator.get(sourceTypeName));
+                folderItem.setName(Translator.get(operateTypeName) + Translator.get(sourceTypeName));
                 results.add(folderItem);
             }
         }
@@ -152,7 +145,7 @@ public class LogService {
             folderItem.setId(driver_file_ope[i] + "-" + sourceType.getValue());
             String operateTypeName = SysLogConstants.operateTypeName(driver_file_ope[i]);
             String sourceTypeName = sourceType.getName();
-            folderItem.setName( Translator.get(operateTypeName) + Translator.get(sourceTypeName));
+            folderItem.setName(Translator.get(operateTypeName) + Translator.get(sourceTypeName));
             results.add(folderItem);
         }
 
@@ -166,7 +159,7 @@ public class LogService {
                 String operateTypeName = SysLogConstants.operateTypeName(operateVal);
                 FolderItem folderItem = new FolderItem();
                 folderItem.setId(operateVal + "-" + sourceVal);
-                folderItem.setName( Translator.get(operateTypeName) + Translator.get(sourceTypeName));
+                folderItem.setName(Translator.get(operateTypeName) + Translator.get(sourceTypeName));
                 results.add(folderItem);
             }
         }
@@ -177,12 +170,11 @@ public class LogService {
             folderItem.setId(panel_ext_ope[i] + "-" + sourceType.getValue());
             String operateTypeName = SysLogConstants.operateTypeName(panel_ext_ope[i]);
             String sourceTypeName = sourceType.getName();
-            folderItem.setName( Translator.get(operateTypeName) + Translator.get(sourceTypeName));
+            folderItem.setName(Translator.get(operateTypeName) + Translator.get(sourceTypeName));
             results.add(folderItem);
         }
 
 
-
         return results;
     }
 
@@ -215,7 +207,6 @@ public class LogService {
     }
 
 
-
     public void exportExcel(BaseGridRequest request) throws Exception {
         request = detailRequest(request);
         HttpServletResponse response = ServletUtils.response();
@@ -285,5 +276,4 @@ public class LogService {
     }
 
 
-
 }

From d9e4cdd18fe701968960bc2fcc13d0e3e4b6de8f Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 30 May 2022 10:22:23 +0800
Subject: [PATCH 14/17] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9log=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/service/sys/log/LogService.java    | 5 ++++-
 frontend/src/views/system/log/index.vue                      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/sys/log/LogService.java b/backend/src/main/java/io/dataease/service/sys/log/LogService.java
index 9d17948db8..fd94d87688 100644
--- a/backend/src/main/java/io/dataease/service/sys/log/LogService.java
+++ b/backend/src/main/java/io/dataease/service/sys/log/LogService.java
@@ -30,6 +30,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import java.io.OutputStream;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -266,7 +267,9 @@ public class LogService {
 
             response.setContentType("application/vnd.ms-excel");
             //文件名称
-            response.setHeader("Content-disposition", "attachment;filename=log.xlsx");
+            String fileName = "DataEase操作日志";
+            String encodeFileName = URLEncoder.encode(fileName, "UTF-8");
+            response.setHeader("Content-disposition", "attachment;filename="+encodeFileName+".xlsx");
             wb.write(outputStream);
             outputStream.flush();
             outputStream.close();
diff --git a/frontend/src/views/system/log/index.vue b/frontend/src/views/system/log/index.vue
index fb374e5e07..dfc935abe7 100644
--- a/frontend/src/views/system/log/index.vue
+++ b/frontend/src/views/system/log/index.vue
@@ -116,7 +116,7 @@ export default {
         const link = document.createElement('a')
         link.style.display = 'none'
         link.href = URL.createObjectURL(blob)
-        link.download = 'log.xlsx' // 下载的文件名
+        link.download = 'DataEase操作日志.xlsx' // 下载的文件名
         document.body.appendChild(link)
         link.click()
         document.body.removeChild(link)

From 97cfaaec9912061de3df0a66225b028db2d6cb09 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Mon, 30 May 2022 11:34:52 +0800
Subject: [PATCH 15/17] =?UTF-8?q?fix:=20=E6=96=87=E5=AD=97=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=8E=BB=E9=99=A4=20=E4=B8=AD=20=E4=B8=AD=E5=9C=BA?=
 =?UTF-8?q?=E6=99=AF=EF=BC=8C=E9=BB=98=E8=AE=A4=E4=B8=8A=20=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/dataease/DeOutWidget.vue         | 4 ++--
 frontend/src/components/widget/DeWidget/TitlePostion.vue | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue
index cf053feefc..b9b9933ebd 100644
--- a/frontend/src/components/dataease/DeOutWidget.vue
+++ b/frontend/src/components/dataease/DeOutWidget.vue
@@ -117,11 +117,11 @@ export default {
     // console.log('aaaaaa')
     const { horizontal, vertical } = this.element.style
     this.$set(this.element.style, 'horizontal', horizontal || 'left')
-    this.$set(this.element.style, 'vertical', vertical || 'top')
+    this.$set(this.element.style, 'vertical', vertical || 'center')
   },
   methods: {
     handlerPositionChange(val) {
-      const { horizontal = 'left', vertical = 'top' } = val
+      const { horizontal = 'left', vertical = 'center' } = val
       this.titleStyle = {
         width: '100%',
         textAlign: horizontal
diff --git a/frontend/src/components/widget/DeWidget/TitlePostion.vue b/frontend/src/components/widget/DeWidget/TitlePostion.vue
index f2ac85e4e6..9b115c7616 100644
--- a/frontend/src/components/widget/DeWidget/TitlePostion.vue
+++ b/frontend/src/components/widget/DeWidget/TitlePostion.vue
@@ -9,14 +9,14 @@
         <el-form-item :label="$t('chart.text_h_position')" class="form-item">
           <el-radio-group v-model="styleInfo.horizontal" size="mini">
             <el-radio-button label="left">{{ $t('chart.text_pos_left') }}</el-radio-button>
-            <el-radio-button label="center">{{ $t('chart.text_pos_center') }}</el-radio-button>
+            <el-radio-button :disabled="styleInfo.vertical === 'center'" label="center">{{ $t('chart.text_pos_center') }}</el-radio-button>
             <el-radio-button label="right">{{ $t('chart.text_pos_right') }}</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item v-if="showVertical" :label="$t('chart.text_v_position')" class="form-item">
           <el-radio-group v-model="styleInfo.vertical" size="mini">
             <el-radio-button label="top">{{ $t('chart.text_pos_top') }}</el-radio-button>
-            <el-radio-button label="center">{{ $t('chart.text_pos_center') }}</el-radio-button>
+            <el-radio-button :disabled="styleInfo.horizontal === 'center'" label="center">{{ $t('chart.text_pos_center') }}</el-radio-button>
           </el-radio-group>
         </el-form-item>
 

From c12dcb79bba117e8f0306751cd45532c2e454aa5 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 30 May 2022 13:12:52 +0800
Subject: [PATCH 16/17] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=85=AC=E5=85=B1=E9=A2=9C=E8=89=B2?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/canvas/custom-component/UserView.vue    | 10 +++++++---
 frontend/src/components/canvas/utils/utils.js          |  2 +-
 .../SubjectSetting/PanelStyle/PanelColorSelector.vue   | 10 +++++++++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index e0643d2f80..01935289c4 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -501,13 +501,17 @@ export default {
         const customStyleChart = JSON.parse(this.chart.customStyle)
         const customAttrPanel = JSON.parse(this.canvasStyleData.chart.customAttr)
         const customStylePanel = JSON.parse(this.canvasStyleData.chart.customStyle)
-        // 组件样式-背景设置
-        customStyleChart.background = customStylePanel.background
+        if (customStyleChart.background) {
+          // 组件样式-背景设置
+          customStyleChart.background = customStylePanel.background
+        }
         // 图形属性-颜色设置
         if (this.chart.type.includes('table')) {
           customAttrChart.color = customAttrPanel.tableColor
         } else {
-          customAttrChart.color = customAttrPanel.color
+          customAttrChart.color['value'] = customAttrPanel.color['value']
+          customAttrChart.color['colors'] = customAttrPanel.color['colors']
+          customAttrChart.color['alpha'] = customAttrPanel.color['alpha']
         }
         this.chart = {
           ...this.chart,
diff --git a/frontend/src/components/canvas/utils/utils.js b/frontend/src/components/canvas/utils/utils.js
index fcf325d86f..5872783eed 100644
--- a/frontend/src/components/canvas/utils/utils.js
+++ b/frontend/src/components/canvas/utils/utils.js
@@ -148,7 +148,7 @@ export function checkViewTitle(opt, id, tile) {
     const curPanelViewsData = store.state.componentViewsData
     const curComponentViewNames = []
     store.state.componentData.forEach(item => {
-      if (item.type === 'view' && item.propValue && item.propValue.viewId) {
+      if (item.type === 'view' && item.propValue && item.propValue.viewId && curPanelViewsData[item.propValue.viewId]) {
         // 更新时自己的title不加入比较
         if ((opt === 'update' && id !== item.propValue.viewId) || opt === 'new') {
           curComponentViewNames.push(curPanelViewsData[item.propValue.viewId].title)
diff --git a/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelColorSelector.vue b/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelColorSelector.vue
index 79c710b340..b14dfee476 100644
--- a/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelColorSelector.vue
+++ b/frontend/src/views/panel/SubjectSetting/PanelStyle/PanelColorSelector.vue
@@ -6,7 +6,7 @@
         width="400"
         trigger="click"
       >
-        <color-selector :source-type="sourceType" :chart="chart" @onColorChange="onColorChange" />
+        <color-selector :chart="chart" :property-inner="propertyInner" @onColorChange="onColorChange" />
         <el-button slot="reference" size="mini" class="shape-item">{{ $t('chart.color') }}<i class="el-icon-setting el-icon--right" /></el-button>
       </el-popover>
     </div>
@@ -29,6 +29,14 @@ export default {
       required: false
     }
   },
+  data() {
+    return {
+      propertyInner: [
+        'value',
+        'alpha'
+      ]
+    }
+  },
   methods: {
     onColorChange(colorForm) {
       this.$emit('onColorChange', colorForm)

From 989d0ea04e6c6796f82da6daa2dece6a77ddcc4a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 30 May 2022 13:38:08 +0800
Subject: [PATCH 17/17] =?UTF-8?q?refactor:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E5=90=8D=E7=A7=B0=E9=87=8D=E5=A4=8D=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/custom-component/UserView.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index 01935289c4..bb6b9fd515 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -858,6 +858,9 @@ export default {
         this.chart.stylePriority = param.viewInfo.stylePriority
         this.sourceCustomAttrStr = this.chart.customAttr
         this.sourceCustomStyleStr = this.chart.customStyle
+        if (this.componentViewsData[this.chart.id]) {
+          this.componentViewsData[this.chart.id]['title'] = this.chart.title
+        }
         this.mergeScale()
       }
     }