From a8e9cc88436bea14e1d74f10aeb28e9b6746dbc3 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 21 Nov 2023 18:21:46 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=A3=9E=E4=B9=A6=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/menu/manage/MenuManage.java   |  3 ++-
 .../main/resources/i18n/core_zh_CN.properties |  1 +
 .../core-frontend/src/assets/svg/platform.svg |  1 +
 .../src/views/system/common/InfoTemplate.vue  | 27 +++++++++++++++++--
 .../system/parameter/basic/BasicInfo.vue      |  7 ++++-
 .../system/parameter/email/EmailInfo.vue      |  7 ++++-
 de-xpack                                      |  2 +-
 .../io/dataease/api/lark/api/LarkApi.java     | 17 ++++++++++++
 .../api/lark/dto/LarkSettingCreator.java      | 17 ++++++++++++
 .../io/dataease/api/lark/vo/LarkInfoVO.java   | 19 +++++++++++++
 10 files changed, 95 insertions(+), 6 deletions(-)
 create mode 100644 core/core-frontend/src/assets/svg/platform.svg
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarkApi.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkSettingCreator.java
 create mode 100644 sdk/api/api-base/src/main/java/io/dataease/api/lark/vo/LarkInfoVO.java

diff --git a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java
index f1a88383ef..87f7a08b88 100644
--- a/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java
+++ b/core/core-backend/src/main/java/io/dataease/menu/manage/MenuManage.java
@@ -95,6 +95,7 @@ public class MenuManage {
                 || coreMenu.getId().equals(18L)
                 || coreMenu.getId().equals(21L)
                 || coreMenu.getPid().equals(21L)
-                || coreMenu.getId().equals(25L);
+                || coreMenu.getId().equals(25L)
+                || coreMenu.getId().equals(26L);
     }
 }
diff --git a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties
index e01c771929..af0608789c 100644
--- a/core/core-backend/src/main/resources/i18n/core_zh_CN.properties
+++ b/core/core-backend/src/main/resources/i18n/core_zh_CN.properties
@@ -23,6 +23,7 @@ i18n_menu.summary=\u6982\u89C8
 i18n_menu.ds=\u6570\u636E\u6E90\u7BA1\u7406
 i18n_menu.task=\u4EFB\u52A1\u7BA1\u7406
 i18n_menu.embedded=\u5D4C\u5165\u5F0F\u7BA1\u7406
+i18n_menu.platform=\u5E73\u53F0\u5BF9\u63A5
 i18n_field_name_repeat=\u6709\u91CD\u590D\u5B57\u6BB5\u540D\uFF1A
 i18n_pid_not_eq_id=\u79FB\u52A8\u76EE\u6807\u4E0D\u80FD\u662F\u81EA\u5DF1\u6216\u5B50\u76EE\u5F55
 i18n_ds_name_exists=\u8BE5\u5206\u7EC4\u4E0B\u540D\u79F0\u91CD\u590D
diff --git a/core/core-frontend/src/assets/svg/platform.svg b/core/core-frontend/src/assets/svg/platform.svg
new file mode 100644
index 0000000000..5ebbc21ab9
--- /dev/null
+++ b/core/core-frontend/src/assets/svg/platform.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path d="M314.49 3.082H157.692C70.793 3.082 0 74.073 0 161.271V864.32c0 87.198 70.792 158.189 157.592 158.189H314.49c86.9 0 157.592-70.991 157.592-158.189V702.652h-72.98V864.32c0 46.93-37.98 84.91-84.612 84.91H157.693c-46.731 0-84.613-38.18-84.613-84.91V161.27c0-46.929 37.981-84.91 84.613-84.91h156.896c46.73 0 84.612 38.18 84.612 84.91v159.68h72.98V161.27c-0.1-87.197-70.793-158.188-157.692-158.188z m546.252 0H703.746c-86.899 0-157.592 70.991-157.592 158.189v159.68h72.98V161.27c0-46.93 37.981-84.911 84.612-84.911h156.896c46.731 0 84.613 38.18 84.613 84.91v703.05c0 46.93-37.981 84.91-84.613 84.91H703.746c-46.73 0-84.612-38.18-84.612-84.91V702.652h-72.98V864.32c0 87.198 70.792 158.189 157.592 158.189h156.896c86.9 0 157.592-70.991 157.592-158.189V161.27c0.1-87.197-70.692-158.188-157.492-158.188z m0 0"  /><path d="M191.995 485.602H461.84c-0.596-27.74-23.465-50.31-51.304-50.31H186.129c-28.238 0-51.305 23.166-51.305 51.503v105.492c0 28.337 23.067 51.504 51.305 51.504h224.506c28.237 0 51.305-23.167 51.305-51.504v-1.093H191.995V485.602z m0 0"  /><path d="M395.423 512.447h230.074v46.035H395.423z"  /><path d="M556.395 485.602H826.34v105.492H556.395v1.094c0 28.337 23.067 51.503 51.305 51.503h224.506c28.238 0 51.305-23.166 51.305-51.503V486.696c0-28.337-23.067-51.503-51.305-51.503H607.7c-27.84 0.099-50.708 22.669-51.305 50.41z m0 0"  /></svg>
\ No newline at end of file
diff --git a/core/core-frontend/src/views/system/common/InfoTemplate.vue b/core/core-frontend/src/views/system/common/InfoTemplate.vue
index f67a876299..9cadffed47 100644
--- a/core/core-frontend/src/views/system/common/InfoTemplate.vue
+++ b/core/core-frontend/src/views/system/common/InfoTemplate.vue
@@ -2,7 +2,7 @@
   <div class="info-template-container">
     <div class="info-template-header">
       <div class="info-template-title">
