feat(系统设置): 自定义机器人非xpack

backend/services/case-management/src/main/java/io/metersphere/functional/service/FunctionalCaseMinderService.java

@@ -161,29 +161,6 @@ public class FunctionalCaseMinderService {
         return customFields.stream().map(TemplateCustomFieldDTO::getFieldId).toList();
     }
 
-    private List<FunctionalMinderTreeDTO> buildAdditionalData(String moduleId) {
-        List<FunctionalMinderTreeDTO> list = new ArrayList<>();
-        MindAdditionalNodeExample mindAdditionalNodeExample = new MindAdditionalNodeExample();
-        mindAdditionalNodeExample.createCriteria().andParentIdEqualTo(moduleId);
-        mindAdditionalNodeExample.setOrderByClause("pos asc");
-        List<MindAdditionalNode> mindAdditionalNodes = mindAdditionalNodeMapper.selectByExample(mindAdditionalNodeExample);
-        if (CollectionUtils.isEmpty(mindAdditionalNodes)) {
-            return new ArrayList<>();
-        }
-        for (MindAdditionalNode mindAdditionalNode : mindAdditionalNodes) {
-            FunctionalMinderTreeDTO root = new FunctionalMinderTreeDTO();
-            FunctionalMinderTreeNodeDTO rootData = new FunctionalMinderTreeNodeDTO();
-            rootData.setId(mindAdditionalNode.getId());
-            rootData.setPos(mindAdditionalNode.getPos());
-            rootData.setText(mindAdditionalNode.getName());
-            rootData.setResource(new ArrayList<>());
-            root.setChildren(buildAdditionalData(mindAdditionalNode.getId()));
-            root.setData(rootData);
-            list.add(root);
-        }
-        return list;
-    }
-
     private void buildList(List<FunctionalCaseMindDTO> functionalCaseMindDTOList, List<FunctionalMinderTreeDTO> list, Map<String, String> priorityMap) {
         //构造父子级数据
         for (FunctionalCaseMindDTO functionalCaseMindDTO : functionalCaseMindDTOList) {

frontend/src/components/pure/navbar/index.vue

@@ -212,7 +212,9 @@
   const unReadCount = ref<number>(0);
 
   async function checkMessageRead() {
-    unReadCount.value = await getMessageUnReadCount(appStore.currentProjectId);
+    if (appStore.currentProjectId) {
+      unReadCount.value = await getMessageUnReadCount(appStore.currentProjectId);
+    }
   }
   watch(
     () => appStore.currentOrgId,

frontend/src/views/project-management/messageManagement/components/robotList.vue

@@ -130,7 +130,6 @@
               {{ platform.name }}
             </div>
             <div
-              v-xpack
               :class="['platform-card-custom', robotForm.platform === 'CUSTOM' ? 'platform-card--active' : '']"
               @click="robotForm.platform = 'CUSTOM'"
             >

frontend/src/views/setting/system/config/components/dingTalkModal.vue

@@ -10,7 +10,7 @@
       {{ t('project.messageManagement.DING_TALK') }}
     </template>
 
-    <a-form class="ms-form rounded-[4px]" :model="dingTalkForm" layout="vertical">
+    <a-form ref="dingTalkFormRef" class="ms-form rounded-[4px]" :model="dingTalkForm" layout="vertical">
       <a-form-item
         field="appKey"
         :label="t('system.config.qrCodeConfig.appKey')"
@@ -82,6 +82,7 @@
 
 <script setup lang="ts">
   import { ref } from 'vue';
+  import { FormInstance, ValidatedError } from '@arco-design/web-vue';
 
   import { getDingInfo, saveDingTalkConfig, validateDingTalkConfig } from '@/api/modules/setting/qrCode';
   import { useI18n } from '@/hooks/useI18n';
@@ -100,6 +101,8 @@
     valid: false,
   });
 
+  const dingTalkFormRef = ref<FormInstance | null>(null);
+
   const loading = ref<boolean>(false);
   const detailVisible = ref<boolean>(false);
   const props = defineProps<{
@@ -140,30 +143,38 @@
   }
 
   async function validateInfo() {
-    loading.value = true;
+    dingTalkFormRef.value?.validate(async (errors: Record<string, ValidatedError> | undefined) => {
-    try {
+      if (!errors) {
-      await validateDingTalkConfig(dingTalkForm.value);
+        loading.value = true;
-      dingTalkForm.value.valid = true;
+        try {
-      Message.success(t('organization.service.testLinkStatusTip'));
+          await validateDingTalkConfig(dingTalkForm.value);
-    } catch (error) {
+          dingTalkForm.value.valid = true;
-      console.log(error);
+          Message.success(t('organization.service.testLinkStatusTip'));
-    } finally {
+        } catch (error) {
-      loading.value = false;
+          console.log(error);
-    }
+        } finally {
+          loading.value = false;
+        }
+      }
+    });
   }
 
   async function saveInfo() {
-    loading.value = true;
+    dingTalkFormRef.value?.validate(async (errors: Record<string, ValidatedError> | undefined) => {
-    try {
+      if (!errors) {
-      await saveDingTalkConfig(dingTalkForm.value);
+        loading.value = true;
-      Message.success(t('organization.service.testLinkStatusTip'));
+        try {
-      emits('success');
+          await saveDingTalkConfig(dingTalkForm.value);
-    } catch (error) {
+          Message.success(t('organization.service.testLinkStatusTip'));
-      console.log(error);
+          emits('success');
-    } finally {
+        } catch (error) {
-      loading.value = false;
+          console.log(error);
-      detailVisible.value = false;
+        } finally {
-    }
+          loading.value = false;
+          detailVisible.value = false;
+        }
+      }
+    });
   }
 </script>
 

frontend/src/views/setting/system/config/components/weComModal.vue

@@ -10,7 +10,7 @@
       {{ t('project.messageManagement.WE_COM') }}
     </template>
 
-    <a-form class="ms-form rounded-[4px]" :model="weComForm" layout="vertical">
+    <a-form ref="weComFormRef" class="ms-form rounded-[4px]" :model="weComForm" layout="vertical">
       <a-form-item
         field="corpId"
         :label="t('system.config.qrCodeConfig.corpId')"
@@ -79,6 +79,7 @@
 
 <script setup lang="ts">
   import { ref } from 'vue';
+  import { FormInstance, ValidatedError } from '@arco-design/web-vue';
 
   import { getWeComInfo, saveWeComConfig, validateWeComConfig } from '@/api/modules/setting/qrCode';
   import { useI18n } from '@/hooks/useI18n';
@@ -97,6 +98,8 @@
     valid: false,
   });
 
