feat：代码库优化一期功能点 #9347 #9584
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,4 +24,9 @@ | |
| cursor: pointer; | ||
| color: $primaryColor; | ||
| } | ||
| } | ||
| a { | ||
| color: #3c96ff; | ||
| cursor: pointer; | ||
| text-decoration: none; | ||
| } | ||
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,96 @@ | ||
| <template> | ||
| <div class="bk-form bk-form-vertical"> | ||
| <template v-for="(obj, key) in atomPropsModel"> | ||
| <form-field v-if="!obj.hidden && rely(obj, element)" :key="key" :desc="obj.desc" :desc-link="obj.descLink" :desc-link-text="obj.descLinkText" :required="obj.required" :label="obj.label" :is-error="errors.has(key)" :error-msg="errors.first(key)"> | ||
| <component | ||
| :is="obj.component" | ||
| :name="key" | ||
| :value="element[key]" | ||
| disabled | ||
| v-bind="obj"> | ||
| </component> | ||
| </form-field> | ||
| </template> | ||
| <form-field v-if="Object.keys(customTriggerControlModel).length"> | ||
| <accordion show-checkbox :show-content="enableThirdFilter" key="customTriggerControl" :is-version="true"> | ||
| <header class="var-header" style="height: 16px;" slot="header"> | ||
| <span> | ||
| {{ $t('codelib.自定义触发控制') }} | ||
| <i class="bk-icon icon-info-circle ml5" v-bk-tooltips="$t('codelib.满足基础过滤条件后，根据第三方接口返回判断是否能够触发')"></i> | ||
| <a class="title-link" target="blink" :href="customTriggerDocsLink">{{ $t('codelib.查看使用指引和示例') }}</a> | ||
| </span> | ||
| <input class="accordion-checkbox" disabled :checked="enableThirdFilter" type="checkbox" /> | ||
| </header> | ||
| <div slot="content" class="bk-form bk-form-vertical"> | ||
| <template v-for="(obj, key) in customTriggerControlModel"> | ||
| <form-field :key="key" :desc="obj.desc" :desc-link="obj.descLink" :desc-link-text="obj.descLinkText" :required="obj.required" :label="obj.label" :is-error="errors.has(key)" :error-msg="errors.first(key)"> | ||
| <component | ||
| :is="obj.component" | ||
| :name="key" | ||
| :value="element[key]" | ||
| v-bind="obj"> | ||
| </component> | ||
| </form-field> | ||
| </template> | ||
| </div> | ||
| </accordion> | ||
| </form-field> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| import atomMixin from './atomMixin' | ||
| export default { | ||
| name: 'code-git-web-hook-trigger', | ||
| mixins: [atomMixin], | ||
| props: { | ||
| element: Object, | ||
| atomPropsModel: Object | ||
| }, | ||
| data () { | ||
| return { | ||
| customTriggerControlModel: {}, | ||
| enableThirdFilter: true, | ||
| customTriggerDocsLink: 'https://github.com/Tencent/bk-ci/issues/7743#issue-1391717634' | ||
| } | ||
| }, | ||
| watch: { | ||
| element: { | ||
| handler (val) { | ||
| if (this.element.repositoryType === 'NAME') { | ||
| this.atomPropsModel.repositoryName.hidden = false | ||
| this.atomPropsModel.repositoryHashId.hidden = true | ||
| } else { | ||
| this.atomPropsModel.repositoryName.hidden = true | ||
| this.atomPropsModel.repositoryHashId.hidden = false | ||
| } | ||
| }, | ||
| deep: true, | ||
| immediate: true | ||
| } | ||
| }, | ||
| created () { | ||
| this.customTriggerControlModel = {} | ||
|
There was a problem hiding this comment. 上面data的默认值就已经是空对象了，没必要再在这里初始化了 |
||
| const { thirdUrl, thirdSecretToken } = this.atomPropsModel | ||
| if (thirdUrl && thirdSecretToken) { | ||
| this.customTriggerControlModel.thirdUrl = thirdUrl | ||
| this.customTriggerControlModel.thirdSecretToken = thirdSecretToken | ||
| this.atomPropsModel.thirdUrl.hidden = true | ||
| this.atomPropsModel.thirdSecretToken.hidden = true | ||
| } | ||
| } | ||
| } | ||
| </script> | ||
|
|
||
| <style lang="scss" scoped> | ||
| .title-link { | ||
| cursor: pointer; | ||
| margin-left: 10px; | ||
| color: #3c96ff; | ||
| } | ||
| ::v-deep .bk-label, | ||
| ::v-deep .bk-form-content, | ||
| ::v-deep .bk-form-radio { | ||
| font-size: 12px !important; | ||
| } | ||
| </style> | ||
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,57 @@ | ||
| <template> | ||
| <div class="bk-form bk-form-vertical"> | ||
| <template v-for="(obj, key) in atomPropsModel"> | ||
| <form-field | ||
| v-if="!obj.hidden && rely(obj, element)" | ||
| :key="key" | ||
| :desc="obj.desc" | ||
| :desc-link="obj.descLink" | ||
| :desc-link-text="obj.descLinkText" | ||
| :required="obj.required" | ||
| :label="obj.label"> | ||
| <component | ||
| :disabled="true" | ||
| :is="obj.component || obj.type" | ||
| :name="key" | ||
| :value="element[key]" | ||
| v-bind="obj" | ||
| ></component> | ||
| </form-field> | ||
| </template> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| import atomMixin from './atomMixin' | ||
| export default { | ||
| name: 'normal-atom', | ||
| mixins: [atomMixin], | ||
| props: { | ||
| element: Object, | ||
| atomPropsModel: Object | ||
| }, | ||
| watch: { | ||
| element: { | ||
| handler () { | ||
| if (this.element.repositoryType === 'NAME') { | ||
| this.atomPropsModel.repositoryName.hidden = false | ||
| this.atomPropsModel.repositoryHashId.hidden = true | ||
| } else { | ||
| this.atomPropsModel.repositoryName.hidden = true | ||
| this.atomPropsModel.repositoryHashId.hidden = false | ||
| } | ||
| }, | ||
|
|
||
| deep: true, | ||
| immediate: true | ||
| } | ||
| } | ||
| } | ||
| </script> | ||
|
|
||
| <style lang="scss" scoped> | ||
| ::v-deep .bk-label, | ||
| ::v-deep .bk-form-content, | ||
| ::v-deep .bk-form-radio { | ||
| font-size: 12px !important; | ||
| } | ||
| </style> | ||
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,31 @@ | ||
| import AtomCheckbox from '../AtomFormField/AtomCheckbox' | ||
| import EnumInput from '../AtomFormField/EnumInput' | ||
| import FormField from '../AtomFormField/FormField' | ||
| import Selector from '../AtomFormField/Selector' | ||
| import VuexInput from '../AtomFormField/VuexInput' | ||
| import RequestSelector from '../AtomFormField/RequestSelector' | ||
| import StaffInput from '../AtomFormField/StaffInput' | ||
| import Accordion from '../AtomFormField/Accordion' | ||
| import Tips from '../AtomFormField/Tips' | ||
| import { rely } from './utils.js' | ||
|
|
||
| const atomMixin = { | ||
| components: { | ||
| FormField, | ||
| VuexInput, | ||
| EnumInput, | ||
| Selector, | ||
| RequestSelector, | ||
| AtomCheckbox, | ||
| StaffInput, | ||
| Accordion, | ||
| Tips | ||
| }, | ||
| methods: { | ||
| rely (obj, element) { | ||
| return rely(obj, element) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| export default atomMixin |
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,49 @@ | ||
| /** | ||
| * 判断两个数组是否有交集 | ||
| * @param {Array} arr1 | ||
| * @param {Array} arr2 | ||
| */ | ||
| export function hasIntersection (arr1, arr2) { | ||
| try { | ||
| return arr2.some(item => arr1.includes(item)) | ||
| } catch (e) { | ||
| return false | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * 根据插件字段rely配置决定是否显示 | ||
| * @param {Object} fieldProps 插件字段配置 | ||
| * @param {Object} values 插件表单值 | ||
| */ | ||
| export function rely (fieldProps, values) { | ||
| try { | ||
| const { rely: { expression = [], operation = 'AND' } } = fieldProps | ||
| const cb = item => { | ||
| const { key, value, regex } = item | ||
| if (Array.isArray(value)) { | ||
| if (Array.isArray(values[key])) { | ||
| return hasIntersection(value, values[key]) | ||
| } | ||
| return typeof values[key] !== 'undefined' && value.includes(values[key]) | ||
| } else if (regex) { | ||
| const reg = new RegExp(regex, 'i') | ||
| return Array.isArray(values[key]) ? values[key].some(item => reg.test(item)) : reg.test(values[key]) | ||
| } else { | ||
| return Array.isArray(values[key]) ? values[key].some(item => item === value) : values[key] === value | ||
| } | ||
| } | ||
| switch (operation) { | ||
| case 'AND': | ||
| return expression.every(cb) | ||
| case 'OR': | ||
| return expression.length > 0 ? expression.some(cb) : true | ||
| case 'NOT': | ||
| return expression.length > 0 ? !expression.some(cb) : true | ||
| default: | ||
| return true | ||
| } | ||
| } catch (e) { | ||
| return true | ||
| } | ||
| } |
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,130 @@ | ||
| <template> | ||
| <div :class="{ 'devops-accordion': true, 'is-danger': isError, 'showCheckbox': showCheckbox }"> | ||
| <header :active="isShow" @click="toggleContent" class="header"> | ||
| <i class="devops-icon icon-angle-right" /> | ||
| <slot name="header"></slot> | ||
| </header> | ||
| <transition name="slideLeft"> | ||
| <section v-if="condition"> | ||
| <section v-if="isShow" class="content"> | ||
| <slot name="content"></slot> | ||
| </section> | ||
| </section> | ||
| <section v-else> | ||
| <section v-show="isShow" class="content"> | ||
| <slot name="content"></slot> | ||
| </section> | ||
| </section> | ||
| </transition> | ||
| </div> | ||
| </template> | ||
|
|
||
| <script> | ||
| export default { | ||
| name: 'accordion', | ||
| props: { | ||
| afterToggle: Function, | ||
| showContent: { | ||
| type: Boolean, | ||
| default: false | ||
| }, | ||
| showCheckbox: { | ||
| type: Boolean, | ||
| default: false | ||
| }, | ||
| isError: { | ||
| type: Boolean, | ||
| default: false | ||
| }, | ||
| isVersion: { | ||
| type: Boolean, | ||
| default: false | ||
| }, | ||
| condition: { | ||
| type: Boolean, | ||
| default: false | ||
| } | ||
| }, | ||
| data () { | ||
| return { | ||
| isShow: this.showContent | ||
| } | ||
| }, | ||
| watch: { | ||
| showContent (val) { | ||
| this.isShow = val | ||
| } | ||
| }, | ||
| methods: { | ||
| toggleContent: function () { | ||
| if (this.isVersion) { | ||
| this.isShow = this.showContent ? !this.isShow : this.isShow | ||
| } else { | ||
| this.isShow = !this.isShow | ||
| } | ||
| if (typeof this.afterToggle === 'function') { | ||
| this.afterToggle(this.$el, this.isShow) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| </script> | ||
|
|
||
| <style lang="scss"> | ||
| @import '../../scss/conf.scss'; | ||
| .devops-accordion { | ||
| border: 1px solid $borderColor; | ||
| border-radius: 3px; | ||
| margin: 12px 0; | ||
| font-size: 12px; | ||
|
|
||
| &.is-danger { | ||
| color: $dangerColor; | ||
| border-color: $dangerColor; | ||
|
|
||
| .header { | ||
| color: $dangerColor; | ||
| } | ||
| } | ||
| .header { | ||
| display: flex; | ||
| color: $fontColor; | ||
| background-color: white; | ||
| padding: 10px 15px; | ||
| align-items: center; | ||
| cursor: pointer; | ||
|
|
||
| .icon-angle-right { | ||
| display: block; | ||
| margin: 2px 12px 0 0; | ||
| transition: all 0.3s ease; | ||
| } | ||
| &[active] { | ||
| .icon-angle-right { | ||
| transform: rotate(90deg) | ||
| } | ||
| } | ||
| } | ||
| .content { | ||
| padding: 10px 15px; | ||
| } | ||
|
|
||
| &.showCheckbox { | ||
| > .header { | ||
| background-color: $fontWeightColor; | ||
| color: white; | ||
| .devops-icon { | ||
| display: none; | ||
| } | ||
| .var-header { | ||
| width: 100%; | ||
| display: flex; | ||
| align-items: center; | ||
| justify-content: space-between; | ||
| } | ||
|
|
||
| } | ||
| } | ||
| } | ||
|
|
||
| </style> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这里的逻辑有点复杂了，可以简单一点，这里两个主要的关联就是this.element.repositoryType === 'NAME'
可以简化一下，例如：
const showName = this.element.repositoryType === 'NAME'
this.atomPropsModel.repositoryName.hidden = !showName
this.atomPropsModel.repositoryHashId.hidden = showName
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
已修改