feat: pipeline as code issue TencentBlueKing#8125

lockiechen · Aug 11, 2023 · 30fbe88 · 30fbe88
1 parent 5d6dc67
commit 30fbe88
Show file tree

Hide file tree

Showing 22 changed files with 813 additions and 202 deletions.
diff --git a/src/frontend/devops-pipeline/package.json b/src/frontend/devops-pipeline/package.json
@@ -23,8 +23,8 @@
         "clipboard": "^1.7.1",
         "moment": "^2.29.2",
         "js-base64": "^3.7.2",
-        "monaco-editor": "^0.30.1",
-        "monaco-editor-webpack-plugin": "^6.0.0",
+        "monaco-editor": "^0.40.0",
+        "monaco-editor-webpack-plugin": "^7.1.0",
         "portal-vue": "^1.5.1",
         "sockjs-client": "^1.3.0",
         "stompjs": "^2.3.3",

diff --git a/src/frontend/devops-pipeline/src/components/BuildHistoryTable/FilterBar.vue b/src/frontend/devops-pipeline/src/components/BuildHistoryTable/FilterBar.vue
@@ -1,13 +1,10 @@
 <template>
     <div class="build-history-filter-bar">
-        <time-picker
-            style="width: 320px"
-            name="dateTimeRange"
-            id="dateTimeRange"
+        <bk-date-picker
             :value="historyPageStatus.dateTimeRange"
-            :date-picker-conf="datePickerConf"
-            :handle-change="handleDateRangeChange"
             :placeholder="$t('startTimeRangePlaceholder')"
+            type="datetimerange"
+            @change="(...args) => handleDateRangeChange('dateTimeRange', ...args)"
         />
         <search-select
             class="pipeline-history-search-select"
@@ -21,7 +18,6 @@
 </template>
 
 <script>
-    import TimePicker from '@/components/AtomFormComponent/TimePicker'
     import SearchSelect from '@blueking/search-select'
     import { PROCESS_API_URL_PREFIX } from '@/store/constants'
     import { coverStrTimer } from '@/utils/util'
@@ -33,8 +29,7 @@
     export default {
         name: 'filter-bar',
         components: {
-            SearchSelect,
-            TimePicker
+            SearchSelect
         },
         props: {
             resetQueryCondition: Function

diff --git a/src/frontend/devops-pipeline/src/components/BuildHistoryTable/index.vue b/src/frontend/devops-pipeline/src/components/BuildHistoryTable/index.vue
@@ -11,8 +11,9 @@
             <div class="no-build-history-box">
                 <span>{{ $t('noBuildHistory') }}</span>
                 <div class="no-build-history-box-tip">
-                    <p v-html="$t('noBuildHistoryTips')"></p>
-                    <span>
+                    <p v-if="canManualStartup">{{ $t('noBuildHistoryTips')}}</p>
+                    <p>{{ $t('buildHistoryIdTips') }}</p>
+                    <span v-if="canManualStartup">
                         <bk-button @click="buildNow" theme="primary" size="large">
                             {{$t('buildNow')}}
                         </bk-button>
@@ -453,6 +454,7 @@
         },
         computed: {
             ...mapGetters({
+                curPipeline: 'pipelines/getCurPipeline',
                 historyPageStatus: 'pipelines/getHistoryPageStatus'
             }),
             projectId () {
@@ -464,6 +466,9 @@
             isQuerying () {
                 return this.historyPageStatus?.isQuerying ?? false
             },
+            canManualStartup () {
+                return this.curPipeline?.canManualStartup ?? true
+            },
             versionToolTipsConf () {
                 return {
                     allowHtml: true,

diff --git a/src/frontend/devops-pipeline/src/components/Outputs/ArtifactsList.vue b/src/frontend/devops-pipeline/src/components/Outputs/ArtifactsList.vue
@@ -105,6 +105,7 @@
             }
         }
         .pipeline-exec-sub-artifact-list {
+
             .pipeline-exec-sub-sub-artifact-list {
                 display: grid;
                 grid-auto-flow: column;

diff --git a/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BuildHistoryTab.vue b/src/frontend/devops-pipeline/src/components/PipelineDetailTabs/BuildHistoryTab.vue
@@ -38,9 +38,6 @@
             ...mapState('atom', [
                 'isPropertyPanelVisible'
             ]),
-            scrollBoxCls () {
-                return 'bkdevops-pipeline-history'
-            },
             projectId () {
                 return this.$route.params.projectId
             },