ecinc-cloud-wappaio 9.6.463 → 9.6.465

package/lib/ecwappaio.common.js

@@ -9854,6 +9854,7 @@ var actions = {
               return window.$user.getLoginUser(data[window.jwtTokenKey || 'ECWEB-JWTSSO-TOKEN']);
             case 2:
               loginUser = _context2.sent;
+              sessionStorage.removeItem('dynamicRoutes-' + loginUser.personAccount);
               window.$auth.setProductCode(data['PRODUCT_CODE_LIST'], loginUser.sysCode);
               window.$auth.setToken(data[window.jwtTokenKey || 'ECWEB-JWTSSO-TOKEN']);
               window.$auth.setTicket(data[window.ecwebTicket || 'ecweb-ticket']);
@@ -9873,7 +9874,7 @@ var actions = {
               commit('SET_MAX_FILE_SIZE', data['MAX_FILE_SIZE']);
               commit('SET_AVATAR', "/apigw" + '/base/user/download?id=' + loginUser.userId + '&dataField=photoData&nameField=photoName&csrfToken=' + data['ecweb-csrf-token']);
               resolve();
-            case 18:
+            case 19:
             case "end":
               return _context2.stop();
           }
@@ -44895,7 +44896,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".attr_title[data-v-bf8654bc]{height:44
 
 /***/ }),
 
-/***/ 98469:
+/***/ 67027:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -44909,7 +44910,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, "[data-v-0738c526] .el-select{width:100%}.btnpreview[data-v-0738c526]{color:#337ab7}.btnpreview[data-v-0738c526]:hover{color:#23527c;text-decoration:underline}[data-v-0738c526] .el-dialog__body{height:650px;overflow-y:auto;padding:0 0 20px 0}[data-v-0738c526] .el-dialog__body .el-tabs--top{margin-top:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "[data-v-77820b4f] .el-select{width:100%}.btnpreview[data-v-77820b4f]{color:#337ab7}.btnpreview[data-v-77820b4f]:hover{color:#23527c;text-decoration:underline}[data-v-77820b4f] .el-dialog__body{height:650px;overflow-y:auto;padding:0 0 20px 0}[data-v-77820b4f] .el-dialog__body .el-tabs--top{margin-top:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -44979,7 +44980,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, "table[data-v-78dcb370]{border-collapse
 
 /***/ }),
 
