mirror of
https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
synced 2024-12-04 21:19:52 +08:00
fix(系统设置): 修复资源池容量bug&富文本工具条遮盖样式
This commit is contained in:
parent
94ec9cf0ca
commit
a84414b4df
@ -633,6 +633,12 @@
|
|||||||
}
|
}
|
||||||
:deep(.editor-content) {
|
:deep(.editor-content) {
|
||||||
.ms-scroll-bar();
|
.ms-scroll-bar();
|
||||||
|
& + div[data-tippy-root] {
|
||||||
|
transform: translate(60%) !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
[data-tippy-root] {
|
||||||
|
inset: auto !important;
|
||||||
}
|
}
|
||||||
:deep(.tableWrapper) {
|
:deep(.tableWrapper) {
|
||||||
.ms-scroll-bar();
|
.ms-scroll-bar();
|
||||||
|
@ -80,6 +80,7 @@
|
|||||||
|
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref } from 'vue';
|
import { ref } from 'vue';
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
import MsDrawer from '@/components/pure/ms-drawer/index.vue';
|
import MsDrawer from '@/components/pure/ms-drawer/index.vue';
|
||||||
import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
|
import MsBaseTable from '@/components/pure/ms-table/base-table.vue';
|
||||||
@ -199,6 +200,50 @@
|
|||||||
options: statusList.value,
|
options: statusList.value,
|
||||||
filterSlotName: FilterSlotNameEnum.API_TEST_CASE_API_REPORT_STATUS,
|
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,
|
showDrag: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -212,14 +257,24 @@
|
|||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
const { propsRes, propsEvent, loadList, setLoadListParams } = useTable(getCapacityTaskList, {
|
const { propsRes, propsEvent, loadList, setLoadListParams } = useTable(
|
||||||
|
getCapacityTaskList,
|
||||||
|
{
|
||||||
tableKey: TableKeyEnum.SYSTEM_RESOURCE_POOL_CAPACITY,
|
tableKey: TableKeyEnum.SYSTEM_RESOURCE_POOL_CAPACITY,
|
||||||
scroll: { x: '100%' },
|
scroll: { x: '100%' },
|
||||||
selectable: false,
|
selectable: false,
|
||||||
showSetting: true,
|
showSetting: true,
|
||||||
heightUsed: 310,
|
heightUsed: 310,
|
||||||
showSelectAll: false,
|
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 selectedNode = ref<string>('');
|
||||||
const nodeList = computed<NodesListItem[]>(() => props.activeRecord?.testResourceDTO.nodesList ?? []);
|
const nodeList = computed<NodesListItem[]>(() => props.activeRecord?.testResourceDTO.nodesList ?? []);
|
||||||
|
Loading…
Reference in New Issue
Block a user