ZF/molly-multi-tenant
1
0
Fork 0
mirror of https://github.com/thousmile/molly-multi-tenant.git synced 2025-12-30 04:32:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

1.修复web页面操作中“更多”高度不一致

Browse Source
This commit is contained in:
WangChenChen
2023-11-15 23:50:06 +08:00
parent 62a84236cb
commit 9a22eac5c7
4 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
platform-web-ui/src/styles/element-plus.scss
View File

@@ -36,3 +36,12 @@
.el-date-editor.el-input__wrapper {
width: 100%;
}
.el-dropdown {
line-height: 1.6;
.el-dropdown-link {
cursor: pointer;
outline: none;
}
}

2
platform-web-ui/src/utils/index.ts
View File

@@ -2,8 +2,6 @@ import dayjs from "dayjs"
import { removeConfigLayout } from "@/utils/cache/local-storage"
import chinaAreaJson from "@/assets/ChinaArea.json"
import { ISimpleProject, ISimpleTenant } from "@/types/base"
import { getFileBlob, httpGet } from "./service"
import { AxiosResponse } from "axios"
//#region 格式化日期时间
export const DEFAULT_DATE_TIME_PATTERN = "YYYY-MM-DD HH:mm:ss"

20
platform-web-ui/src/views/sys/tenant/index.vue
View File

@@ -82,7 +82,10 @@
<el-link :icon="Edit" type="warning" @click="handleEdit(scope.row)">编辑</el-link>
&nbsp;
<!-- v-admin 只有管理员才可以 删除租户、重置数据 -->
<el-dropdown v-admin @command="(cmd: string) => handleCommand(cmd, scope.row)">
<el-dropdown
@command="(cmd: string) => handleCommand(cmd, scope.row)"
v-if="!isDefaultTenantId(scope.row.tenantId)"
>
<span class="el-dropdown-link">
更多
<el-icon class="el-icon--right">
@@ -95,12 +98,12 @@
<el-dropdown-item command="QRcode">
<template #default><SvgIcon name="qrcode" />&nbsp;生成二维码</template>
</el-dropdown-item>
<el-dropdown-item v-if="!isDefaultTenantId(scope.row.tenantId)" :icon="Refresh" command="ResetData">
重置数据
</el-dropdown-item>
<el-dropdown-item v-if="!isDefaultTenantId(scope.row.tenantId)" :icon="Delete" command="Delete">
删除
</el-dropdown-item>
<div v-admin>
<el-dropdown-item :icon="Refresh" command="ResetData">重置数据</el-dropdown-item>
</div>
<div v-admin>
<el-dropdown-item :icon="Delete" command="Delete">删除</el-dropdown-item>
</div>
</el-dropdown-menu>
</template>
</el-dropdown>
@@ -288,8 +291,7 @@ import { isEmail, isTelphone } from "@/utils/validate"
import { futureShortcuts } from "@/utils"
import { useNoticeStoreHook } from "@/store/modules/notice"
import QRCodeVue3 from "qrcode-vue3"
import logoPng from "@/assets/layouts/logo.png?url"
import { downloadFile, getFileBlob } from "@/utils/service"
import { getFileBlob } from "@/utils/service"
const dictStore = useDictStoreHook()

9
tenant-web-ui/src/styles/element-plus.scss
View File

@@ -36,3 +36,12 @@
.el-date-editor.el-input__wrapper {
width: 100%;
}
.el-dropdown {
line-height: 1.6;
.el-dropdown-link {
cursor: pointer;
outline: none;
}
}