eoss-ui 0.5.63 → 0.5.65

package/packages/flow/src/processForm.vue

@@ -257,6 +257,7 @@ import {
   findSysCodes,
   getNotificationMsg,
   findCodeValues,
+  loginUserInfo,
   register
 } from 'eoss-ui/src/config/api';
 import util from 'eoss-ui/src/utils/util';
@@ -342,6 +343,7 @@ export default {
           }
         }
       },
+      userModel:{},
       nextUserTabs: {},
       selectPresetUserList: [],
       presetOptions: [],
@@ -384,12 +386,38 @@ export default {
         return ['employee', 'enterprise', 'department', 'persongroup'];
       }
     }
+  },
+   created() {
+    this.getUserInfo();
   },
   mounted() {
     this.getStartFlow(this.processDefinitionId);
     this.newOpinion = this.opinion;
   },
   methods: {
+     getUserInfo() {
+      let mainConfig = util.getStorage('mainConfig');
+      if (mainConfig) {
+        this.userModel = JSON.parse(mainConfig).userModel;
+      } else {
+        util
+          .ajax({ url: loginUserInfo })
+          .then((res) => {
+            const { status, data } = res;
+            if (status == 'success') {
+              this.userModel = data;
+            } else {
+              let msg = res.msg || '系统错误，请联系管理员！';
+              this.$message.error(msg);
+            }
+          })
+          .catch((err) => {
+            if (err.message && err.message !== 'canceled') {
+              this.$message.error(err.message);
+            }
+          });
+      }
+    },
     getIsShowNextUser(val) {
       if (
         val == 7 ||
@@ -751,15 +779,15 @@ export default {
         multiple = true;
       }
       if (val == 1 || val == 2 || val == 5) {
-        params.filid = util.getStorage('orgId');
+        params.filid = this.userModel.orgId;
         params.only_filid = true;
         if (choiceOrgId) {
           params.filid = choiceOrgId;
         }
       }
       if (val == 5 || val == 6) {
-        params.filid = util.getStorage('orgId');
-        params.deptid = util.getStorage('orgId');
+        params.filid = this.userModel.orgId;
+        params.deptid = this.userModel.orgId;
         if (choiceDeptId) {
           params.deptid = choiceDeptId;
         }
@@ -768,7 +796,7 @@ export default {
         }
       }
       if (val == 15 || val == 16) {
-        params.filid = util.getStorage('orgId');
+        params.filid = this.userModel.orgId;
         if (pOrgId) {
           params.filid = pOrgId;
         }

package/packages/form/src/main.vue

@@ -5011,6 +5011,9 @@ export default {
       this.$refs.esForm && this.$refs.esForm.clearValidate();
     },
     submitData(handle, close = true, type, validate = true) {
+      if (this.readonly) {
+        return Promise.resolve();
+      }
       if (!handle) {
         handle = this.handles || {};
       }

package/packages/login/src/main.vue

@@ -186,6 +186,7 @@
               </div>
               <es-qr-code
                 :content="identifyingId"
+                :logo="qrimg"
                 v-if="active == 3 && identifyingId"
               ></es-qr-code>
               <div class="es-wx-qrcode-box" v-if="active == 9">
@@ -694,6 +695,11 @@ export default {
         this.loginInfo(val == 3);
       }
     },
+    identifyingId(val) {
+      if (val) {
+        this.loginInfo(this.active == 3);
+      }
+    },
     appName: {
       immediate: true,
       handler(val) {
@@ -1011,7 +1017,9 @@ export default {
       this.downloadSetup = res.downloadSetup;
       document.title = res.subsystemName;
       this.app = res.appName || res.subsystemName;
-      this.qrimg = res.qrimg || res.qrImg;
+      if (res.qrimg || res.qrImg) {
+        this.qrimg = res.qrimg || res.qrImg;
+      }
       if (res.loginModel) {
         this.loginModel = res.loginModel;
       }
@@ -1342,6 +1350,9 @@ export default {
       }
     },
     initRequestLoginInfo() {
+      if (this.identifyingId == '') {
+        return false;
+      }
       util
         .ajax({
           method: 'post',

package/packages/main/src/main.vue

@@ -291,10 +291,7 @@ export default {
     //菜单展开关闭
     icons: Object,
     //logo
-    logo: {
-      type: String,
-      default: 'errorlogo'
-    },
+    logo: String,
     //菜单显示类型
     scene: {
       type: String,
@@ -674,8 +671,9 @@ export default {
   },
   created() {
     let params = util.getParams() || {};
-    this.homePage =
-      typeof this.loadHomePage === 'string' ? this.loadHomePage : '';
+    if (typeof this.loadHomePage === 'string') {
+      this.homePage = this.loadHomePage;
+    }
     this.isHeader = params.header;
     let sysLogoIco = sessionStorage.getItem('sysLogoIco');
     sysLogoIco && util.setFavicon(sysLogoIco);
@@ -794,11 +792,7 @@ export default {
             this.setTitle(ids[0]);
           }
         } else if (sessionStorage.getItem('jump') && this.isHistory) {
-          let ids = this.getId(
-            this.menus,
-            sessionStorage.getItem('jump'),
-            true
-          );
+          let ids = this.getId(this.menus, sessionStorage.getItem('jump'));
           if (ids) {
             this.defaultActive = ids;
             this.navIds = ids;
@@ -810,18 +804,14 @@ export default {
             hash = hash.split('?')[0];
           }
           if (hash !== '#/' && hash !== '#/main') {
-            let ids = this.getId(this.menus, util.win.location.hash, true);
+            let ids = this.getId(this.menus, util.win.location.hash);
             if (ids) {
               this.defaultActive = ids;
               this.navIds = ids;
               this.setTitle(ids[0]);
             }
           } else if (sessionStorage.getItem('jump') && this.isHistory) {
-            let ids = this.getId(
-              this.menus,
-              sessionStorage.getItem('jump'),
-              true
-            );
+            let ids = this.getId(this.menus, sessionStorage.getItem('jump'));
             if (ids) {
               this.defaultActive = ids;
               this.navIds = ids;
@@ -910,10 +900,10 @@ export default {
           }
           let jump = sessionStorage.getItem('jump');
           if (
-            !applicationid &&
-            (!jump || !this.isHistory) &&
-            hash === '#/' &&
-            hash === '#/main'
+            (!applicationid &&
+              (!jump || !this.isHistory) &&
+              (hash === '#/' || hash === '#/main')) ||
+            jump == results[i]
           ) {
             this.homePage =
               typeof this.loadHomePage === 'string'
@@ -1035,17 +1025,71 @@ export default {
           }
         });
     },
-    jumpMenu(res, flag, param) {
-      let option = { url: res, flag: flag, param: param };
+    /**
+     * @desc 跳转菜单
+     * @param {Object/String} [res]    - 菜单id（多个用,隔开）或url地址或系统菜单数据对象
+     * @param {Boolean} [isUrl] - res是否是url地址
+     * @param {Object} [param] - 拼接地址后的参数
+     */
+    jumpMenu(res, isUrl, path) {
+      let option = { url: res, isUrl: isUrl, path: path };
       if (util.isObject(res)) {
-        option = { ...option, ...res };
+        if (res.urlopenmode == 1) {
+          util.win.open(res.url);
+          return;
+        } else if (res.urlopenmode == 2) {
+          location.href = res.url;
+          return;
+        } else {
+          option = { ...option, ...res };
+        }
       }
       let ids;
       if (typeof option.url === 'string') {
-        if (option.flag) {
-          ids = this.getId(this.menus, option.url, true);
+        if (
+          option.isUrl ||
+          option.url.indexOf('.html') > -1 ||
+          option.url.indexOf('.dhtml') > -1 ||
+          option.url.indexOf('/#/') > -1 ||
+          option.url.indexOf('#/') > -1
+        ) {
+          option.isUrlc = true;
+          ids = this.getId(this.menus, option.url);
           if (!ids) {
-            this.$message.error('未在菜单栏中找到此地址');
+            if (
+              option.url.indexOf('.html') === -1 &&
+              option.url.indexOf('#/') === -1
+            ) {
+              this.method = 'iframe';
+              this.refresh = false;
+              this.page = option.url;
+            } else {
+              this.method = 'router';
+              const routes = this.$router.options.routes;
+              if (routes) {
+                let path = this.hasRouter(routes, option.url);
+                if (path) {
+                  let params = util.getParams({ url: option.url });
+                  this.$router.push({
+                    path: path,
+                    query: params
+                  });
+                } else {
+                  if (this.loadWujie === false || (this.downgrade && isIE)) {
+                    this.method = 'iframe';
+                    this.refresh = false;
+                    this.page = option.url;
+                  } else {
+                    this.method = 'wujie';
+                    this.wjName = 'application' + Date.now();
+                    this.page = this.host + option.url;
+                  }
+                }
+              }
+            }
+            this.$nextTick(() => {
+              this.refresh = true;
+            });
             return;
           }
         } else {
@@ -1056,17 +1100,22 @@ export default {
       }
       this.setDefault(this.menus, ids, option.param);
     },
-    getId(arry, res, path) {
-      if (!res) {
+    /**
+     * @desc 获取菜单层级id
+     * @param {Array} [menus]    - 系统菜单数据对象
+     * @param {String} [url] - 菜单id或url地址
+     */
+    getId(menus, url) {
+      if (!url) {
         return false;
       }
-      for (let i = 0; i < arry.length; i++) {
-        let item = arry[i];
+      for (let i = 0; i < menus.length; i++) {
+        let item = menus[i];
         if (
           Object.prototype.hasOwnProperty.call(item, 'children') &&
           item.children.length
         ) {
-          let id = this.getId(item.children, res, path);
+          let id = this.getId(item.children, url);
           if (id) {
             if (typeof id === 'string') {
               this.isTabs = false;
@@ -1082,7 +1131,7 @@ export default {
           Object.prototype.hasOwnProperty.call(item, 'fourthTabs') &&
           item.fourthTabs.length
         ) {
-          let id = this.getId(item.fourthTabs, res, path);
+          let id = this.getId(item.fourthTabs, url);
           if (id) {
             if (typeof id === 'string') {
               this.isTabs = true;
@@ -1094,12 +1143,12 @@ export default {
             }
             return id;
           }
-        } else if (item.id === res || item.url == res) {
+        } else if (item.id === url || item.url == url) {
           return item.id;
         } else {
-          if (path && item.url) {
+          if (item.url) {
             let url = new URL(item.url, window.location.origin);
-            if (url.hash == res) {
+            if (url.hash == url) {
               return item.id;
             }
           }
@@ -1117,54 +1166,6 @@ export default {
           if (res.rCode === 0) {
             if (res.results && res.results.length) {
               this.menus = JSON.parse(JSON.stringify(res.results));
-              let applicationid =
-                util.getParams('applicationid') ||
-                util.getParams('applicationId');
-              if (applicationid) {
-                let ids = this.getId(this.menus, applicationid);
-                if (ids) {
-                  this.defaultActive = ids;
-                }
-              } else if (sessionStorage.getItem('jump') && this.isHistory) {
-                let ids = this.getId(
-                  this.menus,
-                  sessionStorage.getItem('jump'),
-                  true
-                );
-                if (ids) {
-                  this.defaultActive = ids;
-                  this.navIds = ids;
-                  this.setTitle(ids[0]);
-                }
-              } else if (util.win.location.hash) {
-                let hash = util.win.location.hash;
-                if (hash) {
-                  hash = hash.split('?')[0];
-                }
-                if (hash !== '#/' && hash !== '#/main') {
-                  let ids = this.getId(
-                    this.menus,
-                    util.win.location.hash,
-                    true
-                  );
-                  if (ids) {
-                    this.defaultActive = ids;
-                    this.navIds = ids;
-                    this.setTitle(ids[0]);
-                  }
-                } else if (sessionStorage.getItem('jump') && this.isHistory) {
-                  let ids = this.getId(
-                    this.menus,
-                    sessionStorage.getItem('jump'),
-                    true
-                  );
-                  if (ids) {
-                    this.defaultActive = ids;
-                    this.navIds = ids;
-                    this.setTitle(ids[0]);
-                  }
-                }
-              }
               this.setTips(this.menus);
               store.set('nav', this.menus);
               this.setMenu(this.menus);
@@ -1184,6 +1185,34 @@ export default {
     },
     //设置默认左侧导航
     setMenu(res) {
+      let applicationid =
+        util.getParams('applicationid') || util.getParams('applicationId');
+      if (applicationid) {
+        let ids = this.getId(this.menus, applicationid);
+        if (ids) {
+          this.defaultActive = ids;
+        }
+      } else if (util.win.location.hash) {
+        let hash = util.win.location.hash;
+        if (hash) {
+          hash = hash.split('?')[0];
+        }
+        if (hash !== '#/' && hash !== '#/main') {
+          let ids = this.getId(this.menus, util.win.location.hash);
+          if (ids) {
+            this.defaultActive = ids;
+            this.navIds = ids;
+            this.setTitle(ids[0]);
+          }
+        }
+      } else if (sessionStorage.getItem('jump') && this.isHistory) {
+        let ids = this.getId(this.menus, sessionStorage.getItem('jump'));
+        if (ids) {
+          this.defaultActive = ids;
+          this.navIds = ids;
+          this.setTitle(ids[0]);
+        }
+      }
       if (this.defaultActive && this.defaultActive.length) {
         this.isDefault = false;
         this.setDefault(res, this.defaultActive);
@@ -1258,11 +1287,24 @@ export default {
             if (id && this.menu[0].id !== id) {
               this.active.push(id);
             } else {
-              this.handleJump(
-                this.menu[0].url,
-                this.menu[0].urlopenmode,
-                this.menu[0]
-              );
+              let hash = util.win.location.hash;
+              if (hash) {
+                hash = hash.split('?')[0];
+                if (hash !== '#/' && hash !== '#/main') {
+                  this.handleJump(hash);
+                  return;
+                }
+              }
+              let jump = sessionStorage.getItem('jump');
+              if (jump) {
+                this.handleJump(jump);
+              } else {
+                this.handleJump(
+                  this.menu[0].url,
+                  this.menu[0].urlopenmode,
+                  this.menu[0]
+                );
+              }
             }
           }
         }
@@ -1409,7 +1451,7 @@ export default {
             break;
           }
         }
-      } else {
+      } else if (active && active.length) {
         this.navs = [];
         this.subsystem = [];
         this.menu = res;
@@ -1504,12 +1546,12 @@ export default {
                 this.active = subNode.id;
                 this.navIds = [
                   node.id,
-                  ...this.getId(node.children, subNode.url, true)
+                  ...this.getId(node.children, subNode.url)
                 ];
               }
             }
           } else {
-            this.navIds = this.getId(this.menus, node.url, true);
+            this.navIds = this.getId(this.menus, node.url);
             this.setTitle(this.navIds[0]);
             this.tabsId = fourthTabs ? node.id : '';
           }
@@ -1529,7 +1571,7 @@ export default {
                 this.active = subNode.id;
                 this.navIds = [
                   node.id,
-                  ...this.getId(node.children, subNode.url, true)
+                  ...this.getId(node.children, subNode.url)
                 ];
               }
             }
@@ -1549,7 +1591,7 @@ export default {
             let subNode = this.getFirst(node);
             this.active = [node.id];
             if (subNode && node.id !== subNode.id) {
-              this.navIds = this.getId(this.menus, subNode.url, true);
+              this.navIds = this.getId(this.menus, subNode.url);
               this.$set(this.active, 1, subNode.id);
             }
           }
@@ -1573,7 +1615,7 @@ export default {
                   } else {
                     this.active = tab.id;
                   }
-                  this.navIds = this.getId(this.menus, tab.url, true);
+                  this.navIds = this.getId(this.menus, tab.url);
                 }
               } else {
                 let tab = (node.fourthTabs || []).filter((item) => {
@@ -1582,9 +1624,9 @@ export default {
                 if (tab) {
                   this.tabs = node.fourthTabs;
                   this.tabsId = tab.id;
-                  this.navIds = this.getId(this.menus, tab.url, true);
+                  this.navIds = this.getId(this.menus, tab.url);
                 } else {
-                  this.navIds = this.getId(this.menus, node.url, true);
+                  this.navIds = this.getId(this.menus, node.url);
                 }
               }
             } else {
@@ -1596,7 +1638,7 @@ export default {
                   this.tabs[0].urlopenmode,
                   this.tabs[0]
                 );
-                this.navIds = this.getId(this.menus, this.tabs[0].url, true);
+                this.navIds = this.getId(this.menus, this.tabs[0].url);
               }
             }
           } else {
@@ -1609,14 +1651,14 @@ export default {
                 } else {
                   this.active = subNode.id;
                 }
-                this.navIds = this.getId(this.menus, subNode.url, true);
+                this.navIds = this.getId(this.menus, subNode.url);
               }
             }
           }
           break;
         case 'tabs':
           this.tabsId = node.id;
-          this.navIds = this.getId(this.menus, node.url, true);
+          this.navIds = this.getId(this.menus, node.url);
           break;
       }
       if (node.url) {
@@ -1734,7 +1776,11 @@ export default {
         util.win.open(page);
       } else if (type == 2) {
         location.href = page;
-      } else if (type == 3) {
+      } else if (
+        type == 3 ||
+        this.loadWujie === false ||
+        (this.downgrade && isIE)
+      ) {
         this.method = 'iframe';
         this.refresh = false;
         this.page = util.handlerUrl(page, param);

package/packages/qr-code/src/main.vue

@@ -7,13 +7,13 @@
       ref="qrcodeImg"
       alt="二维码图片"
     />
-    <img
+    <!-- <img
       v-if="logo"
       class="es-qrcode-logo"
       ref="qrcodeLogo"
       :src="logo"
       alt="二维码logo"
-    />
+    /> -->
     <canvas
       :width="_width"
       :height="_height"
@@ -69,7 +69,7 @@ export default {
     return {};
   },
   watch: {
-    logo: function(val) {
+    logo: function (val) {
       this.$nextTick(() => {
         this.createQRCode();
       });
@@ -92,7 +92,7 @@ export default {
   methods: {
     createQRCode() {
       let qrcodeImg = this.$refs.qrcodeImg;
-      let qrcodeLogo = this.$refs.qrcodeLogo;
+      //let qrcodeLogo = this.$refs.qrcodeLogo;
       let canvas = this.$refs.canvas;
       let option = util.extend({}, this.option, {
         width: this._width,
@@ -110,6 +110,8 @@ export default {
             //获取图片
             ctx.drawImage(qrcodeImg, 0, 0, this._width, this._height);
             if (this.logo && this.logo.indexOf('.') > -1) {
+              let logo = new Image();
+              logo.src = this.logo;
               //设置logo大小
               let logoPosition = (this._width - 46) / 2; //logo相对于canvas居中定位
               //设置获取的logo将其变为圆角以及添加白色背景
@@ -127,7 +129,10 @@ export default {
 							ctx.arcTo(x, y, x + w, y, r);
 							ctx.closePath();
 							ctx.fill(); */
-              ctx.drawImage(qrcodeLogo, logoPosition, logoPosition, 46, 46);
+              logo.onload = () => {
+                ctx.drawImage(logo, logoPosition, logoPosition, 46, 46);
+                qrcodeImg.src = canvas.toDataURL();
+              };
             } else if (this.text) {
               //设置字体
               let fpadd = 10; //规定内间距