From 18ed1cdfed6e5c02085dee7ab95e5a48fc987d88 Mon Sep 17 00:00:00 2001 From: YunaiV Date: Sat, 20 Jun 2026 07:01:34 -0700 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BD=BF=E7=94=A8=20Prettier=20?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=BA=90=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/bpm/processExpression/index.ts | 2 +- src/api/bpm/simple/index.ts | 1 - src/api/im/friend/index.ts | 7 +- src/api/im/group/request/index.ts | 6 +- src/api/im/manager/statistics/index.ts | 10 +- src/api/infra/dataSourceConfig/index.ts | 5 +- src/api/infra/demo/demo03/erp/index.ts | 46 +++--- src/api/infra/demo/demo03/inner/index.ts | 46 +++--- src/api/infra/demo/demo03/normal/index.ts | 46 +++--- src/api/system/mail/account/index.ts | 5 +- src/api/system/oauth2/client.ts | 5 +- src/api/system/tenantPackage/index.ts | 5 +- .../components/mobile/Carousel/property.vue | 7 +- .../mobile/PromotionPoint/config.ts | 2 +- .../components/mobile/TitleBar/property.vue | 8 +- .../FormCreate/src/components/AreaSelect.vue | 2 +- .../FormCreate/src/components/DeptSelect.vue | 12 +- .../FormCreate/src/useFormCreateDesigner.ts | 9 +- src/components/FormCreate/src/utils/index.ts | 2 +- src/components/Icon/src/IconSelect.vue | 7 +- src/components/JsonEditor/types/index.ts | 20 +-- .../src/SimpleProcessDesigner.vue | 25 ++- .../SimpleProcessDesignerV2/src/index.ts | 2 +- .../nodes-config/ChildProcessNodeConfig.vue | 25 ++- .../SimpleProcessDesignerV2/src/utils.ts | 10 +- .../theme/simple-process-designer.scss | 39 ++--- src/components/Verifition/src/Verify.vue | 4 +- src/components/Verifition/src/Verify/index.ts | 2 +- .../descriptor/flowableDescriptor.json | 10 +- .../plugins/translate/customTranslate.js | 16 +- .../package/theme/index.scss | 75 ++++----- src/config/axios/service.ts | 4 +- src/hooks/web/useWatermark.ts | 2 +- src/layout/components/Logo/src/Logo.vue | 5 +- src/layout/components/Menu/src/Menu.vue | 43 +++--- .../Menu/src/components/useRenderMenuItem.tsx | 10 +- src/layout/components/Menu/src/menuRoute.ts | 10 +- src/layout/components/TabMenu/src/TabMenu.vue | 16 +- .../components/TagsView/src/TagsView.vue | 13 +- src/layout/components/ToolHeader.vue | 6 +- .../UserInfo/src/components/LockDialog.vue | 2 +- .../UserInfo/src/components/LockPage.vue | 4 +- src/layout/components/useRenderLayout.tsx | 9 +- src/utils/color.ts | 1 - src/utils/domUtils.ts | 67 ++++---- src/utils/formatTime.ts | 4 +- src/utils/index.ts | 4 +- src/utils/is.ts | 2 +- src/utils/layout.ts | 4 +- src/utils/permission.ts | 3 +- src/utils/routeParams.ts | 7 +- src/views/Login/components/RegisterForm.vue | 2 +- src/views/Login/components/index.ts | 10 +- .../ai/image/index/components/ImageCard.vue | 5 +- .../ai/image/index/components/dall3/index.vue | 19 ++- .../index/components/midjourney/index.vue | 20 +-- .../components/stableDiffusion/index.vue | 1 - src/views/ai/image/square/index.vue | 16 +- src/views/bpm/model/form/FormDesign.vue | 24 ++- .../bpm/model/form/PrintTemplate/Index.vue | 4 +- .../PrintTemplate/module/parse-elem-html.ts | 3 +- src/views/bpm/model/index.vue | 2 +- .../create/ProcessDefinitionDetail.vue | 2 +- .../processInstance/detail/PrintDialog.vue | 24 ++- src/views/bpm/task/manager/index.vue | 7 +- .../permission/components/PermissionList.vue | 3 +- src/views/crm/statistics/customer/index.vue | 2 +- src/views/crm/statistics/funnel/index.vue | 2 +- .../im/home/components/PagedScroller.vue | 5 +- .../im/home/components/ResizableAside.vue | 4 +- .../im/home/components/card/CardBubble.vue | 6 +- .../components/friend/FriendAddDialog.vue | 4 +- .../im/home/components/group/GroupAvatar.vue | 6 +- .../home/components/group/GroupInfoCard.vue | 4 +- .../group/GroupMuteMemberDialog.vue | 8 +- .../group/GroupRequestListDialog.vue | 11 +- .../picker/ConversationPickerPanel.vue | 1 + .../components/picker/FriendPickerPanel.vue | 4 +- .../picker/GroupMemberPickerPanel.vue | 9 +- .../home/components/rtc/RtcCallContainer.vue | 24 +-- .../components/rtc/RtcCallParticipantTile.vue | 2 + .../im/home/components/rtc/RtcCallRunning.vue | 14 +- .../components/user/RecommendCardDialog.vue | 4 +- .../im/home/components/user/UserInfoCard.vue | 4 +- .../im/home/composables/useLiveKitRoom.ts | 12 +- .../im/home/composables/useMediaUploader.ts | 20 +-- .../pages/contact/FriendRequestDetail.vue | 8 +- .../conversation/ConversationGroupSide.vue | 143 ++++++++++++------ .../conversation/ConversationItem.vue | 6 +- .../conversation/ConversationPrivateSide.vue | 52 +++++-- .../components/input/FacePicker.vue | 9 +- .../components/input/MessageInput.vue | 9 +- .../components/input/VoiceRecorder.vue | 26 ++-- .../components/message/GroupPinnedMessage.vue | 6 +- .../message/GroupRequestPending.vue | 2 +- .../components/message/MaterialBubble.vue | 38 +++-- .../components/message/MessageBubble.vue | 10 +- .../components/message/MessageHistory.vue | 17 ++- .../components/message/MessageItem.vue | 1 + .../components/message/MessagePanel.vue | 4 +- .../message/forward/MessageForwardDialog.vue | 4 +- .../forward/MessageMergeDetailDialog.vue | 5 +- .../components/message/forward/keys.ts | 5 +- .../im/home/pages/conversation/index.vue | 6 +- src/views/im/home/store/conversationStore.ts | 17 +-- src/views/im/home/store/faceStore.ts | 6 +- src/views/im/home/store/rtcStore.ts | 12 +- src/views/im/home/store/websocketStore.ts | 4 +- src/views/im/home/types/index.ts | 7 +- .../im/manager/channel/list/ChannelForm.vue | 6 +- .../im/manager/channel/material/index.vue | 7 +- .../im/manager/channel/message/index.vue | 7 +- src/views/im/manager/face/userItem/index.vue | 8 +- src/views/im/manager/friend/index.vue | 14 +- src/views/im/manager/friend/request/index.vue | 22 ++- src/views/im/manager/group/GroupDetail.vue | 15 +- src/views/im/manager/group/index.vue | 14 +- src/views/im/manager/group/request/index.vue | 29 +++- .../manager/message/MessageContentPreview.vue | 20 +-- .../message/group/GroupMessageDetail.vue | 9 +- src/views/im/manager/message/group/index.vue | 6 +- .../message/private/PrivateMessageDetail.vue | 5 +- .../im/manager/message/private/index.vue | 6 +- src/views/im/manager/rtc/RtcCallDetail.vue | 17 ++- src/views/im/manager/rtc/index.vue | 6 +- src/views/im/manager/sensitiveword/index.vue | 15 +- .../components/MessageTrendChart.vue | 18 ++- .../statistics/components/OverviewCards.vue | 14 +- .../statistics/components/UserTrendChart.vue | 14 +- src/views/im/manager/statistics/index.vue | 2 +- src/views/im/utils/conversation.ts | 19 ++- src/views/im/utils/emoji.ts | 143 ++++++++++++++++-- src/views/im/utils/group.ts | 10 +- .../infra/demo/demo01/Demo01ContactForm.vue | 6 +- src/views/infra/demo/demo01/index.vue | 15 +- .../demo/demo03/erp/Demo03StudentForm.vue | 6 +- .../erp/components/Demo03CourseForm.vue | 10 +- .../erp/components/Demo03CourseList.vue | 10 +- .../demo03/erp/components/Demo03GradeForm.vue | 10 +- .../demo03/erp/components/Demo03GradeList.vue | 10 +- src/views/infra/demo/demo03/erp/index.vue | 15 +- .../demo/demo03/normal/Demo03StudentForm.vue | 6 +- .../normal/components/Demo03CourseForm.vue | 4 +- .../normal/components/Demo03GradeForm.vue | 2 +- src/views/infra/demo/demo03/normal/index.vue | 15 +- src/views/iot/device/device/index.vue | 5 +- src/views/iot/product/product/index.vue | 4 +- .../form/configs/MainConditionInnerConfig.vue | 3 +- src/views/iot/utils/sceneRule.ts | 5 +- .../activity/CombinationActivityForm.vue | 6 +- .../seckill/activity/SeckillActivityForm.vue | 6 +- src/views/mall/trade/config/index.vue | 4 +- .../mall/trade/order/form/OrderPickUpForm.vue | 6 +- .../member/user/detail/UserAccountInfo.vue | 2 +- .../member/user/detail/UserBasicInfo.vue | 2 +- .../dv/checkplan/CheckPlanMachineryList.vue | 7 +- src/views/mes/dv/checkplan/index.vue | 5 +- src/views/mes/dv/checkrecord/index.vue | 12 +- src/views/mes/dv/machinery/MachineryForm.vue | 11 +- src/views/mes/dv/maintenrecord/index.vue | 5 +- src/views/mes/dv/repair/index.vue | 5 +- src/views/mes/dv/subject/index.vue | 5 +- src/views/mes/md/client/index.vue | 5 +- src/views/mes/md/item/type/index.vue | 5 +- src/views/mes/md/unitmeasure/index.vue | 5 +- src/views/mes/md/vendor/index.vue | 5 +- .../mes/md/workstation/WorkstationForm.vue | 5 +- .../md/workstation/workshop/WorkshopForm.vue | 11 +- src/views/mes/pro/card/CardForm.vue | 11 +- src/views/mes/pro/card/index.vue | 5 +- src/views/mes/pro/feedback/FeedbackForm.vue | 4 +- src/views/mes/pro/process/index.vue | 5 +- src/views/mes/pro/route/index.vue | 5 +- src/views/mes/pro/task/edit/index.vue | 5 +- src/views/mes/pro/task/index.vue | 5 +- .../components/ProWorkOrderSelectDialog.vue | 7 +- src/views/mes/qc/batchtrace/index.vue | 5 +- src/views/mes/qc/ipqc/IpqcForm.vue | 4 +- src/views/mes/qc/pendinginspect/index.vue | 5 +- src/views/mes/tm/tool/ToolForm.vue | 5 +- src/views/mes/wm/arrivalnotice/index.vue | 5 +- .../wm/barcode/config/BarcodeConfigForm.vue | 7 +- src/views/mes/wm/barcode/index.vue | 5 +- .../mes/wm/batch/components/WmBatchSelect.vue | 8 +- .../wm/itemreceipt/ItemReceiptLineList.vue | 7 +- src/views/mes/wm/itemreceipt/index.vue | 5 +- src/views/mes/wm/materialstock/index.vue | 5 +- .../OutsourceReceiptLineList.vue | 7 +- src/views/mes/wm/productissue/index.vue | 5 +- .../productreceipt/ProductReceiptLineList.vue | 7 +- src/views/mes/wm/productsales/index.vue | 5 +- .../wm/returnissue/ReturnIssueLineList.vue | 7 +- src/views/mes/wm/returnissue/index.vue | 5 +- .../wm/returnsales/ReturnSalesLineList.vue | 7 +- src/views/mes/wm/returnsales/index.vue | 5 +- .../wm/returnvendor/ReturnVendorLineList.vue | 7 +- src/views/mes/wm/returnvendor/index.vue | 5 +- src/views/mes/wm/salesnotice/index.vue | 5 +- src/views/mes/wm/sn/WmSnDetailDialog.vue | 19 +-- src/views/mes/wm/sn/index.vue | 5 +- .../plan/StockTakingPlanParamList.vue | 6 +- .../mes/wm/transfer/TransferLineList.vue | 7 +- src/views/mes/wm/warehouse/WarehouseForm.vue | 5 +- src/views/mes/wm/warehouse/area/AreaForm.vue | 5 +- src/views/mes/wm/warehouse/area/index.vue | 5 +- src/views/mes/wm/warehouse/index.vue | 5 +- .../wm/warehouse/location/LocationForm.vue | 5 +- src/views/mes/wm/warehouse/location/index.vue | 5 +- .../pay/demo/withdraw/DemoWithdrawForm.vue | 2 +- .../components/MailTemplateSelect.vue | 5 +- .../system/role/components/RoleSelect.vue | 10 +- src/views/system/sms/log/index.vue | 2 +- .../system/sms/template/SmsTemplateForm.vue | 2 +- .../template/components/SmsTemplateSelect.vue | 5 +- src/views/system/sms/template/index.vue | 2 +- .../system/user/components/UserSelect.vue | 7 +- src/views/wms/order/check/CheckOrderPrint.vue | 3 +- .../wms/order/movement/MovementOrderForm.vue | 21 +-- .../wms/order/movement/MovementOrderPrint.vue | 3 +- .../wms/order/receipt/ReceiptOrderPrint.vue | 3 +- .../wms/order/shipment/ShipmentOrderPrint.vue | 3 +- 221 files changed, 1426 insertions(+), 908 deletions(-) diff --git a/src/api/bpm/processExpression/index.ts b/src/api/bpm/processExpression/index.ts index af6a73724..e2a654db2 100644 --- a/src/api/bpm/processExpression/index.ts +++ b/src/api/bpm/processExpression/index.ts @@ -39,4 +39,4 @@ export const ProcessExpressionApi = { exportProcessExpression: async (params) => { return await request.download({ url: `/bpm/process-expression/export-excel`, params }) } -} \ No newline at end of file +} diff --git a/src/api/bpm/simple/index.ts b/src/api/bpm/simple/index.ts index 6e1e995a8..937c2b12e 100644 --- a/src/api/bpm/simple/index.ts +++ b/src/api/bpm/simple/index.ts @@ -1,6 +1,5 @@ import request from '@/config/axios' - export const updateBpmSimpleModel = async (data) => { return await request.post({ url: '/bpm/model/simple/update', diff --git a/src/api/im/friend/index.ts b/src/api/im/friend/index.ts index 9cd35d121..54f3f424d 100644 --- a/src/api/im/friend/index.ts +++ b/src/api/im/friend/index.ts @@ -34,7 +34,11 @@ export const getMyFriendList = () => { } // 增量拉取当前用户的好友关系（重连 / 离线补偿） -export const pullMyFriendList = (params: { lastUpdateTime?: number; lastId?: number; limit: number }) => { +export const pullMyFriendList = (params: { + lastUpdateTime?: number + lastId?: number + limit: number +}) => { return request.get({ url: '/im/friend/pull', params }) } @@ -65,4 +69,3 @@ export const blockFriend = (friendUserId: number | string) => { export const unblockFriend = (friendUserId: number | string) => { return request.put({ url: '/im/friend/unblock', params: { friendUserId } }) } - diff --git a/src/api/im/group/request/index.ts b/src/api/im/group/request/index.ts index d9ced2b6f..9af2fe894 100644 --- a/src/api/im/group/request/index.ts +++ b/src/api/im/group/request/index.ts @@ -72,6 +72,10 @@ export const getMyGroupRequest = (id: number) => { } // 增量拉取我管理的所有群下加群申请变更（重连 / 离线补偿） -export const pullMyGroupRequestList = (params: { lastUpdateTime?: number; lastId?: number; limit: number }) => { +export const pullMyGroupRequestList = (params: { + lastUpdateTime?: number + lastId?: number + limit: number +}) => { return request.get({ url: '/im/group-request/pull', params }) } diff --git a/src/api/im/manager/statistics/index.ts b/src/api/im/manager/statistics/index.ts index 360e96afd..88be4470c 100644 --- a/src/api/im/manager/statistics/index.ts +++ b/src/api/im/manager/statistics/index.ts @@ -42,12 +42,18 @@ export const getStatisticsOverview = (): Promise => { // 获得消息趋势（私聊 + 群聊双线） export const getMessageTrend = (days: number): Promise => { - return request.get({ url: '/im/manager/statistics/message-trend', params: { days } }) + return request.get({ + url: '/im/manager/statistics/message-trend', + params: { days } + }) } // 获得用户趋势（新增注册 + 日活双线） export const getUserTrend = (days: number): Promise => { - return request.get({ url: '/im/manager/statistics/user-trend', params: { days } }) + return request.get({ + url: '/im/manager/statistics/user-trend', + params: { days } + }) } // 获得内容类型分布（最近 30 天） diff --git a/src/api/infra/dataSourceConfig/index.ts b/src/api/infra/dataSourceConfig/index.ts index 55bd6a3d5..bdc1d80b8 100644 --- a/src/api/infra/dataSourceConfig/index.ts +++ b/src/api/infra/dataSourceConfig/index.ts @@ -26,7 +26,10 @@ export const deleteDataSourceConfig = (id: number) => { // 批量删除数据源配置 export const deleteDataSourceConfigList = (ids: number[]) => { - return request.delete({ url: '/infra/data-source-config/delete-list', params: { ids: ids.join(',') } }) + return request.delete({ + url: '/infra/data-source-config/delete-list', + params: { ids: ids.join(',') } + }) } // 查询数据源配置详情 diff --git a/src/api/infra/demo/demo03/erp/index.ts b/src/api/infra/demo/demo03/erp/index.ts index c641ed074..5deba7c1e 100644 --- a/src/api/infra/demo/demo03/erp/index.ts +++ b/src/api/infra/demo/demo03/erp/index.ts @@ -1,29 +1,29 @@ import request from '@/config/axios' -import type { Dayjs } from 'dayjs'; +import type { Dayjs } from 'dayjs' /** 学生课程信息 */ export interface Demo03Course { - id: number; // 编号 - studentId?: number; // 学生编号 - name?: string; // 名字 - score?: number; // 分数 + id: number // 编号 + studentId?: number // 学生编号 + name?: string // 名字 + score?: number // 分数 } /** 学生班级信息 */ export interface Demo03Grade { - id: number; // 编号 - studentId?: number; // 学生编号 - name?: string; // 名字 - teacher?: string; // 班主任 + id: number // 编号 + studentId?: number // 学生编号 + name?: string // 名字 + teacher?: string // 班主任 } /** 学生信息 */ export interface Demo03Student { - id: number; // 编号 - name?: string; // 名字 - sex?: number; // 性别 - birthday?: string | Dayjs; // 出生日期 - description?: string; // 简介 + id: number // 编号 + name?: string // 名字 + sex?: number // 性别 + birthday?: string | Dayjs // 出生日期 + description?: string // 简介 } // 学生 API @@ -55,7 +55,9 @@ export const Demo03StudentApi = { /** 批量删除学生 */ deleteDemo03StudentList: async (ids: number[]) => { - return await request.delete({ url: `/infra/demo03-student-erp/delete-list?ids=${ids.join(',')}` }) + return await request.delete({ + url: `/infra/demo03-student-erp/delete-list?ids=${ids.join(',')}` + }) }, // 导出学生 Excel @@ -63,7 +65,7 @@ export const Demo03StudentApi = { return await request.download({ url: `/infra/demo03-student-erp/export-excel`, params }) }, -// ==================== 子表（学生课程） ==================== + // ==================== 子表（学生课程） ==================== // 获得学生课程分页 getDemo03CoursePage: async (params) => { @@ -86,7 +88,9 @@ export const Demo03StudentApi = { /** 批量删除学生课程 */ deleteDemo03CourseList: async (ids: number[]) => { - return await request.delete({ url: `/infra/demo03-student-erp/demo03-course/delete-list?ids=${ids.join(',')}` }) + return await request.delete({ + url: `/infra/demo03-student-erp/demo03-course/delete-list?ids=${ids.join(',')}` + }) }, // 获得学生课程 @@ -94,7 +98,7 @@ export const Demo03StudentApi = { return await request.get({ url: `/infra/demo03-student-erp/demo03-course/get?id=` + id }) }, -// ==================== 子表（学生班级） ==================== + // ==================== 子表（学生班级） ==================== // 获得学生班级分页 getDemo03GradePage: async (params) => { @@ -117,11 +121,13 @@ export const Demo03StudentApi = { /** 批量删除学生班级 */ deleteDemo03GradeList: async (ids: number[]) => { - return await request.delete({ url: `/infra/demo03-student-erp/demo03-grade/delete-list?ids=${ids.join(',')}` }) + return await request.delete({ + url: `/infra/demo03-student-erp/demo03-grade/delete-list?ids=${ids.join(',')}` + }) }, // 获得学生班级 getDemo03Grade: async (id: number) => { return await request.get({ url: `/infra/demo03-student-erp/demo03-grade/get?id=` + id }) - }, + } } diff --git a/src/api/infra/demo/demo03/inner/index.ts b/src/api/infra/demo/demo03/inner/index.ts index 1000d9cc9..5c22aa4aa 100644 --- a/src/api/infra/demo/demo03/inner/index.ts +++ b/src/api/infra/demo/demo03/inner/index.ts @@ -1,29 +1,29 @@ import request from '@/config/axios' -import type { Dayjs } from 'dayjs'; +import type { Dayjs } from 'dayjs' /** 学生课程信息 */ export interface Demo03Course { - id: number; // 编号 - studentId?: number; // 学生编号 - name?: string; // 名字 - score?: number; // 分数 + id: number // 编号 + studentId?: number // 学生编号 + name?: string // 名字 + score?: number // 分数 } /** 学生班级信息 */ export interface Demo03Grade { - id: number; // 编号 - studentId?: number; // 学生编号 - name?: string; // 名字 - teacher?: string; // 班主任 + id: number // 编号 + studentId?: number // 学生编号 + name?: string // 名字 + teacher?: string // 班主任 } /** 学生信息 */ export interface Demo03Student { - id: number; // 编号 - name?: string; // 名字 - sex?: number; // 性别 - birthday?: string | Dayjs; // 出生日期 - description?: string; // 简介 + id: number // 编号 + name?: string // 名字 + sex?: number // 性别 + birthday?: string | Dayjs // 出生日期 + description?: string // 简介 demo03courses?: Demo03Course[] demo03grade?: Demo03Grade } @@ -57,7 +57,9 @@ export const Demo03StudentApi = { /** 批量删除学生 */ deleteDemo03StudentList: async (ids: number[]) => { - return await request.delete({ url: `/infra/demo03-student-inner/delete-list?ids=${ids.join(',')}` }) + return await request.delete({ + url: `/infra/demo03-student-inner/delete-list?ids=${ids.join(',')}` + }) }, // 导出学生 Excel @@ -65,17 +67,21 @@ export const Demo03StudentApi = { return await request.download({ url: `/infra/demo03-student-inner/export-excel`, params }) }, -// ==================== 子表（学生课程） ==================== + // ==================== 子表（学生课程） ==================== // 获得学生课程列表 getDemo03CourseListByStudentId: async (studentId) => { - return await request.get({ url: `/infra/demo03-student-inner/demo03-course/list-by-student-id?studentId=` + studentId }) + return await request.get({ + url: `/infra/demo03-student-inner/demo03-course/list-by-student-id?studentId=` + studentId + }) }, -// ==================== 子表（学生班级） ==================== + // ==================== 子表（学生班级） ==================== // 获得学生班级 getDemo03GradeByStudentId: async (studentId) => { - return await request.get({ url: `/infra/demo03-student-inner/demo03-grade/get-by-student-id?studentId=` + studentId }) - }, + return await request.get({ + url: `/infra/demo03-student-inner/demo03-grade/get-by-student-id?studentId=` + studentId + }) + } } diff --git a/src/api/infra/demo/demo03/normal/index.ts b/src/api/infra/demo/demo03/normal/index.ts index 56a824dd8..ff3d2f4cd 100644 --- a/src/api/infra/demo/demo03/normal/index.ts +++ b/src/api/infra/demo/demo03/normal/index.ts @@ -1,29 +1,29 @@ import request from '@/config/axios' -import type { Dayjs } from 'dayjs'; +import type { Dayjs } from 'dayjs' /** 学生课程信息 */ export interface Demo03Course { - id: number; // 编号 - studentId?: number; // 学生编号 - name?: string; // 名字 - score?: number; // 分数 + id: number // 编号 + studentId?: number // 学生编号 + name?: string // 名字 + score?: number // 分数 } /** 学生班级信息 */ export interface Demo03Grade { - id: number; // 编号 - studentId?: number; // 学生编号 - name?: string; // 名字 - teacher?: string; // 班主任 + id: number // 编号 + studentId?: number // 学生编号 + name?: string // 名字 + teacher?: string // 班主任 } /** 学生信息 */ export interface Demo03Student { - id: number; // 编号 - name?: string; // 名字 - sex?: number; // 性别 - birthday?: string | Dayjs; // 出生日期 - description?: string; // 简介 + id: number // 编号 + name?: string // 名字 + sex?: number // 性别 + birthday?: string | Dayjs // 出生日期 + description?: string // 简介 demo03courses?: Demo03Course[] demo03grade?: Demo03Grade } @@ -57,7 +57,9 @@ export const Demo03StudentApi = { /** 批量删除学生 */ deleteDemo03StudentList: async (ids: number[]) => { - return await request.delete({ url: `/infra/demo03-student-normal/delete-list?ids=${ids.join(',')}` }) + return await request.delete({ + url: `/infra/demo03-student-normal/delete-list?ids=${ids.join(',')}` + }) }, // 导出学生 Excel @@ -65,17 +67,21 @@ export const Demo03StudentApi = { return await request.download({ url: `/infra/demo03-student-normal/export-excel`, params }) }, -// ==================== 子表（学生课程） ==================== + // ==================== 子表（学生课程） ==================== // 获得学生课程列表 getDemo03CourseListByStudentId: async (studentId) => { - return await request.get({ url: `/infra/demo03-student-normal/demo03-course/list-by-student-id?studentId=` + studentId }) + return await request.get({ + url: `/infra/demo03-student-normal/demo03-course/list-by-student-id?studentId=` + studentId + }) }, -// ==================== 子表（学生班级） ==================== + // ==================== 子表（学生班级） ==================== // 获得学生班级 getDemo03GradeByStudentId: async (studentId) => { - return await request.get({ url: `/infra/demo03-student-normal/demo03-grade/get-by-student-id?studentId=` + studentId }) - }, + return await request.get({ + url: `/infra/demo03-student-normal/demo03-grade/get-by-student-id?studentId=` + studentId + }) + } } diff --git a/src/api/system/mail/account/index.ts b/src/api/system/mail/account/index.ts index 97b574a82..f9c334066 100644 --- a/src/api/system/mail/account/index.ts +++ b/src/api/system/mail/account/index.ts @@ -38,7 +38,10 @@ export const deleteMailAccount = async (id: number) => { // 批量删除邮箱账号 export const deleteMailAccountList = async (ids: number[]) => { - return await request.delete({ url: '/system/mail-account/delete-list', params: { ids: ids.join(',') } }) + return await request.delete({ + url: '/system/mail-account/delete-list', + params: { ids: ids.join(',') } + }) } // 获得邮箱账号精简列表 diff --git a/src/api/system/oauth2/client.ts b/src/api/system/oauth2/client.ts index 348aed583..d869f48bc 100644 --- a/src/api/system/oauth2/client.ts +++ b/src/api/system/oauth2/client.ts @@ -48,5 +48,8 @@ export const deleteOAuth2Client = (id: number) => { // 批量删除 OAuth2 客户端 export const deleteOAuth2ClientList = (ids: number[]) => { - return request.delete({ url: '/system/oauth2-client/delete-list', params: { ids: ids.join(',') } }) + return request.delete({ + url: '/system/oauth2-client/delete-list', + params: { ids: ids.join(',') } + }) } diff --git a/src/api/system/tenantPackage/index.ts b/src/api/system/tenantPackage/index.ts index 49d9d4086..ac0017c1f 100644 --- a/src/api/system/tenantPackage/index.ts +++ b/src/api/system/tenantPackage/index.ts @@ -39,7 +39,10 @@ export const deleteTenantPackage = (id: number) => { // 批量删除租户套餐 export const deleteTenantPackageList = (ids: number[]) => { - return request.delete({ url: '/system/tenant-package/delete-list', params: { ids: ids.join(',') } }) + return request.delete({ + url: '/system/tenant-package/delete-list', + params: { ids: ids.join(',') } + }) } // 获取租户套餐精简信息列表 diff --git a/src/components/DiyEditor/components/mobile/Carousel/property.vue b/src/components/DiyEditor/components/mobile/Carousel/property.vue index 8da98ff65..d2524f6d6 100644 --- a/src/components/DiyEditor/components/mobile/Carousel/property.vue +++ b/src/components/DiyEditor/components/mobile/Carousel/property.vue @@ -17,7 +17,12 @@ - px + + px diff --git a/src/components/DiyEditor/components/mobile/PromotionPoint/config.ts b/src/components/DiyEditor/components/mobile/PromotionPoint/config.ts index 75aa0ffb6..46004cd09 100644 --- a/src/components/DiyEditor/components/mobile/PromotionPoint/config.ts +++ b/src/components/DiyEditor/components/mobile/PromotionPoint/config.ts @@ -1,4 +1,4 @@ -import {ComponentStyle, DiyComponent} from '@/components/DiyEditor/util' +import { ComponentStyle, DiyComponent } from '@/components/DiyEditor/util' /** 积分商城属性 */ export interface PromotionPointProperty { diff --git a/src/components/DiyEditor/components/mobile/TitleBar/property.vue b/src/components/DiyEditor/components/mobile/TitleBar/property.vue index 5eebb1511..696b7c853 100644 --- a/src/components/DiyEditor/components/mobile/TitleBar/property.vue +++ b/src/components/DiyEditor/components/mobile/TitleBar/property.vue @@ -31,13 +31,7 @@ /> - + diff --git a/src/components/FormCreate/src/components/AreaSelect.vue b/src/components/FormCreate/src/components/AreaSelect.vue index aae3ba3e1..cef78ae26 100644 --- a/src/components/FormCreate/src/components/AreaSelect.vue +++ b/src/components/FormCreate/src/components/AreaSelect.vue @@ -34,7 +34,7 @@ interface AreaVO { interface Props { modelValue?: number[] | string[] - level?: typeof AreaLevelEnum[keyof typeof AreaLevelEnum] + level?: (typeof AreaLevelEnum)[keyof typeof AreaLevelEnum] disabled?: boolean placeholder?: string clearable?: boolean diff --git a/src/components/FormCreate/src/components/DeptSelect.vue b/src/components/FormCreate/src/components/DeptSelect.vue index 2e18f4ad6..99c7347a1 100644 --- a/src/components/FormCreate/src/components/DeptSelect.vue +++ b/src/components/FormCreate/src/components/DeptSelect.vue @@ -155,32 +155,32 @@ const hasValidPresetValue = (): boolean => { // 设置默认值（当前用户部门） const setDefaultValue = () => { console.log('[DeptSelect] setDefaultValue called, defaultCurrentDept:', props.defaultCurrentDept) - + // 仅当 defaultCurrentDept 为 true 时处理 if (!props.defaultCurrentDept) { console.log('[DeptSelect] defaultCurrentDept is false, skip') return } - + // 检查是否已有预设值（预设值优先级高于默认当前部门） if (hasValidPresetValue()) { console.log('[DeptSelect] has preset value, skip:', props.modelValue) return } - + // 获取当前用户的部门 ID const userStore = useUserStoreWithOut() const user = userStore.getUser const deptId = user?.deptId - + console.log('[DeptSelect] current user:', user, 'deptId:', deptId) - + // 处理 deptId 为空或 0 的边界情况 if (!deptId || deptId === 0) { console.log('[DeptSelect] deptId is invalid, skip') return } - + // 根据多选模式决定默认值格式 const defaultValue = props.multiple ? [deptId] : deptId console.log('[DeptSelect] setting default value:', defaultValue) diff --git a/src/components/FormCreate/src/useFormCreateDesigner.ts b/src/components/FormCreate/src/useFormCreateDesigner.ts index 60d30e329..3996b4eb1 100644 --- a/src/components/FormCreate/src/useFormCreateDesigner.ts +++ b/src/components/FormCreate/src/useFormCreateDesigner.ts @@ -40,7 +40,14 @@ export const useFormCreateDesigner = async (designer: Ref) => { designer.value?.removeMenuItem('fcEditor') const iframeRule = useIframeRule() const areaSelectRule = useAreaSelectRule() - const components = [editorRule, uploadFileRule, uploadImgRule, uploadImgsRule, iframeRule, areaSelectRule] + const components = [ + editorRule, + uploadFileRule, + uploadImgRule, + uploadImgsRule, + iframeRule, + areaSelectRule + ] components.forEach((component) => { // 插入组件规则 designer.value?.addComponent(component) diff --git a/src/components/FormCreate/src/utils/index.ts b/src/components/FormCreate/src/utils/index.ts index a2b3e67f8..53b60d8aa 100644 --- a/src/components/FormCreate/src/utils/index.ts +++ b/src/components/FormCreate/src/utils/index.ts @@ -19,7 +19,7 @@ export const localeProps = (t, prefix, rules) => { /** * 解析表单组件的 field, title 等字段（递归，如果组件包含子组件） - * + * * @param rule 组件的生成规则 https://www.form-create.com/v3/guide/rule * @param fields 解析后表单组件字段 * @param parentTitle 如果是子表单，子表单的标题，默认为空 diff --git a/src/components/Icon/src/IconSelect.vue b/src/components/Icon/src/IconSelect.vue index 76cc6d553..dd4a43744 100644 --- a/src/components/Icon/src/IconSelect.vue +++ b/src/components/Icon/src/IconSelect.vue @@ -125,7 +125,12 @@ watch( diff --git a/src/views/iot/utils/sceneRule.ts b/src/views/iot/utils/sceneRule.ts index 6b7ff59c1..618d58be3 100644 --- a/src/views/iot/utils/sceneRule.ts +++ b/src/views/iot/utils/sceneRule.ts @@ -242,10 +242,7 @@ function createCurrentTimeParamRule(getOperator: () => string): FormItemRule { * @param path 错误提示前缀 * @returns 错误信息，通过则返回 null */ -export function validateTriggerCondition( - condition: TriggerCondition, - path: string -): string | null { +export function validateTriggerCondition(condition: TriggerCondition, path: string): string | null { if (!condition.type) { return `${path}: 条件类型不能为空` } diff --git a/src/views/mall/promotion/combination/activity/CombinationActivityForm.vue b/src/views/mall/promotion/combination/activity/CombinationActivityForm.vue index 5b6e582ba..70e95649c 100644 --- a/src/views/mall/promotion/combination/activity/CombinationActivityForm.vue +++ b/src/views/mall/promotion/combination/activity/CombinationActivityForm.vue @@ -135,7 +135,11 @@ const open = async (type: string, id?: number) => { const data = (await CombinationActivityApi.getCombinationActivity( id )) as CombinationActivityApi.CombinationActivityVO - await getSpuDetails(data.spuId!, data.products?.map((sku) => sku.skuId), data.products) + await getSpuDetails( + data.spuId!, + data.products?.map((sku) => sku.skuId), + data.products + ) formRef.value.setValues(data) } finally { formLoading.value = false diff --git a/src/views/mall/promotion/seckill/activity/SeckillActivityForm.vue b/src/views/mall/promotion/seckill/activity/SeckillActivityForm.vue index 486b71dda..cb36226df 100644 --- a/src/views/mall/promotion/seckill/activity/SeckillActivityForm.vue +++ b/src/views/mall/promotion/seckill/activity/SeckillActivityForm.vue @@ -144,7 +144,11 @@ const open = async (type: string, id?: number) => { const data = (await SeckillActivityApi.getSeckillActivity( id )) as SeckillActivityApi.SeckillActivityVO - await getSpuDetails(data.spuId!, data.products?.map((sku) => sku.skuId), data.products) + await getSpuDetails( + data.spuId!, + data.products?.map((sku) => sku.skuId), + data.products + ) formRef.value.setValues(data) } finally { formLoading.value = false diff --git a/src/views/mall/trade/config/index.vue b/src/views/mall/trade/config/index.vue index 5d4955d37..490b97b5f 100644 --- a/src/views/mall/trade/config/index.vue +++ b/src/views/mall/trade/config/index.vue @@ -114,7 +114,9 @@ - 分销海报图片，按上传顺序从左往右依次为个人分享海报、商品推广海报和拼团推广海报 + 分销海报图片，按上传顺序从左往右依次为个人分享海报、商品推广海报和拼团推广海报 diff --git a/src/views/mall/trade/order/form/OrderPickUpForm.vue b/src/views/mall/trade/order/form/OrderPickUpForm.vue index ccc6c1db9..444de364d 100644 --- a/src/views/mall/trade/order/form/OrderPickUpForm.vue +++ b/src/views/mall/trade/order/form/OrderPickUpForm.vue @@ -54,10 +54,10 @@ const orderDetails = ref({}) /** 打开弹窗 */ const open = async (pickUpVerifyCode: string) => { resetForm() - if(pickUpVerifyCode != null){ - formData.value.pickUpVerifyCode = pickUpVerifyCode; + if (pickUpVerifyCode != null) { + formData.value.pickUpVerifyCode = pickUpVerifyCode await getOrderByPickUpVerifyCode() - }else{ + } else { dialogVisible.value = true } } diff --git a/src/views/member/user/detail/UserAccountInfo.vue b/src/views/member/user/detail/UserAccountInfo.vue index fad174a86..237ce4155 100644 --- a/src/views/member/user/detail/UserAccountInfo.vue +++ b/src/views/member/user/detail/UserAccountInfo.vue @@ -70,8 +70,8 @@ withDefaults(defineProps<{ user: UserApi.UserVO; wallet: WalletApi.WalletVO; col justify-content: space-between; .el-descriptions__label { - width: 120px; display: block; + width: 120px; text-align: left; } diff --git a/src/views/member/user/detail/UserBasicInfo.vue b/src/views/member/user/detail/UserBasicInfo.vue index ac2dd2c76..fb6881ca1 100644 --- a/src/views/member/user/detail/UserBasicInfo.vue +++ b/src/views/member/user/detail/UserBasicInfo.vue @@ -163,8 +163,8 @@ withDefaults(defineProps<{ user: UserApi.UserVO; mode?: string }>(), { justify-content: space-between; .el-descriptions__label { - width: 120px; display: block; + width: 120px; text-align: left; } diff --git a/src/views/mes/dv/checkplan/CheckPlanMachineryList.vue b/src/views/mes/dv/checkplan/CheckPlanMachineryList.vue index 44563aabc..3fefdfaeb 100644 --- a/src/views/mes/dv/checkplan/CheckPlanMachineryList.vue +++ b/src/views/mes/dv/checkplan/CheckPlanMachineryList.vue @@ -17,7 +17,12 @@ - +