yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #225 from DevDengChao/codex/lint-mall-bpm-misc 

chore: fix mall bpm and misc lint
master
芋道源码 2026-05-23 22:07:05 +08:00 committed by GitHub
parent a1c43ed427 f5bcaf22f9
commit fa42f8e574
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
27 changed files with 120 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/Home/Index2.vue
View File

@ -14,7 +14,7 @@
</div>
<div class="flex flex-col justify-between">
<div :class="`${prefixCls}__item--text text-16px text-gray-500 text-right`"
>{{ t('analysis.newUser') }}
>{{ t('analysis.newUser') }}
</div>
<CountTo
:duration="2600"
@ -43,7 +43,7 @@
</div>
<div class="flex flex-col justify-between">
<div :class="`${prefixCls}__item--text text-16px text-gray-500 text-right`"
>{{ t('analysis.unreadInformation') }}
>{{ t('analysis.unreadInformation') }}
</div>
<CountTo
:duration="2600"
@ -72,7 +72,7 @@
</div>
<div class="flex flex-col justify-between">
<div :class="`${prefixCls}__item--text text-16px text-gray-500 text-right`"
>{{ t('analysis.transactionAmount') }}
>{{ t('analysis.transactionAmount') }}
</div>
<CountTo
:duration="2600"
@ -101,7 +101,7 @@
</div>
<div class="flex flex-col justify-between">
<div :class="`${prefixCls}__item--text text-16px text-gray-500 text-right`"
>{{ t('analysis.totalShopping') }}
>{{ t('analysis.totalShopping') }}
</div>
<CountTo
:duration="2600"

2
src/views/Login/Login.vue
View File

@ -37,7 +37,7 @@
>
<div class="flex items-center at-2xl:hidden at-xl:hidden">
<img alt="" class="mr-10px h-48px w-48px" src="@/assets/imgs/logo.png" />
<span class="text-20px font-bold" >{{ underlineToHump(appStore.getTitle) }}</span>
<span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
</div>
<div class="flex items-center justify-end space-x-10px h-48px">
<ThemeSwitch />

2
src/views/Login/SocialLogin.vue
View File

@ -115,7 +115,7 @@
</el-col>
<el-col :offset="6" :span="12">
<el-link style="float: right" type="primary"
>{{ t('login.forgetPassword') }}
>{{ t('login.forgetPassword') }}
</el-link>
</el-col>
</el-row>

2
src/views/bpm/model/CategoryDraggableModel.vue
View File

@ -214,7 +214,7 @@
command="handleReport"
v-if="
checkPermi(['bpm:process-instance:manager-query']) &&
scope.row.processDefinition
scope.row.processDefinition
"
:disabled="!isManagerUser(scope.row)"
>

2
src/views/bpm/model/form/ExtraSettings.vue
View File

@ -91,7 +91,7 @@
<el-radio-group v-model="modelData.titleSetting.enable">
<div class="flex flex-col">
<el-radio :value="false"
>系统默认 <el-text type="info"> 展示流程名称 </el-text></el-radio
>系统默认 <el-text type="info"> 展示流程名称 </el-text></el-radio
>
<el-radio :value="true">
自定义标题

8
src/views/bpm/model/form/PrintTemplate/MentionModal.vue
View File

