Merge branch 'main' into ft-dev

@@ -15,28 +15,12 @@ export const columns: BasicColumn[] = [
   },
   },
   {
   {
     title: '消息类型',
     title: '消息类型',
-    dataIndex: 'messageType',
-    format: (_, record: Recordable) => {
-      return record.messageType === 'PHONE_MESSAGE'
-        ? '短信'
-        : record.type === 'DING_TALK_MESSAGE'
-        ? '钉钉'
-        : '邮件';
-    },
+    dataIndex: 'messageTypeDictText',
     width: 200,
     width: 200,
   },
   },
   {
   {
     title: '平台类型',
     title: '平台类型',
-    dataIndex: 'platformType',
-    format: (_, record: Recordable) => {
-      return record.messageType === MessageTypeEnum.EMAIL_MESSAGE
-        ? '无'
-        : record.messageType === MessageTypeEnum.PHONE_MESSAGE
-        ? record.platformType === 'ALI_CLOUD'
-          ? '阿里云平台'
-          : '腾讯云平台'
-        : '无';
-    },
+    dataIndex: 'platformTypeDictText',
     width: 180,
     width: 180,
   },
   },
   {
   {

@@ -17,10 +17,15 @@ export const columns: BasicColumn[] = [
   {
   {
     title: '配置名称',
     title: '配置名称',
     dataIndex: 'messageConfig.configName',
     dataIndex: 'messageConfig.configName',
-    width: 200,
+    width: 180,
     slots: { customRender: 'config' },
     slots: { customRender: 'config' },
   },
   },
   {
   {
+    title: '配置类型',
+    dataIndex: 'messageTypeDictText',
+    width: 100,
+  },
+  {
     title: '模板编码',
     title: '模板编码',
     dataIndex: 'templateCode',
     dataIndex: 'templateCode',
     width: 180,
     width: 180,
@@ -38,7 +43,7 @@ export const columns: BasicColumn[] = [
   {
   {
     title: '状态',
     title: '状态',
     dataIndex: 'status',
     dataIndex: 'status',
-    width: 180,
+    width: 100,
     customRender: ({ record }) => {
     customRender: ({ record }) => {
       if (!Reflect.has(record, 'pendingStatus')) {
       if (!Reflect.has(record, 'pendingStatus')) {
         record.pendingStatus = false;
         record.pendingStatus = false;