Merge branch 'dev' of github.com:dataease/dataease into dev

backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java

@@ -73,6 +73,7 @@ public class DataSetTableFieldController {
     @ApiOperation("保存")
     @PostMapping("save")
     public DatasetTableField save(@RequestBody DatasetTableField datasetTableField) {
+        dataSetTableFieldsService.checkFieldName(datasetTableField);
         return dataSetTableFieldsService.save(datasetTableField);
     }
 
@@ -85,7 +86,7 @@ public class DataSetTableFieldController {
     @ApiOperation("多字段值枚举")
     @PostMapping("linkMultFieldValues")
     public List<Object> linkMultFieldValues(@RequestBody MultFieldValuesRequest multFieldValuesRequest) throws Exception {
-        HttpServletRequest request =((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         String linkToken = request.getHeader(F2CLinkFilter.LINK_TOKEN_KEY);
         DecodedJWT jwt = JWT.decode(linkToken);
         Long userId = jwt.getClaim("userId").asLong();

backend/src/main/java/io/dataease/plugins/server/RowPermissionsController.java

@@ -41,6 +41,9 @@ public class RowPermissionsController {
             if(!CollectionUtils.isEmpty(rowPermissionsDTOS) && rowPermissionsDTOS.size() > 1){
                 throw new Exception(Translator.get("i18n_rp_exist"));
             }
+            if(rowPermissionsDTOS.size() == 1 && !rowPermissionsDTOS.get(0).getId().equalsIgnoreCase(datasetRowPermissions.getId())){
+                throw new Exception(Translator.get("i18n_rp_exist"));
+            }
         }
         rowPermissionService.save(datasetRowPermissions);
     }

backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java

@@ -3,7 +3,9 @@ package io.dataease.service.dataset;
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.DatasetTableFieldExample;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
+import io.dataease.commons.exception.DEException;
 import io.dataease.commons.utils.DorisTableUtils;
+import io.dataease.i18n.Translator;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -46,6 +48,21 @@ public class DataSetTableFieldsService {
         return datasetTableField;
     }
 
+    public void checkFieldName(DatasetTableField datasetTableField) {
+        if (StringUtils.isNotEmpty(datasetTableField.getName()) && StringUtils.isNotEmpty(datasetTableField.getTableId())) {
+            DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample();
+            DatasetTableFieldExample.Criteria criteria = datasetTableFieldExample.createCriteria();
+            criteria.andNameEqualTo(datasetTableField.getName()).andTableIdEqualTo(datasetTableField.getTableId());
+            if (StringUtils.isNotEmpty(datasetTableField.getId())) {
+                criteria.andIdNotEqualTo(datasetTableField.getId());
+            }
+            List<DatasetTableField> datasetTableFields = datasetTableFieldMapper.selectByExample(datasetTableFieldExample);
+            if (CollectionUtils.isNotEmpty(datasetTableFields)) {
+                DEException.throwException(Translator.get("i18n_field_name_repeat"));
+            }
+        }
+    }
+
     public List<DatasetTableField> list(DatasetTableField datasetTableField) {
         DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample();
         DatasetTableFieldExample.Criteria criteria = datasetTableFieldExample.createCriteria();

backend/src/main/resources/i18n/messages_en_US.properties

@@ -297,4 +297,5 @@ i18n_invalid_ds=Invalid Datasource
 任务管理=Task Manager
 数据同步=Data Sync
 定时报告=Regular report
-i18n_rp_exist=Row permission of the same type already exists
\ No newline at end of file
+i18n_rp_exist=Row permission of the same type already exists
+i18n_field_name_repeat=Field name can't repeat

backend/src/main/resources/i18n/messages_zh_CN.properties

@@ -296,4 +296,5 @@ i18n_invalid_ds=无效数据源
 任务管理=任务管理
 数据同步=数据同步
 定时报告=定时报告
-i18n_rp_exist=已有同类型的行权限存在
\ No newline at end of file
+i18n_rp_exist=已有同类型的行权限存在
+i18n_field_name_repeat=字段名不能重复

backend/src/main/resources/i18n/messages_zh_TW.properties

@@ -299,4 +299,5 @@ i18n_invalid_ds=無效數據源
 任务管理=任務管理
 数据同步=數據同步
 定时报告=定時報告
-i18n_rp_exist=已有同類型餓行權限存在
\ No newline at end of file
+i18n_rp_exist=已有同類型餓行權限存在
+i18n_field_name_repeat=字段名不能重復

frontend/src/components/canvas/custom-component/UserView.vue

@@ -315,7 +315,7 @@ export default {
     this.refId = uuid.v1
     if (this.element && this.element.propValue && this.element.propValue.viewId) {
       const hasFilter = this.componentData.filter(item => item.type === 'custom').some(item => item.options.value && !(item.options.value instanceof Object) || (item.options.attrs && item.options.attrs.default && item.options.attrs.default.isDynamic))
-      hasFilter || this.getData(this.element.propValue.viewId, false)
+      if (!hasFilter || this.filters.length > 0) { this.getData(this.element.propValue.viewId, false) }
     }
   },
   methods: {

frontend/src/components/widget/DeWidget/DeSelectGrid.vue

@@ -17,13 +17,13 @@
           {{ $t('commons.all') }}</el-checkbox>
 
         <el-checkbox-group v-model="value" @change="handleCheckedChange">
-          <el-checkbox v-for="item in datas.filter(node => node.id && node.id.includes(keyWord))" :key="item.id" :label="item.id">{{ item.id }}</el-checkbox>
+          <el-checkbox v-for="item in datas.filter(node => !keyWord || (node.id && node.id.includes(keyWord)))" :key="item.id" :label="item.id">{{ item.id }}</el-checkbox>
         </el-checkbox-group>
       </div>
 
       <div v-else class="radio-group-container">
         <el-radio-group v-model="value" @change="changeRadioBox">
-          <el-radio v-for="(item, index) in datas.filter(node => node.id && node.id.includes(keyWord))" :key="index" :label="item.id" @click.native.prevent="testChange(item)">
+          <el-radio v-for="(item, index) in datas.filter(node => !keyWord || (node.id && node.id.includes(keyWord)))" :key="index" :label="item.id" @click.native.prevent="testChange(item)">
             <span>{{ item.id }}</span>
           </el-radio>
         </el-radio-group>
@@ -36,8 +36,8 @@
 </template>
 
 <script>
-import {multFieldValues, linkMultFieldValues} from '@/api/dataset/dataset'
-import {getLinkToken, getToken} from "@/utils/auth";
+import { multFieldValues, linkMultFieldValues } from '@/api/dataset/dataset'
+import { getLinkToken, getToken } from '@/utils/auth'
 export default {
 
   props: {
@@ -109,7 +109,7 @@ export default {
     'element.options.attrs.fieldId': function(value, old) {
       if (typeof value === 'undefined' || value === old) return
       this.datas = []
-      let method =  multFieldValues
+      let method = multFieldValues
       const token = this.$store.getters.token || getToken()
       const linkToken = this.$store.getters.linkToken || getLinkToken()
       if (!token && linkToken) {
@@ -117,16 +117,16 @@ export default {
       }
       this.element.options.attrs.fieldId &&
           this.element.options.attrs.fieldId.length > 0 &&
-      method({fieldIds: this.element.options.attrs.fieldId.split(',')}).then(res => {
-            this.datas = this.optionDatas(res.data)
-          }) || (this.element.options.value = '')
+      method({ fieldIds: this.element.options.attrs.fieldId.split(',') }).then(res => {
+        this.datas = this.optionDatas(res.data)
+      }) || (this.element.options.value = '')
     },
     'element.options.attrs.multiple': function(value, old) {
       if (typeof old === 'undefined' || value === old) return
-      if (!this.inDraw) {
-        this.value = value ? [] : null
-        this.element.options.value = ''
-      }
+      // if (!this.inDraw) {
+      this.value = value ? [] : null
+      this.element.options.value = ''
+      // }
 
       this.show = false
       this.$nextTick(() => {
@@ -148,7 +148,7 @@ export default {
         if (!token && linkToken) {
           method = linkMultFieldValues
         }
-        method({fieldIds: this.element.options.attrs.fieldId.split(',')}).then(res => {
+        method({ fieldIds: this.element.options.attrs.fieldId.split(',') }).then(res => {
           this.datas = this.optionDatas(res.data)
           if (this.element.options.attrs.multiple) {
             this.checkAll = this.value.length === this.datas.length

frontend/src/views/chart/view/ChartEdit.vue

@@ -1466,11 +1466,11 @@ export default {
         }).catch(err => {
           this.resetView()
           this.resetDrill()
-          this.httpRequest.status = err.response.data.success
-          this.httpRequest.msg = err.response.data.message
           this.$nextTick(() => {
             this.getChart(id)
           })
+          this.httpRequest.status = err.response.data.success
+          this.httpRequest.msg = err.response.data.message
           return true
         })
       } else {

frontend/src/views/dataset/data/FieldEdit.vue

@@ -347,6 +347,8 @@ export default {
 
       post('/dataset/field/save', item).then(response => {
         this.initField()
+      }).catch(res => {
+        this.initField()
       })
     },
 

frontend/src/views/panel/GrantAuth/shareTree.vue

@@ -3,7 +3,7 @@
     <el-row>
       <span class="header-title">{{ $t('panel.share_in') }}</span>
       <div class="block" style="margin-top:8px;">
-        <el-tree :data="datas" :props="defaultProps" :highlight-current="true" node-key="name" :default-expanded-keys="expandNodes" @node-click="handleNodeClick">
+        <el-tree ref="topTree" :data="datas" :props="defaultProps" :highlight-current="true" node-key="name" :default-expanded-keys="expandNodes" @node-click="handleNodeClick">
           <span slot-scope="{ data }" class="custom-tree-node father">
             <span style="display: flex; flex: 1 1 0%; width: 0px;" :class="!!data.msgNode ? 'msg-node-class': ''">
               <span v-if="!!data.id">
@@ -20,7 +20,7 @@
     <el-row>
       <span class="header-title">{{ $t('panel.share_out') }}</span>
       <div class="block" style="margin-top:8px;">
-        <el-tree :data="outDatas" :props="defaultProps" :highlight-current="true" node-key="name" :default-expand-all="true">
+        <el-tree ref="botTree" :data="outDatas" :props="defaultProps" :highlight-current="true" node-key="name" :default-expand-all="true">
           <span slot-scope="{ data }" class="custom-tree-node father">
             <span style="display: flex; flex: 1 1 0%; width: 0px;" @click="viewMyShare(data)">
               <span v-if="!!data.id">
@@ -110,6 +110,7 @@ export default {
         this.$store.dispatch('panel/setPanelInfo', data)
         bus.$emit('set-panel-show-type', 1)
       })
+      this.$refs['botTree'].setCurrentKey(null)
     },
     viewMyShare(data) {
       get('panel/group/findOne/' + data.id).then(response => {
@@ -119,6 +120,7 @@ export default {
         this.$store.dispatch('panel/setPanelInfo', data)
         bus.$emit('set-panel-show-type', 2)
       })
+      this.$refs['topTree'].setCurrentKey(null)
     },
     resetID(data) {
       if (data) {