Merge pull request #7531 from normal-wls/feat_7.2_new_version_hb

master 代码同步 & release 3.33.2

Author: normal-wls

app.yml

@@ -6,7 +6,7 @@ is_use_celery: True
 author: 蓝鲸智云
 introduction: 标准运维是通过一套成熟稳定的任务调度引擎，把在多系统间的工作整合到一个流程，助力运维实现跨系统调度自动化的SaaS应用。
 introduction_en: SOPS is a SaaS application that utilizes a set of mature and stable task scheduling engines to help realize cross-system scheduling automation, and integrates the work among multiple systems into a single process.
-version: 3.33.1
+version: 3.33.2
 category: 运维工具
 language_support: 中文
 desktop:

app_desc.yaml

@@ -1,5 +1,5 @@
 spec_version: 2
-app_version: "3.33.1"
+app_version: "3.33.2"
 app:
     region: default
     bk_app_code: bk_sops

config/default.py

@@ -214,7 +214,7 @@
 # mako模板中：<script src="/a.js?v=${ STATIC_VERSION }"></script>
 # 如果静态资源修改了以后，上线前改这个版本号即可
 
-STATIC_VERSION = "3.33.1"
+STATIC_VERSION = "3.33.2"
 DEPLOY_DATETIME = datetime.datetime.now().strftime("%Y%m%d%H%M%S")
 
 STATICFILES_DIRS = [os.path.join(BASE_DIR, "static")]

env_v3.py

@@ -56,7 +56,8 @@
 # 兼容没有部署 GSEKIT 的情况
 BK_GSE_KIT_PAGE_URL_TEMPLATE = os.getenv(
     "BK_GSEKIT_PAGE_URL_TEMPLATE",
-    BK_SAAS_HOSTS["bk_gsekit"][BKSAAS_DEFAULT_MODULE_NAME] + "/task-history/detail/{job_id}?biz={bk_biz_id}",
+    str(BK_SAAS_HOSTS["bk_gsekit"][BKSAAS_DEFAULT_MODULE_NAME]).rstrip("/")
+    + "/task-history/detail/{job_id}?biz={bk_biz_id}",
 )
 
 # 用户管理配置

frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIp.vue

@@ -42,8 +42,8 @@
                         @focus="onStaticIpFocus"
                         @search="onStaticIpSearch">
                     </ip-search-input>
+                    <span v-if="isUnfold" @click="isUnfold = false" class="return-text">{{ $t('返回') }}</span>
                 </template>
-                <span v-if="isUnfold" @click="isUnfold = false" class="return-text">{{ $t('返回') }}</span>
             </div>
             <div class="selected-ip-table-wrap">
                 <IpSelectorTable

frontend/desktop/src/components/layout/Navigation.vue

