test/MeterSphere
1
0
Fork 0
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git synced 2024-12-03 12:39:12 +08:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

fix(系统设置): 修复资源池容量bug&富文本工具条遮盖样式

Browse Source
This commit is contained in:
xinxin.wu 2024-10-29 16:59:23 +08:00 committed by 刘瑞斌
parent 94ec9cf0ca
commit a84414b4df
2 changed files with 69 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/src/components/pure/ms-rich-text/MsRichText.vue
View File

@ -633,6 +633,12 @@
}
:deep(.editor-content) {
.ms-scroll-bar();
& + div[data-tippy-root] {
transform: translate(60%) !important;
}
}
[data-tippy-root] {
inset: auto !important;
}
:deep(.tableWrapper) {
.ms-scroll-bar();

71
frontend/src/views/setting/system/resourcePool/components/capacityDrawer.vue
View File

@ -80,6 +80,7 @@
<script setup lang="ts">
import { ref } from 'vue';
import dayjs from 'dayjs';
import MsDrawer from '@/components/pure/ms-drawer/index.vue';
import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
@ -199,6 +200,50 @@
options: statusList.value,
filterSlotName: FilterSlotNameEnum.API_TEST_CASE_API_REPORT_STATUS,
},
sortable: {
sortDirections: ['ascend', 'descend'],
sorter: true,
},
showDrag: true,
},
{
title: 'ms.taskCenter.queue',
dataIndex: 'lineNum',
width: 100,
showDrag: true,
},
{
title: 'ms.taskCenter.threadID',
dataIndex: 'threadId',
showTooltip: true,
width: 190,
showDrag: true,
},
{
title: 'ms.taskCenter.startExecuteTime',
dataIndex: 'startTime',
width: 170,
sortable: {
sortDirections: ['ascend', 'descend'],
sorter: true,
},
showDrag: true,
},
{
title: 'ms.taskCenter.endExecuteTime',
dataIndex: 'endTime',
width: 170,
sortable: {
sortDirections: ['ascend', 'descend'],
sorter: true,
},
showDrag: true,
},
{
title: 'ms.taskCenter.operationUser',
dataIndex: 'userName',
width: 100,
showTooltip: true,
showDrag: true,
},
{
@ -212,14 +257,24 @@
},
];
const { propsRes, propsEvent, loadList, setLoadListParams } = useTable(getCapacityTaskList, {
tableKey: TableKeyEnum.SYSTEM_RESOURCE_POOL_CAPACITY,
scroll: { x: '100%' },
selectable: false,
showSetting: true,
heightUsed: 310,
showSelectAll: false,
});
const { propsRes, propsEvent, loadList, setLoadListParams } = useTable(
getCapacityTaskList,
{
tableKey: TableKeyEnum.SYSTEM_RESOURCE_POOL_CAPACITY,
scroll: { x: '100%' },
selectable: false,
showSetting: true,
heightUsed: 310,
showSelectAll: false,
},
(item) => {
return {
...item,
startTime: item.startTime ? dayjs(item.startTime).format('YYYY-MM-DD HH:mm:ss') : '-',
endTime: item.endTime ? dayjs(item.endTime).format('YYYY-MM-DD HH:mm:ss') : '-',
};
}
);
const selectedNode = ref<string>('');
const nodeList = computed<NodesListItem[]>(() => props.activeRecord?.testResourceDTO.nodesList ?? []);