cloud-web-corejs 1.0.54-dev.42 → 1.0.54-dev.420

package/src/views/user/ledger_library/list.vue

@@ -2,16 +2,15 @@
   <div id="containt">
     <fileLibrary :option="fileLibraryOption"></fileLibrary>
   </div>
-
 </template>
 
 <script>
-import fileLibrary from '@base/components/fileLibrary/index';
+import fileLibrary from "@base/components/fileLibrary/index";
 
 export default {
-  name: 'ledger_library:list',
+  name: "ledger_library:list",
   components: {
-    fileLibrary
+    fileLibrary,
   },
   data() {
     return {
@@ -19,12 +18,11 @@ export default {
         isCategoryEdit: true,
         mouseCheck: true,
         storeAreaCode: "company_profile2",
-        current_prefix: USER_PREFIX
-      }
-    }
-  }
-}
-
+        current_prefix: USER_PREFIX,
+        showCategoryFilterArea: false,
+      },
+    };
+  },
+};
 </script>
-<style scoped>
-</style>
+<style scoped></style>

package/src/views/user/login/default.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="login-container" :class="backgroundClass" ref="login-container" v-show="showContent">
     <div class="login-main" style="height: auto;">
-      <el-tabs v-model="activeName">
+      <el-tabs v-model="activeName" @tab-click="changeTab">
         <el-tab-pane label="账号登录" name="first">
           <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="box-form login" autocomplete="on"
                    label-position="left">
@@ -37,7 +37,7 @@
             <el-button :loading="loading" type="primary" @click.prevent.stop="handleLogin" class="btn">登录</el-button>
           </el-form>
         </el-tab-pane>
-        <el-tab-pane label="手机验证码登录" name="second">
+        <el-tab-pane label="手机登录" name="second" v-if="settingConfig.mobileLoginEnabled">
           <el-form ref="loginForm" :model="loginForm2" :rules="loginRules" class="box-form login" autocomplete="on"
                    label-position="left">
             <el-form-item prop="username" class="txt" style="width:66%">
@@ -56,9 +56,16 @@
             <el-button :loading="loading" type="primary" @click.prevent.stop="handleLogin" class="btn">登录</el-button>
           </el-form>
         </el-tab-pane>
+        <el-tab-pane label="扫码登录" name="third" v-if="settingConfig.qrLoginEnabled">
+          <div class="login-qr">
+            <img class="qr__img" :src="qrBase64" v-if="activeName==='third'"/>
+            <span class="qr__txt">扫一扫，登录系统</span>
+            <div v-if="qrExpired" @click="initQR" class="qr__lose"><span><i class="el-icon-refresh"></i>二维码失效</span></div>
+          </div>
+        </el-tab-pane>
       </el-tabs>
     </div>
-    <div class="tc copyright">
+    <div class="tc copyright" v-show="false">
       <slot name="footer">
         © 广州同望科技发展有限公司
         <span style="margin-left:50px;">4000646100</span>
@@ -94,7 +101,7 @@ export default {
   right: 5px;
   top: 25px;
 }
-
+.box-form{height: 330px;}
 ::v-deep .login-main .el-tabs__header {
   margin-bottom: 0;
 
@@ -128,4 +135,26 @@ export default {
     color: #8a8686;
   }
 }
