Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 修复部分空间样式和交互问题 #2736

Merged
merged 4 commits into from
Nov 10, 2023
Merged

fix: 修复部分空间样式和交互问题 #2736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6b61241
feat: 模板导入节目添加跳转配置模板入口
Yuikill Nov 9, 2023
10361c3
fix：文本域改为可拖动改变大小
Yuikill Nov 9, 2023
f06fc11
fix：修复设置变量实时性问题
Yuikill Nov 9, 2023
aa27a74
fix：修改cmdb跳转路径
Yuikill Nov 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bcs-services/bcs-bscp/ui/src/components/head.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ const handleLoginOut = () => {
};
const handleToCMDB = () => {
// @ts-ignore
window.open(BK_CC_HOST); // eslint-disable-line no-undef
window.open(`${BK_CC_HOST}/#/resource/business`); // eslint-disable-line no-undef
};
</script>

Expand Down
7 changes: 6 additions & 1 deletion bcs-services/bcs-bscp/ui/src/views/space/credentials/associate-config-items/rule-edit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@
</div>
<div class="error-info"><span v-if="!rule.isRight">输入的规则有误，请重新确认</span></div>
</div>
<p class="tips">可填写服务名称/文件路径，支持glob 表达式，如：myservice/**</p>
<div class="tips">
<div>填写格式为“服务名称/配置路径”，支持通配符，常用方法：</div>
<div>关联myservice服务下所有的配置(包含子目录):myservice/**</div>
<div>关联myservice服务/etc目录下所有的配置(不含子目录):myservice/etc/*</div>
<div>关联myservice服务/etc/nginx/nginx.conf文件:myservice/etc/nginx/nginx.conf</div>
</div>
</div>
<!-- <div class="preview-btn">预览匹配结果</div> -->
</div>
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-bscp/ui/src/views/space/scripts/list/create-script.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
/>
</bk-form-item>
<bk-form-item class="fixed-width-form" property="memo" label="脚本描述">
<bk-input v-model="formData.memo" type="textarea" :rows="3" :maxlength="200" :resize="false" />
<bk-input v-model="formData.memo" type="textarea" :rows="3" :maxlength="200" :resize="true" />
</bk-form-item>
<bk-form-item label="脚本内容" property="content" required>
<div class="script-content-wrapper">
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-bscp/ui/src/views/space/scripts/version-manage/version-edit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<bk-input v-model="localVal.name" />
</bk-form-item>
<bk-form-item label="版本说明" propperty="memo">
<bk-input v-model="localVal.memo" type="textarea" :rows="8" :resize="false"/>
<bk-input v-model="localVal.memo" type="textarea" :rows="8" :resize="true"/>
</bk-form-item>
</bk-form>
</div>
Expand Down
2 changes: 0 additions & 2 deletions ...services/bcs-bscp/ui/src/views/space/scripts/version-manage/version-list-simple-table.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<div v-if="row.hook_revision" class="version-name-wrapper">
<span :class="['status-dot', row.hook_revision.spec.state]"></span>
<div class="name">{{ row.hook_revision.spec.name }}</div>
<RightShape v-if="props.versionId === row.hook_revision.id" class="arrow-icon" />
</div>
</template>
</bk-table-column>
Expand All @@ -23,7 +22,6 @@
/>
</template>
<script setup lang="ts">
import { RightShape } from 'bkui-vue/lib/icon';
import { IScriptVersionListItem } from '../../../../../types/script';
import { IPagination } from '../../../../../types/index';

Expand Down
3 changes: 2 additions & 1 deletion ...scp/ui/src/views/space/service/detail/components/create-version/create-version-slider.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<bk-input v-model="formData.name" @change="formChange" />
</bk-form-item>
<bk-form-item label="版本描述" property="memo">
<bk-input v-model="formData.memo" type="textarea" :maxlength="100" @change="formChange" :resize="false" />
<bk-input v-model="formData.memo" type="textarea" :maxlength="100" @change="formChange" :resize="true" />
</bk-form-item>
<bk-checkbox v-model="isPublish" :true-label="true" :false-label="false" @change="formChange">
同时上线版本
Expand Down Expand Up @@ -119,6 +119,7 @@ const handleVariablesChange = (variables: IVariableEditParams[]) => {
// };

const confirm = async () => {
if (!formRef.value.validate() || !tableRef.value.validate()) return;
try {
pending.value = true;
const params = {
Expand Down
2 changes: 1 addition & 1 deletion .../bcs-bscp/ui/src/views/space/service/detail/components/publish-version/confirm-dialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</div>
</bk-form-item>
<bk-form-item label="上线说明" property="memo">
<bk-input v-model="localVal.memo" type="textarea" :maxlength="100" :resize="false"></bk-input>
<bk-input v-model="localVal.memo" type="textarea" :maxlength="100" :resize="true"></bk-input>
</bk-form-item>
</bk-form>
<template #footer>
Expand Down
17 changes: 14 additions & 3 deletions bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/publish-version/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<template #footer>
<section class="actions-wrapper">
<bk-button class="publish-btn" theme="primary" @click="handleDiffOrPublish">{{
versionList.length ? '对比并上线' : '上线版本'
versionListByGroup.length ? '对比并上线' : '上线版本'
}}</bk-button>
<bk-button @click="handlePanelClose">取消</bk-button>
</section>
Expand All @@ -54,7 +54,7 @@
:base-version-id="baseVersionId"
:show-publish-btn="true"
@publish="handleOpenPublishDialog"
:version-diff-list="versionList"
:version-diff-list="versionListByGroup"
/>
</section>
</template>
Expand Down Expand Up @@ -114,9 +114,20 @@ const permissionQueryResource = computed(() => [
},
]);

// 获取所有选择上线范围的上线版本
const versionListByGroup = computed(() => {
const list = [] as IConfigVersion[];
versionList.value.forEach((version) => {
groups.value.forEach((group) => {
if (version.spec.name === group.release_name && !list.includes(version)) list.push(version);
});
});
return list;
});

// 判断是否需要对比上线版本
const handleDiffOrPublish = () => {
if (versionList.value.length) {
if (versionListByGroup.value.length) {
isDiffSliderShow.value = true;
return;
}
Expand Down
23 changes: 14 additions & 9 deletions ...cp/ui/src/views/space/service/detail/config/config-list/config-table-list/config-form.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,18 @@
/>
</bk-form-item>
<bk-form-item label="配置文件路径" property="path" :required="true">
<bk-input
v-model="localVal.path"
placeholder="请输入绝对路径，下载路径为前缀+配置路径"
:disabled="!editable"
@change="change"
/>
<template #label>
<span
v-bk-tooltips="{
content:'客户端拉取配置文件后存放路径为：临时目录/业务ID/服务名称/files/配置文件路径，除了配置文件路径其它参数都在客户端sidecar中配置',
placement: 'top'
}"
>配置文件路径</span>
</template>
<bk-input v-model="localVal.path" placeholder="请输入绝对路径" :disabled="!editable" @change="change" />
</bk-form-item>
<bk-form-item label="配置文件描述" property="memo">
<bk-input v-model="localVal.memo" type="textarea" :disabled="!editable" @change="change" :resize="false" />
<bk-input v-model="localVal.memo" type="textarea" :disabled="!editable" @change="change" :resize="true" />
</bk-form-item>
<bk-form-item label="配置文件格式">
<bk-radio-group v-model="localVal.file_type" :required="true" @change="change">
Expand Down Expand Up @@ -98,7 +101,8 @@
:disabled="!editable"
:multiple="false"
:files="fileList"
:custom-request="handleFileUpload">
:custom-request="handleFileUpload"
>
<template #file="{ file }">
<div>
<div class="file-wrapper">
Expand All @@ -118,7 +122,8 @@
<bk-form-item v-else>
<template #label
><div class="config-content-label">
<span>配置内容</span><info v-bk-tooltips="{ content: configContentTip, placement: 'top' }" fill="#3a84ff" /></div
<span>配置内容</span
><info v-bk-tooltips="{ content: configContentTip, placement: 'top' }" fill="#3a84ff" /></div
></template>
<ConfigContentEditor
:content="stringContent"
Expand Down
13 changes: 11 additions & 2 deletions ...iews/space/service/detail/config/config-list/config-table-list/create-config/pkg-tree.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
<template>
<h4 class="title">从配置模板导入</h4>
<SearchInput v-model="searchStr" placeholder="搜索模板套餐" @search="handleSearch" />
<div class="search-wrap">
<SearchInput v-model="searchStr" placeholder="搜索模板套餐" @search="handleSearch" />
<bk-button style="margin-left: 8px;" @click="router.push({name:'templates-list'})"> 管理模板 </bk-button>
</div>
<div class="packages-tree">
<bk-tree
v-if="pkgTreeData.length"
Expand Down Expand Up @@ -38,6 +41,7 @@
</template>
<script lang="ts" setup>
import { ref, computed } from 'vue';
import { useRouter } from 'vue-router';
import { ITemplateBoundByAppData } from '../../../../../../../../../types/config';
import { IAllPkgsGroupBySpaceInBiz, IPkgTreeItem } from '../../../../../../../../../types/template';
import SearchInput from '../../../../../../../../components/search-input.vue';
Expand All @@ -46,6 +50,7 @@ interface ISpaceTreeItem extends IPkgTreeItem {
children: IPkgTreeItem[];
}

const router = useRouter();
const props = defineProps<{
bkBizId: string;
pkgList: IAllPkgsGroupBySpaceInBiz[];
Expand Down Expand Up @@ -175,9 +180,13 @@ const clearSearchStr = () => {
font-weight: 400;
color: #313238;
}
.search-input {
.search-wrap {
display: flex;
align-items: center;
justify-content: space-between;
padding: 0 24px;
}

.packages-tree {
margin-top: 8px;
padding: 0 24px;
Expand Down
7 changes: 7 additions & 0 deletions ...s/space/service/detail/config/config-list/config-table-list/variables/variables-table.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,13 @@ const validate = () => {
}
}
});
if (variable.type === 'number' && !/^\d*(\.\d+)?$/.test(variable.default_val)) {
if (errors[variable.name]) {
errors[variable.name].push('default_val');
} else {
errors[variable.name] = ['default_val'];
}
}
});
errorDetails.value = errors;
return Object.keys(errorDetails.value).length === 0;
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-bscp/ui/src/views/space/service/list/components/create-service.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
type="textarea"
v-model="formData.memo"
@change="isFormChange = true"
:resize="false"
:resize="true"
/>
</bk-form-item>
</bk-form>
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-bscp/ui/src/views/space/service/list/components/edit-service.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
:maxlength="255"
:rows="5"
@blur="handleUpdateMemo"
:resize="false"
:resize="true"
>
</bk-input>
</template>
Expand Down
2 changes: 2 additions & 0 deletions ...templates/list/package-detail/operations/add-configs/create-new-config/select-package.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
</bk-select>
</bk-form-item>
</bk-form>
<div v-if="citedList.length">
<p class="tips">{{ tips }}</p>
<bk-loading style="min-height: 100px" :loading="loading">
<bk-table v-if="!selectedPkgs.includes(0)" :data="citedList" :max-height="maxTableHeight">
Expand All @@ -48,6 +49,7 @@
</bk-table-column>
</bk-table>
</bk-loading>
</div>
</bk-dialog>
</template>
<script lang="ts" setup>
Expand Down
36 changes: 19 additions & 17 deletions ...lates/list/package-detail/operations/move-out-from-pkg/batch-move-out-from-pkg-dialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,21 @@
已选 <span class="num">{{ props.value.length }}</span> 个配置文件
</div>
<p class="tips">以下服务配置的未命名版本中引用此套餐的内容也将更新</p>
<bk-loading style="min-height: 100px" :loading="loading">
<bk-table :data="citedList" :max-height="maxTableHeight">
<bk-table-column label="所在模板套餐" prop="template_set_name"></bk-table-column>
<bk-table-column label="使用此套餐的服务">
<template #default="{ row }">
<div v-if="row.app_id" class="app-info" @click="goToConfigPageImport(row.app_id)">
<div v-overflow-title class="name-text">{{ row.app_name }}</div>
<LinkToApp class="link-icon" :id="row.app_id" />
</div>
</template>
</bk-table-column>
</bk-table>
</bk-loading>
<div class="service-table">
<bk-loading style="min-height: 100px" :loading="loading">
<bk-table :data="citedList" :max-height="maxTableHeight">
<bk-table-column label="所在模板套餐" prop="template_set_name"></bk-table-column>
<bk-table-column label="使用此套餐的服务">
<template #default="{ row }">
<div v-if="row.app_id" class="app-info" @click="goToConfigPageImport(row.app_id)">
<div v-overflow-title class="name-text">{{ row.app_name }}</div>
<LinkToApp class="link-icon" :id="row.app_id" />
</div>
</template>
</bk-table-column>
</bk-table>
</bk-loading>
</div>
</bk-dialog>
</template>
<script lang="ts" setup>
Expand Down Expand Up @@ -67,7 +69,7 @@ watch(
() => props.show,
() => {
getCitedData();
},
}
);

const goToConfigPageImport = (id: number) => {
Expand All @@ -89,19 +91,19 @@ const getCitedData = async () => {
spaceId.value,
currentTemplateSpace.value,
[props.currentPkg],
params,
params
);
citedList.value = res.details;
loading.value = false;
};

const handleConfirm = async () => {
const pkg = packageList.value.find(item => item.id === currentPkg.value);
const pkg = packageList.value.find((item) => item.id === currentPkg.value);
if (!pkg) return;

try {
pending.value = true;
const ids = props.value.map(item => item.id);
const ids = props.value.map((item) => item.id);
await moveOutTemplateFromPackage(spaceId.value, currentTemplateSpace.value, ids, [currentPkg.value as number]);
emits('movedOut');
close();
Expand Down
7 changes: 3 additions & 4 deletions bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-menu/menu.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<template>
<div class="package-list-comp">
<div class="search-wrapper">
<div class="create-btn" v-bk-tooltips="'新建模板套餐'" @click="isCreatePackageDialogShow = true">
<Plus />
</div>
<div class="search-input">
<SearchInput v-model="searchStr" placeholder="搜索模板套餐" @search="handleSearch" />
</div>
<div class="create-btn" v-bk-tooltips="'新建模板套餐'" @click="isCreatePackageDialogShow = true">
<Plus />
</div>
</div>
<div v-if="menuList.length > 0" class="package-list">
<PackageItem
Expand Down Expand Up @@ -299,7 +299,6 @@ const clearSearch = () => {
display: inline-flex;
align-items: center;
justify-content: center;
margin-right: 8px;
width: 32px;
height: 32px;
font-size: 24px;
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-bscp/ui/src/views/space/templates/list/package-menu/package-form.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<bk-input v-model="localVal.name" @change="change" />
</bk-form-item>
<bk-form-item label="模板套餐描述" property="memo">
<bk-input v-model="localVal.memo" type="textarea" :rows="6" :maxlength="256" @change="change" :resize="false" />
<bk-input v-model="localVal.memo" type="textarea" :rows="6" :maxlength="256" @change="change" :resize="true" />
</bk-form-item>
<bk-form-item label="服务可见范围" property="public" required>
<bk-radio-group v-model="localVal.public" @change="change">
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-bscp/ui/src/views/space/templates/list/space/create.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<bk-input v-model="localVal.name" />
</bk-form-item>
<bk-form-item label="模板空间描述" property="memo">
<bk-input v-model="localVal.memo" type="textarea" :rows="6" :maxlength="100" :resize="false" />
<bk-input v-model="localVal.memo" type="textarea" :rows="6" :maxlength="100" :resize="true" />
</bk-form-item>
</bk-form>
</bk-dialog>
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-bscp/ui/src/views/space/templates/list/space/edit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
</template>
<bk-form ref="formRef" form-type="vertical" :model="{ memo }">
<bk-form-item label="模板空间描述" property="memo">
<bk-input v-model="memo" type="textarea" :rows="6" :maxlength="100" :resize="false" />
<bk-input v-model="memo" type="textarea" :rows="6" :maxlength="100" :resize="true" />
</bk-form-item>
</bk-form>
</bk-dialog>
Expand Down
2 changes: 1 addition & 1 deletion ...es/bcs-bscp/ui/src/views/space/templates/version-manage/version-detail/version-editor.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<bk-input v-model="formData.revision_name" />
</bk-form-item>
<bk-form-item label="版本描述" property="revision_memo">
<bk-input v-model="formData.revision_memo" type="textarea" :rows="4" :maxlength="200" :resize="false" />
<bk-input v-model="formData.revision_memo" type="textarea" :rows="4" :maxlength="200" :resize="true" />
</bk-form-item>
<bk-form-item label="文件权限" required>
<PermissionInputPicker v-model="formData.privilege" />
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-bscp/ui/src/views/space/variables/editing-form.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<bk-input v-model="localVal.default_val" @change="change" />
</bk-form-item>
<bk-form-item label="描述" property="memo">
<bk-input v-model="localVal.memo" type="textarea" :maxlength="100" :rows="5" @change="change" :resize="false" />
<bk-input v-model="localVal.memo" type="textarea" :maxlength="100" :rows="5" @change="change" :resize="true" />
</bk-form-item>
</bk-form>
</template>
Expand Down