eoss-ui 0.4.99 → 0.5.11

package/lib/wxlogin.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,
@@ -3630,6 +3691,20 @@ main.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");
 
 /***/ })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.4.99",
+  "version": "0.5.11",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/button/src/main.vue

@@ -49,16 +49,7 @@ export default {
   },
   computed: {
     _type() {
-      return [
-        'default',
-        'primary',
-        'success',
-        'info',
-        'warning',
-        'danger'
-      ].includes(this.type)
-        ? this.type
-        : this.mold;
+      return this.type ? this.type : this.mold;
     }
   },
   data() {

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

@@ -345,6 +345,12 @@
               v-else-if="item.type == 'selector'"
               v-bind="exclAttribute({ data: item, attrs: 'width' })"
               v-model="scope.row[item.field]"
+              v-on="
+                exclAttribute({
+                  data: item.events,
+                  attrs: 'change'
+                })
+              "
               @change="
                 (value) => {
                   handleChange({

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

@@ -12,6 +12,7 @@
       v-if="showToolbar"
       v-bind="{
         contents: toolbars,
+        showLabel: showLabel,
         close: close,
         callBack: resetHeight,
         showFormBtn: showFormBtn,
@@ -281,6 +282,7 @@ export default {
       type: [Array, Boolean],
       default: false
     },
+    showLabel: Boolean,
     searchValue: Object,
     advanceValue: Object,
     // 是否开启序号
@@ -725,26 +727,32 @@ export default {
     },
     handleClickAddData(scope) {
       const data = JSON.parse(JSON.stringify(scope.row));
-      const index = scope.$index + 1;
-      this.datas.splice(index, 0, data);
+      let index = scope.$index + 1;
+      if (this.page) {
+        index += (this.config.pageNum - 1) * this.config.pageSize;
+      }
+      this.data.splice(index, 0, data);
       this.$emit('dataChange', 'add', data);
       this.$emit('btnClick', {
         event: 'addRow',
         row: data,
         index: index,
-        data: data
+        data: this.data
       });
     },
     handleClickDeleteData(scope) {
       const data = JSON.parse(JSON.stringify(scope.row));
-      const index = scope.$index;
-      this.datas.splice(index, 1);
+      let index = scope.$index;
+      if (this.page) {
+        index += (this.config.pageNum - 1) * this.config.pageSize;
+      }
+      this.data.splice(index, 1);
       this.$emit('dataChange', 'delete', data);
       this.$emit('btnClick', {
         event: 'deleteRow',
         row: data,
         index: index,
-        data: this.datas
+        data: this.data
       });
     },
     checkSelect(newVal) {

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

@@ -8,7 +8,8 @@
         (item.type == 'splitReading' &&
           splitReadingData &&
           splitReadingData.length > 0) ||
-        item.type != 'splitReading'
+        (item.type == 'preset' && presetData && presetData.length > 0) ||
+        (item.type != 'splitReading' && item.type != 'preset')
       "
     >
       <div class="es-flow-list-box">
@@ -336,7 +337,7 @@ export default {
             showOverflowTooltip: true,
             width: 110
           },
-           {
+          {
             label: '办理人部门',
             field: 'deptName',
             align: 'center',
@@ -456,7 +457,7 @@ export default {
                 rules: (rows) => {
                   return rows.canDelete;
                 }
-              },
+              }
               // {
               //   text: '修改',
               //   rules: (rows) => {

package/packages/form/src/main.vue

@@ -72,9 +72,7 @@
                       >
                         <es-label
                           v-if="item.label"
-                          :contents="item.label"
-                          :event="item.label.event"
-                          :events="item.label.events"
+                          v-bind="getLabel(item.label)"
                         ></es-label>
                         <span v-if="item.text || item.type === 'text'">{{
                           item.text || item.contents
@@ -249,16 +247,7 @@
                         v-if="
                           item.showLabel !== false && item.label && showLabel
                         "
-                        :contents="item.label"
-                        v-bind="
-                          item.label
-                            ? {
-                                event: item.label.event,
-                                events: item.label.events
-                              }
-                            : {}
-                        "
-                        :plain="item.plain || item.name === undefined"
+                        v-bind="getLabel(item.label)"
                       ></es-label>
                       <es-input-number
                         v-if="item.type == 'number'"
@@ -369,6 +358,12 @@
                         v-model="models[item.name]"
                         :plain="item.plain || item.name === undefined"
                         :readonly="readonly ? readonly : item.readonly"
+                        v-on="
+                          handleExclAttribute({
+                            data: item.events,
+                            attrs: 'change'
+                          })
+                        "
                         @change="
                           (val) => {
                             handleChange(item, val);
@@ -459,6 +454,12 @@
                         btn-size="medium"
                         :readonly="readonly ? readonly : item.readonly"
                         :rules="item.rules"
+                        v-on="
+                          handleExclAttribute({
+                            data: item.events,
+                            attrs: 'change'
+                          })
+                        "
                         @change="
                           (val) => {
                             handleChange(item, val);
@@ -473,6 +474,12 @@
                         v-else-if="item.type == 'selector'"
                         :readonly="readonly ? readonly : item.readonly"
                         :plain="item.plain || item.name === undefined"
+                        v-on="
+                          handleExclAttribute({
+                            data: item.events,
+                            attrs: 'change'
+                          })
+                        "
                         @change="
                           (val) => {
                             handleChange(item, val);
@@ -1191,16 +1198,7 @@
                   <es-label
                     slot="label"
                     v-if="item.showLabel !== false && item.label && showLabel"
-                    :contents="item.label"
-                    v-bind="
-                      item.label
-                        ? {
-                            event: item.label.event,
-                            events: item.label.events
-                          }
-                        : {}
-                    "
-                    :plain="item.plain || item.name === undefined"
+                    v-bind="getLabel(item.label)"
                   ></es-label>
                   <es-input-number
                     v-if="item.type == 'number'"
@@ -1387,6 +1385,12 @@
                     v-model="models[item.name]"
                     :readonly="readonly ? readonly : item.readonly"
                     :rules="item.rules"
+                    v-on="
+                      handleExclAttribute({
+                        data: item.events,
+                        attrs: 'change'
+                      })
+                    "
                     @change="
                       (val) => {
                         handleChange(item, val);
@@ -1401,6 +1405,12 @@
                     v-else-if="item.type === 'selector'"
                     :readonly="readonly ? readonly : item.readonly"
                     :plain="item.plain || item.name === undefined"
+                    v-on="
+                      handleExclAttribute({
+                        data: item.events,
+                        attrs: 'change'
+                      })
+                    "
                     @change="
                       (val) => {
                         handleChange(item, val);
@@ -1996,9 +2006,7 @@
                     <div v-else :key="index" class="es-collapse-title-handler">
                       <es-label
                         v-if="item.label"
-                        :contents="item.label"
-                        :event="item.label.event"
-                        :events="item.label.events"
+                        v-bind="getLabel(item.label)"
                       ></es-label>
                       <span v-if="item.text || item.type === 'text'">{{
                         item.text || item.contents
@@ -2161,16 +2169,7 @@
                     <es-label
                       slot="label"
                       v-if="item.showLabel !== false && item.label && showLabel"
-                      :contents="item.label"
-                      v-bind="
-                        item.label
-                          ? {
-                              event: item.label.event,
-                              events: item.label.events
-                            }
-                          : {}
-                      "
-                      :plain="item.plain || item.name === undefined"
+                      v-bind="getLabel(item.label)"
                     ></es-label>
                     <es-input-number
                       v-if="item.type == 'number'"
@@ -2357,6 +2356,12 @@
                       v-model="models[item.name]"
                       :readonly="readonly ? readonly : item.readonly"
                       :rules="item.rules"
+                      v-on="
+                        handleExclAttribute({
+                          data: item.events,
+                          attrs: 'change'
+                        })
+                      "
                       @change="
                         (val) => {
                           handleChange(item, val);
@@ -2364,13 +2369,24 @@
                       "
                     ></es-upload>
                     <es-selector
+                      v-else-if="item.type == 'selector'"
                       v-bind="
                         handleExclAttribute({ data: item, attrs: ['value'] })
                       "
                       v-model="models[item.name]"
                       :readonly="readonly ? readonly : item.readonly"
                       :plain="item.plain || item.name === undefined"
-                      v-else-if="item.type == 'selector'"
+                      v-on="
+                        handleExclAttribute({
+                          data: item.events,
+                          attrs: 'change'
+                        })
+                      "
+                      @change="
+                        (val) => {
+                          handleChange(item, val);
+                        }
+                      "
                     ></es-selector>
                     <template v-else-if="item.type === 'table'">
                       <es-data-table-form
@@ -3055,16 +3071,7 @@
                 <es-label
                   slot="label"
                   v-if="item.showLabel !== false && item.label && showLabel"
-                  :contents="item.label"
-                  v-bind="
-                    item.label
-                      ? {
-                          event: item.label.event,
-                          events: item.label.events
-                        }
-                      : {}
-                  "
-                  :plain="item.plain || item.name === undefined"
+                  v-bind="getLabel(item.label)"
                 ></es-label>
                 <es-input-number
                   v-if="item.type == 'number'"
@@ -3233,6 +3240,12 @@
                   v-model="models[item.name]"
                   :readonly="readonly ? readonly : item.readonly"
                   :rules="item.rules"
+                  v-on="
+                    handleExclAttribute({
+                      data: item.events,
+                      attrs: 'change'
+                    })
+                  "
                   @change="
                     (val) => {
                       handleChange(item, val);
@@ -3245,6 +3258,12 @@
                   v-else-if="item.type == 'selector'"
                   :readonly="readonly ? readonly : item.readonly"
                   :plain="item.plain || item.name === undefined"
+                  v-on="
+                    handleExclAttribute({
+                      data: item.events,
+                      attrs: 'change'
+                    })
+                  "
                   @change="
                     (val) => {
                       handleChange(item, val);
@@ -4344,6 +4363,11 @@ export default {
     });
   },
   methods: {
+    getLabel(res) {
+      return typeof res === 'string'
+        ? { contents: res }
+        : { ...res, plain: res.plain || res.name === undefined };
+    },
     getHeight() {
       if (
         util.hasClass(this.$parent.$el, 'el-dialog__wrapper') ||