eoss-ui 0.4.56 → 0.4.57

package/lib/form.js

@@ -249,7 +249,9 @@ var ajax = function ajax(_ref) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
         if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
           clearTimeout(loginMsg);
-          loginMsg = setTimeout(function () {
+          var remind = sessionStorage.getItem('remind');
+          !remind && (loginMsg = setTimeout(function () {
+            sessionStorage.setItem('remind', 1);
             eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
               confirmButtonText: '确定',
               closeOnClickModal: false,
@@ -276,7 +278,7 @@ var ajax = function ajax(_ref) {
                 }
               }
             }).catch(function (e) {});
-          }, 1000);
+          }, 1000));
         }
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);
@@ -2862,7 +2864,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=7011090d&
+// 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=0312e450&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -13153,7 +13155,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=7011090d&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=0312e450&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -17439,7 +17441,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
                   switch (_context2.prev = _context2.next) {
                     case 0:
                       if (valid) {
-                        _this7.$emit('submit', _this7.models, res);
+                        _this7.$emit('submit', _this7.getNewValue(util["a" /* default */].extend({}, _this7._value, _this7.models), res), res);
                       } else {
                         _this7.setScroll(valid, triggers, _this7.$refs.scrollbar);
                       }
@@ -17466,21 +17468,21 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       } else if (res.event === 'stepPrev') {
         this.stepActive -= 1;
         this.$emit('stepChange', this.stepActive);
-        this.$emit('stepPrev', res, this.models, this.getNewValue(this.models, res));
+        this.$emit('stepPrev', res, this.models, this.getNewValue(util["a" /* default */].extend({}, this._value, this.models), res));
       } else if (res.event === 'stepNext') {
         this.$refs.esForm.validate(function (valid, fields, triggers) {
           if (valid) {
             _this7.stepActive += 1;
             _this7.$emit('stepChange', _this7.stepActive);
-            _this7.$emit('stepNext', res, _this7.models, _this7.getNewValue(_this7.models, res));
+            _this7.$emit('stepNext', res, _this7.models, _this7.getNewValue(util["a" /* default */].extend({}, _this7._value, _this7.models), res));
           } else {
             _this7.setScroll(valid, triggers, _this7.$refs.scrollbar);
           }
         });
       } else if (res.verify === false) {
-        this.$emit('click', res, this.models, this.getNewValue(this.models, res));
+        this.$emit('click', res, this.models, this.getNewValue(util["a" /* default */].extend({}, this._value, this.models), res));
       } else {
-        this.$emit('click', res, this.models, this.getNewValue(this.models, res));
+        this.$emit('click', res, this.models, this.getNewValue(util["a" /* default */].extend({}, this._value, this.models), res));
       }
     },
     IdCardToInfo: function IdCardToInfo(id, res, type) {
@@ -17525,25 +17527,25 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       var _this8 = this;
 
       if (Object.prototype.hasOwnProperty.call(a, 'idCard')) {
-        var _obj = this.IdCardToInfo(b, a);
-        if (_obj) {
+        var obj = this.IdCardToInfo(b, a);
+        if (obj) {
           if (Array.isArray(a.idCard)) {
             a.idCard.forEach(function (item) {
               if ((typeof item === 'undefined' ? 'undefined' : _typeof(item)) === 'object') {
                 for (var i in item) {
                   if (typeof item[i] === 'string') {
-                    _this8.$set(_this8.models, i, _obj[item[i]]);
+                    _this8.$set(_this8.models, i, obj[item[i]]);
                   } else {
-                    _this8.$set(_this8.models, i, item[i][_obj.sex]);
+                    _this8.$set(_this8.models, i, item[i][obj.sex]);
                   }
                 }
               } else {
-                _this8.$set(_this8.models, item, _obj[item]);
+                _this8.$set(_this8.models, item, obj[item]);
               }
             });
           } else {
-            this.$set(this.models, 'age', _obj.age);
-            this.$set(this.models, 'sex', _obj.sex);
+            this.$set(this.models, 'age', obj.age);
+            this.$set(this.models, 'sex', obj.sex);
           }
         }
       }
@@ -17870,7 +17872,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
           models[handle.table] = handle.join ? ids.join(',') : ids;
         }
       }
-
+      var obj = JSON.parse(JSON.stringify(models));
       if (this.within) {
         //within:把提交数据装到指定属性中
         var newData = {};
@@ -17895,11 +17897,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       if (this.formatSubmit) {
         //formatSubmit:提交数据装到masterData或者指定属性中
         var masterData = {};
-        var _obj2 = JSON.parse(JSON.stringify(models));
         if (typeof this.formatSubmit === 'string') {
-          masterData[this.formatSubmit] = _obj2;
+          masterData[this.formatSubmit] = obj;
         } else {
-          masterData['masterData'] = _obj2;
+          masterData['masterData'] = obj;
         }
         models = masterData;
       }

package/lib/handle-user.js

@@ -249,7 +249,9 @@ var ajax = function ajax(_ref) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
         if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
           clearTimeout(loginMsg);
-          loginMsg = setTimeout(function () {
+          var remind = sessionStorage.getItem('remind');
+          !remind && (loginMsg = setTimeout(function () {
+            sessionStorage.setItem('remind', 1);
             eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
               confirmButtonText: '确定',
               closeOnClickModal: false,
@@ -276,7 +278,7 @@ var ajax = function ajax(_ref) {
                 }
               }
             }).catch(function (e) {});
-          }, 1000);
+          }, 1000));
         }
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);

package/lib/handler.js

@@ -249,7 +249,9 @@ var ajax = function ajax(_ref) {
         removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'deviceUnique', 'menus', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
         if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
           clearTimeout(loginMsg);
-          loginMsg = setTimeout(function () {
+          var remind = sessionStorage.getItem('remind');
+          !remind && (loginMsg = setTimeout(function () {
+            sessionStorage.setItem('remind', 1);
             eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
               confirmButtonText: '确定',
               closeOnClickModal: false,
@@ -276,7 +278,7 @@ var ajax = function ajax(_ref) {
                 }
               }
             }).catch(function (e) {});
-          }, 1000);
+          }, 1000));
         }
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);