Merge pull request #1238 from TencentBlueKing/develop

merge develop to master v1.1.5

.bk.production.env

@@ -38,3 +38,6 @@ BK_VISION_API_URL =
 
 // 跳转到bkvision平台的链接
 BK_VISION_WEB_URL =
+
+// bkaidev websocket服务host
+BK_AIDEV_WEBSOCKET_HOST = 

.gitignore

@@ -52,3 +52,6 @@ lib/server/project-template/bklesscode-proj*
 .codecc
 build.yml
 package-lock.json
+
+
+pre-*-bkcodeai

bkcodeai.json

@@ -0,0 +1,30 @@
+{
+  "crignore_file_patterns": [
+    "out/",
+    "dist/",
+    "assets/",
+    "images/",
+    "package.json",
+    "package-lock.json",
+    "yarn.lock",
+    ".env.*",
+    "*.env",
+    "*.map",
+    "*.yml",
+    "*.yaml",
+    "*.min.js",
+    "libs/",
+    "static/",
+    "doc/",
+    "docs/",
+    "*.mo",
+    "*.po",
+    "*.ini",
+    "*.toml",
+    "*.json",
+    "*.xml",
+    "*.lock",
+    "*.md",
+    "*.txt"
+  ]
+}

lib/client/src/App.vue

@@ -19,12 +19,15 @@
     </section>
     <section v-else-if="authed">
         <div id="app" :class="systemCls">
+            <notice-component :api-url="noticeUrl" @show-alert-change="showAlertChange" />
             <app-header></app-header>
-            <not-exist v-if="isNotExist" :message="notExistMsg" />
-            <template v-else>
-                <apply-page v-if="isNotPermission" :auth-result="authResult" />
-                <router-view v-if="!isNotPermission" :name="topView" v-show="!mainContentLoading" />
-            </template>
+            <div class="page-body" :style="{ height: bodyHeight }" >
+                <not-exist v-if="isNotExist" :message="notExistMsg" />
+                <template v-else>
+                    <apply-page v-if="isNotPermission" :auth-result="authResult" />
+                    <router-view v-if="!isNotPermission" :name="topView" v-show="!mainContentLoading" />
+                </template>
+            </div>   
         </div>
     </section>
 </template>
@@ -33,14 +36,18 @@
 
     import { bus } from './common/bus'
     import ApplyPage from './components/apply-permission/apply-page.vue'
+    import NoticeComponent from '@blueking/notice-component-vue2'
+    import '@blueking/notice-component-vue2/dist/style.css'
 
     export default {
         name: 'app',
         components: {
-            ApplyPage
+            ApplyPage,
+            NoticeComponent
         },
         data () {
             return {
+                noticeUrl: `${process.env.BK_AJAX_URL_PREFIX}/notice-center/getNoticeList`,
                 systemCls: 'mac',
                 position: 'middle',
                 navItems: [
@@ -74,9 +81,9 @@
         },
 
         computed: {
-            ...mapGetters(['mainContentLoading']),
+            ...mapGetters(['mainContentLoading', 'bodyHeight']),
             emptyPage () {
-                return this.$route.name === 'preview' || this.$route.name === 'previewTemplate' || this.$route.name === 'previewMobile'
+                return this.$route.name === 'preview' || this.$route.name === 'previewTemplate' || this.$route.name === 'previewMobile' || this.$route.meta?.navigation === 'empty'
             },
             authed () {
                 return this.$route.meta.authed
@@ -110,8 +117,11 @@
             this.$once('hook:beforeDestroy', () => {
                 bus.$off('not-exist', this.notExistHold)
             })
-            await this.$store.dispatch('checkIamNoResourcesPerm')
-            await this.$store.dispatch('ai/checkAiAvailable')
+            await Promise.all([
+                this.$store.dispatch('checkIamNoResourcesPerm'),
+                this.$store.dispatch('ai/checkAiAvailable'),
+                this.$store.dispatch('saasBackend/checkSaasAvailable')
+            ])
         },
 
         mounted () {
@@ -132,6 +142,10 @@
             notExistHold (msg) {
                 this.isNotExist = true
                 this.notExistMsg = msg
+            },
+
+            showAlertChange (isShow) {
+                this.$store.commit('updateShowAlertNotice', isShow)
             }
         }
     }
@@ -155,6 +169,10 @@
         @mixin scroller;
         font-size: 14px;
         color: #63656e;
+        .page-body {
+            position: relative;
+            overflow-y: hidden;
+        }
     }
 
     .mac {

lib/client/src/bk-icon/style.css

@@ -467,6 +467,9 @@ url("fonts/iconcool.eot?#iefix") format("embedded-opentype");
 .bk-drag-router:before {
 	content: "\e187";
 }
+.bk-drag-sync-pending:before {
+	content: "\e297";
+}
 .bk-drag-paste:before {
 	content: "\e248";
 }
@@ -1193,3 +1196,9 @@ url("fonts/iconcool.eot?#iefix") format("embedded-opentype");
 .bk-drag-saoba:before {
 	content: "\e294";
 }
+.bk-drag-quanquan:before {
+	content: "\e295";
+}
+.bk-drag-builder:before {
+	content: "\e298";
+}

lib/client/src/common/fully-import.js

@@ -16,19 +16,18 @@ import bkImage from '@/components/patch/image'
 import chart from '@/components/patch/chart'
 import widgetElTable from '@/components/patch/widget-el-table'
 import widgetBkVision from '@/components/patch/widget-bk-vision'
-import VueAwesomeSwiper from 'vue-awesome-swiper'
+
+// Swiper-Element注册函数
+import { register } from 'swiper/element/bundle'
+import SwiperAnimation from 'swiper-element-animation'
+import 'animate.css'
 
 // import style
 import 'bk-magic-vue/dist/bk-magic-vue.min.css'
-import 'swiper/css/swiper.css'
 import bkCharts from '@/components/patch/bkCharts'
 
-Vue.use(VueAwesomeSwiper, {
-    height: '800px',
-    pagination: {
-        el: '.swiper-pagination'
-    }
-})
+window.SwiperAnimation = SwiperAnimation
+window.swiperRegister = register
 
 Vue.use(bkText)
 Vue.use(bkImage)