Merge branch 'dev-v2' into pr@dev-v2_dzz

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<String, Object> sqlMap = datasetSQLManage.getUnionSQLForEdit(datasetGroupInfoDTO, null);
         String sql = (String) sqlMap.get("sql");

core/core-backend/src/main/java/io/dataease/dataset/server/DatasetDataServer.java

@@ -46,4 +46,9 @@ public class DatasetDataServer implements DatasetDataApi {
     public List<String> getFieldEnum(List<Long> ids) throws Exception {
         return datasetDataManage.getFieldEnum(ids);
     }
+
+    @Override
+    public Long getDatasetCount(DatasetGroupInfoDTO datasetGroupInfoDTO) throws Exception {
+        return datasetDataManage.getDatasetTotal(datasetGroupInfoDTO.getId());
+    }
 }

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',

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: '技术博客',

de-xpack

@@ -1 +1 @@
-Subproject commit 14d70f42b222b3fc573a0624eabf7002cdb237fa
+Subproject commit a6f7aa3f644fe258d9ed14cca420c3f6c4aeb1cd

sdk/api/api-base/src/main/java/io/dataease/api/dataset/DatasetDataApi.java

@@ -28,4 +28,7 @@ public interface DatasetDataApi {
 
     @PostMapping("enumValue")
     List<String> getFieldEnum(@RequestBody List<Long> ids) throws Exception;
+
+    @PostMapping("getDatasetCount")
+    Long getDatasetCount(@RequestBody DatasetGroupInfoDTO datasetGroupInfoDTO) throws Exception;
 }