gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：根据用户偏好获取表头优化

Browse Source
This commit is contained in:
zyh
2023-12-04 10:55:19 +08:00
parent 334964f88c
commit 3c5602beb1
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nezha-fronted/package-lock.json generated
View File

@@ -17732,7 +17732,7 @@
}, },
"node-sass": { "node-sass": {
"version": "4.14.1", "version": "4.14.1",
"resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", "resolved": "https://registry.npmmirror.com/node-sass/-/node-sass-4.14.1.tgz",
"integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
"dev": true, "dev": true,
"requires": { "requires": {
@@ -24364,7 +24364,7 @@
}, },
"webpack-bundle-analyzer": { "webpack-bundle-analyzer": {
"version": "2.13.1", "version": "2.13.1",
"resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz", "resolved": "https://registry.npmmirror.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz",
"integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==", "integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==",
"dev": true, "dev": true,
"requires": { "requires": {

30
nezha-fronted/src/components/common/mixin/dataList.js
View File

@@ -447,22 +447,22 @@ export default {
if (!tableTitle || !this.tableId) { if (!tableTitle || !this.tableId) {
return return
} }
const preferenceTableTitle = (tableHeaders && tableHeaders.length) ? tableHeaders : tableTitle let preferenceTableTitle = (tableHeaders && tableHeaders.length) ? tableHeaders : tableTitle
if (tableTitle) { // 先根据本地缓存中的prop进行排序
// 先根据本地缓存中的prop进行排序 tableTitle.sort(function (a, b) {
tableTitle.sort(function (a, b) { return preferenceTableTitle.findIndex(function (c) {
return preferenceTableTitle.findIndex(function (c) { return c.prop === a.prop
return c.prop === a.prop }) - preferenceTableTitle.findIndex(function (c) {
}) - preferenceTableTitle.findIndex(function (c) { return c.prop === b.prop
return c.prop === b.prop
})
}) })
this.tools.customTableTitle = tableTitle.map((item, index) => { // 修复切换中英文的问题 })
item.show = preferenceTableTitle[index].show this.tools.customTableTitle = tableTitle.map((item, index) => { // 修复切换中英文的问题
return item item.show = preferenceTableTitle[index].show
}) return item
} })
if (preferenceTableTitle && (preferenceTableTitle.length > tableTitle.length)) {
preferenceTableTitle = preferenceTableTitle.filter(item => tableTitle.find(t => item.prop === t.prop || item.type === 'label'))
if (preferenceTableTitle.length > tableTitle.length) { // asset label
const arr = preferenceTableTitle.splice(tableTitle.length, preferenceTableTitle.length) const arr = preferenceTableTitle.splice(tableTitle.length, preferenceTableTitle.length)
arr.forEach(item => { arr.forEach(item => {
item.minWidth = item.label.length * 16 + 20 item.minWidth = item.label.length * 16 + 20