@@ -171,7 +171,8 @@
                 'loadUserProjectList'
             ]),
             ...mapMutations('project', [
-                'setProjectId'
+                'setProjectId',
+                'setUserProjectList'
             ]),
             setNavigationTitle (route) {
                 const nav = this.findCurrentNav(route)
@@ -243,9 +244,10 @@
                     const routeInfo = this.routerList[groupIndex][routeIndex]
                     // 如果没有项目列表，切换路由时则去拉取用户项目列表
                     if (!this.projectList.length && (routeInfo.hasProjectId || routeInfo.id === 'home')) {
-                        await this.loadUserProjectList({
+                        const resp = await this.loadUserProjectList({
                             params: { is_disable: false }
                         })
+                        this.setUserProjectList(resp.results)
                         if (this.projectList.length && !this.project_id) {
                             const projectId = this.projectList[0].id
                             this.setProjectId(projectId)

frontend/desktop/src/components/layout/NavigatorHeadRight.vue

@@ -142,9 +142,10 @@
         async created () {
             this.curLanguage = getCookie('blueking_language') === 'en' ? 'english' : 'chinese'
             if (this.view_mode !== 'appmaker') {
-                await this.loadUserProjectList({
+                const resp = await this.loadUserProjectList({
                     params: { is_disable: false }
                 })
+                this.setUserProjectList(resp.results)
                 if (this.projectList.length && !this.project_id) {
                     const projectId = this.projectList[0].id
                     this.setProjectId(projectId)
@@ -163,7 +164,8 @@
                 'loadUserProjectList'
             ]),
             ...mapMutations('project', [
-                'setProjectId'
+                'setProjectId',
+                'setUserProjectList'
             ]),
             async toggleLanguage (language) {
                 this.curLanguage = language

frontend/desktop/src/store/modules/project.js

@@ -64,7 +64,6 @@ const project = {
             return axios.get(`api/v3/user_project/`, { params, ...config }).then((response) => {
                 // 不传limit代表拉取全量列表
                 if (!('limit' in params)) { // 拉全量项目时更新项目列表，区分项目管理页面的分页数据
-                    commit('setUserProjectList', response.data.data)
                     return { results: response.data.data }
                 }
                 return response.data.data

gcloud/conf/default_settings.py

@@ -17,7 +17,7 @@
 import env
 from packages.blueking.component.shortcuts import get_client_by_request, get_client_by_user
 
-RUN_VER_NAME = _("腾讯蓝鲸智云")
+RUN_VER_NAME = _("蓝鲸智云")
 
 ESB_GET_CLIENT_BY_REQUEST = get_client_by_request
 ESB_GET_CLIENT_BY_USER = get_client_by_user

gcloud/tasktmpl3/apis/drf/viewsets/batch_form_with_schemes.py

@@ -11,29 +11,26 @@
 specific lan
 """
 
-import logging
 import itertools
+import logging
 
-from rest_framework.views import APIView
-from rest_framework.decorators import action
+from django.utils.translation import ugettext_lazy as _
+from drf_yasg.utils import swagger_auto_schema
+from pipeline.models import TemplateScheme
 from rest_framework import permissions
+from rest_framework.decorators import action
 from rest_framework.response import Response
+from rest_framework.views import APIView
 
-from pipeline.models import TemplateScheme
-
-from gcloud.constants import PROJECT
-from gcloud.tasktmpl3.models import TaskTemplate
 from gcloud.common_template.models import CommonTemplate
+from gcloud.constants import PROJECT
+from gcloud.tasktmpl3.apis.drf.permissions import BatchTemplateFormWithSchemesPermissions
 from gcloud.tasktmpl3.apis.drf.serilaziers.batch_form_with_schemes import (
-    BatchTemplateFormWithSchemesSerializer,
     BatchTemplateFormResponseSerializer,
+    BatchTemplateFormWithSchemesSerializer,
 )
-from gcloud.tasktmpl3.apis.drf.permissions import BatchTemplateFormWithSchemesPermissions
-
-from drf_yasg.utils import swagger_auto_schema
-
+from gcloud.tasktmpl3.models import TaskTemplate
 from pipeline_web.preview import preview_template_tree_with_schemes
-from django.utils.translation import ugettext_lazy as _
 
 logger = logging.getLogger("root")
 
@@ -59,9 +56,12 @@ def post(self, request):
         template_data = {}
         project_template_ids = []
         common_template_ids = []
+        scheme_id_list = []
         for template in template_list:
             template_id = template["id"]
-            template_data[template_id] = template
+            template_data[template_id] = template_data.get(template_id, {})
+            template_data[template_id][template["version"]] = template
+            scheme_id_list.extend(template["scheme_id_list"])
             if template["template_source"] == PROJECT:
                 project_template_ids.append(template_id)
             else:
@@ -83,6 +83,11 @@ def post(self, request):
         pipeline_template_ids = []
         for template in queryset:
             template_dict[template.id] = template
+            template_data[template.id][template.version] = {
+                "id": template.id,
+                "version": template.version,
+                "scheme_id_list": scheme_id_list,
+            }
             pipeline_template_ids.append(template.pipeline_template.id)
 
         # 获取各流程对应的执行方案列表
@@ -102,15 +107,11 @@ def post(self, request):
             data[template_id] = []
             # 每个模板要获取当前版本的和最新版本的表单数据
             # 两次获取数据只有模版版本不同，使用for循环减少重复逻辑,使用is_current标识是否是当前版本的表单数据
-            for index in range(2):
-                if index == 0:
-                    version = template.version
+            for version, temp in template_data[template_id].items():
+                is_current = False
+                if version == template.version:
                     is_current = True
-                else:
-                    version = template_data[template_id]["version"]
-                    is_current = False
-
-                scheme_id_list = template_data[template_id]["scheme_id_list"]
+                scheme_id_list = temp["scheme_id_list"]
                 try:
                     preview_data = preview_template_tree_with_schemes(template, version, scheme_id_list)
                 except Exception as e: