Skip to content

Commit

Permalink
Merge pull request #30 from lhzzforever/dev/develop_ci
Browse files Browse the repository at this point in the history
Dev/develop ci
  • Loading branch information
ielgnaw authored Mar 28, 2024
2 parents 2c9f3df + b8d5a7f commit 756abb7
Show file tree
Hide file tree
Showing 9 changed files with 79 additions and 34 deletions.
2 changes: 1 addition & 1 deletion src/dashboard-front/src/common/menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export const createMenuData = (): IMenu[] => {
},
{
name: 'apigwMonitorAlarmHistory',
title: t('告警历史'),
title: t('告警记录'),
enabled: true,
},
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,12 @@ const handleCreateResourceVersion = async () => {
padding: 0 12px;
i {
font-size: 16px;
margin-right: 4px;
}
&.bk-button.is-disabled {
color: #dcdee5;
cursor: not-allowed;
border-color: #dcdee5;
}
&.bk-button.is-disabled {
color: #dcdee5;
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard-front/src/language/lang.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const lang: ILANG = {
'统计报表': ['Statistics'],
'监控告警': ['Monitoring'],
'告警策略': ['Alarm Strategy'],
'告警历史': ['Alarm Histories'],
'告警记录': ['Alarm Records'],
'在线调试': ['API Test'],
'资源SDK': ['SDKs'],
'操作审计': ['Audits'],
Expand Down
2 changes: 1 addition & 1 deletion src/dashboard-front/src/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ const routes: RouteRecordRaw[] = [
name: 'apigwMonitorAlarmHistory',
component: ApigwMonitorAlarmHistory,
meta: {
title: t('告警历史'),
title: t('告警记录'),
matchRoute: 'apigwMonitorAlarmHistory',
topMenu: 'home',
},
Expand Down
21 changes: 16 additions & 5 deletions src/dashboard-front/src/views/components/plugin-manage/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,9 @@
</div>
</template>
<template #footer v-if="state.curStep === 1">
<div class="slider-footer pl20">
<div class="slider-footer">
<div class="fist-step">
<bk-button theme="primary" @click="handelNext" width="50px" :disabled="!curChoosePlugin">
<bk-button theme="primary" @click="handelNext" :disabled="!curChoosePlugin">
{{ t('下一步') }}
</bk-button>
<bk-button @click="handleCancel">{{ t('取消') }}</bk-button>
Expand Down Expand Up @@ -776,15 +776,26 @@ init();
.plugin-add-slider {
:deep(.bk-modal-content) {
// height: calc(100vh - 106px) !important;
height: calc(100% - 126px) !important;
// height: calc(100% - 126px) !important;
overflow-y: auto;
}
:deep(.bk-sideslider-footer) {
height: 48px !important;
}
.slider-footer {
display: flex;
padding: 0 24px;
height: 32px;
.fist-step {
margin-right: 12px;
font-size: 0;
line-height: 48px;
.bk-button {
min-width: 88px;
&:not(&:first-child) {
margin-left: 8px;
}
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@
@confirm="handleAdd"
v-if="isStage"
>
<bk-button theme="primary">{{ t('确定') }}</bk-button>
<bk-button theme="primary" class="default-btn">{{ t('确定') }}</bk-button>
</bk-pop-confirm>
<bk-button v-else @click="handleAdd" theme="primary">{{ t('确定') }}</bk-button>
<bk-button @click="handlePre" class="ml5" v-if="isAdd">{{ t('上一步') }}</bk-button>
<bk-button @click="handleCancel" class="ml5">{{ t('取消') }}</bk-button>
<bk-button v-else @click="handleAdd" theme="primary" class="default-btn">{{ t('确定') }}</bk-button>
<bk-button @click="handlePre" class="prev-btn ml8" v-if="isAdd">{{ t('上一步') }}</bk-button>
<bk-button @click="handleCancel" class="default-btn ml8">{{ t('取消') }}</bk-button>
</div>
</div>
</div>
Expand Down Expand Up @@ -491,4 +491,17 @@ init();
background: #3a84ff;
}
}
.last-step {
font-size: 0;
.default-btn {
min-width: 88px;
}
.prev-btn {
min-width: 74px;
}
.ml8 {
margin-left: 8px;
}
}
</style>
4 changes: 4 additions & 0 deletions src/dashboard-front/src/views/main.vue
Original file line number Diff line number Diff line change
Expand Up @@ -303,6 +303,10 @@ const handleBack = () => {
.submenu-header-content{
color: rgb(99, 101, 110);
}
.submenu-header-collapse {
width: 20px;
font-size: 20px;
}
.bk-menu-submenu.is-opened {
background: #fff !important;
}
Expand Down
36 changes: 21 additions & 15 deletions src/dashboard-front/src/views/operate-records/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
</bk-form-item>
<bk-form-item class="ag-form-item-search">
<bk-search-select
style="width: 100%"
v-model="searchValue"
unique-select
class="operate-records-search"
Expand Down Expand Up @@ -469,7 +470,7 @@ watch(
:deep(.search-form) {
width: 100% !important;
max-width: 100% !important;
display: inline-block;
display: flex;
.bk-form-item {
display: inline-flex;
Expand All @@ -485,6 +486,7 @@ watch(
width: auto !important;
line-height: 32px;
display: inline-block;
min-width: 75px;
padding: 0 15px 0 0;
span {
Expand Down Expand Up @@ -512,10 +514,21 @@ watch(
}
}
.top-search-input {
width: 600px;
.ag-form-item-datepicker {
.bk-form-content {
max-width: 320px;
}
}
.ag-form-item-search {
width: calc(100% - 320px);
.bk-form-content {
width: 100%;
.operate-records-search {
background: #ffffff;
}
}
}
}
}
Expand All @@ -535,13 +548,6 @@ watch(
}
}
.ag-form-item-search {
.operate-records-search {
width: calc(100vh - 20px);
background: #ffffff;
}
}
.ag-dot {
width: 8px;
height: 8px;
Expand Down Expand Up @@ -605,11 +611,11 @@ watch(
margin-top: 10px;
}
.ag-form-item-search {
.operate-records-search {
width: calc(100vh - 144px);
}
}
// .ag-form-item-search {
// .operate-records-search {
// width: calc(100vh - 144px);
// }
// }
}
}
</style>
19 changes: 12 additions & 7 deletions src/dashboard-front/src/views/resource/setting/comps/base-info.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,21 @@
<bk-form ref="formRef" :model="formData" :rules="rules" class="resource-baseinfo">
<bk-form-item
:label="t('名称')"
:description="t('由小写字母、数字、连接符(-)组成,首字符必须是字母,长度大于3小于30个字符')"
property="name"
required
>
<bk-input
v-model="formData.name"
:placeholder="t('请输入名称')"
class="name"
clearable
/>
<bk-popover
placement="top-start"
trigger="click"
theme="light"
:content="t('由小写字母、数字、连接符(-)组成,首字符必须是字母,长度大于3小于30个字符')">
<bk-input
v-model="formData.name"
:placeholder="t('请输入')"
class="name"
clearable
/>
</bk-popover>
</bk-form-item>
<bk-form-item
:label="t('描述')"
Expand Down

0 comments on commit 756abb7

Please sign in to comment.