eoss-ui 0.4.95 → 0.4.97

package/lib/theme-chalk/selector.css

@@ -1 +1 @@
-@charset "UTF-8";.es-selector,.es-selector .es-selector-tags{position:relative}.es-selector{line-height:normal}.es-selector .el-select__tags{max-width:100%;padding-left:4px}.es-selector .el-select__tags.es-selector-edit>span{padding-top:4px}.es-selector .el-select__tags .el-tag{margin-right:4px;margin-bottom:4px}.es-selector .es-selector-search .el-select__tags{max-width:calc(100% - 71px)}.es-selector .es-selector-tags.es-selector-more{padding-right:50px;width:100%}.es-selector .es-selector-tags.es-selector-more .el-tag{display:block}.es-selector .es-selector-tags.es-selector-more .es-tags-more{width:40px;padding:0 4px;position:absolute;top:0;right:6px;text-align:center}.es-selector .es-selector-tags-box{line-height:0}.es-selector .es-pointer .el-input__inner{cursor:pointer}.es-selector .es-selector-dropdown-item.hover,.es-selector .es-selector-dropdown-item:hover{background-color:#f5f7fa}.es-selector .es-selector-dropdown-item{font-size:14px;padding:0 20px;position:relative;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#606266;height:34px;line-height:34px;-webkit-box-sizing:border-box;box-sizing:border-box;cursor:pointer}.es-selector .es-selector-dropdown-item.es-selected{color:#1890ff}.es-zindex-2{z-index:2}.es-selector-dialog .el-dialog__header{padding:12px 20px 8px}.es-selector-dialog .el-dialog__header .el-dialog__title{font-size:14px}.es-selector-dialog .el-dialog__headerbtn{top:14px;right:16px}.es-selector-dialog .el-dialog__body{padding:4px}
+@charset "UTF-8";.es-selector,.es-selector .es-selector-tags{position:relative}.es-selector{line-height:normal}.es-selector .el-select__tags{max-width:100%;padding-left:4px}.es-selector .el-select__tags.es-selector-edit>span{padding-top:4px}.es-selector .el-select__tags .el-tag{margin-right:4px;margin-bottom:4px}.es-selector .es-selector-search .el-select__tags{max-width:calc(100% - 71px)}.es-selector .es-selector-tags.es-selector-more{padding-right:50px;width:100%}.es-selector .es-selector-tags.es-selector-more .el-tag{display:block}.es-selector .es-selector-tags.es-selector-more .es-tags-more{width:40px;padding:0 4px;position:absolute;top:0;right:6px;text-align:center}.es-selector .es-selector-tags-box{line-height:0}.es-selector .es-pointer .el-input__inner{cursor:pointer}.es-selector-dropdown-item.hover,.es-selector-dropdown-item:hover{background-color:#f5f7fa}.es-selector-popover{padding:0}.es-selector-popover .es-selector-dropdown__list{padding:12px}.es-selector-popover .es-selector-dropdown-item{font-size:14px;padding:0 20px;position:relative;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;color:#606266;height:34px;line-height:34px;-webkit-box-sizing:border-box;box-sizing:border-box;cursor:pointer}.es-selector-popover .es-selector-dropdown-item.es-selected{color:#1890ff}.es-zindex-2{z-index:2}.es-selector-dialog .el-dialog__header{padding:12px 20px 8px}.es-selector-dialog .el-dialog__header .el-dialog__title{font-size:14px}.es-selector-dialog .el-dialog__headerbtn{top:14px;right:16px}.es-selector-dialog .el-dialog__body{padding:4px}

package/lib/theme-chalk/toolbar.css

@@ -1 +1 @@
-@charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:12px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}.es-toolbar .el-form-item__content,.es-toolbar .el-form-item__label{line-height:32px!important}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}
+@charset "UTF-8";.es-toolbar{padding:6px 12px;border-bottom:1px solid #d9d9d9;position:relative;background-color:#fff}.es-toolbar .es-toolbar-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-toolbar .es-toolbar-content .es-button-content{-webkit-box-flex:1;-ms-flex:1;flex:1}.es-toolbar .es-toolbar-content .es-form{background:0 0}.es-toolbar .es-toolbar-content .es-form .es-form-content{padding:0}.es-toolbar .es-toolbar-content .es-form .el-form-item{margin-bottom:0}.es-toolbar .es-toolbar-content .es-advanced-btn{margin-left:12px}.es-toolbar .es-toolbar-content .es-toolbar-text{line-height:32px}.es-toolbar .es-toolbar-content .es-toolbar-info{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-toolbar .es-toolbar-content .es-toolbar-info .es-info{font-size:13px;margin-left:20px}.es-toolbar .es-toolbar-content .el-menu--horizontal{border-bottom:0;position:relative;bottom:-6px}.es-toolbar .es-toolbar-content .el-menu-item{height:32px;line-height:24px}.es-toolbar .es-toolbar-content .el-input__inner,.es-toolbar .es-toolbar-content .es-checkbox-group{height:32px;line-height:32px}.es-toolbar .es-toolbar-content .es-radio-group,.es-toolbar .es-toolbar-content .es-switch-content{line-height:32px}.es-toolbar .es-toolbar-content .el-switch{top:-2px}.es-toolbar .es-toolbar-content .el-button span{line-height:14px}.es-toolbar .es-toolbar-content .el-checkbox:not(:last-child),.es-toolbar .es-toolbar-content .el-radio:not(:last-child){margin-right:8px}.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-checkbox+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-radio+.el-form-item,.es-toolbar .es-toolbar-content .el-form-item.es-toolbar-item-switch+.el-form-item{margin-left:16px}.es-toolbar .es-toolbar-content .el-form-item .el-input__icon{line-height:32px;vertical-align:top}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner{width:100%;max-width:156px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange{max-width:300px}.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-input__icon,.es-toolbar .es-toolbar-content .es-form-search-small .el-input__inner.el-date-editor--daterange .el-range-separator{line-height:24px}.es-toolbar .es-advanced-filter{margin-top:20px;z-index:9}.es-toolbar .es-advanced-filter.es-absolute{position:absolute;left:0;top:45px;right:0;margin-top:0;-webkit-box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);box-shadow:0 1px 10px rgba(0,0,0,.05),0 4px 5px rgba(0,0,0,.08),0 2px 4px -1px rgba(0,0,0,.12);border-bottom-left-radius:6px;border-bottom-right-radius:6px}.es-toolbar .es-advanced-filter.es-absolute .es-form{background-color:#fff;border:1px solid #d9d9d9;border-bottom-left-radius:6px;border-bottom-right-radius:6px;border-top:0;padding:20px 20px 20px 10px}.es-toolbar .el-form-item__content,.es-toolbar .el-form-item__label{line-height:32px!important}.es-toolbar .el-button.es-upload{padding:0!important;border:0!important}

package/lib/upload.js

@@ -3312,6 +3312,13 @@ module.exports = require("eoss-element");
 
 /***/ }),
 
+/***/ 24:
+/***/ (function(module, exports) {
+
+module.exports = require("js-base64");
+
+/***/ }),
+
 /***/ 3:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -3424,8 +3431,8 @@ function normalizeComponent(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=3bdc3f65&
-var mainvue_type_template_id_3bdc3f65_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=74d3e866&
+var mainvue_type_template_id_74d3e866_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3805,10 +3812,10 @@ var mainvue_type_template_id_3bdc3f65_render = function () {
     : _vm._e()
 }
 var staticRenderFns = []
-mainvue_type_template_id_3bdc3f65_render._withStripped = true
+mainvue_type_template_id_74d3e866_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=3bdc3f65&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=74d3e866&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3835,6 +3842,9 @@ var util = __webpack_require__(0);
 // EXTERNAL MODULE: ./src/utils/store.js
 var store = __webpack_require__(8);
 
+// EXTERNAL MODULE: external "js-base64"
+var external_js_base64_ = __webpack_require__(24);
+
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=script&lang=js&
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
@@ -4023,6 +4033,7 @@ var _props;
 
 
 
+
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: 'EsUpload',
   components: {
@@ -4248,7 +4259,8 @@ var _props;
       source: '',
       excludeNames: '',
       previewAdjunct: api["gb" /* previewAdjunct */],
-      boxHeight: this.listHeight
+      boxHeight: this.listHeight,
+      kkfileview: null
     };
   },
 
