Merge branch 'd-ww' into 'main'

perf: message manage sms && email tabel add remark column

See merge request huang/yun-teng-iot-front!334

@@ -16,6 +16,11 @@
           </Popconfirm>
           </Popconfirm>
         </Authority>
         </Authority>
       </template>
       </template>
+      <template #remark="{ record }">
+        <Tooltip :title="record.remark">
+          <div class="truncate w-full">{{ record.remark }}</div>
+        </Tooltip>
+      </template>
       <template #action="{ record }">
       <template #action="{ record }">
         <TableAction
         <TableAction
           :actions="[
           :actions="[
@@ -51,11 +56,11 @@
   import EmailDetail from './EmailDetail.vue';
   import EmailDetail from './EmailDetail.vue';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { Authority } from '/@/components/Authority';
   import { Authority } from '/@/components/Authority';
-  import { Popconfirm } from 'ant-design-vue';
+  import { Popconfirm, Tooltip } from 'ant-design-vue';
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'EmailLog',
     name: 'EmailLog',
-    components: { EmailDetail, BasicTable, TableAction, Authority, Popconfirm },
+    components: { EmailDetail, BasicTable, TableAction, Authority, Popconfirm, Tooltip },
     setup() {
     setup() {
       const [registerModal, { openModal }] = useModal();
       const [registerModal, { openModal }] = useModal();
       const [registerTable, { reload, setProps }] = useTable({
       const [registerTable, { reload, setProps }] = useTable({

@@ -16,6 +16,11 @@
           </Popconfirm>
           </Popconfirm>
         </Authority>
         </Authority>
       </template>
       </template>
+      <template #remark="{ record }">
+        <Tooltip :title="record.remark">
+          <div class="truncate w-full">{{ record.remark }}</div>
+        </Tooltip>
+      </template>
       <template #action="{ record }">
       <template #action="{ record }">
         <TableAction
         <TableAction
           :actions="[
           :actions="[
@@ -45,7 +50,7 @@
   import { defineComponent, h, nextTick } from 'vue';
   import { defineComponent, h, nextTick } from 'vue';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { BasicTable, useTable, TableAction } from '/@/components/Table';
   import { columns, searchFormSchema } from './sms.data';
   import { columns, searchFormSchema } from './sms.data';
-  import { Modal, Popconfirm } from 'ant-design-vue';
+  import { Modal, Popconfirm, Tooltip } from 'ant-design-vue';
   import { smsLogPage, deleteSmsLog } from '/@/api/message/records';
   import { smsLogPage, deleteSmsLog } from '/@/api/message/records';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { JsonPreview } from '/@/components/CodeEditor';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
   import { useBatchDelete } from '/@/hooks/web/useBatchDelete';
@@ -53,7 +58,7 @@
 
 
   export default defineComponent({
   export default defineComponent({
     name: 'SmsLog',
     name: 'SmsLog',
-    components: { BasicTable, TableAction, Authority, Popconfirm },
+    components: { BasicTable, TableAction, Authority, Popconfirm, Tooltip },
     setup() {
     setup() {
       const [registerTable, { reload, setProps }] = useTable({
       const [registerTable, { reload, setProps }] = useTable({
         title: '短信发送列表',
         title: '短信发送列表',
@@ -86,7 +91,7 @@
       });
       });
       function handleQuery(record: Recordable) {
       function handleQuery(record: Recordable) {
         Modal.info({
         Modal.info({
-          title: '当前配置',
+          title: '消息内容',
           width: 480,
           width: 480,
           centered: true,
           centered: true,
           maskClosable: true,
           maskClosable: true,

@@ -36,6 +36,14 @@ export const columns: BasicColumn[] = [
     width: 160,
     width: 160,
   },
   },
   {
   {
+    title: '备注',
+    dataIndex: 'remark',
+    width: 120,
+    slots: {
+      customRender: 'remark',
+    },
+  },
+  {
     title: '发送时间',
     title: '发送时间',
     dataIndex: 'sendTime',
     dataIndex: 'sendTime',
     width: 180,
     width: 180,

@@ -36,6 +36,14 @@ export const columns: BasicColumn[] = [
     },
     },
   },
   },
   {
   {
+    title: '备注',
+    dataIndex: 'remark',
+    width: 120,
+    slots: {
+      customRender: 'remark',
+    },
+  },
+  {
     title: '发送时间',
     title: '发送时间',
     dataIndex: 'sendTime',
     dataIndex: 'sendTime',
     width: 160,
     width: 160,