eoss-ui 0.6.79 → 0.6.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.6.79",
+  "version": "0.6.80",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/flow/src/main.vue

@@ -49,7 +49,7 @@
         :isBanInputOpinion="isBanInputOpinion"
         :nodeFixedOpinionSelectList="nodeFixedOpinionSelectList"
       />
-      <div :class="`es-info ${formLabelPosition == 'left'?'form-left':''}`" >
+      <div :class="`es-info ${formLabelPosition == 'left' ? 'form-left' : ''}`">
         <el-form
           ref="form"
           :model="circulateForm"
@@ -219,13 +219,15 @@
           !shrink
         "
         ref="esContent"
-        :class="`es-info ${formLabelPosition == 'left'?'form-left':''}`"
+        :class="`es-info ${formLabelPosition == 'left' ? 'form-left' : ''}`"
       >
         <el-form
           ref="nextNode"
           :model="isFlow ? nodeInfo : nextNode"
           class="demo-dynamic"
-          :label-width="startFlowPageEmbeddedIntoStartFlowIndex?'100px' : '120px'"
+          :label-width="
+            startFlowPageEmbeddedIntoStartFlowIndex ? '100px' : '120px'
+          "
           :label-position="formLabelPosition"
         >
           <el-form-item
@@ -655,7 +657,8 @@
           v-if="
             isFlow &&
             nodeInfo.nextNode &&
-            startFlowPageEmbeddedIntoStartFlowIndex && !directCreateCircularReadWhenFlowStarted
+            startFlowPageEmbeddedIntoStartFlowIndex &&
+            !directCreateCircularReadWhenFlowStarted
           "
           ref="processFormIndex"
           :id="freeStartFlowParams.startFlowBusinessId || businessIds"
@@ -674,13 +677,18 @@
           @cancel="closeProcess($event, 'handleVisible', closeParent)"
         />
         <circulate
-        v-else-if="isFlow &&
+          v-else-if="
+            isFlow &&
             nodeInfo.nextNode &&
-            startFlowPageEmbeddedIntoStartFlowIndex && directCreateCircularReadWhenFlowStarted"
+            startFlowPageEmbeddedIntoStartFlowIndex &&
+            directCreateCircularReadWhenFlowStarted
+          "
           ref="flowCirculate"
           :label-position="formLabelPosition"
           :businessId="businessId"
-          :startFlowPageEmbeddedIntoStartFlowIndex="startFlowPageEmbeddedIntoStartFlowIndex"
+          :startFlowPageEmbeddedIntoStartFlowIndex="
+            startFlowPageEmbeddedIntoStartFlowIndex
+          "
           :processDefinitionId="nodeInfo.nextNode"
           :simpleTips="simpleTips"
           :showBtn="false"
@@ -1134,9 +1142,9 @@ export default {
       type: String,
       default: 'left'
     },
-    flowListDisabled:{
-      type:Boolean,
-      default:false
+    flowListDisabled: {
+      type: Boolean,
+      default: false
     },
     btnList: {
       type: Array,
@@ -2563,6 +2571,12 @@ export default {
      * @date 2022年5月25日
      **/
     selecNext(val, type, isDef) {
+      console.log(val, 'valvalval');
+      let isNextNode = false;
+      if (type) {
+        isNextNode = this.operationList.filter((x) => x.key == val)[0]
+          .isNextNode;
+      }
       this.loading = util.loading(this.$loading, '加载中...');
       if (this.multiple) {
         this.nextNode.nextUserId = [];
@@ -2573,7 +2587,8 @@ export default {
       this.selectUserList = [];
       this.radioList = [];
 
-      if (type) {
+      if (type && !isNextNode) {
+        console.log('不是下一步节点');
         this.isNextUser = false;
         this.isShowNode = false;
         this.isMainSubProcess = false;
@@ -2590,12 +2605,30 @@ export default {
         this.nextNode.isReturnRejectNode = 0;
         this.nextNode.isSerialSubmit = 0;
         this.nodeInfos = [];
+        let newOperationList = [];
+        // this.operationList.map(x => {
+
+        // })
         this.operationList.forEach((item) => {
           if (item.key === val) {
             if (!item.taskNodeList) {
               this.nodeInfos = [];
             } else {
-              this.nodeInfos = item.taskNodeList;
+              if (isDef) {
+                item.taskNodeList.map((x) => {
+                  if (x.nodeName == '编号') {
+                    this.operationList.push({
+                      key: x.nodeId,
+                      value: x.nodeName,
+                      isNextNode: true
+                    });
+                  }
+                });
+              }
+
+              this.nodeInfos = item.taskNodeList.filter(
+                (x) => x.nodeName != '编号'
+              );
             }
             return;
           }
@@ -2613,7 +2646,10 @@ export default {
           this.nextNode.nextNodeId = this.nodeInfos[0].nodeId;
         }
       }
-
+      if(isNextNode){
+        this.nodeInfos = [];
+        this.nextNode.nextNodeId = val
+      }
       if (val === 9) {
         this.isReject = true;
       } else {
@@ -3210,18 +3246,7 @@ export default {
      * @date 2022年5月25日
      **/
     subProcess(val, type) {
-      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((valid) => {
         if (valid) {
           if (this.isSubmitButtonShowAgreeAndDisagree == 1) {
@@ -3341,6 +3366,18 @@ export default {
     },
 
     sendData(freetype) {
+      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(async (valid) => {
         if (valid) {
           if (this.isFlow) {

package/packages/flow/src/processReject.vue

@@ -10,7 +10,8 @@
       ref="nextNode"
       :model="nextNode"
       class="demo-dynamic"
-      label-width="110px"
+      label-width="100px"
+      label-align="left"
     >
     <div style="max-height: 290px; overflow-y: auto; margin-bottom: 10px">
       <el-form-item prop="nodeName" label="当前节点">

package/src/index.js

@@ -125,7 +125,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.6.79',
+  version: '0.6.80',
   install,
   Button,
   ButtonGroup,