mirror of
https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
synced 2024-12-02 20:19:16 +08:00
fix(全局): 布局滚动条调整&资源池隐藏用途
This commit is contained in:
parent
22750ad7a3
commit
b1279b4ebc
@ -514,6 +514,9 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
.arco-icon-hover.arco-radio-icon-hover::before {
|
||||
@apply hidden;
|
||||
}
|
||||
|
||||
/** Message **/
|
||||
.arco-message {
|
||||
@ -615,10 +618,6 @@
|
||||
.arco-form-item {
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
.arco-icon-hover.arco-radio-icon-hover::before {
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
}
|
||||
.arco-radio {
|
||||
.arco-radio-icon {
|
||||
width: 16px;
|
||||
|
@ -41,7 +41,7 @@
|
||||
</a-drawer>
|
||||
<a-layout class="layout-content" :style="paddingStyle">
|
||||
<a-spin :loading="appStore.loading" :tip="appStore.loadingTip">
|
||||
<a-scrollbar class="flex h-[calc(100vh-56px)] flex-col gap-[8px] overflow-auto">
|
||||
<div class="layout-scroll-container">
|
||||
<MsBreadCrumb />
|
||||
<a-layout-content>
|
||||
<slot name="page">
|
||||
@ -52,7 +52,7 @@
|
||||
<slot></slot>
|
||||
</a-layout-content>
|
||||
<Footer v-if="footer" />
|
||||
</a-scrollbar>
|
||||
</div>
|
||||
</a-spin>
|
||||
</a-layout>
|
||||
</a-layout>
|
||||
@ -75,7 +75,6 @@
|
||||
import { GetTitleImgUrl } from '@/api/requrls/setting/config';
|
||||
import usePermission from '@/hooks/usePermission';
|
||||
import { useAppStore, useUserStore } from '@/store';
|
||||
import useLicenseStore from '@/store/modules/setting/license';
|
||||
|
||||
interface Props {
|
||||
isPreview?: boolean;
|
||||
@ -87,7 +86,6 @@
|
||||
const props = defineProps<Props>();
|
||||
|
||||
const innerProps = ref<Props>(props);
|
||||
const licenseStore = useLicenseStore();
|
||||
watch(
|
||||
() => props.logo,
|
||||
() => {
|
||||
@ -215,6 +213,13 @@
|
||||
padding: 0 16px 16px 0;
|
||||
}
|
||||
}
|
||||
.layout-scroll-container {
|
||||
@apply flex flex-col overflow-auto;
|
||||
.ms-scroll-bar();
|
||||
|
||||
gap: 8px;
|
||||
height: calc(100vh - 56px);
|
||||
}
|
||||
.arco-layout-sider-light {
|
||||
@apply bg-transparent;
|
||||
}
|
||||
|
@ -382,7 +382,6 @@
|
||||
import MsCodeEditor from '@/components/pure/ms-code-editor/index.vue';
|
||||
import MsBatchForm from '@/components/business/ms-batch-form/index.vue';
|
||||
import type { FormItemModel } from '@/components/business/ms-batch-form/types';
|
||||
import MsFormItemSub from '@/components/business/ms-form-item-sub/index.vue';
|
||||
import JobTemplateDrawer from './components/jobTemplateDrawer.vue';
|
||||
|
||||
import { getSystemOrgOption } from '@/api/modules/setting/organizationAndProject';
|
||||
@ -480,7 +479,7 @@
|
||||
...res,
|
||||
addType: 'single',
|
||||
orgType: res.allOrg ? 'allOrg' : 'set',
|
||||
use: [res.apiTest ? 'API' : '', res.uiTest ? 'UI' : ''].filter((e) => e),
|
||||
use: ['API', res.uiTest ? 'UI' : ''].filter((e) => e), // TODO:暂时只有接口测试
|
||||
testResourceDTO: {
|
||||
...testResourceReturnDTO,
|
||||
girdConcurrentNumber: girdConcurrentNumber || 1,
|
||||
|
@ -410,13 +410,13 @@
|
||||
tagTheme: 'light',
|
||||
tagType: 'default',
|
||||
},
|
||||
{
|
||||
label: t('system.resourcePool.detailUse'),
|
||||
value: poolUses.filter((e) => e !== ''),
|
||||
tagTheme: 'light',
|
||||
tagType: 'default',
|
||||
isTag: true,
|
||||
},
|
||||
// {
|
||||
// label: t('system.resourcePool.detailUse'),
|
||||
// value: poolUses.filter((e) => e !== ''),
|
||||
// tagTheme: 'light',
|
||||
// tagType: 'default',
|
||||
// isTag: true,
|
||||
// },
|
||||
...uiDesc,
|
||||
...detailType,
|
||||
...resourceDesc,
|
||||
|
Loading…
Reference in New Issue
Block a user