eoss-ui 0.4.95 → 0.4.97

package/lib/flow-group.js

@@ -3431,7 +3431,7 @@ module.exports = require("qs");
 // 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-group/src/main.vue?vue&type=template&id=200d21c4&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow-group/src/main.vue?vue&type=template&id=f23c44da&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4244,12 +4244,42 @@ var render = function () {
                                                                 )
                                                               )
                                                             : _vm._e(),
+                                                          item.component
+                                                            ? _c(
+                                                                item.type,
+                                                                _vm._b(
+                                                                  {
+                                                                    tag: "component",
+                                                                  },
+                                                                  "component",
+                                                                  _vm.handleExclAttribute(
+                                                                    {
+                                                                      data: item,
+                                                                    }
+                                                                  ),
+                                                                  false
+                                                                )
+                                                              )
+                                                            : _vm._e(),
                                                         ],
                                                   ]
                                                 }
                                               ),
                                             ]
                                           : [
+                                              contents.component
+                                                ? _c(
+                                                    contents.type,
+                                                    _vm._b(
+                                                      { tag: "component" },
+                                                      "component",
+                                                      _vm.handleExclAttribute({
+                                                        data: contents,
+                                                      }),
+                                                      false
+                                                    )
+                                                  )
+                                                : _vm._e(),
                                               contents.type === "form"
                                                 ? _c(
                                                     "es-form",
@@ -4625,7 +4655,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow-group/src/main.vue?vue&type=template&id=200d21c4&
+// CONCATENATED MODULE: ./packages/flow-group/src/main.vue?vue&type=template&id=f23c44da&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -5046,6 +5076,24 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
@@ -5091,14 +5139,16 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     width: {
       type: String,
       default: '360px'
-    }
+    },
+    refs: String
   },
   data: function data() {
     return {
       activeName: this.active,
       businessId: undefined,
       taskExamineAppId: this.appId,
-      showMsg: true
+      showMsg: true,
+      formRefs: this.refs
     };
   },
 
@@ -5146,6 +5196,10 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       var data = _ref.data,
           attrs = _ref.attrs;
 
+      if (!attrs || !attrs.length) {
+        this.ref && (this.formRefs = this.ref);
+        return data;
+      }
       return util["a" /* default */].exclAttribute({
         data: data,
         attrs: attrs
@@ -5182,7 +5236,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       });
     },
     handleSubmit: function handleSubmit(res) {
-      var esFlowForm = this.$refs.esFlowForm;
+      var esFlowForm = this.formRefs ? this.$refs[this.formRefs] : this.$refs.esFlowForm;
       if (Array.isArray(esFlowForm)) {
         esFlowForm = esFlowForm[0];
       }

package/lib/flow.js

@@ -3640,7 +3640,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=1742774e&
+// 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=6538259e&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4388,7 +4388,8 @@ var render = function () {
                                             1
                                           )
                                         : _vm._e(),
-                                      _vm.isMainSubProcess
+                                      _vm.isMainSubProcess &&
+                                      _vm.isNodeShowProcess
                                         ? _c(
                                             "el-form-item",
                                             {
@@ -5265,7 +5266,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=1742774e&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=6538259e&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -12770,6 +12771,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       isHideCurrentOrg: false, //是否隐藏本单位(承办)
       isHideOtherOrg: false, //是否隐藏外单位(承办)
       isMainSubProcess: false, // 判断是否子-主流程
+      isNodeShowProcess: false, //是否展示主办
       isNextUser: false,
       isShowNode: false,
       nextNodeList: [],
@@ -12900,7 +12902,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
   },
   methods: {
     getsubProcessColumns: function getsubProcessColumns() {
-      if (!this.isMainSubProcess) return [];
+      if (!this.isMainSubProcess || !this.isNodeShowProcess) return [];
       var data = [];
       var obj = { name: '[部门员工]-' };
       if (this.nextCurrentOrgObjSelect.length > 0) {
@@ -13577,6 +13579,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
             _this12.nodeType = data.nodeExtAttr.nodeType;
             //如果当前为承办节点/会签节点,则展示本单位外单位办理人选择
             if (_this12.nodeType === 1 || _this12.nodeType === 2) {
+              _this12.isMainSubProcess === true ? _this12.isNodeShowProcess = true : _this12.isNodeShowProcess = false;
               _this12.isMainSubProcess === true ? _this12.isMainSubProcess = true : _this12.isMainSubProcess = false;
               _this12.isNextUser = false;
               _this12.isHideCurrentOrg = res.data.nodeExtAttr.isHideCurrentOrg == 1 ? false : true; //判断是否隐藏本单位
@@ -13584,6 +13587,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
             } else {
               _this12.isHideCurrentOrg = false;
               _this12.isHideOtherOrg = false;
+              _this12.isNodeShowProcess = false;
               _this12.isMainSubProcess = false;
               _this12.isNextUser = true;
               // this.isMainSubProcess === true
@@ -13663,6 +13667,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
         this.isNextUser = false;
         this.isShowNode = false;
         this.isMainSubProcess = false;
+        this.isNodeShowProcess = false;
         this.nextNode.nextNodeId = '';
         this.nextNode.isReturnSubmitter = 0;
         this.nextNode.isUndertakeReply = 0;