Merge branch 'perf/message-log' of http://git.yunteng.com/yunteng/thingskit-fron…

…t into feat/alarm-add-dingtalk

@@ -170,7 +170,6 @@ export const formSchema: FormSchema[] = [
     label: 'secretKey',
     label: 'secretKey',
     required: true,
     required: true,
     componentProps: {
     componentProps: {
-      maxLength: 36,
       placeholder: '请输入secretKey',
       placeholder: '请输入secretKey',
     },
     },
 
 

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

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

@@ -4,6 +4,7 @@ import { h } from 'vue';
 import { Tag } from 'ant-design-vue';
 import { Tag } from 'ant-design-vue';
 import { useI18n } from '/@/hooks/web/useI18n';
 import { useI18n } from '/@/hooks/web/useI18n';
 import moment from 'moment';
 import moment from 'moment';
+import { findDictItemByCode } from '/@/api/system/dict';
 const { t } = useI18n();
 const { t } = useI18n();
 export const columns: BasicColumn[] = [
 export const columns: BasicColumn[] = [
   {
   {
@@ -12,7 +13,7 @@ export const columns: BasicColumn[] = [
     width: 160,
     width: 160,
   },
   },
   {
   {
-    title: '短信平台',
+    title: '消息平台',
     dataIndex: 'typeDictText',
     dataIndex: 'typeDictText',
     width: 160,
     width: 160,
   },
   },
@@ -61,6 +62,20 @@ export const searchFormSchema: FormSchema[] = [
     },
     },
   },
   },
   {
   {
+    field: 'typeDictText',
+    label: '消息平台',
+    component: 'ApiSelect',
+    colProps: { span: 6 },
+    componentProps: {
+      api: findDictItemByCode,
+      params: {
+        dictCode: 'message_type',
+      },
+      labelField: 'itemText',
+      valueField: 'itemValue',
+    },
+  },
+  {
     field: 'sendTime',
     field: 'sendTime',
     label: '发送时间',
     label: '发送时间',
     component: 'RangePicker',
     component: 'RangePicker',

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