Merge remote-tracking branch 'origin/main' into main

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

@@ -90,11 +90,9 @@ public class ChartViewService {
         List<ChartGroupDTO> groups = extChartGroupMapper.search(chartGroupRequest);
         List<ChartViewDTO> group = groups.stream().map(ele -> {
             ChartViewDTO dto = new ChartViewDTO();
-            dto.setId(ele.getId());
-            dto.setName(ele.getName());
+            BeanUtils.copyBean(dto, ele);
             dto.setIsLeaf(false);
             dto.setType("group");
-            dto.setPid(ele.getPid());
             return dto;
         }).collect(Collectors.toList());
         group.addAll(charts);

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

@@ -201,11 +201,9 @@ public class DataSetTableService {
         List<DataSetGroupDTO> groups = extDataSetGroupMapper.search(datasetGroup);
         List<DataSetTableDTO> group = groups.stream().map(ele -> {
             DataSetTableDTO dto = new DataSetTableDTO();
-            dto.setId(ele.getId());
-            dto.setName(ele.getName());
+            BeanUtils.copyBean(dto, ele);
             dto.setIsLeaf(false);
             dto.setType("group");
-            dto.setPid(ele.getPid());
             return dto;
         }).collect(Collectors.toList());
         group.addAll(ds);

frontend/src/api/system/datasource.js

@@ -19,6 +19,7 @@ export function addDs(data) {
   return request({
     url: 'datasource/add/',
     method: 'post',
+    loading: true,
     data
   })
 }
@@ -27,6 +28,7 @@ export function editDs(data) {
   return request({
     url: 'datasource/update/',
     method: 'post',
+    loading: true,
     data
   })
 }
@@ -34,6 +36,7 @@ export function editDs(data) {
 export function delDs(id) {
   return request({
     url: 'datasource/delete/' + id,
+    loading: true,
     method: 'post'
   })
 }
@@ -42,6 +45,7 @@ export function validateDs(data) {
   return request({
     url: 'datasource/validate/',
     method: 'post',
+    loading: true,
     data
   })
 }

frontend/src/views/panel/enshrine/index.vue

@@ -15,7 +15,7 @@
               <span> {{ scope.row.name }}</span>
             </div>
             <div class="star-item-close">
-              <i class="el-icon-close " @click="remove(scope.row)" />
+              <i class="el-icon-delete " @click="remove(scope.row)" />
             </div>
           </div>
         </template>

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

@@ -58,7 +58,15 @@
 
                 </span>
                 <span v-if="data.type !=='folder'" style="margin-left: 12px;" @click.stop>
-                  <el-dropdown trigger="click" size="small" @command="clickFileMore">
+                  <span class="el-dropdown-link">
+                    <el-button
+                      icon="el-icon-delete"
+                      type="text"
+                      size="small"
+                      @click="_handleDelete(data)"
+                    />
+                  </span>
+                  <!-- <el-dropdown trigger="click" size="small" @command="clickFileMore">
                     <span class="el-dropdown-link">
                       <el-button
                         icon="el-icon-more"
@@ -75,7 +83,7 @@
                         {{ $t('panel.delete') }}
                       </el-dropdown-item>
                     </el-dropdown-menu>
-                  </el-dropdown>
+                  </el-dropdown> -->
                 </span>
               </span>
             </span>

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

@@ -2,9 +2,11 @@
   <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" />
-      {{ params && params.id && params.showModel && params.showModel === 'show' ? $t('datasource.show_info') : formType=='add' ? $t('datasource.create') : $t('datasource.modify') }}
+      {{ params && params.id && params.showModel && params.showModel === 'show' && !canEdit ? $t('datasource.show_info') : formType=='add' ? $t('datasource.create') : $t('datasource.modify') }}
     </template>
-    <el-form ref="dsForm" :model="form" :rules="rule" size="small" :disabled="params && params.id && params.showModel && params.showModel === 'show'" label-width="auto" label-position="right">
+    <div>
+
+      <el-form ref="dsForm" :model="form" :rules="rule" size="small" :disabled="params && params.id && params.showModel && params.showModel === 'show' && !canEdit " label-width="auto" label-position="right">
         <el-form-item :label="$t('commons.name')" prop="name">
           <el-input v-model="form.name" autocomplete="off" />
         </el-form-item>
@@ -39,12 +41,25 @@
           <el-input v-model="form.configuration.port" autocomplete="off" />
         </el-form-item>
 
-      <el-form-item v-if="!(params && params.id && params.showModel && params.showModel === 'show')">
+      <!-- <el-form-item v-if="canEdit">
         <el-button @click="validaDatasource">{{ $t('commons.validate') }}</el-button>
         <el-button type="primary" @click="save">{{ $t('commons.save') }}</el-button>
       </el-form-item>
-    </el-form>
 
+      <el-form-item v-else>
+        <el-button @click="validaDatasource">{{ $t('commons.validate') }}</el-button>
+        <el-button @click="changeEdit">{{ $t('commons.edit') }}</el-button>
+      </el-form-item> -->
+      </el-form>
+      <div v-if="canEdit" slot="footer" class="dialog-footer">
+        <el-button @click="validaDatasource">{{ $t('commons.validate') }}</el-button>
+        <el-button type="primary" @click="save">{{ $t('commons.save') }}</el-button>
+      </div>
+      <div v-else slot="footer" class="dialog-footer">
+        <el-button @click="validaDatasource">{{ $t('commons.validate') }}</el-button>
+        <el-button type="primary" @click="changeEdit">{{ $t('commons.edit') }}</el-button>
+      </div>
+    </div>
   </layout-content>
 </template>
 
@@ -76,7 +91,8 @@ export default {
         'configuration.port': [{ required: true, message: this.$t('datasource.please_input_port'), trigger: 'change' }]
       },
       allTypes: [{ name: 'mysql', label: 'MySQL', type: 'jdbc' },
-        { name: 'sqlServer', label: 'SQL Server', type: 'jdbc' }]
+        { name: 'sqlServer', label: 'SQL Server', type: 'jdbc' }],
+      canEdit: false
     }
   },
 
@@ -103,8 +119,13 @@ export default {
     // }
   },
   methods: {
+    changeEdit() {
+      this.canEdit = true
+      this.formType = 'modify'
+    },
     create() {
       this.formType = 'add'
+      this.canEdit = true
     },
     edit(row) {
       this.formType = 'modify'