eoss-ui 0.5.62 → 0.5.64

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/handler/src/main.vue

@@ -61,7 +61,7 @@
                 :value="typeof ele.tips !== 'boolean' ? ele.tips : 0"
                 ><i
                   :class="[
-                    unicode(ele.icons) ? ele.icons : 'es-icons',
+                    unicode(ele.icons) ? ele.icons : 'es-icon',
                     'es-sub-system-icon',
                     { 'es-icon-yingyong': !ele.icons }
                   ]"

package/packages/label/src/main.vue

@@ -167,7 +167,7 @@ export default {
                 {
                   class: [
                     'es-label-icon',
-                    'es-icons',
+                    'es-icon',
                     this.events && this.events['icon'] ? 'es-pointer' : ''
                   ],
                   on: {
@@ -306,7 +306,7 @@ export default {
                     {
                       class: [
                         'es-label-icon',
-                        'es-icons',
+                        'es-icon',
                         this.events && this.events['icon'] ? 'es-pointer' : ''
                       ],
                       on: {

package/packages/login/src/main.vue

@@ -24,6 +24,9 @@
           'background-image': getImgUrl(loginImageUrl)
         }"
       >
+        <div v-if="loginTitleUrl" class="es-login-title-image">
+          <img class="es-login-title-img" :src="loginTitleUrl" />
+        </div>
         <div
           v-if="switchs > 1"
           :class="{
@@ -47,7 +50,7 @@
         <div class="es-login-form-box">
           <template v-if="isShow(active) && (active == 0 || active == 12)">
             <el-form ref="login" class="es-login-form" :model="formData">
-              <div class="es-login-title">
+              <div class="es-login-title" v-if="!loginTitleUrl">
                 <span class="es-login-title-content">{{ title }}</span>
               </div>
               <el-form-item
@@ -155,7 +158,7 @@
             v-if="isShow(active) && (active == 3 || active == 7 || active == 9)"
           >
             <div class="es-login-qrcode">
-              <div class="es-login-title">
+              <div class="es-login-title" v-if="!loginTitleUrl">
                 <div class="es-login-title-content">
                   {{ iconfonts[active].name }}
                 </div>
@@ -183,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">
@@ -202,7 +206,7 @@
               class="es-login-form es-login-verify"
               :model="formData"
             >
-              <div class="es-login-title">
+              <div class="es-login-title" v-if="!loginTitleUrl">
                 <span class="es-login-title-content">{{
                   iconfonts[active].name
                 }}</span>
@@ -291,12 +295,12 @@
       <span class="es-login-icp-item" :style="_copyrightStyle">{{
         icpInfo.copyright_unit
       }}</span>
-      <span
+      <a
         class="es-login-icp-item"
         target="_blank"
         :style="_copyrightStyle"
         :href="icpInfo.copyright_icp_url"
-        >{{ icpInfo.copyright_icp }}</span
+        >{{ icpInfo.copyright_icp }}</a
       >
     </div>
     <es-dialog
@@ -386,8 +390,12 @@ export default {
     loginBackground: [String, Array],
     loginImage: [String, Array],
     loginLogo: String,
+    loginTitle: String,
     loginName: String,
-    type: String,
+    type: {
+      type: String,
+      default: '0'
+    },
     //是否加密传输
     isEncrypt: {
       type: Boolean,
@@ -560,6 +568,13 @@ export default {
   },
   computed: {
     transform() {
+      if (this.align.indexOf('%') > -1) {
+        return {
+          left: this.align,
+          top: '50%',
+          transform: 'translateY(-51%)'
+        };
+      }
       if (this.align === 'left') {
         return {
           left: '30%',
@@ -598,6 +613,9 @@ export default {
     loginNameUrl() {
       return this.loginNameImg ? this.loginNameImg : this.loginName;
     },
+    loginTitleUrl() {
+      return this.loginTitleImg ? this.loginTitleImg : this.loginTitle;
+    },
     loginLogoUrl() {
       return this.loginLogoImg ? this.loginLogoImg : this.loginLogo;
     },
@@ -608,22 +626,13 @@ export default {
         ? this.warning
         : '本系统为非涉密系统，禁止上传和处理任何涉密文件';
     },
-    loginType() {
-      if (this.type) {
-        return this.type;
-      }
-      if (this.loginModel) {
-        return this.loginModel;
-      }
-      return '0';
-    },
     switchs() {
-      return Array.isArray(this.loginType)
-        ? this.loginType.length
-        : this.loginType.split(',').length;
+      return Array.isArray(this.loginModel)
+        ? this.loginModel.length
+        : this.loginModel.split(',').length;
     },
     iconfonts() {
-      const types = this.loginType.split(',');
+      const types = this.loginModel.split(',');
       return types.length > 2
         ? {
             0: { type: '0', icon: 'es-icon-shuru', name: '账号登录' },
@@ -652,7 +661,7 @@ export default {
     },
     icons() {
       let icon = [];
-      const types = this.loginType.split(',');
+      const types = this.loginModel.split(',');
       types.forEach((item) => {
         icon.push(this.iconfonts[item]);
       });
@@ -674,7 +683,7 @@ export default {
     }
   },
   watch: {
-    loginType: {
+    loginModel: {
       immediate: true,
       handler(val) {
         this.active = val.split(',')[0];
@@ -725,8 +734,9 @@ export default {
       loginBackgroundImg: null,
       loginMainImg: null,
       loginNameImg: null,
+      loginTitleImg: null,
       loginLogoImg: null,
-      loginModel: null,
+      loginModel: this.type,
       passModifyModel: null,
       active: 0,
       submit: false,
@@ -942,7 +952,7 @@ export default {
       this.$emit('change-type', res, this.identifyingId);
     },
     isShow(res) {
-      return this.loginType.indexOf(res) > -1;
+      return this.loginModel.indexOf(res) > -1;
     },
     getLogin() {
       const config = util.getStorage('initLogin');
@@ -981,8 +991,11 @@ export default {
       if (res.androidDownloadUrl) {
         downloads['android'] = res.androidDownloadUrl;
       }
-      if (res.iosDownloadUrl || res.iosDownloadUrl2) {
-        downloads['ios'] = res.iosDownloadUrl || res.iosDownloadUrl2;
+      if (res.iosDownloadUrl) {
+        downloads['ios'] = res.iosDownloadUrl;
+      }
+      if (res.iosDownloadUrl2) {
+        downloads['pad'] = res.iosDownloadUrl2;
       }
       if (res.macDownloadUrl) {
         downloads['mac'] = res.macDownloadUrl;
@@ -999,8 +1012,12 @@ export default {
       this.downloadSetup = res.downloadSetup;
       document.title = res.subsystemName;
       this.app = res.appName || res.subsystemName;
-      this.qrimg = res.qrimg || res.qrImg;
-      this.loginModel = res.loginModel;
+      if (res.qrimg || res.qrImg) {
+        this.qrimg = res.qrimg || res.qrImg;
+      }
+      if (res.loginModel) {
+        this.loginModel = res.loginModel;
+      }
       this.loginBackgroundImg = res.loginBackgroundUrl
         ? res.loginBackgroundUrl.split(',')
         : null;
@@ -1017,12 +1034,15 @@ export default {
         if (res.subsystemExtend.applicationName) {
           localStorage.setItem('appcode', res.subsystemExtend.applicationName);
         }
-        this.loginMainImg = res.subsystemExtend.loginBoxBackground
-          ? res.subsystemExtend.loginBoxBackground.split(',')
-          : null;
-        this.loginNameImg = res.subsystemExtend.loginBoxName
-          ? res.subsystemExtend.loginBoxName.split(',')
-          : null;
+        if (res.subsystemExtend.loginBoxBackgroun) {
+          this.loginMainImg = res.subsystemExtend.loginBoxBackground.split(',');
+        }
+        if (res.subsystemExtend.loginBoxTitle) {
+          this.loginTitleImg = res.subsystemExtend.loginBoxTitle;
+        }
+        if (res.subsystemExtend.loginBoxName) {
+          this.loginNameImg = res.subsystemExtend.loginBoxName;
+        }
         if (res.subsystemExtend.loginBoxAlign && this.useResults) {
           this.align = res.subsystemExtend.loginBoxAlign;
         }

package/packages/main/src/main.vue

@@ -237,6 +237,7 @@
       <slot name="user">
         <userinfo
           v-bind="$attrs"
+          :contents="userInfoContents"
           @change="handleUserModel"
           @reGetConfig="reGetConfig"
         >
@@ -290,10 +291,7 @@ export default {
     //菜单展开关闭
     icons: Object,
     //logo
-    logo: {
-      type: String,
-      default: 'errorlogo'
-    },
+    logo: String,
     //菜单显示类型
     scene: {
       type: String,
@@ -649,6 +647,7 @@ export default {
       color: util.getStorage('theme') ? util.getStorage('theme') : this.theme,
       //显示用户信息
       showUserInfo: false,
+      userInfoContents: undefined,
       //是否展示侧边导航
       showMenu: true,
       props: {},
@@ -955,6 +954,9 @@ export default {
             this.color = color;
           }
         }
+        if (i === 'subsystemExtend' && results[i].userInfoContents) {
+          this.userInfoContents = results[i].userInfoContents;
+        }
         if (i === 'subsystemExtend' && results[i].webPageWatermark) {
           try {
             util.win.top.webPageWatermark = results[i].webPageWatermark;
@@ -1679,13 +1681,13 @@ export default {
         case 'user':
           this.showUserInfo = true;
           break;
-        case 'online':
-          this.dialog = {
-            title: '查看在线人员',
-            show: true,
-            url: '/main/sysuseronline/list.dhtml'
-          };
-          break;
+        // case 'online':
+        //   this.dialog = {
+        //     title: '查看在线人员',
+        //     show: true,
+        //     url: '/main/sysuseronline/list.dhtml'
+        //   };
+        //   break;
         case 'notice':
           this.showMsg = !this.showMsg;
           break;
@@ -1729,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);
@@ -1988,9 +1994,9 @@ export default {
         clearTimeout(this.sysMsgOut);
       }
     },
-    handleDialog(obj) {
-      this.dialog = obj;
-    },
+    // handleDialog(obj) {
+    //   this.dialog = obj;
+    // },
     handleUserModel(name, val) {
       this.$set(this.userModel, name, val);
     },