eoss-mobiles 0.3.86 → 0.3.87

package/packages/flow/src/components/taskUnionExamine.vue

@@ -17,6 +17,7 @@
             v-model="takeAdviceUser"
             :multiple="newMultiple"
             :isAllCheck="isAllCheck"
+            @selector-click="handleSelectorClick"
             isEnterprise
             :tabs="
               type == 'takeAdvice'
@@ -61,6 +62,7 @@
             v-model="nextOtherOrgObj"
             :multiple="newMultiple"
             :isAllCheck="isAllCheck"
+            @selector-click="handleSelectorClick"
             :mix="otherMix"
             :tabs="
               foreignOrgTabs.length > 0
@@ -90,7 +92,7 @@
           :pendingId="pendingId"
           @onInputMsg="onInputMsg"
           :defaultNotificationType="infoList.noticeType"
-          ></Message>
+        ></Message>
       </div>
     </div>
     <div class="btn-list">
@@ -166,7 +168,7 @@ export default {
       currentOrgTabs: [],
       foreignOrgTabs: [],
       otherOrgDisabledObjId: [],
-      showMessage:false,
+      showMessage: false,
       file: '',
       infoList: {
         nextOtherOrgObj: [],
@@ -188,12 +190,12 @@ export default {
       currentOrgName: '',
       otherOrgName: '',
       // newMultiple: true,
-      params: { pid: 'root',},
+      params: { pid: 'root' },
 
       isHideOtherOrg: '',
       isHideCurrentOrg: 0,
       isOpinionRequired: 0,
-      otherParams: { pid: 'root'}
+      otherParams: { pid: 'root' }
     };
   },
   components: { Opinion, Message },
@@ -204,16 +206,21 @@ export default {
         ? sessionStorage.getItem('pt') + 'px'
         : '30px'
     };
-    this.otherParams.myUserid = this.params.myUserid = $.getStorage('userId') || this.userId || '';
-    this.params.nofilid = this.otherParams.nofilid = this.orgId || JSON.parse($.getStorage('userInfo')).orgId || this.userId || '';
-    if(this.type == 'takeAdvice'){
-      this.params.only_filid=true
-      this.params.onlyMyOrg=true
-    }else{
-      this.params = {...this.params,...this.selectorParams}
+    this.otherParams.myUserid = this.params.myUserid =
+      $.getStorage('userId') || this.userId || '';
+    this.params.nofilid = this.otherParams.nofilid =
+      this.orgId ||
+      JSON.parse($.getStorage('userInfo')).orgId ||
+      this.userId ||
+      '';
+    if (this.type == 'takeAdvice') {
+      this.params.only_filid = true;
+      this.params.onlyMyOrg = true;
+    } else {
+      this.params = { ...this.params, ...this.selectorParams };
     }
-    this.params = {...this.params}
-    this.otherParams = {...this.otherParams,...this.selectorParams}
+    this.params = { ...this.params };
+    this.otherParams = { ...this.otherParams, ...this.selectorParams };
     // this.newMultiple = this.multiple;
     if (this.type === 'taskReview') return this.getTaskReview();
     if (this.type === 'takeAdvice') return this.getIsCanStartSubFlow();
@@ -242,6 +249,9 @@ export default {
     }
   },
   methods: {
+    handleSelectorClick(val) {
+      this.$parent.$emit('selector-click', val);
+    },
     getuserInfo() {
       request({ url: findUserBaseInfo }).then((res) => {
         localStorage.setItem('userInfo', JSON.stringify(res.results));
@@ -283,8 +293,9 @@ export default {
       };
       request({ url: getNotificationMsg, params, methods: 'post' })
         .then((res) => {
-          this.$toast.clear();http://localhost:8080/#/Selector
-          if (res.status === 'success') {
+          this.$toast.clear();
+          //localhost:8080/#/Selector
+          http: if (res.status === 'success') {
             this.infoList.noticeInfo = res.message;
           }
         })
@@ -302,13 +313,13 @@ export default {
           const { status, message } = res;
           this.$toast.clear();
           if (status === 'success') {
-            if(!this.hideMessage){
+            if (!this.hideMessage) {
               this.infoList.noticeType = message.split(',');
             }
           } else {
             this.$toast(message || '系统错误，请联系管理员！');
           }
-          this.showMessage = true
+          this.showMessage = true;
         })
         .catch((err) => {
           this.loading = false;
@@ -320,12 +331,12 @@ export default {
     changeSelectUser(val, type) {
       const { list } = val;
       let newNextUser = [];
-      let obj = {}
+      let obj = {};
       list.map((item) => {
-        if(obj[item.mixType]){
-          obj[item.mixType].push(item.showid)
-        }else{
-          obj[item.mixType] = [item.showid]
+        if (obj[item.mixType]) {
+          obj[item.mixType].push(item.showid);
+        } else {
+          obj[item.mixType] = [item.showid];
         }
         // if (newNextUser) {
         //   newNextUser += `,${item.selecttype}-${item.showid}`;
@@ -333,8 +344,8 @@ export default {
         //   newNextUser = `${item.selecttype}-${item.showid}`;
         // }
       });
-      for(let key in obj){
-        newNextUser.push(`${key}-${obj[key].join(',')}`)
+      for (let key in obj) {
+        newNextUser.push(`${key}-${obj[key].join(',')}`);
       }
       this.infoList[type] = newNextUser.join('|');
       this[type] = list;
@@ -426,8 +437,8 @@ export default {
               }
             } = res;
             res.data.otherOrgDisabledObjId &&
-            (this.otherOrgDisabledObjId =
-              res.data.otherOrgDisabledObjId.split(','));
+              (this.otherOrgDisabledObjId =
+                res.data.otherOrgDisabledObjId.split(','));
             this.notificationMessageReadOnly =
               notificationMessageReadOnly == 'true';
             this.readOnlyNotificationType = readOnlyNotificationType;
@@ -471,18 +482,16 @@ export default {
                       pid:
                         param[i] == 'my'
                           ? (this.params.pid = JSON.parse(
-                             $.getStorage('userInfo')
+                              $.getStorage('userInfo')
                             ).orgId)
                           : param[i],
-                          only_filid:true,
-                          onlyMyOrg:true
+                      only_filid: true,
+                      onlyMyOrg: true
                     };
                   });
               } else {
                 if (this.type == 'takeAdvice') {
-                  this.params.pid = JSON.parse(
-                    $.getStorage('userInfo')
-                  ).orgId;
+                  this.params.pid = JSON.parse($.getStorage('userInfo')).orgId;
                 }
               }
               if (res.data.customizedConfig.foreignOrgSelectorCustomized) {
@@ -499,9 +508,9 @@ export default {
                 //   .split(',')
                 //   .map((x, i) => {
                 //     this.otherParams[x] = { pid: param[i] };
-                    
+
                 //   });
-                }
+              }
             }
             this.getFind();
             this.getMessage();
@@ -521,7 +530,9 @@ export default {
     },
     // 通知消息回调
     onInputMsg(obj) {
-      this.infoList.newNoticeType = JSON.parse(JSON.stringify(obj.notificationType));
+      this.infoList.newNoticeType = JSON.parse(
+        JSON.stringify(obj.notificationType)
+      );
       this.infoList.noticeInfo = obj.notificationMsg;
     },
     goBack() {

package/packages/selector/src/main.vue

@@ -72,6 +72,10 @@ export default {
     showTree: {
       type: Boolean,
       default: false
+    },
+    isClosePopup: {
+      type: Boolean,
+      default: false
     }
   },
   data() {
@@ -82,13 +86,24 @@ export default {
     };
   },
   watch: {
+    isClosePopup: {
+      handler(val) {
+        if (this.showSelectorTree) {
+          this.showSelectorTree = false;
+          this.$emit('selector-click', this.showSelectorTree);
+        }
+      },
+      deep: true,
+      immediate: true
+    },
     value: {
       handler(val) {
         this.selectList = val;
         if (this.selectList.length > 0) {
-          this.inputValue = this.selectList[0][
-            this.$attrs.labelKey || this.$attrs['label-key'] || 'showname'
-          ];
+          this.inputValue =
+            this.selectList[0][
+              this.$attrs.labelKey || this.$attrs['label-key'] || 'showname'
+            ];
         } else {
           this.inputValue = '';
         }
@@ -118,6 +133,7 @@ export default {
     handleSelector() {
       if (this.$attrs.disabled || this.$attrs.readonly) return;
       this.showSelectorTree = !this.showSelectorTree;
+      this.$emit('selector-click', this.showSelectorTree);
     },
     /**
      * handleDispose
@@ -141,6 +157,7 @@ export default {
         }
       }
       this.showSelectorTree = false;
+      this.$emit('selector-click', this.showSelectorTree);
     },
     /**
      * handleChangeSel

package/src/index.js

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