eoss-ui 0.7.12 → 0.7.14

package/package.json

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

package/packages/flow/src/component/CommonOpinions.vue

@@ -1,25 +1,23 @@
 <template>
   <div class="commonOpinion">
-    <el-form
-      :model="form"
-      :rules="required?rules:{}"
-      ref="ruleForm"
-      label-width="0"
-    >
+    <el-form :model="form" :rules="rules" ref="ruleForm" label-width="0">
       <el-form-item label="" prop="value">
-         <el-tooltip :disabled="tooltipDisabled || !pendingItemHandleDescription" placement="top">
-        <div slot="content">{{ pendingItemHandleDescription }}</div>
-        <el-input
-          v-model="form.value"
-          :disabled="isBanInputOpinion == '1' || disabled"
-          type="textarea"
-          clear="inp"
-          :placeholder="pendingItemHandleDescription || '请输入意见'"
-          @change="changeOpinion"
-          @blur="handleBlur"
-          @focus="handleFocus"
-          :rows="rows"
-        ></el-input>
+        <el-tooltip
+          :disabled="tooltipDisabled || !pendingItemHandleDescription"
+          placement="top"
+        >
+          <div slot="content">{{ pendingItemHandleDescription }}</div>
+          <el-input
+            v-model="form.value"
+            :disabled="isBanInputOpinion == '1' || disabled"
+            type="textarea"
+            clear="inp"
+            :placeholder="pendingItemHandleDescription || '请输入意见'"
+            @change="changeOpinion"
+            @blur="handleBlur"
+            @focus="handleFocus"
+            :rows="rows"
+          ></el-input>
         </el-tooltip>
       </el-form-item>
     </el-form>
@@ -117,13 +115,10 @@ export default {
   data() {
     return {
       value: '',
-      tooltipDisabled:false,
+      tooltipDisabled: false,
       form: {
         value: ''
       },
-      rules: {
-        value: [{ required: true, message: '请输入意见', trigger: 'blur' }]
-      },
       input3: '',
       selectValue: '',
       optionList: [],
@@ -144,7 +139,7 @@ export default {
       type: String,
       default: ''
     },
-    pendingItemHandleDescription:{
+    pendingItemHandleDescription: {
       type: String,
       default: ''
     },
@@ -153,10 +148,23 @@ export default {
       default: () => []
     },
     rows: {
-      type: [Number,String],
+      type: [Number, String],
       default: 10
     },
-    required:{type:Boolean,default:false}
+    required: { type: Boolean, default: false }
+  },
+  computed: {
+    rules() {
+      return {
+        value: [
+          {
+            required: this.required,
+            message: '请输入意见',
+            trigger: 'blur'
+          }
+        ]
+      };
+    }
   },
   mounted() {
     if (this.nodeFixedOpinionSelectList.length > 0) {
@@ -173,24 +181,24 @@ export default {
     }
   },
   methods: {
-    handleBlur(){
-      this.$emit('blur', this.form.value)
-      this.tooltipDisabled = false
+    handleBlur() {
+      this.$emit('blur', this.form.value);
+      this.tooltipDisabled = false;
     },
-    handleFocus(){
-      this.$emit('focus', this.form.value)
-      this.tooltipDisabled = true
+    handleFocus() {
+      this.$emit('focus', this.form.value);
+      this.tooltipDisabled = true;
     },
-    validate(){
-      let validSate = true
+    validate() {
+      let validSate = true;
       this.$refs.ruleForm.validate((valid) => {
-          if (valid) {
-            validSate = true
-          } else {
-            validSate = false;
-          }
-        });
-        return validSate
+        if (valid) {
+          validSate = true;
+        } else {
+          validSate = false;
+        }
+      });
+      return validSate;
     },
     /**
      * changeOpinion

package/packages/flow/src/main.vue

@@ -38,6 +38,7 @@
         </div>
       </div>
       <CommonOpinions
+      v-if="showOpinion"
         class="es-common-opinions"
         v-show="!shrink"
         ref="commonOpinions"
@@ -127,6 +128,7 @@
       v-else-if="typeCode == 'freeCirculation'"
       :appId="resetAppId"
       :params="param"
+      :showOther="showOther"
       :formLabelPosition="formLabelPosition"
       :simpleTips="simpleTips"
     />
@@ -183,6 +185,7 @@
           @change="(val) => (value = val)"
           :opinion="value"
           :rows="rows"
+          v-if="showOpinion"
           :pendingItemHandleDescription="pendingItemHandleDescription"
           :placeholder="pendingItemHandleDescription"
           :required="isOpinionRequired == 1"
@@ -1245,6 +1248,10 @@ export default {
       type: [String, Number],
       default: 10
     },
+    showOther:{
+      type: Boolean,
+      default: true
+    },
     isEndMessage: { type: Boolean, default: false }
   },
   data() {
@@ -1254,6 +1261,7 @@ export default {
       endMessage: '',
       isHideTemporarySave: false,
       oldNextOperate: '',
+      showOpinion:true,
       taskOperationShiftedNodeList: null,
       currentNodeEnableItemHandleDescription: false,
       startFlowPageEmbeddedIntoStartFlowIndex: false,
@@ -1522,7 +1530,8 @@ export default {
             }
           }
           if (this.nodeInfo.nextNode) {
-            this.handleChange(this.nodeInfo.nextNode);
+
+            this.handleChange(this.nodeInfo.nextNode,true);
           }
         }
       },
@@ -1659,6 +1668,10 @@ export default {
           // }
           this.optionsKey++;
           this.isOpinionRequired = res.data.nodeExtAttr.isOpinionRequired == 1;
+          this.showOpinion = false
+          setTimeout(() => {
+            this.showOpinion = true
+          }, 0);
         }
       });
     },
@@ -1702,8 +1715,8 @@ export default {
       this.flowSuccess(true);
       // this.$emit('success');
     },
-    handleChange(val) {
-      this.getNodeInfoForStartFlow(val);
+    handleChange(val,isForStartFlow) {
+      this.getNodeInfoForStartFlow(val,isForStartFlow);
       this.$parent.$emit('flowChange', val);
     },
     getsubProcessColumns() {
@@ -2978,7 +2991,7 @@ export default {
                 this.circularReadParamsMap.circularReadOrgRoleCode;
             }
             this.currentOrgName = currentOrgName;
-            this.nextOperateCheckType = nextOperateCheckType;
+            this.nextOperateCheckType = nextOperateCheckType || 'select';
             this.currentNodeIsCircularReadNode =
               nodeInfoMap.nodeExtAttr.currentNodeIsCircularReadNode == 1;
 
@@ -3299,7 +3312,7 @@ export default {
                 }
               }
               if (this.nodeInfo.nextNode) {
-                this.handleChange(this.nodeInfo.nextNode);
+                this.handleChange(this.nodeInfo.nextNode,true);
               }
               if (
                 this.showCirculate != undefined &&
@@ -3537,6 +3550,7 @@ export default {
       this.$refs['nextNode'].validate(async (valid) => {
         if (valid) {
           if (this.isFlow) {
+            if(this.isOpinionRequired && !this.$refs.commonOpinions.validate()) return 
             if (this.directCreateCircularReadWhenFlowStarted) {
               this.circulateVisible = true;
             } else {

package/src/index.js

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