@@ -4501,6 +4513,7 @@ var _props;
                     return item;
                   }).join(',');
                 }
+                _this2.kkfileview = res.results.kkViewRootPath ? res.results.kkViewRootPath : null;
                 _this2.fileSize = res.results.limitFileSize ? res.results.limitFileSize : 0;
                 _this2.fileTotalSize = res.results.limitTotalSize;
                 store["a" /* default */].set(_this2.code, {
@@ -4560,6 +4573,10 @@ var _props;
     handleUpload: function handleUpload() {
       this.$refs.upload.submit();
     },
+    openKkfileview: function openKkfileview(file) {
+      var url = encodeURIComponent(external_js_base64_["Base64"].encode((typeof this.download === 'string' ? this.download : api["q" /* downloadByAdjunctId */]) + ('?adjunctId=' + (file.adjunctId || file.response.adjunctId) + '&fullfilename=' + file.originalName)));
+      util["a" /* default */].win.top.open(this.kkfileview + '?url=' + url);
+    },
     handlePreview: function handlePreview(res) {
       var _this4 = this;
 
@@ -4573,9 +4590,17 @@ var _props;
             var suffix = file.suffix;
             suffix = suffix.toLowerCase();
             if (suffix.includes('doc') || suffix.includes('docx') || suffix.includes('xls') || suffix.includes('xlsx') || suffix.includes('ppt')) {
-              util["a" /* default */].win.open(this.host + (url ? url : api["ib" /* previewAdjunctOffice */]) + '?cmd=view&bucketName=' + file.absolutePath + '&fileId=' + file.adjunctId + '&fileName=' + file.newName);
+              if (this.kkfileview) {
+                this.openKkfileview(file);
+              } else {
+                util["a" /* default */].win.top.open(this.host + (url ? url : api["ib" /* previewAdjunctOffice */]) + '?cmd=view&bucketName=' + file.absolutePath + '&fileId=' + file.adjunctId + '&fileName=' + file.newName);
+              }
             } else if (suffix.includes('pdf')) {
-              util["a" /* default */].win.open(this.host + (url ? url : api["hb" /* previewAdjunct2 */]) + '/' + file.originalName + '?adjunctId=' + file.adjunctId);
+              if (this.kkfileview) {
+                this.openKkfileview(file);
+              } else {
+                util["a" /* default */].win.top.open(this.host + (url ? url : api["hb" /* previewAdjunct2 */]) + '/' + file.originalName + '?adjunctId=' + file.adjunctId);
+              }
             } else if (suffix.includes('jpge') || suffix.includes('jpg') || suffix.includes('gif') || suffix.includes('png')) {
               this.imgUrl = res.url && util["a" /* default */].startWith(url, ['http', '/', true]) ? res.url : this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId;
               this.title = file.originalName;
@@ -4590,10 +4615,14 @@ var _props;
               this.title = file.originalName;
               this.showVideo = true;
             } else {
-              util["a" /* default */].win.open(this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId);
+              if (this.kkfileview) {
+                this.openKkfileview(file);
+              } else {
+                util["a" /* default */].win.top.open(this.host + (url ? url : this.previewAdjunct) + '?adjunctId=' + file.adjunctId);
+              }
             }
           } else {
-            util["a" /* default */].win.open(URL.createObjectURL(file.raw));
+            util["a" /* default */].win.top.open(URL.createObjectURL(file.raw));
           }
         }
       }