-/***/ 16306:
+/***/ 98474:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -44993,7 +44994,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-a34ec44a]{border-collapse:collapse}table tr td[data-v-a34ec44a]{border:1px solid #e2e2e2;padding:5px;height:40px;color:#555;font-size:12px;line-height:30px}table tr td em[data-v-a34ec44a]{color:red}table tr .tdBg[data-v-a34ec44a]{font-weight:700}[data-v-a34ec44a] .el-input__inner{height:35px!important;line-height:35px!important;font-size:12px}[data-v-a34ec44a] .el-textarea__inner{font-size:12px}[data-v-a34ec44a] .el-select{width:100%;display:inline-block;position:relative}[data-v-a34ec44a] .el-checkbox__label,[data-v-a34ec44a] .el-radio__label{font-size:12px;padding-left:5px}.tableBox table[data-v-a34ec44a]{border-collapse:collapse}.tableBox table th[data-v-a34ec44a]{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-a34ec44a],.tableBox table th .addbtn i[data-v-a34ec44a]{color:#337ab7;font-weight:700}.tableBox table tr[data-v-a34ec44a]:nth-of-type(odd){background:#f9f9f9}.tableBox table tr[data-v-a34ec44a]{cursor:pointer}.tableBox table td[data-v-a34ec44a],.tableBox table tr[data-v-a34ec44a]{font-size:12px;border:1px solid #e2e2e2}.tableBox table td[data-v-a34ec44a]{line-height:20px;height:35px;color:#555}.tableBox table td .deleteButton[data-v-a34ec44a]{color:#dd5a43;padding:2px 3px;border:1px solid transparent;border-radius:2px}.tableBox table td .deleteButton[data-v-a34ec44a]:hover{border:1px solid #abbac3;text-decoration:none}.tableBox table td .editButton[data-v-a34ec44a]{color:#478fca;padding:2px 3px;border:1px solid transparent;border-radius:2px}.tableBox table td .editButton[data-v-a34ec44a]:hover{border:1px solid #abbac3;text-decoration:none}.tableBox table td .disabledButton[data-v-a34ec44a]{color:#a9a9a9}.tableBox .el-row[data-v-a34ec44a]{margin-top:10px;padding:10px}.tableBox[data-v-a34ec44a] .el-checkbox__label{display:none}.tableBox .el-button-group[data-v-a34ec44a]{float:right;margin-top:-10px;margin-bottom:10px}[data-v-a34ec44a] .el-scrollbar__wrap{overflow-x:hidden!important}[data-v-a34ec44a] .is-horizontal{display:none!important}.el-icon[data-v-a34ec44a],[data-v-a34ec44a] .svg-icon{margin-right:5px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "table[data-v-0ce3f94e]{border-collapse:collapse}table tr td[data-v-0ce3f94e]{border:1px solid #e2e2e2;padding:5px;height:40px;color:#555;font-size:12px;line-height:30px}table tr td em[data-v-0ce3f94e]{color:red}table tr .tdBg[data-v-0ce3f94e]{font-weight:700}[data-v-0ce3f94e] .el-input__inner{height:35px!important;line-height:35px!important;font-size:12px}[data-v-0ce3f94e] .el-textarea__inner{font-size:12px}[data-v-0ce3f94e] .el-select{width:100%;display:inline-block;position:relative}[data-v-0ce3f94e] .el-checkbox__label,[data-v-0ce3f94e] .el-radio__label{font-size:12px;padding-left:5px}.tableBox table[data-v-0ce3f94e]{border-collapse:collapse}.tableBox table th[data-v-0ce3f94e]{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-0ce3f94e],.tableBox table th .addbtn i[data-v-0ce3f94e]{color:#337ab7;font-weight:700}.tableBox table tr[data-v-0ce3f94e]:nth-of-type(odd){background:#f9f9f9}.tableBox table tr[data-v-0ce3f94e]{cursor:pointer}.tableBox table td[data-v-0ce3f94e],.tableBox table tr[data-v-0ce3f94e]{font-size:12px;border:1px solid #e2e2e2}.tableBox table td[data-v-0ce3f94e]{line-height:20px;height:35px;color:#555}.tableBox table td .deleteButton[data-v-0ce3f94e]{color:#dd5a43;padding:2px 3px;border:1px solid transparent;border-radius:2px}.tableBox table td .deleteButton[data-v-0ce3f94e]:hover{border:1px solid #abbac3;text-decoration:none}.tableBox table td .editButton[data-v-0ce3f94e]{color:#478fca;padding:2px 3px;border:1px solid transparent;border-radius:2px}.tableBox table td .editButton[data-v-0ce3f94e]:hover{border:1px solid #abbac3;text-decoration:none}.tableBox table td .disabledButton[data-v-0ce3f94e]{color:#a9a9a9}.tableBox .el-row[data-v-0ce3f94e]{margin-top:10px;padding:10px}.tableBox[data-v-0ce3f94e] .el-checkbox__label{display:none}.tableBox .el-button-group[data-v-0ce3f94e]{float:right;margin-top:-10px;margin-bottom:10px}[data-v-0ce3f94e] .el-scrollbar__wrap{overflow-x:hidden!important}[data-v-0ce3f94e] .is-horizontal{display:none!important}.el-icon[data-v-0ce3f94e],[data-v-0ce3f94e] .svg-icon{margin-right:5px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -138686,19 +138687,19 @@ var update = add("31aba80c", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 74963:
+/***/ 95225:
 /***/ (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__(98469);
+var content = __webpack_require__(67027);
 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("8cf9e610", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("5deef3dc", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -138750,19 +138751,19 @@ var update = add("3dce005e", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 43164:
+/***/ 92328:
 /***/ (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__(16306);
+var content = __webpack_require__(98474);
 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("4d343ac9", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("04468cb6", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -146438,6 +146439,7 @@ var wfengine_install = function install(Vue) {
           if (btn.btnCode === 'btnOpenWordClick' || btn.btnCode === 'btnModifyFlTypeClick') {
             btn.btnShow = $scope.canEditBodyfile ? 1 : 0;
           }
+          if (btn.btnJavascript === null) btn.btnJavascript = '';
           if (!btn.i18nCode) {
             if (btn.btnJavascript && btn.btnJavascript.indexOf('(') !== -1) {
               if (btn.btnJavascript.indexOf('btnDeleteClick') !== -1) {
@@ -146904,6 +146906,29 @@ var wfengine_install = function install(Vue) {
             message: '没有可用的提交路径。'
           };
         }
+        if ($scope.wfInstance.udmNodes && $scope.wfInstance.udmNodes !== '') {
+          var emputyNodes = $scope.wfInstance.udmNodes.filter(function (udmNode) {
+            return !udmNode.name;
+          });
+          if (emputyNodes.length > 0) {
+            //$scope.handleTabsClick('flowChart')
+            return {
+              code: 'warning',
+              message: '自由协同流程节点配置不正确。'
+            };
+          }
+          if ($scope.wfInstance.passenger.chartData && $scope.wfInstance.passenger.chartData.paths) {
+            var emputyPaths = $scope.wfInstance.passenger.chartData.paths.filter(function (path) {
+              return !path.name;
+            });
+            if (emputyPaths.length > 0) {
+              return {
+                code: 'warning',
+                message: '自由协同流程节点配置不正确。'
+              };
+            }
+          }
+        }
         if (selRoute.taskNodes.length === 1 && selRoute.taskNodes[0].users.length === 1 && selRoute.taskNodes[0].users[0].account !== undefined) {
           $scope.submitHandle.route[selRoute.taskNodes[0].name] = {
             users: selRoute.taskNodes[0].users
@@ -251867,8 +251892,8 @@ var Tab2_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ var Tab2 = (Tab2_component.exports);
-;// 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/Tab3.vue?vue&type=template&id=a34ec44a&scoped=true
-var Tab3vue_type_template_id_a34ec44a_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/Tab3.vue?vue&type=template&id=0ce3f94e&scoped=true
+var Tab3vue_type_template_id_0ce3f94e_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('div', {
@@ -251918,7 +251943,7 @@ var Tab3vue_type_template_id_a34ec44a_scoped_true_render = function render() {
           return _vm.editButton(item);
         }
       }
-    }, [_vm._v(_vm._s(item.btnOrderNo))]), _c('td', {
+    }, [_vm._v(_vm._s(item.btnOrderNot))]), _c('td', {
       staticClass: "text-center",
       on: {
         "click": function click($event) {
@@ -252153,7 +252178,7 @@ var Tab3vue_type_template_id_a34ec44a_scoped_true_render = function render() {
     }
   }, [_vm._v("确 定")])], 1)], 1)], 1);
 };
-var Tab3vue_type_template_id_a34ec44a_scoped_true_staticRenderFns = [function () {
+var Tab3vue_type_template_id_0ce3f94e_scoped_true_staticRenderFns = [function () {
   var _vm = this,
     _c = _vm._self._c;
   return _c('thead', [_c('tr', [_c('th', {
@@ -252169,12 +252194,12 @@ var Tab3vue_type_template_id_a34ec44a_scoped_true_staticRenderFns = [function ()
   }, [_vm._v("按钮类型")]), _c('th', {
     staticClass: "text-center",
     staticStyle: {
-      "width": "70px"
+      "width": "85px"
     }
   }, [_vm._v("按钮排序")]), _c('th', {
     staticClass: "text-center",
     staticStyle: {
-      "width": "100px"
+      "width": "85px"
     }
   }, [_vm._v("显示位置")]), _c('th', {
     staticClass: "text-center",
@@ -252184,10 +252209,10 @@ var Tab3vue_type_template_id_a34ec44a_scoped_true_staticRenderFns = [function ()
   }, [_vm._v("操作")])])]);
 }];
 
-;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab3.vue?vue&type=template&id=a34ec44a&scoped=true
+;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab3.vue?vue&type=template&id=0ce3f94e&scoped=true
 
-;// 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/ButtonForm.vue?vue&type=template&id=0738c526&scoped=true
-var ButtonFormvue_type_template_id_0738c526_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/ButtonForm.vue?vue&type=template&id=77820b4f&scoped=true
+var ButtonFormvue_type_template_id_77820b4f_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('el-form', {
@@ -252957,7 +252982,7 @@ var ButtonFormvue_type_template_id_0738c526_scoped_true_render = function render
     }
   }, [_c('Icons')], 1) : _vm._e()], 1)], 1);
 };
-var ButtonFormvue_type_template_id_0738c526_scoped_true_staticRenderFns = [];
+var ButtonFormvue_type_template_id_77820b4f_scoped_true_staticRenderFns = [];
 
 ;// 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/ButtonForm.vue?vue&type=script&lang=js
 /* harmony default export */ var ButtonFormvue_type_script_lang_js = ({
@@ -253030,6 +253055,9 @@ var ButtonFormvue_type_template_id_0738c526_scoped_true_staticRenderFns = [];
         this.$set(this.curNodeOperation, 'btnShowCondition', 3);
       }
     }
+    if (this.curNodeOperation.btnJavascript === null) {
+      this.curNodeOperation.btnJavascript = '';
+    }
     this.$options.components['Icons'] = this.$loadComponent('@/wapp/support/icons/index');
     this.$bus.on('onSelectedIcon', this.onSelectedIcon);
   },
@@ -253105,9 +253133,9 @@ var ButtonFormvue_type_template_id_0738c526_scoped_true_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/ButtonForm.vue?vue&type=script&lang=js
  /* harmony default export */ var PanelNode_ButtonFormvue_type_script_lang_js = (ButtonFormvue_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/ButtonForm.vue?vue&type=style&index=0&id=0738c526&prod&scoped=true&lang=scss
-var ButtonFormvue_type_style_index_0_id_0738c526_prod_scoped_true_lang_scss = __webpack_require__(74963);
-;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/ButtonForm.vue?vue&type=style&index=0&id=0738c526&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/ButtonForm.vue?vue&type=style&index=0&id=77820b4f&prod&scoped=true&lang=scss
+var ButtonFormvue_type_style_index_0_id_77820b4f_prod_scoped_true_lang_scss = __webpack_require__(95225);
+;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/ButtonForm.vue?vue&type=style&index=0&id=77820b4f&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/ButtonForm.vue
 
@@ -253120,11 +253148,11 @@ var ButtonFormvue_type_style_index_0_id_0738c526_prod_scoped_true_lang_scss = __
 
 var ButtonForm_component = (0,componentNormalizer/* default */.A)(
   PanelNode_ButtonFormvue_type_script_lang_js,
-  ButtonFormvue_type_template_id_0738c526_scoped_true_render,
-  ButtonFormvue_type_template_id_0738c526_scoped_true_staticRenderFns,
+  ButtonFormvue_type_template_id_77820b4f_scoped_true_render,
+  ButtonFormvue_type_template_id_77820b4f_scoped_true_staticRenderFns,
   false,
   null,
-  "0738c526",
+  "77820b4f",
   null
   
 )
@@ -253182,11 +253210,20 @@ var ButtonForm_component = (0,componentNormalizer/* default */.A)(
       this.curNode = curNode;
     },
     curNodeOperationArrhandler: function curNodeOperationArrhandler(curNodeOperationArr) {
-      this.curNodeOperationArr = curNodeOperationArr.sort(function (a, b) {
-        return a.btnOrderNo - b.btnOrderNo;
+      curNodeOperationArr.forEach(function (oper) {
+        if (oper.btnType === '1') {
+          oper.passenger.btnOrderNo = oper.btnOrderNo;
+        } else if (oper.btnType === '2') {
+          oper.passenger.btnOrderNo = oper.btnOrderNo;
+          curNodeOperationArr.forEach(function (suboper) {
+            if (suboper.btnType === '3' && suboper.btnGroupId === oper.id) {
+              suboper.passenger.btnOrderNo = oper.btnOrderNo + '-' + suboper.btnOrderNo;
+            }
+          });
+        }
       });
       this.curNodeOperationArr = curNodeOperationArr.sort(function (a, b) {
-        return a.btnType - b.btnType;
+        return a.passenger.btnOrderNo.localeCompare(b.passenger.btnOrderNo);
       });
     },
     // 添加自定义按钮
@@ -253697,9 +253734,9 @@ var ButtonForm_component = (0,componentNormalizer/* default */.A)(
 });
 ;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab3.vue?vue&type=script&lang=js
  /* harmony default export */ var PanelNode_Tab3vue_type_script_lang_js = (Tab3vue_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/Tab3.vue?vue&type=style&index=0&id=a34ec44a&prod&scoped=true&lang=scss
-var Tab3vue_type_style_index_0_id_a34ec44a_prod_scoped_true_lang_scss = __webpack_require__(43164);
-;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab3.vue?vue&type=style&index=0&id=a34ec44a&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/Tab3.vue?vue&type=style&index=0&id=0ce3f94e&prod&scoped=true&lang=scss
+var Tab3vue_type_style_index_0_id_0ce3f94e_prod_scoped_true_lang_scss = __webpack_require__(92328);
+;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab3.vue?vue&type=style&index=0&id=0ce3f94e&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab3.vue
 
@@ -253712,11 +253749,11 @@ var Tab3vue_type_style_index_0_id_a34ec44a_prod_scoped_true_lang_scss = __webpac
 
 var Tab3_component = (0,componentNormalizer/* default */.A)(
   PanelNode_Tab3vue_type_script_lang_js,
-  Tab3vue_type_template_id_a34ec44a_scoped_true_render,
-  Tab3vue_type_template_id_a34ec44a_scoped_true_staticRenderFns,
+  Tab3vue_type_template_id_0ce3f94e_scoped_true_render,
+  Tab3vue_type_template_id_0ce3f94e_scoped_true_staticRenderFns,
   false,
   null,
-  "a34ec44a",
+  "0ce3f94e",
   null
   
 )

package/lib/ecwappaio.umd.js

@@ -9864,6 +9864,7 @@ var actions = {
               return window.$user.getLoginUser(data[window.jwtTokenKey || 'ECWEB-JWTSSO-TOKEN']);
             case 2:
               loginUser = _context2.sent;
+              sessionStorage.removeItem('dynamicRoutes-' + loginUser.personAccount);
               window.$auth.setProductCode(data['PRODUCT_CODE_LIST'], loginUser.sysCode);
               window.$auth.setToken(data[window.jwtTokenKey || 'ECWEB-JWTSSO-TOKEN']);
               window.$auth.setTicket(data[window.ecwebTicket || 'ecweb-ticket']);
@@ -9883,7 +9884,7 @@ var actions = {
               commit('SET_MAX_FILE_SIZE', data['MAX_FILE_SIZE']);
               commit('SET_AVATAR', "/apigw" + '/base/user/download?id=' + loginUser.userId + '&dataField=photoData&nameField=photoName&csrfToken=' + data['ecweb-csrf-token']);
               resolve();
-            case 18:
+            case 19:
             case "end":
               return _context2.stop();
           }
@@ -44905,7 +44906,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".attr_title[data-v-bf8654bc]{height:44
 
 /***/ }),
 
-/***/ 25413:
+/***/ 10323:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -44919,7 +44920,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, "[data-v-0738c526] .el-select{width:100%}.btnpreview[data-v-0738c526]{color:#337ab7}.btnpreview[data-v-0738c526]:hover{color:#23527c;text-decoration:underline}[data-v-0738c526] .el-dialog__body{height:650px;overflow-y:auto;padding:0 0 20px 0}[data-v-0738c526] .el-dialog__body .el-tabs--top{margin-top:0}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "[data-v-77820b4f] .el-select{width:100%}.btnpreview[data-v-77820b4f]{color:#337ab7}.btnpreview[data-v-77820b4f]:hover{color:#23527c;text-decoration:underline}[data-v-77820b4f] .el-dialog__body{height:650px;overflow-y:auto;padding:0 0 20px 0}[data-v-77820b4f] .el-dialog__body .el-tabs--top{margin-top:0}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -44989,7 +44990,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, "table[data-v-78dcb370]{border-collapse
 
 /***/ }),
 
-/***/ 55602:
+/***/ 37770:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -45003,7 +45004,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-a34ec44a]{border-collapse:collapse}table tr td[data-v-a34ec44a]{border:1px solid #e2e2e2;padding:5px;height:40px;color:#555;font-size:12px;line-height:30px}table tr td em[data-v-a34ec44a]{color:red}table tr .tdBg[data-v-a34ec44a]{font-weight:700}[data-v-a34ec44a] .el-input__inner{height:35px!important;line-height:35px!important;font-size:12px}[data-v-a34ec44a] .el-textarea__inner{font-size:12px}[data-v-a34ec44a] .el-select{width:100%;display:inline-block;position:relative}[data-v-a34ec44a] .el-checkbox__label,[data-v-a34ec44a] .el-radio__label{font-size:12px;padding-left:5px}.tableBox table[data-v-a34ec44a]{border-collapse:collapse}.tableBox table th[data-v-a34ec44a]{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-a34ec44a],.tableBox table th .addbtn i[data-v-a34ec44a]{color:#337ab7;font-weight:700}.tableBox table tr[data-v-a34ec44a]:nth-of-type(odd){background:#f9f9f9}.tableBox table tr[data-v-a34ec44a]{cursor:pointer}.tableBox table td[data-v-a34ec44a],.tableBox table tr[data-v-a34ec44a]{font-size:12px;border:1px solid #e2e2e2}.tableBox table td[data-v-a34ec44a]{line-height:20px;height:35px;color:#555}.tableBox table td .deleteButton[data-v-a34ec44a]{color:#dd5a43;padding:2px 3px;border:1px solid transparent;border-radius:2px}.tableBox table td .deleteButton[data-v-a34ec44a]:hover{border:1px solid #abbac3;text-decoration:none}.tableBox table td .editButton[data-v-a34ec44a]{color:#478fca;padding:2px 3px;border:1px solid transparent;border-radius:2px}.tableBox table td .editButton[data-v-a34ec44a]:hover{border:1px solid #abbac3;text-decoration:none}.tableBox table td .disabledButton[data-v-a34ec44a]{color:#a9a9a9}.tableBox .el-row[data-v-a34ec44a]{margin-top:10px;padding:10px}.tableBox[data-v-a34ec44a] .el-checkbox__label{display:none}.tableBox .el-button-group[data-v-a34ec44a]{float:right;margin-top:-10px;margin-bottom:10px}[data-v-a34ec44a] .el-scrollbar__wrap{overflow-x:hidden!important}[data-v-a34ec44a] .is-horizontal{display:none!important}.el-icon[data-v-a34ec44a],[data-v-a34ec44a] .svg-icon{margin-right:5px}", ""]);
+___CSS_LOADER_EXPORT___.push([module.id, "table[data-v-0ce3f94e]{border-collapse:collapse}table tr td[data-v-0ce3f94e]{border:1px solid #e2e2e2;padding:5px;height:40px;color:#555;font-size:12px;line-height:30px}table tr td em[data-v-0ce3f94e]{color:red}table tr .tdBg[data-v-0ce3f94e]{font-weight:700}[data-v-0ce3f94e] .el-input__inner{height:35px!important;line-height:35px!important;font-size:12px}[data-v-0ce3f94e] .el-textarea__inner{font-size:12px}[data-v-0ce3f94e] .el-select{width:100%;display:inline-block;position:relative}[data-v-0ce3f94e] .el-checkbox__label,[data-v-0ce3f94e] .el-radio__label{font-size:12px;padding-left:5px}.tableBox table[data-v-0ce3f94e]{border-collapse:collapse}.tableBox table th[data-v-0ce3f94e]{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-0ce3f94e],.tableBox table th .addbtn i[data-v-0ce3f94e]{color:#337ab7;font-weight:700}.tableBox table tr[data-v-0ce3f94e]:nth-of-type(odd){background:#f9f9f9}.tableBox table tr[data-v-0ce3f94e]{cursor:pointer}.tableBox table td[data-v-0ce3f94e],.tableBox table tr[data-v-0ce3f94e]{font-size:12px;border:1px solid #e2e2e2}.tableBox table td[data-v-0ce3f94e]{line-height:20px;height:35px;color:#555}.tableBox table td .deleteButton[data-v-0ce3f94e]{color:#dd5a43;padding:2px 3px;border:1px solid transparent;border-radius:2px}.tableBox table td .deleteButton[data-v-0ce3f94e]:hover{border:1px solid #abbac3;text-decoration:none}.tableBox table td .editButton[data-v-0ce3f94e]{color:#478fca;padding:2px 3px;border:1px solid transparent;border-radius:2px}.tableBox table td .editButton[data-v-0ce3f94e]:hover{border:1px solid #abbac3;text-decoration:none}.tableBox table td .disabledButton[data-v-0ce3f94e]{color:#a9a9a9}.tableBox .el-row[data-v-0ce3f94e]{margin-top:10px;padding:10px}.tableBox[data-v-0ce3f94e] .el-checkbox__label{display:none}.tableBox .el-button-group[data-v-0ce3f94e]{float:right;margin-top:-10px;margin-bottom:10px}[data-v-0ce3f94e] .el-scrollbar__wrap{overflow-x:hidden!important}[data-v-0ce3f94e] .is-horizontal{display:none!important}.el-icon[data-v-0ce3f94e],[data-v-0ce3f94e] .svg-icon{margin-right:5px}", ""]);
 // Exports
 /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
 
@@ -138696,19 +138697,19 @@ var update = add("dd3d640c", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 697:
+/***/ 59951:
 /***/ (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__(25413);
+var content = __webpack_require__(10323);
 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("3258aef8", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("5276d448", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -138760,19 +138761,19 @@ var update = add("2086a25e", content, true, {"sourceMap":false,"shadowMode":fals
 
 /***/ }),
 
-/***/ 10054:
+/***/ 47342:
 /***/ (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__(55602);
+var content = __webpack_require__(37770);
 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("2fecdcc9", content, true, {"sourceMap":false,"shadowMode":false});
+var update = add("3ed548b6", content, true, {"sourceMap":false,"shadowMode":false});
 
 /***/ }),
 
@@ -146448,6 +146449,7 @@ var wfengine_install = function install(Vue) {
           if (btn.btnCode === 'btnOpenWordClick' || btn.btnCode === 'btnModifyFlTypeClick') {
             btn.btnShow = $scope.canEditBodyfile ? 1 : 0;
           }
+          if (btn.btnJavascript === null) btn.btnJavascript = '';
           if (!btn.i18nCode) {
             if (btn.btnJavascript && btn.btnJavascript.indexOf('(') !== -1) {
               if (btn.btnJavascript.indexOf('btnDeleteClick') !== -1) {
@@ -146914,6 +146916,29 @@ var wfengine_install = function install(Vue) {
             message: '没有可用的提交路径。'
           };
         }
+        if ($scope.wfInstance.udmNodes && $scope.wfInstance.udmNodes !== '') {
+          var emputyNodes = $scope.wfInstance.udmNodes.filter(function (udmNode) {
+            return !udmNode.name;
+          });
+          if (emputyNodes.length > 0) {
+            //$scope.handleTabsClick('flowChart')
+            return {
+              code: 'warning',
+              message: '自由协同流程节点配置不正确。'
+            };
+          }
+          if ($scope.wfInstance.passenger.chartData && $scope.wfInstance.passenger.chartData.paths) {
+            var emputyPaths = $scope.wfInstance.passenger.chartData.paths.filter(function (path) {
+              return !path.name;
+            });
+            if (emputyPaths.length > 0) {
+              return {
+                code: 'warning',
+                message: '自由协同流程节点配置不正确。'
+              };
+            }
+          }
+        }
         if (selRoute.taskNodes.length === 1 && selRoute.taskNodes[0].users.length === 1 && selRoute.taskNodes[0].users[0].account !== undefined) {
           $scope.submitHandle.route[selRoute.taskNodes[0].name] = {
             users: selRoute.taskNodes[0].users
@@ -251877,8 +251902,8 @@ var Tab2_component = (0,componentNormalizer/* default */.A)(
 )
 
 /* harmony default export */ var Tab2 = (Tab2_component.exports);
-;// 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/Tab3.vue?vue&type=template&id=a34ec44a&scoped=true
-var Tab3vue_type_template_id_a34ec44a_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/Tab3.vue?vue&type=template&id=0ce3f94e&scoped=true
+var Tab3vue_type_template_id_0ce3f94e_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('div', {
@@ -251928,7 +251953,7 @@ var Tab3vue_type_template_id_a34ec44a_scoped_true_render = function render() {
           return _vm.editButton(item);
         }
       }
-    }, [_vm._v(_vm._s(item.btnOrderNo))]), _c('td', {
+    }, [_vm._v(_vm._s(item.btnOrderNot))]), _c('td', {
       staticClass: "text-center",
       on: {
         "click": function click($event) {
@@ -252163,7 +252188,7 @@ var Tab3vue_type_template_id_a34ec44a_scoped_true_render = function render() {
     }
   }, [_vm._v("确 定")])], 1)], 1)], 1);
 };
-var Tab3vue_type_template_id_a34ec44a_scoped_true_staticRenderFns = [function () {
+var Tab3vue_type_template_id_0ce3f94e_scoped_true_staticRenderFns = [function () {
   var _vm = this,
     _c = _vm._self._c;
   return _c('thead', [_c('tr', [_c('th', {
@@ -252179,12 +252204,12 @@ var Tab3vue_type_template_id_a34ec44a_scoped_true_staticRenderFns = [function ()
   }, [_vm._v("按钮类型")]), _c('th', {
     staticClass: "text-center",
     staticStyle: {
-      "width": "70px"
+      "width": "85px"
     }
   }, [_vm._v("按钮排序")]), _c('th', {
     staticClass: "text-center",
     staticStyle: {
-      "width": "100px"
+      "width": "85px"
     }
   }, [_vm._v("显示位置")]), _c('th', {
     staticClass: "text-center",
@@ -252194,10 +252219,10 @@ var Tab3vue_type_template_id_a34ec44a_scoped_true_staticRenderFns = [function ()
   }, [_vm._v("操作")])])]);
 }];
 
-;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab3.vue?vue&type=template&id=a34ec44a&scoped=true
+;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab3.vue?vue&type=template&id=0ce3f94e&scoped=true
 
-;// 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/ButtonForm.vue?vue&type=template&id=0738c526&scoped=true
-var ButtonFormvue_type_template_id_0738c526_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/ButtonForm.vue?vue&type=template&id=77820b4f&scoped=true
+var ButtonFormvue_type_template_id_77820b4f_scoped_true_render = function render() {
   var _vm = this,
     _c = _vm._self._c;
   return _c('div', [_c('el-form', {
@@ -252967,7 +252992,7 @@ var ButtonFormvue_type_template_id_0738c526_scoped_true_render = function render
     }
   }, [_c('Icons')], 1) : _vm._e()], 1)], 1);
 };
-var ButtonFormvue_type_template_id_0738c526_scoped_true_staticRenderFns = [];
+var ButtonFormvue_type_template_id_77820b4f_scoped_true_staticRenderFns = [];
 
 ;// 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/ButtonForm.vue?vue&type=script&lang=js
 /* harmony default export */ var ButtonFormvue_type_script_lang_js = ({
@@ -253040,6 +253065,9 @@ var ButtonFormvue_type_template_id_0738c526_scoped_true_staticRenderFns = [];
         this.$set(this.curNodeOperation, 'btnShowCondition', 3);
       }
     }
+    if (this.curNodeOperation.btnJavascript === null) {
+      this.curNodeOperation.btnJavascript = '';
+    }
     this.$options.components['Icons'] = this.$loadComponent('@/wapp/support/icons/index');
     this.$bus.on('onSelectedIcon', this.onSelectedIcon);
   },
@@ -253115,9 +253143,9 @@ var ButtonFormvue_type_template_id_0738c526_scoped_true_staticRenderFns = [];
 });
 ;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/ButtonForm.vue?vue&type=script&lang=js
  /* harmony default export */ var PanelNode_ButtonFormvue_type_script_lang_js = (ButtonFormvue_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/ButtonForm.vue?vue&type=style&index=0&id=0738c526&prod&scoped=true&lang=scss
-var ButtonFormvue_type_style_index_0_id_0738c526_prod_scoped_true_lang_scss = __webpack_require__(697);
-;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/ButtonForm.vue?vue&type=style&index=0&id=0738c526&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/ButtonForm.vue?vue&type=style&index=0&id=77820b4f&prod&scoped=true&lang=scss
+var ButtonFormvue_type_style_index_0_id_77820b4f_prod_scoped_true_lang_scss = __webpack_require__(59951);
+;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/ButtonForm.vue?vue&type=style&index=0&id=77820b4f&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/ButtonForm.vue
 
@@ -253130,11 +253158,11 @@ var ButtonFormvue_type_style_index_0_id_0738c526_prod_scoped_true_lang_scss = __
 
 var ButtonForm_component = (0,componentNormalizer/* default */.A)(
   PanelNode_ButtonFormvue_type_script_lang_js,
-  ButtonFormvue_type_template_id_0738c526_scoped_true_render,
-  ButtonFormvue_type_template_id_0738c526_scoped_true_staticRenderFns,
+  ButtonFormvue_type_template_id_77820b4f_scoped_true_render,
+  ButtonFormvue_type_template_id_77820b4f_scoped_true_staticRenderFns,
   false,
   null,
-  "0738c526",
+  "77820b4f",
   null
   
 )
@@ -253192,11 +253220,20 @@ var ButtonForm_component = (0,componentNormalizer/* default */.A)(
       this.curNode = curNode;
     },
     curNodeOperationArrhandler: function curNodeOperationArrhandler(curNodeOperationArr) {
-      this.curNodeOperationArr = curNodeOperationArr.sort(function (a, b) {
-        return a.btnOrderNo - b.btnOrderNo;
+      curNodeOperationArr.forEach(function (oper) {
+        if (oper.btnType === '1') {
+          oper.passenger.btnOrderNo = oper.btnOrderNo;
+        } else if (oper.btnType === '2') {
+          oper.passenger.btnOrderNo = oper.btnOrderNo;
+          curNodeOperationArr.forEach(function (suboper) {
+            if (suboper.btnType === '3' && suboper.btnGroupId === oper.id) {
+              suboper.passenger.btnOrderNo = oper.btnOrderNo + '-' + suboper.btnOrderNo;
+            }
+          });
+        }
       });
       this.curNodeOperationArr = curNodeOperationArr.sort(function (a, b) {
-        return a.btnType - b.btnType;
+        return a.passenger.btnOrderNo.localeCompare(b.passenger.btnOrderNo);
       });
     },
     // 添加自定义按钮
@@ -253707,9 +253744,9 @@ var ButtonForm_component = (0,componentNormalizer/* default */.A)(
 });
 ;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab3.vue?vue&type=script&lang=js
  /* harmony default export */ var PanelNode_Tab3vue_type_script_lang_js = (Tab3vue_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/Tab3.vue?vue&type=style&index=0&id=a34ec44a&prod&scoped=true&lang=scss
-var Tab3vue_type_style_index_0_id_a34ec44a_prod_scoped_true_lang_scss = __webpack_require__(10054);
-;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab3.vue?vue&type=style&index=0&id=a34ec44a&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/Tab3.vue?vue&type=style&index=0&id=0ce3f94e&prod&scoped=true&lang=scss
+var Tab3vue_type_style_index_0_id_0ce3f94e_prod_scoped_true_lang_scss = __webpack_require__(47342);
+;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab3.vue?vue&type=style&index=0&id=0ce3f94e&prod&scoped=true&lang=scss
 
 ;// CONCATENATED MODULE: ./packages/ecwplus/WorkflowDesigner/src/components/RightForm/PanelNode/Tab3.vue
 
@@ -253722,11 +253759,11 @@ var Tab3vue_type_style_index_0_id_a34ec44a_prod_scoped_true_lang_scss = __webpac
 
 var Tab3_component = (0,componentNormalizer/* default */.A)(
   PanelNode_Tab3vue_type_script_lang_js,
-  Tab3vue_type_template_id_a34ec44a_scoped_true_render,
-  Tab3vue_type_template_id_a34ec44a_scoped_true_staticRenderFns,
+  Tab3vue_type_template_id_0ce3f94e_scoped_true_render,
+  Tab3vue_type_template_id_0ce3f94e_scoped_true_staticRenderFns,
   false,
   null,
-  "a34ec44a",
+  "0ce3f94e",
   null
   
 )