eoss-ui 0.4.58 → 0.4.60

package/lib/flow-list.js

@@ -264,20 +264,35 @@ var ajax = function ajax(_ref) {
             }).then(function () {
               var loginPage = getStorage('login') || getStorage('loginPage');
               if (loginPage) {
-                win.top.location.href = loginPage;
+                var src = void 0;
+                if (!startWith(loginPage, ['http', '/'])) {
+                  var pathname = win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                    src = pathname + loginPage.replace('./', '/');
+                  } else {
+                    src = pathname + loginPage.replace('./', '');
+                  }
+                } else {
+                  src = loginPage;
+                }
+                win.top.location.href = src;
               } else if (win.top.location.href.indexOf('main.html') > -1) {
                 win.top.location.href = './login.html';
               } else {
                 var hash = win.top.location.hash;
-                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                if (hash) {
                   var len = win.top.location.href.indexOf(hash);
-                  var href = win.top.location.href.slice(0, len) + '#/login';
-                  win.top.location.href = href;
+                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
                 } else {
                   win.top.location.href = '/login.html';
                 }
               }
-            }).catch(function (e) {});
+            }).catch(function (e) {
+              sessionStorage.removeItem('remind');
+            });
           }, 1000));
         }
       } else if (response.data.rCode === 61) {

package/lib/flow.js

@@ -263,20 +263,35 @@ var ajax = function ajax(_ref) {
             }).then(function () {
               var loginPage = getStorage('login') || getStorage('loginPage');
               if (loginPage) {
-                win.top.location.href = loginPage;
+                var src = void 0;
+                if (!startWith(loginPage, ['http', '/'])) {
+                  var pathname = win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                    src = pathname + loginPage.replace('./', '/');
+                  } else {
+                    src = pathname + loginPage.replace('./', '');
+                  }
+                } else {
+                  src = loginPage;
+                }
+                win.top.location.href = src;
               } else if (win.top.location.href.indexOf('main.html') > -1) {
                 win.top.location.href = './login.html';
               } else {
                 var hash = win.top.location.hash;
-                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                if (hash) {
                   var len = win.top.location.href.indexOf(hash);
-                  var href = win.top.location.href.slice(0, len) + '#/login';
-                  win.top.location.href = href;
+                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
                 } else {
                   win.top.location.href = '/login.html';
                 }
               }
-            }).catch(function (e) {});
+            }).catch(function (e) {
+              sessionStorage.removeItem('remind');
+            });
           }, 1000));
         }
       } else if (response.data.rCode === 61) {
@@ -3049,7 +3064,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 // 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/flow/src/main.vue?vue&type=template&id=fd0d2338&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=122da260&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4553,7 +4568,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=fd0d2338&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=122da260&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -9612,8 +9627,8 @@ var processReject_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var processReject = (processReject_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/startTaskRead.vue?vue&type=template&id=503131e8&
-var startTaskReadvue_type_template_id_503131e8_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/startTaskRead.vue?vue&type=template&id=44f07b3f&
+var startTaskReadvue_type_template_id_44f07b3f_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -9988,11 +10003,11 @@ var startTaskReadvue_type_template_id_503131e8_render = function () {
     1
   )
 }
-var startTaskReadvue_type_template_id_503131e8_staticRenderFns = []
-startTaskReadvue_type_template_id_503131e8_render._withStripped = true
+var startTaskReadvue_type_template_id_44f07b3f_staticRenderFns = []
+startTaskReadvue_type_template_id_44f07b3f_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/startTaskRead.vue?vue&type=template&id=503131e8&
+// CONCATENATED MODULE: ./packages/flow/src/startTaskRead.vue?vue&type=template&id=44f07b3f&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/startTaskRead.vue?vue&type=script&lang=js&
 var startTaskReadvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -10418,7 +10433,8 @@ var startTaskReadvue_type_script_lang_js_components;
           pendingId = this.pendingId,
           nextNode = this.nextNode,
           newsInfo = this.newsInfo,
