eoss-ui 0.5.30 → 0.5.31

package/lib/input-number.js

@@ -1915,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2939,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/input.js

@@ -1915,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2939,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,
@@ -3841,14 +3853,23 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       var cls = [];
       var doms = [];
       if (this.readonly) {
-        var content = this.text;
-        if (this.model) {
-          content = this.model.replace(RegExp('\\n', 'g'), '<br/>');
-          content = content.replace(RegExp(' ', 'g'), '&nbsp;');
+        var content = this.model ? this.model : this.text;
+        if (this.$attrs.type === 'textarea') {
+          if (this.model) {
+            content = this.model.replace(RegExp('\\n', 'g'), '<br/>');
+            content = content.replace(RegExp(' ', 'g'), '&nbsp;');
+          }
+          return h('div', {
+            class: ['es-textarea__inner ', { 'es-plain': this.plain }],
+            domProps: {
+              innerHTML: content
+            }
+          });
+        } else {
+          return h('div', {
+            class: ['es-input__inner', { 'es-plain': this.plain }]
+          }, [content]);
         }
-        return h('div', {
-          class: [this.$attrs.type === 'textarea' ? 'es-textarea__inner ' : 'es-input__inner', { 'es-plain': this.plain }]
-        }, [content]);
       }
       if (this.$slots.prefix) {
         doms.push(h('template', { slot: 'prefix' }, this.$slots.prefix));

package/lib/login.js

@@ -1914,6 +1914,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2938,6 +2949,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,
@@ -3675,7 +3687,7 @@ var bankCard = { pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message:
 // 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=7a5eded6&
+// 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=49b75306&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4535,10 +4547,10 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=7a5eded6&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=49b75306&
 
-// 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=7815e915&
-var resetPasswordvue_type_template_id_7815e915_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/resetPassword.vue?vue&type=template&id=7e3a7461&
+var resetPasswordvue_type_template_id_7e3a7461_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4598,11 +4610,11 @@ var resetPasswordvue_type_template_id_7815e915_render = function () {
     1
   )
 }
-var resetPasswordvue_type_template_id_7815e915_staticRenderFns = []
-resetPasswordvue_type_template_id_7815e915_render._withStripped = true
+var resetPasswordvue_type_template_id_7e3a7461_staticRenderFns = []
+resetPasswordvue_type_template_id_7e3a7461_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/resetPassword.vue?vue&type=template&id=7815e915&
+// CONCATENATED MODULE: ./packages/login/src/resetPassword.vue?vue&type=template&id=7e3a7461&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4653,6 +4665,8 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
 //
 //
 //
+//
+//
 
 
 
@@ -4865,119 +4879,6 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
             }]
           }];
       }
