-
如何实现实现会签、或签?
+
+
+
+ 如何实现实现会签、或签?
-
+
-
+
-
+
-
+
@@ -31,7 +59,7 @@ export default {
businessObject: Object,
model: Object, // 流程模型的数据
},
- data() {
+ data () {
return {
elementBaseInfo: {},
// 流程表单的下拉框的数据
@@ -41,14 +69,14 @@ export default {
key: [{ required: true, message: "流程标识不能为空", trigger: "blur" }],
name: [{ required: true, message: "流程名称不能为空", trigger: "blur" }],
},
- };
+ }
},
watch: {
businessObject: {
immediate: false,
- handler: function(val) {
+ handler: function (val) {
if (val) {
- this.$nextTick(() => this.resetBaseInfo());
+ this.$nextTick(() => this.resetBaseInfo())
}
}
},
@@ -59,7 +87,7 @@ export default {
// }
// }
},
- created() {
+ created () {
// 针对上传的 bpmn 流程图时,需要延迟 1 秒的时间,保证 key 和 name 的更新
setTimeout(() => {
this.handleKeyUpdate(this.model.key)
@@ -67,53 +95,53 @@ export default {
}, 1000)
},
methods: {
- resetBaseInfo() {
- this.bpmnElement = window?.bpmnInstances?.bpmnElement;
- this.elementBaseInfo = JSON.parse(JSON.stringify(this.bpmnElement.businessObject));
+ resetBaseInfo () {
+ this.bpmnElement = window?.bpmnInstances?.bpmnElement
+ this.elementBaseInfo = JSON.parse(JSON.stringify(this.bpmnElement.businessObject))
},
- handleKeyUpdate(value) {
+ handleKeyUpdate (value) {
// 校验 value 的值,只有 XML NCName 通过的情况下,才进行赋值。否则,会导致流程图报错,无法绘制的问题
- if (!value) {
- return;
- }
- if (!value.match(/[a-zA-Z_][\-_.0-9a-zA-Z$]*/)) {
- console.log('key 不满足 XML NCName 规则,所以不进行赋值');
- return;
- }
- console.log('key 满足 XML NCName 规则,所以进行赋值');
-
- // 在 BPMN 的 XML 中,流程标识 key,其实对应的是 id 节点
- this.elementBaseInfo['id'] = value;
- this.updateBaseInfo('id');
- },
- handleNameUpdate(value) {
if (!value) {
return
}
- this.elementBaseInfo['name'] = value;
- this.updateBaseInfo('name');
+ if (!value.match(/[a-zA-Z_][\-_.0-9a-zA-Z$]*/)) {
+ console.log('key 不满足 XML NCName 规则,所以不进行赋值')
+ return
+ }
+ console.log('key 满足 XML NCName 规则,所以进行赋值')
+
+ // 在 BPMN 的 XML 中,流程标识 key,其实对应的是 id 节点
+ this.elementBaseInfo['id'] = value
+ this.updateBaseInfo('id')
},
- handleDescriptionUpdate(value) {
+ handleNameUpdate (value) {
+ if (!value) {
+ return
+ }
+ this.elementBaseInfo['name'] = value
+ this.updateBaseInfo('name')
+ },
+ handleDescriptionUpdate (value) {
// TODO 芋艿:documentation 暂时无法修改,后续在看看
// this.elementBaseInfo['documentation'] = value;
// this.updateBaseInfo('documentation');
},
- updateBaseInfo(key) {
+ updateBaseInfo (key) {
// 触发 elementBaseInfo 对应的字段
- const attrObj = Object.create(null);
- attrObj[key] = this.elementBaseInfo[key];
+ const attrObj = Object.create(null)
+ attrObj[key] = this.elementBaseInfo[key]
if (key === "id") {
window.bpmnInstances.modeling.updateProperties(this.bpmnElement, {
id: this.elementBaseInfo[key],
di: { id: `${this.elementBaseInfo[key]}_di` }
- });
+ })
} else {
- window.bpmnInstances.modeling.updateProperties(this.bpmnElement, attrObj);
+ window.bpmnInstances.modeling.updateProperties(this.bpmnElement, attrObj)
}
}
},
- beforeDestroy() {
- this.bpmnElement = null;
+ beforeDestroy () {
+ this.bpmnElement = null
}
};
diff --git a/yudao-ui-admin/src/utils/request.js b/yudao-ui-admin/src/utils/request.js
index 525155fe4..a501686ca 100644
--- a/yudao-ui-admin/src/utils/request.js
+++ b/yudao-ui-admin/src/utils/request.js
@@ -119,6 +119,13 @@ service.interceptors.response.use(async res => {
type: 'error'
})
return Promise.reject(new Error(msg))
+ } else if (code === 501) {
+ Message({
+ type: 'error',
+ duration: 0,
+ message: msg
+ })
+ return Promise.reject(new Error(msg))
} else if (code === 901) {
Message({
type: 'error',
diff --git a/yudao-ui-admin/src/views/bpm/processInstance/detail.vue b/yudao-ui-admin/src/views/bpm/processInstance/detail.vue
index 57ff762bf..a1f9f6908 100644
--- a/yudao-ui-admin/src/views/bpm/processInstance/detail.vue
+++ b/yudao-ui-admin/src/views/bpm/processInstance/detail.vue
@@ -163,10 +163,7 @@ export default {
rules: {
assigneeUserId: [{ required: true, message: "新审批人不能为空", trigger: "change" }],
}
- },
-
- // 数据字典
- categoryDictDatas: getDictDatas(DICT_TYPE.BPM_MODEL_CATEGORY),
+ }
};
},
created() {
@@ -275,23 +272,6 @@ export default {
this.tasksLoad = false;
});
},
- /** 处理选择流程的按钮操作 **/
- handleSelect(row) {
- // 设置选择的流程
- this.selectProcessInstance = row;
-
- // 流程表单
- if (row.formId) {
- // 设置对应的表单
- this.detailForm = {
- ...JSON.parse(row.formConf),
- fields: decodeFields(row.formFields)
- }
- } else if (row.formCustomCreatePath) {
- this.$router.push({ path: row.formCustomCreatePath});
- // 这里暂时无需加载流程图,因为跳出到另外个 Tab;
- }
- },
getDateStar(ms) {
return getDate(ms);
},
diff --git a/yudao-ui-admin/src/views/bpm/processInstance/index.vue b/yudao-ui-admin/src/views/bpm/processInstance/index.vue
index e57da88a9..b15751325 100644
--- a/yudao-ui-admin/src/views/bpm/processInstance/index.vue
+++ b/yudao-ui-admin/src/views/bpm/processInstance/index.vue
@@ -58,7 +58,7 @@
-
+
{{ task.name }}
diff --git a/yudao-ui-admin/src/views/infra/build/RightPanel.vue b/yudao-ui-admin/src/views/infra/build/RightPanel.vue
index 127b7039e..f6fa61046 100644
--- a/yudao-ui-admin/src/views/infra/build/RightPanel.vue
+++ b/yudao-ui-admin/src/views/infra/build/RightPanel.vue
@@ -545,7 +545,7 @@
-
+
布局结构树
-
+
{{ node.label }}
diff --git a/yudao-ui-admin/src/views/mall/market/banner/index.vue b/yudao-ui-admin/src/views/mall/market/banner/index.vue
index 1bbb02094..9b683eda9 100644
--- a/yudao-ui-admin/src/views/mall/market/banner/index.vue
+++ b/yudao-ui-admin/src/views/mall/market/banner/index.vue
@@ -1,5 +1,6 @@
+
diff --git a/yudao-ui-admin/src/views/mall/product/brand/index.vue b/yudao-ui-admin/src/views/mall/product/brand/index.vue
index 4ba42d3f2..2f357898d 100644
--- a/yudao-ui-admin/src/views/mall/product/brand/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/brand/index.vue
@@ -1,7 +1,8 @@
+
-«
+
diff --git a/yudao-ui-admin/src/views/mall/product/category/index.vue b/yudao-ui-admin/src/views/mall/product/category/index.vue
index 4e07b6201..ff230fff1 100644
--- a/yudao-ui-admin/src/views/mall/product/category/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/category/index.vue
@@ -1,5 +1,6 @@
+
diff --git a/yudao-ui-admin/src/views/mall/product/property/index.vue b/yudao-ui-admin/src/views/mall/product/property/index.vue
index dca67dfc2..a4044cfe1 100644
--- a/yudao-ui-admin/src/views/mall/product/property/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/property/index.vue
@@ -1,5 +1,6 @@
+
diff --git a/yudao-ui-admin/src/views/mall/product/property/value.vue b/yudao-ui-admin/src/views/mall/product/property/value.vue
index bef8a4e8d..86fc54f00 100644
--- a/yudao-ui-admin/src/views/mall/product/property/value.vue
+++ b/yudao-ui-admin/src/views/mall/product/property/value.vue
@@ -1,5 +1,7 @@
+
+
diff --git a/yudao-ui-admin/src/views/mall/product/spu/index.vue b/yudao-ui-admin/src/views/mall/product/spu/index.vue
index f86188eab..d77229203 100644
--- a/yudao-ui-admin/src/views/mall/product/spu/index.vue
+++ b/yudao-ui-admin/src/views/mall/product/spu/index.vue
@@ -1,5 +1,7 @@
+
+
diff --git a/yudao-ui-admin/src/views/mall/promotion/coupon/index.vue b/yudao-ui-admin/src/views/mall/promotion/coupon/index.vue
index 7c866636a..afc34b68d 100755
--- a/yudao-ui-admin/src/views/mall/promotion/coupon/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/coupon/index.vue
@@ -1,5 +1,7 @@
+
+
diff --git a/yudao-ui-admin/src/views/mall/promotion/couponTemplate/index.vue b/yudao-ui-admin/src/views/mall/promotion/couponTemplate/index.vue
index 4a50c9ed1..c1a12a319 100755
--- a/yudao-ui-admin/src/views/mall/promotion/couponTemplate/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/couponTemplate/index.vue
@@ -1,5 +1,6 @@
+
diff --git a/yudao-ui-admin/src/views/mall/promotion/discountActivity/index.vue b/yudao-ui-admin/src/views/mall/promotion/discountActivity/index.vue
index cfe4364fa..4e71d1ec1 100755
--- a/yudao-ui-admin/src/views/mall/promotion/discountActivity/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/discountActivity/index.vue
@@ -1,5 +1,6 @@
+
diff --git a/yudao-ui-admin/src/views/mall/promotion/rewardActivity/index.vue b/yudao-ui-admin/src/views/mall/promotion/rewardActivity/index.vue
index 4520e1e7e..65fc70432 100755
--- a/yudao-ui-admin/src/views/mall/promotion/rewardActivity/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/rewardActivity/index.vue
@@ -1,5 +1,6 @@
+
diff --git a/yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue b/yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue
index c36cbf166..48b146441 100644
--- a/yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue
+++ b/yudao-ui-admin/src/views/mall/promotion/seckill/seckillActivity/index.vue
@@ -1,5 +1,6 @@
+
+
diff --git a/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue b/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
index a21a8a78a..21e24c0d4 100644
--- a/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
+++ b/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue
@@ -1,5 +1,6 @@
+
diff --git a/yudao-ui-admin/src/views/mall/trade/order/index.vue b/yudao-ui-admin/src/views/mall/trade/order/index.vue
index 96f156f7a..5c7aa987c 100644
--- a/yudao-ui-admin/src/views/mall/trade/order/index.vue
+++ b/yudao-ui-admin/src/views/mall/trade/order/index.vue
@@ -1,5 +1,7 @@
+
+