refactror(应用): 应用编辑权限控制优化

backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java

@@ -85,11 +85,7 @@ public class DatasourceController {
     @ApiOperation("查询数据源详情")
     @PostMapping("/get/{id}")
     public DatasourceDTO getDatasource(@PathVariable String id) throws Exception {
-        DatasourceUnionRequest request = new DatasourceUnionRequest();
+        return datasourceService.getDataSourceDetails(id);
-        request.setUserId("1");
-        request.setId(id);
-        List<DatasourceDTO> datasourceList = datasourceService.getDatasourceList(request);
-        return CollectionUtils.isNotEmpty(datasourceList) ? datasourceList.get(0) : null;
     }
 
     @ApiOperation("查询当前用户数据源")

backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.java

@@ -15,7 +15,7 @@ public interface ExtDataSourceMapper {
 
     List<DatasourceDTO> findByPanelId(@Param("panelId") String panelId);
 
-
+    DatasourceDTO queryDetails(@Param("datasourceId") String datasourceId,@Param("userId") String userId);
 
 
 }

backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.xml

@@ -130,5 +130,12 @@
         WHERE panel_view.panel_id = #{panelId}
     </select>
 
+    <select id="queryDetails" resultMap="BaseResultMapDTO">
+        select datasource.*,
+               get_auths(id, 'link', #{userId}) as `privileges`
+        from datasource
+        where id = #{datasourceId}
+    </select>
+
 
 </mapper>

backend/src/main/java/io/dataease/service/datasource/DatasourceService.java

@@ -152,6 +152,12 @@ public class DatasourceService {
         request.setSort("update_time desc");
         List<DatasourceDTO> datasourceDTOS = extDataSourceMapper.queryUnion(request);
         datasourceDTOS.forEach(datasourceDTO -> {
+            datasourceTrans(datasourceDTO);
+        });
+        return datasourceDTOS;
+    }
+
+    private void datasourceTrans(DatasourceDTO datasourceDTO){
         types().forEach(dataSourceType -> {
             if (dataSourceType.getType().equalsIgnoreCase(datasourceDTO.getType())) {
                 datasourceDTO.setTypeDesc(dataSourceType.getName());
@@ -206,10 +212,15 @@ public class DatasourceService {
                 }
             }
         }
-        });
-        return datasourceDTOS;
     }
 
+    public DatasourceDTO getDataSourceDetails(String datasourceId){
+        DatasourceDTO result =  extDataSourceMapper.queryDetails(datasourceId,String.valueOf(AuthUtils.getUser().getUserId()));
+        if(result != null){
+            this.datasourceTrans(result);
+        }
+        return result;
+    }
     public List<DatasourceDTO> gridQuery(BaseGridRequest request) {
         //如果没有查询条件增加一个默认的条件
         if (CollectionUtils.isEmpty(request.getConditions())) {

backend/src/main/java/io/dataease/service/panel/PanelGroupService.java

@@ -814,8 +814,8 @@ public class PanelGroupService {
         // dataset check
         if (CollectionUtils.isEmpty(datasetTablesInfo)) {
             return new PanelExport2App("this panel don't have dataset");
-        } else if (datasetTablesInfo.stream().filter(datasetTable -> datasetTable.getType().equals("excel")).collect(Collectors.toList()).size() > 0) {
+        } else if (datasetTablesInfo.stream().filter(datasetTable -> datasetTable.getType().equals("excel") || datasetTable.getType().equals("api")).collect(Collectors.toList()).size() > 0) {
-            return new PanelExport2App("this panel have dataset witch type is excel");
+            return new PanelExport2App("this panel have dataset witch type is excel or api");
         }
 
         //datasource check

frontend/src/views/panel/appTemplateMarket/log/index.vue

@@ -224,6 +224,7 @@ import {
 import { deleteLogAndResource, logGrid } from '@/api/appTemplateMarket/log'
 import { findOneWithParent } from '@/api/panel/panel'
 import AppTemplateApply from '@/views/panel/appTemplate/component/AppTemplateApply'
+import { hasDataPermission } from '@/utils/permission'
 
 export default {
   name: 'AppTemplateLog',
@@ -308,7 +309,8 @@ export default {
         panelName: item.panelName,
         datasourcePrivileges: item.datasourcePrivileges,
         panelPrivileges: item.panelPrivileges,
-        datasetPrivileges: item.datasetPrivileges
+        datasetPrivileges: item.datasetPrivileges,
+        appMarketEdit: hasDataPermission('manage', item.datasourcePrivileges)
       }
       this.$refs.templateEditApply.init(param)
     },

frontend/src/views/system/datasource/DsForm.vue

@@ -87,7 +87,7 @@
             >
               <treeselect
                 v-model="attachForm.panelGroupPid"
-                :disabled="!(formType === 'add' ? true : hasDataPermission('manage', outerParams.panelPrivileges))"
+                :disabled="baseInfoDisabledCheck(outerParams.panelPrivileges)"
                 :clearable="false"
                 :options="panelGroupList"
                 :normalizer="normalizer"
@@ -103,7 +103,7 @@
             >
               <el-input
                 v-model="attachForm.panelName"
-                :disabled="!(formType === 'add' ? true : hasDataPermission('manage', outerParams.panelPrivileges))"
+                :disabled="baseInfoDisabledCheck(outerParams.panelPrivileges)"
               />
             </el-form-item>
             <el-form-item
@@ -112,7 +112,7 @@
             >
               <treeselect
                 v-model="attachForm.datasetGroupPid"
-                :disabled="!(formType === 'add' ? true : hasDataPermission('manage', outerParams.datasetPrivileges))"
+                :disabled="baseInfoDisabledCheck(outerParams.datasetPrivileges)"
                 :clearable="false"
                 :options="datasetGroupList"
                 :normalizer="normalizer"
@@ -128,7 +128,7 @@
             >
               <el-input
                 v-model="attachForm.datasetGroupName"
-                :disabled="!(formType === 'add' ? true : hasDataPermission('manage', outerParams.panelPrivileges))"
+                :disabled="baseInfoDisabledCheck(outerParams.datasetPrivileges)"
               />
             </el-form-item>
           </el-form>
@@ -138,13 +138,7 @@
             :model="form"
             :rules="rule"
             size="small"
-            :disabled="
+            :disabled="disabled"
-              params &&
-                params.id &&
-                params.showModel &&
-                params.showModel === 'show' &&
-                !canEdit
-            "
             class="de-form-item"
             label-width="180px"
             label-position="right"
@@ -218,13 +212,7 @@
               ref="dsConfig"
               :datasource-type="datasourceType"
               :form="form"
-              :disabled="
+              :disabled="disabled"
-                params &&
-                  params.id &&
-                  params.showModel &&
-                  params.showModel === 'show' &&
-                  !canEdit
-              "
             />
             <plugin-com
               v-if="datasourceType.isPlugin"
@@ -306,6 +294,7 @@ import msgCfm from '@/components/msgCfm'
 import { dsGroupTree } from '@/api/dataset/dataset'
 import { appApply, appEdit, groupTree } from '@/api/panel/panel'
 import { deepCopy } from '@/components/canvas/utils/utils'
+import { hasDataPermission } from '@/utils/permission'
 
 export default {
   name: 'DsForm',
@@ -587,7 +576,9 @@ export default {
     this.queryTreeData()
     let { id, showModel, type, name } = this.$route.query
     this.params = this.$route.query
-    if (this.positionCheck('appMarket')) {
+    const appMarketCheck = this.positionCheck('appMarket')
+    if (appMarketCheck) {
+      this.appMarketEdit = this.outerParams.appMarketEdit === undefined ? true : this.outerParams.appMarketEdit
       id = this.outerParams.datasourceId
       showModel = this.outerParams.showModel
       type = this.outerParams.datasourceType
@@ -615,16 +606,18 @@ export default {
       this.changeType(true)
     } else {
       this.canEdit = true
-      this.disabled = false
       if (type) {
         this.typeMap = name
         this.setType()
         this.changeType()
       }
     }
-    this.disabled = Boolean(id) && showModel === 'show' && !this.canEdit
+    this.disabled = appMarketCheck ? !this.appMarketEdit : (Boolean(id) && showModel === 'show' && !this.canEdit)
   },
   methods: {
+    baseInfoDisabledCheck(privileges) {
+      return !(this.formType === 'add' ? true : hasDataPermission('manage', privileges))
+    },
     normalizer(node) {
       // 去掉children=null的属性
       if (node.children === null || node.children === 'null') {
@@ -720,12 +713,6 @@ export default {
     changeEdit() {
       this.canEdit = true
       this.formType = 'modify'
-      this.disabled =
-        this.params &&
-        this.params.id &&
-        this.params.showModel &&
-        this.params.showModel === 'show' &&
-        !this.canEdit
     },
     edit(row) {
       this.formType = 'modify'
@@ -742,12 +729,6 @@ export default {
         this.form.configuration = JSON.parse(this.form.configuration)
         this.originConfiguration = JSON.stringify(this.form.configuration)
       }
-      this.disabled =
-        this.params &&
-        this.params.id &&
-        this.params.showModel &&
-        this.params.showModel === 'show' &&
-        !this.canEdit
       this.changeEdit()
     },
     reset() {