Skip to content

Commit

Permalink
Merge pull request #2338 from TencentBlueKing/develop
Browse files Browse the repository at this point in the history 
v1.10.16
  • Loading branch information
@zhu327
zhu327 authored Nov 7, 2023
2 parents c444e13 + d44337c commit 3b35d88
Show file tree
Hide file tree
Showing 125 changed files with 7,489 additions and 2,439 deletions.
3 changes: 2 additions & 1 deletion frontend/build/paas-server.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ const GLOBAL_VAR = {
ENABLE_GROUP_INSTANCE_SEARCH: process.env.ENABLE_GROUP_INSTANCE_SEARCH || '',
ENABLE_ORGANIZATION_COUNT: process.env.ENABLE_ORGANIZATION_COUNT || '',
ENABLE_ASSISTANT: process.env.ENABLE_ASSISTANT || '',
BK_COMPONENT_API_URL: process.env.BK_COMPONENT_API_URL || ''
BK_COMPONENT_API_URL: process.env.BK_COMPONENT_API_URL || '',
BK_DOCS_URL_PREFIX: process.env.BK_DOCS_URL_PREFIX || ''
};

// APA 重定向回首页，由首页Route响应处理
Expand Down
11 changes: 10 additions & 1 deletion frontend/build/webpack.base.conf.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,5 +139,14 @@ export default {
toType: 'dir'
}
])
]
],

performance: {
hints: 'warning',
maxEntrypointSize: 50000000,
maxAssetSize: 30000000,
assetFilter: function (assetFilename) {
return assetFilename.endsWith('.css') || assetFilename.endsWith('.js') || assetFilename.endsWith('.png');
}
}
};
4 changes: 2 additions & 2 deletions frontend/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
const BK_PAAS_HOST = '{{ BK_PAAS_HOST }}'
const BK_USER_API = '{{ BK_COMPONENT_API_URL }}' + '/api/c/compapi/v2/usermanage/fs_list_users/'
const CSRF_COOKIE_NAME = '{{ CSRF_COOKIE_NAME }}'
const PRODUCT_DOC_URL_PREFIX = 'https://bk.tencent.com/docs/'
const BK_DOCS_URL_PREFIX = '{{ BK_DOCS_URL_PREFIX }}' + '/markdown'
const CE_URL = 'https://bk.tencent.com/s-mart/community'
const BK_ITSM_APP_URL = '{{ BK_ITSM_APP_URL }}'
const ENABLE_MODEL_BUILD = '{{ ENABLE_MODEL_BUILD }}' || ''
Expand All @@ -37,7 +37,7 @@
window.BK_USER_API = BK_USER_API
window.CUR_LANGUAGE = getLanguage()
window.CSRF_COOKIE_NAME = CSRF_COOKIE_NAME
window.PRODUCT_DOC_URL_PREFIX = PRODUCT_DOC_URL_PREFIX
window.BK_DOCS_URL_PREFIX = BK_DOCS_URL_PREFIX
window.BK_ITSM_APP_URL = BK_ITSM_APP_URL
window.ENABLE_MODEL_BUILD = ENABLE_MODEL_BUILD
window.ENABLE_PERMISSION_HANDOVER = ENABLE_PERMISSION_HANDOVER
Expand Down
60 changes: 60 additions & 0 deletions frontend/src/assets/iconfont/demo.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,18 @@ <h2 class="page-title">
<span class="icon iam-icon iamcenter-time-circle-fill"></span>
<p class="icon-text">time-circle-fill</p>
</li>
<li class="icon-item" title="help">
<span class="icon iam-icon iamcenter-help"></span>
<p class="icon-text">help</p>
</li>
<li class="icon-item" title="add-fill">
<span class="icon iam-icon iamcenter-add-fill"></span>
<p class="icon-text">add-fill</p>
</li>
<li class="icon-item" title="reduce-fill">
<span class="icon iam-icon iamcenter-reduce-fill"></span>
<p class="icon-text">reduce-fill</p>
</li>
<li class="icon-item" title="check">
<span class="icon iam-icon iamcenter-check"></span>
<p class="icon-text">check</p>
Expand Down Expand Up @@ -629,6 +641,10 @@ <h2 class="page-title">
<span class="icon iam-icon iamcenter-level-one-manage-space"></span>
<p class="icon-text">level-one-manage-space</p>
</li>
<li class="icon-item" title="shezhi">
<span class="icon iam-icon iamcenter-shezhi"></span>
<p class="icon-text">shezhi</p>
</li>
<li class="icon-item" title="my-manage-space">
<span class="icon iam-icon iamcenter-my-manage-space"></span>
<p class="icon-text">my-manage-space</p>
Expand All @@ -637,6 +653,14 @@ <h2 class="page-title">
<span class="icon iam-icon iamcenter-auth-scope"></span>
<p class="icon-text">auth-scope</p>
</li>
<li class="icon-item" title="mingandengji">
<span class="icon iam-icon iamcenter-mingandengji"></span>
<p class="icon-text">mingandengji</p>
</li>
<li class="icon-item" title="all">
<span class="icon iam-icon iamcenter-all"></span>
<p class="icon-text">all</p>
</li>
</ul>
<h3 class="describe-title">为什么使用</h3>
<ul class="use-describe">
Expand Down Expand Up @@ -666,6 +690,24 @@ <h3 class="describe-title">如何使用</h3>
</svg>
<p class="icon-text">time-circle-fill</p>
</li>
<li class="colorful-icon">
<svg class="icon svg-icon">
<use xlink:href="#iamcenter-help"></use>
</svg>
<p class="icon-text">help</p>
</li>
<li class="colorful-icon">
<svg class="icon svg-icon">
<use xlink:href="#iamcenter-add-fill"></use>
</svg>
<p class="icon-text">add-fill</p>
</li>
<li class="colorful-icon">
<svg class="icon svg-icon">
<use xlink:href="#iamcenter-reduce-fill"></use>
</svg>
<p class="icon-text">reduce-fill</p>
</li>
<li class="colorful-icon">
<svg class="icon svg-icon">
<use xlink:href="#iamcenter-check"></use>
Expand Down Expand Up @@ -1422,6 +1464,12 @@ <h3 class="describe-title">如何使用</h3>
</svg>
<p class="icon-text">level-one-manage-space</p>
</li>
<li class="colorful-icon">
<svg class="icon svg-icon">
<use xlink:href="#iamcenter-shezhi"></use>
</svg>
<p class="icon-text">shezhi</p>
</li>
<li class="colorful-icon">
<svg class="icon svg-icon">
<use xlink:href="#iamcenter-my-manage-space"></use>
Expand All @@ -1434,6 +1482,18 @@ <h3 class="describe-title">如何使用</h3>
</svg>
<p class="icon-text">auth-scope</p>
</li>
<li class="colorful-icon">
<svg class="icon svg-icon">
<use xlink:href="#iamcenter-mingandengji"></use>
</svg>
<p class="icon-text">mingandengji</p>
</li>
<li class="colorful-icon">
<svg class="icon svg-icon">
<use xlink:href="#iamcenter-all"></use>
</svg>
<p class="icon-text">all</p>
</li>
</ul>
<h3 class="describe-title">为什么使用</h3>
<ul class="use-describe">
Expand Down
Binary file modified frontend/src/assets/iconfont/fonts/iconcool.eot
View file
Binary file not shown.
18 changes: 18 additions & 0 deletions frontend/src/assets/iconfont/fonts/iconcool.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified frontend/src/assets/iconfont/fonts/iconcool.ttf
View file
Binary file not shown.
Binary file modified frontend/src/assets/iconfont/fonts/iconcool.woff
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion frontend/src/assets/iconfont/iconcool.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion frontend/src/assets/iconfont/iconcool.json
View file