@@ -4874,7 +4903,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_3bdc3f65_render,
+  mainvue_type_template_id_74d3e866_render,
   staticRenderFns,
   false,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.95",
+  "version": "0.4.97",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -56,6 +56,7 @@
     "@interactjs/feedback": "^1.10.3",
     "axios": "^0.27.2",
     "interactjs": "^1.10.26",
+    "js-base64": "^3.7.5",
     "json-bigint": "^1.0.0",
     "net": "^1.0.2",
     "qrcode": "^1.5.1",
@@ -95,7 +96,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.74",
+    "eoss-element": "^0.2.75",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/flow/src/main.vue

@@ -274,7 +274,7 @@
                 />
               </el-form-item>
               <el-form-item
-                v-if="isMainSubProcess"
+                v-if="isMainSubProcess && isNodeShowProcess"
                 prop="mainSubId"
                 label="主办"
               >
@@ -501,7 +501,7 @@
               "
               trigger="click"
               placement="top"
-              style="border-left:1px solid #d9d9d9"
+              style="border-left: 1px solid #d9d9d9"
             >
               <el-button>...</el-button>
               <el-dropdown-menu slot="dropdown">
@@ -778,6 +778,7 @@ export default {
       isHideCurrentOrg: false, //是否隐藏本单位(承办)
       isHideOtherOrg: false, //是否隐藏外单位(承办)
       isMainSubProcess: false, // 判断是否子-主流程
+      isNodeShowProcess: false, //是否展示主办
       isNextUser: false,
       isShowNode: false,
       nextNodeList: [],
@@ -945,7 +946,7 @@ export default {
   },
   methods: {
     getsubProcessColumns() {
-      if (!this.isMainSubProcess) return [];
+      if (!this.isMainSubProcess || !this.isNodeShowProcess) return [];
       let data = [];
       let obj = { name: '[部门员工]-' };
       if (this.nextCurrentOrgObjSelect.length > 0) {
@@ -1644,6 +1645,9 @@ export default {
               this.nodeType = data.nodeExtAttr.nodeType;
               //如果当前为承办节点/会签节点,则展示本单位外单位办理人选择
               if (this.nodeType === 1 || this.nodeType === 2) {
+                this.isMainSubProcess === true
+                  ? (this.isNodeShowProcess = true)
+                  : (this.isNodeShowProcess = false);
                 this.isMainSubProcess === true
                   ? (this.isMainSubProcess = true)
                   : (this.isMainSubProcess = false);
@@ -1655,6 +1659,7 @@ export default {
               } else {
                 this.isHideCurrentOrg = false;
                 this.isHideOtherOrg = false;
+                this.isNodeShowProcess = false;
                 this.isMainSubProcess = false;
                 this.isNextUser = true;
                 // this.isMainSubProcess === true
@@ -1748,6 +1753,7 @@ export default {
         this.isNextUser = false;
         this.isShowNode = false;
         this.isMainSubProcess = false;
+        this.isNodeShowProcess = false;
         this.nextNode.nextNodeId = '';
         this.nextNode.isReturnSubmitter = 0;
         this.nextNode.isUndertakeReply = 0;
@@ -2255,7 +2261,7 @@ export default {
             this.value = this.value.replace(RegExp('同意。', 'g'), '');
             this.value = val + this.value;
           }
-          if(!this.validInfo()) return
+          if (!this.validInfo()) return;
           if (this.beforeSubmit == undefined) {
             this.subFun(this.sendData);
           } else {
@@ -2269,58 +2275,59 @@ export default {
       });
     },
     validInfo() {
-       if (
-            !this.endFlow &&
-            this.newTypeCode != 'fenyue' &&
-            !this.shrink &&
-            this.nextNode.isAddSign != '1' &&
-            this.nextNode.isRemoveSign != '1' &&
-            this.isSpecial &&
-            !this.isReject &&
-            this.nodeInfos.length != 0 &&
-            this.isNextUser
-          ) {
-            if (this.isShowNextUser) {
-              if (
-                this.nextNode.nextUserId == '' ||
-                (this.multiple && this.nextNode.nextUserId.length == 0)
-              ) {
-              this.$message.warning('请选择下步办理人');
-                return false
-              }
-            } else {
-              if (
-                this.nextNode.nextOrgId == '' ||
-                (this.multiple && this.nextNode.nextOrgId.length == 0)
-              ) {
-                 this.$message.warning('请选择办理对象');
-                return false
-              }
-            }
-          }
-
-          if (
-            this.nextNode.isAddSign == '1' &&
-            this.nextNode.addSignUserId.length == 0
-          )
-            {this.$message.warning('请选择加签办理人');
-                return false}
+      if (
+        !this.endFlow &&
+        this.newTypeCode != 'fenyue' &&
+        !this.shrink &&
+        this.nextNode.isAddSign != '1' &&
+        this.nextNode.isRemoveSign != '1' &&
+        this.isSpecial &&
+        !this.isReject &&
+        this.nodeInfos.length != 0 &&
+        this.isNextUser
+      ) {
+        if (this.isShowNextUser) {
           if (
-            this.nextNode.isRemoveSign == '1' &&
-            this.nextNode.removeSignUserId.length == 0
-          ){
-           this.$message.warning('请选择减签办理人');
-                return false
-            }
-          if (!this.value && this.isOpinionRequired === 1) {
-            this.$message.warning('请选择输入审批意见');
+            this.nextNode.nextUserId == '' ||
+            (this.multiple && this.nextNode.nextUserId.length == 0)
+          ) {
+            this.$message.warning('请选择下步办理人');
             return false;
           }
-          if (this.isHideCurrentOrg && !this.nextNode.nextCurrentOrgObjJson) {
-            this.$message.warning(`请选择${this.currentOrgName || '本单位'}`);
+        } else {
+          if (
+            this.nextNode.nextOrgId == '' ||
+            (this.multiple && this.nextNode.nextOrgId.length == 0)
+          ) {
+            this.$message.warning('请选择办理对象');
             return false;
           }
-          return true
+        }
+      }
+
+      if (
+        this.nextNode.isAddSign == '1' &&
+        this.nextNode.addSignUserId.length == 0
+      ) {
+        this.$message.warning('请选择加签办理人');
+        return false;
+      }
+      if (
+        this.nextNode.isRemoveSign == '1' &&
+        this.nextNode.removeSignUserId.length == 0
+      ) {
+        this.$message.warning('请选择减签办理人');
+        return false;
+      }
+      if (!this.value && this.isOpinionRequired === 1) {
+        this.$message.warning('请选择输入审批意见');
+        return false;
+      }
+      if (this.isHideCurrentOrg && !this.nextNode.nextCurrentOrgObjJson) {
+        this.$message.warning(`请选择${this.currentOrgName || '本单位'}`);
+        return false;
+      }
+      return true;
     },
     sendData() {
       this.$refs['nextNode'].validate(async (valid) => {

package/packages/flow-group/src/main.vue

@@ -271,10 +271,28 @@
                         v-on="{ ...item.events }"
                       >
                       </es-dialog>
+                      <component
+                        v-if="item.component"
+                        :is="item.type"
+                        v-bind="
+                          handleExclAttribute({
+                            data: item
+                          })
+                        "
+                      ></component>
                     </template>
                   </template>
                 </template>
                 <template v-else>
+                  <component
+                    v-if="contents.component"
+                    :is="contents.type"
+                    v-bind="
+                      handleExclAttribute({
+                        data: contents
+                      })
+                    "
+                  ></component>
                   <es-form
                     v-if="contents.type === 'form'"
                     :show-button="false"
@@ -456,14 +474,16 @@ export default {
     width: {
       type: String,
       default: '360px'
-    }
+    },
+    refs: String
   },
   data() {
     return {
       activeName: this.active,
       businessId: undefined,
       taskExamineAppId: this.appId,
-      showMsg: true
+      showMsg: true,
+      formRefs: this.refs
     };
   },
   computed: {
@@ -515,6 +535,10 @@ export default {
         : true;
     },
     handleExclAttribute({ data, attrs }) {
+      if (!attrs || !attrs.length) {
+        this.ref && (this.formRefs = this.ref);
+        return data;
+      }
       return util.exclAttribute({
         data: data,
         attrs: attrs
@@ -561,7 +585,9 @@ export default {
       });
     },
     handleSubmit(res) {
-      let esFlowForm = this.$refs.esFlowForm;
+      let esFlowForm = this.formRefs
+        ? this.$refs[this.formRefs]
+        : this.$refs.esFlowForm;
       if (Array.isArray(esFlowForm)) {
         esFlowForm = esFlowForm[0];
       }

package/packages/login/src/main.vue

@@ -530,6 +530,10 @@ export default {
     useResults: {
       type: Boolean,
       default: true
+    },
+    scanIntervalTime: {
+      type: Number,
+      default: 1500
     }
   },
   computed: {
@@ -1271,12 +1275,12 @@ export default {
     },
     //获取app登录信息
     loginInfo(res) {
-      clearInterval(this.interval);
+      clearTimeout(this.interval);
       if (res) {
         //this.modifyPasswordfun();
-        this.interval = setInterval(() => {
+        this.interval = setTimeout(() => {
           this.initRequestLoginInfo();
-        }, 1000);
+        }, this.scanIntervalTime);
       }
     },
     initRequestLoginInfo() {
@@ -1295,7 +1299,7 @@ export default {
           }
         })
         .catch((err) => {
-          clearInterval(this.interval);
+          clearTimeout(this.interval);
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }

package/packages/main/src/main.vue

@@ -707,9 +707,6 @@ export default {
                     }
                   } else {
                     this.getConfig();
-                    if (this.socket) {
-                      this.initWebSocket();
-                    }
                   }
                   break;
                 case 1:
@@ -790,9 +787,6 @@ export default {
           .catch((e) => {});
       } else {
         this.getConfig();
-        if (this.socket) {
-          this.initWebSocket();
-        }
       }
     },
     menuSuccess(res) {
@@ -1060,6 +1054,9 @@ export default {
         .then((res) => {
           if (res && res.rCode === 0) {
             this.setConfig(res.results, 1);
+            if (this.socket) {
+              this.initWebSocket();
+            }
             if (this.remote) {
               this.getMenu();
             } else {

package/packages/select/src/main.vue

@@ -2,7 +2,6 @@
 import { findSysCode } from 'eoss-ui/src/config/api.js';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
-import { string } from 'slate';
 export default {
   name: 'EsSelect',
   componentName: 'EsSelect',

package/packages/selector/src/main.vue

@@ -143,7 +143,11 @@
       v-model="show"
       placement="bottom-start"
       trigger="manual"
+      popper-class="es-selector-popover"
       :width="minWidth"
+      :queryParent="true"
+      :reference="reference"
+      :arrow-offset="20"
     >
       <el-scrollbar
         tag="ul"
@@ -151,6 +155,7 @@
         view-class="es-selector-dropdown__list"
         ref="scrollbar"
         v-show="options.length"
+        maxHeight="228"
       >
         <li
           v-for="item in options"
@@ -326,7 +331,8 @@ export default {
       minWidth: '',
       options: '',
       show: false,
-      focus: false
+      focus: false,
+      reference: undefined
     };
   },
   computed: {
@@ -402,7 +408,9 @@ export default {
       }
     }
   },
-  created() {},
+  created() {
+    this.reference = this.$refs.esSelector;
+  },
   mounted() {
     this.resetInputHeight();
     if (this.filterable) {