npm - ecinc-cloud-wappaio - Versions diffs - 9.6.566 → 9.6.567 - Mend

ecinc-cloud-wappaio 9.6.566 → 9.6.567

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/lib/ecwappaio.common.js CHANGED Viewed

@@ -45375,7 +45375,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, "[data-v-77820b4f] .el-select{width:100
 /***/ }),
-/***/ 82462:
+/***/ 66212:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 "use strict";
@@ -45389,7 +45389,7 @@ __webpack_require__.r(__webpack_exports__);
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, "table[data-v-1164a06e]{border-collapse:collapse}table tr td[data-v-1164a06e]{border:1px solid #e2e2e2;padding:5px;height:40px;color:#555;font-size:12px;line-height:30px}table tr td em[data-v-1164a06e]{color:red}table tr .tdBg[data-v-1164a06e]{font-weight:700}[data-v-1164a06e] .el-input__inner{height:35px!important;line-height:35px!important;font-size:12px}[data-v-1164a06e] .el-textarea__inner{font-size:12px}[data-v-1164a06e] .el-select{width:100%;display:inline-block;position:relative}[data-v-1164a06e] .el-checkbox__label,[data-v-1164a06e] .el-radio__label{font-size:12px;padding-left:5px}.tableBox table[data-v-1164a06e]{border-collapse:collapse}.tableBox table th[data-v-1164a06e]{background:#f2f2f2;border-bottom:none;background-image:-webkit-gradient(linear,left top,left bottom,from(#f8f8f8),to(#ececec));background-image:linear-gradient(180deg,#f8f8f8 0,#ececec);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=\"#fff8f8f8\",endColorstr=\"#ffececec\",GradientType=0);font-size:12px;padding:8px;line-height:1.42857143;color:#555;border:1px solid #e2e2e2}.tableBox table th .addbtn[data-v-1164a06e],.tableBox table th .addbtn i[data-v-1164a06e]{color:#337ab7;font-weight:700}.tableBox table tr[data-v-1164a06e]:nth-of-type(odd){background:#f9f9f9}.tableBox table tr[data-v-1164a06e]{cursor:pointer}.tableBox table td[data-v-1164a06e],.tableBox table tr[data-v-1164a06e]{font-size:12px;border:1px solid #e2e2e2}.tableBox table td[data-v-1164a06e]{line-height:20px;height:35px;color:#555}.tableBox table td .deleteButton[data-v-1164a06e]{color:#dd5a43;padding:2px 3px;border:1px solid transparent;border-radius:2px}.tableBox table td .deleteButton[data-v-1164a06e]:hover{border:1px solid #abbac3;text-decoration:none}.tableBox table td .editButton[data-v-1164a06e]{color:#478fca;padding:2px 3px;border:1px solid transparent;border-radius:2px}.tableBox table td .editButton[data-v-1164a06e]:hover{border:1px solid #abbac3;text-decoration:none}.tableBox table td .disabledButton[data-v-1164a06e]{color:#a9a9a9}.tableBox .el-row[data-v-1164a06e]{margin-top:10px;padding:10px}.tableBox[data-v-1164a06e] .el-checkbox__label{display:none}.tableBox .el-button-group[data-v-1164a06e]{float:right;margin-top:-10px;margin-bottom:10px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "table[data-v-2e405932]{border-collapse:collapse}table tr td[data-v-2e405932]{border:1px solid #e2e2e2;padding:5px;height:40px;color:#555;font-size:12px;line-height:30px}table tr td em[data-v-2e405932]{color:red}table tr .tdBg[data-v-2e405932]{font-weight:700}[data-v-2e405932] .el-input__inner{height:35px!important;line-height:35px!important;font-size:12px}[data-v-2e405932] .el-textarea__inner{font-size:12px}[data-v-2e405932] .el-select{width:100%;display:inline-block;position:relative}[data-v-2e405932] .el-checkbox__label,[data-v-2e405932] .el-radio__label{font-size:12px;padding-left:5px}.tableBox table[data-v-2e405932]{border-collapse:collapse}.tableBox table th[data-v-2e405932]{background:#f2f2f2;border-bottom:none;background-image:-webkit-gradient(linear,left top,left bottom,from(#f8f8f8),to(#ececec));background-image:linear-gradient(180deg,#f8f8f8 0,#ececec);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=\"#fff8f8f8\",endColorstr=\"#ffececec\",GradientType=0);font-size:12px;padding:8px;line-height:1.42857143;color:#555;border:1px solid #e2e2e2}.tableBox table th .addbtn[data-v-2e405932],.tableBox table th .addbtn i[data-v-2e405932]{color:#337ab7;font-weight:700}.tableBox table tr[data-v-2e405932]:nth-of-type(odd){background:#f9f9f9}.tableBox table tr[data-v-2e405932]{cursor:pointer}.tableBox table td[data-v-2e405932],.tableBox table tr[data-v-2e405932]{font-size:12px;border:1px solid #e2e2e2}.tableBox table td[data-v-2e405932]{line-height:20px;height:35px;color:#555}.tableBox table td .deleteButton[data-v-2e405932]{color:#dd5a43;padding:2px 3px;border:1px solid transparent;border-radius:2px}.tableBox table td .deleteButton[data-v-2e405932]:hover{border:1px solid #abbac3;text-decoration:none}.tableBox table td .editButton[data-v-2e405932]{color:#478fca;padding:2px 3px;border:1px solid transparent;border-radius:2px}.tableBox table td .editButton[data-v-2e405932]:hover{border:1px solid #abbac3;text-decoration:none}.tableBox table td .disabledButton[data-v-2e405932]{color:#a9a9a9}.tableBox .el-row[data-v-2e405932]{margin-top:10px;padding:10px}.tableBox[data-v-2e405932] .el-checkbox__label{display:none}.tableBox .el-button-group[data-v-2e405932]{float:right;margin-top:-10px;margin-bottom:10px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
@@ -139225,19 +139225,19 @@ var update = add("5deef3dc", content, true, {"sourceMap":false,"shadowMode":fals
 /***/ }),
-/***/ 96972:
+/***/ 55502:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 // style-loader: Adds some css to the DOM by adding a <style> tag
 // load the styles
-var content = __webpack_require__(82462);
+var content = __webpack_require__(66212);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(99548)/* ["default"] */ .A)
-var update = add("bf571530", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("9c6fda1c", content, true, {"sourceMap":false,"shadowMode":false});
 /***/ }),