-        <span>基础设置</span>
+        <span>{{ curTitle }}</span>
       </div>
       <div>
         <el-button type="primary" @click="edit">{{ t('commons.edit') }}</el-button>
@@ -40,7 +40,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { ref, defineProps, PropType } from 'vue'
+import { ref, defineProps, PropType, computed } from 'vue'
 import { useI18n } from '@/hooks/web/useI18n'
 import { SettingRecord, ToolTipRecord } from './SettingTemplate'
 const { t } = useI18n()
@@ -52,9 +52,29 @@ const props = defineProps({
   labelTooltips: {
     type: Array as PropType<ToolTipRecord[]>,
     default: () => []
+  },
+  settingData: {
+    type: Array as PropType<SettingRecord[]>,
+    default: () => []
+  },
+  settingTitle: {
+    type: String,
+    default: '基础设置'
   }
 })
 
+const curTitle = computed(() => {
+  return props.settingTitle
+})
+
+const loadList = () => {
+  if (props.settingData?.length) {
+    props.settingData.forEach(item => {
+      settingList.value.push(item)
+    })
+  }
+}
+
 const settingList = ref([] as SettingRecord[])
 
 const loadBasic = () => {
@@ -136,6 +156,9 @@ const init = () => {
   if (props.settingKey === 'email') {
     loadEmail()
   }
+  if (props.settingData?.length) {
+    loadList()
+  }
 }
 const pwdItem = ref({})
 
diff --git a/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue b/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue
index ec9660ceb0..0ffb0ca5b4 100644
--- a/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue
+++ b/core/core-frontend/src/views/system/parameter/basic/BasicInfo.vue
@@ -1,5 +1,10 @@
 <template>
-  <InfoTemplate :label-tooltips="tooltips" setting-key="basic" @edit="edit" />
+  <InfoTemplate
+    :label-tooltips="tooltips"
+    setting-key="basic"
+    setting-title="基础设置"
+    @edit="edit"
+  />
   <basic-edit ref="editor" />
 </template>
 
diff --git a/core/core-frontend/src/views/system/parameter/email/EmailInfo.vue b/core/core-frontend/src/views/system/parameter/email/EmailInfo.vue
index f525baee0b..998a07634c 100644
--- a/core/core-frontend/src/views/system/parameter/email/EmailInfo.vue
+++ b/core/core-frontend/src/views/system/parameter/email/EmailInfo.vue
@@ -1,5 +1,10 @@
 <template>
-  <InfoTemplate :label-tooltips="tooltips" setting-key="email" @edit="edit" />
+  <InfoTemplate
+    :label-tooltips="tooltips"
+    setting-title="邮件设置"
+    setting-key="email"
+    @edit="edit"
+  />
   <email-edit ref="editor" />
 </template>
 
diff --git a/de-xpack b/de-xpack
index 411c21f322..3b92a91021 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 411c21f3228c89e60cbf90d90ace4e1a905e9016
+Subproject commit 3b92a9102173342ea3d49f9dd5d9bc38f9589257
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarkApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarkApi.java
new file mode 100644
index 0000000000..a4af5935f5
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/lark/api/LarkApi.java
@@ -0,0 +1,17 @@
+package io.dataease.api.lark.api;
+
+import io.dataease.api.lark.vo.LarkInfoVO;
+import io.dataease.api.lark.dto.LarkSettingCreator;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+public interface LarkApi {
+
+    @GetMapping("/info")
+    LarkInfoVO info();
+
+    @PostMapping("/create")
+    void save(@RequestBody LarkSettingCreator creator);
+
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkSettingCreator.java b/sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkSettingCreator.java
new file mode 100644
index 0000000000..94eb9d369d
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/lark/dto/LarkSettingCreator.java
@@ -0,0 +1,17 @@
+package io.dataease.api.lark.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class LarkSettingCreator implements Serializable {
+
+    private String appId;
+
+    private String appSecret;
+
+    private String callBack;
+
+    private Boolean enable;
+}
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/lark/vo/LarkInfoVO.java b/sdk/api/api-base/src/main/java/io/dataease/api/lark/vo/LarkInfoVO.java
new file mode 100644
index 0000000000..4b24e66e79
--- /dev/null
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/lark/vo/LarkInfoVO.java
@@ -0,0 +1,19 @@
+package io.dataease.api.lark.vo;
+
+
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class LarkInfoVO implements Serializable {
+
+    private String appId;
+
+    private String appSecret;
+
+    private String callBack;
+
+    private Boolean enable;
+}