From 8e24089997cc5a9537901e5c5ca65e2d16503ab2 Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Tue, 21 May 2024 15:26:42 +0800 Subject: [PATCH 01/43] =?UTF-8?q?feature:=20=E6=94=AF=E6=8C=81=E9=80=9A?= =?UTF-8?q?=E8=BF=87npm=E9=9B=86=E6=88=90=E7=BB=9F=E4=B8=80iframe=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/package.json | 1 + frontend/src/IframeEntry.vue | 418 ++++++++++++++++++ frontend/src/common/util.js | 11 + frontend/src/main.js | 20 +- frontend/src/router/ce.js | 32 +- frontend/src/router/ee.js | 34 +- frontend/src/router/ieod.js | 33 +- frontend/src/router/index.js | 9 +- frontend/src/store/index.js | 4 +- .../secondary-manage-space/create/index.vue | 2 +- .../secondary-manage-space/edit/index.vue | 0 11 files changed, 503 insertions(+), 61 deletions(-) create mode 100644 frontend/src/IframeEntry.vue delete mode 100644 frontend/src/views/manage-spaces/secondary-manage-space/edit/index.vue diff --git a/frontend/package.json b/frontend/package.json index 3c6ea806d..094e6e565 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -88,6 +88,7 @@ "@babel/runtime": "~7.4.5", "@blueking/login-modal": "^1.0.0", "@blueking/notice-component-vue2": "^2.0.3", + "@blueking/sub-saas": "0.0.0-beta.7", "@blueking/user-selector": "^1.0.14", "@commitlint/cli": "~13.1.0", "@commitlint/config-conventional": "~13.1.0", diff --git a/frontend/src/IframeEntry.vue b/frontend/src/IframeEntry.vue new file mode 100644 index 000000000..25a4c56fc --- /dev/null +++ b/frontend/src/IframeEntry.vue @@ -0,0 +1,418 @@ + + + + + diff --git a/frontend/src/common/util.js b/frontend/src/common/util.js index 79856c893..3750aeb62 100644 --- a/frontend/src/common/util.js +++ b/frontend/src/common/util.js @@ -26,6 +26,7 @@ import il8n from '@/language'; import { messageWarn, messageSuccess } from '@/common/bkmagic'; +import { rootPath } from '@blueking/sub-saas/dist/main.js'; /** * 函数柯里化 @@ -780,3 +781,13 @@ export function getCopyValue (value) { } messageSuccess(il8n('common', '复制成功')); } + +/** + * 复制传入的字符集 + * @param {subPath} value 传入的路径 + * @return {values} 返回根路径拼接当前路径 + */ +export const getRoutePath = (subPath) => { + const path = subPath.startsWith('/') ? subPath.slice(1) : subPath; + return rootPath ? `${rootPath}${path}` : path; +}; diff --git a/frontend/src/main.js b/frontend/src/main.js index d48fb04d3..1c3f14580 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -28,14 +28,13 @@ import './public-path'; import '../static/lib.bundle.js'; import Vue from 'vue'; import App from './App.vue'; -import router from './router'; +import IframeEntry from './IframeEntry.vue'; +import router from './router/index'; import store from './store'; -import { injectCSRFTokenToHeaders } from './api'; import auth from './common/auth'; import Img403 from './images/403.png'; import Svg403 from './images/403.svg'; import Exception from './components/exception/index.vue'; -import { bus } from './common/bus'; import AuthComponent from './components/auth/index.vue'; import iamFormItem from './components/iam-form/item.vue'; import SmartAction from './components/smart-action/index.vue'; @@ -48,7 +47,10 @@ import RenderSearch from './components/render-search/index.vue'; import Icon from './components/icon'; import VueI18n from 'vue-i18n'; import magicbox from 'bk-magic-vue'; +import { subEnv } from '@blueking/sub-saas/dist/main.js'; import { language, il8n as il8nNew } from './language'; +import { bus } from './common/bus'; +import { injectCSRFTokenToHeaders } from './api'; import './common/bkmagic'; // 全量引入自定义图标 import './assets/iconfont/style.css'; @@ -128,7 +130,6 @@ Vue.mixin(locale.mixin); if (NODE_ENV === 'development') { Vue.config.devtools = true; } - auth.requestCurrentUser().then(user => { injectCSRFTokenToHeaders(); if (!user.isAuthenticated) { @@ -140,10 +141,13 @@ auth.requestCurrentUser().then(user => { i18n, router, store, - components: { - App - }, - template: '' + // components: { + // App + // }, + // template: '' + render () { + return !subEnv ? : ; + } }); if (NODE_ENV === 'development') { window.__VUE_DEVTOOLS_GLOBAL_HOOK__.Vue = global.mainComponent.constructor; diff --git a/frontend/src/router/ce.js b/frontend/src/router/ce.js index 4954e143c..3fc613d0e 100644 --- a/frontend/src/router/ce.js +++ b/frontend/src/router/ce.js @@ -25,8 +25,10 @@ */ import il8n from '@/language'; +import { rootPath } from '@blueking/sub-saas/dist/main.js'; +import { getRoutePath } from '@/common/util'; -const SITE_URL = window.SITE_URL; +// const SITE_URL = window.SITE_URL; // 系统接入 const SystemAccess = () => import(/* webpackChunkName: 'system-access' */ '../views/system-access'); @@ -152,8 +154,8 @@ const SecondaryManageSpaceCreate = () => import(/* webpackChunkName: 'grading-admin' */ '../views/manage-spaces/secondary-manage-space/create'); // 二极管理空间编辑 -const SecondaryManageSpaceEdit = () => - import(/* webpackChunkName: 'grading-admin' */ '../views/manage-spaces/secondary-manage-space/Edit'); +// const SecondaryManageSpaceEdit = () => +// import(/* webpackChunkName: 'grading-admin' */ '../views/manage-spaces/secondary-manage-space/Edit'); // 二极管理空间详情 const SecondaryManageSpaceDetail = () => @@ -218,7 +220,7 @@ const MainEntry = () => import(/* webpackChunkName: 'index' */ '../views'); export const routes = [ { - path: SITE_URL, + path: rootPath, name: 'iamMain', component: MainEntry, children: [ @@ -421,15 +423,15 @@ export const routes = [ props: true, component: SecondaryManageSpaceCreate }, - { - path: ':id/manage-spaces/secondary-manage-space/edit', - name: 'secondaryManageSpaceEdit', - meta: { - backRouter: -1 - }, - props: true, - component: SecondaryManageSpaceEdit - }, + // { + // path: ':id/manage-spaces/secondary-manage-space/edit', + // name: 'secondaryManageSpaceEdit', + // meta: { + // backRouter: -1 + // }, + // props: true, + // component: SecondaryManageSpaceEdit + // }, { path: ':id/manage-spaces/secondary-manage-space/detail', name: 'secondaryManageSpaceDetail', @@ -741,12 +743,12 @@ export const routes = [ ] }, { - path: '403', + path: getRoutePath('403'), name: '403', component: NotAccessPermPage }, { - path: '*', + path: getRoutePath('*'), name: '404', component: NotFound } diff --git a/frontend/src/router/ee.js b/frontend/src/router/ee.js index 5bd6f30bc..d80c0f382 100644 --- a/frontend/src/router/ee.js +++ b/frontend/src/router/ee.js @@ -25,8 +25,8 @@ */ import il8n from '@/language'; - -const SITE_URL = window.SITE_URL; +import { rootPath } from '@blueking/sub-saas/dist/main.js'; +import { getRoutePath } from '@/common/util'; // 系统接入 const SystemAccess = () => import(/* webpackChunkName: 'system-access' */ '../views/system-access'); @@ -152,8 +152,8 @@ const SecondaryManageSpaceCreate = () => import(/* webpackChunkName: 'grading-admin' */ '../views/manage-spaces/secondary-manage-space/create'); // 二极管理空间编辑 -const SecondaryManageSpaceEdit = () => - import(/* webpackChunkName: 'grading-admin' */ '../views/manage-spaces/secondary-manage-space/edit'); +// const SecondaryManageSpaceEdit = () => +// import(/* webpackChunkName: 'grading-admin' */ '../views/manage-spaces/secondary-manage-space/edit'); // 二极管理空间详情 const SecondaryManageSpaceDetail = () => @@ -218,7 +218,7 @@ const MainEntry = () => import(/* webpackChunkName: 'index' */ '../views'); export const routes = [ { - path: SITE_URL, + path: rootPath, name: 'iamMain', component: MainEntry, children: [ @@ -421,15 +421,15 @@ export const routes = [ props: true, component: SecondaryManageSpaceCreate }, - { - path: ':id/manage-spaces/secondary-manage-space/edit', - name: 'secondaryManageSpaceEdit', - meta: { - backRouter: -1 - }, - props: true, - component: SecondaryManageSpaceEdit - }, + // { + // path: ':id/manage-spaces/secondary-manage-space/edit', + // name: 'secondaryManageSpaceEdit', + // meta: { + // backRouter: -1 + // }, + // props: true, + // component: SecondaryManageSpaceEdit + // }, { path: ':id/manage-spaces/secondary-manage-space/detail', name: 'secondaryManageSpaceDetail', @@ -741,12 +741,14 @@ export const routes = [ ] }, { - path: '403', + // path: '403', + path: getRoutePath('403'), name: '403', component: NotAccessPermPage }, { - path: '*', + // path: '*', + path: getRoutePath('*'), name: '404', component: NotFound } diff --git a/frontend/src/router/ieod.js b/frontend/src/router/ieod.js index cbec2da59..8b697a859 100644 --- a/frontend/src/router/ieod.js +++ b/frontend/src/router/ieod.js @@ -25,8 +25,8 @@ */ import il8n from '@/language'; - -const SITE_URL = window.SITE_URL; +import { rootPath } from '@blueking/sub-saas/dist/main.js'; +import { getRoutePath } from '@/common/util'; // 系统接入 const SystemAccess = () => import(/* webpackChunkName: 'system-access' */ '../views/system-access'); @@ -144,8 +144,8 @@ const SecondaryManageSpaceCreate = () => import(/* webpackChunkName: 'grading-admin' */ '../views/manage-spaces/secondary-manage-space/create'); // 二极管理空间编辑 -const SecondaryManageSpaceEdit = () => - import(/* webpackChunkName: 'grading-admin' */ '../views/manage-spaces/secondary-manage-space/Edit'); +// const SecondaryManageSpaceEdit = () => +// import(/* webpackChunkName: 'grading-admin' */ '../views/manage-spaces/secondary-manage-space/Edit'); // 二极管理空间详情 const SecondaryManageSpaceDetail = () => @@ -210,7 +210,8 @@ const MainEntry = () => import(/* webpackChunkName: 'index' */ '../views'); export const routes = [ { - path: SITE_URL, + // path: window.SITE_URL, + path: rootPath, name: 'iamMain', component: MainEntry, children: [ @@ -413,15 +414,15 @@ export const routes = [ props: true, component: SecondaryManageSpaceCreate }, - { - path: ':id/manage-spaces/secondary-manage-space/edit', - name: 'secondaryManageSpaceEdit', - meta: { - backRouter: -1 - }, - props: true, - component: SecondaryManageSpaceEdit - }, + // { + // path: ':id/manage-spaces/secondary-manage-space/edit', + // name: 'secondaryManageSpaceEdit', + // meta: { + // backRouter: -1 + // }, + // props: true, + // component: SecondaryManageSpaceEdit + // }, { path: ':id/manage-spaces/secondary-manage-space/detail', name: 'secondaryManageSpaceDetail', @@ -733,12 +734,12 @@ export const routes = [ ] }, { - path: '403', + path: getRoutePath('403'), name: '403', component: NotAccessPermPage }, { - path: '*', + path: getRoutePath('*'), name: '404', component: NotFound } diff --git a/frontend/src/router/index.js b/frontend/src/router/index.js index 44bdd651d..0eeb4fc30 100644 --- a/frontend/src/router/index.js +++ b/frontend/src/router/index.js @@ -32,12 +32,13 @@ import http from '@/api'; // import il8n from '@/language'; import preload from '@/common/preload'; import { bus } from '@/common/bus'; -import { existValue, getParamsValue } from '@/common/util'; +import { existValue, getParamsValue, getRoutePath } from '@/common/util'; // import { existValue, getParamsValue, getManagerMenuPerm } from '@/common/util'; import { getRouterDiff, getNavRouterDiff } from '@/common/router-handle'; import { messageError } from '@/common/bkmagic'; +import { connectToMain } from '@blueking/sub-saas/dist/main.js'; -const SITE_URL = window.SITE_URL; +const SITE_URL = getRoutePath(window.SITE_URL); Vue.use(VueRouter); @@ -395,4 +396,6 @@ const fetchExternalSystemsLayout = async (externalSystemId) => { router.beforeEach(beforeEach); router.afterEach(afterEach); -export default router; +connectToMain(router); + +export default router; \ No newline at end of file diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js index 111eb9bd8..d9832356d 100644 --- a/frontend/src/store/index.js +++ b/frontend/src/store/index.js @@ -27,7 +27,7 @@ import Vue from 'vue'; import Vuex from 'vuex'; import http from '@/api'; -import { unifyObjectStyle, json2Query, getManagerMenuPerm } from '@/common/util'; +import { unifyObjectStyle, json2Query, getManagerMenuPerm, getRoutePath } from '@/common/util'; import { getRouterDiff, getNavRouterDiff } from '@/common/router-handle'; import il8n from '@/language'; @@ -99,7 +99,7 @@ import renewalNotice from './modules/renewal-notice'; Vue.use(Vuex); -const SITE_URL = window.SITE_URL; +const SITE_URL = getRoutePath(window.SITE_URL); const currentNav = [ { diff --git a/frontend/src/views/manage-spaces/secondary-manage-space/create/index.vue b/frontend/src/views/manage-spaces/secondary-manage-space/create/index.vue index 9f90b1d48..ec06b3bd9 100644 --- a/frontend/src/views/manage-spaces/secondary-manage-space/create/index.vue +++ b/frontend/src/views/manage-spaces/secondary-manage-space/create/index.vue @@ -286,7 +286,7 @@ import Condition from '@/model/condition'; export default { - name: '', + name: 'secondaryManageSpaceCreate', components: { AddMemberDialog, basicInfo, diff --git a/frontend/src/views/manage-spaces/secondary-manage-space/edit/index.vue b/frontend/src/views/manage-spaces/secondary-manage-space/edit/index.vue deleted file mode 100644 index e69de29bb..000000000 From 2e4f60f1872edd3d08386ad41eb8b099dae4c31c Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Tue, 21 May 2024 17:09:33 +0800 Subject: [PATCH 02/43] =?UTF-8?q?feature:=20=E6=B7=BB=E5=8A=A0iframe?= =?UTF-8?q?=E7=89=B9=E5=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/IframeEntry.vue | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/frontend/src/IframeEntry.vue b/frontend/src/IframeEntry.vue index 25a4c56fc..b14685038 100644 --- a/frontend/src/IframeEntry.vue +++ b/frontend/src/IframeEntry.vue @@ -13,23 +13,11 @@ @show-alert-change="handleShowAlertChange" />
+ From 5bb713a5f72a4e8f01b0ffd9aa533726f9a252cf Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Wed, 5 Jun 2024 20:17:58 +0800 Subject: [PATCH 08/43] =?UTF-8?q?fix:=20=E7=94=B3=E8=AF=B7=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=BB=84=E2=80=94>=E6=97=A0=E6=9D=83=E9=99=90?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=9D=83=E9=99=90=E5=92=8C=E5=B8=B8=E7=94=A8?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E6=9D=83=E9=99=90=E9=9C=80=E8=A6=81=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=8E=89=E6=8C=87=E5=AE=9A=E7=9A=84=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../perm-apply/apply-custom-perm/index.vue | 96 ++++++++++--------- 1 file changed, 51 insertions(+), 45 deletions(-) diff --git a/frontend/src/views/perm-apply/apply-custom-perm/index.vue b/frontend/src/views/perm-apply/apply-custom-perm/index.vue index ea64231b0..ff435d720 100644 --- a/frontend/src/views/perm-apply/apply-custom-perm/index.vue +++ b/frontend/src/views/perm-apply/apply-custom-perm/index.vue @@ -1055,9 +1055,9 @@ }; try { const res = await this.$store.dispatch('perm/getRecommended', params); - const recommendActions = res.data.actions || []; + // 常用操作需要过滤掉需要隐藏的操作 + const recommendActions = res.data.actions.filter((item) => !item.hidden) || []; const recommendPolicies = res.data.policies || []; - const data = recommendActions.map(item => { const resourceGroups = recommendPolicies.find(sub => sub.id === item.id); if (resourceGroups) { @@ -2289,51 +2289,57 @@ } try { const res = await this.$store.dispatch('permApply/getPolicies', params); - const data = res.data.map(item => { - let relatedActions = []; - const findLinerActions = this.linearActionList.find(sub => sub.id === item.id); - if (findLinerActions) { - const { related_actions, related_environments } = findLinerActions; - // eslint-disable-next-line camelcase - relatedActions = [...related_actions]; - // eslint-disable-next-line camelcase - item.related_environments = related_environments; - } - // 此处处理related_resource_types中value的赋值 - return new Policy({ - ...item, - related_actions: relatedActions, - tid: this.routerQuery.cache_id ? this.routerQuery.cache_id : '' - }); - }); - this.tableData = data; - this.tableData.forEach(item => { - // item.expired_at = 1627616000 - - // 无权限跳转过来, 新增的操作过期时间为 0 即小于 user.timestamp 时，expired_at 就设置为六个月 15552000 - if (item.tag === 'add') { - if (item.expired_at <= this.user.timestamp) { - item.expired_at = 15552000; + // 无权限申请过滤需要隐藏的操作 + if (res.data && res.data.length > 0) { + let result = []; + const policyList = res.data.map((item) => `${item.name}&${item.id}`); + result = this.linearActionList.filter((item) => policyList.includes(`${item.name}&${item.id}`) && !item.hidden); + const data = result.map(item => { + let relatedActions = []; + const findLinerActions = this.linearActionList.find(sub => sub.id === item.id); + if (findLinerActions) { + const { related_actions, related_environments } = findLinerActions; + // eslint-disable-next-line camelcase + relatedActions = [...related_actions]; + // eslint-disable-next-line camelcase + item.related_environments = related_environments; } - } else { - // 新增的权限不判断是否过期 - if (item.expired_at <= this.user.timestamp) { - item.isShowRenewal = true; - item.isExpired = true; + // 此处处理related_resource_types中value的赋值 + return new Policy({ + ...item, + related_actions: relatedActions, + tid: this.routerQuery.cache_id ? this.routerQuery.cache_id : '' + }); + }); + this.tableData = data || []; + this.tableData.forEach(item => { + // item.expired_at = 1627616000 + + // 无权限跳转过来, 新增的操作过期时间为 0 即小于 user.timestamp 时，expired_at 就设置为六个月 15552000 + if (item.tag === 'add') { + if (item.expired_at <= this.user.timestamp) { + item.expired_at = 15552000; + } + } else { + // 新增的权限不判断是否过期 + if (item.expired_at <= this.user.timestamp) { + item.isShowRenewal = true; + item.isExpired = true; + } } - } - - // // 新增的权限不判断是否过期 - // if (item.expired_at <= this.user.timestamp && item.tag !== 'add') { - // item.isShowRenewal = true - // item.isExpired = true - // // this.$set(item, 'isShowRenewal', true) - // // this.$set(item, 'isExpired', true) - // } - }); - this.newTableList = _.cloneDeep(this.tableData.filter(item => { - return !item.isExpiredAtDisabled; - })); + + // // 新增的权限不判断是否过期 + // if (item.expired_at <= this.user.timestamp && item.tag !== 'add') { + // item.isShowRenewal = true + // item.isExpired = true + // // this.$set(item, 'isShowRenewal', true) + // // this.$set(item, 'isExpired', true) + // } + }); + this.newTableList = _.cloneDeep(this.tableData.filter(item => { + return !item.isExpiredAtDisabled; + })); + } this.tableDataBackup = _.cloneDeep(this.tableData); this.aggregationsTableData = _.cloneDeep(this.tableData); } catch (e) { From 5726b54086f57006b7f286dd55695e270bc18d07 Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Wed, 5 Jun 2024 20:24:32 +0800 Subject: [PATCH 09/43] =?UTF-8?q?fix:=20=E6=8F=90=E4=BB=B7=E6=BC=8F?= =?UTF-8?q?=E7=BC=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/perm-apply/apply-custom-perm/index.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/src/views/perm-apply/apply-custom-perm/index.vue b/frontend/src/views/perm-apply/apply-custom-perm/index.vue index ff435d720..5780a0231 100644 --- a/frontend/src/views/perm-apply/apply-custom-perm/index.vue +++ b/frontend/src/views/perm-apply/apply-custom-perm/index.vue @@ -2291,9 +2291,8 @@ const res = await this.$store.dispatch('permApply/getPolicies', params); // 无权限申请过滤需要隐藏的操作 if (res.data && res.data.length > 0) { - let result = []; - const policyList = res.data.map((item) => `${item.name}&${item.id}`); - result = this.linearActionList.filter((item) => policyList.includes(`${item.name}&${item.id}`) && !item.hidden); + const allPolicyList = this.linearActionList.map((item) => `${item.name}&${item.id}`); + const result = res.data.filter((item) => allPolicyList.includes(`${item.name}&${item.id}`) && !item.hidden); const data = result.map(item => { let relatedActions = []; const findLinerActions = this.linearActionList.find(sub => sub.id === item.id); From 7c07fe9c180e90e9d6851ad8ac7806ed9a268f87 Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Wed, 5 Jun 2024 20:29:49 +0800 Subject: [PATCH 10/43] =?UTF-8?q?fix:=20=E6=8F=90=E4=BA=A4=E6=BC=8F?= =?UTF-8?q?=E7=BC=BA=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/perm-apply/apply-custom-perm/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/perm-apply/apply-custom-perm/index.vue b/frontend/src/views/perm-apply/apply-custom-perm/index.vue index 5780a0231..0a648f3d6 100644 --- a/frontend/src/views/perm-apply/apply-custom-perm/index.vue +++ b/frontend/src/views/perm-apply/apply-custom-perm/index.vue @@ -2291,8 +2291,8 @@ const res = await this.$store.dispatch('permApply/getPolicies', params); // 无权限申请过滤需要隐藏的操作 if (res.data && res.data.length > 0) { - const allPolicyList = this.linearActionList.map((item) => `${item.name}&${item.id}`); - const result = res.data.filter((item) => allPolicyList.includes(`${item.name}&${item.id}`) && !item.hidden); + const allPolicyList = this.linearActionList.filter((v) => !v.hidden).map((item) => `${item.name}&${item.id}`); + const result = res.data.filter((item) => allPolicyList.includes(`${item.name}&${item.id}`)); const data = result.map(item => { let relatedActions = []; const findLinerActions = this.linearActionList.find(sub => sub.id === item.id); From f72d2f93c65700618f71daf0e412d09e0ab6dad9 Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Wed, 5 Jun 2024 20:47:52 +0800 Subject: [PATCH 11/43] =?UTF-8?q?fix:=20=E5=85=BC=E5=AE=B9=E6=97=A0?= =?UTF-8?q?=E6=9D=83=E9=99=90=E9=A1=B5=E9=9D=A2=E5=92=8C=E6=9C=89=E6=9D=83?= =?UTF-8?q?=E9=99=90=E7=94=B3=E8=AF=B7=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/perm-apply/apply-custom-perm/index.vue | 2 ++ .../components/resource-instance-table.css | 5 +++++ .../components/resource-instance-table.vue | 12 +++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/frontend/src/views/perm-apply/apply-custom-perm/index.vue b/frontend/src/views/perm-apply/apply-custom-perm/index.vue index 0a648f3d6..87b420a9f 100644 --- a/frontend/src/views/perm-apply/apply-custom-perm/index.vue +++ b/frontend/src/views/perm-apply/apply-custom-perm/index.vue @@ -565,6 +565,7 @@ > {{ row.name }} -
+
{{ row.name }} @@ -359,6 +365,10 @@ type: Boolean, default: false }, + isNoPermPage: { + type: Boolean, + default: false + }, hasSystem: { type: Boolean, default: false From 06a7610b5290e4399246e30c1a002085080b8d89 Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Fri, 7 Jun 2024 14:57:54 +0800 Subject: [PATCH 12/43] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=9D=83=E9=99=90=E5=88=87=E6=8D=A2=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E6=9C=AA=E6=B8=85=E7=A9=BA=E8=B5=84=E6=BA=90=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/perm-apply/apply-custom-perm/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/views/perm-apply/apply-custom-perm/index.vue b/frontend/src/views/perm-apply/apply-custom-perm/index.vue index 87b420a9f..1972b6fcc 100644 --- a/frontend/src/views/perm-apply/apply-custom-perm/index.vue +++ b/frontend/src/views/perm-apply/apply-custom-perm/index.vue @@ -2696,6 +2696,8 @@ this.sysAndtid = false; this.aggregationMap = []; this.aggregations = []; + this.tableData = []; + this.tableDataBackup = []; this.aggregationsBackup = []; this.aggregationsTableData = []; this.actionSearchValue = ''; From f1bb7d32549d8a9aa5b5d6e6c841e288583bd1f8 Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Wed, 12 Jun 2024 11:24:05 +0800 Subject: [PATCH 13/43] =?UTF-8?q?fix:=20=E7=BC=96=E8=BE=91=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=BB=84=E6=9D=83=E9=99=90-=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=AE=9E=E4=BE=8B=E5=86=85=E5=AE=B9=E5=90=8E?= =?UTF-8?q?=E5=8F=96=E6=B6=88=EF=BC=8C=E8=B5=84=E6=BA=90=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E6=B2=A1=E6=9C=89=E6=98=BE=E7=A4=BA=E4=B8=BA?= =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/group/detail/group-perm-new.vue | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/frontend/src/views/group/detail/group-perm-new.vue b/frontend/src/views/group/detail/group-perm-new.vue index e1e4da13e..923ef21ea 100644 --- a/frontend/src/views/group/detail/group-perm-new.vue +++ b/frontend/src/views/group/detail/group-perm-new.vue @@ -269,12 +269,16 @@ } }, - handleEdit (paylaod) { - this.$set(paylaod, 'isEdit', true); // 事件会冒泡会触发handleExpanded方法 + handleEdit (payload) { + this.$set(payload, 'isEdit', true); // 事件会冒泡会触发handleExpanded方法 }, - handleCancel (paylaod) { - this.$set(paylaod, 'isEdit', false); + handleCancel (payload) { + const { tableData, tableDataBackup } = payload; + if (JSON.stringify(tableData) !== JSON.stringify(tableDataBackup)) { + payload.tableData = _.cloneDeep(tableDataBackup); + } + this.$set(payload, 'isEdit', false); }, async getGroupTemplateList (groupSystem) { @@ -532,6 +536,7 @@ subItem.editLoading = false; } }, + handleDelete (item, subItem) { this.removingSingle = false; if (subItem.id > 0) { From e7bd4655cc69d0e90921321ec9c2573b7547eefe Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Thu, 13 Jun 2024 19:17:47 +0800 Subject: [PATCH 14/43] =?UTF-8?q?feature:=20=E5=A2=9E=E5=8A=A0function-dep?= =?UTF-8?q?endcy=E7=BB=84=E4=BB=B6=E5=A4=84=E7=90=86=E9=9C=80=E8=A6=81?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BE=9D=E8=B5=96=E9=A1=B9=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E7=9A=84=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/package.json | 2 + frontend/src/App.vue | 64 ++++++++++++++++--- frontend/src/language/lang/en.js | 5 +- frontend/src/language/lang/zh.js | 5 +- .../perm-apply/apply-custom-perm/index.vue | 14 +++- 5 files changed, 77 insertions(+), 13 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 094e6e565..db0ee3fd5 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -86,6 +86,8 @@ "@babel/preset-env": "~7.4.5", "@babel/register": "~7.4.4", "@babel/runtime": "~7.4.5", + "@blueking/bkui-library": "0.0.0-beta.6", + "@blueking/functional-dependency": "0.0.1-beta.12", "@blueking/login-modal": "^1.0.0", "@blueking/notice-component-vue2": "^2.0.3", "@blueking/sub-saas": "0.0.0-beta.7", diff --git a/frontend/src/App.vue b/frontend/src/App.vue index fe9bb70c2..d5f4b0ff8 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -29,10 +29,10 @@ :content="$t(`m.guide['创建审批流程']`)" /> --> - + :user-group-id="userGroupId" + /> + v-if="!externalSystemsLayout.hideIamSlider" + />
--> +
+ - diff --git a/frontend/src/views/group/add-perm/index.vue b/frontend/src/views/group/add-perm/index.vue index c091f58e1..1a6ef5d9d 100644 --- a/frontend/src/views/group/add-perm/index.vue +++ b/frontend/src/views/group/add-perm/index.vue @@ -1,17 +1,13 @@ -
@@ -1062,249 +1053,6 @@ }; - diff --git a/frontend/src/views/group/components/render-instance-table.vue b/frontend/src/views/group/components/render-instance-table.vue index 0e7ec5f75..a7844ec44 100644 --- a/frontend/src/views/group/components/render-instance-table.vue +++ b/frontend/src/views/group/components/render-instance-table.vue @@ -2118,7 +2118,6 @@ min-height: 101px; .bk-table { width: 100%; - margin-top: 8px; border-right: none; border-bottom: none; font-size: 12px; diff --git a/frontend/src/views/group/create/index.vue b/frontend/src/views/group/create/index.vue index b0884573d..d838bcb62 100644 --- a/frontend/src/views/group/create/index.vue +++ b/frontend/src/views/group/create/index.vue @@ -34,24 +34,15 @@ v-if="!isHasPermTemplate" data-test-id="group_btn_showAddGroupPerm" @on-click="handleAddPerm"> - - +
-
-
+
+
{{ $t(`m.userGroup['添加组权限']`) }} -
-
-
-
+
+
- - +
+
+ {{ $t(`m.grading['${item.name}']`)}} +
+
+
-
+
-
+
@import '@/css/mixins/create-user-group.css'; +@import '@/css/mixins/aggregate-action-group.css'; diff --git a/frontend/src/views/manage-spaces/components/add-action-side-slider.vue b/frontend/src/views/manage-spaces/components/add-action-side-slider.vue index e5526d67b..bdaecedeb 100644 --- a/frontend/src/views/manage-spaces/components/add-action-side-slider.vue +++ b/frontend/src/views/manage-spaces/components/add-action-side-slider.vue @@ -973,245 +973,6 @@ }; - diff --git a/frontend/src/views/manage-spaces/secondary-manage-space/components/add-action-sideslider.vue b/frontend/src/views/manage-spaces/secondary-manage-space/components/add-action-sideslider.vue index 6ef51a0c2..1da70c538 100644 --- a/frontend/src/views/manage-spaces/secondary-manage-space/components/add-action-sideslider.vue +++ b/frontend/src/views/manage-spaces/secondary-manage-space/components/add-action-sideslider.vue @@ -68,15 +68,6 @@ @on-refresh="refreshList" /> -
@@ -1021,249 +1012,6 @@ }; - +> diff --git a/frontend/src/views/manage-spaces/secondary-manage-space/components/render-instance-table.vue b/frontend/src/views/manage-spaces/secondary-manage-space/components/render-instance-table.vue index bed86c033..adbf9ef9b 100644 --- a/frontend/src/views/manage-spaces/secondary-manage-space/components/render-instance-table.vue +++ b/frontend/src/views/manage-spaces/secondary-manage-space/components/render-instance-table.vue @@ -1988,144 +1988,142 @@ diff --git a/frontend/src/views/manage-spaces/first-manage-space/index.vue b/frontend/src/views/manage-spaces/first-manage-space/index.vue deleted file mode 100644 index 25e82377d..000000000 --- a/frontend/src/views/manage-spaces/first-manage-space/index.vue +++ /dev/null @@ -1,260 +0,0 @@ - - - - - From 8a903ab3c9b0534910302e7d15c6a565f6341a13 Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Tue, 18 Jun 2024 18:45:21 +0800 Subject: [PATCH 22/43] =?UTF-8?q?feature:=20=E5=B9=B3=E5=8F=B0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E4=BD=BF=E7=94=A8=E8=BF=9C=E7=A8=8B=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/build/paas-server.js | 5 +- frontend/index.html | 10 +- frontend/package.json | 1 + frontend/src/App.vue | 8 + frontend/src/components/footer/index.vue | 216 +++++++++---------- frontend/src/components/header-nav/index.vue | 52 +++-- frontend/src/store/index.js | 6 +- frontend/src/store/modules/global-config.js | 93 ++++++++ 8 files changed, 262 insertions(+), 129 deletions(-) create mode 100644 frontend/src/store/modules/global-config.js diff --git a/frontend/build/paas-server.js b/frontend/build/paas-server.js index f3261b719..3f6cc7ba4 100644 --- a/frontend/build/paas-server.js +++ b/frontend/build/paas-server.js @@ -68,7 +68,10 @@ const GLOBAL_VAR = { ENABLE_BK_NOTICE: process.env.ENABLE_BK_NOTICE || '', BK_COMPONENT_API_URL: process.env.BK_COMPONENT_API_URL || '', BK_DOCS_URL_PREFIX: process.env.BK_DOCS_URL_PREFIX || '', - BK_DOMAIN: process.env.BK_DOMAIN || '' + BK_DOMAIN: process.env.BK_DOMAIN || '', + BK_SHARED_RES_URL: process.env.BK_SHARED_RES_URL || '', + BK_APP_CODE: process.env.BK_APP_CODE || '', + VERSION: process.env.VERSION || '' }; // APA 重定向回首页，由首页Route响应处理 diff --git a/frontend/index.html b/frontend/index.html index 6b71a5f72..68eecd801 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,8 +1,10 @@ + - + 权限中心 | 腾讯蓝鲸智云 @@ -29,6 +31,9 @@ const ENABLE_BK_NOTICE = '{{ ENABLE_BK_NOTICE }}' || '' const BK_DOMAIN = '{{ BK_DOMAIN }}' || '' const BK_COMPONENT_API_URL = '{{ BK_COMPONENT_API_URL }}' || '' + const BK_SHARED_RES_URL = '{{ BK_SHARED_RES_URL }}' || '' + const BK_APP_CODE = '{{ BK_APP_CODE" }}' || '' + const VERSION = '{{ VERSION }}' || '' document.domain = '{{ SESSION_COOKIE_DOMAIN }}' window.LOGIN_SERVICE_URL = LOGIN_SERVICE_URL window.AJAX_URL_PREFIX = AJAX_URL_PREFIX @@ -50,6 +55,9 @@ window.CE_URL = CE_URL window.BK_DOMAIN = BK_DOMAIN window.BK_COMPONENT_API_URL = BK_COMPONENT_API_URL + window.BK_SHARED_RES_URL = BK_SHARED_RES_URL + window.BK_APP_CODE = BK_APP_CODE + window.VERSION = VERSION })() function getLanguage () { diff --git a/frontend/package.json b/frontend/package.json index db0ee3fd5..a48fff5ae 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -90,6 +90,7 @@ "@blueking/functional-dependency": "0.0.1-beta.12", "@blueking/login-modal": "^1.0.0", "@blueking/notice-component-vue2": "^2.0.3", + "@blueking/platform-config": "^1.0.2", "@blueking/sub-saas": "0.0.0-beta.7", "@blueking/user-selector": "^1.0.14", "@commitlint/cli": "~13.1.0", diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 228047b40..e85e0a5f4 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -197,6 +197,7 @@ if (!existValue('externalApp')) { this.fetchVersionLog(); this.fetchNoviceGuide(); + this.fetchUserGlobalConfig(); } const isPoll = window.localStorage.getItem('isPoll'); if (isPoll) { @@ -338,6 +339,13 @@ this.messageAdvancedError(e); } }, + + /** + * 获取用户全局配置 + */ + async fetchUserGlobalConfig () { + await this.$store.dispatch('userGlobalConfig/getCurrentGlobalConfig'); + }, // 是否存在key existKey (value) { diff --git a/frontend/src/components/footer/index.vue b/frontend/src/components/footer/index.vue index 3e17cd473..ccb923e45 100644 --- a/frontend/src/components/footer/index.vue +++ b/frontend/src/components/footer/index.vue @@ -1,108 +1,108 @@ - - - - - + + + + + diff --git a/frontend/src/components/header-nav/index.vue b/frontend/src/components/header-nav/index.vue index 4360885f7..c8a4668f5 100644 --- a/frontend/src/components/header-nav/index.vue +++ b/frontend/src/components/header-nav/index.vue @@ -2,8 +2,9 @@
- - {{ $t('m.nav["蓝鲸权限中心"]') }} + + + {{ appName }}
@@ -128,6 +129,7 @@ import { getRouterDiff, getNavRouterDiff } from '@/common/router-handle'; import Cookie from 'js-cookie'; import magicbox from 'bk-magic-vue'; + import logoSvg from '@/images/logo.svg'; // 有选项卡的页面，user-group-detail 以及 perm-template-detail const getTabData = (routerName) => { @@ -281,30 +283,44 @@ }, computed: { ...mapGetters([ - 'navStick', - 'headerTitle', - 'backRouter', - 'user', - 'mainContentLoading', - 'roleList', - 'index', - 'navCurRoleId', - 'externalSystemId' + 'navStick', + 'headerTitle', + 'backRouter', + 'user', + 'mainContentLoading', + 'roleList', + 'index', + 'navCurRoleId', + 'externalSystemId' ]), + ...mapGetters('userGlobalConfig', ['globalConfig']), style () { - return { - // height: `${this.roleList.length ? this.curHeight : 46}px` - height: `46px` - }; + return { + // height: `${this.roleList.length ? this.curHeight : 46}px` + height: `46px` + }; }, curAccountLogo () { - return [].slice.call(this.user.username)[0].toUpperCase() || '-'; + return [].slice.call(this.user.username)[0].toUpperCase() || '-'; }, isHide () { - return this.$route.query.system_id && this.$route.query.tid; + return this.$route.query.system_id && this.$route.query.tid; }, isShowSearch () { - return this.searchValue === ''; + return this.searchValue === ''; + }, + appName () { + // 如果未获取到配置，使用默认title + if (this.globalConfig.publicConfig) { + const { name, nameEn } = this.globalConfig.publicConfig; + return this.curLanguageIsCn ? name : nameEn; + } + return this.$t('m.nav["蓝鲸权限中心"]'); + }, + appLogo () { + // 如果未获取到配置，使用默认logo + const src = this.globalConfig.publicConfig.appLogo || logoSvg; + return src; } }, watch: { diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js index d9832356d..7a0603fc7 100644 --- a/frontend/src/store/index.js +++ b/frontend/src/store/index.js @@ -97,6 +97,9 @@ import userOrOrg from './modules/user-org'; // 续期通知 import renewalNotice from './modules/renewal-notice'; +// 用户全局配置 +import userGlobalConfig from './modules/global-config'; + Vue.use(Vuex); const SITE_URL = getRoutePath(window.SITE_URL); @@ -372,7 +375,8 @@ const store = new Vuex.Store({ sensitivityLevel, memberTemplate, userOrOrg, - renewalNotice + renewalNotice, + userGlobalConfig }, state: { mainContentLoading: false, diff --git a/frontend/src/store/modules/global-config.js b/frontend/src/store/modules/global-config.js new file mode 100644 index 000000000..b33a49b5c --- /dev/null +++ b/frontend/src/store/modules/global-config.js @@ -0,0 +1,93 @@ +/* + * Tencent is pleased to support the open source community by making + * 蓝鲸智云-权限中心(BlueKing-IAM) available. + * + * Copyright (C) 2021 THL A29 Limited, a Tencent company. All rights reserved. + * + * 蓝鲸智云-权限中心(BlueKing-IAM) is licensed under the MIT License. + * + * License for 蓝鲸智云-权限中心(BlueKing-IAM): + * + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and + * to permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO + * THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + * IN THE SOFTWARE. +*/ +import { getPlatformConfig, titleSeparator, setDocumentTitle, setShortcutIcon } from '@blueking/platform-config'; + +export default { + namespaced: true, + state: { + initialConfig: { + site: { + name: '', // 网站名 + separator: '|' // 网站名称路由分隔符 + }, + footer: { + copyright: `Copyright © 2012-${new Date().getFullYear()} Tencent BlueKing. All Rights Reserved.` + }, + publicConfig: { + name: '权限中心', + nameEn: 'BK_IAM', + brandName: '腾讯蓝鲸智云', + brandNameEn: 'BlueKing', + appLogo: require('@/images/logo.svg'), + favicon: require('@/images/logo.svg'), + version: '' + } + } + }, + getters: { + globalConfig: state => state.initialConfig + }, + mutations: { + setCurrentGlobalConfig (state, params) { + state.initialConfig = Object.assign(state.initialConfig, params); + } + }, + actions: { + /** + * 获取当前用户的全局设置 + * + * @param {Function} commit store commit mutation handler + * @param {Object} state store state + * @param {Function} dispatch store dispatch action handler + * @param {Object?} config http config + * + * @return {Promise} promise 对象 + */ + async getCurrentGlobalConfig ({ commit, state, dispatch }) { + let commitParams = {}; + if (window.BK_SHARED_RES_URL) { + const repoUrl = window.BK_SHARED_RES_URL.endsWith('/') ? window.BK_SHARED_RES_URL : `${window.BK_SHARED_RES_URL}/`; + try { + commitParams = await getPlatformConfig(`${repoUrl}${window.BK_APP_CODE}/base.js`, state.initialConfig); + if (commitParams && commitParams.site) { + commitParams.site.separator = titleSeparator; + } + } catch (e) { + console.error(e, '错误日志'); + commitParams = await getPlatformConfig(state.initialConfig); + } + } else { + // 本地开发环境调试 + commitParams = await getPlatformConfig(state.initialConfig); + } + console.log(commitParams, '配置项数据'); + const { i18n, publicConfig } = commitParams; + setDocumentTitle(i18n.name ? i18n : publicConfig); + setShortcutIcon(publicConfig.favicon); + commit('setCurrentGlobalConfig', commitParams); + } + } +}; From c0a40635e3f845967fbc98f5a4aa7dc7492d60a3 Mon Sep 17 00:00:00 2001 From: Oren Zhang Date: Wed, 19 Jun 2024 08:48:40 +0800 Subject: [PATCH 23/43] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E9=85=8D=E7=BD=AE=E5=95=86=E6=A0=87&LOGO=E7=AD=89?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=20#2712=20(#2716)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 支持全局配置商标&LOGO等信息 #2712 --- saas/backend/common/vue.py | 4 ++++ saas/config/default.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/saas/backend/common/vue.py b/saas/backend/common/vue.py index cab79384b..85f6aaea3 100644 --- a/saas/backend/common/vue.py +++ b/saas/backend/common/vue.py @@ -36,6 +36,10 @@ def get(self, request): # BK_DOMAIN "BK_DOMAIN": settings.BK_DOMAIN, "BK_DOCS_URL_PREFIX": settings.BK_DOCS_URL_PREFIX.rstrip("/"), + # BK Res + "BK_SHARED_RES_URL": settings.BK_SHARED_RES_URL.rstrip("/"), + # App Code + "BK_APP_CODE": settings.APP_CODE, } # 添加前端功能启用开关 diff --git a/saas/config/default.py b/saas/config/default.py index ddacefa59..adc603831 100644 --- a/saas/config/default.py +++ b/saas/config/default.py @@ -486,3 +486,7 @@ # 文档地址 BK_DOCS_URL_PREFIX = env.str("BK_DOCS_URL_PREFIX", default="https://bk.tencent.com/docs/") + + +# 全局配置地址 +BK_SHARED_RES_URL = env.str("BK_SHARED_RES_URL", default="") From 80bfd45f4a79e60337fec67ef07483cdd720faca Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Wed, 19 Jun 2024 09:42:54 +0800 Subject: [PATCH 24/43] =?UTF-8?q?fix:=E5=8E=BB=E6=8E=89=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E5=BC=95=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/index.html b/frontend/index.html index 68eecd801..85d8cd4b0 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -32,7 +32,7 @@ const BK_DOMAIN = '{{ BK_DOMAIN }}' || '' const BK_COMPONENT_API_URL = '{{ BK_COMPONENT_API_URL }}' || '' const BK_SHARED_RES_URL = '{{ BK_SHARED_RES_URL }}' || '' - const BK_APP_CODE = '{{ BK_APP_CODE" }}' || '' + const BK_APP_CODE = '{{ BK_APP_CODE }}' || '' const VERSION = '{{ VERSION }}' || '' document.domain = '{{ SESSION_COOKIE_DOMAIN }}' window.LOGIN_SERVICE_URL = LOGIN_SERVICE_URL From 443d0182db9ca9925808a1c92ac857f765c469b8 Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Wed, 19 Jun 2024 15:32:49 +0800 Subject: [PATCH 25/43] =?UTF-8?q?feature:=20=E5=85=BC=E5=AE=B9dbm=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E4=BE=9D=E8=B5=96cmdb=E5=B9=B3=E5=8F=B0=E4=B8=AA?= =?UTF-8?q?=E5=88=AB=E8=87=AA=E5=AE=9A=E4=B9=89=E5=B1=9E=E6=80=A7=E9=9B=86?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E5=B1=95=E7=A4=BA=E4=BA=BA=E5=91=98=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=99=A8=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/css/mixins/attribute.css | 27 ++++ .../components/render-resource.vue | 2 +- .../src/views/group/components/attribute.vue | 137 ++++++++++------- .../components/attribute.vue | 137 ++++++++++------- .../views/perm-apply/components/attribute.vue | 140 ++++++++++++------ .../perm-template/components/attribute.vue | 136 ++++++++++------- .../resource-permiss/components/attribute.vue | 135 +++++++++++------ .../components/attribute.vue | 135 +++++++++++------ 8 files changed, 550 insertions(+), 299 deletions(-) create mode 100644 frontend/src/css/mixins/attribute.css diff --git a/frontend/src/css/mixins/attribute.css b/frontend/src/css/mixins/attribute.css new file mode 100644 index 000000000..802dd0846 --- /dev/null +++ b/frontend/src/css/mixins/attribute.css @@ -0,0 +1,27 @@ +.attribute-item { + display: flex; + /deep/ .attribute-select { + display: flex; + .sub-selector-content { + width: 330px !important; + position: relative; + left: -1px; + } + } + .attribute-action { + margin-left: 12px; + line-height: 32px; + i { + color: #979ba5; + font-size: 20px; + cursor: pointer; + &.disabled { + color: #c4c6cc; + cursor: not-allowed; + } + } + } + &.set-margin-top { + margin-top: 8px; + } +} diff --git a/frontend/src/views/grading-admin/components/render-resource.vue b/frontend/src/views/grading-admin/components/render-resource.vue index a2a728dd3..b82ecd829 100644 --- a/frontend/src/views/grading-admin/components/render-resource.vue +++ b/frontend/src/views/grading-admin/components/render-resource.vue @@ -161,7 +161,7 @@ import OrStatusBar from '@/components/render-status/bar'; import ChooseIp from '@/components/choose-ip/grade/index'; import InstanceView from '@/components/choose-ip/view'; - import Attribute from '../../perm-apply/components/attribute'; + import Attribute from '@/views/perm-apply/components/attribute'; import Instance from '@/model/instance'; import Condition from '@/model/condition'; diff --git a/frontend/src/views/group/components/attribute.vue b/frontend/src/views/group/components/attribute.vue index 93774c54e..809d545e7 100644 --- a/frontend/src/views/group/components/attribute.vue +++ b/frontend/src/views/group/components/attribute.vue @@ -18,30 +18,45 @@ :name="option.display_name"> - - - - - - + + +
@@ -54,9 +69,11 @@
+ - diff --git a/frontend/src/views/manage-spaces/secondary-manage-space/components/attribute.vue b/frontend/src/views/manage-spaces/secondary-manage-space/components/attribute.vue index 19af60a0d..afcbcfb36 100644 --- a/frontend/src/views/manage-spaces/secondary-manage-space/components/attribute.vue +++ b/frontend/src/views/manage-spaces/secondary-manage-space/components/attribute.vue @@ -18,30 +18,45 @@ :name="option.display_name"> - - - - - - + + +
@@ -54,9 +69,11 @@
+ - diff --git a/frontend/src/views/perm-apply/components/attribute.vue b/frontend/src/views/perm-apply/components/attribute.vue index 299d53201..2fb31b191 100644 --- a/frontend/src/views/perm-apply/components/attribute.vue +++ b/frontend/src/views/perm-apply/components/attribute.vue @@ -18,31 +18,46 @@ :name="option.display_name"> - - - - - - + + +
@@ -55,10 +70,12 @@
+ - diff --git a/frontend/src/views/perm-template/components/attribute.vue b/frontend/src/views/perm-template/components/attribute.vue index 2fffdfb13..fb3829683 100644 --- a/frontend/src/views/perm-template/components/attribute.vue +++ b/frontend/src/views/perm-template/components/attribute.vue @@ -18,30 +18,44 @@ :name="option.display_name"> - - - - - - + +
@@ -54,10 +68,12 @@
+ - diff --git a/frontend/src/views/resource-permiss/components/attribute.vue b/frontend/src/views/resource-permiss/components/attribute.vue index 0ace182d5..3f0aee5ea 100644 --- a/frontend/src/views/resource-permiss/components/attribute.vue +++ b/frontend/src/views/resource-permiss/components/attribute.vue @@ -18,30 +18,44 @@ :name="option.display_name"> - - - - - - + +
@@ -54,10 +68,12 @@
+ - diff --git a/frontend/src/views/tempora-perm-apply/components/attribute.vue b/frontend/src/views/tempora-perm-apply/components/attribute.vue index 7f88318ca..3c9bbf63d 100644 --- a/frontend/src/views/tempora-perm-apply/components/attribute.vue +++ b/frontend/src/views/tempora-perm-apply/components/attribute.vue @@ -18,30 +18,44 @@ :name="option.display_name"> - - - - - - + +
@@ -54,10 +68,12 @@
+ - From c22de4f49454ad6cd6e212ec9484e7c2decfe444 Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Wed, 19 Jun 2024 15:36:26 +0800 Subject: [PATCH 26/43] =?UTF-8?q?fix:=20=E6=8F=90=E4=BE=9B=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E5=80=BC=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/index.html b/frontend/index.html index 85d8cd4b0..da1aec013 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -31,7 +31,7 @@ const ENABLE_BK_NOTICE = '{{ ENABLE_BK_NOTICE }}' || '' const BK_DOMAIN = '{{ BK_DOMAIN }}' || '' const BK_COMPONENT_API_URL = '{{ BK_COMPONENT_API_URL }}' || '' - const BK_SHARED_RES_URL = '{{ BK_SHARED_RES_URL }}' || '' + const BK_SHARED_RES_URL = '{{ BK_SHARED_RES_URL }}' || 'http://bkrepo.bk-dev.woa.com/generic/blueking/bk-config-stage/bk-config-stage' const BK_APP_CODE = '{{ BK_APP_CODE }}' || '' const VERSION = '{{ VERSION }}' || '' document.domain = '{{ SESSION_COOKIE_DOMAIN }}' From 32b1d511000fb2d50431777a5ed1eb7cf1d9acfb Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Wed, 19 Jun 2024 15:55:28 +0800 Subject: [PATCH 27/43] =?UTF-8?q?fix:=20http=E9=93=BE=E6=8E=A5=E6=94=B9?= =?UTF-8?q?=E4=B8=BAhttps?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/index.html b/frontend/index.html index da1aec013..3b0508d31 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -31,7 +31,7 @@ const ENABLE_BK_NOTICE = '{{ ENABLE_BK_NOTICE }}' || '' const BK_DOMAIN = '{{ BK_DOMAIN }}' || '' const BK_COMPONENT_API_URL = '{{ BK_COMPONENT_API_URL }}' || '' - const BK_SHARED_RES_URL = '{{ BK_SHARED_RES_URL }}' || 'http://bkrepo.bk-dev.woa.com/generic/blueking/bk-config-stage/bk-config-stage' + const BK_SHARED_RES_URL = '{{ BK_SHARED_RES_URL }}' || 'https://bkrepo.bk-dev.woa.com/generic/blueking/bk-config-stage/bk-config-stage' const BK_APP_CODE = '{{ BK_APP_CODE }}' || '' const VERSION = '{{ VERSION }}' || '' document.domain = '{{ SESSION_COOKIE_DOMAIN }}' From 0840080b88731c246208124e946f6850ead92d27 Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Wed, 19 Jun 2024 16:08:50 +0800 Subject: [PATCH 28/43] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=88=97?= =?UTF-8?q?=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/views/perm/components/render-renewal-table.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/perm/components/render-renewal-table.vue b/frontend/src/views/perm/components/render-renewal-table.vue index 13229c8f8..39f35a788 100644 --- a/frontend/src/views/perm/components/render-renewal-table.vue +++ b/frontend/src/views/perm/components/render-renewal-table.vue @@ -548,7 +548,7 @@ { label: this.$t(`m.grading['管理空间']`), prop: 'role.name' }, { label: this.$t(`m.levelSpace['管理员']`), prop: 'role_members' }, { label: this.$t(`m.common['有效期']`), prop: 'expired_at' }, - { label: this.$t(`m.common['操作']`), prop: 'operate' } + { label: this.$t(`m.common['操作-table']`), prop: 'operate' } ]; } return [ @@ -556,7 +556,7 @@ { label: this.$t(`m.common['资源实例']`), prop: 'policy' }, { label: this.$t(`m.common['所属系统']`), prop: 'system' }, { label: this.$t(`m.common['有效期']`), prop: 'expired_at' }, - { label: this.$t(`m.common['操作']`), prop: 'operate' } + { label: this.$t(`m.common['操作-table']`), prop: 'operate' } ]; }, From 0ebd3fa4c488b8a1a113ccda7d947bca2f92088a Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Wed, 19 Jun 2024 16:27:41 +0800 Subject: [PATCH 29/43] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/store/modules/global-config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/store/modules/global-config.js b/frontend/src/store/modules/global-config.js index b33a49b5c..dee80b70d 100644 --- a/frontend/src/store/modules/global-config.js +++ b/frontend/src/store/modules/global-config.js @@ -71,7 +71,7 @@ export default { if (window.BK_SHARED_RES_URL) { const repoUrl = window.BK_SHARED_RES_URL.endsWith('/') ? window.BK_SHARED_RES_URL : `${window.BK_SHARED_RES_URL}/`; try { - commitParams = await getPlatformConfig(`${repoUrl}${window.BK_APP_CODE}/base.js`, state.initialConfig); + commitParams = await getPlatformConfig(`${repoUrl}bk_iam/base.js`, state.initialConfig); if (commitParams && commitParams.site) { commitParams.site.separator = titleSeparator; } From 31485fa46705ee1af480bd814244736750a272c3 Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Wed, 19 Jun 2024 16:42:20 +0800 Subject: [PATCH 30/43] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/index.html b/frontend/index.html index 3b0508d31..bef0c05ec 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -31,7 +31,7 @@ const ENABLE_BK_NOTICE = '{{ ENABLE_BK_NOTICE }}' || '' const BK_DOMAIN = '{{ BK_DOMAIN }}' || '' const BK_COMPONENT_API_URL = '{{ BK_COMPONENT_API_URL }}' || '' - const BK_SHARED_RES_URL = '{{ BK_SHARED_RES_URL }}' || 'https://bkrepo.bk-dev.woa.com/generic/blueking/bk-config-stage/bk-config-stage' + const BK_SHARED_RES_URL = '{{ BK_SHARED_RES_URL }}' || 'https://paas6.bktencent.com//generic/blueking/bk-config-stage/bk-config-stage' const BK_APP_CODE = '{{ BK_APP_CODE }}' || '' const VERSION = '{{ VERSION }}' || '' document.domain = '{{ SESSION_COOKIE_DOMAIN }}' From 6c151bebffdd28aad4e76cc8dad84dc097f3c0c5 Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Wed, 19 Jun 2024 16:49:44 +0800 Subject: [PATCH 31/43] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/index.html | 2 +- frontend/src/store/modules/global-config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index bef0c05ec..85d8cd4b0 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -31,7 +31,7 @@ const ENABLE_BK_NOTICE = '{{ ENABLE_BK_NOTICE }}' || '' const BK_DOMAIN = '{{ BK_DOMAIN }}' || '' const BK_COMPONENT_API_URL = '{{ BK_COMPONENT_API_URL }}' || '' - const BK_SHARED_RES_URL = '{{ BK_SHARED_RES_URL }}' || 'https://paas6.bktencent.com//generic/blueking/bk-config-stage/bk-config-stage' + const BK_SHARED_RES_URL = '{{ BK_SHARED_RES_URL }}' || '' const BK_APP_CODE = '{{ BK_APP_CODE }}' || '' const VERSION = '{{ VERSION }}' || '' document.domain = '{{ SESSION_COOKIE_DOMAIN }}' diff --git a/frontend/src/store/modules/global-config.js b/frontend/src/store/modules/global-config.js index dee80b70d..b33a49b5c 100644 --- a/frontend/src/store/modules/global-config.js +++ b/frontend/src/store/modules/global-config.js @@ -71,7 +71,7 @@ export default { if (window.BK_SHARED_RES_URL) { const repoUrl = window.BK_SHARED_RES_URL.endsWith('/') ? window.BK_SHARED_RES_URL : `${window.BK_SHARED_RES_URL}/`; try { - commitParams = await getPlatformConfig(`${repoUrl}bk_iam/base.js`, state.initialConfig); + commitParams = await getPlatformConfig(`${repoUrl}${window.BK_APP_CODE}/base.js`, state.initialConfig); if (commitParams && commitParams.site) { commitParams.site.separator = titleSeparator; } From 9659af567b26ae93c10abd96e71bbc8223acceb2 Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Wed, 19 Jun 2024 17:28:35 +0800 Subject: [PATCH 32/43] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9appcode=E4=B8=BA?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/store/modules/global-config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/store/modules/global-config.js b/frontend/src/store/modules/global-config.js index b33a49b5c..dee80b70d 100644 --- a/frontend/src/store/modules/global-config.js +++ b/frontend/src/store/modules/global-config.js @@ -71,7 +71,7 @@ export default { if (window.BK_SHARED_RES_URL) { const repoUrl = window.BK_SHARED_RES_URL.endsWith('/') ? window.BK_SHARED_RES_URL : `${window.BK_SHARED_RES_URL}/`; try { - commitParams = await getPlatformConfig(`${repoUrl}${window.BK_APP_CODE}/base.js`, state.initialConfig); + commitParams = await getPlatformConfig(`${repoUrl}bk_iam/base.js`, state.initialConfig); if (commitParams && commitParams.site) { commitParams.site.separator = titleSeparator; } From f1528ad67aa58b238d59dcbdf6688f20bfac945e Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Wed, 19 Jun 2024 18:32:58 +0800 Subject: [PATCH 33/43] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=E8=BF=9C=E7=A8=8B=E5=85=A8=E5=B1=80=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/header-nav/index.vue | 26 +++++++++++--------- frontend/src/store/modules/global-config.js | 11 ++++----- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/frontend/src/components/header-nav/index.vue b/frontend/src/components/header-nav/index.vue index c8a4668f5..328147931 100644 --- a/frontend/src/components/header-nav/index.vue +++ b/frontend/src/components/header-nav/index.vue @@ -3,8 +3,8 @@
- - {{ appName }} + + {{ appName() }}
@@ -310,17 +310,21 @@ return this.searchValue === ''; }, appName () { - // 如果未获取到配置，使用默认title - if (this.globalConfig.publicConfig) { - const { name, nameEn } = this.globalConfig.publicConfig; - return this.curLanguageIsCn ? name : nameEn; - } - return this.$t('m.nav["蓝鲸权限中心"]'); + return () => { + // 如果未获取到配置，使用默认title + if (this.globalConfig) { + const { name, nameEn } = this.globalConfig; + return this.curLanguageIsCn ? name : nameEn; + } + return this.$t('m.nav["蓝鲸权限中心"]'); + }; }, appLogo () { - // 如果未获取到配置，使用默认logo - const src = this.globalConfig.publicConfig.appLogo || logoSvg; - return src; + return () => { + // 如果未获取到配置，使用默认logo + const src = this.globalConfig.appLogo || logoSvg; + return src; + }; } }, watch: { diff --git a/frontend/src/store/modules/global-config.js b/frontend/src/store/modules/global-config.js index dee80b70d..8c4e63654 100644 --- a/frontend/src/store/modules/global-config.js +++ b/frontend/src/store/modules/global-config.js @@ -71,22 +71,21 @@ export default { if (window.BK_SHARED_RES_URL) { const repoUrl = window.BK_SHARED_RES_URL.endsWith('/') ? window.BK_SHARED_RES_URL : `${window.BK_SHARED_RES_URL}/`; try { - commitParams = await getPlatformConfig(`${repoUrl}bk_iam/base.js`, state.initialConfig); + commitParams = await getPlatformConfig(`${repoUrl}bk_iam/base.js`, state.initialConfig.publicConfig); if (commitParams && commitParams.site) { commitParams.site.separator = titleSeparator; } } catch (e) { console.error(e, '错误日志'); - commitParams = await getPlatformConfig(state.initialConfig); + commitParams = await getPlatformConfig(state.initialConfig.publicConfig); } } else { // 本地开发环境调试 - commitParams = await getPlatformConfig(state.initialConfig); + commitParams = await getPlatformConfig(state.initialConfig.publicConfig); } console.log(commitParams, '配置项数据'); - const { i18n, publicConfig } = commitParams; - setDocumentTitle(i18n.name ? i18n : publicConfig); - setShortcutIcon(publicConfig.favicon); + setDocumentTitle(commitParams.i18n || {}); + setShortcutIcon(commitParams.favicon); commit('setCurrentGlobalConfig', commitParams); } } From d37a3fab18818b3294e8b75e4e14bfac3ad98708 Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Thu, 20 Jun 2024 11:27:53 +0800 Subject: [PATCH 34/43] =?UTF-8?q?fix:=20=E8=AE=BE=E7=BD=AEgetters=E7=9A=84?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/header-nav/index.vue | 27 +++++++++----------- frontend/src/store/modules/global-config.js | 2 +- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/frontend/src/components/header-nav/index.vue b/frontend/src/components/header-nav/index.vue index 328147931..74796981a 100644 --- a/frontend/src/components/header-nav/index.vue +++ b/frontend/src/components/header-nav/index.vue @@ -3,8 +3,8 @@
- - {{ appName() }} + + {{ appName }}
@@ -310,21 +310,18 @@ return this.searchValue === ''; }, appName () { - return () => { - // 如果未获取到配置，使用默认title - if (this.globalConfig) { - const { name, nameEn } = this.globalConfig; - return this.curLanguageIsCn ? name : nameEn; - } - return this.$t('m.nav["蓝鲸权限中心"]'); - }; + // 如果未获取到配置，使用默认title + if (this.globalConfig) { + const { name, nameEn } = this.globalConfig; + return this.curLanguageIsCn ? name : nameEn; + } + return this.$t('m.nav["蓝鲸权限中心"]'); }, appLogo () { - return () => { - // 如果未获取到配置，使用默认logo - const src = this.globalConfig.appLogo || logoSvg; - return src; - }; + // 如果未获取到配置，使用默认logo + console.log(this.globalConfig.appLogo); + const src = this.globalConfig.appLogo || logoSvg; + return src; } }, watch: { diff --git a/frontend/src/store/modules/global-config.js b/frontend/src/store/modules/global-config.js index 8c4e63654..523417080 100644 --- a/frontend/src/store/modules/global-config.js +++ b/frontend/src/store/modules/global-config.js @@ -48,7 +48,7 @@ export default { } }, getters: { - globalConfig: state => state.initialConfig + globalConfig: state => state.initialConfig.publicConfig }, mutations: { setCurrentGlobalConfig (state, params) { From fa9666e405b3898c84f53506acb98b624de6bcf9 Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Thu, 20 Jun 2024 11:59:55 +0800 Subject: [PATCH 35/43] =?UTF-8?q?fix:=20=E7=BB=9F=E4=B8=80=E8=BF=9C?= =?UTF-8?q?=E7=A8=8B=E9=85=8D=E7=BD=AE=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/footer/index.vue | 2 +- frontend/src/store/modules/global-config.js | 27 +++++++++------------ 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/frontend/src/components/footer/index.vue b/frontend/src/components/footer/index.vue index ccb923e45..20bec4d2b 100644 --- a/frontend/src/components/footer/index.vue +++ b/frontend/src/components/footer/index.vue @@ -64,7 +64,7 @@ return this.curLanguageIsCn ? this.globalConfig.footerInfoHTML : this.globalConfig.footerInfoHTMLEn; }, copyright () { - return this.globalConfig.footer.copyright; + return this.globalConfig.footerCopyrightContent; } }, created () { diff --git a/frontend/src/store/modules/global-config.js b/frontend/src/store/modules/global-config.js index 523417080..4ca61797f 100644 --- a/frontend/src/store/modules/global-config.js +++ b/frontend/src/store/modules/global-config.js @@ -33,22 +33,17 @@ export default { name: '', // 网站名 separator: '|' // 网站名称路由分隔符 }, - footer: { - copyright: `Copyright © 2012-${new Date().getFullYear()} Tencent BlueKing. All Rights Reserved.` - }, - publicConfig: { - name: '权限中心', - nameEn: 'BK_IAM', - brandName: '腾讯蓝鲸智云', - brandNameEn: 'BlueKing', - appLogo: require('@/images/logo.svg'), - favicon: require('@/images/logo.svg'), - version: '' - } + name: '权限中心', + nameEn: 'BK_IAM', + brandName: '腾讯蓝鲸智云', + brandNameEn: 'BlueKing', + appLogo: require('@/images/logo.svg'), + favicon: require('@/images/logo.svg'), + version: '' } }, getters: { - globalConfig: state => state.initialConfig.publicConfig + globalConfig: state => state.initialConfig }, mutations: { setCurrentGlobalConfig (state, params) { @@ -71,17 +66,17 @@ export default { if (window.BK_SHARED_RES_URL) { const repoUrl = window.BK_SHARED_RES_URL.endsWith('/') ? window.BK_SHARED_RES_URL : `${window.BK_SHARED_RES_URL}/`; try { - commitParams = await getPlatformConfig(`${repoUrl}bk_iam/base.js`, state.initialConfig.publicConfig); + commitParams = await getPlatformConfig(`${repoUrl}bk_iam/base.js`, state.initialConfig); if (commitParams && commitParams.site) { commitParams.site.separator = titleSeparator; } } catch (e) { console.error(e, '错误日志'); - commitParams = await getPlatformConfig(state.initialConfig.publicConfig); + commitParams = await getPlatformConfig(state.initialConfig); } } else { // 本地开发环境调试 - commitParams = await getPlatformConfig(state.initialConfig.publicConfig); + commitParams = await getPlatformConfig(state.initialConfig); } console.log(commitParams, '配置项数据'); setDocumentTitle(commitParams.i18n || {}); From cffe6e4964f1a244bc0fdff1b07c7c5ecbf2bdcc Mon Sep 17 00:00:00 2001 From: lhzzforever Date: Thu, 20 Jun 2024 12:37:18 +0800 Subject: [PATCH 36/43] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dkey=E5=80=BC?= =?UTF-8?q?=E6=98=AF=E4=B8=AAobject=E5=BC=82=E5=B8=B8=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/render-resource/edit.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/render-resource/edit.vue b/frontend/src/components/render-resource/edit.vue index 675a40bde..6af565012 100644 --- a/frontend/src/components/render-resource/edit.vue +++ b/frontend/src/components/render-resource/edit.vue @@ -2,7 +2,7 @@
diff --git a/frontend/src/views/group/components/add-action-sideslider.vue b/frontend/src/views/group/components/add-action-sideslider.vue index 9c9a1a9e4..983e6bf00 100644 --- a/frontend/src/views/group/components/add-action-sideslider.vue +++ b/frontend/src/views/group/components/add-action-sideslider.vue @@ -13,20 +13,18 @@ v-bkloading="{ isLoading, opacity: 1 }"> -
diff --git a/frontend/src/views/manage-spaces/secondary-manage-space/components/add-action-sideslider.vue b/frontend/src/views/manage-spaces/secondary-manage-space/components/add-action-sideslider.vue index d7204d344..1dc9a4336 100644 --- a/frontend/src/views/manage-spaces/secondary-manage-space/components/add-action-sideslider.vue +++ b/frontend/src/views/manage-spaces/secondary-manage-space/components/add-action-sideslider.vue @@ -13,20 +13,18 @@ v-bkloading="{ isLoading, opacity: 1 }">