Merge branch 'feat/alarm-add-dingtalk' into 'main_dev'

fix: 修改消息配置添加钉钉相关逻辑

See merge request yunteng/thingskit-front!1034

@@ -76,9 +76,9 @@
             };
           } else if (values.messageType === 'DING_TALK_MESSAGE') {
             config = {
-              AgentId: values?.AgentId,
-              ClientID: values?.ClientID,
-              ClientSecret: values?.ClientSecret,
+              agentId: values?.agentId,
+              clientId: values?.clientId,
+              clientSecret: values?.clientSecret,
             };
           }
           Reflect.set(values, 'config', config);

@@ -116,50 +116,31 @@ export const formSchema: FormSchema[] = [
     label: '平台类型',
     required: true,
     component: 'ApiSelect',
-    componentProps: {
-      // api: findDictItemByCode,
-      api: async (params: Recordable) => {
-        try {
-          const result = await findDictItemByCode(params as any);
-          return result.filter((item) => item.itemValue !== 'DING_TALK');
-        } catch (e) {
-          // eslint-disable-next-line no-console
-          console.error(e);
-          return [];
-        }
-      },
-      params: {
-        dictCode: 'platform_type',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
-    },
-    ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
-  },
-  {
-    field: 'platformType',
-    label: '平台类型',
-    required: true,
-    component: 'ApiSelect',
-    componentProps: {
-      // api: findDictItemByCode,console.log(result
-      api: async (params: Recordable) => {
-        try {
-          const result = await findDictItemByCode(params as any);
-          return result.filter((item) => item.itemValue === 'DING_TALK');
-        } catch (e) {
-          // eslint-disable-next-line no-console
-          console.error(e);
-          return [];
-        }
-      },
-      params: {
-        dictCode: 'platform_type',
-      },
-      labelField: 'itemText',
-      valueField: 'itemValue',
+    componentProps({ formModel }) {
+      return {
+        api: async (params: Recordable) => {
+          try {
+            const result = await findDictItemByCode(params as any);
+            if (isMessage(Reflect.get(formModel, 'messageType')))
+              return result.filter((item) => item.itemValue !== 'DING_TALK');
+            if (isDingtalk(Reflect.get(formModel, 'messageType')))
+              return result.filter((item) => item.itemValue === 'DING_TALK');
+          } catch (e) {
+            // eslint-disable-next-line no-console
+            console.error(e);
+            return [];
+          }
+        },
+        params: {
+          dictCode: 'platform_type',
+        },
+        labelField: 'itemText',
+        valueField: 'itemValue',
+      };
     },
-    ifShow: ({ values }) => isDingtalk(Reflect.get(values, 'messageType')),
+    ifShow: ({ values }) =>
+      isMessage(Reflect.get(values, 'messageType')) ||
+      isDingtalk(Reflect.get(values, 'messageType')),
   },
   {
     field: 'appId',
@@ -189,7 +170,6 @@ export const formSchema: FormSchema[] = [
     label: 'secretKey',
     required: true,
     componentProps: {
-      maxLength: 36,
       placeholder: '请输入secretKey',
     },
 
@@ -289,36 +269,36 @@ export const formSchema: FormSchema[] = [
     },
   },
   {
-    field: 'AgentId',
-    label: 'AgentId',
+    field: 'agentId',
+    label: 'agentId',
     component: 'Input',
     required: true,
     ifShow: ({ values }) => isDingtalk(Reflect.get(values, 'messageType')),
     componentProps: {
       maxLength: 36,
-      placeholder: '请输入AgentId',
+      placeholder: '请输入agentId',
     },
   },
   {
-    field: 'ClientID',
-    label: 'ClientID',
+    field: 'clientId',
+    label: 'clientId',
     component: 'Input',
     required: true,
     ifShow: ({ values }) => isDingtalk(Reflect.get(values, 'messageType')),
     componentProps: {
       maxLength: 36,
-      placeholder: '请输入ClientID',
+      placeholder: '请输入clientID',
     },
   },
   {
-    field: 'ClientSecret',
-    label: 'ClientSecret',
+    field: 'clientSecret',
+    label: 'clientSecret',
     component: 'Input',
     ifShow: ({ values }) => isDingtalk(Reflect.get(values, 'messageType')),
     required: true,
     componentProps: {
       maxLength: 36,
-      placeholder: '请输入ClientSecret',
+      placeholder: '请输入clientSecret',
     },
   },
   {

@@ -6,7 +6,7 @@ export interface TabItem {
 export const achieveList: TabItem[] = [
   {
     key: '1',
-    name: '短信发送记录',
+    name: '消息发送记录',
     component: 'SmsLog',
   },
   {

@@ -61,7 +61,7 @@
     components: { BasicTable, TableAction, Authority, Popconfirm, Tooltip },
     setup() {
       const [registerTable, { reload, setProps }] = useTable({
-        title: '短信发送列表',
+        title: '消息发送列表',
         api: smsLogPage,
         columns,
         formConfig: {

@@ -12,7 +12,7 @@ export const columns: BasicColumn[] = [
     width: 160,
   },
   {
-    title: '短信平台',
+    title: '消息平台',
     dataIndex: 'typeDictText',
     width: 160,
   },
@@ -50,6 +50,12 @@ export const columns: BasicColumn[] = [
   },
 ];
 
+export const typeList = [
+  { label: '阿里', value: 'ALI_CLOUD' },
+  { label: '钉钉', value: 'DING_TALK' },
+  { label: '腾讯', value: 'TENCENT_CLOUD' },
+];
+
 export const searchFormSchema: FormSchema[] = [
   {
     field: 'toPhone',
@@ -61,6 +67,15 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
+    field: 'type',
+    label: '消息平台',
+    component: 'Select',
+    colProps: { span: 6 },
+    componentProps: {
+      options: typeList,
+    },
+  },
+  {
     field: 'sendTime',
     label: '发送时间',
     component: 'RangePicker',

@@ -2,7 +2,7 @@ import { BasicColumn } from '/@/components/Table';
 import { FormSchema } from '/@/components/Table';
 import { findDictItemByCode } from '/@/api/system/dict';
 import { findMessageConfig } from '/@/api/message/config';
-import { isMessage } from '/@/views/message/config/config.data';
+import { isDingtalk, isMessage } from '/@/views/message/config/config.data';
 
 export enum PlateFormTypeEnum {
   ali_cound = 'ALI_CLOUD',
@@ -172,6 +172,7 @@ export const formSchema: FormSchema[] = [
             const record = await findMessageConfig(params);
             return record.filter((item) => item.status === 1);
           } catch (error) {
+            // eslint-disable-next-line no-console
             console.log(error);
             return [];
           }
@@ -218,7 +219,9 @@ export const formSchema: FormSchema[] = [
       placeholder: '请输入签名',
     },
 
-    ifShow: ({ values }) => isMessage(Reflect.get(values, 'messageType')),
+    ifShow: ({ values }) =>
+      isMessage(Reflect.get(values, 'messageType')) ||
+      isDingtalk(Reflect.get(values, 'messageType')),
   },
   {
     field: 'templatePurpose',