eoss-ui 0.4.17 → 0.4.19

package/packages/login/src/main.vue

@@ -301,6 +301,7 @@
       :visible.sync="showDownLoadApp"
       ><es-clients v-bind="download"></es-clients>
     </es-dialog>
+    <slot name="calogin"></slot>
   </div>
 </template>
 <script>
@@ -315,7 +316,8 @@ import {
   doQrLogin,
   getLoginCode,
   doCodeLogin,
-  doWechatQrLogin
+  doWechatQrLogin,
+  doCaLogin
 } from 'eoss-ui/src/config/api.js';
 export default {
   name: 'EsLogin',
@@ -408,6 +410,11 @@ export default {
       type: String,
       default: doUserLogin
     },
+    //ca登录地址
+    caAction: {
+      type: String,
+      default: doCaLogin
+    },
     //扫码登录接口地址
     scanAction: {
       type: String,
@@ -549,22 +556,22 @@ export default {
       const types = this.loginType.split(',');
       return types.length > 2
         ? {
-            '0': { type: '0', icon: 'es-icon-shuru', name: '账号登录' },
-            '1': { type: '1', icon: 'es-icon-usb-key', name: '证书登录' },
-            '3': { type: '3', icon: 'es-icon-saoma', name: '扫码登录' },
-            '6': { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
-            '7': { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
-            '9': { type: '9', icon: 'es-icon-weixin', name: '微信扫码登录' },
-            '11': { type: '11', icon: 'es-icon-youxiang', name: '邮箱登录' }
+            0: { type: '0', icon: 'es-icon-shuru', name: '账号登录' },
+            1: { type: '1', icon: 'es-icon-usb-key', name: '证书登录' },
+            3: { type: '3', icon: 'es-icon-saoma', name: '扫码登录' },
+            6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
+            7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
+            9: { type: '9', icon: 'es-icon-weixin', name: '微信扫码登录' },
+            11: { type: '11', icon: 'es-icon-youxiang', name: '邮箱登录' }
           }
         : {
-            '0': { type: '0', icon: 'es-icon-jianpan', name: '账号登录' },
-            '1': { type: '1', icon: 'es-icon-ca', name: '证书登录' },
-            '3': { type: '3', icon: 'es-icon-qrcode', name: '扫码登录' },
-            '6': { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
-            '7': { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
-            '9': { type: '9', icon: 'es-icon-weixin', name: '微信扫码登录' },
-            '11': {
+            0: { type: '0', icon: 'es-icon-jianpan', name: '账号登录' },
+            1: { type: '1', icon: 'es-icon-ca', name: '证书登录' },
+            3: { type: '3', icon: 'es-icon-qrcode', name: '扫码登录' },
+            6: { type: '6', icon: 'es-icon-duanxin', name: '短信登录' },
+            7: { type: '7', icon: 'es-icon-dingding', name: '钉钉扫码登录' },
+            9: { type: '9', icon: 'es-icon-weixin', name: '微信扫码登录' },
+            11: {
               type: '11',
               icon: 'es-icon-wodeyouxiang',
               name: '邮箱登录'
@@ -574,7 +581,7 @@ export default {
     icons() {
       let icon = [];
       const types = this.loginType.split(',');
-      types.forEach(item => {
+      types.forEach((item) => {
         icon.push(this.iconfonts[item]);
       });
       return icon;
@@ -688,7 +695,7 @@ export default {
           url: this.doWechatQrLogin,
           data: { code: code }
         })
-        .then(res => {
+        .then((res) => {
           if (res.rCode == 0) {
             const results = res.results;
             this.handleResults(results);
@@ -708,7 +715,7 @@ export default {
             });
           }
         })
-        .catch(err => {
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -721,7 +728,7 @@ export default {
       }
       if (Array.isArray(urls)) {
         url = urls
-          .map(item => {
+          .map((item) => {
             return `url(${item})`;
           })
           .join(',');
@@ -804,9 +811,11 @@ export default {
     switchLogin(res) {
       //this.$refs.login && this.$refs.login.resetFields();
       this.$refs.login && this.$refs.login.clearValidate();
-
-      this.active = res;
-      this.formData = JSON.parse(JSON.stringify(this.defaultModel));
+      if (res != 1) {
+        this.active = res;
+        this.formData = JSON.parse(JSON.stringify(this.defaultModel));
+      }
+      this.$emit('change-type', res, this.identifyingId);
     },
     isShow(res) {
       return this.loginType.indexOf(res) > -1;
@@ -818,7 +827,7 @@ export default {
       } else {
         util
           .ajax({ url: this.initLogin })
-          .then(res => {
+          .then((res) => {
             if (res && res.rCode === 0) {
               store.set('initLogin', res.results);
               util.setStorage({
@@ -835,7 +844,7 @@ export default {
               });
             }
           })
-          .catch(err => {
+          .catch((err) => {
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
             }
@@ -915,7 +924,7 @@ export default {
         return false;
       } else {
         let flag = false;
-        this.$refs.login.validateField('target', res => {
+        this.$refs.login.validateField('target', (res) => {
           flag = res != '';
         });
         if (flag) {
@@ -942,7 +951,7 @@ export default {
             url: this.getLoginCode,
             data: data
           })
-          .then(res => {
+          .then((res) => {
             this.$message({
               message: res.msg,
               duration: 2000,
@@ -952,7 +961,7 @@ export default {
             //   clearInterval(this.timer);
             // }
           })
-          .catch(err => {
+          .catch((err) => {
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
             }
@@ -963,7 +972,7 @@ export default {
       if (this.submit) {
         return false;
       }
-      this.$refs['login'].validate(valid => {
+      this.$refs['login'].validate((valid) => {
         if (valid) {
           this.submit = true;
           const data =
@@ -1020,7 +1029,7 @@ export default {
             ? { ...data, extUserBindHandleId: extUserBindHandleId }
             : data
         })
-        .then(res => {
+        .then((res) => {
           this.submit = false;
           if (res.rCode == 0) {
             sessionStorage.removeItem('extUserBindHandleId');
@@ -1044,7 +1053,43 @@ export default {
             this.onError(res);
           }
         })
-        .catch(err => {
+        .catch((err) => {
+          this.submit = false;
+          if (err.message && err.message !== 'canceled') {
+            this.$message.error(err.message);
+          }
+        });
+    },
+    caLogin(signedData) {
+      util
+        .ajax({
+          method: 'post',
+          url: this.caAction,
+          data: { identifyingId: this.identifyingId, signedData: signedData }
+        })
+        .then((res) => {
+          this.submit = false;
+          if (res.rCode == 0) {
+            const results = res.results;
+            this.handleResults(results);
+            if (this.onSuccess) {
+              this.onSuccess(res);
+            }
+          } else {
+            const msg =
+              res.results && res.results.msg ? res.results.msg : res.msg;
+            this.$message({
+              message: msg || '系统错误，请联系管理员！',
+              type: 'error',
+              duration: 1500,
+              onClose: () => {
+                this.getImgCode();
+              }
+            });
+            this.onError(res);
+          }
+        })
+        .catch((err) => {
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -1079,13 +1124,13 @@ export default {
             identifyingId: this.identifyingId
           }
         })
-        .then(res => {
+        .then((res) => {
           if (res.rCode === 0) {
             const results = res.results;
             this.handleResults(results, 3);
           }
         })
-        .catch(err => {
+        .catch((err) => {
           clearInterval(this.interval);
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -1145,7 +1190,7 @@ export default {
                 this.showResetPassword = true;
               }
             })
-            .catch(e => {});
+            .catch((e) => {});
           break;
         case 3:
           let url =
@@ -1185,7 +1230,7 @@ export default {
                 location.reload();
               }
             })
-            .catch(e => {});
+            .catch((e) => {});
           break;
         default:
           if (type !== 3) {

package/packages/main/src/main.vue

@@ -215,9 +215,7 @@ export default {
     //host
     host: {
       type: String,
-      default() {
-        return util.getStorage('host') ? util.getStorage('host') : '';
-      }
+      default: ''
     },
     header: {
       type: Boolean,
@@ -515,6 +513,8 @@ export default {
     if (this.socket) {
       this.initWebSocket();
     }
+    let sysLogoIco = sessionStorage.getItem('sysLogoIco');
+    sysLogoIco && util.setFavicon(sysLogoIco);
   },
   mounted() {
     util.win.reLogin = this.handleReLogin;
@@ -645,6 +645,7 @@ export default {
           sessionStorage.setItem('useCaseCodes', results[i]);
         }
         if (i === 'sysLogoIco' && results[i]) {
+          sessionStorage.setItem('sysLogoIco', results[i]);
           util.setFavicon(results[i]);
         }
         if (i === 'userStyle' && results[i].color) {
@@ -1214,7 +1215,6 @@ export default {
     },
     //跳转页面
     handleJump(page, type, res) {
-      console.log(page);
       if (util.win.location.hash === page) {
         this.refresh = true;
         return;
@@ -1232,7 +1232,7 @@ export default {
         if (urls[0].indexOf('.js') > 1) {
           this.method = 'wujie';
           this.wjName = 'singlespa';
-          this.page = page;
+          this.page = this.host + page;
           this.$nextTick(() => {
             this.refresh = true;
           });
@@ -1284,7 +1284,7 @@ export default {
                 } else {
                   this.method = 'wujie';
                   this.wjName = res.appCode ? res.appCode : 'application';
-                  this.page = page;
+                  this.page = this.host + page;
                   this.$nextTick(() => {
                     this.refresh = true;
                   });

package/packages/select/src/main.vue

@@ -36,7 +36,7 @@ export default {
     valueType: {
       type: String,
       default: 'string',
-      validator: function(value) {
+      validator: function (value) {
         return ['string', 'object'].includes(value);
       }
     },
@@ -153,10 +153,10 @@ export default {
       if (this.filtrate) {
         if (Array.isArray(this.filtrate) && this.filtrate.length) {
           let ary = [];
-          this.filtrate.forEach(items => {
+          this.filtrate.forEach((items) => {
             let val = typeof items === 'string' ? items : items[this.valKey];
             ary.concat(
-              this.data.filter(item => {
+              this.data.filter((item) => {
                 return item[this.filtrateKey] == val;
               })
             );
@@ -166,7 +166,7 @@ export default {
             typeof this.filtrate === 'string'
               ? this.filtrate
               : this.filtrate[this.valKey];
-          return this.data.filter(item => {
+          return this.data.filter((item) => {
             return item[this.filtrateKey] == val;
           });
         }
@@ -225,7 +225,7 @@ export default {
       let filte =
         filtrate && util.isObject(filtrate) ? filtrate[this.valKey] : filtrate;
       let eles = [];
-      data.forEach(item => {
+      data.forEach((item) => {
         if (this.models === undefined && item.selected) {
           this.$emit(
             'input',
@@ -288,7 +288,7 @@ export default {
       });
       return eles;
     },
-    getData(sysCode, param) {
+    getData(sysCode, param, reload) {
       if (
         !this.ajax ||
         (!this.isNoParamRequest && Object.keys(this.param).length == 0)
@@ -296,7 +296,7 @@ export default {
         return false;
       }
       let params = {};
-      if (this.results.length === 0) {
+      if (this.results.length === 0 || reload) {
         params = util.extend(
           {},
           this.param,
@@ -317,7 +317,7 @@ export default {
           params: params,
           data: params
         })
-        .then(res => {
+        .then((res) => {
           this.loading = false;
           if (res.rCode === 0) {
             if (this.parseData) {
@@ -330,7 +330,7 @@ export default {
             }
           }
         })
-        .catch(err => {
+        .catch((err) => {
           this.loading = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
@@ -351,10 +351,10 @@ export default {
               params: params,
               data: params
             })
-            .then(res => {
+            .then((res) => {
               this.loading = false;
               if (res.rCode === 0) {
-                this.options = res.results.filter(item => {
+                this.options = res.results.filter((item) => {
                   if (item[this.label]) {
                     return (
                       item[this.label]
@@ -369,7 +369,7 @@ export default {
                 });
               }
             })
-            .catch(err => {
+            .catch((err) => {
               this.loading = false;
               if (err.message && err.message !== 'canceled') {
                 this.$message.error(err.message);
@@ -423,7 +423,7 @@ export default {
                 ? { innerHTML: this.$attrs[type].icon }
                 : {},
               on: {
-                click: e => {
+                click: (e) => {
                   this.$attrs[type].click &&
                     this.$attrs[type].click(this, this.model);
                   this.$attrs[type].event &&
@@ -473,7 +473,7 @@ export default {
       return '';
     },
     reload(param) {
-      this.getData(null, param);
+      this.getData(null, param, true);
     },
     handleExpand(data, node) {
       if (this.onExpand) {
@@ -502,11 +502,11 @@ export default {
         }
         if (this.onLoadsub) {
           this.onLoadsub({ data, params, node })
-            .then(res => {
+            .then((res) => {
               this.loading = false;
               this.$set(data, 'children', JSON.parse(JSON.stringify(res)));
             })
-            .catch(e => {
+            .catch((e) => {
               this.loading = false;
             });
         } else {
@@ -517,7 +517,7 @@ export default {
               data: params,
               params: params
             })
-            .then(res => {
+            .then((res) => {
               if (res.rCode === 0) {
                 this.loading = false;
                 let results = JSON.parse(JSON.stringify(res.results));
@@ -534,7 +534,7 @@ export default {
                 }
               }
             })
-            .catch(err => {
+            .catch((err) => {
               this.loading = false;
               if (err.message && err.message !== 'canceled') {
                 this.$message.error(err.message);
@@ -552,7 +552,7 @@ export default {
       if (this.readonly) {
         let dom = [];
         if (Array.isArray(this.models)) {
-          dom = this.models.map(item => {
+          dom = this.models.map((item) => {
             if (util.isObject(item)) {
               if (!item[this.label] && !item.label) {
                 return this.getLabel(value[this.valKey], data);
@@ -588,7 +588,7 @@ export default {
       let cls = [];
       if (this.results.length && !this.tree) {
         if (this.filtrate && Array.isArray(this.filtrate)) {
-          doms = this.filtrate.map(item => {
+          doms = this.filtrate.map((item) => {
             return h(
               'el-option-group',
               {

package/packages/selector/src/main.vue

@@ -91,7 +91,7 @@
                 ref="openDialog"
                 v-if="filterable && showButton"
                 @click.stop="openDialog"
-                >选择</el-button
+                ><slot>选择</slot></el-button
               >
             </template>
           </el-input>
@@ -130,7 +130,7 @@
               ref="openDialog"
               v-if="filterable && showButton"
               @click.stop="openDialog"
-              >选择</el-button
+              ><slot>选择</slot></el-button
             >
           </template>
         </el-input>
@@ -249,7 +249,7 @@ export default {
     valueType: {
       type: String,
       default: 'object',
-      validator: function(value) {
+      validator: function (value) {
         return ['string', 'object'].includes(value);
       }
     },
@@ -350,7 +350,7 @@ export default {
             return this.selected[this.labelKey];
           } else if (Array.isArray(this.selected)) {
             return this.selected
-              .map(item => {
+              .map((item) => {
                 return typeof item === 'string' ? item : item[this.labelKey];
               })
               .join(',');
@@ -442,11 +442,11 @@ export default {
             url: this.action,
             params: params
           })
-          .then(res => {
+          .then((res) => {
             if (res.rCode === 0) {
               this.options = res.results;
               if (this.selected.length && this.multiple) {
-                this.selected.forEach(item => {
+                this.selected.forEach((item) => {
                   let i = util.indexOfObj(this.options, item, this.valueKey);
                   if (i > -1) {
                     this.options[i].selected = true;
@@ -456,7 +456,7 @@ export default {
               this.show = true;
             }
           })
-          .catch(err => {
+          .catch((err) => {
             if (err.message && err.message !== 'canceled') {
               this.$message.error(err.message);
             }
@@ -528,7 +528,7 @@ export default {
       let inputChildNodes = this.$refs.reference.$el.childNodes;
       let input = [].filter.call(
         inputChildNodes,
-        item => item.tagName === 'INPUT'
+        (item) => item.tagName === 'INPUT'
       )[0];
       if (input) {
         input.focus();
@@ -567,7 +567,7 @@ export default {
             let inputChildNodes = this.$refs.reference.$el.childNodes;
             let input = [].filter.call(
               inputChildNodes,
-              item => item.tagName === 'INPUT'
+              (item) => item.tagName === 'INPUT'
             )[0];
             input.style.height = height;
           }