Skip to content

Commit

Permalink
feat:流水线变量语法支持两种风格 TencentBlueKing#10576
Browse files Browse the repository at this point in the history
# Reviewed, transaction id: 16330
  • Loading branch information
useryuyu committed Aug 23, 2024
1 parent ad1c1ea commit c486ff5
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
:width="900"
:placement="placement"
extCls="dialect-popover"
:componentEventDelay="300"
>
<label class="label">{{ t('变量语法风格') }}</label>
<template #content>
Expand Down Expand Up @@ -117,5 +118,4 @@ const namingConventionData = [
overflow: hidden;
}
}
</style>
16 changes: 8 additions & 8 deletions src/frontend/devops-manage/src/components/project-form.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import IAMIframe from './IAM-Iframe';
import { useI18n } from 'vue-i18n';
import { Message, Popover } from 'bkui-vue';
import http from '@/http/api';
import DialectPopoverTable from "@/components/dialectPopoverTable";
import DialectPopoverTable from "@/components/dialectPopoverTable.vue";
const {
t,
} = useI18n();
Expand Down Expand Up @@ -472,13 +472,13 @@ onBeforeUnmount(() => {
<bk-form-item
property="pipelineDialect"
>
<template #label>
<dialect-popover-table />
</template>
<bk-radio-group
v-model="projectData.pipelineDialect"
@change="handleChangeForm"
>
<template #label>
<dialect-popover-table />
</template>
<bk-radio-group
v-model="projectData.pipelineDialect"
@change="handleChangeForm"
>
<bk-radio label="CLASSIC">
<span>{{ t('传统风格') }}</span>
</bk-radio>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import {
RESOURCE_ACTION,
RESOURCE_TYPE,
} from '@/utils/permission.js'
import DialectPopoverTable from "@/components/dialectPopoverTable";
import DialectPopoverTable from "@/components/dialectPopoverTable.vue";
const { t } = useI18n();
const router = useRouter();
Expand Down Expand Up @@ -421,7 +421,7 @@ onMounted(async () => {
</bk-form-item>
<bk-form-item property="pipelineDialect">
<template #label>
<dialect-popover-table :placement="'bottom-end'"/>
<dialect-popover-table :placement="'bottom-start'"/>
</template>
<div>
<span>{{ pipelineDialectMap[projectData.pipelineDialect] }}</span>
Expand Down

0 comments on commit c486ff5

Please sign in to comment.