@@ -262129,8 +262129,8 @@ var PanelNodevue_type_template_id_6a67cdfa_scoped_true_render = function render(
 };
 var PanelNodevue_type_template_id_6a67cdfa_scoped_true_staticRenderFns = [];
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=template&id=1164a06e&scoped=true
-var Tab0vue_type_template_id_1164a06e_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=template&id=2e405932&scoped=true
+var Tab0vue_type_template_id_2e405932_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_vm.showType > 0 ? _c('div', {
@@ -262565,7 +262565,46 @@ var Tab0vue_type_template_id_1164a06e_scoped_true_render = function render() {
       "value": 2,
       "label": "退回任意节点"
     }
-  })], 1)], 1)]), _vm.curNode.nodeType == 1 && _vm.curNode.returnMode == 1 ? _c('tr', [_c('td', {
+  })], 1)], 1)]), _c('tr', {
+    directives: [{
+      name: "show",
+      rawName: "v-show",
+      value: _vm.curNode.nodeType == 1,
+      expression: "curNode.nodeType == 1"
+    }],
+    attrs: {
+      "valign": "top"
+    }
+  }, [_c('td', {
+    staticClass: "el-table__cell tdBg",
+    staticStyle: {
+      "width": "130px"
+    },
+    attrs: {
+      "id": "TNToDoModeTd",
+      "valign": "middle",
+      "align": "right"
+    }
+  }, [_vm._v("待办合并")]), _c('td', [_c('el-radio-group', {
+    staticClass: "form-control",
+    model: {
+      value: _vm.curNode.todoMerge,
+      callback: function callback($$v) {
+        _vm.$set(_vm.curNode, "todoMerge", $$v);
+      },
+      expression: "curNode.todoMerge"
+    }
+  }, [_c('el-radio', {
+    attrs: {
+      "label": 1,
+      "name": "todoMerge"
+    }
+  }, [_vm._v("合并同一处理人待办")]), _c('el-radio', {
+    attrs: {
+      "label": 0,
+      "name": "todoMerge"
+    }
+  }, [_vm._v("不合并")])], 1)], 1)]), _vm.curNode.nodeType == 1 && _vm.curNode.returnMode == 1 ? _c('tr', [_c('td', {
     staticClass: "el-table__cell tdBg",
     staticStyle: {
       "width": "130px"
@@ -262939,7 +262978,7 @@ var Tab0vue_type_template_id_1164a06e_scoped_true_render = function render() {
     }
   })], 1)])], 2)]) : _vm._e()]);
 };
