-
Notifications
You must be signed in to change notification settings - Fork 201
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2546 from hLinx/hotfix_master
Hotfix master
- Loading branch information
Showing
17 changed files
with
1,733 additions
and
30 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
122 changes: 122 additions & 0 deletions
122
.../views/executive-history/step-detail/components/view-step-info/components/render-step.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| <!-- | ||
| * Tencent is pleased to support the open source community by making BK-JOB蓝鲸智云作业平台 available. | ||
| * | ||
| * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. | ||
| * | ||
| * BK-JOB蓝鲸智云作业平台 is licensed under the MIT License. | ||
| * | ||
| * License for BK-JOB蓝鲸智云作业平台: | ||
| * | ||
| * | ||
| * Terms of the MIT License: | ||
| * --------------------------------------------------- | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated | ||
| * documentation files (the "Software"), to deal in the Software without restriction, including without limitation | ||
| * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and | ||
| * to permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all copies or substantial portions of | ||
| * the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT | ||
| * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF | ||
| * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS | ||
| * IN THE SOFTWARE. | ||
| --> | ||
|
|
||
| <template> | ||
| <div | ||
| v-bkloading="{ isLoading }" | ||
| class="history-step-detail-view"> | ||
| <task-step-detail | ||
| :data="stepInfo" | ||
| :variable="variableList"> | ||
| <detail-item | ||
| v-if="rollingConfigExpr" | ||
| :label="$t('history.滚动策略：')"> | ||
| <span | ||
| v-bk-tooltips.right="rollingExprParse(rollingConfigExpr)" | ||
| class="tips"> | ||
| {{ rollingConfigExpr }} | ||
| </span> | ||
| </detail-item> | ||
| <detail-item | ||
| v-if="rollingModeText" | ||
| :label="$t('history.滚动机制：')"> | ||
| {{ rollingModeText }} | ||
| </detail-item> | ||
| </task-step-detail> | ||
| </div> | ||
| </template> | ||
| <script setup> | ||
| import { | ||
| ref, | ||
| shallowRef, | ||
| } from 'vue'; | ||
| import TaskExecuteService from '@service/task-execute'; | ||
| import GlobalVariableModel from '@model/task/global-variable'; | ||
| import TaskStepModel from '@model/task/task-step'; | ||
| import rollingExprParse from '@utils/rolling-expr-parse'; | ||
| import DetailItem from '@components/detail-layout/item'; | ||
| import I18n from '@/i18n'; | ||
| import TaskStepDetail from './task-step-detail/index.vue'; | ||
| const props = defineProps({ | ||
| taskId: { | ||
| type: Number, | ||
| required: true, | ||
| }, | ||
| id: { | ||
| type: [Number, String], | ||
| }, | ||
| }); | ||
| const isLoading = ref(true); | ||
| const stepInfo = shallowRef({}); | ||
| const rollingConfigExpr = ref(''); | ||
| const rollingModeText = ref(''); | ||
| const variableList = shallowRef([]); | ||
| // 步骤详情 | ||
| const fetchStep = () => TaskExecuteService.fetchStepInstance({ | ||
| id: props.id, | ||
| }).then((data) => { | ||
| if (data.rollingEnabled) { | ||
| rollingConfigExpr.value = data.rollingConfig.expr; | ||
| const modeMap = { | ||
| 1: I18n.t('默认（执行失败则暂停）'), | ||
| 2: I18n.t('忽略失败，自动滚动下一批'), | ||
| 3: I18n.t('不自动，每批次都人工确认'), | ||
| }; | ||
| rollingModeText.value = modeMap[data.rollingConfig.mode]; | ||
| } | ||
| stepInfo.value = new TaskStepModel(data); | ||
| }); | ||
| const fetchTaskVariables = () => TaskExecuteService.fetchStepInstanceParam({ | ||
| id: props.taskId, | ||
| }).then((data) => { | ||
| variableList.value = Object.freeze(data.map(({ id, name, type, value, targetValue }) => new GlobalVariableModel({ | ||
| id, | ||
| name, | ||
| type, | ||
| defaultValue: value, | ||
| defaultTargetValue: targetValue, | ||
| }))); | ||
| }); | ||
| Promise.all([ | ||
| fetchStep(), | ||
| fetchTaskVariables(), | ||
| ]).finally(() => { | ||
| isLoading.value = false; | ||
| }); | ||
| </script> |
167 changes: 167 additions & 0 deletions
167
...ve-history/step-detail/components/view-step-info/components/task-step-detail/approval.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| <!-- | ||
| * Tencent is pleased to support the open source community by making BK-JOB蓝鲸智云作业平台 available. | ||
| * | ||
| * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. | ||
| * | ||
| * BK-JOB蓝鲸智云作业平台 is licensed under the MIT License. | ||
| * | ||
| * License for BK-JOB蓝鲸智云作业平台: | ||
| * | ||
| * | ||
| * Terms of the MIT License: | ||
| * --------------------------------------------------- | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated | ||
| * documentation files (the "Software"), to deal in the Software without restriction, including without limitation | ||
| * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and | ||
| * to permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all copies or substantial portions of | ||
| * the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT | ||
| * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF | ||
| * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS | ||
| * IN THE SOFTWARE. | ||
| --> | ||
|
|
||
| <template> | ||
| <div | ||
| v-bkloading="{ isLoading }" | ||
| class="artificial-view"> | ||
| <detail-item :label="$t('template.确认人：')"> | ||
| <div class="approval-wraper"> | ||
| <div | ||
| v-for="role in renderRoleList" | ||
| :key="role" | ||
| class="item"> | ||
| <icon | ||
| class="approval-flag" | ||
| type="user-group-gray" /> | ||
| {{ role }} | ||
| </div> | ||
| <div | ||
| v-for="user in stepInfo.approvalUser.userList" | ||
| :key="user" | ||
| class="item"> | ||
| <icon | ||
| class="approval-flag" | ||
| type="user" /> | ||
| {{ user }} | ||
| </div> | ||
| </div> | ||
| </detail-item> | ||
| <detail-item :label="$t('template.通知方式：')"> | ||
| {{ renderChannel }} | ||
| </detail-item> | ||
| <detail-item :label="$t('template.确认描述：')"> | ||
| {{ stepInfo.approvalMessage || '--' }} | ||
| </detail-item> | ||
| <slot /> | ||
| </div> | ||
| </template> | ||
| <script setup> | ||
| import { | ||
| ref, | ||
| shallowRef, | ||
| } from 'vue'; | ||
| import NotifyService from '@service/notify'; | ||
| import QueryGlobalSettingService from '@service/query-global-setting'; | ||
| import DetailItem from '@components/detail-layout/item'; | ||
| const props = defineProps({ | ||
| data: { | ||
| type: Object, | ||
| default: () => ({}), | ||
| }, | ||
| }); | ||
| const isLoading = ref(true); | ||
| const stepInfo = shallowRef(props.data.approvalStepInfo); | ||
| const renderRoleList = shallowRef([]); | ||
| const renderChannel = ref(''); | ||
| const fetchRoleList = () => { | ||
| NotifyService.fetchRoleList() | ||
| .then((data) => { | ||
| const roleMap = {}; | ||
| data.forEach((role) => { | ||
| roleMap[role.code] = role.name; | ||
| }); | ||
| // 过滤掉已经被删除的角色分组 | ||
| renderRoleList.value = stepInfo.value.approvalUser.roleList.reduce((result, item) => { | ||
| if (roleMap[item]) { | ||
| result.push(roleMap[item]); | ||
| } | ||
| return result; | ||
| }, []); | ||
| }); | ||
| }; | ||
| const fetchAllChannel = () => { | ||
| if (stepInfo.value.notifyChannel.length < 1) { | ||
| renderChannel.value = '--'; | ||
| return Promise.resolve(); | ||
| } | ||
| QueryGlobalSettingService.fetchActiveNotifyChannel() | ||
| .then((data) => { | ||
| const channelMap = {}; | ||
| data.forEach((channel) => { | ||
| channelMap[channel.code] = channel.name; | ||
| }); | ||
| const channel = stepInfo.value.notifyChannel.reduce((result, item) => { | ||
| // 过滤掉已经被删除的通知渠道 | ||
| if (channelMap[item]) { | ||
| result.push(channelMap[item]); | ||
| } | ||
| return result; | ||
| }, []); | ||
| if (channel.length < 1) { | ||
| renderChannel.value = '--'; | ||
| } | ||
| renderChannel.value = channel.join('，'); | ||
| }); | ||
| }; | ||
| Promise.all([ | ||
| fetchRoleList(), | ||
| fetchAllChannel(), | ||
| ]).finally(() => { | ||
| isLoading.value = false; | ||
| }); | ||
| </script> | ||
| <style lang='postcss' scoped> | ||
| .artificial-view { | ||
| .detail-item { | ||
| margin-bottom: 0; | ||
| } | ||
| .approval-wraper { | ||
| display: flex; | ||
| align-items: center; | ||
| flex-wrap: wrap; | ||
| min-height: 34px; | ||
| margin-top: -5px; | ||
| .item { | ||
| display: flex; | ||
| height: 20px; | ||
| padding: 0 6px; | ||
| margin-top: 10px; | ||
| margin-right: 10px; | ||
| font-size: 12px; | ||
| color: #63656e; | ||
| background: #f0f1f5; | ||
| border-radius: 2px; | ||
| align-items: center; | ||
| } | ||
| .approval-flag { | ||
| margin-right: 4px; | ||
| } | ||
| } | ||
| } | ||
| </style> |
Oops, something went wrong.