feat(3rd-app): add: 3rd-app(tpapp) support visiable labels

TencentBlueKing · Nov 22, 2021 · c213cdc · c213cdc
1 parent ee0477e
commit c213cdc
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 1 deletion.
diff --git a/paas2/VERSION b/paas2/VERSION
@@ -1 +1 @@
-2.13.15
+2.13.16
diff --git a/paas2/paas/templates/tpapp/info.html b/paas2/paas/templates/tpapp/info.html
@@ -2,6 +2,42 @@
 
 <%block name="right_content">
     <link rel="stylesheet" type="text/css" href="${STATIC_URL}css/paas_app.${CSS_SUFFIX}?v=${STATIC_VERSION}">
+    <link rel="stylesheet" type="text/css" href="${STATIC_URL}css/paas_app_visiable.${CSS_SUFFIX}?v=${STATIC_VERSION}">
+    <link rel="stylesheet" type="text/css" href="${STATIC_URL}assets/components_vue/bk-magic-vue.css?v=${STATIC_VERSION}">
+    <style>
+    [v-cloak] { display: none }
+    .bk-dialog [class*=" icon-"], .bk-dialog [class^=icon-] {
+      background-image: none;
+      width: auto;
+    }
+    .bk-infinite-tree .node-radio .node-checkbox.is-checked:after,
+    .bk-infinite-list .node-checkbox.is-checked:after {
+      left: 5px;
+      top: 2px;
+    }
+    .bk-infinite-tree .arrow-icon {
+      margin-right: 3px;
+      top: 0;
+    }
+    .bk-infinite-list .user-content .user-icon {
+      top: 0;
+      margin-right: 5px;
+    }
+    .bk-infinite-tree .node-icon {
+      top: -1px;
+      margin-right: 5px;
+      margin-left: 2px;
+    }
+    .bk-add-member-dialog .add-member-content-wrapper .right .content .user-content .user-icon {
+      top: 0;
+      margin-right: 5px;
+    }
+    .bk-add-member-dialog .add-member-content-wrapper .right .content .organization-content .folder-icon {
+      top: 0;
+      margin-right: 5px;
+    }
+    </style>
+
         <div class="ml50 app-info">
             <div class="t_b mb10">${_(u'注册信息')}
             </div>
@@ -98,6 +134,40 @@
                 </div>
             </div>
 
+            % if EDITION == "ee":
+            <div class="row mt5 chmt">
+                <div class="col-sm-10 col-xs-10" style="width:100%">
+                    <div class="row" >
+                        <div class="col-sm-2 col-xs-2">
+                            <div><font class="t_grey"> ${_(u'可见范围')}：</font></div>
+                        </div>
+                        <div class="col-sm-8 col-xs-8" style="margin-left: -94px;">
+                          <div id="app">
+                                <div class="selected-text" ref="selectedText" style="font-size: 14px; margin-bottom: 10px;">--</div>
+                                <div class="item">
+                                <bk-button type="default" @click="handleChoose" size="small">${_(u'选择组织/人员')}</bk-button>
+                                </div>
+
+                                <bk-user-selector
+                                    :show="isShow"
+                                    :users="users"
+                                    :departments="departments"
+                                    api-host="${app_info.get('paas_host')}"
+                                    @submit="handleSubmit"
+                                    @cancel="handleCancel">
+                                </bk-user-selector>
+                                <div id="#error_tip"></div>
+                          </div>
+                        </div>
+                        <div class="col-sm-2 col-xs-2">
+                            <div id="tip_developer" style="color: #f00;" class="app-info-tips"></div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            % endif
+
+
         </div>
         <hr/>
         <div class="ml50 app-info">
@@ -171,8 +241,15 @@
 
 <script src="${STATIC_URL}js/paas_release.${JS_SUFFIX}"></script>
 <script src="${STATIC_URL}js/paas_app.${JS_SUFFIX}"></script>
+<script src="${STATIC_URL}js/paas_app_visiable.${JS_SUFFIX}?v=${STATIC_VERSION}"></script>
+<script src="${STATIC_URL}assets/vue/vue-2.5.22.${JS_SUFFIX}?v=${STATIC_VERSION}"></script>
+<script src="${STATIC_URL}assets/components_vue/bk-magic-vue.min.js?v=${STATIC_VERSION}"></script>
+<script src="${STATIC_URL}assets/components_vue/bk-user-selector.umd.js?v=${STATIC_VERSION}"></script>
 <script type="text/javascript">
     $(function(){
         APP_INFO.get_tpapp_access_info('${app_code}');
+
+        var data = JSON.parse('${app_info.get("visiable_labels", "[]")}');
+        APP_VISIABLE.init('${app_code}', data);
     })
 </script>
diff --git a/paas2/paas/tpapp/views.py b/paas2/paas/tpapp/views.py
@@ -23,6 +23,7 @@
 from app.constants import AppStateEnum, OPENMODE_CHOICES, OPENMODE_DICT
 from app.models import App, AppTags
 from app.validators import validate_app_code, validate_app_name, validate_external_url, validate_app_tags
+from app.utils import parse_app_visiable_labels
 from common.decorators import app_exists, has_app_develop_permission
 from common.log import logger
 from common.mymako import render_mako_context, render_json, render_mako_tostring_context
@@ -193,6 +194,7 @@ def info(request, app_code):
         "external_url": app.external_url,
         "open_mode": app.open_mode,
         "open_mode_name": _(OPENMODE_DICT.get(app.open_mode)) or "",
+        "visiable_labels": parse_app_visiable_labels(app.visiable_labels),
     }
     return render_mako_context(
         request,

diff --git a/paas2/release.md b/paas2/release.md
@@ -1,5 +1,8 @@
 Release Log
 ===============================
+# 2.13.16
+    - add: 3rd-app(tpapp) support visiable labels
+
 # 2.13.15
     - update: esb update monitor_v3, nodeman confapis