eoss-ui 0.4.48 → 0.4.50

package/lib/login.js

@@ -2815,7 +2815,7 @@ function normalizeComponent(
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=5756d38e&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=9885b762&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2916,7 +2916,8 @@ var render = function () {
                     "div",
                     { staticClass: "es-login-form-box" },
                     [
-                      _vm.isShow(_vm.active) && _vm.active == 0
+                      _vm.isShow(_vm.active) &&
+                      (_vm.active == 0 || _vm.active == 2)
                         ? [
                             _c(
                               "el-form",
@@ -3025,7 +3026,7 @@ var render = function () {
                                   ],
                                   1
                                 ),
-                                _vm.imgCode
+                                _vm.imgCode || _vm.showVerifyCode
                                   ? _c(
                                       "el-form-item",
                                       {
@@ -3073,20 +3074,66 @@ var render = function () {
                                                   "es-icon-yanzheng es-label-code-image",
                                               }),
                                             ]),
-                                            _c("template", { slot: "suffix" }, [
-                                              _c("img", {
-                                                staticClass: "es-img-code",
-                                                attrs: { src: _vm.imageCode },
-                                                on: {
-                                                  click: function ($event) {
-                                                    $event.stopPropagation()
-                                                    return _vm.getImgCode(
-                                                      $event
-                                                    )
+                                            _c(
+                                              "template",
+                                              { slot: "suffix" },
+                                              [
+                                                _c(
+                                                  "el-button",
+                                                  {
+                                                    directives: [
+                                                      {
+                                                        name: "show",
+                                                        rawName: "v-show",
+                                                        value:
+                                                          _vm.active == 2 &&
+                                                          _vm.showVerifyCode,
+                                                        expression:
+                                                          "active == 2 && showVerifyCode",
+                                                      },
+                                                    ],
+                                                    staticClass: "es-get-code",
+                                                    attrs: {
+                                                      type: "primary",
+                                                      disabled: _vm.disabled,
+                                                    },
+                                                    on: {
+                                                      click: function ($event) {
+                                                        $event.stopPropagation()
+                                                        return _vm.getCode(
+                                                          $event
+                                                        )
+                                                      },
+                                                    },
                                                   },
-                                                },
-                                              }),
-                                            ]),
+                                                  [_vm._v(_vm._s(_vm.btnText))]
+                                                ),
+                                                _c("img", {
+                                                  directives: [
+                                                    {
+                                                      name: "show",
+                                                      rawName: "v-show",
+                                                      value:
+                                                        _vm.imgCode &&
+                                                        _vm.active == 0,
+                                                      expression:
+                                                        "imgCode && active == 0",
+                                                    },
+                                                  ],
+                                                  staticClass: "es-img-code",
+                                                  attrs: { src: _vm.imageCode },
+                                                  on: {
+                                                    click: function ($event) {
+                                                      $event.stopPropagation()
+                                                      return _vm.getImgCode(
+                                                        $event
+                                                      )
+                                                    },
+                                                  },
+                                                }),
+                                              ],
+                                              1
+                                            ),
                                           ],
                                           2
                                         ),
@@ -3617,7 +3664,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=5756d38e&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=9885b762&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/resetPassword.vue?vue&type=template&id=4f5da52e&
 var resetPasswordvue_type_template_id_4f5da52e_render = function () {
@@ -4337,6 +4384,15 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -4570,6 +4626,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       return types.length > 2 ? {
         0: { type: '0', icon: 'es-icon-shuru', name: '账号登录' },
         1: { type: '1', icon: 'es-icon-usb-key', name: '证书登录' },
+        2: { type: '2', icon: 'es-icon-shuru', 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: '钉钉扫码登录' },
@@ -4578,6 +4635,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       } : {
         0: { type: '0', icon: 'es-icon-jianpan', name: '账号登录' },
         1: { type: '1', icon: 'es-icon-ca', name: '证书登录' },
+        2: { type: '2', icon: 'es-icon-jianpan', 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: '钉钉扫码登录' },
@@ -4604,6 +4662,9 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       this.copyrightBgColor && (style['background-color'] = this.copyrightBgColor);
       this.copyrightColor && (style['color'] = this.copyrightColor);
       return mainvue_type_script_lang_js_extends({}, this.copyrightStyle, style);
+    },
+    showVerifyCode: function showVerifyCode() {
+      return this.passModifyModel.indexOf('6') > -1 || this.passModifyModel.indexOf('11') > -1;
     }
   },
   watch: {
@@ -4839,6 +4900,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         this.active = res;
         this.formData = JSON.parse(JSON.stringify(this.defaultModel));
       }
+      this.countdown = 0;
       this.$emit('change-type', res, this.identifyingId);
     },
     isShow: function isShow(res) {
@@ -4938,58 +5000,72 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
       if (this.countdown) {
         return false;
       }
-      if (!this.formData.target) {
-        this.$refs.login.validateField('target');
-        return false;
+      var data = {};
+      var flag = false;
+      if (this.active == 2) {
+        if (!this.formData.username) {
+          this.$refs.login.validateField('username');
+          return false;
+        }
+        this.$refs.login.validateField('username', function (res) {
+          flag = res != '';
+        });
+        if (flag) {
+          return false;
+        }
+        data = {
+          target: this.formData.username,
+          targetType: this.passModifyModel.indexOf('11') > -1 ? 'EMAIL' : 'SMS'
+        };
       } else {
-        var flag = false;
+        if (!this.formData.target) {
+          this.$refs.login.validateField('target');
+          return false;
+        }
         this.$refs.login.validateField('target', function (res) {
           flag = res != '';
         });
         if (flag) {
           return false;
         }
-        var data = {
+        data = {
           target: this.formData.target,
           targetType: this.active == '6' ? 'SMS' : 'EMAIL'
         };
-        this.countdown = 60;
-        this.timer = setInterval(function () {
-          if (_this4.countdown > 0) {
-            _this4.countdown--;
-            _this4.disabled = true;
-            _this4.btnText = '重新获取' + _this4.countdown + 's';
-          } else {
-            _this4.btnText = '重新获取';
-            _this4.disabled = false;
-          }
-        }, 1000);
-        util["a" /* default */].ajax({
-          method: 'post',
-          url: this.getLoginCode,
-          data: data
-        }).then(function (res) {
-          _this4.$message({
-            message: res.msg,
-            duration: 2000,
-            type: res.rCode == 0 ? 'success' : 'error'
-          });
-
-          if (res.rCode === 2) {
-            _this4.btnText = '获取验证码';
-            _this4.disabled = false;
-            _this4.countdown = 0;
-            clearInterval(_this4.timer);
-          }
-          // if (res.rCode) {
-          //   clearInterval(this.timer);
-          // }
-        }).catch(function (err) {
-          if (err.message && err.message !== 'canceled') {
-            _this4.$message.error(err.message);
-          }
-        });
       }
+      this.countdown = 60;
+      this.timer = setInterval(function () {
+        if (_this4.countdown > 0) {
+          _this4.countdown--;
+          _this4.disabled = true;
+          _this4.btnText = '重新获取' + _this4.countdown + 's';
+        } else {
+          _this4.btnText = '重新获取';
+          _this4.disabled = false;
+        }
+      }, 1000);
+      util["a" /* default */].ajax({
+        method: 'post',
+        url: this.getLoginCode,
+        data: data
+      }).then(function (res) {
+        _this4.$message({
+          message: res.msg,
+          duration: 2000,
+          type: res.rCode == 0 ? 'success' : 'error'
+        });
+
+        if (res.rCode === 2) {
+          _this4.btnText = '获取验证码';
+          _this4.disabled = false;
+          _this4.countdown = 0;
+          clearInterval(_this4.timer);
+        }
+      }).catch(function (err) {
+        if (err.message && err.message !== 'canceled') {
+          _this4.$message.error(err.message);
+        }
+      });
     },
     handleLogin: function handleLogin() {
       var _this5 = this;

package/package.json

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

package/packages/data-table/src/main.vue

@@ -301,6 +301,10 @@ export default {
       type: [Boolean, Array],
       default: false
     },
+    checkedKey: {
+      type: String,
+      default: 'id'
+    },
     sizer: {
       type: Boolean,
       default: true
@@ -389,7 +393,10 @@ export default {
     },
     checkboxParseData: Function,
     checkboxParse: Object,
-    display: Boolean,
+    display: {
+      type: Boolean,
+      default: true
+    },
     showFormBtn: {
       type: Boolean,
       default: true
@@ -510,6 +517,7 @@ export default {
       handler(val) {
         if (this.tableHeight != 'auto' && this.display) {
           this.resetHeight();
+          this.doLayout();
         }
       }
     },
@@ -517,11 +525,12 @@ export default {
       handler(val) {
         if (this.tableHeight != 'auto' && this.display) {
           this.resetHeight();
+          this.doLayout();
         }
       }
     },
     checked(newVal) {
-      this.checkSelect(newVal);
+      this.datas.length && this.checkSelect(newVal);
     },
     thead: {
       immediate: true,
@@ -572,6 +581,7 @@ export default {
     display(val) {
       if (val) {
         this.resetHeight();
+        this.doLayout();
       }
     }
   },
@@ -579,12 +589,13 @@ export default {
     this.immediate && this.getTableData();
   },
   mounted() {
-    this.checkSelect(this.checked);
+    this.datas.length && this.checkSelect(this.checked);
     this.resetHeight();
   },
   methods: {
     getIcon(res) {
       if (
+        this.sizer &&
         this.icon &&
         res !== 'right' &&
         !this.$slots.prepend &&
@@ -689,16 +700,23 @@ export default {
       });
     },
     checkSelect(newVal) {
-      if (!this.isFirsetCheck && newVal) {
+      this.$nextTick(() => {
         if (util.getObjectType(newVal) === 'array') {
           newVal.forEach((row) => {
-            this.$refs.oaTable.toggleRowSelection(row, true);
+            if (util.isObject(row)) {
+              this.$refs.oaTable.toggleRowSelection(row, true);
+            } else
+              this.datas.forEach((item) => {
+                if (item[this.checkedKey] === row) {
+                  this.$refs.oaTable.toggleRowSelection(item, true);
+                  return;
+                }
+              });
           });
         } else if (newVal === true) {
           this.toggleAllSelection();
         }
-        this.isFirsetCheck = true;
-      }
+      });
     },
     getTheads() {
       util
@@ -773,6 +791,10 @@ export default {
             this.list = results.data || results.records || results.list || [];
             this.config.totalCount =
               results.count || results.total || results.totalCount;
+            this.checked &&
+              this.$nextTick(() => {
+                this.checkSelect(this.checked);
+              });
           } else {
             this.list = [];
             let msg = res.msg || '系统错误，请联系管理员！';

package/packages/form/src/main.vue

@@ -3719,7 +3719,10 @@ export default {
     formatTable: Object,
     full: Boolean,
     within: [String, Object],
-    display: Boolean,
+    display: {
+      type: Boolean,
+      default: true
+    },
     submitLoading: {
       type: Boolean,
       default: true

package/packages/login/src/main.vue

@@ -45,7 +45,7 @@
           ></i>
         </div>
         <div class="es-login-form-box">
-          <template v-if="isShow(active) && active == 0">
+          <template v-if="isShow(active) && (active == 0 || active == 2)">
             <el-form ref="login" class="es-login-form" :model="formData">
               <div class="es-login-title">
                 <span class="es-login-title-content">{{ title }}</span>
@@ -92,7 +92,7 @@
                 size="large"
                 prop="identifyingCode"
                 :rules="[{ required: true, message: '验证码不能为空' }]"
-                v-if="imgCode"
+                v-if="imgCode || showVerifyCode"
               >
                 <el-input
                   size="large"
@@ -107,7 +107,16 @@
                     <i class="es-icon-yanzheng es-label-code-image"></i>
                   </template>
                   <template slot="suffix">
+                    <el-button
+                      class="es-get-code"
+                      type="primary"
+                      v-show="active == 2 && showVerifyCode"
+                      :disabled="disabled"
+                      @click.stop="getCode"
+                      >{{ btnText }}</el-button
+                    >
                     <img
+                      v-show="imgCode && active == 0"
                       class="es-img-code"
                       :src="imageCode"
                       @click.stop="getImgCode"
@@ -563,6 +572,7 @@ export default {
         ? {
             0: { type: '0', icon: 'es-icon-shuru', name: '账号登录' },
             1: { type: '1', icon: 'es-icon-usb-key', name: '证书登录' },
+            2: { type: '2', icon: 'es-icon-shuru', 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: '钉钉扫码登录' },
@@ -572,6 +582,7 @@ export default {
         : {
             0: { type: '0', icon: 'es-icon-jianpan', name: '账号登录' },
             1: { type: '1', icon: 'es-icon-ca', name: '证书登录' },
+            2: { type: '2', icon: 'es-icon-jianpan', 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: '钉钉扫码登录' },
@@ -597,6 +608,12 @@ export default {
         (style['background-color'] = this.copyrightBgColor);
       this.copyrightColor && (style['color'] = this.copyrightColor);
       return { ...this.copyrightStyle, ...style };
+    },
+    showVerifyCode() {
+      return (
+        this.passModifyModel.indexOf('6') > -1 ||
+        this.passModifyModel.indexOf('11') > -1
+      );
     }
   },
   watch: {
@@ -833,6 +850,7 @@ export default {
         this.active = res;
         this.formData = JSON.parse(JSON.stringify(this.defaultModel));
       }
+      this.countdown = 0;
       this.$emit('change-type', res, this.identifyingId);
     },
     isShow(res) {
@@ -947,61 +965,75 @@ export default {
       if (this.countdown) {
         return false;
       }
-      if (!this.formData.target) {
-        this.$refs.login.validateField('target');
-        return false;
+      let data = {};
+      let flag = false;
+      if (this.active == 2) {
+        if (!this.formData.username) {
+          this.$refs.login.validateField('username');
+          return false;
+        }
+        this.$refs.login.validateField('username', (res) => {
+          flag = res != '';
+        });
+        if (flag) {
+          return false;
+        }
+        data = {
+          target: this.formData.username,
+          targetType: this.passModifyModel.indexOf('11') > -1 ? 'EMAIL' : 'SMS'
+        };
       } else {
-        let flag = false;
+        if (!this.formData.target) {
+          this.$refs.login.validateField('target');
+          return false;
+        }
         this.$refs.login.validateField('target', (res) => {
           flag = res != '';
         });
         if (flag) {
           return false;
         }
-        let data = {
+        data = {
           target: this.formData.target,
           targetType: this.active == '6' ? 'SMS' : 'EMAIL'
         };
-        this.countdown = 60;
-        this.timer = setInterval(() => {
-          if (this.countdown > 0) {
-            this.countdown--;
-            this.disabled = true;
-            this.btnText = '重新获取' + this.countdown + 's';
-          } else {
-            this.btnText = '重新获取';
+      }
+      this.countdown = 60;
+      this.timer = setInterval(() => {
+        if (this.countdown > 0) {
+          this.countdown--;
+          this.disabled = true;
+          this.btnText = '重新获取' + this.countdown + 's';
+        } else {
+          this.btnText = '重新获取';
+          this.disabled = false;
+        }
+      }, 1000);
+      util
+        .ajax({
+          method: 'post',
+          url: this.getLoginCode,
+          data: data
+        })
+        .then((res) => {
+          this.$message({
+            message: res.msg,
+            duration: 2000,
+            type: res.rCode == 0 ? 'success' : 'error'
+          });
+
+          if (res.rCode === 2) {
+            this.btnText = '获取验证码';
             this.disabled = false;
+            this.countdown = 0;
+            clearInterval(this.timer);
           }
-        }, 1000);
-        util
-          .ajax({
-            method: 'post',
-            url: this.getLoginCode,
-            data: data
-          })
-          .then((res) => {
-            this.$message({
-              message: res.msg,
-              duration: 2000,
-              type: res.rCode == 0 ? 'success' : 'error'
-            });
-
-            if (res.rCode === 2) {
-              this.btnText = '获取验证码';
-              this.disabled = false;
-              this.countdown = 0;
-              clearInterval(this.timer);
-            }
-            // if (res.rCode) {
-            //   clearInterval(this.timer);
-            // }
-          })
-          .catch((err) => {
-            if (err.message && err.message !== 'canceled') {
-              this.$message.error(err.message);
-            }
-          });
-      }
+        })
+        .catch((err) => {
+          if (err.message && err.message !== 'canceled') {
+            this.$message.error(err.message);
+          }
+        });
     },
     handleLogin() {
       if (this.submit) {

package/src/index.js

@@ -117,7 +117,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.48',
+  version: '0.4.50',
   install,
   Button,
   ButtonGroup,