feature: 流程模版编辑增加新建任务按钮；职能化中心列表、审计中心列表增加高级搜索功能 #123 #125 (#124)

* feature: 流程模版编辑增加新建任务按钮 * feature:职能化中心列表、审计中心列表增加高级搜索功能 #125
TencentBlueKing · Apr 14, 2019 · 8c025e4 · 8c025e4
1 parent f30d2ac
commit 8c025e4
Show file tree

Hide file tree

Showing 5 changed files with 498 additions and 112 deletions.
diff --git a/pipeline/blueflow/src/components/common/PipelineCanvas/ConfigBar.vue b/pipeline/blueflow/src/components/common/PipelineCanvas/ConfigBar.vue
@@ -42,15 +42,15 @@
                 type="primary"
                 class="save-canvas"
                 :loading="templateSaving"
-                @click="onSaveTemplate">
+                @click="onSaveTemplate(false)">
                 {{ i18n.save }}
             </bk-button>
             <bk-button
                 type="primary"
                 class="task-btn"
                 :loading="createTaskSaving"
                 @click="onSaveTemplate(true)">
-                {{ isSaveAndCreate ? i18n.saveTplAndcreateTask : i18n.addTask }}
+                {{ isTemplateDataChanged ? i18n.saveTplAndcreateTask : i18n.addTask }}
             </bk-button>
             <router-link class="bk-button bk-button-default" :to="getHomeUrl()">{{ i18n.return }}</router-link>
         </div>
@@ -59,6 +59,7 @@
 <script>
 import '@/utils/i18n.js'
 import { Validator } from 'vee-validate'
+import { mapMutations } from 'vuex'
 import { NAME_REG, STRING_LENGTH } from '@/constants/index.js'
 import BaseInput from '@/components/common/base/BaseInput.vue'
 
