eoss-ui 0.8.4 → 0.8.5

package/packages/flow/src/processForm.vue

@@ -15,9 +15,9 @@
       :label-position="labelPosition"
     >
       <div
-        :style="`height:${
-          showBtn ? '430px' : 'auto'
-        }; overflow-y:${showBtn ? 'auto' : 'hidden'} ; margin-bottom: 10px;overflow-x: hidden;`"
+        :style="`height:${showBtn ? '430px' : 'auto'}; overflow-y:${
+          showBtn ? 'auto' : 'hidden'
+        } ; margin-bottom: 10px;overflow-x: hidden;`"
       >
         <el-form-item
           v-show="showBtn"
@@ -136,38 +136,35 @@
             :params="params"
           />
         </el-form-item> -->
-         <el-form-item
-                  v-if="isHideCurrentOrg"
-                  prop="nextCurrentOrgObj"
-                  label="本单位"
-                >
-                  <SelectUser
-                    :nextUser="nextCurrentOrgObjSelect"
-                    multiple
-                    mix
-                    @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
-                    :showTooltip="showTooltip"
-                    :types="['employee', 'persongroup']"
-                    :params="currentOrgSelectorParams"
-                  />
-                </el-form-item>
-                <el-form-item
-                  v-if="isHideOtherOrg"
-                  label="外单位"
-                >
-                  <SelectUser
-                    :nextUser="nextOtherOrgObjSelect"
-                    multiple
-                    :showTooltip="showTooltip"
-                    mix
-                    :where="{ filid: 'other' }"
-                    @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
-                    :types="['enterprise', 'filgroup']"
-                    :params="foreignOrgSelectorParams"
-                  />
-                </el-form-item>
         <el-form-item
-        v-if="!isHideOtherOrg && !isHideCurrentOrg"
+          v-if="isHideCurrentOrg"
+          prop="nextCurrentOrgObj"
+          label="本单位"
+        >
+          <SelectUser
+            :nextUser="nextCurrentOrgObjSelect"
+            multiple
+            mix
+            @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
+            :showTooltip="showTooltip"
+            :types="['employee', 'persongroup']"
+            :params="currentOrgSelectorParams"
+          />
+        </el-form-item>
+        <el-form-item v-if="isHideOtherOrg" label="外单位">
+          <SelectUser
+            :nextUser="nextOtherOrgObjSelect"
+            multiple
+            :showTooltip="showTooltip"
+            mix
+            :where="{ filid: 'other' }"
+            @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
+            :types="['enterprise', 'filgroup']"
+            :params="foreignOrgSelectorParams"
+          />
+        </el-form-item>
+        <el-form-item
+          v-if="!isHideOtherOrg && !isHideCurrentOrg"
           :prop="isShowNextUser ? 'nextUser' : 'nextOrgId'"
           :label="isShowNextUser ? '下步办理人' : '办理对象'"
         >
@@ -177,7 +174,9 @@
             :multiple="multiple"
             :isCustomUser="!isShowNextUser ? 1 : isCustomUser"
             :showTooltip="showTooltip"
-            :isCurrentNodeForbiddenChangeCandidate="isCurrentNodeForbiddenChangeCandidate"
+            :isCurrentNodeForbiddenChangeCandidate="
+              isCurrentNodeForbiddenChangeCandidate
+            "
             :options="options"
             :presetEdit="presetEdit"
             :mix="multiple"
@@ -261,23 +260,27 @@
             }
           ]"
         >
-        <div style="display: flex;">
-          <es-select
-          v-model="nextNode.customLimitTimeText"
-          placeholder="请选择"
-          @change="handleChangeTime"
-       :style="`flex:${showBtn?'unset' : '1'};width: ${showBtn?'20%' : 'unset'} !important; display: inline-block;`"
-          sysCode="bpm_custom_limit_time"
-        ></es-select>
-          <el-input
-            v-model="nextNode.customLimitTime"
-       :style="`flex:${showBtn?'unset' : '1'};width: ${showBtn?'20%' : 'unset'} !important; display: inline-block;`"
-            placeholder="请输入限时办理的天数"
-            class="input-with-select custom-limit-time"
-            @change="changeCustomLimitTime"
-          >
+          <div style="display: flex">
+            <es-select
+              v-model="nextNode.customLimitTimeText"
+              placeholder="请选择"
+              @change="handleChangeTime"
+              :style="`flex:${showBtn ? 'unset' : '1'};width: ${
+                showBtn ? '20%' : 'unset'
+              } !important; display: inline-block;`"
+              sysCode="bpm_custom_limit_time"
+            ></es-select>
+            <el-input
+              v-model="nextNode.customLimitTime"
+              :style="`flex:${showBtn ? 'unset' : '1'};width: ${
+                showBtn ? '20%' : 'unset'
+              } !important; display: inline-block;`"
+              placeholder="请输入限时办理的天数"
+              class="input-with-select custom-limit-time"
+              @change="changeCustomLimitTime"
+            >
             </el-input>
-          <span style="margin-left:5px">天</span>
+            <span style="margin-left: 5px">天</span>
           </div>
         </el-form-item>
         <el-form-item
@@ -362,13 +365,10 @@
       </div>
       <el-form-item style="margin-bottom: 0px" v-show="showBtn">
         <div style="text-align: right">
-          <el-button
-            type="primary"
-            @click="subProcess('nextNode')"
-          >
+          <el-button type="primary" @click="subProcess('nextNode')">
             确认
           </el-button>
-          <el-button  @click="quit"> 取消 </el-button>
+          <el-button @click="quit"> 取消 </el-button>
         </div>
       </el-form-item>
     </el-form>
@@ -472,7 +472,7 @@ export default {
       type: String,
       default: ''
     },
-    isCancelSecondConfirmationType:{
+    isCancelSecondConfirmationType: {
       type: Boolean,
       default: false
     },
@@ -509,13 +509,13 @@ export default {
       type: [Number, String],
       default: 0
     },
-    selectorParams:{type:Object,default:()=>{}}
+    selectorParams: { type: Object, default: () => {} }
   },
   data() {
     return {
       loading: false,
       isCustomUser: 0,
-      isCurrentNodeForbiddenChangeCandidate:0,
+      isCurrentNodeForbiddenChangeCandidate: 0,
       allLoading: null,
       selectUser: false,
       multiple: false,
@@ -588,10 +588,13 @@ export default {
       subProcessColumns: [],
       nextOtherOrgObjSelect: [],
       nextCurrentOrgObjSelect: [],
-      isHideCurrentOrg:false,
-      isHideOtherOrg:false,
-      currentOrgSelectorParams:{filid: JSON.parse(util.getStorage('mainConfig')).userModel.orgId,only_filid:true},
-      foreignOrgSelectorParams:{filid: 'all', nofilid: 1},
+      isHideCurrentOrg: false,
+      isHideOtherOrg: false,
+      currentOrgSelectorParams: {
+        filid: JSON.parse(util.getStorage('mainConfig')).userModel.orgId,
+        only_filid: true
+      },
+      foreignOrgSelectorParams: { filid: 'all', nofilid: 1 },
       nextNode: {
         nodeName: '',
         customLimitTime: '',
@@ -700,7 +703,7 @@ export default {
     }
   },
   methods: {
-  handleChangeTime(val){
+    handleChangeTime(val) {
       this.nextNode.customLimitTime = val;
     },
     limitTimevalidate() {
@@ -735,8 +738,9 @@ export default {
       let mainConfig = util.getStorage('mainConfig');
       if (mainConfig) {
         this.userModel = JSON.parse(mainConfig).userModel;
-        this.foreignOrgSelectorParams.nofilid = this.userModel.orgId
-        this.foreignOrgSelectorParams.roleid = this.currentOrgSelectorParams.roleid = this.selectorParams.roleid
+        this.foreignOrgSelectorParams.nofilid = this.userModel.orgId;
+        this.foreignOrgSelectorParams.roleid =
+          this.currentOrgSelectorParams.roleid = this.selectorParams.roleid;
       } else {
         util
           .ajax({ url: loginUserInfo })
@@ -744,8 +748,10 @@ export default {
             const { status, data } = res;
             if (status == 'success') {
               this.userModel = data;
-               this.foreignOrgSelectorParams.nofilid = this.userModel.orgId
-        this.foreignOrgSelectorParams.roleid = tthis.currentOrgSelectorParams.roleid = this.selectorParams.roleid
+              this.foreignOrgSelectorParams.nofilid = this.userModel.orgId;
+              this.foreignOrgSelectorParams.roleid =
+                tthis.currentOrgSelectorParams.roleid =
+                  this.selectorParams.roleid;
             } else {
               let msg = res.msg || '系统错误，请联系管理员！';
               this.$message.error(msg);
@@ -838,8 +844,14 @@ export default {
       }
       this.nextNode.nodeInfo = this.operationList[val].list;
       if (this.nextNode.nodeInfo.length > 0) {
+        let defaultNodeData = this.nextNode.nodeInfo.filter(
+          (x) => x.nodeId == this.defaultNextNode
+        );
+        length;
         this.nextNode.nextNode =
-          this.defaultNextNode || this.nextNode.nodeInfo[0].nodeId;
+          defaultNodeData.length > 0
+            ? this.defaultNextNode
+            : this.nextNode.nodeInfo[0].nodeId;
       }
       this.getNodeInfos();
     },
@@ -880,7 +892,7 @@ export default {
       this.subProcessColumns = data;
       // return data;
     },
-        // 单位选择完回调
+    // 单位选择完回调
     disposeAppUnit(res, type) {
       let label = type.substring(0, type.lastIndexOf('Select'));
       this.nextNode[label + 'Name'] = '';
@@ -1024,7 +1036,11 @@ export default {
           //   return this.$message.warning('请选择通知方式');
           // }
           if (this.isShowNextUser) {
-            if ((nextUser == '' || (this.multiple && nextUser.length == 0)) && !this.isHideCurrentOrg && !this.isHideOtherOrg) {
+            if (
+              (nextUser == '' || (this.multiple && nextUser.length == 0)) &&
+              !this.isHideCurrentOrg &&
+              !this.isHideOtherOrg
+            ) {
               return this.$message.warning('请选择下步办理人');
             }
           } else {
@@ -1032,149 +1048,156 @@ export default {
               return this.$message.warning('请选择办理对象');
             }
           }
-          if((this.isHideOtherOrg || this.isHideCurrentOrg) && !nextCurrentOrgObj && !nextOtherOrgObj){
+          if (
+            (this.isHideOtherOrg || this.isHideCurrentOrg) &&
+            !nextCurrentOrgObj &&
+            !nextOtherOrgObj
+          ) {
             return this.$message.warning('请选择办理对象');
           }
-          if(this.isCancelSecondConfirmationType){
-              this.$confirm('确认提交吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then( () => {
-          if (this.showBtn) {
-            this.loading = true;
-          } else {
-            this.allLoading = util.loading(this.$loading, '加载中...');
-          }
-          let newNextUser = [];
-          if (this.multiple) {
-            nextUser && nextUser.map((item) => newNextUser.push(item));
-          }
-          let newNoticeType = '';
-          if (noticeType) {
-            newNoticeType = noticeType.join(',');
-          }
-          let params = {
-            processDefinitionId: this.processDefinitionId,
-            nextUserId: this.multiple ? newNextUser.join(',') : nextUser,
-            nextNodeId: nextNode,
-            businessId: this.businessId,
-            notificationType: newNoticeType,
-            userId: util.getStorage('userId'),
-            notificationMsg: noticeInfo,
-            customPresetUserJson: JSON.stringify(this.presetList),
-            presetUserJson: JSON.stringify(this.presetUserJson),
-            nextReadUserId: this.readMultiple
-              ? this.mixReadList && this.mixReadList.join('|')
-              : nextReadUserId,
-            nextOrgId: !this.isShowNextUser
-              ? this.multiple
-                ? this.mixOrgIdList && this.mixOrgIdList.join('|')
-                : nextOrgId
-              : '',
-            handleExplain: handleExplain,
-            presetReadUserId:
-              this.mixPresetList && this.mixPresetList.length > 0
-                ? this.mixPresetList.join('|')
-                : presetReadUserId.join(','),
-            opinion: this.newOpinion || newOpinion
-          };
-          if (this.enableCustomLimitTimeSetting) {
-            params.customLimitTime = customLimitTime;
-            if (!customLimitTime) {
-              this.$message.warning('请选择或输入限时办理的天数');
-              this.nextNode.customLimitTime = '';
-              return;
-            } else if (
-              !Number(customLimitTime) ||
-              customLimitTime.indexOf('.') != -1 ||
-              Number(customLimitTime) < 0
-            ) {
-              this.$message.warning('请输入正确的天数');
-              this.nextNode.customLimitTime = '';
-              return;
-            }
-          }
-          if(this.isHideCurrentOrg){
-            params.nextCurrentOrgObj = nextCurrentOrgObj
-          }
-          if(this.isHideOtherOrg){
-            params.nextOtherOrgObj = nextOtherOrgObj
-          }
-          if (this.activeNames != '1') delete params.customPresetUserJson;
-          if (this.isFreeStartFlow || this.formType === 'readTransfer') {
-            let newParm = {};
-            newParm.copyHistory = this.copyHistory === 'needCopyPendedHistory';
-            newParm.startFlowParamJson = params;
-            // newParm.startFlowParamJson.businessId = this.id; //this.id
-            newParm.startFlowParamJson.taskExamineParam = {
-              startFlowFirstNodeName: this.taskExamineParam
-            };
-            newParm.startFlowParamJson = JSON.stringify(
-              newParm.startFlowParamJson
-            );
-            for (let key in this.taskParams) {
-              if (Array.isArray(this.taskParams[key])) {
-                this.taskParams[key] =
-                  this.taskParams[key].length > 0
-                    ? this.taskParams[key].join(',')
-                    : '';
-              }
-            }
-
-            newParm.submitTaskParamJson = JSON.stringify(this.taskParams);
-            if (this.formType == 'readTransfer') {
-              newParm.readTransferHandleStartFlowParamJson =
-                JSON.stringify(params);
-              newParm.taskReadEndParamJson = JSON.stringify(this.taskParams);
-              delete newParm.copyHistory;
-              delete newParm.startFlowParamJson;
-              delete newParm.submitTaskParamJson;
-            }
-            params = newParm;
-          }
-          if (this.copyHistory && !this.isFreeStartFlow) {
-            params.pendingId = this.pendingId;
-            delete params.businessId;
-          }
-          util
-            .ajax({
-              url: this.isFreeStartFlow
-                ? freeStartFlowWithSubmitTask
-                : this.formType == 'readTransfer'
-                ? startReadTransferHandleFlowWithTaskReadEnd
-                : this.copyHistory
-                ? freeStartFlow
-                : register,
-              method: 'post',
-              data: params
-            })
-            .then((res) => {
-              const { status, message } = res;
+          if (this.isCancelSecondConfirmationType) {
+            this.$confirm('确认提交吗?', '提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            }).then(() => {
               if (this.showBtn) {
-                this.loading = false;
+                this.loading = true;
               } else {
-                this.allLoading.close();
+                this.allLoading = util.loading(this.$loading, '加载中...');
               }
-              if (status === 'success' || res.rCode == 0) {
-                this.quit(true);
-                this.simpleTips && this.$message.success('操作成功');
-              } else {
-                this.$message.error(message || '系统错误，请联系管理员！');
+              let newNextUser = [];
+              if (this.multiple) {
+                nextUser && nextUser.map((item) => newNextUser.push(item));
               }
-            })
-            .catch((err) => {
-              if (this.showBtn) {
-                this.loading = false;
-              } else {
-                this.allLoading.close();
+              let newNoticeType = '';
+              if (noticeType) {
+                newNoticeType = noticeType.join(',');
               }
-              if (err.message && err.message !== 'canceled') {
-                this.$message.error(err.message);
+              let params = {
+                processDefinitionId: this.processDefinitionId,
+                nextUserId: this.multiple ? newNextUser.join(',') : nextUser,
+                nextNodeId: nextNode,
+                businessId: this.businessId,
+                notificationType: newNoticeType,
+                userId: util.getStorage('userId'),
+                notificationMsg: noticeInfo,
+                customPresetUserJson: JSON.stringify(this.presetList),
+                presetUserJson: JSON.stringify(this.presetUserJson),
+                nextReadUserId: this.readMultiple
+                  ? this.mixReadList && this.mixReadList.join('|')
+                  : nextReadUserId,
+                nextOrgId: !this.isShowNextUser
+                  ? this.multiple
+                    ? this.mixOrgIdList && this.mixOrgIdList.join('|')
+                    : nextOrgId
+                  : '',
+                handleExplain: handleExplain,
+                presetReadUserId:
+                  this.mixPresetList && this.mixPresetList.length > 0
+                    ? this.mixPresetList.join('|')
+                    : presetReadUserId.join(','),
+                opinion: this.newOpinion || newOpinion
+              };
+              if (this.enableCustomLimitTimeSetting) {
+                params.customLimitTime = customLimitTime;
+                if (!customLimitTime) {
+                  this.$message.warning('请选择或输入限时办理的天数');
+                  this.nextNode.customLimitTime = '';
+                  return;
+                } else if (
+                  !Number(customLimitTime) ||
+                  customLimitTime.indexOf('.') != -1 ||
+                  Number(customLimitTime) < 0
+                ) {
+                  this.$message.warning('请输入正确的天数');
+                  this.nextNode.customLimitTime = '';
+                  return;
+                }
+              }
+              if (this.isHideCurrentOrg) {
+                params.nextCurrentOrgObj = nextCurrentOrgObj;
               }
+              if (this.isHideOtherOrg) {
+                params.nextOtherOrgObj = nextOtherOrgObj;
+              }
+              if (this.activeNames != '1') delete params.customPresetUserJson;
+              if (this.isFreeStartFlow || this.formType === 'readTransfer') {
+                let newParm = {};
+                newParm.copyHistory =
+                  this.copyHistory === 'needCopyPendedHistory';
+                newParm.startFlowParamJson = params;
+                // newParm.startFlowParamJson.businessId = this.id; //this.id
+                newParm.startFlowParamJson.taskExamineParam = {
+                  startFlowFirstNodeName: this.taskExamineParam
+                };
+                newParm.startFlowParamJson = JSON.stringify(
+                  newParm.startFlowParamJson
+                );
+                for (let key in this.taskParams) {
+                  if (Array.isArray(this.taskParams[key])) {
+                    this.taskParams[key] =
+                      this.taskParams[key].length > 0
+                        ? this.taskParams[key].join(',')
+                        : '';
+                  }
+                }
+
+                newParm.submitTaskParamJson = JSON.stringify(this.taskParams);
+                if (this.formType == 'readTransfer') {
+                  newParm.readTransferHandleStartFlowParamJson =
+                    JSON.stringify(params);
+                  newParm.taskReadEndParamJson = JSON.stringify(
+                    this.taskParams
+                  );
+                  delete newParm.copyHistory;
+                  delete newParm.startFlowParamJson;
+                  delete newParm.submitTaskParamJson;
+                }
+                params = newParm;
+              }
+              if (this.copyHistory && !this.isFreeStartFlow) {
+                params.pendingId = this.pendingId;
+                delete params.businessId;
+              }
+              util
+                .ajax({
+                  url: this.isFreeStartFlow
+                    ? freeStartFlowWithSubmitTask
+                    : this.formType == 'readTransfer'
+                    ? startReadTransferHandleFlowWithTaskReadEnd
+                    : this.copyHistory
+                    ? freeStartFlow
+                    : register,
+                  method: 'post',
+                  data: params
+                })
+                .then((res) => {
+                  const { status, message } = res;
+                  if (this.showBtn) {
+                    this.loading = false;
+                  } else {
+                    this.allLoading.close();
+                  }
+                  if (status === 'success' || res.rCode == 0) {
+                    this.quit(true);
+                    this.simpleTips && this.$message.success('操作成功');
+                  } else {
+                    this.$message.error(message || '系统错误，请联系管理员！');
+                  }
+                })
+                .catch((err) => {
+                  if (this.showBtn) {
+                    this.loading = false;
+                  } else {
+                    this.allLoading.close();
+                  }
+                  if (err.message && err.message !== 'canceled') {
+                    this.$message.error(err.message);
+                  }
+                });
             });
-        })
-            return
+            return;
           }
           if (this.showBtn) {
             this.loading = true;
@@ -1230,11 +1253,11 @@ export default {
               return;
             }
           }
-          if(this.isHideCurrentOrg){
-            params.nextCurrentOrgObj = nextCurrentOrgObj
+          if (this.isHideCurrentOrg) {
+            params.nextCurrentOrgObj = nextCurrentOrgObj;
           }
-          if(this.isHideOtherOrg){
-            params.nextOtherOrgObj = nextOtherOrgObj
+          if (this.isHideOtherOrg) {
+            params.nextOtherOrgObj = nextOtherOrgObj;
           }
           if (this.activeNames != '1') delete params.customPresetUserJson;
           if (this.isFreeStartFlow || this.formType === 'readTransfer') {
@@ -1347,13 +1370,13 @@ export default {
             this.nextNode.countersignaturetypeText = countersignaturetypeText;
             this.enableCustomLimitTimeSetting =
               nodeExtAttr.enableCustomLimitTimeSetting == 1;
-               if (
+            if (
               this.enableCustomLimitTimeSetting &&
               nodeMoreInfo.defaultCustomLimitDays
             ) {
               this.nextNode.customLimitTime =
                 this.nextNode.customLimitTimeText =
-                 nodeMoreInfo.defaultCustomLimitDays + '';
+                  nodeMoreInfo.defaultCustomLimitDays + '';
             }
             this.isTaskread = nodeExtAttr.isTaskread;
             this.isHandleExplain = nodeExtAttr.isHandleExplain;
@@ -1380,14 +1403,14 @@ export default {
             }
             // this.isReadMultiple(nodeExtAttr.userSelectionType);
             if (nodeExtAttr.nodeType === 1 || nodeExtAttr.nodeType === 2) {
-           
-                this.isHideCurrentOrg =
-                  nodeExtAttr.isHideCurrentOrg == 1 ? false : true; //判断是否隐藏本单位
-                this.isHideOtherOrg = nodeExtAttr.isHideOtherOrg == 1 ? false : true; //判断是否隐藏外单位
-              } else {
-                this.isHideCurrentOrg = false;
-                this.isHideOtherOrg = false;
-              }
+              this.isHideCurrentOrg =
+                nodeExtAttr.isHideCurrentOrg == 1 ? false : true; //判断是否隐藏本单位
+              this.isHideOtherOrg =
+                nodeExtAttr.isHideOtherOrg == 1 ? false : true; //判断是否隐藏外单位
+            } else {
+              this.isHideCurrentOrg = false;
+              this.isHideOtherOrg = false;
+            }
             nextUserList.map((item) => {
               if (
                 this.multiple &&
@@ -1541,8 +1564,8 @@ export default {
         userId: util.getStorage('userId'),
         businessId: this.businessId
       };
-      if(!this.shwowBtn){
-        params.taskAction = "toStartFlowWithoutTempSave"
+      if (!this.shwowBtn) {
+        params.taskAction = 'toStartFlowWithoutTempSave';
       }
       // 获取节点
       util
@@ -1587,15 +1610,21 @@ export default {
                 // { key: 0, value: '默认', list: [] },
                 { key: 1, value: '自定义', list: [] }
               ];
-              if(data.nodeInfoMap.nodeExtAttr.isHideDefaultOperation != 1){
-                this.operationList.unshift({ key: 0, value: '默认', list: [] });
+              if (data.nodeInfoMap.nodeExtAttr.isHideDefaultOperation != 1) {
+                this.operationList.unshift({
+                  key: 0,
+                  value: '默认',
+                  list: data.nextNodeList
+                });
               }
               let arr = [];
               for (let key in data.taskNodeMap) {
                 arr.push({ nodeName: data.taskNodeMap[key], nodeId: key });
               }
               // this.operationList[0].list = data.nextNodeList;
-              this.operationList[0].list = arr;
+              this.operationList[
+                data.nodeInfoMap.nodeExtAttr.isHideDefaultOperation != 1 ? 1 : 0
+              ].list = arr;
               if (this.isHideDefaultOperation != 1) {
                 this.nextNode.nextOperate = 0;
                 this.nextNode.nodeInfo = this.operationList[0].list;
@@ -1608,21 +1637,23 @@ export default {
                       ? this.defaultNextNode
                       : data.nextNodeList[0].nodeId;
                 }
-              } else if (
+              } 
+              if (
                 data.nodeInfoMap.nodeExtAttr.defaultNextOperate == 1 ||
                 data.nodeInfoMap.nodeExtAttr.isHideDefaultOperation == 1
               ) {
                 //  this.nextNode.nodeInfo = data.nextNodeList
                 this.nextNode.nextOperate = 1;
-                this.nextNode.nodeInfo = this.operationList[0].list;
+                this.nextNode.nodeInfo = this.operationList[this.isHideDefaultOperation != 1?1:0].list;
+                
                 if (this.nextNode.nodeInfo.length > 0) {
-                  let defaultNodeData = data.nextNodeList.filter(
+                  let defaultNodeData = this.nextNode.nodeInfo.filter(
                     (x) => x.nodeId == this.defaultNextNode
                   );
                   this.nextNode.nextNode =
                     defaultNodeData.length > 0
                       ? this.defaultNextNode
-                      : data.nextNodeList[0].nodeId;
+                      :this.nextNode.nodeInfo[0].nodeId;
                 }
               }
             }

package/packages/flow-group/index.js

@@ -1,5 +1,5 @@
-import EsFlowGroup from './src/main';
-
-EsFlowGroup.install = Vue => Vue.component(EsFlowGroup.name, EsFlowGroup);
-
-export default EsFlowGroup;
+import EsFlowGroup from './src/main';
+
+EsFlowGroup.install = Vue => Vue.component(EsFlowGroup.name, EsFlowGroup);
+
+export default EsFlowGroup;