eoss-ui 0.5.29 → 0.5.31

package/lib/tips.js

@@ -240,16 +240,21 @@ var ajax = function ajax(_ref) {
     delPendingRequest(response.config);
     loading && loading.close();
     if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
-      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId') || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
-        localStorage.setItem('ssId', response.headers.ssid);
+      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
         localStorage.setItem('token', response.headers.authorization);
         localStorage.setItem('Authorization', response.headers.authorization);
       } else {
-        sessionStorage.setItem('ssId', response.headers.ssid);
         sessionStorage.setItem('token', response.headers.authorization);
         sessionStorage.setItem('Authorization', response.headers.authorization);
       }
     }
+    if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
+      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
+        localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
+      } else {
+        sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
+      }
+    }
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
@@ -1910,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:判断是否是函数
@@ -2934,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/tree-group.js

@@ -240,16 +240,21 @@ var ajax = function ajax(_ref) {
     delPendingRequest(response.config);
     loading && loading.close();
     if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
-      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId') || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
-        localStorage.setItem('ssId', response.headers.ssid);
+      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
         localStorage.setItem('token', response.headers.authorization);
         localStorage.setItem('Authorization', response.headers.authorization);
       } else {
-        sessionStorage.setItem('ssId', response.headers.ssid);
         sessionStorage.setItem('token', response.headers.authorization);
         sessionStorage.setItem('Authorization', response.headers.authorization);
       }
     }
+    if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
+      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
+        localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
+      } else {
+        sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
+      }
+    }
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
@@ -1910,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:判断是否是函数
@@ -2934,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/tree.js

@@ -240,16 +240,21 @@ var ajax = function ajax(_ref) {
     delPendingRequest(response.config);
     loading && loading.close();
     if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
-      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId') || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
-        localStorage.setItem('ssId', response.headers.ssid);
+      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
         localStorage.setItem('token', response.headers.authorization);
         localStorage.setItem('Authorization', response.headers.authorization);
       } else {
-        sessionStorage.setItem('ssId', response.headers.ssid);
         sessionStorage.setItem('token', response.headers.authorization);
         sessionStorage.setItem('Authorization', response.headers.authorization);
       }
     }
+    if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
+      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
+        localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
+      } else {
+        sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
+      }
+    }
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
@@ -1910,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:判断是否是函数
@@ -2934,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/upload.js

@@ -239,16 +239,21 @@ var ajax = function ajax(_ref) {
     delPendingRequest(response.config);
     loading && loading.close();
     if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
-      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId') || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
-        localStorage.setItem('ssId', response.headers.ssid);
+      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
         localStorage.setItem('token', response.headers.authorization);
         localStorage.setItem('Authorization', response.headers.authorization);
       } else {
-        sessionStorage.setItem('ssId', response.headers.ssid);
         sessionStorage.setItem('token', response.headers.authorization);
         sessionStorage.setItem('Authorization', response.headers.authorization);
       }
     }
+    if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
+      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
+        localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
+      } else {
+        sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
+      }
+    }
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
@@ -1909,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:判断是否是函数
@@ -2933,6 +2949,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/utils/util.js

@@ -157,16 +157,21 @@ var ajax = function ajax(_ref) {
     delPendingRequest(response.config);
     loading && loading.close();
     if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
-      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId') || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
-        localStorage.setItem('ssId', response.headers.ssid);
+      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
         localStorage.setItem('token', response.headers.authorization);
         localStorage.setItem('Authorization', response.headers.authorization);
       } else {
-        sessionStorage.setItem('ssId', response.headers.ssid);
         sessionStorage.setItem('token', response.headers.authorization);
         sessionStorage.setItem('Authorization', response.headers.authorization);
       }
     }
+    if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
+      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
+        localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
+      } else {
+        sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
+      }
+    }
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
@@ -1827,6 +1832,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:判断是否是函数
@@ -2851,6 +2867,7 @@ exports.default = {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/wujie.js

@@ -240,16 +240,21 @@ var ajax = function ajax(_ref) {
     delPendingRequest(response.config);
     loading && loading.close();
     if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
-      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId') || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
-        localStorage.setItem('ssId', response.headers.ssid);
+      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
         localStorage.setItem('token', response.headers.authorization);
         localStorage.setItem('Authorization', response.headers.authorization);
       } else {
-        sessionStorage.setItem('ssId', response.headers.ssid);
         sessionStorage.setItem('token', response.headers.authorization);
         sessionStorage.setItem('Authorization', response.headers.authorization);
       }
     }
