Compare commits

..

7 Commits

Author SHA1 Message Date
ZhuRui 48ab5d013b feat: 优化报名人数筛选功能 2026-08-28 15:39:23 +08:00
ZhuRui ce1a5e3f1f feat: 操作日志添加登录枚举 2026-08-28 14:44:14 +08:00
ZhuRui 8c023e63ec feat: 1.05需求处理 2026-08-28 14:40:40 +08:00
chenzhen a581f64ccb feat: 优化打包 教研 2026-08-26 15:32:14 +08:00
chenzhen 8c317d5b84 Merge pull request 'Release/0826' (#16) from release/0826 into master
Reviewed-on: #16
2026-08-26 15:17:06 +08:00
chenzhen 91d4410c2a Merge pull request 'feat: 处理部分样式与体验问题' (#15) from hotfix/0826/ZR into release/0826
Reviewed-on: #15
2026-08-26 15:10:42 +08:00
ZhuRui 045e491ade feat: 处理部分样式与体验问题 2026-08-26 15:05:32 +08:00
12 changed files with 195 additions and 25 deletions
+1 -1
View File
@@ -9,7 +9,7 @@
"serve:prod": "vite --mode production",
"build:dev": "vue-tsc --noEmit && vite build --mode development",
"build:test": "vue-tsc --noEmit && vite build --mode test",
"build:prod": "vue-tsc --noEmit && vite build --mode production",
"build:prod": "vite build --mode production",
"test": "vitest",
"test:run": "vitest run",
"test:coverage": "vitest run --coverage",
+4
View File
@@ -76,6 +76,10 @@ export interface EventListQueryParams {
idCardImg?: string;
/** 是否要求提供证件号码;0=无需,1=需要 */
idCardNo?: string;
/** 报名人数起始(含) */
scBegin?: string;
/** 报名人数结束(含) */
scEnd?: string;
}
/** 分页数据 */
+40
View File
@@ -2,6 +2,7 @@ import { defineComponent } from 'vue';
import {
Button,
Input,
InputNumber,
Table,
Form,
Space,
@@ -266,6 +267,45 @@ export default defineComponent({
onUpdate:value={(val: any) => (filterForm.region = val || [])}
/>
</Form.Item>
<Form.Item label="报名人数">
<Space.Compact>
<InputNumber
placeholder="请输入"
style={{ width: '140px' }}
value={filterForm.scBegin || undefined}
precision={0}
step={0}
min={0}
controls={false}
onUpdate:value={(val: any) =>
(filterForm.scBegin = val != null ? String(val) : '')
}
onPressEnter={handleSearch}
/>
<Input
style={{
width: '40px',
textAlign: 'center',
backgroundColor: '#fafafa',
pointerEvents: 'none',
color: 'rgba(0,0,0,0.45)',
}}
value="至"
disabled
/>
<InputNumber
placeholder="请输入"
style={{ width: '140px' }}
value={filterForm.scEnd || undefined}
precision={0}
step={0}
min={0}
controls={false}
onUpdate:value={(val: any) => (filterForm.scEnd = val != null ? String(val) : '')}
onPressEnter={handleSearch}
/>
</Space.Compact>
</Form.Item>
<Form.Item>
<Space>
<Button type="primary" onClick={handleSearch} loading={loading.value}>
+4
View File
@@ -15,6 +15,8 @@ export const FILTER_DEFAULTS = {
isPublic: '',
idCardNo: '',
idCardImg: '',
scBegin: '',
scEnd: '',
};
export type FieldMapping = [
@@ -35,6 +37,8 @@ export const FIELD_MAPPINGS: FieldMapping[] = [
['createDateRange', 'createDateEnd', (v) => v?.[1]],
['startDateRange', 'startDate', (v) => v?.[0]],
['startDateRange', 'startDateEnd', (v) => v?.[1]],
['scBegin', 'scBegin'],
['scEnd', 'scEnd'],
];
/** 赛事状态选项(value 对应 API status) */
@@ -92,11 +92,24 @@ export function useEventListModel() {
f.region.length > 0 ||
!!f.isPublic ||
!!f.idCardNo ||
!!f.idCardImg
!!f.idCardImg ||
!!f.scBegin?.trim() ||
!!f.scEnd?.trim()
);
});
/** 报名人数区间:起始大于结束时对调 */
const normalizeSignupCountRange = () => {
const begin = filterForm.scBegin.trim();
const end = filterForm.scEnd.trim();
if (begin && end && Number(begin) > Number(end)) {
filterForm.scBegin = end;
filterForm.scEnd = begin;
}
};
const handleSearch = () => {
normalizeSignupCountRange();
pagination.reset();
fetchList();
};
+33
View File
@@ -0,0 +1,33 @@
.cell {
display: flex;
align-items: center;
gap: 6px;
width: 100%;
cursor: default;
}
.text {
flex: 1;
min-width: 0;
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
line-height: 1.5;
word-break: break-all;
color: rgba(0, 0, 0, 0.88);
}
.view {
flex-shrink: 0;
color: #1677ff;
cursor: pointer;
user-select: none;
line-height: 1.5;
white-space: nowrap;
&:hover {
opacity: 0.85;
}
}
+77 -3
View File
@@ -1,11 +1,81 @@
import { defineComponent } from 'vue';
import { Button, Input, Table, DatePicker, Form, Space, Select, Pagination } from 'ant-design-vue';
import { defineComponent, ref, nextTick } from 'vue';
import {
Button,
Input,
Table,
DatePicker,
Form,
Space,
Select,
Pagination,
Modal,
} from 'ant-design-vue';
import { useLogModel, ACTION_TYPE_OPTIONS, ACTION_TYPE_MAP } from './model/useLogModel';
import { useContainerSize } from '@/hooks';
import { useContainerSize, useState, useEffect } from '@/hooks';
import pageStyles from '@/assets/styles/pageLayout.module.less';
import cellStyles from './index.module.less';
const { RangePicker } = DatePicker;
/**
* 操作内容单元格:最多 2 行截断,溢出时显示"查看"按钮
*/
const LogContentCell = defineComponent({
name: 'LogContentCell',
props: { text: { type: String, required: true } },
setup(props) {
const textRef = ref<HTMLElement | null>(null);
const [overflow, setOverflow] = useState(false);
const [modalOpen, setModalOpen] = useState(false);
const checkOverflow = () => {
const el = textRef.value;
if (el) setOverflow(el.scrollHeight > el.clientHeight);
};
let observer: ResizeObserver | null = null;
useEffect(() => {
if (!textRef.value) return;
nextTick(checkOverflow);
observer = new ResizeObserver(checkOverflow);
observer.observe(textRef.value);
return () => {
observer?.disconnect();
observer = null;
};
}, [() => textRef.value]);
return () => {
const raw = props.text;
return (
<div class={cellStyles.cell}>
<div ref={textRef} class={cellStyles.text}>
{raw}
</div>
{overflow.value ? (
<span class={cellStyles.view} onClick={() => setModalOpen(true)}>
查看
</span>
) : null}
<Modal
visible={modalOpen.value}
title="操作内容"
footer={null}
width={600}
centered
destroyOnClose
onCancel={() => setModalOpen(false)}
>
<div style={{ whiteSpace: 'pre-wrap', wordBreak: 'break-all', lineHeight: 1.8 }}>
{raw}
</div>
</Modal>
</div>
);
};
},
});
/**
* bodyCell 渲染
*/
@@ -13,6 +83,10 @@ function renderBodyCell({ column, text }: { column: any; text: any }) {
if (column.key === 'type') {
return <span>{ACTION_TYPE_MAP[text as number] || text || '--'}</span>;
}
if (column.dataIndex === 'content') {
const raw = text || '';
return raw ? <LogContentCell text={raw} /> : <span>--</span>;
}
return <span>{text || '--'}</span>;
}
+3 -1
View File
@@ -24,6 +24,7 @@ export const ACTION_TYPE_OPTIONS = [
{ value: '3', label: '禁用用户' },
{ value: '4', label: '启用用户' },
{ value: '7', label: '系统参数' },
{ value: '8', label: '用户登录' },
] as const;
/** 操作类型文案映射 */
@@ -33,6 +34,7 @@ export const ACTION_TYPE_MAP: Record<number, string> = {
3: '禁用用户',
4: '启用用户',
7: '系统参数',
8: '用户登录',
};
// ============================================================
@@ -103,7 +105,7 @@ export function useLogModel() {
const columns = [
{ title: '操作类型', dataIndex: 'type', key: 'type', width: 140 },
{ title: '操作人', dataIndex: 'nickname', key: 'nickname', width: 140 },
{ title: '操作内容', dataIndex: 'content', key: 'content', minWidth: 360 },
{ title: '操作内容', dataIndex: 'content', key: 'content', width: 480 },
{ title: '操作时间', dataIndex: 'createDate', key: 'createDate', width: 180 },
];
@@ -104,13 +104,13 @@ export default defineComponent({
</Form.Item>
<Form.Item label="参数值" name="paramValue" rules={paramValueRules}>
<Input
<TextArea
value={formData.paramValue}
onUpdate:value={(val: any) => {
formData.paramValue = val?.target?.value ?? val ?? '';
}}
placeholder="请输入参数值"
allowClear
rows={2}
/>
</Form.Item>
@@ -123,7 +123,7 @@ export default defineComponent({
placeholder="请输入备注说明(选填,最多200字)"
maxlength={200}
showCount
rows={3}
rows={4}
/>
</Form.Item>
</Form>
+12 -12
View File
@@ -8,11 +8,14 @@ import pageStyles from '@/assets/styles/pageLayout.module.less';
import cellStyles from './index.module.less';
/**
* 参数值单元格:最多 2 行截断,溢出时显示"查看"按钮
* 文本单元格:最多 2 行截断,溢出时显示"查看"按钮
*/
const ParamValueCell = defineComponent({
name: 'ParamValueCell',
props: { text: { type: String, required: true } },
const TruncatedTextCell = defineComponent({
name: 'TruncatedTextCell',
props: {
text: { type: String, required: true },
modalTitle: { type: String, required: true },
},
setup(props) {
const textRef = ref<HTMLElement | null>(null);
const [overflow, setOverflow] = useState(false);
@@ -49,7 +52,7 @@ const ParamValueCell = defineComponent({
) : null}
<Modal
visible={modalOpen.value}
title="参数值"
title={props.modalTitle}
footer={null}
width={600}
centered
@@ -90,14 +93,11 @@ function renderBodyCell({
</Space>
);
}
// 参数值列:两行截断 + 查看弹窗
if (column.dataIndex === 'paramValue') {
// 参数值 / 备注列:两行截断 + 查看弹窗
if (column.dataIndex === 'paramValue' || column.dataIndex === 'remark') {
const raw = text || '';
return raw ? <ParamValueCell text={raw} /> : <span>--</span>;
}
// 备注列:空值显示 --
if (column.dataIndex === 'remark' && !text) {
return <span>--</span>;
const modalTitle = column.dataIndex === 'paramValue' ? '参数值' : '备注说明';
return raw ? <TruncatedTextCell text={raw} modalTitle={modalTitle} /> : <span>--</span>;
}
return <span>{text ?? '--'}</span>;
}
@@ -28,7 +28,7 @@ export function useParamsColumns() {
title: '备注说明',
dataIndex: 'remark',
key: 'remark',
minWidth: 240,
width: 240,
},
];
+3 -3
View File
@@ -34,8 +34,8 @@ export const REAL_NAME_REGEX = /^[\u4e00-\u9fa5A-Za-z0-9·]{1,8}$/;
export const IMAGE_TYPE_REGEX = /^image\//;
/**
* 纯数字(整数)
* - 用于过滤非数字字符
* 非数字字符
* - 用于过滤 0-9 以外的字符(含小数点、字母、符号等)
*/
export const INTEGER_ONLY_REGEX = /\D/g;
@@ -63,7 +63,7 @@ export function isImageFile(file: { type: string }): boolean {
return IMAGE_TYPE_REGEX.test(file.type);
}
/** 过滤非数字字符,只保留整数 */
/** 只保留数字字符 */
export function toIntegerOnly(value: unknown): string {
return String(value ?? '').replace(INTEGER_ONLY_REGEX, '');
}