+  const weComFormRef = ref<FormInstance | null>(null);
+
   const emits = defineEmits<{
     (event: 'update:visible', visible: boolean): void;
     (event: 'success'): void;
@@ -137,30 +140,38 @@
   }
 
   async function validateInfo() {
-    loading.value = true;
+    weComFormRef.value?.validate(async (errors: Record<string, ValidatedError> | undefined) => {
-    try {
+      if (!errors) {
-      await validateWeComConfig(weComForm.value);
+        loading.value = true;
-      weComForm.value.valid = true;
+        try {
-      Message.success(t('organization.service.testLinkStatusTip'));
+          await validateWeComConfig(weComForm.value);
-    } catch (error) {
+          weComForm.value.valid = true;
-      console.log(error);
+          Message.success(t('organization.service.testLinkStatusTip'));
-    } finally {
+        } catch (error) {
-      loading.value = false;
+          console.log(error);
-    }
+        } finally {
+          loading.value = false;
+        }
+      }
+    });
   }
 
   async function saveInfo() {
-    loading.value = true;
+    weComFormRef.value?.validate(async (errors: Record<string, ValidatedError> | undefined) => {
-    try {
+      if (!errors) {
-      await saveWeComConfig(weComForm.value);
+        loading.value = true;
-      Message.success(t('organization.service.testLinkStatusTip'));
+        try {
-      emits('success');
+          await saveWeComConfig(weComForm.value);
-    } catch (error) {
+          Message.success(t('organization.service.testLinkStatusTip'));
-      console.log(error);
+          emits('success');
-    } finally {
+        } catch (error) {
-      loading.value = false;
+          console.log(error);
-      detailVisible.value = false;
+        } finally {
-    }
+          loading.value = false;
+          detailVisible.value = false;
+        }
+      }
+    });
   }
 </script>