eoss-ui 0.8.18 → 0.8.19

package/package.json

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

package/packages/flow/src/main.vue

@@ -2813,6 +2813,9 @@ this.$confirm('确认提交?', '提示', {
                 this.nextNode.customLimitTimeText =
                   data.nodeMoreInfo.defaultCustomLimitDays + '';
             }
+            if( this.currentOrgSelectorParams.department && !this.currentOrgSelectorParams.department.roleid && this.selectorParams.roleid && data.nodeExtAttr.deptRoleCode){
+              this.currentOrgSelectorParams.department.roleid = data.nodeExtAttr.deptRoleCode;
+            }
             if(data.nodeMoreInfo.currentOrgDefaultSelectObjectItems){
               if(data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.length > 0){
                 data.nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.map((x,i) => {
@@ -3236,7 +3239,8 @@ this.$confirm('确认提交?', '提示', {
                     currentOrgparams[i] == 'my'
                       ? choiceOrgId
                       : currentOrgparams[i],
-                  only_filid: true
+                  only_filid: true,
+                  roleid:this.selectorParams.roleid
                 };
               });
             }
@@ -4184,7 +4188,6 @@ this.$confirm('确认提交?', '提示', {
     },
     // 单位选择完回调
     disposeAppUnit(res, type) {
-      console.log(res, '选完了');
       let label = type.substring(0, type.lastIndexOf('Select'));
       this.nextNode[label + 'Name'] = '';
       res.options && (this[type] = res.options);

package/packages/flow/src/processForm.vue

@@ -147,7 +147,8 @@
             mix
             @change="disposeAppUnit($event, 'nextCurrentOrgObjSelect')"
             :showTooltip="showTooltip"
-            :types="['employee', 'persongroup']"
+            :selectUserList="nextCurrentOrgselectUserList"
+            :types="currentOrgSelectorTabs"
             :params="currentOrgSelectorParams"
           />
         </el-form-item>
@@ -166,7 +167,11 @@
         <el-form-item
           v-if="!isHideOtherOrg && !isHideCurrentOrg"
           :prop="isShowNextUser ? 'nextUser' : 'nextOrgId'"
-          :label="isShowNextUser ?  `${flowLabelConfig.nextUser||'下步办理人'}` : '办理对象'"
+          :label="
+            isShowNextUser
+              ? `${flowLabelConfig.nextUser || '下步办理人'}`
+              : '办理对象'
+          "
         >
           <SelectUser
             :nextUser="isShowNextUser ? nextNode.nextUser : nextNode.nextOrgId"
@@ -510,11 +515,13 @@ export default {
       default: 0
     },
     selectorParams: { type: Object, default: () => {} },
-    flowLabelConfig: { 
-      type:Object,
-      default: () => {return {}}
+    flowLabelConfig: {
+      type: Object,
+      default: () => {
+        return {};
+      }
     },
-    hideMessage: { type: Boolean, default: false },
+    hideMessage: { type: Boolean, default: false }
   },
   data() {
     return {
@@ -525,6 +532,7 @@ export default {
       selectUser: false,
       multiple: false,
       readMultiple: true,
+      currentOrgSelectorTabs: ['employee', 'persongroup'],
       customPresetHintMessage: '', //流程预设标题
       nextNodeCheckType: 'select',
       nextOperateCheckType: 'select',
@@ -535,6 +543,7 @@ export default {
       show: true,
       enableCustomLimitTimeSetting: false,
       radioList: [],
+      nextCurrentOrgselectUserList: [],
       showCustomLimitTimeText: false,
       activeNames: '',
       selectUserList: [],
@@ -1046,7 +1055,9 @@ export default {
               !this.isHideCurrentOrg &&
               !this.isHideOtherOrg
             ) {
-              return this.$message.warning(`请选择${this.flowLabelConfig.nextUser || '下步办理人'}`);
+              return this.$message.warning(
+                `请选择${this.flowLabelConfig.nextUser || '下步办理人'}`
+              );
             }
           } else {
             if (nextOrgId == '' || (this.multiple && nextOrgId.length == 0)) {
@@ -1368,6 +1379,9 @@ export default {
             this.allLoading.close();
           }
           if (status === 'success') {
+             if( this.currentOrgSelectorParams.department && !this.currentOrgSelectorParams.department.roleid && this.selectorParams.roleid && nodeExtAttr.deptRoleCode){
+              this.currentOrgSelectorParams.department.roleid = nodeExtAttr.deptRoleCode;
+            }
             this.isCurrentNodeForbiddenChangeCandidate =
               nodeExtAttr.isCurrentNodeForbiddenChangeCandidate;
             this.nextNode.userInfo = nextUserList;
@@ -1375,6 +1389,58 @@ export default {
             this.nextNode.countersignaturetypeText = countersignaturetypeText;
             this.enableCustomLimitTimeSetting =
               nodeExtAttr.enableCustomLimitTimeSetting == 1;
+            if (nodeMoreInfo.currentOrgDefaultSelectObjectItems) {
+              this.nextCurrentOrgselectUserList = []
+              if (
+                nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.length >
+                0
+              ) {
+                nodeMoreInfo.currentOrgDefaultSelectObjectItems.deptIds.map(
+                  (x, i) => {
+                    this.nextCurrentOrgselectUserList.push({
+                      showname:
+                        nodeMoreInfo.currentOrgDefaultSelectObjectItems
+                          .deptNames[i],
+                      showid: x,
+                      stype: 'department'
+                    });
+                  }
+                );
+              }
+              if (
+                nodeMoreInfo.currentOrgDefaultSelectObjectItems.userIds.length >
+                0
+              ) {
+                nodeMoreInfo.currentOrgDefaultSelectObjectItems.userIds.map(
+                  (x, i) => {
+                    this.nextCurrentOrgselectUserList.push({
+                      showname:
+                        nodeMoreInfo.currentOrgDefaultSelectObjectItems
+                          .userNames[i],
+                      showid: x,
+                      stype: 'employee'
+                    });
+                  }
+                );
+              }
+              if (
+                nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgIds.length >
+                0
+              ) {
+                nodeMoreInfo.currentOrgDefaultSelectObjectItems.orgIds.map(
+                  (x, i) => {
+                    this.nextCurrentOrgselectUserList.push({
+                      showname:
+                        nodeMoreInfo.currentOrgDefaultSelectObjectItems
+                          .orgNames[i],
+                      showid: x,
+                      stype: 'enterprise'
+                    });
+                  }
+                );
+              }
+              this.nextNode.nextCurrentOrgObj = nodeMoreInfo.currentOrgDefaultSelectObjects
+            }
             if (
               this.enableCustomLimitTimeSetting &&
               nodeMoreInfo.defaultCustomLimitDays
@@ -1492,7 +1558,7 @@ export default {
         .then((res) => {
           const { status, message } = res;
           if (status === 'success') {
-            if(this.hideMessage) return
+            if (this.hideMessage) return;
             this.nextNode.noticeType = message.split(',');
             let arr = [];
             this.nextNode.noticeList.map((item) => {
@@ -1598,6 +1664,26 @@ export default {
               (this.nextNodeCheckType = data.nextNodeCheckType);
             data.nextOperateCheckType &&
               (this.nextOperateCheckType = data.nextOperateCheckType);
+            if (data.currentOrgSelectorParams) {
+              if (
+                data.currentOrgSelectorParams.enableCurrentOrgConfig == 'true'
+              ) {
+                this.currentOrgSelectorTabs =
+                  data.currentOrgSelectorParams.currentOrgType.split(',');
+                let currentOrgparams =
+                  data.currentOrgSelectorParams.currentOrgRange.split(',');
+                this.currentOrgSelectorTabs.map((x, i) => {
+                  this.currentOrgSelectorParams[x] = {
+                    filid:
+                      currentOrgparams[i] == 'my'
+                        ? JSON.parse(util.getStorage('mainConfig')).userModel
+                            .orgId
+                        : currentOrgparams[i],
+                    only_filid: true
+                  };
+                });
+              }
+            }
             this.customPresetHintMessage = data.customPresetHintMessage;
             this.readOnlyNotificationType = data.readOnlyNotificationType;
             this.notificationMessageReadOnly =
@@ -1643,15 +1729,18 @@ export default {
                       ? this.defaultNextNode
                       : data.nextNodeList[0].nodeId;
                 }
-              } 
+              }
               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[this.isHideDefaultOperation != 1?1:0].list;
-                
+                this.nextNode.nodeInfo =
+                  this.operationList[
+                    this.isHideDefaultOperation != 1 ? 1 : 0
+                  ].list;
+
                 if (this.nextNode.nodeInfo.length > 0) {
                   let defaultNodeData = this.nextNode.nodeInfo.filter(
                     (x) => x.nodeId == this.defaultNextNode
@@ -1659,7 +1748,7 @@ export default {
                   this.nextNode.nextNode =
                     defaultNodeData.length > 0
                       ? this.defaultNextNode
-                      :this.nextNode.nodeInfo[0].nodeId;
+                      : this.nextNode.nodeInfo[0].nodeId;
                 }
               }
             }

package/packages/flow/src/selectUser.vue

@@ -385,7 +385,6 @@ export default {
       if (this.mix) data = this.getMixList();
       if (this.newMultiple) {
         this.newNextUser = [];
-
         this.newSelectUserList.map((item) => {
           if (this.mix) {
             this.newOptions.push({

package/packages/form/src/main.vue

@@ -1853,20 +1853,20 @@
                     "
                     @blur="
                       (event) => {
-                        handleBlur(item.name, event);
+                        handleBlur(item, event);
                       }
                     "
                     @focus="
                       (event) => {
-                        handleFocus(item.name, event);
+                        handleFocus(item, event);
                       }
                     "
                     @input="
                       (val) => {
-                        handleInput(item.name, val);
+                        handleInput(item, val);
                       }
                     "
-                    @clear="handleClear(item.name)"
+                    @clear="handleClear(item)"
                     @change="
                       (val) => {
                         handleChange(item, val);
@@ -3491,6 +3491,7 @@ export default {
       }
     },
     handleFocus(a, b, c) {
+      console.log('handleFocus focus', a);
       if (a.events && a.events.focus) {
         a.events.focus(a.name, b, c, this.models);
       } else if (this.events[a.name] && this.events[a.name].focus) {

package/src/index.js

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