Large diffs are not rendered by default.

18 changes: 18 additions & 0 deletions frontend/src/assets/iconfont/style.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,15 @@ url("fonts/iconcool.eot?#iefix") format("embedded-opentype");
.iamcenter-time-circle-fill:before {
content: "\e20b";
}
.iamcenter-help:before {
content: "\e220";
}
.iamcenter-add-fill:before {
content: "\e222";
}
.iamcenter-reduce-fill:before {
content: "\e223";
}
.iamcenter-check:before {
content: "\e19b";
}
Expand Down Expand Up @@ -407,9 +416,18 @@ url("fonts/iconcool.eot?#iefix") format("embedded-opentype");
.iamcenter-level-one-manage-space:before {
content: "\e218";
}
.iamcenter-shezhi:before {
content: "\e21f";
}
.iamcenter-my-manage-space:before {
content: "\e219";
}
.iamcenter-auth-scope:before {
content: "\e21a";
}
.iamcenter-mingandengji:before {
content: "\e221";
}
.iamcenter-all:before {
content: "\e224";
}
4 changes: 2 additions & 2 deletions frontend/src/common/bkmagic.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export const messageWarn = (message, delay = 3000, ellipsisLine = 3) => {

// message高阶用法

export const messageAdvancedError = (details, delay = 8000, ellipsisLine = 3) => {
export const messageAdvancedError = (details, delay = 8000, ellipsisLine = 3, externalMsg = '') => {
// 区分内外部链接
let linkContent = {
url: ''
Expand All @@ -106,7 +106,7 @@ export const messageAdvancedError = (details, delay = 8000, ellipsisLine = 3) =>
linkMap[isTencent]();
const { code, data, message, statusText, response } = details;
let errCode = null;
const errMsg = message || data.msg || statusText;
const errMsg = externalMsg || (message || data.msg || statusText);
if (code) {
errCode = code;
}
Expand Down
Loading

0 comments on commit 3b35d88

Please sign in to comment.