eoss-ui 0.4.61 → 0.4.63

package/lib/flow.js

@@ -247,52 +247,54 @@ var ajax = function ajax(_ref) {
       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']);
         if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
-          clearTimeout(loginMsg);
           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,
-              type: 'warning'
-            } : {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              closeOnClickModal: false,
-              type: 'warning'
-            }).then(function () {
-              var loginPage = getStorage('login') || getStorage('loginPage');
-              if (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('./', '');
+          if (!remind) {
+            clearTimeout(loginMsg);
+            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,
+                type: 'warning'
+              } : {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                closeOnClickModal: false,
+                type: 'warning'
+              }).then(function () {
+                var loginPage = getStorage('login') || getStorage('loginPage');
+                if (loginPage) {
+                  var src = void 0;
+                  if (!startWith(loginPage, ['http', '/'], true)) {
+                    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 = pathname + loginPage.replace('./', '');
+                    src = loginPage;
                   }
+                  win.top.location.href = src;
+                } else if (win.top.location.href.indexOf('main.html') > -1) {
+                  win.top.location.href = './login.html';
                 } 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) {
-                  var len = win.top.location.href.indexOf(hash);
-                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
-                } else {
-                  win.top.location.href = '/login.html';
+                  var hash = win.top.location.hash;
+                  if (hash) {
+                    var len = win.top.location.href.indexOf(hash);
+                    win.top.location.href = win.location.href.slice(0, len) + '#/login';
+                  } else {
+                    win.top.location.href = '/login.html';
+                  }
                 }
-              }
-            }).catch(function (e) {
-              sessionStorage.removeItem('remind');
-            });
-          }, 1000));
+              }).catch(function (e) {
+                sessionStorage.removeItem('remind');
+              });
+            }, 2000);
+          }
         }
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);
@@ -2081,7 +2083,7 @@ var setStorage = function setStorage(_ref14) {
  * @param {boolean} [or] - 或者（等同于||）
  **/
 var startWith = function startWith(value, reg) {
-  var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
 
   if (Array.isArray(reg)) {
     var flag = true;
@@ -10618,8 +10620,8 @@ var startTaskRead_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var startTaskRead = (startTaskRead_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/component/taskUnionExamine.vue?vue&type=template&id=23e0402f&
-var taskUnionExaminevue_type_template_id_23e0402f_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/component/taskUnionExamine.vue?vue&type=template&id=47986272&
+var taskUnionExaminevue_type_template_id_47986272_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -10834,11 +10836,11 @@ var taskUnionExaminevue_type_template_id_23e0402f_render = function () {
     1
   )
 }
-var taskUnionExaminevue_type_template_id_23e0402f_staticRenderFns = []
-taskUnionExaminevue_type_template_id_23e0402f_render._withStripped = true
+var taskUnionExaminevue_type_template_id_47986272_staticRenderFns = []
+taskUnionExaminevue_type_template_id_47986272_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/component/taskUnionExamine.vue?vue&type=template&id=23e0402f&
+// CONCATENATED MODULE: ./packages/flow/src/component/taskUnionExamine.vue?vue&type=template&id=47986272&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/taskUnionExamine.vue?vue&type=script&lang=js&
 var taskUnionExaminevue_type_script_lang_js_components;
@@ -11238,7 +11240,6 @@ var taskUnionExaminevue_type_script_lang_js_components;
           newNextUser = item.stype + '-' + item.id;
         }
       });
