eoss-mobiles 0.3.63 → 0.3.65

package/lib/eoss-mobile.common.js

@@ -15512,8 +15512,8 @@ var StartFlow_component = normalizeComponent(
 )
 
 /* harmony default export */ var StartFlow = (StartFlow_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Handle.vue?vue&type=template&id=2b6a3d23
-var Handlevue_type_template_id_2b6a3d23_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Handle.vue?vue&type=template&id=952a81d8
+var Handlevue_type_template_id_952a81d8_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -15592,7 +15592,10 @@ var Handlevue_type_template_id_2b6a3d23_render = function () {
                     },
                     on: { onInputOpintion: _vm.onInputOpintion },
                   }),
-                  _vm.typeCode != "fenyue" && !_vm.endFlow
+                  _vm.typeCode != "fenyue" &&
+                  (!_vm.endFlow ||
+                    _vm.taskOperations.length > 1 ||
+                    _vm.taskOperationShiftedNodeList)
                     ? _c("div", { staticClass: "special-box input-box" }, [
                         _vm.isCanAddSign
                           ? _c(
@@ -16960,11 +16963,11 @@ var Handlevue_type_template_id_2b6a3d23_render = function () {
     1
   )
 }
-var Handlevue_type_template_id_2b6a3d23_staticRenderFns = []
-Handlevue_type_template_id_2b6a3d23_render._withStripped = true
+var Handlevue_type_template_id_952a81d8_staticRenderFns = []
+Handlevue_type_template_id_952a81d8_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/Handle.vue?vue&type=template&id=2b6a3d23
+// CONCATENATED MODULE: ./packages/flow/src/components/Handle.vue?vue&type=template&id=952a81d8
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Reject.vue?vue&type=template&id=7503f952
 var Rejectvue_type_template_id_7503f952_render = function () {
@@ -18258,6 +18261,13 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -18867,9 +18877,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
     changeNextOperate: function changeNextOperate(val, isDef) {
       var _this8 = this;
 
-      console.log(val, isDef, this.tagKey, 'isDef');
       if (!isDef && val.key === this.tagKey) return;
-      console.log(val, isDef, this.tagKey, 'isDef2222');
       this.tagKey = val.key;
       //恢复默认
       this.isNextUser = false;
@@ -18893,7 +18901,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
       } else {
         this.isReject = false;
       }
-      this.form.nextOperate = val.key;
+      this.form.nextOperate = val.isNextNode ? val.nextOperate : val.key;
       this.form.nextOperateName = val.value;
       this.nodeList = val.taskNodeList;
       if (this.isSpecial) {
@@ -19188,18 +19196,31 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
             that.isSpecial = res.data.isSpecial;
             that.processObj = res.data;
             that.taskOperations = [].concat(res.data.taskOperations, that.taskOperations);
+            var isSelected = false;
+            var isSelectIndex = 0;
             if (that.taskOperations && that.taskOperations.length > 0) {
-              var isSelected = false;
-              that.taskOperations.map(function (item) {
+              that.taskOperations.map(function (item, index) {
                 if (item.isSelected || that.taskOperations.length == 1) {
                   isSelected = true;
+                  isSelectIndex = index;
                   if (that.taskOperations.length == 1) {
-                    that.form.nextOperate = that.taskOperations[0].key;
+
+                    if (that.taskOperations[0].isNextNode) {
+
+                      that.form.nextOperate = that.taskOperations[0].nextOperate;
+                    } else {
+                      that.form.nextOperate = that.taskOperations[0].key;
+                    }
                     that.form.nextOperateName = that.taskOperations[0].value;
-                    if (!that.taskOperations[0].taskNodeList || that.taskOperations[0].taskNodeList.length === 0) {
+                    if ((!that.taskOperations[0].taskNodeList || that.taskOperations[0].taskNodeList.length === 0) && !that.taskOperations[0].isNextNode) {
+
                       that.form.nextNodeId = undefined;
                       that.form.nextNodeName = undefined;
+                    } else if (that.taskOperations[0].isNextNode) {
+                      that.form.nextNodeId = that.taskOperations[0].key;
+                      that.form.nextNodeName = that.taskOperations[0].value;
                     } else {
+
                       that.nodeList = that.taskOperations[0].taskNodeList;
                       var info = [];
                       that.nodeList.map(function (x) {
@@ -19259,7 +19280,9 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
             }
             that.changeNextOperate({
               value: that.form.nextOperateName,
-              key: that.form.nextOperate,
+              key: that.taskOperations[isSelectIndex].key,
+              nextOperate: that.taskOperations[isSelectIndex].nextOperate,
+              isNextNode: that.taskOperations[isSelectIndex].isNextNode,
               taskNodeList: that.nodeList
             }, true);
             if (nodeInfoMap && JSON.stringify(nodeInfoMap) != '{}') {
@@ -19368,7 +19391,6 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
         _this10.$toast.clear();
         _this10.showFlowBtn = true;
         if (res.status == 'success') {
-
           _that.currentNodeEnableItemHandleDescription = res.data.nodeExtAttr.currentNodeEnableItemHandleDescription == 1;
           _that.deptRoleCode = res.data.nodeExtAttr.deptRoleCode;
           _that.enableCustomLimitTimeSetting = res.data.nodeExtAttr.enableCustomLimitTimeSetting == 1;
@@ -19514,8 +19536,8 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 
 var Handle_component = normalizeComponent(
   components_Handlevue_type_script_lang_js,
-  Handlevue_type_template_id_2b6a3d23_render,
-  Handlevue_type_template_id_2b6a3d23_staticRenderFns,
+  Handlevue_type_template_id_952a81d8_render,
+  Handlevue_type_template_id_952a81d8_staticRenderFns,
   false,
   null,
   null,
@@ -29430,7 +29452,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src = __webpack_exports__["default"] = ({
-  version: '0.3.63',
+  version: '0.3.65',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow.js

@@ -4755,8 +4755,8 @@ var StartFlow_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var StartFlow = (StartFlow_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Handle.vue?vue&type=template&id=2b6a3d23
-var Handlevue_type_template_id_2b6a3d23_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Handle.vue?vue&type=template&id=952a81d8
+var Handlevue_type_template_id_952a81d8_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4835,7 +4835,10 @@ var Handlevue_type_template_id_2b6a3d23_render = function () {
                     },
                     on: { onInputOpintion: _vm.onInputOpintion },
                   }),
-                  _vm.typeCode != "fenyue" && !_vm.endFlow
+                  _vm.typeCode != "fenyue" &&
+                  (!_vm.endFlow ||
+                    _vm.taskOperations.length > 1 ||
+                    _vm.taskOperationShiftedNodeList)
                     ? _c("div", { staticClass: "special-box input-box" }, [
                         _vm.isCanAddSign
                           ? _c(
@@ -6203,11 +6206,11 @@ var Handlevue_type_template_id_2b6a3d23_render = function () {
     1
   )
 }
-var Handlevue_type_template_id_2b6a3d23_staticRenderFns = []
-Handlevue_type_template_id_2b6a3d23_render._withStripped = true
+var Handlevue_type_template_id_952a81d8_staticRenderFns = []
+Handlevue_type_template_id_952a81d8_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/components/Handle.vue?vue&type=template&id=2b6a3d23
+// CONCATENATED MODULE: ./packages/flow/src/components/Handle.vue?vue&type=template&id=952a81d8
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/components/Reject.vue?vue&type=template&id=7503f952
 var Rejectvue_type_template_id_7503f952_render = function () {
@@ -7501,6 +7504,13 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -8110,9 +8120,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
     changeNextOperate: function changeNextOperate(val, isDef) {
       var _this8 = this;
 
-      console.log(val, isDef, this.tagKey, 'isDef');
       if (!isDef && val.key === this.tagKey) return;
-      console.log(val, isDef, this.tagKey, 'isDef2222');
       this.tagKey = val.key;
       //恢复默认
       this.isNextUser = false;
@@ -8136,7 +8144,7 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
       } else {
         this.isReject = false;
       }
-      this.form.nextOperate = val.key;
+      this.form.nextOperate = val.isNextNode ? val.nextOperate : val.key;
       this.form.nextOperateName = val.value;
       this.nodeList = val.taskNodeList;
       if (this.isSpecial) {
@@ -8431,18 +8439,31 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
             that.isSpecial = res.data.isSpecial;
             that.processObj = res.data;
             that.taskOperations = [].concat(res.data.taskOperations, that.taskOperations);
+            var isSelected = false;
+            var isSelectIndex = 0;
             if (that.taskOperations && that.taskOperations.length > 0) {
-              var isSelected = false;
-              that.taskOperations.map(function (item) {
+              that.taskOperations.map(function (item, index) {
                 if (item.isSelected || that.taskOperations.length == 1) {
                   isSelected = true;
+                  isSelectIndex = index;
                   if (that.taskOperations.length == 1) {
-                    that.form.nextOperate = that.taskOperations[0].key;
+
+                    if (that.taskOperations[0].isNextNode) {
+
+                      that.form.nextOperate = that.taskOperations[0].nextOperate;
+                    } else {
+                      that.form.nextOperate = that.taskOperations[0].key;
+                    }
                     that.form.nextOperateName = that.taskOperations[0].value;
-                    if (!that.taskOperations[0].taskNodeList || that.taskOperations[0].taskNodeList.length === 0) {
+                    if ((!that.taskOperations[0].taskNodeList || that.taskOperations[0].taskNodeList.length === 0) && !that.taskOperations[0].isNextNode) {
+
                       that.form.nextNodeId = undefined;
                       that.form.nextNodeName = undefined;
+                    } else if (that.taskOperations[0].isNextNode) {
+                      that.form.nextNodeId = that.taskOperations[0].key;
+                      that.form.nextNodeName = that.taskOperations[0].value;
                     } else {
+
                       that.nodeList = that.taskOperations[0].taskNodeList;
                       var info = [];
                       that.nodeList.map(function (x) {
@@ -8502,7 +8523,9 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
             }
             that.changeNextOperate({
               value: that.form.nextOperateName,
-              key: that.form.nextOperate,
+              key: that.taskOperations[isSelectIndex].key,
+              nextOperate: that.taskOperations[isSelectIndex].nextOperate,
+              isNextNode: that.taskOperations[isSelectIndex].isNextNode,
               taskNodeList: that.nodeList
             }, true);
             if (nodeInfoMap && JSON.stringify(nodeInfoMap) != '{}') {
@@ -8611,7 +8634,6 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
         _this10.$toast.clear();
         _this10.showFlowBtn = true;
         if (res.status == 'success') {
-
           _that.currentNodeEnableItemHandleDescription = res.data.nodeExtAttr.currentNodeEnableItemHandleDescription == 1;
           _that.deptRoleCode = res.data.nodeExtAttr.deptRoleCode;
           _that.enableCustomLimitTimeSetting = res.data.nodeExtAttr.enableCustomLimitTimeSetting == 1;
@@ -8757,8 +8779,8 @@ var Handlevue_type_script_lang_js_extends = Object.assign || function (target) {
 
 var Handle_component = Object(componentNormalizer["a" /* default */])(
   components_Handlevue_type_script_lang_js,
-  Handlevue_type_template_id_2b6a3d23_render,
-  Handlevue_type_template_id_2b6a3d23_staticRenderFns,
+  Handlevue_type_template_id_952a81d8_render,
+  Handlevue_type_template_id_952a81d8_staticRenderFns,
   false,
   null,
   null,