diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index 92f91e172c..a031064eba 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -447,8 +447,8 @@ public class ExtractDataService {
bw.close();
File scriptFile = new File(root_path + datasetTable.getId() + ".sh");
- scriptFile.setExecutable(true);
scriptFile.createNewFile();
+ scriptFile.setExecutable(true);
BufferedWriter scriptFileBw = new BufferedWriter(new FileWriter(root_path + datasetTable.getId() + ".sh"));
scriptFileBw.write("#!/bin/sh");
diff --git a/frontend/src/icons/svg/ds-api.svg b/frontend/src/icons/svg/ds-api.svg
new file mode 100644
index 0000000000..537b512888
--- /dev/null
+++ b/frontend/src/icons/svg/ds-api.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index a298b63c1e..43bf9ac7b9 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1253,7 +1253,8 @@ export default {
union_error: 'Union relation and field can not be empty',
union_repeat: 'This dataset is already union，do not union repeat',
preview_result: 'Preview',
- sql_ds_union_error: 'Direct connect SQL dataset can not be union'
+ sql_ds_union_error: 'Direct connect SQL dataset can not be union',
+ api_data: 'API dataset'
},
datasource: {
datasource: 'Data Source',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 8c320c6a3a..28e9b16dcf 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1253,7 +1253,8 @@ export default {
union_error: '關聯關繫與關聯字段不能為空',
union_repeat: '當前數據集已被關聯，請勿重復關聯',
preview_result: '預覽結果',
- sql_ds_union_error: '直連模式下SQL數據集，不支持關聯'
+ sql_ds_union_error: '直連模式下SQL數據集，不支持關聯',
+ api_data: 'API 數據集'
},
datasource: {
datasource: '數據源',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 71a082b6fd..a8a350de1d 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1256,7 +1256,8 @@ export default {
union_error: '关联关系与关联字段不能为空',
union_repeat: '当前数据集已被关联，请勿重复关联',
preview_result: '预览结果',
- sql_ds_union_error: '直连模式下SQL数据集，不支持关联'
+ sql_ds_union_error: '直连模式下SQL数据集，不支持关联',
+ api_data: 'API 数据集'
},
datasource: {
datasource: '数据源',
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 93ff912679..e084b036b3 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -350,6 +350,14 @@ div:focus {
margin: 0 2px 0 0;
}
+.ds-icon-api {
+ width: 14px;
+ height: 14px;
+ color: #13227a;
+ margin: 0 2px 0 0;
+}
+
+
.showRightPanel {
.el-popper {
position: fixed !important;
diff --git a/frontend/src/views/dataset/common/DatasetGroupSelector.vue b/frontend/src/views/dataset/common/DatasetGroupSelector.vue
index acb40e11d2..45f2344097 100644
--- a/frontend/src/views/dataset/common/DatasetGroupSelector.vue
+++ b/frontend/src/views/dataset/common/DatasetGroupSelector.vue
@@ -97,6 +97,7 @@
+
diff --git a/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue b/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
index 75f31e063c..c0feb93984 100644
--- a/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
+++ b/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
@@ -62,6 +62,7 @@
+
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index c548c4d58e..6d2d6f8c22 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -100,8 +100,8 @@
{{ $t('dataset.union_data') }}
-
- {{ $t('dataset.union_data') }}
+
+ {{ $t('dataset.api_data') }}
@@ -141,6 +141,7 @@
+
diff --git a/frontend/src/views/panel/filter/filterDialog.vue b/frontend/src/views/panel/filter/filterDialog.vue
index efbf3df595..b88623d20e 100644
--- a/frontend/src/views/panel/filter/filterDialog.vue
+++ b/frontend/src/views/panel/filter/filterDialog.vue
@@ -46,6 +46,7 @@
+
{{ node.label }}