refactor: 解决冲突

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

@@ -72,11 +72,12 @@ public class DataSetTableController {
     }, logical = Logical.AND)
     @ApiOperation("更新")
     @PostMapping("update")
-    public List<DatasetTable> save(@RequestBody DataSetTableRequest datasetTable) throws Exception {
+    public List<VAuthModelDTO> save(@RequestBody DataSetTableRequest datasetTable) throws Exception {
         if (datasetTable.getType().equalsIgnoreCase("excel")) {
-            return dataSetTableService.saveExcel(datasetTable);
+            List<String> ids = dataSetTableService.saveExcel(datasetTable).stream().map(DatasetTable::getId).collect(Collectors.toList());
+            return vAuthModelService.queryAuthModelByIds("dataset", ids);
         } else {
-            return Collections.singletonList(dataSetTableService.save(datasetTable));
+            return vAuthModelService.queryAuthModelByIds("dataset", Collections.singletonList(dataSetTableService.save(datasetTable).getId()));
         }
     }
 

backend/src/main/java/io/dataease/service/chart/ChartViewService.java

@@ -529,6 +529,9 @@ public class ChartViewService {
             xAxisForRequest.addAll(xAxis);
             xAxisForRequest.addAll(extStack);
             datasourceRequest.setXAxis(xAxisForRequest);
+            List<ChartViewFieldDTO> yAxisForRequest = new ArrayList<>();
+            yAxisForRequest.addAll(yAxis);
+            datasourceRequest.setYAxis(yAxisForRequest);
             data = datasourceProvider.getData(datasourceRequest);
         } else if (table.getMode() == 1) {// 抽取
             datasourceRequest.setDatasource(ds);
@@ -1037,6 +1040,7 @@ public class ChartViewService {
             }
             if (StringUtils.isNotEmpty(totalPageSql) && StringUtils.equalsIgnoreCase((String) mapSize.get("tablePageMode"), "page")) {
                 datasourceRequest.setQuery(totalPageSql);
+                datasourceRequest.setTotalPageFlag(true);
                 java.util.List<java.lang.String[]> tmpData = datasourceProvider.getData(datasourceRequest);
                 totalItems = CollectionUtils.isEmpty(tmpData) ? 0 : Long.valueOf(tmpData.get(0)[0]);
                 totalPage = (totalItems / pageInfo.getPageSize()) + (totalItems % pageInfo.getPageSize() > 0 ? 1 : 0);
@@ -1047,6 +1051,10 @@ public class ChartViewService {
             xAxisForRequest.addAll(xAxis);
             xAxisForRequest.addAll(extStack);
             datasourceRequest.setXAxis(xAxisForRequest);
+            List<ChartViewFieldDTO> yAxisForRequest = new ArrayList<>();
+            yAxisForRequest.addAll(yAxis);
+            datasourceRequest.setYAxis(yAxisForRequest);
+            datasourceRequest.setTotalPageFlag(false);
             data = datasourceProvider.getData(datasourceRequest);
             if (CollectionUtils.isNotEmpty(assistFields)) {
                 datasourceAssistRequest.setQuery(assistSQL(datasourceRequest.getQuery(), assistFields));

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

@@ -34,6 +34,7 @@ import io.dataease.plugins.common.base.mapper.*;
 import io.dataease.plugins.common.constants.DatasetType;
 import io.dataease.plugins.common.constants.DatasourceTypes;
 import io.dataease.plugins.common.constants.DeTypeConstants;
+import io.dataease.plugins.common.dto.chart.ChartViewFieldDTO;
 import io.dataease.plugins.common.dto.dataset.SqlVariableDetails;
 import io.dataease.plugins.common.dto.datasource.DataSourceType;
 import io.dataease.plugins.common.dto.datasource.TableField;
@@ -712,6 +713,7 @@ public class DataSetTableService {
                 datasourceRequest.setPreviewData(true);
                 try {
                     datasourceRequest.setPageable(true);
+                    datasourceRequest.setPermissionFields(fields);
                     data.addAll(datasourceProvider.getData(datasourceRequest));
                 } catch (Exception e) {
                     logger.error(e.getMessage());

backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java

@@ -195,6 +195,7 @@ public class DirectFieldService implements DataSetFieldService {
             datasourceRequest.setQuery(qp.createQuerySQL(tableName, permissionFields, !needSort, null, customFilter, rowPermissionsTree, deSortFields));
         }
         LogUtil.info(datasourceRequest.getQuery());
+        datasourceRequest.setPermissionFields(permissionFields);
         List<String[]> rows = datasourceProvider.getData(datasourceRequest);
         if (!needMapping) {
             List<Object> results = rows.stream().map(row -> row[0]).distinct().collect(Collectors.toList());

frontend/src/views/dataset/add/AddCustom.vue

@@ -105,9 +105,10 @@
 </template>
 
 <script>
-import { post, getTable } from '@/api/dataset/dataset'
+import { getTable, post } from '@/api/dataset/dataset'
 import DatasetGroupSelector from '../common/DatasetGroupSelector'
 import DatasetCustomField from '../common/DatasetCustomField'
+import { updateCacheTree } from '@/components/canvas/utils/utils'
 
 export default {
   name: 'AddCustom',
@@ -252,6 +253,12 @@ export default {
       }
       post('/dataset/table/update', table).then(response => {
         // this.$store.dispatch('dataset/setSceneData', new Date().getTime())
+        if (table.id) {
+          const renameNode = { id: table.id, name: table.name, label: table.name }
+          updateCacheTree('rename', 'dataset-tree', renameNode, JSON.parse(localStorage.getItem('dataset-tree')))
+        } else {
+          updateCacheTree('batchNew', 'dataset-tree', response.data, JSON.parse(localStorage.getItem('dataset-tree')))
+        }
         this.$emit('saveSuccess', table)
         this.cancel()
       })
@@ -338,6 +345,7 @@ export default {
 .span-number {
   color: #0a7be0;
 }
+
 .table-count {
   color: #606266;
 }

frontend/src/views/dataset/add/AddExcel.vue

@@ -238,6 +238,7 @@ import store from '@/store'
 import msgCfm from '@/components/msgCfm/index'
 import cancelMix from './cancelMix'
 import Config from "@/settings";
+import { updateCacheTree } from '@/components/canvas/utils/utils'
 
 const token = getToken()
 const RefreshTokenKey = Config.RefreshTokenKey
@@ -577,6 +578,9 @@ export default {
             table.mergeSheet = false
             post('/dataset/table/update', table)
               .then((response) => {
+                if (!table.id) {
+                  updateCacheTree('batchNew', 'dataset-tree', response.data, JSON.parse(localStorage.getItem('dataset-tree')))
+                }
                 this.openMessageSuccess('deDataset.set_saved_successfully')
                 this.cancel(response.data)
               })
@@ -590,6 +594,9 @@ export default {
         this.loading = true
         post('/dataset/table/update', table)
           .then((response) => {
+            if (!table.id) {
+              updateCacheTree('batchNew', 'dataset-tree', response.data, JSON.parse(localStorage.getItem('dataset-tree')))
+            }
             this.openMessageSuccess('deDataset.set_saved_successfully')
             this.cancel(response.data)
           })
@@ -645,10 +652,12 @@ export default {
     border-top-right-radius: 13px;
     border-bottom-right-radius: 13px;
   }
+
   .table-list {
     p {
       margin: 0;
     }
+
     height: 100%;
     width: 240px;
     padding: 16px 12px;
@@ -661,6 +670,7 @@ export default {
       display: flex;
       justify-content: space-between;
       color: var(--deTextPrimary, #1f2329);
+
       i {
         font-size: 14px;
         color: var(--deTextPlaceholder, #8f959e);
@@ -674,10 +684,12 @@ export default {
     .table-checkbox-list {
       height: calc(100% - 100px);
       overflow-y: auto;
+
       .custom-tree-node {
         position: relative;
         width: 80%;
         display: flex;
+
         .label {
           overflow: hidden;
           white-space: nowrap;
@@ -685,11 +697,13 @@ export default {
           width: 85%;
         }
       }
+
       .error-name-exist {
         position: absolute;
         top: 0;
         right: 0;
       }
+
       .item {
         height: 40px;
         width: 215px;
@@ -727,6 +741,7 @@ export default {
       display: flex;
       align-items: center;
       position: relative;
+
       .name {
         font-size: 14px;
         font-weight: 400;
@@ -757,10 +772,12 @@ export default {
         padding: 2px 1.5px;
         display: inline-block;
         cursor: pointer;
+
         i {
           margin-left: 4px;
           font-size: 12px;
         }
+
         &:hover {
           background: rgba(31, 35, 41, 0.1);
           border-radius: 4px;

frontend/src/views/dataset/add/AddSQL.vue

@@ -149,7 +149,9 @@
             $t('deDataset.to_start_using')
           }}</span>
         <template v-else>
-          <el-input :placeholder="$t('fu.search_bar.please_input')" style="padding: 5px" size="small" v-model="keywords"></el-input>
+          <el-input :placeholder="$t('fu.search_bar.please_input')" style="padding: 5px" size="small"
+                    v-model="keywords"
+          ></el-input>
           <div
             v-if="dataSource && !dataTable"
             v-loading="tableLoading"
@@ -269,7 +271,8 @@
               :image-size="60"
               :image="errImg"
               :description="$t('deDataset.run_failed')"
-            >{{ errMsgCont }}</el-empty>
+            >{{ errMsgCont }}
+            </el-empty>
             <el-table
               v-else
               :data="plxTableData"
@@ -520,13 +523,15 @@
                 @click="closeVariableMgm"
               >{{
                   $t('dataset.cancel')
-              }}</deBtn>
+                }}
+              </deBtn>
               <deBtn
                 type="primary"
                 @click="saveVariable()"
               >{{
                   $t('dataset.confirm')
-              }}</deBtn>
+                }}
+              </deBtn>
             </div>
           </el-drawer>
         </div>
@@ -536,9 +541,8 @@
 </template>
 
 <script>
-import { post, listDatasource, isKettleRunning } from '@/api/dataset/dataset'
+import { getTable, isKettleRunning, listDatasource, post } from '@/api/dataset/dataset'
 import { codemirror } from 'vue-codemirror'
-import { getTable } from '@/api/dataset/dataset'
 import { Base64 } from 'js-base64'
 // 核心样式
 import 'codemirror/lib/codemirror.css'
@@ -568,6 +572,8 @@ import cancelMix from './cancelMix'
 import { pySort } from './util'
 import _ from 'lodash'
 import GridTable from '@/components/gridTable/index.vue'
+import { updateCacheTree } from '@/components/canvas/utils/utils'
+
 export default {
   name: 'AddSQL',
   components: { codemirror, GridTable },
@@ -575,7 +581,8 @@ export default {
   props: {
     param: {
       type: Object,
-      default: () => {}
+      default: () => {
+      }
     }
   },
   data() {
@@ -932,7 +939,8 @@ export default {
           this.sqlData = response.data.listObject
           this.paginationConfig.total = response.data.itemCount
         })
-        .catch(() => {})
+        .catch(() => {
+        })
     },
     save() {
       if (!this.dataSource || this.datasource === '') {
@@ -965,6 +973,12 @@ export default {
       }
       post('/dataset/table/update', table)
         .then((response) => {
+          if (table.id) {
+            const renameNode = { id: table.id, name: table.name, label: table.name }
+            updateCacheTree('rename', 'dataset-tree', renameNode, JSON.parse(localStorage.getItem('dataset-tree')))
+          } else {
+            updateCacheTree('batchNew', 'dataset-tree', response.data, JSON.parse(localStorage.getItem('dataset-tree')))
+          }
           this.openMessageSuccess('deDataset.set_saved_successfully')
           this.cancel(response.data)
         })
@@ -975,14 +989,16 @@ export default {
     onCopy(e) {
       this.openMessageSuccess('commons.copy_success')
     },
-    onError(e) {},
+    onError(e) {
+    },
     showSQL(val) {
       this.sql = val || ''
     },
     onCmReady(cm) {
       this.codemirror.setSize('-webkit-fill-available', 'auto')
     },
-    onCmFocus(cm) {},
+    onCmFocus(cm) {
+    },
     onCmCodeChange(newCode) {
       this.sql = newCode
       this.$emit('codeChange', this.sql)
@@ -1068,6 +1084,7 @@ export default {
 
   .select-type {
     width: 180px;
+
     .el-input__inner {
       padding-left: 32px;
     }
@@ -1079,6 +1096,7 @@ export default {
     top: 50%;
     transform: translateY(-50%);
   }
+
   .content {
     height: 62px;
     width: 822px;
@@ -1097,14 +1115,17 @@ export default {
       font-size: 14px;
       color: var(--primary, #3370ff);
     }
+
     margin-bottom: 16px;
   }
 }
+
 .dataset-sql {
   height: 100%;
   width: 100%;
   display: flex;
   flex-direction: column;
+
   .sql-editer {
     background: #f5f6f7;
     padding: 16px 24px;
@@ -1115,11 +1136,13 @@ export default {
     display: flex;
     flex-direction: row-reverse;
     overflow: hidden;
+
     .data-reference {
       width: 280px;
       height: 100%;
       overflow: hidden;
       border-left: 1px solid var(--deCardStrokeColor, #dee0e3);
+
       .no-select-datasource {
         font-family: PingFang SC;
         font-size: 14px;
@@ -1129,6 +1152,7 @@ export default {
         width: 100%;
         padding: 16px 12px;
       }
+
       .table-database-name {
         font-family: PingFang SC;
         font-size: 16px;
@@ -1136,6 +1160,7 @@ export default {
         color: var(--deTextPrimary, #1f2329);
         padding: 16px 12px;
         border-bottom: 1px solid var(--deCardStrokeColor, #dee0e3);
+
         p {
           display: flex;
           align-items: center;
@@ -1161,6 +1186,7 @@ export default {
         padding: 16px 8px;
         height: calc(100vh - 242px);
         overflow: auto;
+
         .table-or-field {
           height: 40px;
           width: 100%;
@@ -1203,34 +1229,40 @@ export default {
             i {
               display: block;
             }
+
             background: rgba(31, 35, 41, 0.1);
           }
         }
       }
     }
+
     .sql-table {
       flex: 1;
       height: 100%;
       display: flex;
       flex-direction: column;
       overflow: hidden;
+
       .code-container {
         background: #f5f6f7;
         box-sizing: border-box;
         min-height: 248px;
         color: var(--deTextPrimary, #1f2329);
+
         .CodeMirror {
           height: 100% !important;
         }
       }
     }
   }
+
   .sql-result {
     font-family: PingFang SC;
     font-size: 14px;
     overflow-y: auto;
     box-sizing: border-box;
     flex: 1;
+
     .sql-title {
       user-select: none;
       height: 54px;
@@ -1247,6 +1279,7 @@ export default {
         color: var(--deTextSecondary, #646a73);
         margin-left: 12px;
       }
+
       .drag {
         position: absolute;
         top: 0;
@@ -1271,6 +1304,7 @@ export default {
       padding: 0 25px 18px 25px;
       overflow-y: auto;
       box-sizing: border-box;
+
       .el-empty__bottom,
       .el-empty__description p {
         font-family: PingFang SC;
@@ -1281,16 +1315,20 @@ export default {
       }
     }
   }
+
   .table-container {
     height: calc(100% - 125px);
     padding: 0 24px;
+
     .mar6 {
       margin-right: 6px;
     }
+
     .mar3 {
       margin-left: -3px;
     }
   }
+
   .table-container-filter {
     height: calc(100% - 110px);
   }

frontend/src/views/dataset/add/AddUnion.vue

@@ -97,12 +97,14 @@
           @click="closeSelectDs()"
         >{{
             $t('dataset.cancel')
-        }}</deBtn>
+          }}
+        </deBtn>
         <deBtn
           :disabled="!tempDs.id"
           type="primary"
           @click="confirmSelectDs()"
-        >{{ $t('dataset.confirm') }}</deBtn>
+        >{{ $t('dataset.confirm') }}
+        </deBtn>
       </div>
     </el-drawer>
 
@@ -127,13 +129,15 @@
           @click="closeEditUnion()"
         >{{
             $t('dataset.cancel')
-        }}</deBtn>
+          }}
+        </deBtn>
         <deBtn
           type="primary"
           @click="confirmEditUnion()"
         >{{
             $t('dataset.confirm')
-        }}</deBtn>
+          }}
+        </deBtn>
       </div>
     </el-drawer>
   </div>
@@ -148,6 +152,8 @@ import { post } from '@/api/dataset/dataset'
 import UnionPreview from '@/views/dataset/add/union/UnionPreview'
 import cancelMix from './cancelMix'
 import msgCfm from '@/components/msgCfm/index'
+import { updateCacheTree } from '@/components/canvas/utils/utils'
+
 export default {
   name: 'AddUnion',
   components: {
@@ -267,6 +273,12 @@ export default {
       }
       post('/dataset/table/update', table)
         .then((response) => {
+          if (table.id) {
+            const renameNode = { id: table.id, name: table.name, label: table.name }
+            updateCacheTree('rename', 'dataset-tree', renameNode, JSON.parse(localStorage.getItem('dataset-tree')))
+          } else {
+            updateCacheTree('batchNew', 'dataset-tree', response.data, JSON.parse(localStorage.getItem('dataset-tree')))
+          }
           this.$emit('saveSuccess', table)
           this.cancel(response.data)
         })
@@ -413,6 +425,7 @@ export default {
     overflow-y: auto;
     box-sizing: border-box;
     flex: 1;
+
     .sql-title {
       user-select: none;
       height: 54px;
@@ -437,6 +450,7 @@ export default {
         color: var(--deTextSecondary, #646a73);
         margin-left: 12px;
       }
+
       .drag {
         position: absolute;
         top: 0;