@@ -67,16 +68,15 @@ export default {
     components: {
         BaseInput
     },
-    props: [
-        'name', 'cc_id', 'template_id', 'common', 'type',
-        'templateSaving', 'createTaskSaving', 'isTemplateDataChanged'
-    ],
+    props: ['name', 'cc_id', 'template_id', 'common', 'templateSaving', 'createTaskSaving', 'isTemplateDataChanged'],
     data () {
         return {
             i18n: {
                 placeholder: gettext('请输入名称'),
                 NewProcess: gettext('新建流程'),
                 editProcess: gettext('编辑流程'),
+                addTask: gettext('新建任务'),
+                saveTplAndcreateTask: gettext('保存并新建任务'),
                 save: gettext("保存"),
                 return: gettext("返回")
             },
@@ -97,24 +97,26 @@ export default {
     computed: {
         templateTitle () {
             return this.$route.query.template_id === undefined ? this.i18n.NewProcess : this.i18n.editProcess
-        },
-        isSaveAndCreate () {
-            return this.type === 'new' || this.isTemplateDataChanged
         }
     },
     methods: {
+        ...mapMutations('template/', [
+            'setTemplateName'
+        ]),
         onInputName (val) {
             this.$emit('onChangeName', val)
         },
-        onSaveTemplate (saveCreateBtn = false) {
-            if (saveCreateBtn && !this.isSaveAndCreate) {
-                this.$router.push(this.getTaskUrl())
-                return
-            }
+        onSaveTemplate (saveAndCreate = false) {
             this.$validator.validateAll().then((result) => {
+                if (!result) return
                 this.tName = this.tName.trim()
                 this.setTemplateName(this.tName)
-                this.$emit('onSaveTemplate', saveCreateBtn)
+                if (saveAndCreate && !this.isTemplateDataChanged) {
+                    const taskUrl = this.getTaskUrl()
+                    this.$router.push(taskUrl)
+                } else {
+                    this.$emit('onSaveTemplate', saveAndCreate)
+                }
             })
         },
         getHomeUrl () {
@@ -152,6 +154,7 @@ export default {
 <style lang="scss" scoped>
 @import '@/scss/config.scss';
 .config-wrapper {
+    position: relative;
     height: 60px;
     background: #f4f7fa;
     border-bottom: 1px solid $commonBorderColor;
@@ -223,8 +226,9 @@ export default {
         }
     }
     .canvas-operation-wrapper {
-        float: right;
-        margin: 14px 20px 0 0;
+        position: absolute;
+        top: 14px;
+        right: 20px;
         .save-canvas {
             width: 90px;
             height: 32px;
@@ -237,7 +241,11 @@ export default {
             line-height: 32px;
             margin-left: 10px;
         }
+        .bk-button.bk-primary {
+            height: 32px;
+            line-height: 32px;
+            margin-left: 10px;
+        }
     }
 }
 </style>
-
diff --git a/pipeline/blueflow/src/components/common/PipelineCanvas/index.vue b/pipeline/blueflow/src/components/common/PipelineCanvas/index.vue
@@ -20,9 +20,9 @@
             :cc_id="cc_id"
             :common="common"
             :template_id="template_id"
-            :type="type"
             :isTemplateDataChanged="isTemplateDataChanged"
             :templateSaving="templateSaving"
+            :createTaskSaving="createTaskSaving"
             @onChangeName="onChangeName"
             @onSaveTemplate="onSaveTemplate">
         </ConfigBar>
@@ -132,30 +132,20 @@ export default {
             type: Boolean
         },
         subAtomListLoading: {
-            type: Boolean,
-            default: true
-        },
-        type: {
-            type: String,
-            default: ''
+            type: Boolean
         },
         templateSaving: {
-            type: Boolean,
-            default: false
+            type: Boolean
         },
         createTaskSaving: {
-            type: Boolean,
-            default: false
+            type: Boolean
         },
         atomTypeList: {
             type: Object,
             required: false
         },
         searchAtomResult: {
-            type: Array,
-            default () {
-                return []
-            }
+            type: Array
         },
         canvasData: {
             type: Object,
@@ -174,37 +164,32 @@ export default {
             type: String,
             required: false
         },
+        template_id: {
+            type: String,
+            required: false
+        },
         common: {
             type: String,
             required: false
         },
+        isTemplateDataChanged: {
+            type: Boolean
+        },
         isSelectNode: {
             type: Boolean,
-            required: false,
-            default () {
-                return false
-            }
+            default: false
         },
         selectNodeType: {
             type: Boolean,
-            required: false,
-            default () {
-                return false
-            }
+            default: false
         },
         isPreviewMode: {
             type: Boolean,
-            required: false,
-            default () {
-                return false
-            }
+            default: false
         },
         isSelectAllNode: {
             type: Boolean,
-            required: false,
-            default () {
-                return false
-            }
+            default: false
         }
     },
     components: {
@@ -224,7 +209,7 @@ export default {
                 choiceAll: gettext('全选'),
                 cancelChoiceAll: gettext('反选'),
                 added: gettext('已添加'),
-                node: gettext('个节点')
+                node: gettext('个任务节点')
             },
             zoomRadio: 1,
             nodeTypeUniqueInCanvas: ['startpoint', 'endpoint'],
@@ -538,7 +523,7 @@ export default {
         onChangeName (name) {
             this.$emit('onChangeName', name)
         },
-        onSaveTemplate (saveCreateBtn) {
+        onSaveTemplate (saveAndCreate) {
             const validateMessage = validatePipeline.isDataValid(this.canvasData)
             if (!validateMessage.result) {
                 this.$bkMessage({
@@ -547,7 +532,7 @@ export default {
                 })
                 return false
             }
-            this.$emit('onSaveTemplate', saveCreateBtn)
+            this.$emit('onSaveTemplate', saveAndCreate)
         },
         onNewDraft (message) {
             this.$emit('onNewDraft', message)
@@ -697,5 +682,3 @@ export default {
     }
 }
 </style>
-
-