-
+
{{ backName }}
@@ -131,9 +131,6 @@
this.initData();
},
methods: {
- backTab() {
- this.$parent.displayInfo.level_1 = {};
- },
changTitle(item, index) {
this.checkIndex = index;
},
diff --git a/frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue b/frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue
index c1270546b..f3c1cd26d 100644
--- a/frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue
+++ b/frontend/pc/src/views/processManagement/apiConfigure/apiTable.vue
@@ -334,7 +334,6 @@
await this.$parent.getRemoteApiDetail(item.id);
},
getRemoteSystemData() {
- debugger;
this.$parent.getRemoteSystemData();
const customPaging = {
page: this.pagination.current,
diff --git a/frontend/pc/src/views/processManagement/apiConfigure/index.vue b/frontend/pc/src/views/processManagement/apiConfigure/index.vue
index d23ff1ccc..8de2bb8a9 100644
--- a/frontend/pc/src/views/processManagement/apiConfigure/index.vue
+++ b/frontend/pc/src/views/processManagement/apiConfigure/index.vue
@@ -39,7 +39,8 @@
-
-
+ :is-builtin-id-list="isBuiltinIdList"
+ @back="handleBackToList">
@@ -305,6 +308,18 @@
.finally(() => {
});
},
+ handleBackToList() {
+ this.displayInfo.level_1 = {};
+ this.$nextTick(() => {
+ const { pagination, searchInfo } = this.$refs.apiTable;
+ const { current, limit } = pagination;
+ const pageParams = {
+ page: current,
+ page_size: limit,
+ };
+ this.getTableList(this.displayInfo.level_0.id || '', pageParams, searchInfo);
+ });
+ },
},
};
diff --git a/frontend/pc/src/views/processManagement/taskTemplate/components/commonStep.vue b/frontend/pc/src/views/processManagement/taskTemplate/components/commonStep.vue
index 53557f648..1aa11309a 100644
--- a/frontend/pc/src/views/processManagement/taskTemplate/components/commonStep.vue
+++ b/frontend/pc/src/views/processManagement/taskTemplate/components/commonStep.vue
@@ -107,7 +107,8 @@
diff --git a/frontend/pc/src/views/processManagement/taskTemplate/components/commonTriggerList.vue b/frontend/pc/src/views/processManagement/taskTemplate/components/commonTriggerList.vue
index 8ad7ca896..5d8026f65 100644
--- a/frontend/pc/src/views/processManagement/taskTemplate/components/commonTriggerList.vue
+++ b/frontend/pc/src/views/processManagement/taskTemplate/components/commonTriggerList.vue
@@ -53,8 +53,12 @@
-
-
+
+
@@ -120,6 +124,7 @@
data-test-id="common-trigger-confirm"
class="mr10"
:title="$t(`m.taskTemplate['确定']`)"
+ :disabled="citeList.length === 0"
@click="citeTrigger">
{{$t(`m.taskTemplate['确定']`)}}
@@ -197,6 +202,11 @@
type: String,
default: '',
},
+ // 是否可以引用公共触发器
+ citable: {
+ type: Boolean,
+ default: true,
+ },
},
data() {
return {
@@ -359,6 +369,11 @@
trigger.checked = flag;
});
},
+ handleAddTrigger() {
+ if (!this.citable) {
+ this.openNew('add');
+ }
+ },
openNew(type, item = {}) {
this.originInfoToTrigger = {
id: this.sourceId,
@@ -490,4 +505,11 @@
@import '../../publicTrigger/triggerCss/index';
@import '../taskCss/commonTrigger';
@import '~@/scss/common-section-card.scss';
+ .trigger-dropdown.bk-dropdown-menu {
+ float: left;
+ cursor: pointer;
+ /deep/ .bk-dropdown-trigger * {
+ cursor: pointer;
+ }
+ }
diff --git a/frontend/pc/src/views/project/notice.vue b/frontend/pc/src/views/project/notice.vue
index 27ae6008b..8f632d222 100644
--- a/frontend/pc/src/views/project/notice.vue
+++ b/frontend/pc/src/views/project/notice.vue
@@ -24,7 +24,7 @@
-
+
{{ $t(`m['控件库']`) }}
-
+
+
-
已有字段不存在你搜索的内容
+
+
+ 控件库不存在你搜索的内容
+
{{ $t(`m['已有字段']`) }}
-
+
+
-
@@ -541,10 +558,7 @@
},
});
this.isBasicFormEditting = false;
- })
- .catch(res => {
- errorHandler(res, this);
- });
+ });
},
// 修改服务
updateServiceInfo(params) {
@@ -555,10 +569,7 @@
});
this.isBasicFormEditting = false;
this.$emit('updateServiceInfo', res.data);
- })
- .catch(res => {
- errorHandler(res, this);
- });
+ });
},
// 关联目录树组件
async getServiceDirectory() {
diff --git a/frontend/pc/src/views/service/serviceList.vue b/frontend/pc/src/views/service/serviceList.vue
index b56d02b2c..511c955c7 100644
--- a/frontend/pc/src/views/service/serviceList.vue
+++ b/frontend/pc/src/views/service/serviceList.vue
@@ -87,7 +87,7 @@
ref="serviceTable"
v-bkloading="{ isLoading: isDataLoading }"
:data="dataList"
- :size="'small'"
+ :size="setting.size"
:pagination="pagination"
@cell-mouse-enter="cellMouseEnter"
@cell-mouse-leave="cellMouseLeave"
@@ -525,13 +525,6 @@
value: '',
list: [],
},
- {
- name: this.$t('m.serviceConfig["服务级别"]'),
- type: 'select',
- typeKey: 'sla',
- value: '',
- list: [],
- },
],
addList: [],
lineList: [],
@@ -600,7 +593,6 @@
}
this.getServiceTypes();
this.getList();
- this.getSlaList();
this.getServiceDirectory();
},
methods: {
@@ -708,6 +700,7 @@
this.isImportServiceShow = false;
this.isCheckImport = false;
this.getList(1);
+ this.updateDirTree();
});
},
importService() {
@@ -885,23 +878,6 @@
errorHandler(res, this);
});
},
- // 服务级别列表
- getSlaList() {
- const params = {
- is_enabled: true,
- project_key: this.$store.state.project.id,
- };
- this.$store.dispatch('slaManagement/getProtocolsList', { params }).then(res => {
- this.slaList = res.data;
- this.moreSearch[2].list = res.data;
- this.moreSearch[2].list.forEach(item => {
- this.$set(item, 'key', item.id);
- });
- })
- .catch(res => {
- errorHandler(res, this);
- });
- },
disabledFn(item) {
return !item.bounded_catalogs[0];
},
@@ -1190,8 +1166,9 @@
display: inline-block;
font-size: 14px;
transition: transform 0.3s ease-in-out;
+ transform: rotate(180deg);
&.closed {
- transform: rotate(180deg);
+ transform: rotate(0deg);
}
}
}
diff --git a/frontend/pc/src/views/systemConfig/component/addDataDirectory.vue b/frontend/pc/src/views/systemConfig/component/addDataDirectory.vue
index 159b6d8c1..596360a9b 100644
--- a/frontend/pc/src/views/systemConfig/component/addDataDirectory.vue
+++ b/frontend/pc/src/views/systemConfig/component/addDataDirectory.vue
@@ -34,11 +34,12 @@
:property="'key'">
+ :disabled="addTableInfo.formInfo.id !== '' && addTableInfo.formInfo.id !== undefined"
+ @change="change">
-
+
+ :placeholder="$t(`m.systemConfig['请输入名称']`)"
+ @change="change">
+ :placeholder="$t(`m.systemConfig['请输入描述']`)"
+ @change="change">
-
+
@@ -486,6 +489,9 @@
onParentChange(tree) {
this.dictDataTable.formInfo.parentObj = tree;
},
+ change() {
+ this.$emit('change');
+ },
},
};
diff --git a/frontend/pc/src/views/systemConfig/dataDictionary.vue b/frontend/pc/src/views/systemConfig/dataDictionary.vue
index 11ffd562e..5061f7e2f 100644
--- a/frontend/pc/src/views/systemConfig/dataDictionary.vue
+++ b/frontend/pc/src/views/systemConfig/dataDictionary.vue
@@ -151,9 +151,13 @@
:is-show.sync="customSettings.isShow"
:title="customSettings.title"
:quick-close="true"
- :width="customSettings.width">
+ :transfer="true"
+ :width="customSettings.width"
+ :before-close="handleBeforeClose">
-
@@ -167,6 +171,7 @@
diff --git a/itsm/iadmin/views.py b/itsm/iadmin/views.py
index f647f3a78..eefc0ebef 100644
--- a/itsm/iadmin/views.py
+++ b/itsm/iadmin/views.py
@@ -100,6 +100,7 @@ class CustomNotifyViewSet(ModelViewSet):
filter_fields = {
"notify_type": ["exact"],
"used_by": ["exact"],
+ "title_template": ["icontains", "contains"],
"content_template": ["icontains", "contains"],
}
diff --git a/itsm/pipeline_plugins/components/collections/itsm_auto.py b/itsm/pipeline_plugins/components/collections/itsm_auto.py
index 79a97b7f8..bad69d8ac 100644
--- a/itsm/pipeline_plugins/components/collections/itsm_auto.py
+++ b/itsm/pipeline_plugins/components/collections/itsm_auto.py
@@ -29,6 +29,7 @@
import re
from datetime import datetime, timedelta
+import jmespath
import jsonschema
from django.core.cache import cache
from django.db import transaction
@@ -91,9 +92,16 @@ def poll_proceed(api_config, success_conditions):
def update_variables(self, rsp, ticket_id, variables, data=None):
for variable in variables:
+ value = rsp.get(variable["ref_path"])
+ # 兼容手动重试
+ if value is None:
+ value = jmespath.search(variable["ref_path"], rsp)
+ # 默认值
+ if value is None:
+ value = ""
TicketGlobalVariable.objects.filter(
ticket_id=ticket_id, key=variable["key"]
- ).update(value=rsp.get(variable["ref_path"], ""))
+ ).update(value=value)
return variables
@staticmethod
@@ -401,8 +409,9 @@ def schedule(self, data, parent_data, callback_data=None):
return True
logger.info(
- "\n------- AutoStateService schedule times: %s latest_poll_time %s state_id %s ticket_id"
- " %s----------\n" % (poll_time, latest_poll_time, state_id, ticket_id)
+ "[AutoStateService_schedule][%s][%s] poll_times: %s latest_poll_time %s" % (
+ ticket_id, state_id, poll_time, latest_poll_time
+ )
)
# 如果为轮询并且时间超过上一次的轮询时间
@@ -413,6 +422,11 @@ def schedule(self, data, parent_data, callback_data=None):
success_conditions,
operate_info,
)
+
+ logger.info(
+ "[AutoStateService_schedule][{}][{}]{}".format(ticket_id, state_id, p_rsp)
+ )
+
poll_time -= 1
if p_result:
# 返回为True的时候，直接结束
@@ -429,8 +443,8 @@ def schedule(self, data, parent_data, callback_data=None):
return True
if poll_time <= 0:
logger.error(
- "[AutoStateService_schedule] api_request_error, response={}".format(
- p_rsp
+ "[AutoStateService_schedule][{}][{}] api_request_error, response={}".format(
+ ticket_id, state_id, p_rsp
)
)
self.do_exit_plugins(
diff --git a/itsm/role/serializers.py b/itsm/role/serializers.py
index 8bdd7e47d..123f02cb4 100644
--- a/itsm/role/serializers.py
+++ b/itsm/role/serializers.py
@@ -110,7 +110,7 @@ def to_representation(self, instance):
data["owners"] = normal_name(data.get("owners"))
data["name"] = _(data["name"])
- data["desc"] = _(data["desc"])
+ data["desc"] = _(data["desc"] or "")
# 支持动态字段渲染
if "members" in data:
diff --git a/itsm/ticket/models/ticket.py b/itsm/ticket/models/ticket.py
index 4dfacb117..cc5e94665 100644
--- a/itsm/ticket/models/ticket.py
+++ b/itsm/ticket/models/ticket.py
@@ -2340,19 +2340,10 @@ def can_close(self, username):
):
# 当前状态无法到达关闭的时候，不可以进行关闭操作按钮
return False
- if username == self.creator:
- # 创建人可以直接关闭
- return True
if self.iam_ticket_manage_auth(username):
return True
- for _status in self.node_status.filter(
- Q(status__in=Status.CAN_OPERATE_STATUS) | Q(status=FAILED, type=TASK_STATE)
- ):
- if _status.can_operate(username):
- # 当前节点的操作人也可以进行关闭操作
- return True
return False
def update_current_status(self, status):
diff --git a/requirements.txt b/requirements.txt
index cd5cbccd2..72308b302 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -122,7 +122,7 @@ Jinja2==3.0.3
jmespath==0.10.0
requests_toolbelt==0.9.1
-apigw-manager[cryptography]==1.0.7
+apigw-manager[cryptography]==1.1.8
blueapps[opentelemetry,bkcrypto]==4.12.0
drf-yasg==1.20.0