refactor: 个人中心 账号绑定 样式/逻辑重构(回滚了 既要又要的问题)

CHANGELOG.md

@@ -13,8 +13,8 @@
 
 - 字典接口抛出异常(为什么会抛出异常?)无限调用接口 兼容处理
 - 代码生成 字典下拉加载 改为每次进入编辑页面都加载
-- 个人中心 账号绑定 样式/逻辑重构
+- ~~个人中心 账号绑定 样式/逻辑重构~~(回滚了 既要又要的问题)
-- 个人中心 下拉卡片 昵称超长省略显示
+- ~~个人中心 下拉卡片 昵称超长省略显示~~(回滚了 既要又要的问题)
 
 # 1.4.0
 

apps/web-antd/src/views/_core/profile/components/online-device.vue

@@ -1,93 +1,52 @@
 <script setup lang="ts">
 import type { Recordable } from '@vben/types';
 
-import type { OnlineUser } from '#/api/monitor/online/model';
+import type { VxeGridProps } from '#/adapter/vxe-table';
 
-import { onMounted, shallowRef } from 'vue';
+import { Popconfirm } from 'ant-design-vue';
-
-import { getPopupContainer } from '@vben/utils';
-
-import {
-  Card,
-  Descriptions,
-  DescriptionsItem,
-  Popconfirm,
-  Spin,
-  Tag,
-} from 'ant-design-vue';
-import dayjs from 'dayjs';
 
+import { useVbenVxeGrid } from '#/adapter/vxe-table';
 import { forceLogout2, onlineDeviceList } from '#/api/monitor/online';
-import { renderBrowserIcon, renderOsIcon } from '#/utils/render';
+import { columns } from '#/views/monitor/online/data';
+
+const gridOptions: VxeGridProps = {
+  columns,
+  keepSource: true,
+  pagerConfig: {
+    enabled: false,
+  },
+  proxyConfig: {
+    ajax: {
+      query: async () => {
+        return await onlineDeviceList();
+      },
+    },
+  },
+  rowConfig: {
+    keyField: 'tokenId',
+  },
+};
+
+const [BasicTable, tableApi] = useVbenVxeGrid({ gridOptions });
 
 async function handleForceOffline(row: Recordable<any>) {
   await forceLogout2(row.tokenId);
-  await loadData();
+  await tableApi.query();
 }
-
-const list = shallowRef<OnlineUser[]>([]);
-const loading = shallowRef(false);
-async function loadData() {
-  loading.value = true;
-  const resp = await onlineDeviceList();
-  list.value = resp.rows.map((item) => {
-    // Windows 10 or Windows Server 2016 太长了 分割一下
-    let value = item.os;
-    if (value) {
-      const split = value.split(' or ');
-      if (split.length === 2) {
-        value = split[0]!;
-      }
-      item.os = value;
-    }
-    return item;
-  });
-  loading.value = false;
-}
-onMounted(loadData);
 </script>
 
 <template>
-  <div class="mb-6">
+  <div>
-    <Spin :spinning="loading">
+    <BasicTable table-title="我的在线设备">
-      <div
+      <template #action="{ row }">
-        class="grid max-h-[calc(100vh/2)] min-h-[100px] grid-cols-1 gap-4 overflow-auto lg:grid-cols-2 2xl:grid-cols-3"
+        <Popconfirm
-      >
+          :title="`确认强制下线[${row.userName}]?`"
-        <Card
+          placement="left"
-          v-for="online in list"
+          @confirm="handleForceOffline(row)"
-          :key="online.tokenId"
-          size="small"
-          :title="`登录时间: ${dayjs(online.loginTime).format('YYYY-MM-DD HH:mm:ss')}`"
         >
-          <template #extra>
+          <a-button danger size="small" type="link">强制下线</a-button>
-            <Popconfirm
+        </Popconfirm>
-              title="确认强制下线?"
+      </template>
-              placement="left"
+    </BasicTable>
-              :get-popup-container="getPopupContainer"
-              @confirm="handleForceOffline(online)"
-            >
-              <a-button danger size="small">强制下线</a-button>
-            </Popconfirm>
-          </template>
-          <Descriptions size="middle" :column="2">
-            <DescriptionsItem label="登录平台">
-              <Tag>{{ online.deviceType }}</Tag>
-            </DescriptionsItem>
-            <DescriptionsItem label="浏览器">
-              <component :is="renderBrowserIcon(online.browser)" />
-            </DescriptionsItem>
-            <DescriptionsItem label="系统">
-              <component :is="renderOsIcon(online.os)" />
-            </DescriptionsItem>
-            <DescriptionsItem label="IP地址">
-              {{ online.ipaddr }}
-            </DescriptionsItem>
-            <DescriptionsItem label="登录地址">
-              {{ online.loginLocation }}
-            </DescriptionsItem>
-          </Descriptions>
-        </Card>
-      </div>
-    </Spin>
   </div>
 </template>