+
+::v-deep .login-main .el-tabs__header .el-tabs__nav .el-tabs__item {
+  width: 33%;
+}
+.login-qr{height: 330px;text-align: center;position: relative;
+  .qr__img{width: 220px;margin-top:40px;}
+  .qr__txt{color: #666;font-size: 15px;display: block;}
+  .qr__lose{
+    position: absolute;cursor: pointer;
+    width: 192px;
+    height: 192px;
+    background: rgb(255 255 255 / 76%);
+    top: 60px;
+    left: 136px;
+    color: #000;
+    line-height: 64px;
+    font-weight: 600;
+    font-size: 26px;
+    span{line-height: 1;margin-top:30px;}
+    i{display: block;font-size:42px;margin-top: 46px;}
+  }
+}
 </style>

package/src/views/user/login/indexMixin.js

@@ -1,5 +1,6 @@
 import {encode} from "js-base64";
 import settingConfig from "@/settings";
+import QRcode from "qrcode";
 
 function getUrlParams(url) {
   let result = {};
@@ -19,6 +20,7 @@ export default {
       isCounting: false,
       countdown: 0,
       buttonText: '获取验证码',
+      smsTimer: null,
       isRememberPassword: false,
       loginForm: {
         username: '',
@@ -54,7 +56,15 @@ export default {
       },
       activeName: "first",
       searchParam: {},
-      showContent: true
+      showContent: true,
+
+      qrTimer1: null,
+      qrTimer2: null,
+      qrContent: null,
+      qrCodeFlag: 0,
+      qrBase64: "",
+      settingConfig: settingConfig,
+      qrExpired: false
     };
   },
   watch: {
@@ -69,6 +79,10 @@ export default {
       immediate: true
     }
   },
+  beforeDestroy() {
+    this.clearQrLoginTimer();
+    this.clearSmsTimer();
+  },
   created() {
     this.init();
   },
@@ -110,6 +124,7 @@ export default {
       if (e.keyCode == 13 && e.target.nodeName != 'INPUT') {
         let closeBtn = document.querySelector('.el-dialog__close');
         closeBtn && closeBtn.click();
+        if (this.activeName == "third") return
         this.handleLogin();
       }
     },
@@ -325,6 +340,7 @@ export default {
         this.$baseAlert("请输入手机号");
         return
       }
+
       this.$http({
         url: USER_PREFIX + '/auth/sendSmsCode',
         method: `post`,
@@ -339,11 +355,12 @@ export default {
           this.isCounting = true
           this.countdown = 60
           this.buttonText = '60秒后重新获取'
-          const times = setInterval(() => {
+          this.clearSmsTimer();
+          this.smsTimer = setInterval(() => {
             this.countdown--;
             this.buttonText = this.countdown + '秒后重新获取'
             if (this.countdown == 0) {
-              clearInterval(times);
+              this.clearSmsTimer();
               this.isCounting = false
               this.buttonText = '获取验证码'
             }
@@ -352,6 +369,12 @@ export default {
       });
 
     },
+    clearSmsTimer() {
+      if (this.smsTimer) {
+        clearInterval(this.smsTimer);
+        this.smsTimer = null;
+      }
+    },
     mobileLogin() {
 
     },
@@ -420,6 +443,97 @@ export default {
             });
           }
         });
+    },
+
+    /**二维码登录begin*/
+    guid() {
+      return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function (t) {
+        var e = 16 * Math.random() | 0;
+        return ("x" == t ? e : 3 & e | 8).toString(16);
+      });
+    },
+    initQR() {
+      this.clearQrLoginTimer();
+      this.qrExpired = true;
+      let option = {width: 300, height: 300};
+      this.qrContent = this.guid();
+      this.createQR(this.qrContent, option).then(url => {
+        this.qrExpired = false;
+        this.qrBase64 = url
+        this.createQrLoginTimer();
+      })
+    },
+    // 生成二维码
+    createQR(content, options) {
+      return new Promise((resolve, reject) => {
+        QRcode.toDataURL(content, options).then(url => {
+          resolve(url)
+        })
+      })
+    },
+    changeTab() {
+      // this.initQR();
+      // return
+      if (this.activeName == "third") {
+        this.initQR();
+      } else {
+        this.clearQrLoginTimer();
+      }
+    },
+    clearQrLoginTimer() {
+      if (this.qrTimer1) {
+        clearTimeout(this.qrTimer1)
+        this.qrTimer1 = null;
+      }
+      if (this.qrTimer2) {
+        clearTimeout(this.qrTimer2)
+        this.qrTimer2 = null;
+      }
+    },
+    createQrLoginTimer() {
+      this.checkQrLoginTimerHanlde()
+      this.qrTimer2 = setTimeout(() => {
+        this.qrExpired = true;
+        this.clearQrLoginTimer();
+      }, 60000)
+    },
+    checkQrLoginTimerHanlde() {
+      this.qrTimer1 = setTimeout(() => {
+        this.checkQrLoginStatusHanlde();
+      }, 3000)
+    },
+    checkQrLoginStatusHanlde() {
+      if (this.qrExpired) {
+        return
+      }
+      this.$http({
+        url: USER_PREFIX + '/auth/login',
+        method: `post`,
+        data: {as: this.qrContent},
+        // isLoading: true,
+        failMsg: false,
+        success: res => {
+          let token = res.objx;
+          if (token) {
+            this.$message({
+              message: "登录成功",
+              type: 'success'
+            });
+            this.clearQrLoginTimer();
+            this.$store.dispatch('user/addToken', {token}).then(res => {
+              localStorage.removeItem('currentMenuId');
+              this.rememberPassword();
+              this.loading = false;
+              window.removeEventListener('keydown', this.keyDown, false);
+              this.handleRedirectUrl();
+            });
+          } else {
+            this.checkQrLoginTimerHanlde();
+          }
+        }
+      });
     }
+    /**二维码登录end*/
+
   }
 }

