eoss-ui 0.5.63 → 0.5.64

package/lib/theme-chalk/qr-code.css

@@ -1 +1 @@
-.es-qrcode-box{position:relative;border-radius:10px;overflow:hidden;-webkit-box-sizing:border-box;box-sizing:border-box;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-qrcode-box .es-qrcode-img,.es-qrcode-box .ese-qrcode-logo{display:none}.es-qrcode-box .es-qrcode-img{border-radius:4px;-webkit-box-sizing:border-box;box-sizing:border-box}
+.es-qrcode-box{position:relative;border-radius:10px;overflow:hidden;-webkit-box-sizing:border-box;box-sizing:border-box;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.es-qrcode-box .es-qrcode-img,.es-qrcode-box .es-qrcode-logo{display:none}.es-qrcode-box .es-qrcode-img{border-radius:4px;-webkit-box-sizing:border-box;box-sizing:border-box}

package/lib/tips.js

@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;

package/lib/tree-group.js

@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;

package/lib/tree.js

@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;

package/lib/upload.js

@@ -2200,7 +2200,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2890,7 +2890,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;

package/lib/utils/util.js

@@ -2118,7 +2118,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2808,7 +2808,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;

package/lib/wujie.js

@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;

package/lib/wxlogin.js

@@ -2201,7 +2201,7 @@ var isLogined = function isLogined(_ref8) {
           });
         }
       }).catch(function (e) {});
-    } else if (token || to.path === '/' || to.path === '/404' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
+    } else if (token || to.path === '/' || to.path === '/404' || to.path === '/error' || typeof exclude === 'boolean' && exclude || exclude.indexOf(to.path) > -1 || exclude.indexOf(to.name) > -1 || to.path === '/login' || token && to.path === '/main') {
       if (redirect && (to.path === '/main' || to.path === '/login')) {
         window.location.replace(urlJoinParams({ url: '.' + to.path + '.html', param: to.query }));
       } else {
@@ -2891,7 +2891,9 @@ var toFunction = function toFunction(str) {
  * @param {string} [$color] - 颜色值
  **/
 var updateTheme = function updateTheme(color, send) {
-  color = color && startWith(color, '#') ? color : '#409eff';
+  if (!color) {
+    return false;
+  }
 
   if (send === undefined) {
     send = true;

package/package.json

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

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">
@@ -1011,7 +1012,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;
       }

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,
@@ -1734,7 +1731,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; //规定内间距