eoss-ui 0.7.10 → 0.7.12

package/packages/flow/src/main.vue

@@ -122,6 +122,14 @@
       :news-info="nextNode.notificationMsg"
       @cancel="closeProcess($event)"
     />
+
+    <FreeCirculation
+      v-else-if="typeCode == 'freeCirculation'"
+      :appId="resetAppId"
+      :params="param"
+      :formLabelPosition="formLabelPosition"
+      :simpleTips="simpleTips"
+    />
     <Supervise
       :businessId="businessId"
       :appId="resetAppId"
@@ -213,6 +221,7 @@
             multiple
             mix
             :disableds="otherOrgDisabledObjId"
+            :where="{ filid: 'other' }"
             @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
             :types="foreignOrgSelectorTabs"
             :params="foreignOrgSelectorParams"
@@ -528,6 +537,7 @@
                     :nextUser="nextOtherOrgObjSelect"
                     multiple
                     mix
+                    :where="{ filid: 'other' }"
                     :disableds="otherOrgDisabledObjId"
                     @change="disposeAppUnit($event, 'nextOtherOrgObjSelect')"
                     :types="foreignOrgSelectorTabs"
@@ -1130,6 +1140,7 @@ import FreeStartFlow from './freeStartFlow.vue';
 import SelectUser from './selectUser.vue';
 import Supervise from './supervise.vue';
 import circulate from './component/Circulate.vue';
+import FreeCirculation from './component/FreeCirculation.vue';
 import {
   findSysCodes,
   getHandleInfoHtml,
@@ -1171,7 +1182,8 @@ export default {
     circulate,
     Preset,
     Reset,
-    Supervise
+    Supervise,
+    FreeCirculation
   },
   props: {
     showShrink: { type: Boolean, default: true },
@@ -1584,7 +1596,12 @@ export default {
       this.$emit('endMessageChange', this.endMessage);
     },
     getInfo() {
-      if (this.typeCode == 'supervise' || this.typeCode == 'read') return;
+      if (
+        this.typeCode == 'supervise' ||
+        this.typeCode == 'read' ||
+        this.typeCode == 'freeCirculation'
+      )
+        return;
       if (
         this.showCirculate != undefined &&
         !this.showCirculate &&
@@ -1608,7 +1625,15 @@ export default {
       }
     },
     handleClickCirculate() {
-      this.$refs.circulate.subMit();
+      if (this.beforeSubmit == undefined) {
+        this.$refs.circulate.subMit();
+      } else {
+        this.beforeSubmit(1)
+          .then((next) => {
+            this.$refs.circulate.subMit();
+          })
+          .catch((e) => {});
+      }
     },
     getNodeInfoForStartFlow(processDefinitionId) {
       let params = {
@@ -2943,7 +2968,7 @@ export default {
                     foreignOrgparams[i] == 'my'
                       ? choiceOrgId
                       : foreignOrgparams[i],
-                  nofilid:foreignOrgparams[i] == 'other'?1 : 0,
+                  nofilid: foreignOrgparams[i] == 'other' ? 1 : 0
                 };
               });
             }

package/packages/flow/src/selectUser.vue

@@ -67,7 +67,7 @@
         :tabs="tabs"
         :title="title"
         :classify="classify"
-        :collapse-tags="2"
+        :collapse-tags="selectorTags"
         :mix="mix"
         :min="isUnionSeal ? 1 : 0"
         :disabled="!isCustomUser || isCurrentNodeForbiddenChangeCandidate == 1"
@@ -127,6 +127,10 @@ export default {
       type: Boolean,
       default: false
     },
+    selectorTags:{
+      type:[Number,undefined],
+      default:2
+    },
     isCustomUser: { type: Number, default: 1 },
     isCurrentNodeForbiddenChangeCandidate: { type: Number, default: 0 },
     options: {

package/packages/flow/src/startTaskRead.vue

@@ -5,6 +5,7 @@
     element-loading-text="加载中..."
     element-loading-spinner="el-icon-loading"
     element-loading-background="rgba(255, 255,255, 0.8)"
+    :style="`height: ${typeCode == 'read'? '100%' : 'unset'};`"
   >
     <el-form
       ref="nextNode"

package/packages/flow/src/supervise.vue

@@ -87,10 +87,10 @@ export default {
   },
   methods: {
     subProcess() {
-      // if (this.nextNode.noticeType.length == 0) {
-      //   this.$message.warning('请选择通知方式');
-      //   return;
-      // }
+      if (this.nextNode.noticeType.length == 0) {
+        this.$message.warning('请选择通知方式');
+        return;
+      }
       if (this.nextNode.noticeType.length != 0 && !this.nextNode.notifyMessage) {
         this.$message.warning('请填写通知消息内容');
         return;

package/packages/form/src/main.vue

@@ -2617,7 +2617,11 @@ export default {
       }
     },
     active: Array,
-    resetActive: Boolean
+    resetActive: Boolean,
+    resetValue: {
+      type: Boolean,
+      default: true
+    }
   },
   data() {
     return {
@@ -3263,7 +3267,7 @@ export default {
         res.event === 'cancel' ||
         res.type === 'reset'
       ) {
-        this.resetFields();
+        this.resetValue && this.resetFields();
         if (this.closeDialog && this.esDialog) {
           this.esDialog.handleClose(res.reload || false);
         }

package/packages/login/src/resetPassword.vue

@@ -352,7 +352,7 @@ export default {
   },
   data() {
     return {
-      activeIndex: '6',
+      activeIndex: '0',
       checkPassword: null,
       checkPasswordMsg: null,
       btnText: '获取验证码',
@@ -368,15 +368,10 @@ export default {
     if (this.type) {
       let types = this.type.split(',');
       if (types.length) {
-        types.forEach((item) => {
-          if (item != '0' && (item == '11' || item == '6')) {
-            this.activeIndex = item;
-            return;
-          }
-        });
+        this.activeIndex = types[0];
       }
     } else {
-      this.activeIndex = this.operationCheckCode ? '0' : '';
+      this.activeIndex = '0';
     }
   },
   destroyed() {

package/packages/main/src/simplicity/userinfo.vue

@@ -8,6 +8,7 @@
     :autocomplete="false"
     :rules="formRules"
     :events="events"
+    :resetValue="false"
     @submit="handleFormSubmit"
   >
     <template slot="other">

package/src/config/api.js

@@ -1,7 +1,7 @@
 const flowPendingPrefix =
   window.flowPendingPrefix ||
   localStorage.getItem('flowPendingPrefix') ||
-  '/oa';
+  '/bpm';
 // 登录
 export const doCaLogin = '/sso2/signIn/auth/doCaLogin'; // ca登录认证
 export const doUserLogin = '/sso2/signIn/auth/doUserLogin'; // 一般的账号密码认证含验证码验证
@@ -305,4 +305,11 @@ export const endFlowAndStartTaskCircularRead =
 export const getNodeInfoForStart =
   flowPendingPrefix + '/task/taskHandle/getNodeInfoForStart.dhtml';
 export const freeStartFlow = '/bpm/bpmBackend/freeStartFlow';
-export const getUrgencyLevelChangedNotificationType = '/bpm/bpmBackend/getUrgencyLevelChangedNotificationType';
+export const getUrgencyLevelChangedNotificationType =
+  '/bpm/bpmBackend/getUrgencyLevelChangedNotificationType';
+// 自由发起传阅查询
+export const toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
+// 自由发起传阅提交
+export const freeTaskCircularRead =
+  '/bpm/bpmBackend/freeTaskCircularRead';
+

package/src/index.js

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