-      // return [
-      //   this.activeIndex == '6'
-      //     ? {
-      //         type: 'text',
-      //         name: 'target',
-      //         label: '手机号',
-      //         placeholder: '请输入手机号',
-      //         rules: [
-      //           {
-      //             required: true,
-      //             message: '请输入手机号',
-      //             trigger: 'blur'
-      //           },
-      //           {
-      //             ...rules.phone,
-      //             trigger: 'blur'
-      //           }
-      //         ]
-      //       }
-      //     : {
-      //         type: 'text',
-      //         name: 'target',
-      //         label: '邮箱地址',
-      //         placeholder: '请输入邮箱地址',
-      //         rules: [
-      //           {
-      //             required: true,
-      //             message: '请输入邮箱地址',
-      //             trigger: 'blur'
-      //           },
-      //           {
-      //             type: 'email',
-      //             message: '请输入正确的邮箱地址',
-      //             trigger: 'blur'
-      //           }
-      //         ]
-      //       },
-      //   {
-      //     type: 'password',
-      //     name: 'password',
-      //     label: '新密码',
-      //     placeholder: '请输入新密码',
-      //     showPassword: true,
-      //     rules: [
-      //       this.checkPassword
-      //         ? {
-      //             pattern: this.checkPassword,
-      //             message: this.checkPasswordMsg
-      //               ? this.checkPasswordMsg
-      //               : '密码格式不合法',
-      //             trigger: 'blur'
-      //           }
-      //         : {},
-      //       {
-      //         required: true,
-      //         message: '请输入新密码',
-      //         trigger: 'blur'
-      //       }
-      //     ]
-      //   },
-      //   {
-      //     type: 'password',
-      //     name: 'repassword',
-      //     placeholder: '请确认新密码',
-      //     label: '确认新密码',
-      //     showPassword: true,
-      //     rules: [
-      //       this.checkPassword
-      //         ? {
-      //             pattern: this.checkPassword,
-      //             message: this.checkPasswordMsg
-      //               ? this.checkPasswordMsg
-      //               : '密码格式不合法',
-      //             trigger: 'blur'
-      //           }
-      //         : {},
-      //       {
-      //         required: true,
-      //         message: '请输入新密码',
-      //         trigger: 'blur'
-      //       },
-      //       { validator: this.reregExpValidate, trigger: 'blur' }
-      //     ]
-      //   },
-      //   {
-      //     type: 'text',
-      //     name: 'verificationCode',
-      //     placeholder: '请输入验证码',
-      //     label: '验证码',
-      //     append: {
-      //       text: this.btnText,
-      //       attrs: { disabled: this.disabled },
-      //       event: this.getVerificationCode
-      //     },
-      //     rules: [
-      //       {
-      //         required: true,
-      //         message: '请输入验证码',
-      //         trigger: 'blur'
-      //       }
-      //     ]
-      //   },
-      //   {
-      //     type: 'submit',
-      //     contents: [
-      //       {
-      //         type: 'primary',
-      //         text: '提交',
-      //         event: 'confirm'
-      //       }
-      //     ]
-      //   }
-      // ];
     },
     show: function show() {
       if (this.type) {
@@ -5139,6 +5040,10 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
           } else {
             var msg = res.msg || '系统错误，请联系管理员！';
             _this4.$message.error(msg);
+            _this4.btnText = '获取验证码';
+            _this4.disabled = false;
+            delete _this4.formData.verificationCode;
+            clearInterval(_this4.timer);
           }
         }).catch(function (err) {
           if (err.message && err.message !== 'canceled') {
@@ -5162,6 +5067,10 @@ function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in ob
             _this4.$emit('success');
           } else {
             var msg = res.msg || '系统错误，请联系管理员！';
+            _this4.btnText = '获取验证码';
+            _this4.disabled = false;
+            clearInterval(_this4.timer);
+            delete _this4.formData.verificationCode;
             _this4.$message.error(msg);
           }
         }).catch(function (err) {
@@ -5195,8 +5104,8 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_resetPasswordvue_type_script_lang_js_,
-  resetPasswordvue_type_template_id_7815e915_render,
-  resetPasswordvue_type_template_id_7815e915_staticRenderFns,
+  resetPasswordvue_type_template_id_7e3a7461_render,
+  resetPasswordvue_type_template_id_7e3a7461_staticRenderFns,
   false,
   null,
   null,
@@ -6195,7 +6104,8 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
         return;
       }
       this.imageCode = util["a" /* default */].getStorage('host') + this.codeAction + '?identifyingId=' + this.identifyingId + (this.imgCode && _typeof(this.imgCode) == 'object' ? '&' + util["a" /* default */].queryParams(this.imgCode) : '') + '&heightflag=' + Math.random().toString().split('.')[1];
-
+      delete this.formData.identifyingCode;
+      delete this.formData.verificationCode;
       return this.imageCode;
     },
     getCode: function getCode() {
@@ -6353,6 +6263,10 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
             type: 'error',
             duration: 1500,
             onClose: function onClose() {
+              _this6.btnText = '获取验证码';
+              _this6.disabled = false;
+              _this6.countdown = 0;
+              clearInterval(_this6.timer);
               _this6.getImgCode();
             }
           });

package/lib/main.js

@@ -1914,6 +1914,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2938,6 +2949,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/nav.js

@@ -1915,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2939,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/page.js

@@ -1915,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2939,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/player.js

@@ -1915,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2939,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/qr-code.js

@@ -1915,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2939,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/radio-group.js

@@ -1915,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2939,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,
@@ -3507,7 +3519,7 @@ module.exports = require("axios");
 // 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/radio-group/src/main.vue?vue&type=template&id=4b2ba50e&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/radio-group/src/main.vue?vue&type=template&id=6d8b784f&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3641,7 +3653,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/radio-group/src/main.vue?vue&type=template&id=4b2ba50e&
+// CONCATENATED MODULE: ./packages/radio-group/src/main.vue?vue&type=template&id=6d8b784f&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3839,7 +3851,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
     labelVal: function labelVal() {
       var _this = this;
 
-      if (this.readonly && this.model !== undefined && this.results.length) {
+      if (this.readonly && util["a" /* default */].isExist(this.model) && this.results.length) {
         if (_typeof(this.model) !== 'object') {
           if (util["a" /* default */].isObject(this.results[0])) {
             var val = void 0;

package/lib/retrial-auth.js

@@ -1915,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2939,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/select-ganged.js

@@ -1915,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2939,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/select.js

@@ -1915,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2939,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/selector-panel.js

@@ -1914,6 +1914,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2938,6 +2949,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/selector.js

@@ -1915,6 +1915,17 @@ var indexOfObj = function indexOfObj(arry, target, key) {
   return -1;
 };
 
+/**
+ * isExist
+ * @desc:判断是否存在
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {Object} [obj] -
+ **/
+var isExist = function isExist(obj) {
+  return obj !== undefined && obj !== null && obj === '';
+};
+
 /**
  * isFunction
  * @desc:判断是否是函数
@@ -2939,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,
@@ -3474,7 +3486,7 @@ module.exports = require("axios");
 // 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/selector/src/main.vue?vue&type=template&id=2098c784&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=51a080ae&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3963,7 +3975,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=2098c784&
+// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=51a080ae&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -4385,7 +4397,7 @@ var util_ = __webpack_require__(28);
       immediate: true,
       deep: true,
       handler: function handler(val) {
-        if (val !== '' && val !== undefined) {
+        if (util["a" /* default */].isExist(val)) {
           if (util["a" /* default */].isObject(val)) {
             this.selected = [val];
           } else {