+
{{ viewValue }}
{{ viewValue }}
@@ -29,6 +29,10 @@
type: String,
required: false,
default: ''
+ },
+ color: {
+ type: String,
+ default: 'inherit'
}
}
export default {
diff --git a/frontend/desktop/src/pages/admin/statistics/Percentage.vue b/frontend/desktop/src/pages/admin/statistics/Percentage.vue
index 1f9dd987c1..cdf8c6dd6f 100644
--- a/frontend/desktop/src/pages/admin/statistics/Percentage.vue
+++ b/frontend/desktop/src/pages/admin/statistics/Percentage.vue
@@ -32,6 +32,7 @@
:min-width="item.width"
:label="item.label"
:align="item.align"
+ :resizable="false"
show-overflow-tooltip
:render-header="renderTableHeader"
:prop="item.prop">
diff --git a/frontend/desktop/src/utils/errorNotify.js b/frontend/desktop/src/utils/errorNotify.js
index 86a8b4237a..22f550f82a 100644
--- a/frontend/desktop/src/utils/errorNotify.js
+++ b/frontend/desktop/src/utils/errorNotify.js
@@ -1,92 +1,65 @@
-// 接口异常通知提示，出现在页面右上角，10s后自动关闭，鼠标hover时暂停计时
+// 接口异常通知提示
import i18n from '@/config/i18n/index.js'
import bus from '@/utils/bus.js'
export default class ErrorNotify {
constructor (errorInfo, vueInstance) {
- const { msg, type, traceId, errorSource } = errorInfo
- const h = vueInstance.$createElement
- this.showMore = false
- this.notify = vueInstance.$bkNotify({
- theme: type,
- offsetY: 80,
- limit: 5,
- limitLine: 0,
- delay: 0,
- title: this.setNotifyTitleAndContent(msg, true, errorSource),
- message: h('div',
- [
- traceId || msg ? h('p', {
- class: 'toggle-btn',
- style: { position: 'absolute', top: '24px', right: '36px', color: '#3a84ff', cursor: 'pointer' },
- on: {
- click: () => {
- this.toggleShowMore()
- }
- }
- }, [i18n.t('展开详情')]) : '',
- h('div', {
- class: 'bk-notify-content-text',
- style: this.showMore ? {} : {
- 'display': '-webkit-box',
- 'overflow': 'hidden',
- 'text-overflow': 'ellipsis',
- 'word-break': 'break-all',
- '-webkit-line-clamp': '2',
- '-webkit-box-orient': 'vertical'
- }
- }, [
- msg ? this.setNotifyTitleAndContent(msg, false, errorSource, 0) : ''
- ]),
- h('div', {
- class: 'bk-notify-trace-content',
- style: { display: 'none', maxHeight: '300px', overflow: 'auto', margin: '10px 0 0 0' }
- }, [
- traceId ? h('p', [`trace_id：${traceId}`]) : '',
- msg && errorSource === 'result' ? h('p', ['error_function: ', this.setNotifyTitleAndContent(msg, false, errorSource, 1) || '--']) : ''
- ]),
- h('bk-button', {
- class: 'copy-btn',
- style: { display: 'none', position: 'relative', margin: '10px 10px 0 auto' },
- on: {
- click: () => {
- this.handleCopy(vueInstance, errorInfo)
- }
- }
- }, [i18n.t('复制')])
- ]
- ),
- onClose: this.handleClose
- })
+ const { msg, type, traceId, errorSource, title } = errorInfo
+ this.type = type
+ // 标题
+ const msgTitle = title || this.getTitleAndContent(msg, true, errorSource)
- // 内容区域及进度条样式处理
- this.notify.$el.style.width = '450px'
- this.notify.$el.style.zIndex = '2500'
- const progressWrap = document.createElement('div')
- const bar = document.createElement('div')
- progressWrap.style.cssText = 'position: absolute; left: 0; bottom: 0; width: 100%; height: 4px; background: #f0f1f5;'
- bar.style.cssText = 'height: 100%; width: 100%; background: #cbcedb;'
- bar.className = 'progress-bar'
- progressWrap.appendChild(bar)
- this.notify.$el.appendChild(progressWrap)
+ // 详情
+ let details = {}
+ const msgLabel = type === 'success' ? 'success_msg' : 'error_msg'
+ details[msgLabel] = this.getTitleAndContent(msg, false, errorSource, 0)
+ if (traceId) {
+ details.trace_id = traceId
+ }
+ if (errorSource === 'result') {
+ details.error_func = this.getTitleAndContent(msg, false, errorSource, 1) || '--'
+ }
+ details = JSON.stringify(details)
- // title 样式处理
- const notifyContentDom = document.querySelector('.bk-notify-content')
- const titleDom = document.querySelector('.bk-notify-content-title')
- notifyContentDom.style.cssText = 'width: 90%'
- titleDom.style.cssText = 'width: 80%; white-space: nowrap;overflow: hidden; text-overflow: ellipsis;'
- titleDom.title = this.setNotifyTitleAndContent(msg, true, errorSource) || ''
+ // 助手
+ const helperUrl = type === 'success' ? '' : window.MESSAGE_HELPER_URL || ''
- this.remainingTime = 10000 // 倒数10s
- this.timer = null // 定时器示例
- this.errorMsg = msg // 来自window.msg_list的错误信息
- this.startTimeCountDown(this.remainingTime)
- this.handleMouseEvent()
+ // 工具列表
+ const actions = [
+ { id: 'assistant', disabled: !helperUrl },
+ { id: 'details' },
+ { id: 'fix' },
+ { id: 'close' }
+ ]
+ vueInstance.$bkMessage({
+ message: {
+ title: msgTitle,
+ details,
+ assistant: helperUrl,
+ type: 'key-value'
+ },
+ actions,
+ theme: type,
+ ellipsisLine: 2,
+ ellipsisCopy: true,
+ extCls: 'interface-exception-notify-message',
+ onClose: () => {
+ const index = window.msg_list.findIndex(item => item.msg === msg)
+ if (index > -1) {
+ window.msg_list.splice(index, 1)
+ }
+ bus.$emit('onCloseErrorNotify', details)
+ }
+ })
}
- setNotifyTitleAndContent (info, isTitle, errorSource, msgIndex) {
+ getTitleAndContent (info, isTitle, errorSource, msgIndex) {
let content = ''
if (errorSource !== 'result') {
- const infoArr = info.split(': ')
- content = isTitle ? infoArr[0].split('{')[1].replace(/\'|\"/g, '') : (infoArr[1] || infoArr[0]).split('}')[0]
+ if (info.match(': ')) {
+ const infoArr = info.split(': ')
+ content = isTitle ? infoArr[0].split('{')[1].replace(/\'|\"/g, '') : (infoArr[1] || infoArr[0]).split('}')[0]
+ } else {
+ content = isTitle ? '' : info
+ }
} else {
const { message } = JSON.parse(info)
const regex = /([^:]*)?: (.*)?/ // 标准数据结构
@@ -97,96 +70,13 @@ export default class ErrorNotify {
content = isTitle ? message : message?.split(' | ')[msgIndex]
}
}
- if (isTitle && (!content || content.length > 21)) { // 21为标题能容纳的最大数量
- content = errorSource === 'result' ? i18n.t('请求异常（外部系统错误或非法操作）') : i18n.t('请求异常（内部系统发生未知错误）')
+ if (isTitle && !content) {
+ content = this.type === 'success'
+ ? i18n.t('请求成功')
+ : errorSource === 'result'
+ ? i18n.t('请求异常（外部系统错误或非法操作）')
+ : i18n.t('请求异常（内部系统发生未知错误）')
}
return content
}
- // 开始倒计时
- startTimeCountDown () {
- if (!this.notify) {
- return
- }
- this.timer = setTimeout(() => {
- if (this.remainingTime > 0) {
- this.remainingTime -= 100
- this.notify.$el.querySelector('.progress-bar').style.width = `${(this.remainingTime / 10000) * 100}%`
- this.startTimeCountDown()
- } else {
- const index = window.msg_list.findIndex(item => item.msg === this.errorMsg)
- if (index > -1) {
- window.msg_list.splice(index, 1)
- }
- this.notify.$el.removeEventListener('mouseenter', this.stopTimeCountDown, false)
- this.notify.$el.removeEventListener('mouseleave', this.startTimeCountDown, false)
- this.notify && this.notify.close()
- this.notify = null
- }
- }, 100)
- }
- stopTimeCountDown () {
- this.timer && clearTimeout(this.timer)
- }
- handleMouseEvent () {
- this.notify.$el.addEventListener('mouseenter', this.stopTimeCountDown.bind(this), false)
- this.notify.$el.addEventListener('mouseleave', this.startTimeCountDown.bind(this), false)
- }
- toggleShowMore () {
- this.showMore = !this.showMore
- // 设置切换按钮文案
- const btnDom = this.notify.$el.querySelector('.toggle-btn')
- if (btnDom) {
- btnDom.innerHTML = this.showMore ? i18n.t('隐藏详情') : i18n.t('展开详情')
- }
- // 计算当前展开的notify最大层级
- const notifyErrorDoms = document.querySelectorAll('.bk-notify')
- const zIndexList = [2500] // 默认层级2500
- if (notifyErrorDoms) {
- notifyErrorDoms.forEach(dom => {
- zIndexList.push(Number(dom.style.zIndex))
- })
- }
- this.notify.$el.style.zIndex = this.showMore ? Math.max(...zIndexList) + 1 : 2500
- const contentTextDom = this.notify.$el.querySelector('.bk-notify-content-text')
- if (this.showMore) {
- contentTextDom.classList.add('is-expand')
- } else {
- contentTextDom.scrollTop = 0
- contentTextDom.classList.remove('is-expand')
- }
- this.notify.$el.querySelector('.bk-notify-trace-content').style.display = this.showMore ? 'block' : 'none'
- this.notify.$el.querySelector('.copy-btn').style.display = this.showMore ? 'block' : 'none'
- }
- handleClose (instance) {
- instance.$el.querySelector('.bk-notify-trace-content').style.display = 'none'
- const errorMsg = instance.$el.textContent
- bus.$emit('onCloseErrorNotify', errorMsg)
- }
- handleCopy (vueInstance, errorInfo) {
- const { msg, traceId, errorSource } = errorInfo
- let copyMsg = ''
- if (msg) {
- copyMsg = this.setNotifyTitleAndContent(msg, true, errorSource) + '\n'
- copyMsg = copyMsg + this.setNotifyTitleAndContent(msg, false, errorSource, 0) + '\n'
- }
- if (traceId) {
- copyMsg = copyMsg + `trace_id：${traceId}` + '\n'
- }
- if (msg && errorSource === 'result') {
- copyMsg = copyMsg + 'error_function: ' + this.setNotifyTitleAndContent(msg, false, errorSource, 1) || '--'
- }
- const textarea = document.createElement('textarea')
- document.body.appendChild(textarea)
- textarea.style.position = 'fixed'
- textarea.style.clip = 'rect(0 0 0 0)'
- textarea.style.top = '10px'
- textarea.value = copyMsg
- textarea.select()
- document.execCommand('copy', true)
- document.body.removeChild(textarea)
- vueInstance.$bkMessage({
- theme: 'success',
- message: i18n.t('复制成功')
- })
- }
}
From 1fffb74c8e7c350e4cbaee3a480010cf4cb25f85 Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Fri, 8 Dec 2023 19:55:09 +0800
Subject: [PATCH 48/62] =?UTF-8?q?fix:=20=E6=88=91=E7=9A=84=E6=94=B6?=
=?UTF-8?q?=E8=97=8F=E9=A1=B5=E9=9D=A2=E6=94=AF=E6=8C=81=E5=B1=95=E7=A4=BA?=
=?UTF-8?q?=E6=94=B6=E8=97=8F=E7=9A=84=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
gcloud/contrib/collection/models.py | 9 ++++++--
gcloud/core/apis/drf/viewsets/collection.py | 23 ++++++++++++++-----
gcloud/core/apis/drf/viewsets/user_project.py | 3 +--
.../collection/test_user_favorite_project.py | 7 +++++-
4 files changed, 31 insertions(+), 11 deletions(-)
diff --git a/gcloud/contrib/collection/models.py b/gcloud/contrib/collection/models.py
index c0c5477814..a690a6086d 100644
--- a/gcloud/contrib/collection/models.py
+++ b/gcloud/contrib/collection/models.py
@@ -20,8 +20,13 @@ class CollectionManager(models.Manager):
def cascade_delete(self, category, instance_id):
self.filter(category=category, instance_id=instance_id).delete()
- def add_user_favorite_project(self, username, project_id):
- return self.get_or_create(category="project", username=username, instance_id=project_id)
+ def add_user_favorite_project(self, username, project):
+ return self.get_or_create(
+ category="project",
+ username=username,
+ instance_id=project.id,
+ defaults={"extra_info": json.dumps({"id": project.id, "name": project.name})},
+ )
def remove_user_favorite_project(self, username, project_id):
return self.filter(category="project", username=username, instance_id=project_id).delete()
diff --git a/gcloud/core/apis/drf/viewsets/collection.py b/gcloud/core/apis/drf/viewsets/collection.py
index 6bf3f40d75..b2f859d40a 100644
--- a/gcloud/core/apis/drf/viewsets/collection.py
+++ b/gcloud/core/apis/drf/viewsets/collection.py
@@ -11,17 +11,20 @@
specific language governing permissions and limitations under the License.
"""
-from rest_framework import permissions, status, mixins
-from rest_framework.response import Response
+import logging
+
+from django.utils.translation import ugettext_lazy as _
+from rest_framework import mixins, permissions, status
from rest_framework.exceptions import ErrorDetail
+from rest_framework.response import Response
+from gcloud import err_code
from gcloud.contrib.collection.models import Collection
from gcloud.core.apis.drf.serilaziers.collection import CollectionSerializer
from gcloud.core.apis.drf.viewsets import GcloudReadOnlyViewSet
-from gcloud import err_code
-from gcloud.iam_auth import IAMMeta, utils as iam_auth_utils
-from django.utils.translation import ugettext_lazy as _
-import logging
+from gcloud.iam_auth import IAMMeta
+from gcloud.iam_auth import utils as iam_auth_utils
+from gcloud.iam_auth.utils import get_user_projects
logger = logging.getLogger("root")
@@ -69,6 +72,7 @@ def create(self, request, *args, **kwargs):
return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
def injection_auth_actions(self, request, serializer_data, queryset_data):
+ # 计算项目之下其他资源的权限
resource_id_list_map = {r_type: [] for r_type in self.append_resource_actions}
resource_allowed_actions_map = {}
@@ -83,7 +87,14 @@ def injection_auth_actions(self, request, serializer_data, queryset_data):
iam_auth_utils, "get_{}_allowed_actions_for_user".format(r_type)
)(request.user.username, self.append_resource_actions[r_type], id_list)
+ # 计算有查看权限的项目资源
+ user_projects = set(get_user_projects(request.user.username).values_list("id", flat=True))
+
for item in serializer_data:
+ if item["category"] == "project":
+ item["auth_actions"] = [IAMMeta.PROJECT_VIEW_ACTION] if item["instance_id"] in user_projects else []
+ continue
+
if item["category"] not in resource_allowed_actions_map:
item["auth_actions"] = []
continue
diff --git a/gcloud/core/apis/drf/viewsets/user_project.py b/gcloud/core/apis/drf/viewsets/user_project.py
index cabbc1478f..29da342ae2 100644
--- a/gcloud/core/apis/drf/viewsets/user_project.py
+++ b/gcloud/core/apis/drf/viewsets/user_project.py
@@ -78,9 +78,8 @@ def list(self, request, *args, **kwargs):
@action(methods=["post"], detail=True)
def favor(self, request, *args, **kwargs):
- project_id = kwargs["pk"]
try:
- Collection.objects.add_user_favorite_project(request.user.username, project_id)
+ Collection.objects.add_user_favorite_project(request.user.username, self.get_object())
except IntegrityError as e:
logger.exception(e)
return Response({"result": False, "data": None, "message": "该用户已收藏该项目"}, status=400)
diff --git a/gcloud/tests/contrib/collection/test_user_favorite_project.py b/gcloud/tests/contrib/collection/test_user_favorite_project.py
index a41474cc5a..a678759c08 100644
--- a/gcloud/tests/contrib/collection/test_user_favorite_project.py
+++ b/gcloud/tests/contrib/collection/test_user_favorite_project.py
@@ -10,6 +10,7 @@
an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
specific language governing permissions and limitations under the License.
"""
+from unittest.mock import MagicMock
from django.test import TestCase
@@ -21,12 +22,16 @@ def setUp(self):
self.username = "user"
self.project_id = 1
+ self.mock_project = MagicMock()
+ self.mock_project.id = 1
+ self.mock_project.name = "mock_project"
+
def tearDown(self):
Collection.objects.all().delete()
def test_add_user_favorite_project(self):
self.assertEqual(Collection.objects.count(), 0)
- Collection.objects.add_user_favorite_project(self.username, self.project_id)
+ Collection.objects.add_user_favorite_project(self.username, self.mock_project)
self.assertEqual(Collection.objects.count(), 1)
def test_remove_user_favorite_project(self):
From 3a3cffde636997cf4f783977b1533952d30e7068 Mon Sep 17 00:00:00 2001
From: waylon <1158341873@qq.com>
Date: Fri, 8 Dec 2023 20:02:18 +0800
Subject: [PATCH 49/62] =?UTF-8?q?feat:=20=E6=94=AF=E6=8C=81=E5=86=85?=
=?UTF-8?q?=E7=BD=AE=E6=8F=92=E4=BB=B6=E9=BB=98=E8=AE=A4=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../sites/open/wechat_work/wechat_work_send_message/v1_0.py | 6 ++----
requirements.txt | 2 +-
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/pipeline_plugins/components/collections/sites/open/wechat_work/wechat_work_send_message/v1_0.py b/pipeline_plugins/components/collections/sites/open/wechat_work/wechat_work_send_message/v1_0.py
index 1d00698457..3800a64e01 100644
--- a/pipeline_plugins/components/collections/sites/open/wechat_work/wechat_work_send_message/v1_0.py
+++ b/pipeline_plugins/components/collections/sites/open/wechat_work/wechat_work_send_message/v1_0.py
@@ -38,10 +38,7 @@ def inputs_format(self):
schema=StringItemSchema(description=_("通过在群里@企业微信机器人获取，多个用换行分隔")),
),
self.InputItem(
- name=_("消息内容"),
- key="message_content",
- type="string",
- schema=StringItemSchema(description=_("消息内容")),
+ name=_("消息内容"), key="message_content", type="string", schema=StringItemSchema(description=_("消息内容")),
),
self.InputItem(
name=_("提醒人"),
@@ -139,4 +136,5 @@ class WechatWorkSendMessageComponent(Component):
bound_service = WechatWorkSendMessageService
form = "%scomponents/atoms/wechat_work/wechat_work_send_message/v1_0.js" % settings.STATIC_URL
version = "1.0"
+ is_default_version = True
desc = _("1.部署环境与企业微信服务器网络必须联通 " "2.通过企业微信机器人获取会话 ID，可参考https://open.work.weixin.qq.com/api/doc/90000/90136/91770")
diff --git a/requirements.txt b/requirements.txt
index 4a9c3f02cd..03f1e450b7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -28,7 +28,7 @@ pyinstrument==3.1.3
djangorestframework==3.11.2
django-filter==2.4.0
prometheus-client==0.9.0
-bamboo-pipeline==3.24.2
+bamboo-pipeline==3.24.4
drf-yasg==1.20.0
typing-extensions==3.7.4.3
pyyaml==5.4.1
From 219523c4fae72d86858fe439bd2610eb2b5aa156 Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Mon, 11 Dec 2023 10:02:15 +0800
Subject: [PATCH 50/62] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DIP=E9=80=89?=
=?UTF-8?q?=E6=8B=A9=E5=99=A8=E4=BD=93=E9=AA=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/RenderForm/IpSelector/StaticIp.vue | 4 +--
.../IpSelector/StaticIpAddingPanel.vue | 35 +++++++++++--------
frontend/desktop/src/config/i18n/cn.js | 5 ++-
frontend/desktop/src/config/i18n/en.js | 5 ++-
4 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIp.vue b/frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIp.vue
index 4601d5ebf3..d1991ccc4f 100644
--- a/frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIp.vue
+++ b/frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIp.vue
@@ -43,7 +43,7 @@
@search="onStaticIpSearch">
-
{{ i18n.return }}
+
{{ $t('返回') }}