diff --git a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java index 34672a43a5..f575012f4c 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/manage/DatasetDataManage.java @@ -210,6 +210,14 @@ public class DatasetDataManage { return map; } + public Long getDatasetTotal(Long datasetGroupId) throws Exception { + DatasetGroupInfoDTO dto = datasetGroupManage.get(datasetGroupId, null); + if (StringUtils.equalsIgnoreCase(dto.getNodeType(), "dataset")) { + return getDatasetTotal(dto); + } + return 0L; + } + public Long getDatasetTotal(DatasetGroupInfoDTO datasetGroupInfoDTO) throws Exception { Map sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, null); String sql = (String) sqlMap.get("sql"); diff --git a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java b/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java index 4298a46b0a..c6e41b1e4d 100644 --- a/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java +++ b/core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java @@ -46,4 +46,9 @@ public class DatasetDataServer implements DatasetDataApi { public List getFieldEnum(List ids) throws Exception { return datasetDataManage.getFieldEnum(ids); } + + @Override + public Long getDatasetCount(DatasetGroupInfoDTO datasetGroupInfoDTO) throws Exception { + return datasetDataManage.getDatasetTotal(datasetGroupInfoDTO.getId()); + } } diff --git a/core/core-frontend/src/custom-component/component-list.ts b/core/core-frontend/src/custom-component/component-list.ts index 78f0ed76ae..fc30c53561 100644 --- a/core/core-frontend/src/custom-component/component-list.ts +++ b/core/core-frontend/src/custom-component/component-list.ts @@ -126,7 +126,7 @@ const list = [ x: 1, y: 1, sizeX: 18, - sizeY: 6, + sizeY: 7, propValue: { url: '', flip: { @@ -178,8 +178,8 @@ const list = [ }, { component: 'DeTabs', - name: 'Tabs', - label: 'Tabs', + name: '选项卡', + label: '选项卡', propValue: [ { name: 'tab', diff --git a/core/core-frontend/src/layout/components/TopDoc.vue b/core/core-frontend/src/layout/components/TopDoc.vue index c1c0764f2d..6bd2997858 100644 --- a/core/core-frontend/src/layout/components/TopDoc.vue +++ b/core/core-frontend/src/layout/components/TopDoc.vue @@ -2,13 +2,13 @@ import { ref } from 'vue' import { Icon } from '@/components/icon-custom' import TopDocCard from '@/layout/components/TopDocCard.vue' -const helpLink = ref('https://dataease.io/docs/') +const helpLink = ref('https://dataease.io/docs/v2/') const openBlank = () => { window.open(helpLink.value) } const cardInfoList = [ - { name: '帮助文档', url: 'https://dataease.io/docs/index.html', icon: 'top-help-doc' }, + { name: '帮助文档', url: 'https://dataease.io/docs/v2/', icon: 'top-help-doc' }, { name: '产品论坛', url: 'https://bbs.fit2cloud.com/c/de/6', icon: 'top-product-bbs' }, { name: '技术博客', diff --git a/de-xpack b/de-xpack index 14d70f42b2..a6f7aa3f64 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 14d70f42b222b3fc573a0624eabf7002cdb237fa +Subproject commit a6f7aa3f644fe258d9ed14cca420c3f6c4aeb1cd diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java index eacb18c023..7b2213d534 100644 --- a/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java +++ b/sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java @@ -28,4 +28,7 @@ public interface DatasetDataApi { @PostMapping("enumValue") List getFieldEnum(@RequestBody List ids) throws Exception; + + @PostMapping("getDatasetCount") + Long getDatasetCount(@RequestBody DatasetGroupInfoDTO datasetGroupInfoDTO) throws Exception; }