-var Tab0vue_type_template_id_1164a06e_scoped_true_staticRenderFns = [function () {
+var Tab0vue_type_template_id_2e405932_scoped_true_staticRenderFns = [function () {
   var _vm = this,
     _c = _vm._self._c;
   return _c('td', {
@@ -263006,7 +263045,7 @@ var Tab0vue_type_template_id_1164a06e_scoped_true_staticRenderFns = [function ()
   }, [_c('em', [_vm._v("*")]), _vm._v(" 子流程模块URL ")]);
 }];
-;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=template&id=1164a06e&scoped=true
+;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=template&id=2e405932&scoped=true
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=script&lang=js
 /* harmony default export */ var PanelNode_Tab0vue_type_script_lang_js = ({
@@ -263109,6 +263148,7 @@ var Tab0vue_type_template_id_1164a06e_scoped_true_staticRenderFns = [function ()
       if (curNode.todoType === null) curNode.todoType = 0;
       if (curNode.autoProcess === null) curNode.autoProcess = 0;
       if (curNode.returnMode === null) curNode.returnMode = 0;
+      if (curNode.todoMerge == null) curNode.todoMerge = 1;
       this.curNode = curNode;
       if (this.curNode.childWflow) {
         this.$set(this, 'childWf', JSON.parse(this.curNode.childWflow));
@@ -263210,9 +263250,9 @@ var Tab0vue_type_template_id_1164a06e_scoped_true_staticRenderFns = [function ()
 });
 ;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=script&lang=js
  /* harmony default export */ var RightForm_PanelNode_Tab0vue_type_script_lang_js = (PanelNode_Tab0vue_type_script_lang_js);
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=style&index=0&id=1164a06e&prod&scoped=true&lang=scss
-var Tab0vue_type_style_index_0_id_1164a06e_prod_scoped_true_lang_scss = __webpack_require__(96972);
-;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=style&index=0&id=1164a06e&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=style&index=0&id=2e405932&prod&scoped=true&lang=scss
+var Tab0vue_type_style_index_0_id_2e405932_prod_scoped_true_lang_scss = __webpack_require__(55502);
+;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=style&index=0&id=2e405932&prod&scoped=true&lang=scss
 ;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue
@@ -263225,11 +263265,11 @@ var Tab0vue_type_style_index_0_id_1164a06e_prod_scoped_true_lang_scss = __webpac
 var PanelNode_Tab0_component = (0,componentNormalizer/* default */.A)(
   RightForm_PanelNode_Tab0vue_type_script_lang_js,
-  Tab0vue_type_template_id_1164a06e_scoped_true_render,
-  Tab0vue_type_template_id_1164a06e_scoped_true_staticRenderFns,
+  Tab0vue_type_template_id_2e405932_scoped_true_render,
+  Tab0vue_type_template_id_2e405932_scoped_true_staticRenderFns,
   false,
   null,
-  "1164a06e",
+  "2e405932",
   null
 )

package/lib/ecwappaio.umd.js CHANGED Viewed

@@ -45385,7 +45385,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, "[data-v-77820b4f] .el-select{width:100
 /***/ }),
-/***/ 38110:
+/***/ 5508:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 "use strict";
@@ -45399,7 +45399,7 @@ __webpack_require__.r(__webpack_exports__);
 var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
 // Module
-___CSS_LOADER_EXPORT___.push([module.id, "table[data-v-1164a06e]{border-collapse:collapse}table tr td[data-v-1164a06e]{border:1px solid #e2e2e2;padding:5px;height:40px;color:#555;font-size:12px;line-height:30px}table tr td em[data-v-1164a06e]{color:red}table tr .tdBg[data-v-1164a06e]{font-weight:700}[data-v-1164a06e] .el-input__inner{height:35px!important;line-height:35px!important;font-size:12px}[data-v-1164a06e] .el-textarea__inner{font-size:12px}[data-v-1164a06e] .el-select{width:100%;display:inline-block;position:relative}[data-v-1164a06e] .el-checkbox__label,[data-v-1164a06e] .el-radio__label{font-size:12px;padding-left:5px}.tableBox table[data-v-1164a06e]{border-collapse:collapse}.tableBox table th[data-v-1164a06e]{background:#f2f2f2;border-bottom:none;background-image:-webkit-gradient(linear,left top,left bottom,from(#f8f8f8),to(#ececec));background-image:linear-gradient(180deg,#f8f8f8 0,#ececec);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=\"#fff8f8f8\",endColorstr=\"#ffececec\",GradientType=0);font-size:12px;padding:8px;line-height:1.42857143;color:#555;border:1px solid #e2e2e2}.tableBox table th .addbtn[data-v-1164a06e],.tableBox table th .addbtn i[data-v-1164a06e]{color:#337ab7;font-weight:700}.tableBox table tr[data-v-1164a06e]:nth-of-type(odd){background:#f9f9f9}.tableBox table tr[data-v-1164a06e]{cursor:pointer}.tableBox table td[data-v-1164a06e],.tableBox table tr[data-v-1164a06e]{font-size:12px;border:1px solid #e2e2e2}.tableBox table td[data-v-1164a06e]{line-height:20px;height:35px;color:#555}.tableBox table td .deleteButton[data-v-1164a06e]{color:#dd5a43;padding:2px 3px;border:1px solid transparent;border-radius:2px}.tableBox table td .deleteButton[data-v-1164a06e]:hover{border:1px solid #abbac3;text-decoration:none}.tableBox table td .editButton[data-v-1164a06e]{color:#478fca;padding:2px 3px;border:1px solid transparent;border-radius:2px}.tableBox table td .editButton[data-v-1164a06e]:hover{border:1px solid #abbac3;text-decoration:none}.tableBox table td .disabledButton[data-v-1164a06e]{color:#a9a9a9}.tableBox .el-row[data-v-1164a06e]{margin-top:10px;padding:10px}.tableBox[data-v-1164a06e] .el-checkbox__label{display:none}.tableBox .el-button-group[data-v-1164a06e]{float:right;margin-top:-10px;margin-bottom:10px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "table[data-v-2e405932]{border-collapse:collapse}table tr td[data-v-2e405932]{border:1px solid #e2e2e2;padding:5px;height:40px;color:#555;font-size:12px;line-height:30px}table tr td em[data-v-2e405932]{color:red}table tr .tdBg[data-v-2e405932]{font-weight:700}[data-v-2e405932] .el-input__inner{height:35px!important;line-height:35px!important;font-size:12px}[data-v-2e405932] .el-textarea__inner{font-size:12px}[data-v-2e405932] .el-select{width:100%;display:inline-block;position:relative}[data-v-2e405932] .el-checkbox__label,[data-v-2e405932] .el-radio__label{font-size:12px;padding-left:5px}.tableBox table[data-v-2e405932]{border-collapse:collapse}.tableBox table th[data-v-2e405932]{background:#f2f2f2;border-bottom:none;background-image:-webkit-gradient(linear,left top,left bottom,from(#f8f8f8),to(#ececec));background-image:linear-gradient(180deg,#f8f8f8 0,#ececec);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=\"#fff8f8f8\",endColorstr=\"#ffececec\",GradientType=0);font-size:12px;padding:8px;line-height:1.42857143;color:#555;border:1px solid #e2e2e2}.tableBox table th .addbtn[data-v-2e405932],.tableBox table th .addbtn i[data-v-2e405932]{color:#337ab7;font-weight:700}.tableBox table tr[data-v-2e405932]:nth-of-type(odd){background:#f9f9f9}.tableBox table tr[data-v-2e405932]{cursor:pointer}.tableBox table td[data-v-2e405932],.tableBox table tr[data-v-2e405932]{font-size:12px;border:1px solid #e2e2e2}.tableBox table td[data-v-2e405932]{line-height:20px;height:35px;color:#555}.tableBox table td .deleteButton[data-v-2e405932]{color:#dd5a43;padding:2px 3px;border:1px solid transparent;border-radius:2px}.tableBox table td .deleteButton[data-v-2e405932]:hover{border:1px solid #abbac3;text-decoration:none}.tableBox table td .editButton[data-v-2e405932]{color:#478fca;padding:2px 3px;border:1px solid transparent;border-radius:2px}.tableBox table td .editButton[data-v-2e405932]:hover{border:1px solid #abbac3;text-decoration:none}.tableBox table td .disabledButton[data-v-2e405932]{color:#a9a9a9}.tableBox .el-row[data-v-2e405932]{margin-top:10px;padding:10px}.tableBox[data-v-2e405932] .el-checkbox__label{display:none}.tableBox .el-button-group[data-v-2e405932]{float:right;margin-top:-10px;margin-bottom:10px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
@@ -139235,19 +139235,19 @@ var update = add("5276d448", content, true, {"sourceMap":false,"shadowMode":fals
 /***/ }),
-/***/ 43602:
+/***/ 45200:
 /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
 // style-loader: Adds some css to the DOM by adding a <style> tag
 // load the styles
-var content = __webpack_require__(38110);
+var content = __webpack_require__(5508);
 if(content.__esModule) content = content.default;
 if(typeof content === 'string') content = [[module.id, content, '']];
 if(content.locals) module.exports = content.locals;
 // add the styles to the DOM
 var add = (__webpack_require__(99548)/* ["default"] */ .A)
-var update = add("f9e5d130", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("d6fe961c", content, true, {"sourceMap":false,"shadowMode":false});
 /***/ }),
@@ -262139,8 +262139,8 @@ var PanelNodevue_type_template_id_6a67cdfa_scoped_true_render = function render(
 };
 var PanelNodevue_type_template_id_6a67cdfa_scoped_true_staticRenderFns = [];
-;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=template&id=1164a06e&scoped=true
-var Tab0vue_type_template_id_1164a06e_scoped_true_render = function render() {
+;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=template&id=2e405932&scoped=true
+var Tab0vue_type_template_id_2e405932_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_vm.showType > 0 ? _c('div', {
@@ -262575,7 +262575,46 @@ var Tab0vue_type_template_id_1164a06e_scoped_true_render = function render() {
       "value": 2,
       "label": "退回任意节点"
     }
-  })], 1)], 1)]), _vm.curNode.nodeType == 1 && _vm.curNode.returnMode == 1 ? _c('tr', [_c('td', {
+  })], 1)], 1)]), _c('tr', {
+    directives: [{
+      name: "show",
+      rawName: "v-show",
+      value: _vm.curNode.nodeType == 1,
+      expression: "curNode.nodeType == 1"
+    }],
+    attrs: {
+      "valign": "top"
+    }
+  }, [_c('td', {
+    staticClass: "el-table__cell tdBg",
+    staticStyle: {
+      "width": "130px"
+    },
+    attrs: {
+      "id": "TNToDoModeTd",
+      "valign": "middle",
+      "align": "right"
+    }
+  }, [_vm._v("待办合并")]), _c('td', [_c('el-radio-group', {
+    staticClass: "form-control",
+    model: {
+      value: _vm.curNode.todoMerge,
+      callback: function callback($$v) {
+        _vm.$set(_vm.curNode, "todoMerge", $$v);
+      },
+      expression: "curNode.todoMerge"
+    }
+  }, [_c('el-radio', {
+    attrs: {
+      "label": 1,
+      "name": "todoMerge"
+    }
+  }, [_vm._v("合并同一处理人待办")]), _c('el-radio', {
+    attrs: {
+      "label": 0,
+      "name": "todoMerge"
+    }
+  }, [_vm._v("不合并")])], 1)], 1)]), _vm.curNode.nodeType == 1 && _vm.curNode.returnMode == 1 ? _c('tr', [_c('td', {
     staticClass: "el-table__cell tdBg",
     staticStyle: {
       "width": "130px"
@@ -262949,7 +262988,7 @@ var Tab0vue_type_template_id_1164a06e_scoped_true_render = function render() {
     }
   })], 1)])], 2)]) : _vm._e()]);
 };
