eoss-ui 0.4.99 → 0.5.11

package/lib/table-form.js

@@ -98,8 +98,14 @@ module.exports =
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(7);
+/* harmony import */ var sockjs_client__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(sockjs_client__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(8);
+/* harmony import */ var stompjs__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(stompjs__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(2);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_6__);
+var _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; };
+
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
 /**
@@ -110,7 +116,9 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
  **/
 
 /* eslint-disable indent */
-var sm2 = __webpack_require__(7).sm2;
+var sm2 = __webpack_require__(9).sm2;
+
+
 
 
 
@@ -257,7 +265,7 @@ var ajax = function ajax(_ref) {
             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 ? {
+              eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].confirm(response.data.rCode === 69 ? '该账号在其他地方已登陆!' : '登录已过期，请重新登录!', '提示', response.data.rCode === 69 ? {
                 confirmButtonText: '确定',
                 closeOnClickModal: false,
                 type: 'warning'
@@ -304,7 +312,7 @@ var ajax = function ajax(_ref) {
       } else if (response.data.rCode === 61) {
         clearTimeout(initAuth);
         initAuth = setTimeout(function () {
-          Object(eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"])({
+          Object(eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"])({
             title: '请进行二次鉴权',
             closeOnClickModal: false,
             closeOnPressEscape: false,
@@ -738,6 +746,7 @@ var delUrlParam = function delUrlParam(_ref2) {
       key.forEach(function (item) {
         if (param.hasOwnProperty(item)) {
           var reg = item + '=' + param[item];
+          console.log(reg);
           if (src.indexOf(reg + '&') > -1) {
             src = src.replace(reg + '&', '');
           } else if (src.indexOf('&' + reg) > -1) {
@@ -1753,7 +1762,7 @@ var getWeekday = function getWeekday(date) {
  * @param {String} [url] - url地址
  **/
 
-var handlerUrl = function handlerUrl(url, before) {
+var handlerUrl = function handlerUrl(url, param, before) {
   var arry = url.split('?');
   if (arry.length > 2) {
     var ary = arry.splice(1, arry.length);
@@ -1775,6 +1784,10 @@ var handlerUrl = function handlerUrl(url, before) {
   } else {
     url += '?_tt=' + new Date().getTime();
   }
+  if (param) {
+    var str = queryParams(param);
+    url += '&' + str;
+  }
   if (before && before === arry[0]) {
     var pathname = win.location.pathname;
     if (pathname === '/') {
@@ -1934,7 +1947,6 @@ var isLogined = function isLogined(_ref8) {
       next = _ref8.next,
       _ref8$exclude = _ref8.exclude,
       exclude = _ref8$exclude === undefined ? [] : _ref8$exclude,
-      open = _ref8.open,
       cookie = _ref8.cookie,
       loginPage = _ref8.loginPage,
       redirect = _ref8.redirect;
@@ -1942,24 +1954,24 @@ var isLogined = function isLogined(_ref8) {
   if (cookie === undefined) {
     cookie = getParams({ name: 'cookie' });
   }
+  var pathname = win.top.location.pathname;
   if (loginPage) {
     sessionStorage.setItem('loginPage', loginPage);
     if (!startWith(loginPage, ['http', '/'], true)) {
-      var pathname = win.top.location.pathname;
       if (pathname !== '/') {
-        pathname = pathname.split('/');
-        pathname.splice(pathname.length - 1);
-        pathname = pathname.join('/');
-        loginPage = pathname + '/' + loginPage.replace('./', '');
+        var path = pathname.split('/');
+        path.splice(pathname.length - 1);
+        path = path.join('/');
+        loginPage = path + '/' + loginPage.replace('./', '');
       } else {
         loginPage = pathname + loginPage.replace('./', '');
       }
     }
   }
   var token = getStorage('token') || getStorage('Authorization');
-  var logined = getStorage('logined');
+  // const logined = getStorage('logined');
   // eslint-disable-next-line eqeqeq
-  if (token || logined || cookie == true || cookie == 1) {
+  if (token || cookie == true || cookie == 1) {
     next && next();
   } else {
     if (!token && Object.prototype.hasOwnProperty.call(to.query, 'serverId') && Object.prototype.hasOwnProperty.call(to.query, 'authType')) {
@@ -1983,40 +1995,25 @@ var isLogined = function isLogined(_ref8) {
                   deviceUnique: results.deviceUnique
                 }
               });
-              next();
+              var url = delUrlParam({
+                url: win.top.location.href,
+                key: ['serverId', 'authType', 'code', 'sessionId']
+              });
+              win.top.location.href = url;
+              setTimeout(function () {
+                win.top.location.reload();
+              }, 200);
               break;
             case 1:
               break;
             case 2:
               break;
             case 3:
-              var url = win.top.location.href;
-              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(url));
-              if (to.query.openType) {
-                switch (to.query.openType) {
-                  case 'self':
-                    win.location.href = href;
-                    break;
-                  case 'blank':
-                    win.open(href);
-                    break;
-                  case 'top':
-                    win.top.location.href = href;
-                    break;
-                  case 'parent':
-                    win.parent.location.href = href;
-                    break;
-                }
-              } else {
-                if (open) {
-                  win.open(href);
-                } else {
-                  win.top.location.href = href;
-                }
-              }
+              var href = results.authorizeUrl.replace('{redirectUri}', encodeURIComponent(win.top.location.href));
+              win.top.location.href = href;
               break;
             case 4:
-              eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
+              eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].alert(results.msg ? results.msg : '账号未绑定，账号密码登录后自动绑定！', '提示', {
                 confirmButtonText: '确定',
                 type: 'error',
                 callback: function callback() {
@@ -2036,7 +2033,7 @@ var isLogined = function isLogined(_ref8) {
             default:
           }
         } else {
-          eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].alert(res.msg, '提示', {
+          eoss_element__WEBPACK_IMPORTED_MODULE_6__["MessageBox"].alert(res.msg, '提示', {
             confirmButtonText: '确定',
             type: 'error',
             callback: function callback() {
@@ -2167,7 +2164,7 @@ var loadJs = function loadJs(_ref10) {
  **/
 var loading = function loading($loading, res) {
   if (!$loading) {
-    $loading = eoss_element__WEBPACK_IMPORTED_MODULE_4__["Loading"].service;
+    $loading = eoss_element__WEBPACK_IMPORTED_MODULE_6__["Loading"].service;
   }
   if (isObject(res)) {
     var config = extend({}, {
@@ -2526,6 +2523,70 @@ var setStorage = function setStorage(_ref14) {
   }
 };
 
+/**
+ * socket
+ * @desc:webSocket
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {String} [url] - 连接地址
+ * @param {String} [take] - 订阅地址
+ * @param {String} [debug] - 调试
+ * @param {String} [interval] - 重连间隔时间
+ **/
+function socket(options) {
+  var nextDate = 0;
+  var connect = 1;
+  return new Promise(function (resolve, reject) {
+    var wshost = getStorage('wshost') || '';
+    var option = {
+      url: wshost + _config_api__WEBPACK_IMPORTED_MODULE_0__[/* wss */ "Zb"],
+      take: _config_api__WEBPACK_IMPORTED_MODULE_0__[/* topic */ "Qb"],
+      debug: true,
+      interval: 20
+    };
+    var websocket = win.websocket || {};
+    if (options && isObject(options)) {
+      option = _extends({}, option, options);
+    }
+    var key = window.btoa(option.url);
+    if (!websocket[key]) {
+      websocket[key] = { socket: new sockjs_client__WEBPACK_IMPORTED_MODULE_4___default.a(option.url) };
+      win.websocket = websocket;
+    }
+
+    var client = websocket[key] ? websocket[key].client : null;
+    if (!client) {
+      client = websocket[key].client = stompjs__WEBPACK_IMPORTED_MODULE_5___default.a.over(websocket[key].socket);
+      !option.debug && (client.debug = null);
+    }
+    client.connect({}, function () {
+      client.subscribe(option.take, function (response) {
+        var res = JSON.parse(response.body);
+        resolve(res, function () {
+          client.disconnect();
+          win.top.websocket && win.top.websocket[key] && delete win.top.websocket[key];
+        }, client, websocket[key]);
+      });
+    }, function (error) {
+      var diffSecond = parseInt((new Date() - nextDate) / 1000, 10);
+      if (connect > 5 && diffSecond < option.interval) {
+        client.disconnect();
+        if (win.top.websocket) {
+          if (Object.keys(win.top.websocket).length > 1) {
+            delete win.top.websocket[key];
+          } else {
+            delete win.top.websocket;
+          }
+        }
+      } else {
+        win.top.websocket && win.top.websocket[key] && setTimeout(function () {
+          socket(options);
+        }, 5000);
+      }
+      reject(error);
+    });
+  });
+}
 /**
  * sum
  * @desc 求和
@@ -2778,7 +2839,6 @@ var urlJoinParams = function urlJoinParams(_ref15) {
       params[items[0]] = items[1];
     });
   }
-  '&_tt=' + new Date().getTime();
   params = extend(true, params, param);
   var str = queryParams(params);
   if (str) {
@@ -2946,6 +3006,7 @@ var watermark = function watermark(option) {
   sendMessage: sendMessage,
   setFavicon: setFavicon,
   setStorage: setStorage,
+  socket: socket,
   startWith: startWith,
   sum: sum,
   takeLeft: takeLeft,
@@ -3305,7 +3366,7 @@ var formContents = '/config/admin/online/onlineForm/render';
 
 /***/ }),
 
-/***/ 10:
+/***/ 12:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3470,8 +3531,8 @@ module.exports = require("json-bigint");
 // 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/table.vue?vue&type=template&id=b2377b8c&
-var tablevue_type_template_id_b2377b8c_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/table.vue?vue&type=template&id=3e2bccce&
+var tablevue_type_template_id_3e2bccce_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3657,20 +3718,9 @@ var tablevue_type_template_id_b2377b8c_render = function () {
                                           ? _c(
                                               "es-label",
                                               _vm._b(
-                                                {
-                                                  attrs: {
-                                                    contents: item.label,
-                                                    plain: item.plain,
-                                                    rules: item.rules,
-                                                  },
-                                                },
+                                                {},
                                                 "es-label",
-                                                item.label
-                                                  ? {
-                                                      event: item.label.event,
-                                                      events: item.label.events,
-                                                    }
-                                                  : {},
+                                                _vm.getLabel(item.label),
                                                 false
                                               )
                                             )
@@ -4351,55 +4401,65 @@ var tablevue_type_template_id_b2377b8c_render = function () {
                                                           "selector"
                                                         ? _c(
                                                             "es-selector",
-                                                            _vm._b(
-                                                              {
-                                                                attrs: {
-                                                                  readonly:
-                                                                    _vm.readonly
-                                                                      ? _vm.readonly
-                                                                      : item.readonly,
-                                                                  plain:
-                                                                    item.plain,
-                                                                },
-                                                                on: {
-                                                                  change:
-                                                                    function (
-                                                                      val
-                                                                    ) {
-                                                                      _vm.handleChange(
-                                                                        item,
+                                                            _vm._g(
+                                                              _vm._b(
+                                                                {
+                                                                  attrs: {
+                                                                    readonly:
+                                                                      _vm.readonly
+                                                                        ? _vm.readonly
+                                                                        : item.readonly,
+                                                                    plain:
+                                                                      item.plain,
+                                                                  },
+                                                                  on: {
+                                                                    change:
+                                                                      function (
                                                                         val
-                                                                      )
-                                                                    },
-                                                                },
-                                                                model: {
-                                                                  value:
-                                                                    _vm.model[
-                                                                      item.name
-                                                                    ],
-                                                                  callback:
-                                                                    function (
-                                                                      $$v
-                                                                    ) {
-                                                                      _vm.$set(
-                                                                        _vm.model,
-                                                                        item.name,
+                                                                      ) {
+                                                                        _vm.handleChange(
+                                                                          item,
+                                                                          val
+                                                                        )
+                                                                      },
+                                                                  },
+                                                                  model: {
+                                                                    value:
+                                                                      _vm.model[
+                                                                        item
+                                                                          .name
+                                                                      ],
+                                                                    callback:
+                                                                      function (
                                                                         $$v
-                                                                      )
-                                                                    },
-                                                                  expression:
-                                                                    "model[item.name]",
+                                                                      ) {
+                                                                        _vm.$set(
+                                                                          _vm.model,
+                                                                          item.name,
+                                                                          $$v
+                                                                        )
+                                                                      },
+                                                                    expression:
+                                                                      "model[item.name]",
+                                                                  },
                                                                 },
-                                                              },
-                                                              "es-selector",
+                                                                "es-selector",
+                                                                _vm.handleExclAttribute(
+                                                                  {
+                                                                    data: item,
+                                                                    attrs:
+                                                                      "label",
+                                                                  }
+                                                                ),
+                                                                false
+                                                              ),
                                                               _vm.handleExclAttribute(
                                                                 {
-                                                                  data: item,
+                                                                  data: item.events,
                                                                   attrs:
-                                                                    "label",
+                                                                    "change",
                                                                 }
-                                                              ),
-                                                              false
+                                                              )
                                                             )
                                                           )
                                                         : item.type === "icon"
@@ -6123,22 +6183,20 @@ var tablevue_type_template_id_b2377b8c_render = function () {
   )
 }
 var staticRenderFns = []
-tablevue_type_template_id_b2377b8c_render._withStripped = true
+tablevue_type_template_id_3e2bccce_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=b2377b8c&
+// CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=3e2bccce&
 
 // EXTERNAL MODULE: ./src/utils/rules.js
-var rules = __webpack_require__(10);
+var rules = __webpack_require__(12);
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/table.vue?vue&type=script&lang=js&
-//
-//
-//
-//
+var _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; };
+
 //
 //
 //
@@ -7362,6 +7420,9 @@ var util = __webpack_require__(0);
   },
 
   methods: {
+    getLabel: function getLabel(res) {
+      return typeof res === 'string' ? { contents: res } : _extends({}, res, { plain: res.plain || res.name === undefined });
+    },
     getRules: function getRules(res) {
       if (res.rules && !res.hide) {
         if (Array.isArray(res.rules)) {
@@ -7494,7 +7555,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_b2377b8c_render,
+  tablevue_type_template_id_3e2bccce_render,
   staticRenderFns,
   false,
   null,
@@ -7518,6 +7579,20 @@ table.install = function (Vue) {
 /***/ 7:
 /***/ (function(module, exports) {
 
+module.exports = require("sockjs-client");
+
+/***/ }),
+
+/***/ 8:
+/***/ (function(module, exports) {
+
+module.exports = require("stompjs");
+
+/***/ }),
+
+/***/ 9:
+/***/ (function(module, exports) {
+
 module.exports = require("sm-crypto");
 
 /***/ })