+    if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
+      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
+        localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
+      } else {
+        sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
+      }
+    }
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
@@ -1910,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:判断是否是函数
@@ -2934,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/lib/wxlogin.js

@@ -240,16 +240,21 @@ var ajax = function ajax(_ref) {
     delPendingRequest(response.config);
     loading && loading.close();
     if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
-      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId') || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
-        localStorage.setItem('ssId', response.headers.ssid);
+      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
         localStorage.setItem('token', response.headers.authorization);
         localStorage.setItem('Authorization', response.headers.authorization);
       } else {
-        sessionStorage.setItem('ssId', response.headers.ssid);
         sessionStorage.setItem('token', response.headers.authorization);
         sessionStorage.setItem('Authorization', response.headers.authorization);
       }
     }
+    if ((response.headers.ssId || response.headers.Ssid || response.headers.ssid) && (response.headers.ssId || response.headers.SsId || response.headers.ssid) !== getStorage('ssId')) {
+      if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('ssId')) {
+        localStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
+      } else {
+        sessionStorage.setItem('ssId', response.headers.ssId || response.headers.SsId || response.headers.ssid);
+      }
+    }
     if (response.status === 200) {
       if (response.data.rCode === 64 || response.data.rCode === 65 || response.data.rCode === 67 || response.data.rCode === 69) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
@@ -1910,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:判断是否是函数
@@ -2934,6 +2950,7 @@ var watermark = function watermark(option) {
   hsvTorgb: hsvTorgb,
   identical: identical,
   indexOfObj: indexOfObj,
+  isExist: isExist,
   isFunction: isFunction,
   isLogged: isLogged,
   isLogined: isLogined,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.5.29",
+  "version": "0.5.31",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -96,7 +96,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.2.81",
+    "eoss-element": "^0.2.82",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/cascader/src/main.vue

@@ -3,7 +3,7 @@ export default {
   name: 'EsCascader',
   inheritAttrs: false,
   props: {
-    value: [String, Object, Array],
+    value: [String, Array],
     data: Array,
     options: Array,
     hide: {
@@ -96,27 +96,32 @@ export default {
   render(h) {
     if (!this.hide) {
       if (this.readonly) {
-        const value = this.model
-          .map(item => {
-            if (Array.isArray(item)) {
-              return item
-                .map(ele => {
-                  if (typeof ele === 'string') {
-                    return ele;
+        let value = '';
+        if (this.model) {
+          value = Array.isArray(this.model)
+            ? this.model
+                .map((item) => {
+                  if (Array.isArray(item)) {
+                    return item
+                      .map((ele) => {
+                        if (typeof ele === 'string') {
+                          return ele;
+                        } else {
+                          return ele[this.newProps.label];
+                        }
+                      })
+                      .join(this.separator);
                   } else {
-                    return ele[this.newProps.label];
+                    if (typeof item === 'string') {
+                      return item;
+                    } else {
+                      return item[this.newProps.label];
+                    }
                   }
                 })
-                .join(this.separator);
-            } else {
-              if (typeof item === 'string') {
-                return item;
-              } else {
-                return item[this.newProps.label];
-              }
-            }
-          })
-          .join(this.multiple ? '，' : this.separator);
+                .join(this.multiple ? '，' : this.separator)
+            : this.model;
+        }
         return h(
           'div',
           {

package/packages/checkbox-group/src/main.vue

@@ -11,7 +11,7 @@
       v-else
       v-show="display"
       v-model="model"
-      v-bind="$attrs"
+      v-bind="{ valueKey: valKey, labelKey: label, ...$attrs }"
       v-on="$listeners"
     >
       <template v-if="genre === 'button'">
@@ -97,6 +97,10 @@ export default {
       type: String,
       default: ''
     },
+    separator: {
+      type: String,
+      default: '、'
+    },
     display: {
       type: Boolean,
       default: true
@@ -158,6 +162,7 @@ export default {
         return this.value === undefined ? [] : this.value;
       },
       set(val) {
+        console.log(val);
         return val;
       }
     },
@@ -186,17 +191,17 @@ export default {
           return item[this.label];
         }
         if (util.isObject(this.results[0])) {
-          return this.results
-            .map((ele) => {
-              if (ele[this.valueKey] === item) {
-                return ele[this.label];
-              }
-            })
-            .join(' ');
+          let vals = [];
+          this.results.forEach((ele) => {
+            if (ele[this.valKey] === item) {
+              vals.push(ele[this.label]);
+            }
+          });
+          return vals.join(this.separator);
         }
         return item;
       });
-      return label.join(' ');
+      return label.join(this.separator);
     }
   },
   watch: {

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

@@ -730,16 +730,17 @@ export default {
       } else if (Array.isArray(rows[field])) {
         const vals = rows[field].map((item) => {
           if (util.isObject(item)) {
-            str =
+            return (
               item[this.labelKey] ||
               item['name'] ||
               item['label'] ||
-              item['shortName'];
+              item['shortName']
+            );
           } else {
             if (data && data.length && util.isObject(data[0])) {
-              str = this.getLabel(data, item);
+              return this.getLabel(data, item);
             }
-            str = item;
+            return item;
           }
         });
         str = vals.join(this.symbol ? this.symbol : '-');
@@ -747,16 +748,17 @@ export default {
         if (this.valueToString) {
           const vals = rows[field].split(',').map((item) => {
             if (data && data.length && util.isObject(data[0])) {
-              str = this.getLabel(data, item);
+              return this.getLabel(data, item);
             }
-            str = item;
+            return item;
           });
           str = vals.join(this.symbol ? this.symbol : '-');
         } else {
           if (data && data.length && util.isObject(data[0])) {
             str = this.getLabel(data, rows[field]);
+          } else {
+            str = rows[field];
           }
-          str = rows[field];
         }
       }
       if (str && flag) {

package/packages/flow-group/src/main.vue

@@ -604,7 +604,7 @@ export default {
     handleSuccess() {
       if (this.closeDialog && this.esDialog) {
         this.esDialog.handleClose();
-      }else if (util.win.top.opener) {
+      } else if (util.win.top.opener) {
         util.win.top.close();
       }
       if (this.events && this.events.success) {

package/packages/form/src/main.vue

@@ -4039,7 +4039,8 @@ export default {
       default: 3
     },
     zoom: false,
-    showMsg: true
+    showMsg: true,
+    validated: Function
   },
   data() {
     return {
@@ -4871,6 +4872,9 @@ export default {
                   handle,
                   type
                 );
+                if (this.validated && !this.validated(models, validate)) {
+                  return reject(err);
+                }
                 let param = this.param;
                 if (handle.param) {
                   param = util.extend({}, this.param, handle.param);
@@ -4949,6 +4953,9 @@ export default {
                 handle,
                 type
               );
+              if (this.validated && !this.validated(models, validate)) {
+                return reject(err);
+              }
               let param = this.param;
               if (handle.param) {
                 param = util.extend({}, this.param, handle.param);

package/packages/input/src/main.vue

@@ -235,23 +235,27 @@ export default {
       let cls = [];
       let doms = [];
       if (this.readonly) {
-        let content = this.text;
-        if (this.model) {
-          content = this.model.replace(RegExp('\\n', 'g'), '<br/>');
-          content = content.replace(RegExp(' ', 'g'), '&nbsp;');
+        let 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/packages/login/src/main.vue

@@ -732,7 +732,7 @@ export default {
       ipad: '',
       interval: null,
       showResetPassword: false,
-      operationCheckCode:'',
+      operationCheckCode: '',
       showDownLoadApp: false,
       wechatAppid: null,
       wechatScope: null,
@@ -1041,7 +1041,8 @@ export default {
           : '') +
         '&heightflag=' +
         Math.random().toString().split('.')[1];
-
+      delete this.formData.identifyingCode;
+      delete this.formData.verificationCode;
       return this.imageCode;
     },
     getCode() {
@@ -1219,6 +1220,10 @@ export default {
               type: 'error',
               duration: 1500,
               onClose: () => {
+                this.btnText = '获取验证码';
+                this.disabled = false;
+                this.countdown = 0;
+                clearInterval(this.timer);
                 this.getImgCode();
               }
             });
@@ -1355,7 +1360,7 @@ export default {
             }
           )
             .then(() => {
-              this.operationCheckCode = results.checkCode
+              this.operationCheckCode = results.checkCode;
               if (typeof this.forget === 'string') {
                 util.win.open(this.forgetUrl);
               } else {