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

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

@@ -1696,11 +1696,13 @@ public class ChartViewService {
 
     // check permission
     private void checkPermission(String needPermission, DataSetTableDTO table) {
-        if (ObjectUtils.isEmpty(table) || ObjectUtils.isEmpty(table.getPrivileges())) {
-            throw new RuntimeException(Translator.get("i18n_dataset_delete_or_no_permission"));
+        if (ObjectUtils.isEmpty(table)) {
+            throw new RuntimeException(Translator.get("i18n_dataset_delete"));
         }
-        if (!AuthUtils.getUser().getIsAdmin() && !table.getPrivileges().contains(needPermission)) {
-            throw new RuntimeException(Translator.get("i18n_dataset_delete_or_no_permission"));
+        if (!AuthUtils.getUser().getIsAdmin()) {
+            if (ObjectUtils.isEmpty(table.getPrivileges()) || !table.getPrivileges().contains(needPermission)) {
+                throw new RuntimeException(Translator.get("i18n_dataset_no_permission"));
+            }
         }
     }
 }

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

@@ -70,7 +70,8 @@ i18n_datasource_not_allow_delete_msg= datasets are using this data source and ca
 i18n_task_name_repeat=Name is used in same data set
 i18n_id_or_pwd_error=Invalid ID or password
 i18n_datasource_delete=Data source is delete
-i18n_dataset_delete_or_no_permission=Data set is delete or no permission
+i18n_dataset_delete=Data set is deleted
+i18n_dataset_no_permission=Data set no permission
 i18n_chart_delete=Chart is delete
 i18n_not_exec_add_sync=There is no completed synchronization task. Incremental synchronization cannot be performed
 i18n_excel_header_empty=Excel first row can not empty

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

@@ -69,7 +69,8 @@ i18n_datasource_not_allow_delete_msg= 个数据集正在使用此数据源，无
 i18n_task_name_repeat=同一数据集下任务名称已被使用
 i18n_id_or_pwd_error=无效的ID或密码
 i18n_datasource_delete=当前用到的数据源已被删除
-i18n_dataset_delete_or_no_permission=当前用到的数据集没有权限或已被删除
+i18n_dataset_delete=当前用到的数据集已被删除
+i18n_dataset_no_permission=当前用到的数据集没有权限
 i18n_chart_delete=当前用到的视图已被删除
 i18n_not_exec_add_sync=没有已完成的同步任务，无法进行增量同步
 i18n_excel_header_empty=Excel第一行为空

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

@@ -70,7 +70,8 @@ i18n_datasource_not_allow_delete_msg= 個數據集正在使用此數據源，無
 i18n_task_name_repeat=同一數據集下任務名稱已被使用
 i18n_id_or_pwd_error=無效的ID或密碼
 i18n_datasource_delete=當前用到的數據源已被刪除
-i18n_dataset_delete_or_no_permission=當前用到的數據集沒有權限或已被刪除
+i18n_dataset_delete=當前用到的數據集已被刪除
+i18n_dataset_no_permission=當前用到的數據集沒有權限
 i18n_chart_delete=當前用到的視圖已被刪除
 i18n_not_exec_add_sync=沒有已經完成的同步任務，無法進行增量同步
 i18n_excel_header_empty=Excel第一行為空

frontend/src/views/system/plugin/PluginCom.vue

@@ -1,18 +1,18 @@
 <template>
-  <div>
-    <async-component
-      v-if="showAsync"
-      :ref="refId"
-      :url="url"
-      :obj="obj"
-      @execute-axios="executeAxios"
-      @on-add-languanges="addLanguages"
-      @plugin-call-back="pluginCallBack"
-    />
-    <div v-else>
-      <h1>未知组件无法展示</h1>
-    </div>
+
+  <async-component
+    v-if="showAsync"
+    :ref="refId"
+    :url="url"
+    :obj="obj"
+    @execute-axios="executeAxios"
+    @on-add-languanges="addLanguages"
+    @plugin-call-back="pluginCallBack"
+  />
+  <div v-else>
+    <h1>未知组件无法展示</h1>
   </div>
+
 </template>
 
 <script>