diff --git a/src/main.ts b/src/main.ts
index f6d4ffcb1..66e8a21cc 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -11,6 +11,11 @@ import { setupAntd, setupDirectives, setupGlobalMethods, setupCustomComponents }
import permission from '@/core/permission/';
+if (process.env.NODE_ENV === 'production') {
+ const { mockXHR } = require('./mock');
+ mockXHR();
+}
+
const app = createApp(App);
// 全局挂载Reflect反射对象
diff --git a/src/mock/hero/heroList.json b/src/mock/hero/heroList.json
index e56e5e159..053106557 100644
--- a/src/mock/hero/heroList.json
+++ b/src/mock/hero/heroList.json
@@ -1751,7 +1751,8 @@
"cname": "马超",
"new_type": 0,
"hero_type": 1,
- "hero_type2": 4
+ "hero_type2": 4,
+ "skin_name": "冷晖之枪|幸存者|神威"
},
{
"title": "幻纱之灵",
diff --git a/src/styles/antdv.override.less b/src/styles/antdv.override.less
index 5bda4bfc5..62d002078 100644
--- a/src/styles/antdv.override.less
+++ b/src/styles/antdv.override.less
@@ -11,3 +11,7 @@ body {
vertical-align: 0.125em !important;
}
}
+
+.ant-image-preview-root img {
+ display: unset;
+}
diff --git a/src/views/shared/demos/tables/wzry-table/columns.tsx b/src/views/shared/demos/tables/wzry-table/columns.tsx
index 2541e3dd2..5eca18a3c 100644
--- a/src/views/shared/demos/tables/wzry-table/columns.tsx
+++ b/src/views/shared/demos/tables/wzry-table/columns.tsx
@@ -1,13 +1,13 @@
import type { TableColumn } from '@/components/dynamic-table';
-import { Avatar, Tag } from 'ant-design-vue';
+import { Image, Tag } from 'ant-design-vue';
export const columns: TableColumn[] = [
{
title: '头像',
align: 'center',
width: 100,
- dataIndex: 'heroimg',
- bodyCell: ({ record }) => ,
+ dataIndex: 'faceimg',
+ bodyCell: ({ record }) => ,
},
{
title: '英雄名称',
@@ -30,8 +30,10 @@ export const columns: TableColumn[] = [
dataIndex: 'skin_name',
bodyCell: ({ record }) => (
<>
- {record.skin_name.split('|').map((name) => (
- {name}
+ {record.skin_name?.split('|')?.map((name) => (
+
+ {name}
+
))}
>
),
@@ -39,6 +41,7 @@ export const columns: TableColumn[] = [
{
title: '操作',
align: 'center',
+ width: 120,
dataIndex: '$action',
actions: ({ record }) => [
{