Merge pull request #2659 from TencentBlueKing/ft_renewal_notice

Ft renewal notice
TencentBlueKing · May 13, 2024 · 99040c5 · 99040c5
2 parents fe06807 + 44fde25
commit 99040c5
Show file tree

Hide file tree

Showing 79 changed files with 3,633 additions and 382 deletions.
diff --git a/frontend/package.json b/frontend/package.json
@@ -88,7 +88,7 @@
     "@babel/runtime": "~7.4.5",
     "@blueking/login-modal": "^1.0.0",
     "@blueking/notice-component-vue2": "^2.0.3",
-    "@blueking/user-selector": "^1.0.11",
+    "@blueking/user-selector": "^1.0.14",
     "@commitlint/cli": "~13.1.0",
     "@commitlint/config-conventional": "~13.1.0",
     "@icon-cool/bk-icon-bk-iam": "^0.0.3",

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -197,8 +197,11 @@
       //     window.location.reload();
       //   }, 0);
       // });
-      bus.$on('updatePoll', () => {
+      bus.$on('updatePoll', (payload) => {
         clearInterval(this.timer);
+        if (payload && payload.isStop) {
+          return;
+        }
         this.timer = setInterval(() => {
           this.fetchSyncStatus();
         }, 15000);
@@ -300,6 +303,7 @@
                 ? this.$t(`m.permTemplate['同步组织架构成功']`)
                 : this.$t(`m.permTemplate['同步组织架构失败']`)
             });
+            bus.$emit('on-sync-record-status');
           }
         } catch (e) {
           console.error(e);
@@ -367,7 +371,7 @@
 
     .views-layout {
         min-height: 100%;
-        min-width: 1120px;
+        /* min-width: 1120px; */
         padding: 24px;
     }
 

diff --git a/frontend/src/assets/iconfont/demo.html b/frontend/src/assets/iconfont/demo.html
@@ -405,6 +405,18 @@ <h2 class="page-title">
           <span class="icon iam-icon iamcenter-revoke"></span>
           <p class="icon-text">revoke</p>
         </li>
+        <li class="icon-item" title="qq">
+          <span class="icon iam-icon iamcenter-qq"></span>
+          <p class="icon-text">qq</p>
+        </li>
+        <li class="icon-item" title="qw">
+          <span class="icon iam-icon iamcenter-qw"></span>
+          <p class="icon-text">qw</p>
+        </li>
+        <li class="icon-item" title="wechat">
+          <span class="icon iam-icon iamcenter-wechat"></span>
+          <p class="icon-text">wechat</p>
+        </li>
         <li class="icon-item" title="user-directory">
           <span class="icon iam-icon iamcenter-user-directory"></span>
           <p class="icon-text">user-directory</p>
@@ -669,6 +681,22 @@ <h2 class="page-title">
           <span class="icon iam-icon iamcenter-renyuanmuban"></span>
           <p class="icon-text">renyuanmuban</p>
         </li>
+        <li class="icon-item" title="setting">
+          <span class="icon iam-icon iamcenter-setting"></span>
+          <p class="icon-text">setting</p>
+        </li>
+        <li class="icon-item" title="notification">
+          <span class="icon iam-icon iamcenter-notification"></span>
+          <p class="icon-text">notification</p>
+        </li>
+        <li class="icon-item" title="duanxin">
+          <span class="icon iam-icon iamcenter-duanxin"></span>
+          <p class="icon-text">duanxin</p>
+        </li>
+        <li class="icon-item" title="youjian">
+          <span class="icon iam-icon iamcenter-youjian"></span>
+          <p class="icon-text">youjian</p>
+        </li>
       </ul>
       <h3 class="describe-title">为什么使用</h3>
       <ul class="use-describe">
@@ -1118,6 +1146,24 @@ <h3 class="describe-title">如何使用</h3>
           </svg>
           <p class="icon-text">revoke</p>
         </li>
+        <li class="colorful-icon">
+          <svg class="icon svg-icon">
+            <use xlink:href="#iamcenter-qq"></use>
+          </svg>
+          <p class="icon-text">qq</p>
+        </li>
+        <li class="colorful-icon">
+          <svg class="icon svg-icon">
+            <use xlink:href="#iamcenter-qw"></use>
+          </svg>
+          <p class="icon-text">qw</p>
+        </li>
+        <li class="colorful-icon">
+          <svg class="icon svg-icon">
+            <use xlink:href="#iamcenter-wechat"></use>
+          </svg>
+          <p class="icon-text">wechat</p>
+        </li>
         <li class="colorful-icon">
           <svg class="icon svg-icon">
             <use xlink:href="#iamcenter-user-directory"></use>
@@ -1514,6 +1560,30 @@ <h3 class="describe-title">如何使用</h3>
           </svg>
           <p class="icon-text">renyuanmuban</p>
         </li>
+        <li class="colorful-icon">
+          <svg class="icon svg-icon">
+            <use xlink:href="#iamcenter-setting"></use>
+          </svg>
+          <p class="icon-text">setting</p>
+        </li>
+        <li class="colorful-icon">
+          <svg class="icon svg-icon">
+            <use xlink:href="#iamcenter-notification"></use>
+          </svg>
+          <p class="icon-text">notification</p>
+        </li>
+        <li class="colorful-icon">
+          <svg class="icon svg-icon">
+            <use xlink:href="#iamcenter-duanxin"></use>
+          </svg>
+          <p class="icon-text">duanxin</p>
+        </li>
+        <li class="colorful-icon">
+          <svg class="icon svg-icon">
+            <use xlink:href="#iamcenter-youjian"></use>
+          </svg>
+          <p class="icon-text">youjian</p>
+        </li>
       </ul>
       <h3 class="describe-title">为什么使用</h3>
       <ul class="use-describe">

diff --git a/frontend/src/assets/iconfont/fonts/iconcool.eot b/frontend/src/assets/iconfont/fonts/iconcool.eot