@ -82,9 +82,9 @@ onMounted(() => {
<style>
#mention-modal {
position: absolute;
border: 1px solid #ccc;
background-color: #fff;
padding: 5px;
background-color: #fff;
border: 1px solid #ccc;
}
#mention-modal input {
@ -98,10 +98,10 @@ onMounted(() => {
}
#mention-modal ul li {
list-style: none;
cursor: pointer;
padding: 3px 0;
text-align: left;
list-style: none;
cursor: pointer;
}
#mention-modal ul li:hover {

4
src/views/bpm/processInstance/detail/ProcessInstanceBpmnViewer.vue
View File

@ -42,8 +42,8 @@ watch(
</script>
<style lang="scss" scoped>
.box-card {
height: 100%;
width: 100%;
height: 100%;
margin-bottom: 0;
:deep(.el-card__body) {
@ -52,9 +52,9 @@ watch(
}
:deep(.process-viewer) {
width: 100%;
height: 100% !important;
min-height: 100%;
width: 100%;
overflow: auto;
}
}

4
src/views/bpm/processInstance/detail/ProcessInstanceOperationButton.vue
View File

@ -501,8 +501,8 @@
class="hover-bg-gray-100 rounded-xl p-6px"
v-if="
userId === processInstance?.startUser?.id &&
isEndProcessStatus(processInstance?.status) &&
processDefinition?.formType === 10
isEndProcessStatus(processInstance?.status) &&
processDefinition?.formType === 10
"
>
<Icon :size="14" icon="ep:refresh" />&nbsp; 再次提交

10
src/views/bpm/processInstance/detail/ProcessInstanceTimeline.vue
View File

@ -55,10 +55,10 @@
class="flex flex-wrap gap2 items-center"
v-if="
isEmpty(activity.tasks) &&
((CandidateStrategy.START_USER_SELECT === activity.candidateStrategy &&
isEmpty(activity.candidateUsers)) ||
(props.enableApproveUserSelect &&
CandidateStrategy.APPROVE_USER_SELECT === activity.candidateStrategy))
((CandidateStrategy.START_USER_SELECT === activity.candidateStrategy &&
isEmpty(activity.candidateUsers)) ||
(props.enableApproveUserSelect &&
CandidateStrategy.APPROVE_USER_SELECT === activity.candidateStrategy))
"
>
<!-- && activity.nodeType === NodeType.USER_TASK_NODE -->
@ -131,7 +131,7 @@
<div
v-if="
task.reason &&
[NodeType.USER_TASK_NODE, NodeType.END_EVENT_NODE].includes(activity.nodeType)
[NodeType.USER_TASK_NODE, NodeType.END_EVENT_NODE].includes(activity.nodeType)
"
class="text-#a5a5a5 text-13px mt-1 w-full bg-#f8f8fa p2 rounded-md"
>

2
src/views/infra/codegen/components/ColumInfoForm.vue
View File

@ -104,7 +104,7 @@
placement="top-start"
>
<template #reference>
<el-button :icon="Refresh" size="small" circle @click="getDictOptions" class=""/>
<el-button :icon="Refresh" size="small" circle @click="getDictOptions" class="" />
</template>
</el-popover>
</div>

6
src/views/mall/product/spu/components/SkuList.vue
View File

@ -578,8 +578,10 @@ const getSkuTableRef = () => {
defineExpose({ generateTableData, validateSku, getSkuTableRef })
</script>
<style>
// 避免滚动条遮挡最后一行数据
/*noinspection CssUnusedSymbol*/
/*
* 避免滚动条遮挡最后一行数据
* noinspection CssUnusedSymbol
*/
.el-table.tabNumWidth .el-scrollbar {
padding-bottom: 10px;
}

2
src/views/mall/product/spu/components/SkuTableSelect.vue
View File

@ -4,7 +4,7 @@
<el-table-column label="#" width="55">
<template #default="{ row }">
<el-radio :value="row.id" v-model="selectedSkuId" @change="handleSelected(row)"
>&nbsp;
>&nbsp;
</el-radio>
</template>
</el-table-column>

2
src/views/mall/promotion/combination/components/CombinationShowcase.vue
View File

@ -136,11 +136,11 @@ const emitActivityChange = () => {
display: flex;
width: 60px;
height: 60px;
cursor: pointer;
border: 1px dashed var(--el-border-color-darker);
border-radius: 8px;
align-items: center;
justify-content: center;
cursor: pointer;
}
.spu-pic {

22
src/views/mall/promotion/discountActivity/index.vue
View File

@ -70,17 +70,17 @@
~ {{ formatDate(scope.row.endTime, 'YYYY-MM-DD') }}
</template>
</el-table-column>
<!-- <el-table-column label="商品图片" prop="spuName" min-width="80">-->
<!-- <template #default="scope">-->
<!-- <el-image-->
<!-- :src="scope.row.picUrl"-->
<!-- class="h-40px w-40px"-->
<!-- :preview-src-list="[scope.row.picUrl]"-->
<!-- preview-teleported-->
<!-- />-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="商品标题" prop="spuName" min-width="300" />-->
<!-- <el-table-column label="商品图片" prop="spuName" min-width="80">-->
<!-- <template #default="scope">-->
<!-- <el-image-->
<!-- :src="scope.row.picUrl"-->
<!-- class="h-40px w-40px"-->
<!-- :preview-src-list="[scope.row.picUrl]"-->
<!-- preview-teleported-->
<!-- />-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column label="商品标题" prop="spuName" min-width="300" />-->
<el-table-column label="活动状态" align="center" prop="status" min-width="100">
<template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />

12
src/views/mall/promotion/kefu/components/KeFuConversationList.vue
View File

@ -208,8 +208,8 @@ onBeforeUnmount(() => {
//transition: border-left 0.05s ease-in-out; /* 设置过渡效果 */
.username {
min-width: 0;
max-width: 60%;
min-width: 0;
}
.last-message {
@ -218,27 +218,27 @@ onBeforeUnmount(() => {
.last-message,
.username {
display: -webkit-box;
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
}
}
.active {
background-color: rgba(128, 128, 128, 0.5); // 透明色，暗黑模式下也能体现
background-color: rgb(128 128 128 / 50%); // 透明色，暗黑模式下也能体现
}
.right-menu-ul {
position: absolute;
background-color: var(--app-content-bg-color);
width: 130px;
padding: 5px;
margin: 0;
list-style-type: none; /* 移除默认的项目符号 */
background-color: var(--app-content-bg-color);
border-radius: 12px;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* 阴影效果 */
width: 130px;
box-shadow: 0 2px 4px rgb(0 0 0 / 10%); /* 阴影效果 */
li {
padding: 8px 16px;

54
src/views/mall/promotion/kefu/components/KeFuMessageList.vue
View File

@ -373,36 +373,36 @@ const showTime = computed(() => (item: KeFuMessageRespVO, index: number) => {
<style lang="scss" scoped>
.kefu {
background-color: var(--app-content-bg-color);
position: relative;
width: calc(100% - 300px - 260px);
background-color: var(--app-content-bg-color);
&::after {
content: '';
position: absolute;
top: 0;
left: 0;
width: 1px; /* 实际宽度 */
height: 100%;
background-color: var(--el-border-color);
content: '';
transform: scaleX(0.3); /* 缩小宽度 */
}
.kefu-header {
background-color: var(--app-content-bg-color);
position: relative;
display: flex;
background-color: var(--app-content-bg-color);
align-items: center;
justify-content: space-between;
&::before {
content: '';
position: absolute;
bottom: 0;
left: 0;
width: 100%;
height: 1px; /* 初始宽度 */
background-color: var(--el-border-color);
content: '';
transform: scaleY(0.3); /* 缩小视觉高度 */
}
@ -413,30 +413,30 @@ const showTime = computed(() => (item: KeFuMessageRespVO, index: number) => {
}
&-content {
margin: 0;
padding: 10px;
position: relative;
height: 100%;
width: 100%;
height: 100%;
padding: 10px;
margin: 0;
.newMessageTip {
position: absolute;
bottom: 35px;
right: 35px;
background-color: var(--app-content-bg-color);
bottom: 35px;
padding: 10px;
border-radius: 30px;
font-size: 12px;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); /* 阴影效果 */
background-color: var(--app-content-bg-color);
border-radius: 30px;
box-shadow: 0 2px 4px rgb(0 0 0 / 10%); /* 阴影效果 */
}
.ss-row-left {
justify-content: flex-start;
.kefu-message {
background-color: #fff;
margin-left: 10px;
margin-top: 3px;
margin-left: 10px;
background-color: #fff;
border-top-right-radius: 10px;
border-bottom-right-radius: 10px;
border-bottom-left-radius: 10px;
@ -447,22 +447,22 @@ const showTime = computed(() => (item: KeFuMessageRespVO, index: number) => {
justify-content: flex-end;
.kefu-message {
background-color: rgb(206, 223, 255);
margin-right: 10px;
margin-top: 3px;
border-top-left-radius: 10px;
margin-right: 10px;
background-color: rgb(206 223 255);
border-bottom-right-radius: 10px;
border-bottom-left-radius: 10px;
border-top-left-radius: 10px;
}
}
// 消息气泡
.kefu-message {
color: #414141;
font-weight: 500;
padding: 5px 10px;
width: auto;
max-width: 50%;
padding: 5px 10px;
font-weight: 500;
color: #414141;
//text-align: left;
//display: inline-block !important;
//word-break: break-all;
@ -476,30 +476,30 @@ const showTime = computed(() => (item: KeFuMessageRespVO, index: number) => {
.date-message,
.system-message {
width: fit-content;
background-color: rgba(0, 0, 0, 0.1);
border-radius: 8px;
padding: 0 5px;
color: #fff;
font-size: 10px;
color: #fff;
background-color: rgb(0 0 0 / 10%);
border-radius: 8px;
}
}
.kefu-footer {
position: relative;
display: flex;
flex-direction: column;
height: auto;
margin: 0;
padding: 0;
margin: 0;
flex-direction: column;
&::before {
content: '';
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 1px; /* 初始宽度 */
background-color: var(--el-border-color);
content: '';
transform: scaleY(0.3); /* 缩小视觉高度 */
}
@ -510,13 +510,13 @@ const showTime = computed(() => (item: KeFuMessageRespVO, index: number) => {
}
::v-deep(textarea) {
resize: none;
background-color: var(--app-content-bg-color);
resize: none;
}
:deep(.el-input__wrapper) {
box-shadow: none !important;
border-radius: 0;
box-shadow: none !important;
}
::v-deep(.el-textarea__inner) {

36
src/views/mall/promotion/kefu/components/member/MemberInfo.vue
View File

@ -173,31 +173,31 @@ const getUserData = async () => {
background-color: var(--app-content-bg-color);
&::after {
content: '';
position: absolute;
top: 0;
left: 0;
width: 1px; /* 实际宽度 */
height: 100%;
background-color: var(--el-border-color);
content: '';
transform: scaleX(0.3); /* 缩小宽度 */
}
&-header {
background-color: var(--app-content-bg-color);
position: relative;
display: flex;
background-color: var(--app-content-bg-color);
align-items: center;
justify-content: space-around;
&::before {
content: '';
position: absolute;
bottom: 0;
left: 0;
width: 100%;
height: 1px; /* 初始宽度 */
background-color: var(--el-border-color);
content: '';
transform: scaleY(0.3); /* 缩小视觉高度 */
}
@ -207,45 +207,39 @@ const getUserData = async () => {
}
&-item {
height: 100%;
width: 100%;
position: relative;
width: 100%;
height: 100%;
&-activation::before {
content: '';
position: absolute; /* 绝对定位 */
top: 0;
left: 0;
right: 0;
bottom: 0; /* 覆盖整个元素 */
border-bottom: 2px solid rgba(128, 128, 128, 0.5); /* 边框样式 */
inset: 0; /* 覆盖整个元素 */
pointer-events: none; /* 确保点击事件不会被伪元素拦截 */
border-bottom: 2px solid rgb(128 128 128 / 50%); /* 边框样式 */
content: '';
}
&:hover::before {
content: '';
position: absolute; /* 绝对定位 */
top: 0;
left: 0;
right: 0;
bottom: 0; /* 覆盖整个元素 */
border-bottom: 2px solid rgba(128, 128, 128, 0.5); /* 边框样式 */
inset: 0; /* 覆盖整个元素 */
pointer-events: none; /* 确保点击事件不会被伪元素拦截 */
border-bottom: 2px solid rgb(128 128 128 / 50%); /* 边框样式 */
content: '';
}
}
}
&-content {
margin: 0;
padding: 0;
position: relative;
height: 100%;
width: 100%;
height: 100%;
padding: 0;
margin: 0;
}
&-tabs {
height: 100%;
width: 100%;
height: 100%;
}
}

18
src/views/mall/promotion/kefu/components/message/OrderItem.vue
View File

@ -25,7 +25,7 @@
<div class="pay-box flex justify-end pr-5px">
<div class="flex items-center">
<div class="discounts-title pay-color"
>共 {{ getMessageContent?.productCount }} 件商品,总金额:
>共 {{ getMessageContent?.productCount }} 件商品,总金额:
</div>
<div class="discounts-money pay-color">
￥{{ fenToYuan(getMessageContent?.payPrice) }}
@ -109,10 +109,10 @@ function formatOrderStatus(order: any) {
<style lang="scss" scoped>
.order-list-card-box {
border-radius: 10px;
padding: 10px;
background-color: rgb(128 128 128 / 30%); // 透明色，暗黑模式下也能体现
border: 1px var(--el-border-color) solid;
background-color: rgba(128, 128, 128, 0.3); // 透明色，暗黑模式下也能体现
border-radius: 10px;
.order-card-header {
height: 28px;
@ -123,8 +123,8 @@ function formatOrderStatus(order: any) {
span {
&:hover {
text-decoration: underline;
color: var(--left-menu-bg-active-color);
text-decoration: underline;
}
}
}
@ -144,9 +144,9 @@ function formatOrderStatus(order: any) {
}
.discounts-money {
font-family: OPPOSANS;
font-size: 16px;
line-height: normal;
font-family: OPPOSANS;
}
.pay-color {
@ -156,26 +156,26 @@ function formatOrderStatus(order: any) {
}
.warning-color {
color: #faad14;
font-size: 11px;
font-weight: bold;
color: #faad14;
}
.danger-color {
color: #ff3000;
font-size: 11px;
font-weight: bold;
color: #ff3000;
}
.success-color {
color: #52c41a;
font-size: 11px;
font-weight: bold;
color: #52c41a;
}
.info-color {
color: #999999;
font-size: 11px;
font-weight: bold;
color: #999;
}
</style>

20
src/views/mall/promotion/kefu/components/message/ProductItem.vue
View File

@ -68,21 +68,21 @@ const openDetail = (spuId: number) => {
<style lang="scss" scoped>
.button {
background-color: #007bff;
color: white;
border: none;
padding: 5px 10px;
color: white;
cursor: pointer;
background-color: #007bff;
border: none;
}
.product-warp {
display: flex;
width: 100%;
background-color: rgba(128, 128, 128, 0.3);
padding: 10px;
background-color: rgb(128 128 128 / 30%);
border: 1px solid var(--el-border-color);
border-radius: 8px;
display: flex;
align-items: center;
padding: 10px;
&-left {
width: 70px;
@ -98,14 +98,14 @@ const openDetail = (spuId: number) => {
flex: 1;
.description {
display: -webkit-box;
width: 100%;
overflow: hidden;
font-size: 16px;
font-weight: bold;
display: -webkit-box;
-webkit-line-clamp: 1; /* 显示一行 */
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1; /* 显示一行 */
}
.price {

12
src/views/mall/promotion/kefu/index.vue
View File

@ -107,11 +107,11 @@ onBeforeUnmount(() => {
<style lang="scss">
.kefu-layout {
position: absolute;
flex: 1;
top: 0;
left: 0;
height: 100%;
width: 100%;
height: 100%;
flex: 1;
}
/* 定义滚动条样式 */
@ -122,15 +122,15 @@ onBeforeUnmount(() => {
/* 定义滚动条轨道 内阴影+圆角 */
::-webkit-scrollbar-track {
box-shadow: inset 0 0 0 rgba(240, 240, 240, 0.5);
border-radius: 10px;
background-color: #fff;
border-radius: 10px;
box-shadow: inset 0 0 0 rgb(240 240 240 / 50%);
}
/* 定义滑块 内阴影+圆角 */
::-webkit-scrollbar-thumb {
background-color: rgb(240 240 240 / 50%);
border-radius: 10px;
box-shadow: inset 0 0 0 rgba(240, 240, 240, 0.5);
background-color: rgba(240, 240, 240, 0.5);
box-shadow: inset 0 0 0 rgb(240 240 240 / 50%);
}
</style>

2
src/views/mall/promotion/point/components/PointShowcase.vue
View File

@ -132,11 +132,11 @@ const emitActivityChange = () => {
display: flex;
width: 60px;
height: 60px;
cursor: pointer;
border: 1px dashed var(--el-border-color-darker);
border-radius: 8px;
align-items: center;
justify-content: center;
cursor: pointer;
}
.spu-pic {

2
src/views/mall/promotion/rewardActivity/index.vue
View File

@ -71,7 +71,7 @@
<ContentWrap>
<el-table v-loading="loading" :data="list" default-expand-all row-key="id">
<el-table-column label="活动名称" prop="name" />
<el-table-column label="活动范围" prop="productScope" >
<el-table-column label="活动范围" prop="productScope">
<template #default="scope">
<dict-tag :type="DICT_TYPE.PROMOTION_PRODUCT_SCOPE" :value="scope.row.productScope" />
</template>

2
src/views/mall/promotion/seckill/components/SeckillShowcase.vue
View File

@ -134,11 +134,11 @@ const emitActivityChange = () => {
display: flex;
width: 60px;
height: 60px;
cursor: pointer;
border: 1px dashed var(--el-border-color-darker);
border-radius: 8px;
align-items: center;
justify-content: center;
cursor: pointer;
}
.spu-pic {

2
src/views/mall/trade/brokerage/user/BrokerageUserCreateForm.vue
View File

@ -51,7 +51,7 @@
<el-avatar :src="userInfo.bindUser?.avatar" />
</el-descriptions-item>
<el-descriptions-item label="昵称"
>{{ userInfo.bindUser?.nickname }}
>{{ userInfo.bindUser?.nickname }}
</el-descriptions-item>
<el-descriptions-item label="推广资格">
<el-tag v-if="userInfo.bindUser?.brokerageEnabled">有</el-tag>

2
src/views/mall/trade/brokerage/withdraw/index.vue
View File

@ -169,7 +169,7 @@
<template
v-if="
scope.row.status === BrokerageWithdrawStatusEnum.AUDITING.status &&
!scope.row.payTransferId
!scope.row.payTransferId
"
>
<el-button

4
src/views/mall/trade/order/detail/index.vue
View File

@ -394,11 +394,11 @@ onMounted(async () => {
.el-timeline-right-content {
display: flex;
align-items: center;
min-height: 30px;
padding: 10px;
border-radius: var(--el-card-border-radius);
background-color: var(--app-content-bg-color);
border-radius: var(--el-card-border-radius);
align-items: center;
&::before {
position: absolute;

2
src/views/mall/trade/order/index.vue
View File

@ -194,7 +194,7 @@
<el-dropdown-item
v-if="
row.deliveryType === DeliveryTypeEnum.EXPRESS.type &&
row.status === TradeOrderStatusEnum.UNDELIVERED.status
row.status === TradeOrderStatusEnum.UNDELIVERED.status
"
command="delivery"
>