eoss-ui 0.4.48 → 0.4.49

package/lib/data-table.js

@@ -2852,8 +2852,8 @@ module.exports = require("vue");
 // 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/data-table/src/main.vue?vue&type=template&id=7c8f1565&
-var mainvue_type_template_id_7c8f1565_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=da343bae&
+var mainvue_type_template_id_da343bae_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3188,10 +3188,10 @@ var mainvue_type_template_id_7c8f1565_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_7c8f1565_render._withStripped = true
+mainvue_type_template_id_da343bae_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=7c8f1565&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=da343bae&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -5756,6 +5756,10 @@ var mainvue_type_script_lang_js_components;
       type: [Boolean, Array],
       default: false
     },
+    checkedKey: {
+      type: String,
+      default: 'id'
+    },
     sizer: {
       type: Boolean,
       default: true
@@ -5844,7 +5848,10 @@ var mainvue_type_script_lang_js_components;
     },
     checkboxParseData: Function,
     checkboxParse: Object,
-    display: Boolean,
+    display: {
+      type: Boolean,
+      default: true
+    },
     showFormBtn: {
       type: Boolean,
       default: true
@@ -6032,7 +6039,7 @@ var mainvue_type_script_lang_js_components;
 
   methods: {
     getIcon: function getIcon(res) {
-      if (this.icon && res !== 'right' && !this.$slots.prepend && !this.$slots.append && !this.$slots.default && !this.form) {
+      if (this.sizer && this.icon && res !== 'right' && !this.$slots.prepend && !this.$slots.append && !this.$slots.default && !this.form) {
         this.icon = false;
         return 'es-icon-biao';
       }
@@ -6126,7 +6133,14 @@ var mainvue_type_script_lang_js_components;
       if (!this.isFirsetCheck && newVal) {
         if (util["a" /* default */].getObjectType(newVal) === 'array') {
           newVal.forEach(function (row) {
-            _this4.$refs.oaTable.toggleRowSelection(row, true);
+            if (util["a" /* default */].isObject(row)) {
+              _this4.$refs.oaTable.toggleRowSelection(row, true);
+            } else _this4.datas.forEach(function (item) {
+              if (item[_this4.checkedKey] === row) {
+                _this4.$refs.oaTable.toggleRowSelection(item, true);
+                return;
+              }
+            });
           });
         } else if (newVal === true) {
           this.toggleAllSelection();
@@ -6661,7 +6675,7 @@ var mainvue_type_script_lang_js_components;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_7c8f1565_render,
+  mainvue_type_template_id_da343bae_render,
   staticRenderFns,
   false,
   null,

package/lib/eoss-ui.common.js

@@ -4599,8 +4599,8 @@ clients_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var clients = (clients_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=7c8f1565&
-var mainvue_type_template_id_7c8f1565_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=da343bae&
+var mainvue_type_template_id_da343bae_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4934,11 +4934,11 @@ var mainvue_type_template_id_7c8f1565_render = function () {
     1
   )
 }
-var mainvue_type_template_id_7c8f1565_staticRenderFns = []
-mainvue_type_template_id_7c8f1565_render._withStripped = true
+var mainvue_type_template_id_da343bae_staticRenderFns = []
+mainvue_type_template_id_da343bae_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=7c8f1565&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=da343bae&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=796433ee&
 var childrenvue_type_template_id_796433ee_render = function () {
@@ -7499,6 +7499,10 @@ var mainvue_type_script_lang_js_components;
       type: [Boolean, Array],
       default: false
     },
+    checkedKey: {
+      type: String,
+      default: 'id'
+    },
     sizer: {
       type: Boolean,
       default: true
@@ -7587,7 +7591,10 @@ var mainvue_type_script_lang_js_components;
     },
     checkboxParseData: Function,
     checkboxParse: Object,
-    display: Boolean,
+    display: {
+      type: Boolean,
+      default: true
+    },
     showFormBtn: {
       type: Boolean,
       default: true
@@ -7775,7 +7782,7 @@ var mainvue_type_script_lang_js_components;
 
   methods: {
     getIcon: function getIcon(res) {
-      if (this.icon && res !== 'right' && !this.$slots.prepend && !this.$slots.append && !this.$slots.default && !this.form) {
+      if (this.sizer && this.icon && res !== 'right' && !this.$slots.prepend && !this.$slots.append && !this.$slots.default && !this.form) {
         this.icon = false;
         return 'es-icon-biao';
       }
@@ -7869,7 +7876,14 @@ var mainvue_type_script_lang_js_components;
       if (!this.isFirsetCheck && newVal) {
         if (utils_util["a" /* default */].getObjectType(newVal) === 'array') {
           newVal.forEach(function (row) {
-            _this4.$refs.oaTable.toggleRowSelection(row, true);
+            if (utils_util["a" /* default */].isObject(row)) {
+              _this4.$refs.oaTable.toggleRowSelection(row, true);
+            } else _this4.datas.forEach(function (item) {
+              if (item[_this4.checkedKey] === row) {
+                _this4.$refs.oaTable.toggleRowSelection(item, true);
+                return;
+              }
+            });
           });
         } else if (newVal === true) {
           this.toggleAllSelection();
@@ -8404,8 +8418,8 @@ var mainvue_type_script_lang_js_components;
 
 var data_table_src_main_component = normalizeComponent(
   packages_data_table_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_7c8f1565_render,
-  mainvue_type_template_id_7c8f1565_staticRenderFns,
+  mainvue_type_template_id_da343bae_render,
+  mainvue_type_template_id_da343bae_staticRenderFns,
   false,
   null,
   null,
@@ -12926,8 +12940,8 @@ error_page_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var error_page = (error_page_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=3481f0aa&
-var mainvue_type_template_id_3481f0aa_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=7011090d&
+var mainvue_type_template_id_7011090d_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -23213,11 +23227,11 @@ var mainvue_type_template_id_3481f0aa_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_3481f0aa_staticRenderFns = []
-mainvue_type_template_id_3481f0aa_render._withStripped = true
+var mainvue_type_template_id_7011090d_staticRenderFns = []
+mainvue_type_template_id_7011090d_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=3481f0aa&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=7011090d&
 
 // CONCATENATED MODULE: ./src/utils/rules.js
 // 手机号
@@ -26969,7 +26983,10 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
     formatTable: Object,
     full: Boolean,
     within: [String, Object],
-    display: Boolean,
+    display: {
+      type: Boolean,
+      default: true
+    },
     submitLoading: {
       type: Boolean,
       default: true
@@ -28020,8 +28037,8 @@ function src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return function
 
 var form_src_main_component = normalizeComponent(
   packages_form_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_3481f0aa_render,
-  mainvue_type_template_id_3481f0aa_staticRenderFns,
+  mainvue_type_template_id_7011090d_render,
+  mainvue_type_template_id_7011090d_staticRenderFns,
   false,
   null,
   null,
@@ -43204,8 +43221,8 @@ label_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_label = (label_src_main);
-// 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&
-var mainvue_type_template_id_5756d38e_render = function () {
+// 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 mainvue_type_template_id_9885b762_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -43305,7 +43322,8 @@ var mainvue_type_template_id_5756d38e_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",
@@ -43414,7 +43432,7 @@ var mainvue_type_template_id_5756d38e_render = function () {
                                   ],
                                   1
                                 ),
-                                _vm.imgCode
+                                _vm.imgCode || _vm.showVerifyCode
                                   ? _c(
                                       "el-form-item",
                                       {
@@ -43462,20 +43480,66 @@ var mainvue_type_template_id_5756d38e_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
                                         ),
@@ -44002,11 +44066,11 @@ var mainvue_type_template_id_5756d38e_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_5756d38e_staticRenderFns = []
-mainvue_type_template_id_5756d38e_render._withStripped = true
+var mainvue_type_template_id_9885b762_staticRenderFns = []
+mainvue_type_template_id_9885b762_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 () {
@@ -44711,6 +44775,15 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -44944,6 +45017,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       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: '钉钉扫码登录' },
@@ -44952,6 +45026,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       } : {
         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: '钉钉扫码登录' },
@@ -44978,6 +45053,9 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       this.copyrightBgColor && (style['background-color'] = this.copyrightBgColor);
       this.copyrightColor && (style['color'] = this.copyrightColor);
       return login_src_mainvue_type_script_lang_js_extends({}, this.copyrightStyle, style);
+    },
+    showVerifyCode: function showVerifyCode() {
+      return this.passModifyModel.indexOf('6') > -1 || this.passModifyModel.indexOf('11') > -1;
     }
   },
   watch: {
@@ -45213,6 +45291,7 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
         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) {
@@ -45312,58 +45391,72 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
       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);
-        utils_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);
+      utils_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;
@@ -45639,8 +45732,8 @@ var login_src_mainvue_type_script_lang_js_extends = Object.assign || function (t
 
 var login_src_main_component = normalizeComponent(
   packages_login_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_5756d38e_render,
-  mainvue_type_template_id_5756d38e_staticRenderFns,
+  mainvue_type_template_id_9885b762_render,
+  mainvue_type_template_id_9885b762_staticRenderFns,
   false,
   null,
   null,
@@ -71324,7 +71417,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.4.48',
+  version: '0.4.49',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/form.js

@@ -2822,7 +2822,7 @@ module.exports = require("qs");
 // 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/form/src/main.vue?vue&type=template&id=3481f0aa&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/main.vue?vue&type=template&id=7011090d&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -13113,7 +13113,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=3481f0aa&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=7011090d&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -16859,7 +16859,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     formatTable: Object,
     full: Boolean,
     within: [String, Object],
-    display: Boolean,
+    display: {
+      type: Boolean,
+      default: true
+    },
     submitLoading: {
       type: Boolean,
       default: true