Merge pull request #50 from hLinx/feature_3.3.5_new

feature: 全局变量支持批量编辑 #43
TencentBlueKing · Jul 6, 2021 · 68c356b · 68c356b
2 parents 2b8398e + 4248b9f
commit 68c356b
Show file tree

Hide file tree

Showing 52 changed files with 2,350 additions and 1,667 deletions.
diff --git a/src/frontend/package.json b/src/frontend/package.json
@@ -15,6 +15,7 @@
   "dependencies": {
     "@blueking/paas-login": "0.0.4",
     "@blueking/user-selector": "^1.0.6",
+    "@icon-cool/bk-icon-job": "0.0.3",
     "@vue/composition-api": "^1.0.0-beta.1",
     "ace-builds": "^1.4.12",
     "axios": "^0.21.1",

diff --git a/src/frontend/src/App.vue b/src/frontend/src/App.vue
@@ -235,8 +235,13 @@
              * @desc 退出登录
              */
             handleLogout () {
-                EventBus.$emit('logout');
-                LogoutService.logout();
+                this.$bkInfo({
+                    title: '确认退出登录？',
+                    confirmFn: () => {
+                        EventBus.$emit('logout');
+                        LogoutService.logout();
+                    },
+                });
             },
         },
     };

diff --git a/src/frontend/src/common/fully-import.js b/src/frontend/src/common/fully-import.js
@@ -40,6 +40,7 @@ import JbRouterView from '@components/jb-router-view';
 import JbForm from '@components/jb-form';
 import JbFormItem from '@components/jb-form/item';
 import JbInput from '@components/jb-input';
+import JbTextarea from '@components/jb-textarea';
 import JbPopoverConfirm from '@components/jb-popover-confirm';
 import JbSideslider from '@components/jb-sideslider';
 import JbDialog from '@components/jb-dialog';
@@ -82,6 +83,7 @@ Vue.component('JbRouterView', JbRouterView);
 Vue.component('JbForm', JbForm);
 Vue.component('JbFormItem', JbFormItem);
 Vue.component('JbInput', JbInput);
+Vue.component('JbTextarea', JbTextarea);
 Vue.component('JbPopoverConfirm', JbPopoverConfirm);
 Vue.component('JbSideslider', JbSideslider);
 Vue.component('JbDialog', JbDialog);