From dbe4d740a7b0b5696c89f4df14b6804a71364432 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 08 五月 2024 14:56:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/technology/routing/routing-form.vue | 33 +++++++++++++++------------------
1 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/src/views/technology/routing/routing-form.vue b/src/views/technology/routing/routing-form.vue
index b725d9d..e7da9de 100644
--- a/src/views/technology/routing/routing-form.vue
+++ b/src/views/technology/routing/routing-form.vue
@@ -1200,15 +1200,15 @@
...this.dataForm.operations.slice(obj.index - 1)
]
}
- this.dataForm.operations.forEach((e, idx) => {
- e.index = idx + 1
- })
- this.$forceUpdate()
- this.$refs.operationTable.sort('index')
- Promise.all([this.save()]).then((res) => {
- this.selectByIndex(obj.index)
- })
- })
+ })
+ this.dataForm.operations.forEach((e, idx) => {
+ e.index = idx + 1
+ })
+ this.$forceUpdate()
+ this.$refs.operationTable.sort('index')
+ Promise.all([this.save()]).then((res) => {
+ this.selectByIndex(obj.index)
+ })
}else{
operation.operationName = operation.name
operation.operationId = operation.id
@@ -1429,18 +1429,15 @@
},
// 淇濆瓨鎵�鏈夊弬鏁扮殑淇敼
saveAllParamChange() {
- const paramJson = { routingOperationParam: this.paramData }
- let num = 0
this.paramData.forEach(e=>{
- var regex=/^[^\(\)|^,]+$/;
- if(!regex.test(e.paramValue)){
- num+=1
+ if(e.paramValue!=null){
+ e.paramValue=e.paramValue.replace(',','锛�').replace('(','锛�').replace(')','锛�')
+ if (!isNaN(e.paramValue)) {
+ e.paramValue='='+e.paramValue
+ }
}
})
- if(num>0){
- this.$message.error("鍙傛暟鍊间笉鑳藉寘鍚嫳鏂囨嫭鍙锋垨閫楀彿,璇锋鏌�")
- return
- }
+ const paramJson = { routingOperationParam: this.paramData }
putRoutingTemplateParam(paramJson).then((response) => {
const data = response.data
if (data.code == 0) {
--
Gitblit v1.9.3