-          multiple = this.multiple;
+          multiple = this.multiple,
+          type = this.type;
 
       var params = {
         url: api["zb" /* taskTransfer */],
@@ -10427,7 +10443,7 @@ var startTaskReadvue_type_script_lang_js_components;
           choiceOrgId: choiceOrgId,
           bCode: bCode,
           bName: bName,
-          nextUserId: multiple ? nextNode.nextUser.join(',') : nextNode.nextUser,
+          nextUserId: multiple && type != 'transfer' ? nextNode.nextUser.join(',') : nextNode.nextUser,
           opinion: opinion,
           pendingId: pendingId,
           notificationType: nextNode.noticeType.join(','),
@@ -10592,8 +10608,8 @@ var startTaskReadvue_type_script_lang_js_components;
 
 var startTaskRead_component = Object(componentNormalizer["a" /* default */])(
   src_startTaskReadvue_type_script_lang_js_,
-  startTaskReadvue_type_template_id_503131e8_render,
-  startTaskReadvue_type_template_id_503131e8_staticRenderFns,
+  startTaskReadvue_type_template_id_44f07b3f_render,
+  startTaskReadvue_type_template_id_44f07b3f_staticRenderFns,
   false,
   null,
   null,
@@ -12267,6 +12283,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
       }
     },
     setShrink: function setShrink() {
+      this.shrink = !this.shrink;
       this.$emit('shrink', this.shrink);
     },
     customLoading: function customLoading(type) {

package/lib/form.js

@@ -264,20 +264,35 @@ var ajax = function ajax(_ref) {
             }).then(function () {
               var loginPage = getStorage('login') || getStorage('loginPage');
               if (loginPage) {
-                win.top.location.href = loginPage;
+                var src = void 0;
+                if (!startWith(loginPage, ['http', '/'])) {
+                  var pathname = win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                    src = pathname + loginPage.replace('./', '/');
+                  } else {
+                    src = pathname + loginPage.replace('./', '');
+                  }
+                } else {
+                  src = loginPage;
+                }
+                win.top.location.href = src;
               } else if (win.top.location.href.indexOf('main.html') > -1) {
                 win.top.location.href = './login.html';
               } else {
                 var hash = win.top.location.hash;
-                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                if (hash) {
                   var len = win.top.location.href.indexOf(hash);
-                  var href = win.top.location.href.slice(0, len) + '#/login';
-                  win.top.location.href = href;
+                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
                 } else {
                   win.top.location.href = '/login.html';
                 }
               }
-            }).catch(function (e) {});
+            }).catch(function (e) {
+              sessionStorage.removeItem('remind');
+            });
           }, 1000));
         }
       } else if (response.data.rCode === 61) {

package/lib/handle-user.js

@@ -264,20 +264,35 @@ var ajax = function ajax(_ref) {
             }).then(function () {
               var loginPage = getStorage('login') || getStorage('loginPage');
               if (loginPage) {
-                win.top.location.href = loginPage;
+                var src = void 0;
+                if (!startWith(loginPage, ['http', '/'])) {
+                  var pathname = win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                    src = pathname + loginPage.replace('./', '/');
+                  } else {
+                    src = pathname + loginPage.replace('./', '');
+                  }
+                } else {
+                  src = loginPage;
+                }
+                win.top.location.href = src;
               } else if (win.top.location.href.indexOf('main.html') > -1) {
                 win.top.location.href = './login.html';
               } else {
                 var hash = win.top.location.hash;
-                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                if (hash) {
                   var len = win.top.location.href.indexOf(hash);
-                  var href = win.top.location.href.slice(0, len) + '#/login';
-                  win.top.location.href = href;
+                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
                 } else {
                   win.top.location.href = '/login.html';
                 }
               }
-            }).catch(function (e) {});
+            }).catch(function (e) {
+              sessionStorage.removeItem('remind');
+            });
           }, 1000));
         }
       } else if (response.data.rCode === 61) {

package/lib/handler.js

@@ -264,20 +264,35 @@ var ajax = function ajax(_ref) {
             }).then(function () {
               var loginPage = getStorage('login') || getStorage('loginPage');
               if (loginPage) {
-                win.top.location.href = loginPage;
+                var src = void 0;
+                if (!startWith(loginPage, ['http', '/'])) {
+                  var pathname = win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                    src = pathname + loginPage.replace('./', '/');
+                  } else {
+                    src = pathname + loginPage.replace('./', '');
+                  }
+                } else {
+                  src = loginPage;
+                }
+                win.top.location.href = src;
               } else if (win.top.location.href.indexOf('main.html') > -1) {
                 win.top.location.href = './login.html';
               } else {
                 var hash = win.top.location.hash;
-                if (hash || win.top.location.indexOf('model=') && win.top.location.indexOf('view=') && win.top.location.indexOf('render.html')) {
+                if (hash) {
                   var len = win.top.location.href.indexOf(hash);
-                  var href = win.top.location.href.slice(0, len) + '#/login';
-                  win.top.location.href = href;
+                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
                 } else {
                   win.top.location.href = '/login.html';
                 }
               }
-            }).catch(function (e) {});
+            }).catch(function (e) {
+              sessionStorage.removeItem('remind');
+            });
           }, 1000));
         }
       } else if (response.data.rCode === 61) {
@@ -2840,7 +2855,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/handler/src/main.vue?vue&type=template&id=36cec0d2&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/handler/src/main.vue?vue&type=template&id=2b2955b5&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3015,7 +3030,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/handler/src/main.vue?vue&type=template&id=36cec0d2&
+// CONCATENATED MODULE: ./packages/handler/src/main.vue?vue&type=template&id=2b2955b5&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -3169,7 +3184,6 @@ var util = __webpack_require__(0);
     lists: function lists() {
       var _this = this;
 
-      console.log(111);
       if (this.data === undefined) {
         if (Object.keys(this.hide).length) {
           this.list.forEach(function (item) {
@@ -3288,7 +3302,24 @@ var util = __webpack_require__(0);
             if (_this2.onQuit && typeof _this2.onQuit === 'function') {
               _this2.onQuit();
             } else {
-              if (util["a" /* default */].win.top.location.href.indexOf('main.html') > -1) {
+              var loginPage = util["a" /* default */].getStorage('login') || util["a" /* default */].getStorage('loginPage');
+              if (loginPage) {
+                var src = void 0;
+                if (!util["a" /* default */].startWith(loginPage, ['http', '/'])) {
+                  var pathname = util["a" /* default */].win.top.location.pathname;
+                  if (pathname !== '/') {
+                    pathname = pathname.split('/');
+                    pathname.splice(pathname.length - 1);
+                    pathname = pathname.join('/');
+                    src = pathname + loginPage.replace('./', '/');
+                  } else {
+                    src = pathname + loginPage.replace('./', '');
+                  }
+                } else {
+                  src = loginPage;
+                }
+                util["a" /* default */].win.top.location.href = src;
+              } else if (util["a" /* default */].win.top.location.href.indexOf('main.html') > -1) {
                 util["a" /* default */].win.top.location.href = './login.html';
               } else {
                 var hash = util["a" /* default */].win.top.location.hash;
@@ -3296,12 +3327,7 @@ var util = __webpack_require__(0);
                   var len = util["a" /* default */].win.top.location.href.indexOf(hash);
                   util["a" /* default */].win.top.location.href = util["a" /* default */].win.location.href.slice(0, len) + '#/login';
                 } else {
-                  var loginPage = util["a" /* default */].getStorage('login') || util["a" /* default */].getStorage('loginPage');
-                  if (loginPage) {
-                    util["a" /* default */].win.top.location.href = loginPage;
-                  } else {
-                    util["a" /* default */].win.top.location.href = '/login.html';
-                  }
+                  util["a" /* default */].win.top.location.href = '/login.html';
                 }
               }
             }