package/src/views/user/notify_message/dialog.vue

@@ -20,7 +20,7 @@
         v-if="showWfContent && wfContent"
         :is="wfContent"
         visible-key="showWfContent"
-        :_dataId.sync="wfDataId"
+        v-bind="param"
         :_isNotifyMessage="true"
         :parent-target="_self"
         @reload="$reloadHandle"
@@ -35,15 +35,18 @@ export default {
   data() {
     return {
       showWfDialog2: false,
-      wfUrl2: '',
+      wfUrl2: "",
       showWfContent: true,
       wfContent: null,
-      wfDataId: '',
+      wfDataId: "",
+      param: {},
     };
   },
   methods: {
     getUrlParam(url) {
-      var reg = /([^?&=]+)=([^?&=]+)/g, obj = {}, str = url;
+      var reg = /([^?&=]+)=([^?&=]+)/g,
+        obj = {},
+        str = url;
       url.replace(reg, function () {
         obj[arguments[1]] = arguments[2];
       });
@@ -57,9 +60,9 @@ export default {
           data: [row.id],
           isLoading: true,
           loadingTarget: document.body,
-          success: res => {
+          success: (res) => {
             callback && callback();
-          }
+          },
         });
       } else {
         callback && callback();
@@ -71,24 +74,41 @@ export default {
         let wfUrl = turl.split("?")[0];
         let param = this.getUrlParam(turl);
         let wfDataId = param.dataId;
+        if (!wfDataId) {
+          wfDataId = 0;
+        } else if (!isNaN(wfDataId)) {
+          wfDataId = Number(wfDataId);
+        }
 
-        let url = wfUrl + '.vue';
-        let id = wfDataId;
-        this.wfDataId = !id || typeof id == 'object' ? 0 : id;
-        // this.showWfDialog = true;
-        this.showWfContent = true;
-        this.wfContent = require('@/views' + url).default;
-
+        if (wfUrl == "form") {
+          this.param = Object.assign(param, {
+            formCode: param.objTypeCode.substr(9),
+            dataId: wfDataId,
+          });
+          let url = "/user/form/vform/render.vue";
+          this.wfContent = require("@base/views" + url).default;
+        } else {
+          this.param = Object.assign(param, {
+            _dataId: wfDataId,
+          });
+          let url = wfUrl + ".vue";
+          let id = wfDataId;
+          this.wfDataId = !id || typeof id == "object" ? 0 : id;
+          // this.showWfDialog = true;
+          this.showWfContent = true;
+          this.wfContent = require("@/views" + url).default;
+        }
         this.showWfDialog2 = true;
+
         callback && callback();
-      })
-    }
-  }
+      });
+    },
+  },
 };
 </script>
 
-<style>
+<style scoped>
 .designer-dialog.indexUse #containt .detail-wrap .d-cont {
-  height: calc(100vh - 82px)
+  height: calc(100vh - 82px);
 }
 </style>