github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-09-01 06:58:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v4' of github.com:jumpserver/lina into v4

Browse Source
This commit is contained in:
ibuler
2024-02-28 17:05:30 +08:00
parent fb6ac84fb3 e32c44aaa3
commit b0ae5d4299
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/utils/common.js
View File

@@ -424,6 +424,7 @@ export function toTitleCase(string) {
export function toSentenceCase(string) { export function toSentenceCase(string) {
if (!string) return string if (!string) return string
if (string.indexOf('/') > 0) return string
const s = string.trim().split(' ').map(item => { const s = string.trim().split(' ').map(item => {
if (item.length === 0) return '' if (item.length === 0) return ''
if (item.length === 1) return item.toLowerCase() if (item.length === 1) return item.toLowerCase()

2
src/views/perms/AssetPermission/AssetPermissionList.vue
View File

@@ -96,7 +96,7 @@ export default {
} }
}, },
user_groups_amount: { user_groups_amount: {
width: 90, width: 100,
formatter: AmountFormatter, formatter: AmountFormatter,
formatterArgs: { formatterArgs: {
async: true, async: true,