-var Tab0vue_type_template_id_1164a06e_scoped_true_staticRenderFns = [function () {
+var Tab0vue_type_template_id_2e405932_scoped_true_staticRenderFns = [function () {
   var _vm = this,
     _c = _vm._self._c;
   return _c('td', {
@@ -263016,7 +263055,7 @@ var Tab0vue_type_template_id_1164a06e_scoped_true_staticRenderFns = [function ()
   }, [_c('em', [_vm._v("*")]), _vm._v(" 子流程模块URL ")]);
 }];
-;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=template&id=1164a06e&scoped=true
+;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=template&id=2e405932&scoped=true
 ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-82.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=script&lang=js
 /* harmony default export */ var PanelNode_Tab0vue_type_script_lang_js = ({
@@ -263119,6 +263158,7 @@ var Tab0vue_type_template_id_1164a06e_scoped_true_staticRenderFns = [function ()
       if (curNode.todoType === null) curNode.todoType = 0;
       if (curNode.autoProcess === null) curNode.autoProcess = 0;
       if (curNode.returnMode === null) curNode.returnMode = 0;
+      if (curNode.todoMerge == null) curNode.todoMerge = 1;
       this.curNode = curNode;
       if (this.curNode.childWflow) {
         this.$set(this, 'childWf', JSON.parse(this.curNode.childWflow));
@@ -263220,9 +263260,9 @@ var Tab0vue_type_template_id_1164a06e_scoped_true_staticRenderFns = [function ()
 });
 ;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=script&lang=js
  /* harmony default export */ var RightForm_PanelNode_Tab0vue_type_script_lang_js = (PanelNode_Tab0vue_type_script_lang_js);
-// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=style&index=0&id=1164a06e&prod&scoped=true&lang=scss
-var Tab0vue_type_style_index_0_id_1164a06e_prod_scoped_true_lang_scss = __webpack_require__(43602);
-;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=style&index=0&id=1164a06e&prod&scoped=true&lang=scss
+// EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-64.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-64.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-64.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-64.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=style&index=0&id=2e405932&prod&scoped=true&lang=scss
+var Tab0vue_type_style_index_0_id_2e405932_prod_scoped_true_lang_scss = __webpack_require__(45200);
+;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue?vue&type=style&index=0&id=2e405932&prod&scoped=true&lang=scss
 ;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab0.vue
@@ -263235,11 +263275,11 @@ var Tab0vue_type_style_index_0_id_1164a06e_prod_scoped_true_lang_scss = __webpac
 var PanelNode_Tab0_component = (0,componentNormalizer/* default */.A)(
   RightForm_PanelNode_Tab0vue_type_script_lang_js,
-  Tab0vue_type_template_id_1164a06e_scoped_true_render,
-  Tab0vue_type_template_id_1164a06e_scoped_true_staticRenderFns,
+  Tab0vue_type_template_id_2e405932_scoped_true_render,
+  Tab0vue_type_template_id_2e405932_scoped_true_staticRenderFns,
   false,
   null,
-  "1164a06e",
+  "2e405932",
   null
 )