eoss-ui 0.6.79 → 0.6.80

package/lib/eoss-ui.common.js

@@ -27180,8 +27180,8 @@ form_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_form = (form_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=b92af252&
-var mainvue_type_template_id_b92af252_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/main.vue?vue&type=template&id=4ea6a802&
+var mainvue_type_template_id_4ea6a802_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -29992,11 +29992,11 @@ var mainvue_type_template_id_b92af252_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_b92af252_staticRenderFns = []
-mainvue_type_template_id_b92af252_render._withStripped = true
+var mainvue_type_template_id_4ea6a802_staticRenderFns = []
+mainvue_type_template_id_4ea6a802_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=b92af252&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=4ea6a802&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=19364a89&
 var CommonOpinionsvue_type_template_id_19364a89_render = function () {
@@ -35463,8 +35463,8 @@ var TimeLimit_component = normalizeComponent(
 )
 
 /* harmony default export */ var TimeLimit = (TimeLimit_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/processReject.vue?vue&type=template&id=67bb0710&
-var processRejectvue_type_template_id_67bb0710_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/processReject.vue?vue&type=template&id=9cd54606&
+var processRejectvue_type_template_id_9cd54606_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -35492,7 +35492,11 @@ var processRejectvue_type_template_id_67bb0710_render = function () {
         {
           ref: "nextNode",
           staticClass: "demo-dynamic",
-          attrs: { model: _vm.nextNode, "label-width": "110px" },
+          attrs: {
+            model: _vm.nextNode,
+            "label-width": "100px",
+            "label-align": "left",
+          },
         },
         [
           _c(
@@ -35685,11 +35689,11 @@ var processRejectvue_type_template_id_67bb0710_render = function () {
     1
   )
 }
-var processRejectvue_type_template_id_67bb0710_staticRenderFns = []
-processRejectvue_type_template_id_67bb0710_render._withStripped = true
+var processRejectvue_type_template_id_9cd54606_staticRenderFns = []
+processRejectvue_type_template_id_9cd54606_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processReject.vue?vue&type=template&id=67bb0710&
+// CONCATENATED MODULE: ./packages/flow/src/processReject.vue?vue&type=template&id=9cd54606&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processReject.vue?vue&type=script&lang=js&
 //
@@ -35777,6 +35781,7 @@ processRejectvue_type_template_id_67bb0710_render._withStripped = true
 //
 //
 //
+//
 
 
 
@@ -35995,8 +36000,8 @@ processRejectvue_type_template_id_67bb0710_render._withStripped = true
 
 var processReject_component = normalizeComponent(
   src_processRejectvue_type_script_lang_js_,
-  processRejectvue_type_template_id_67bb0710_render,
-  processRejectvue_type_template_id_67bb0710_staticRenderFns,
+  processRejectvue_type_template_id_9cd54606_render,
+  processRejectvue_type_template_id_9cd54606_staticRenderFns,
   false,
   null,
   null,
@@ -46126,6 +46131,14 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -47504,6 +47517,13 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
     selecNext: function selecNext(val, type, isDef) {
       var _this26 = this;
 
+      console.log(val, 'valvalval');
+      var isNextNode = false;
+      if (type) {
+        isNextNode = this.operationList.filter(function (x) {
+          return x.key == val;
+        })[0].isNextNode;
+      }
       this.loading = utils_util["a" /* default */].loading(this.$loading, '加载中...');
       if (this.multiple) {
         this.nextNode.nextUserId = [];
@@ -47514,7 +47534,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
       this.selectUserList = [];
       this.radioList = [];
 
-      if (type) {
+      if (type && !isNextNode) {
+        console.log('不是下一步节点');
         this.isNextUser = false;
         this.isShowNode = false;
         this.isMainSubProcess = false;
@@ -47531,12 +47552,30 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
         this.nextNode.isReturnRejectNode = 0;
         this.nextNode.isSerialSubmit = 0;
         this.nodeInfos = [];
+        var newOperationList = [];
+        // this.operationList.map(x => {
+
+        // })
         this.operationList.forEach(function (item) {
           if (item.key === val) {
             if (!item.taskNodeList) {
               _this26.nodeInfos = [];
             } else {
-              _this26.nodeInfos = item.taskNodeList;
+              if (isDef) {
+                item.taskNodeList.map(function (x) {
+                  if (x.nodeName == '编号') {
+                    _this26.operationList.push({
+                      key: x.nodeId,
+                      value: x.nodeName,
+                      isNextNode: true
+                    });
+                  }
+                });
+              }
+
+              _this26.nodeInfos = item.taskNodeList.filter(function (x) {
+                return x.nodeName != '编号';
+              });
             }
             return;
           }
@@ -47554,7 +47593,10 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
           this.nextNode.nextNodeId = this.nodeInfos[0].nodeId;
         }
       }
-
+      if (isNextNode) {
+        this.nodeInfos = [];
+        this.nextNode.nextNodeId = val;
+      }
       if (val === 9) {
         this.isReject = true;
       } else {
@@ -48114,14 +48156,6 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
     subProcess: function subProcess(val, type) {
       var _this31 = this;
 
-      if (this.isFlow && this.nodeInfo.nextNode && this.startFlowPageEmbeddedIntoStartFlowIndex) {
-        if (this.directCreateCircularReadWhenFlowStarted) {
-          this.$refs.flowCirculate.subMit();
-        } else {
-          this.$refs.processFormIndex.subProcess('nextNode');
-        }
-        return;
-      }
       return this.$refs['nextNode'].validate(function (valid) {
         if (valid) {
           if (_this31.isSubmitButtonShowAgreeAndDisagree == 1) {
@@ -48215,6 +48249,14 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
     sendData: function sendData(freetype) {
       var _this33 = this;
 
+      if (this.isFlow && this.nodeInfo.nextNode && this.startFlowPageEmbeddedIntoStartFlowIndex) {
+        if (this.directCreateCircularReadWhenFlowStarted) {
+          this.$refs.flowCirculate.subMit();
+        } else {
+          this.$refs.processFormIndex.subProcess('nextNode');
+        }
+        return;
+      }
       this.$refs['nextNode'].validate(function () {
         var _ref2 = flow_src_mainvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee(valid) {
           var nextUserId, addSignUserId, removeSignUserId, str, notificationType, params, isEndUserTask, choiceOrgId, choiceDeptId, pOrgId, taskExamineInfo, currentNodeIsCircularReadNode, needRetrialAuth, circularReadParamsMap, currentNodeEnableItemHandleDescription;
@@ -48439,8 +48481,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
 var flow_src_main_component = normalizeComponent(
   packages_flow_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_b92af252_render,
-  mainvue_type_template_id_b92af252_staticRenderFns,
+  mainvue_type_template_id_4ea6a802_render,
+  mainvue_type_template_id_4ea6a802_staticRenderFns,
   false,
   null,
   null,
@@ -91926,7 +91968,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.6.79',
+  version: '0.6.80',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow.js

@@ -4469,7 +4469,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_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/main.vue?vue&type=template&id=b92af252&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=4ea6a802&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -7285,7 +7285,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=b92af252&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=4ea6a802&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -12608,8 +12608,8 @@ var TimeLimit_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var TimeLimit = (TimeLimit_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/processReject.vue?vue&type=template&id=67bb0710&
-var processRejectvue_type_template_id_67bb0710_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/processReject.vue?vue&type=template&id=9cd54606&
+var processRejectvue_type_template_id_9cd54606_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -12637,7 +12637,11 @@ var processRejectvue_type_template_id_67bb0710_render = function () {
         {
           ref: "nextNode",
           staticClass: "demo-dynamic",
-          attrs: { model: _vm.nextNode, "label-width": "110px" },
+          attrs: {
+            model: _vm.nextNode,
+            "label-width": "100px",
+            "label-align": "left",
+          },
         },
         [
           _c(
@@ -12830,11 +12834,11 @@ var processRejectvue_type_template_id_67bb0710_render = function () {
     1
   )
 }
-var processRejectvue_type_template_id_67bb0710_staticRenderFns = []
-processRejectvue_type_template_id_67bb0710_render._withStripped = true
+var processRejectvue_type_template_id_9cd54606_staticRenderFns = []
+processRejectvue_type_template_id_9cd54606_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processReject.vue?vue&type=template&id=67bb0710&
+// CONCATENATED MODULE: ./packages/flow/src/processReject.vue?vue&type=template&id=9cd54606&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processReject.vue?vue&type=script&lang=js&
 //
@@ -12922,6 +12926,7 @@ processRejectvue_type_template_id_67bb0710_render._withStripped = true
 //
 //
 //
+//
 
 
 
@@ -13140,8 +13145,8 @@ processRejectvue_type_template_id_67bb0710_render._withStripped = true
 
 var processReject_component = Object(componentNormalizer["a" /* default */])(
   src_processRejectvue_type_script_lang_js_,
-  processRejectvue_type_template_id_67bb0710_render,
-  processRejectvue_type_template_id_67bb0710_staticRenderFns,
+  processRejectvue_type_template_id_9cd54606_render,
+  processRejectvue_type_template_id_9cd54606_staticRenderFns,
   false,
   null,
   null,
@@ -23271,6 +23276,14 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -24649,6 +24662,13 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     selecNext: function selecNext(val, type, isDef) {
       var _this26 = this;
 
+      console.log(val, 'valvalval');
+      var isNextNode = false;
+      if (type) {
+        isNextNode = this.operationList.filter(function (x) {
+          return x.key == val;
+        })[0].isNextNode;
+      }
       this.loading = util["a" /* default */].loading(this.$loading, '加载中...');
       if (this.multiple) {
         this.nextNode.nextUserId = [];
@@ -24659,7 +24679,8 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
       this.selectUserList = [];
       this.radioList = [];
 
-      if (type) {
+      if (type && !isNextNode) {
+        console.log('不是下一步节点');
         this.isNextUser = false;
         this.isShowNode = false;
         this.isMainSubProcess = false;
@@ -24676,12 +24697,30 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         this.nextNode.isReturnRejectNode = 0;
         this.nextNode.isSerialSubmit = 0;
         this.nodeInfos = [];
+        var newOperationList = [];
+        // this.operationList.map(x => {
+
+        // })
         this.operationList.forEach(function (item) {
           if (item.key === val) {
             if (!item.taskNodeList) {
               _this26.nodeInfos = [];
             } else {
-              _this26.nodeInfos = item.taskNodeList;
+              if (isDef) {
+                item.taskNodeList.map(function (x) {
+                  if (x.nodeName == '编号') {
+                    _this26.operationList.push({
+                      key: x.nodeId,
+                      value: x.nodeName,
+                      isNextNode: true
+                    });
+                  }
+                });
+              }
+
+              _this26.nodeInfos = item.taskNodeList.filter(function (x) {
+                return x.nodeName != '编号';
+              });
             }
             return;
           }
@@ -24699,7 +24738,10 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
           this.nextNode.nextNodeId = this.nodeInfos[0].nodeId;
         }
       }
-
+      if (isNextNode) {
+        this.nodeInfos = [];
+        this.nextNode.nextNodeId = val;
+      }
       if (val === 9) {
         this.isReject = true;
       } else {
@@ -25259,14 +25301,6 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     subProcess: function subProcess(val, type) {
       var _this31 = this;
 
-      if (this.isFlow && this.nodeInfo.nextNode && this.startFlowPageEmbeddedIntoStartFlowIndex) {
-        if (this.directCreateCircularReadWhenFlowStarted) {
-          this.$refs.flowCirculate.subMit();
-        } else {
-          this.$refs.processFormIndex.subProcess('nextNode');
-        }
-        return;
-      }
       return this.$refs['nextNode'].validate(function (valid) {
         if (valid) {
           if (_this31.isSubmitButtonShowAgreeAndDisagree == 1) {
@@ -25360,6 +25394,14 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     sendData: function sendData(freetype) {
       var _this33 = this;
 
+      if (this.isFlow && this.nodeInfo.nextNode && this.startFlowPageEmbeddedIntoStartFlowIndex) {
+        if (this.directCreateCircularReadWhenFlowStarted) {
+          this.$refs.flowCirculate.subMit();
+        } else {
+          this.$refs.processFormIndex.subProcess('nextNode');
+        }
+        return;
+      }
       this.$refs['nextNode'].validate(function () {
         var _ref2 = mainvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/regenerator_default.a.mark(function _callee(valid) {
           var nextUserId, addSignUserId, removeSignUserId, str, notificationType, params, isEndUserTask, choiceOrgId, choiceDeptId, pOrgId, taskExamineInfo, currentNodeIsCircularReadNode, needRetrialAuth, circularReadParamsMap, currentNodeEnableItemHandleDescription;