-      //console.log(options, newNextUser, 'newNextUser');
       this.infoList[type] = newNextUser;
     },
     getNodeType: function getNodeType() {
@@ -11317,8 +11318,8 @@ var taskUnionExaminevue_type_script_lang_js_components;
 
 var taskUnionExamine_component = Object(componentNormalizer["a" /* default */])(
   component_taskUnionExaminevue_type_script_lang_js_,
-  taskUnionExaminevue_type_template_id_23e0402f_render,
-  taskUnionExaminevue_type_template_id_23e0402f_staticRenderFns,
+  taskUnionExaminevue_type_template_id_47986272_render,
+  taskUnionExaminevue_type_template_id_47986272_staticRenderFns,
   false,
   null,
   null,

package/lib/form.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 44);
+/******/ 	return __webpack_require__(__webpack_require__.s = 43);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -248,52 +248,54 @@ var ajax = function ajax(_ref) {
       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']);
         if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
-          clearTimeout(loginMsg);
           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,
-              type: 'warning'
-            } : {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              closeOnClickModal: false,
-              type: 'warning'
-            }).then(function () {
-              var loginPage = getStorage('login') || getStorage('loginPage');
-              if (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('./', '');
+          if (!remind) {
+            clearTimeout(loginMsg);
+            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,
+                type: 'warning'
+              } : {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                closeOnClickModal: false,
+                type: 'warning'
+              }).then(function () {
+                var loginPage = getStorage('login') || getStorage('loginPage');
+                if (loginPage) {
+                  var src = void 0;
+                  if (!startWith(loginPage, ['http', '/'], true)) {
+                    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 = pathname + loginPage.replace('./', '');
+                    src = loginPage;
                   }
+                  win.top.location.href = src;
+                } else if (win.top.location.href.indexOf('main.html') > -1) {
+                  win.top.location.href = './login.html';
                 } 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) {
-                  var len = win.top.location.href.indexOf(hash);
-                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
-                } else {
-                  win.top.location.href = '/login.html';
+                  var hash = win.top.location.hash;
+                  if (hash) {
+                    var len = win.top.location.href.indexOf(hash);
+                    win.top.location.href = win.location.href.slice(0, len) + '#/login';
+                  } else {
+                    win.top.location.href = '/login.html';
+                  }
                 }
-              }
-            }).catch(function (e) {
-              sessionStorage.removeItem('remind');
-            });
-          }, 1000));
+              }).catch(function (e) {
+                sessionStorage.removeItem('remind');
+              });
+            }, 2000);
+          }
         }
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);
@@ -2082,7 +2084,7 @@ var setStorage = function setStorage(_ref14) {
  * @param {boolean} [or] - 或者（等同于||）
  **/
 var startWith = function startWith(value, reg) {
-  var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
 
   if (Array.isArray(reg)) {
     var flag = true;
@@ -2873,14 +2875,14 @@ module.exports = require("qs");
 
 /***/ }),
 
-/***/ 44:
+/***/ 43:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 // 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=0312e450&
+// 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=87903c8e&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4519,6 +4521,39 @@ var render = function () {
                                                                           )
                                                                         ),
                                                                   ]
+                                                                : (item.type ===
+                                                                    "flow-list" ||
+                                                                    item.type ===
+                                                                      "flowList") &&
+                                                                  _vm._businessId
+                                                                ? _c(
+                                                                    "es-flow-list",
+                                                                    _vm._g(
+                                                                      _vm._b(
+                                                                        {
+                                                                          attrs:
+                                                                            {
+                                                                              businessId:
+                                                                                _vm._businessId,
+                                                                            },
+                                                                        },
+                                                                        "es-flow-list",
+                                                                        _vm.handleExclAttribute(
+                                                                          {
+                                                                            data: item,
+                                                                            attrs:
+                                                                              [
+                                                                                "events",
+                                                                                "visible",
+                                                                                "type",
+                                                                              ],
+                                                                          }
+                                                                        ),
+                                                                        false
+                                                                      ),
+                                                                      item.events
+                                                                    )
+                                                                  )
                                                                 : item.type ===
                                                                   "icon"
                                                                 ? _c(
@@ -6858,6 +6893,37 @@ var render = function () {
                                                             )
                                                           ),
                                                     ]
+                                                  : (item.type ===
+                                                      "flow-list" ||
+                                                      item.type ===
+                                                        "flowList") &&
+                                                    _vm._businessId
+                                                  ? _c(
+                                                      "es-flow-list",
+                                                      _vm._g(
+                                                        _vm._b(
+                                                          {
+                                                            attrs: {
+                                                              businessId:
+                                                                _vm._businessId,
+                                                            },
+                                                          },
+                                                          "es-flow-list",
+                                                          _vm.handleExclAttribute(
+                                                            {
+                                                              data: item,
+                                                              attrs: [
+                                                                "events",
+                                                                "visible",
+                                                                "type",
+                                                              ],
+                                                            }
+                                                          ),
+                                                          false
+                                                        ),
+                                                        item.events
+                                                      )
+                                                    )
                                                   : item.type === "icon"
                                                   ? _c(
                                                       "es-icons",
@@ -9641,6 +9707,37 @@ var render = function () {
                                                                       )
                                                                     ),
                                                               ]
