forked from TencentBlueKing/bk-bcs
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: 1.提交审批部分接口更新；2.添加操作记录列表，部分功能暂未联调(总体80%进度)--story=115998324
- Loading branch information
1 parent
5316fb2
commit 3b89876
Showing
22 changed files
with
1,614 additions
and
36 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| import http from '../request'; | ||
| import { IRecordQuery } from '../../types/record'; | ||
|
|
||
| /** | ||
| * 获取操作记录列表 | ||
| * @param biz_id 空间ID | ||
| * @param params 查询参数 | ||
| * @returns | ||
| */ | ||
| export const getRecordList = (biz_id: string, params: IRecordQuery) => | ||
| http.get(`/config/biz_id/${biz_id}/audits`, { params }).then((res) => res.data); | ||
|
|
||
| /** | ||
| * 审批操作：撤销/驳回/通过/手动上线 | ||
| * @param biz_id 空间ID | ||
| * @param app_id 服务ID | ||
| * @param release_id 版本ID | ||
| * @param params 参数 | ||
| * @returns | ||
| */ | ||
| export const approve = ( | ||
| biz_id: string, | ||
| app_id: number, | ||
| release_id: number, | ||
| params: { publish_status: string; reason?: string }, | ||
| ) => | ||
| http | ||
| .post(`/config/biz_id/${biz_id}/app_id/${app_id}/release_id/${release_id}/approve`, { ...params }) | ||
| .then((res) => res.data); |
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| import { localT } from '../i18n'; | ||
|
|
||
| // 资源类型 | ||
| export const RECORD_RES_TYPE = { | ||
| app_config: localT('服务配置'), // 2024.9 第一版只有这个字段 | ||
| }; | ||
|
|
||
| // 操作行为 | ||
| export const ACTION = { | ||
| Create: localT('创建服务'), | ||
| Publish: localT('上线服务'), | ||
| Update: localT('更新服务'), | ||
| Delete: localT('删除服务'), | ||
| PublishVersionConfig: localT('上线版本配置'), // 2024.9 第一版只有这个字段 | ||
| }; | ||
|
|
||
| // 资源实例 | ||
| export const INSTANCE = { | ||
| releases_name: localT('配置版本名称'), | ||
| group: localT('配置上线范围'), | ||
| }; | ||
|
|
||
| // 状态 | ||
| export const STATUS = { | ||
| PendApproval: localT('待审批'), | ||
| PendPublish: localT('待上线'), | ||
| RevokedPublish: localT('撤销上线'), | ||
| RejectedApproval: localT('审批驳回'), | ||
| AlreadyPublish: localT('已上线'), | ||
| Failure: localT('失败'), // 脚本相关的才会有 | ||
| Success: localT('成功'), // 脚本相关的才会有 | ||
| }; | ||
|
|
||
| // 版本状态 | ||
| export enum APPROVE_STATUS { | ||
| PendApproval = 'PendApproval', // 待审批 | ||
| PendPublish = 'PendPublish', // 待上线 | ||
| RevokedPublish = 'RevokedPublish', // 撤销上线 | ||
| RejectedApproval = 'RejectedApproval', // 审批驳回 | ||
| AlreadyPublish = 'AlreadyPublish', // 已上线 | ||
| Failure = 'Failure', | ||
| Success = 'Success', | ||
| } |
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
90 changes: 90 additions & 0 deletions
90
bcs-services/bcs-bscp/ui/src/views/space/records/components/date-picker.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,90 @@ | ||
| <template> | ||
| <div> | ||
| <bk-date-picker | ||
| v-click-outside="() => (open = false)" | ||
| ref="datePickerRef" | ||
| style="width: 300" | ||
| :disabled-date="disabledDate" | ||
| :model-value="defaultValue" | ||
| :shortcuts="shortcutsRange" | ||
| :editable="false" | ||
| :clearable="false" | ||
| :open="open" | ||
| type="datetimerange" | ||
| append-to-body | ||
| clear | ||
| @change="handleChange" | ||
| @click="open = !open"> | ||
| <template #confirm> | ||
| <div> | ||
| <bk-button theme="primary" @click="open = false" style="margin-right: 8px; height: 26px"> 确定 </bk-button> | ||
| </div> | ||
| </template> | ||
| </bk-date-picker> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script setup lang="ts"> | ||
| import { ref } from 'vue'; | ||
| const shortcutsRange = ref([ | ||
| // { | ||
| // text: '今天', | ||
| // value() { | ||
| // const end = new Date(); | ||
| // const start = new Date(end.getFullYear(), end.getMonth(), end.getDate()); | ||
| // return [start, end]; | ||
| // }, | ||
| // onClick: (picker) => { | ||
| // console.log(picker); | ||
| // }, | ||
| // }, | ||
| { | ||
| text: '近7天', | ||
| value() { | ||
| const end = new Date(); | ||
| const start = new Date(); | ||
| start.setTime(start.getTime() - 3600 * 1000 * 24 * 7); | ||
| return [start, end]; | ||
| }, | ||
| onClick: (picker) => { | ||
| console.log(picker); | ||
| }, | ||
| }, | ||
| { | ||
| text: '近15天', | ||
| value() { | ||
| const end = new Date(); | ||
| const start = new Date(); | ||
| start.setTime(start.getTime() - 3600 * 1000 * 24 * 15); | ||
| return [start, end]; | ||
| }, | ||
| onClick: (picker) => { | ||
| console.log(picker); | ||
| }, | ||
| }, | ||
| { | ||
| text: '近30天', | ||
| value() { | ||
| const end = new Date(); | ||
| const start = new Date(); | ||
| start.setTime(start.getTime() - 3600 * 1000 * 24 * 30); | ||
| return [start, end]; | ||
| }, | ||
| onClick: (picker) => { | ||
| console.log(picker); | ||
| }, | ||
| }, | ||
| ]); | ||
| const open = ref(false); | ||
| const datePickerRef = ref(null); | ||
| const defaultValue = ref([new Date(Date.now() - 7 * 24 * 60 * 60 * 1000), new Date()]); | ||
| const handleChange = (date: []) => { | ||
| defaultValue.value = date; | ||
| }; | ||
| const disabledDate = (date: Date) => date && date.valueOf() > Date.now() - 86400; | ||
| </script> | ||
|
|
||
| <style scoped></style> |
Oops, something went wrong.