Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
KubePi
Commits
312a82de
Commit
312a82de
authored
3 years ago
by
chenyang shen
Browse files
Options
Download
Email Patches
Plain Diff
fix(ui): 修复折行问题
parent
254359bc
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
web/kubepi/src/business/cluster-management/index.vue
+3
-6
web/kubepi/src/business/cluster-management/index.vue
web/kubepi/src/business/user-management/role/index.vue
+1
-1
web/kubepi/src/business/user-management/role/index.vue
web/kubepi/src/business/user-management/user/index.vue
+1
-1
web/kubepi/src/business/user-management/user/index.vue
web/kubepi/src/filters/index.js
+68
-32
web/kubepi/src/filters/index.js
with
73 additions
and
40 deletions
+73
-40
web/kubepi/src/business/cluster-management/index.vue
+
3
-
6
View file @
312a82de
...
@@ -13,14 +13,14 @@
...
@@ -13,14 +13,14 @@
</
template
>
</
template
>
<el-table-column
:label=
"$t('commons.table.status')"
min-width=
"
6
0px"
fix
>
<el-table-column
:label=
"$t('commons.table.status')"
min-width=
"
8
0px"
fix
>
<
template
v-slot:default=
"{row}"
>
<
template
v-slot:default=
"{row}"
>
<el-tag
type=
"success"
v-if=
"row.extraClusterInfo.health"
>
{{
$t
(
'
business.cluster.ready
'
)
}}
</el-tag>
<el-tag
type=
"success"
v-if=
"row.extraClusterInfo.health"
>
{{
$t
(
'
business.cluster.ready
'
)
}}
</el-tag>
<el-tag
type=
"danger"
v-if=
"!row.extraClusterInfo.health"
>
{{
$t
(
'
business.cluster.not_ready
'
)
}}
</el-tag>
<el-tag
type=
"danger"
v-if=
"!row.extraClusterInfo.health"
>
{{
$t
(
'
business.cluster.not_ready
'
)
}}
</el-tag>
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('commons.table.name')"
prop=
"name"
min-width=
"
60
"
fix
>
<el-table-column
:label=
"$t('commons.table.name')"
prop=
"name"
min-width=
"
140px
"
fix
>
<
template
v-slot:default=
"{row}"
>
<
template
v-slot:default=
"{row}"
>
<el-link
@
click=
"onGotoDashboard(row)"
>
{{
row
.
name
}}
</el-link>
<el-link
@
click=
"onGotoDashboard(row)"
>
{{
row
.
name
}}
</el-link>
</
template
>
</
template
>
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
<el-table-column
:label=
"$t('commons.table.created_time')"
min-width=
"120"
fix
>
<el-table-column
:label=
"$t('commons.table.created_time')"
min-width=
"120"
fix
>
<
template
v-slot:default=
"{row}"
>
<
template
v-slot:default=
"{row}"
>
{{
row
.
createAt
|
datetim
eFormat
}}
{{
row
.
createAt
|
ag
eFormat
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
@@ -149,9 +149,6 @@ import {deleteCluster, listClusters, searchClusters, updateCluster} from "@/api/
...
@@ -149,9 +149,6 @@ import {deleteCluster, listClusters, searchClusters, updateCluster} from "@/api/
import
{
checkPermissions
}
from
"
@/utils/permission
"
;
import
{
checkPermissions
}
from
"
@/utils/permission
"
;
import
ComplexTable
from
"
@/components/complex-table
"
;
import
ComplexTable
from
"
@/components/complex-table
"
;
import
Rule
from
"
@/utils/rules
"
import
Rule
from
"
@/utils/rules
"
import
i18n
from
"
@/i18n
"
;
export
default
{
export
default
{
...
...
This diff is collapsed.
Click to expand it.
web/kubepi/src/business/user-management/role/index.vue
+
1
-
1
View file @
312a82de
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('commons.table.created_time')"
min-width=
"100"
fix
>
<el-table-column
:label=
"$t('commons.table.created_time')"
min-width=
"100"
fix
>
<
template
v-slot:default=
"{row}"
>
<
template
v-slot:default=
"{row}"
>
{{
row
.
createAt
|
datetim
eFormat
}}
{{
row
.
createAt
|
ag
eFormat
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
<fu-table-operations
:buttons=
"buttons"
:label=
"$t('commons.table.action')"
fix
/>
<fu-table-operations
:buttons=
"buttons"
:label=
"$t('commons.table.action')"
fix
/>
...
...
This diff is collapsed.
Click to expand it.
web/kubepi/src/business/user-management/user/index.vue
+
1
-
1
View file @
312a82de
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
</el-table-column>
</el-table-column>
<el-table-column
:label=
"$t('commons.table.created_time')"
min-width=
"100"
fix
>
<el-table-column
:label=
"$t('commons.table.created_time')"
min-width=
"100"
fix
>
<
template
v-slot:default=
"{row}"
>
<
template
v-slot:default=
"{row}"
>
{{
row
.
createAt
|
datetim
eFormat
}}
{{
row
.
createAt
|
ag
eFormat
}}
</
template
>
</
template
>
</el-table-column>
</el-table-column>
...
...
This diff is collapsed.
Click to expand it.
web/kubepi/src/filters/index.js
+
68
-
32
View file @
312a82de
import
{
dateFormat
,
datetimeFormat
}
from
"
fit2cloud-ui/src/filters/time
"
;
import
{
dateFormat
,
datetimeFormat
}
from
"
fit2cloud-ui/src/filters/time
"
;
export
function
errorFormat
(
value
)
{
export
function
errorFormat
(
value
)
{
if
(
value
!==
null
)
{
if
(
value
!==
null
)
{
let
errItem
=
value
;
let
errItem
=
value
;
errItem
=
errItem
.
replace
(
/
\\
n/gi
,
'
\n
'
);
errItem
=
errItem
.
replace
(
/
\\
n/gi
,
'
\n
'
);
errItem
=
errItem
.
replace
(
/
\\
u/gi
,
'
%u
'
);
errItem
=
errItem
.
replace
(
/
\\
u/gi
,
'
%u
'
);
errItem
=
errItem
.
replace
(
/
\\
/gi
,
''
);
errItem
=
errItem
.
replace
(
/
\\
/gi
,
''
);
errItem
=
unescape
(
errItem
)
errItem
=
unescape
(
errItem
)
return
errItem
return
errItem
}
}
return
value
return
value
}
}
export
function
emailFormat
(
value
)
{
export
function
emailFormat
(
value
)
{
let
result
=
''
;
let
result
=
''
;
if
(
value
.
indexOf
(
'
@
'
)
===
-
1
||
value
.
indexOf
(
'
.
'
)
===
-
1
)
{
if
(
value
.
indexOf
(
'
@
'
)
===
-
1
||
value
.
indexOf
(
'
.
'
)
===
-
1
)
{
return
value
return
value
}
}
const
aiteIndex
=
value
.
indexOf
(
'
@
'
)
const
aiteIndex
=
value
.
indexOf
(
'
@
'
)
const
pointIndex
=
value
.
lastIndexOf
(
'
.
'
)
const
pointIndex
=
value
.
lastIndexOf
(
'
.
'
)
const
mail
=
value
.
substring
(
0
,
aiteIndex
)
const
mail
=
value
.
substring
(
0
,
aiteIndex
)
if
(
mail
.
length
<=
3
)
{
if
(
mail
.
length
<=
3
)
{
result
+=
'
***
'
result
+=
'
***
'
}
else
{
}
else
{
result
+=
value
.
substring
(
0
,
3
)
+
'
***
'
result
+=
value
.
substring
(
0
,
3
)
+
'
***
'
}
}
result
+=
value
.
substring
(
pointIndex
+
1
,
value
.
length
)
result
+=
value
.
substring
(
pointIndex
+
1
,
value
.
length
)
return
result
;
return
result
;
}
export
function
AgeFormat
(
value
)
{
if
(
value
==
null
)
{
return
""
}
const
begin
=
new
Date
(
value
)
const
end
=
new
Date
()
const
dateDiff
=
end
.
getTime
()
-
begin
.
getTime
()
let
dayDiff
=
Math
.
floor
(
dateDiff
/
(
24
*
3600
*
1000
))
//计算出相差天数
let
result
=
""
if
(
dayDiff
>
0
)
{
result
=
result
+
dayDiff
+
"
days ago
"
return
result
}
let
leave1
=
dateDiff
%
(
24
*
3600
*
1000
)
//计算天数后剩余的毫秒数
let
hours
=
Math
.
floor
(
leave1
/
(
3600
*
1000
))
//计算出小时数
if
(
hours
>
0
)
{
result
=
result
+
hours
+
"
hours ago
"
return
result
}
let
leave2
=
leave1
%
(
3600
*
1000
)
//计算小时数后剩余的毫秒数
let
minutes
=
Math
.
floor
(
leave2
/
(
60
*
1000
))
//计算相差分钟
if
(
minutes
>
0
)
{
result
=
result
+
minutes
+
"
mins ago
"
return
result
}
//计算相差秒数
let
leave3
=
leave2
%
(
60
*
1000
);
//计算分钟数后剩余的毫秒数
let
seconds
=
Math
.
round
(
leave3
/
1000
);
if
(
seconds
>
0
)
{
result
=
result
+
seconds
+
"
secs ago
"
return
result
}
return
result
}
}
const
filters
=
{
const
filters
=
{
"
dateFormat
"
:
dateFormat
,
"
dateFormat
"
:
dateFormat
,
"
datetimeFormat
"
:
datetimeFormat
,
"
datetimeFormat
"
:
datetimeFormat
,
"
errorFormat
"
:
errorFormat
,
"
errorFormat
"
:
errorFormat
,
"
emailFormat
"
:
emailFormat
,
"
emailFormat
"
:
emailFormat
,
"
ageFormat
"
:
AgeFormat
,
};
};
export
default
{
export
default
{
install
(
Vue
)
{
install
(
Vue
)
{
Object
.
keys
(
filters
).
forEach
(
key
=>
{
Object
.
keys
(
filters
).
forEach
(
key
=>
{
Vue
.
filter
(
key
,
filters
[
key
])
Vue
.
filter
(
key
,
filters
[
key
])
});
});
}
}
}
}
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help