+                                                            : (item.type ===
+                                                                "flow-list" ||
+                                                                item.type ===
+                                                                  "flowList") &&
+                                                              _vm._businessId
+                                                            ? _c(
+                                                                "es-flow-list",
+                                                                _vm._g(
+                                                                  _vm._b(
+                                                                    {
+                                                                      attrs: {
+                                                                        businessId:
+                                                                          _vm._businessId,
+                                                                      },
+                                                                    },
+                                                                    "es-flow-list",
+                                                                    _vm.handleExclAttribute(
+                                                                      {
+                                                                        data: item,
+                                                                        attrs: [
+                                                                          "events",
+                                                                          "visible",
+                                                                          "type",
+                                                                        ],
+                                                                      }
+                                                                    ),
+                                                                    false
+                                                                  ),
+                                                                  item.events
+                                                                )
+                                                              )
                                                             : item.type ===
                                                               "icon"
                                                             ? _c(
@@ -11815,6 +11912,33 @@ var render = function () {
                                                         )
                                                       ),
                                                 ]
+                                              : (item.type === "flow-list" ||
+                                                  item.type === "flowList") &&
+                                                _vm._businessId
+                                              ? _c(
+                                                  "es-flow-list",
+                                                  _vm._g(
+                                                    _vm._b(
+                                                      {
+                                                        attrs: {
+                                                          businessId:
+                                                            _vm._businessId,
+                                                        },
+                                                      },
+                                                      "es-flow-list",
+                                                      _vm.handleExclAttribute({
+                                                        data: item,
+                                                        attrs: [
+                                                          "events",
+                                                          "visible",
+                                                          "type",
+                                                        ],
+                                                      }),
+                                                      false
+                                                    ),
+                                                    item.events
+                                                  )
+                                                )
                                               : item.type === "icon"
                                               ? _c(
                                                   "es-icons",
@@ -13171,7 +13295,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=0312e450&
+// CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=template&id=87903c8e&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(9);
@@ -16774,6 +16898,64 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -17093,6 +17275,9 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
         }
       }
       return buttons;
+    },
+    _businessId: function _businessId() {
+      return typeof this.autoId === 'string' ? this.models[this.autoId] : this.models['id'];
     }
   },
   watch: {

package/lib/handle-user.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 46);
+/******/ 	return __webpack_require__(__webpack_require__.s = 45);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -248,52 +248,54 @@ var ajax = function ajax(_ref) {
       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']);
         if (win.top.location.href.indexOf('#/login') === -1 && win.top.location.href.indexOf('/login.html') === -1) {
-          clearTimeout(loginMsg);
           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,
-              type: 'warning'
-            } : {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              closeOnClickModal: false,
-              type: 'warning'
-            }).then(function () {
-              var loginPage = getStorage('login') || getStorage('loginPage');
-              if (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('./', '');
+          if (!remind) {
+            clearTimeout(loginMsg);
+            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,
+                type: 'warning'
+              } : {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                closeOnClickModal: false,
+                type: 'warning'
+              }).then(function () {
+                var loginPage = getStorage('login') || getStorage('loginPage');
+                if (loginPage) {
+                  var src = void 0;
+                  if (!startWith(loginPage, ['http', '/'], true)) {
+                    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 = pathname + loginPage.replace('./', '');
+                    src = loginPage;
                   }
+                  win.top.location.href = src;
+                } else if (win.top.location.href.indexOf('main.html') > -1) {
+                  win.top.location.href = './login.html';
                 } 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) {
-                  var len = win.top.location.href.indexOf(hash);
-                  win.top.location.href = win.location.href.slice(0, len) + '#/login';
-                } else {
-                  win.top.location.href = '/login.html';
+                  var hash = win.top.location.hash;
+                  if (hash) {
+                    var len = win.top.location.href.indexOf(hash);
+                    win.top.location.href = win.location.href.slice(0, len) + '#/login';
+                  } else {
+                    win.top.location.href = '/login.html';
+                  }
                 }
-              }
-            }).catch(function (e) {
-              sessionStorage.removeItem('remind');
-            });
-          }, 1000));
+              }).catch(function (e) {
+                sessionStorage.removeItem('remind');
+              });
+            }, 2000);
+          }
         }
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);
@@ -2082,7 +2084,7 @@ var setStorage = function setStorage(_ref14) {
  * @param {boolean} [or] - 或者（等同于||）
  **/
 var startWith = function startWith(value, reg) {
-  var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+  var or = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
 
   if (Array.isArray(reg)) {
     var flag = true;
@@ -2848,7 +2850,7 @@ module.exports = require("qs");
 
 /***/ }),
 
-/***/ 46:
+/***/ 45:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";