eoss-ui 0.5.61 → 0.5.63

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>
@@ -202,7 +205,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 +294,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
@@ -377,11 +380,21 @@ export default {
       type: String,
       default: '账号登录'
     },
+    param: {
+      type: Object,
+      default() {
+        return {};
+      }
+    },
     loginBackground: [String, Array],
     loginImage: [String, Array],
     loginLogo: String,
+    loginTitle: String,
     loginName: String,
-    type: String,
+    type: {
+      type: String,
+      default: '0'
+    },
     //是否加密传输
     isEncrypt: {
       type: Boolean,
@@ -554,6 +567,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%',
@@ -592,6 +612,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;
     },
@@ -602,22 +625,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: '账号登录' },
@@ -646,7 +660,7 @@ export default {
     },
     icons() {
       let icon = [];
-      const types = this.loginType.split(',');
+      const types = this.loginModel.split(',');
       types.forEach((item) => {
         icon.push(this.iconfonts[item]);
       });
@@ -668,7 +682,7 @@ export default {
     }
   },
   watch: {
-    loginType: {
+    loginModel: {
       immediate: true,
       handler(val) {
         this.active = val.split(',')[0];
@@ -719,8 +733,9 @@ export default {
       loginBackgroundImg: null,
       loginMainImg: null,
       loginNameImg: null,
+      loginTitleImg: null,
       loginLogoImg: null,
-      loginModel: null,
+      loginModel: this.type,
       passModifyModel: null,
       active: 0,
       submit: false,
@@ -936,7 +951,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');
@@ -975,8 +990,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;
@@ -994,7 +1012,9 @@ export default {
       document.title = res.subsystemName;
       this.app = res.appName || res.subsystemName;
       this.qrimg = res.qrimg || res.qrImg;
-      this.loginModel = res.loginModel;
+      if (res.loginModel) {
+        this.loginModel = res.loginModel;
+      }
       this.loginBackgroundImg = res.loginBackgroundUrl
         ? res.loginBackgroundUrl.split(',')
         : null;
@@ -1011,12 +1031,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;
         }
@@ -1151,6 +1174,7 @@ export default {
       this.$refs['login'].validate((valid) => {
         if (valid) {
           this.submit = true;
+          let param = util.getParams() || {};
           const data =
             this.active == '0'
               ? {
@@ -1186,12 +1210,16 @@ export default {
                 };
           if (this.onLogin) {
             if (this.active == '0') {
-              this.onLogin(data, this.getImgCode, this.handleRemember);
+              this.onLogin(
+                { ...param, ...data },
+                this.getImgCode,
+                this.handleRemember
+              );
             } else {
-              this.onLogin(data);
+              this.onLogin({ ...param, ...data });
             }
           } else {
-            this.handleUserLogin(data);
+            this.handleUserLogin({ ...param, ...this.param, ...data });
           }
         } else {
           this.submit = false;

package/packages/main/src/main.vue

@@ -237,6 +237,7 @@
       <slot name="user">
         <userinfo
           v-bind="$attrs"
+          :contents="userInfoContents"
           @change="handleUserModel"
           @reGetConfig="reGetConfig"
         >
@@ -649,6 +650,7 @@ export default {
       color: util.getStorage('theme') ? util.getStorage('theme') : this.theme,
       //显示用户信息
       showUserInfo: false,
+      userInfoContents: undefined,
       //是否展示侧边导航
       showMenu: true,
       props: {},
@@ -950,7 +952,13 @@ export default {
           this.color = unescape(results[i].themeColor).toLowerCase();
         }
         if (i === 'userStyle' && results[i].color) {
-          this.color = unescape(results[i].color).toLowerCase();
+          let color = unescape(results[i].color).toLowerCase();
+          if (util.startWith(color, '#')) {
+            this.color = color;
+          }
+        }
+        if (i === 'subsystemExtend' && results[i].userInfoContents) {
+          this.userInfoContents = results[i].userInfoContents;
         }
         if (i === 'subsystemExtend' && results[i].webPageWatermark) {
           try {
@@ -1676,13 +1684,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;
@@ -1985,9 +1993,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);
     },

package/packages/main/src/userinfo.vue

@@ -32,6 +32,117 @@ export default {
     secret: {
       type: Boolean,
       default: true
+    },
+    contents: {
+      type: Array,
+      default() {
+        return [
+          {
+            title: '用户信息',
+            contents: [
+              {
+                type: 'upload',
+                name: 'userHeadUrl',
+                label: '头像',
+                portrait: true,
+                code: 'USER_IMG',
+                col: 12,
+                weixinQrcode: true,
+                class: 'es-flex-none'
+              },
+              {
+                type: 'select',
+                name: 'job',
+                label: '切换职务',
+                valueType: 'object',
+                class: 'es-user-info-job',
+                row: true,
+                col: 12
+              },
+              {
+                name: 'orgName',
+                label: '所属机构',
+                type: 'text',
+                disabled: true,
+                col: 6
+              },
+              {
+                name: 'depName',
+                label: '所属部门',
+                type: 'text',
+                disabled: true,
+                col: 6
+              },
+              {
+                name: 'idCard',
+                label: '身份证号',
+                type: 'text',
+                disabled: true,
+                col: 6
+              },
+              {
+                name: 'outCode',
+                label: '工号',
+                type: 'text',
+                disabled: true,
+                col: 6
+              },
+              {
+                name: 'phone',
+                placeholder: '联系电话',
+                label: '联系电话',
+                type: 'text',
+                col: 6
+              },
+              {
+                name: 'email',
+                placeholder: '电子邮箱',
+                label: '电子邮箱',
+                type: 'text',
+                rules: {
+                  type: 'email',
+                  message: '请输入正确的邮箱地址',
+                  trigger: 'blur'
+                },
+                col: 6
+              },
+              {
+                name: 'officetel',
+                placeholder: '座机号',
+                label: '座机号',
+                type: 'text',
+                rules: {
+                  type: 'telephone'
+                  //message: '请输入正确的邮箱地址',
+                  //trigger: 'blur'
+                },
+                col: 6
+              },
+              {
+                name: 'oldpassword',
+                placeholder: '旧密码',
+                label: '旧密码',
+                type: 'text',
+                col: 6
+              },
+              {
+                name: 'password',
+                placeholder: '新密码',
+                label: '新密码',
+                type: 'text',
+                col: 6
+              },
+              {
+                name: 'repassword',
+                placeholder: '确认新密码',
+                label: '确认新密码',
+                type: 'text',
+                col: 6
+              }
+            ]
+          }
+        ];
+      }
     }
   },
   data() {
@@ -61,153 +172,56 @@ export default {
   },
   computed: {
     forms() {
-      let page = [
-        {
-          title: '用户信息',
-          contents: [
-            {
-              type: 'upload',
-              name: 'userHeadUrl',
-              label: '头像',
-              portrait: true,
-              code: 'USER_IMG',
-              ownId: store.get('userModel').personId,
-              onSuccess: this.handleUploadSuccess,
-              col: 12,
-              class: 'es-flex-none',
-              inline: this.qrcode
-                ? {
-                    range: false,
-                    class: 'weixinQrcode',
-                    type: 'image',
-                    url: this.qrcode,
-                    event: this.getQrcode
-                  }
-                : ''
-            },
-            // {
-            //   type: 'upload',
-            //   name: 'userQrcode',
-            //   // label: '微信二维码',
-            //   portrait: true,
-            //   code: 'USER_IMG',
-            //   ownId: 'ddd',
-            //   class: 'es-qrcode',
-            //   col: 12
-            // },
-            {
-              type: 'select',
-              name: 'job',
-              label: '切换职务',
-              valueType: 'object',
-              data: store.get('userModel').identityList,
-              class: 'es-user-info-job',
-              row: true,
-              col: 12
-            },
-            {
-              name: 'orgName',
-              label: '所属机构',
-              type: 'text',
-              disabled: true,
-              col: 6
-            },
-            {
-              name: 'depName',
-              label: '所属部门',
-              type: 'text',
-              disabled: true,
-              col: 6
-            },
-            {
-              name: 'idCard',
-              label: '身份证号',
-              type: 'text',
-              disabled: true,
-              row: true,
-              col: 12
-            },
-            {
-              name: 'phone',
-              placeholder: '联系电话',
-              label: '联系电话',
-              type: 'text',
-              col: 6
-            },
-            {
-              name: 'email',
-              placeholder: '电子邮箱',
-              label: '电子邮箱',
-              type: 'text',
-              rules: {
-                type: 'email',
-                message: '请输入正确的邮箱地址',
+      let page = JSON.parse(JSON.stringify(this.contents));
+      for (let i = 0; i < page.length; i++) {
+        for (let x = 0; x < page[i].contents.length; x++) {
+          let item = page[i].contents[x];
+          if (item.name == 'userHeadUrl') {
+            page[i].contents[x].ownId = store.get('userModel').personId;
+            page[i].contents[x].onSuccess = this.handleUploadSuccess;
+            if (item.weixinQrcode && this.qrcode) {
+              page[i].contents[x].inline = {
+                range: false,
+                class: 'weixinQrcode',
+                type: 'image',
+                url: this.qrcode,
+                event: this.getQrcode
+              };
+            }
+          }
+          if (item.name == 'job') {
+            page[i].contents[x].data = store.get('userModel').identityList;
+          }
+          if (item.name == 'oldpassword') {
+            page[i].contents[x].rules = {
+              required: true,
+              message: '请输入旧密码'
+            };
+          }
+          if (item.name == 'password' && this.checkPassword) {
+            page[i].contents[x].rules = {
+              pattern: this.checkPassword,
+              message: this.checkPasswordMsg
+                ? this.checkPasswordMsg
+                : '密码格式不合法',
+              trigger: 'blur'
+            };
+          }
+          if (item.name == 'repassword') {
+            let rules = [{ validator: this.repassword, trigger: 'blur' }];
+            if (this.checkPassword) {
+              rules.push({
+                pattern: this.checkPassword,
+                message: this.checkPasswordMsg
+                  ? this.checkPasswordMsg
+                  : '密码格式不合法',
                 trigger: 'blur'
-              },
-              col: 6
-            },
-            {
-              name: 'officetel',
-              placeholder: '座机号',
-              label: '座机号',
-              type: 'text',
-              rules: {
-                type: 'telephone'
-                //message: '请输入正确的邮箱地址',
-                //trigger: 'blur'
-              },
-              col: 6
-            },
-            {
-              name: 'oldpassword',
-              placeholder: '旧密码',
-              label: '旧密码',
-              rules: this.values.password
-                ? { required: true, message: '请输入旧密码' }
-                : {},
-              type: 'text',
-              col: 6
-            },
-            {
-              name: 'password',
-              placeholder: '新密码',
-              label: '新密码',
-              type: 'text',
-              rules: [
-                this.checkPassword
-                  ? {
-                      pattern: this.checkPassword,
-                      message: this.checkPasswordMsg
-                        ? this.checkPasswordMsg
-                        : '密码格式不合法',
-                      trigger: 'blur'
-                    }
-                  : {}
-              ],
-              col: 6
-            },
-            {
-              name: 'repassword',
-              placeholder: '确认新密码',
-              label: '确认新密码',
-              type: 'text',
-              rules: [
-                this.checkPassword
-                  ? {
-                      pattern: this.checkPassword,
-                      message: this.checkPasswordMsg
-                        ? this.checkPasswordMsg
-                        : '密码格式不合法',
-                      trigger: 'blur'
-                    }
-                  : {},
-                { validator: this.repassword, trigger: 'blur' }
-              ],
-              col: 6
+              });
             }
-          ]
+            page[i].contents[x].rules = rules;
+          }
         }
-      ];
+      }
       if (this.showNotify) {
         page.push({
           title: '接收消息类型',
@@ -270,12 +284,13 @@ export default {
               this.checkPasswordMsg = results.checkPasswordMsg;
             }
             this.results = results.simpleUserInfo;
-            this.values.orgName = results.simpleUserInfo.orgName;
-            this.values.depName = results.simpleUserInfo.depName;
-            this.values.idCard = results.simpleUserInfo.idCard;
-            this.values.phone = results.simpleUserInfo.phone;
-            this.values.email = results.simpleUserInfo.email;
-            this.values.officeTel = results.simpleUserInfo.officeTel;
+            this.values = { ...this.values, ...results.simpleUserInfo };
+            // this.values.orgName = results.simpleUserInfo.orgName;
+            // this.values.depName = results.simpleUserInfo.depName;
+            // this.values.idCard = results.simpleUserInfo.idCard;
+            // this.values.phone = results.simpleUserInfo.phone;
+            // this.values.email = results.simpleUserInfo.email;
+            // this.values.officeTel = results.simpleUserInfo.officeTel;
             if (results.userScanBindImgUrl) {
               this.userScanBindImgUrl = results.userScanBindImgUrl;
               this.qrcode =

package/packages/menu/src/main.vue

@@ -239,7 +239,7 @@ export default {
             item.icons
               ? this.unicode(item.icons)
                 ? item.icons
-                : 'es-icons iconfont'
+                : 'es-icon iconfont'
               : 'es-icon-application',
             'es-menu-item-icon'
           ],
@@ -411,7 +411,7 @@ export default {
               item.icons
                 ? this.unicode(item.icons)
                   ? item.icons
-                  : 'es-icons iconfont'
+                  : 'es-icon iconfont'
                 : 'es-icon-application',
               'es-menu-item-icon'
             ],

package/packages/selector/src/main.vue

@@ -210,7 +210,6 @@
 import util from 'eoss-ui/src/utils/util.js';
 import { getSelectorOrgDetail } from 'eoss-ui/src/config/api.js';
 import Clickoutside from 'eoss-element/src/utils/clickoutside';
-import { debounce } from 'eoss-element/src/utils/util';
 export default {
   name: 'EsSelector',
   inheritAttrs: false,