eoss-ui 0.5.12 → 0.5.14

package/lib/theme-chalk/nav.css

@@ -1 +1 @@
-@charset "UTF-8";.es-nav,.es-nav .es-nav-main{display:inline-block;overflow:hidden}.es-nav{transition:all .2s;-webkit-transition:all .2s}.es-nav .el-menu,.es-nav .es-menu{background-color:transparent}.es-nav .es-nav-main{position:relative;height:100%;background-color:#002766;border-right:1px solid #d9d9d9}.es-nav .es-nav-main .es-nav-title{width:100%;height:45px;font-size:16px;line-height:44px;text-align:center;overflow:hidden;padding-right:32px;background-color:#096dd9;color:#fff;position:relative;z-index:1;-webkit-box-shadow:0 4px 10px 0 rgba(0,0,0,.2);box-shadow:0 4px 10px 0 rgba(0,0,0,.2)}.es-nav .es-nav-main .es-nav-title .es-collapse-handle{font-size:20px;cursor:pointer;position:absolute;right:12px;top:50%;margin-top:-10px;color:#fff}.es-nav .es-nav-main .es-nav-title .es-collapse-handle.es-icon-zengjiasuojinliang{right:50%;margin-right:-10px}.es-nav .es-nav-initial{width:70px;-webkit-box-shadow:0 6px 30px 5px rgba(0,0,0,.05),0 16px 24px 2px rgba(0,0,0,.04),0 8px 10px -5px rgba(0,0,0,.08);box-shadow:0 6px 30px 5px rgba(0,0,0,.05),0 16px 24px 2px rgba(0,0,0,.04),0 8px 10px -5px rgba(0,0,0,.08);position:relative;z-index:2;height:100%;background:#003a8c}.es-nav .es-nav-initial .el-menu-item,.es-nav .es-nav-initial .es-menu-vertical{height:auto}.es-nav .es-nav-initial .el-menu-item.is-active,.es-nav .es-nav-initial .es-menu-vertical.is-active{background:#096dd9}.es-nav.es-nav-biserial{position:relative}.es-nav.es-nav-biserial .es-nav-main{position:absolute;left:70px;top:0;bottom:0}.es-nav.es-nav-biserial .es-menu-title-vertical{margin-right:0}
+@charset "UTF-8";.es-nav,.es-nav .es-nav-main{display:inline-block;overflow:hidden}.es-nav{transition:all .2s;-webkit-transition:all .2s}.es-nav .el-menu,.es-nav .es-menu{background-color:transparent}.es-nav .es-nav-main{position:relative;height:100%;background-color:#002766;border-right:1px solid #d9d9d9}.es-nav .es-nav-main .es-nav-title{width:100%;height:45px;font-size:15px;line-height:30px;text-align:center;overflow:hidden;padding:7px 32px 7px 0;background-color:#096dd9;color:#fff;position:relative;z-index:1;-webkit-box-shadow:0 4px 10px 0 rgba(0,0,0,.2);box-shadow:0 4px 10px 0 rgba(0,0,0,.2)}.es-nav .es-nav-main .es-nav-title .es-collapse-handle{font-size:20px;cursor:pointer;position:absolute;right:12px;top:50%;margin-top:-10px;color:#fff}.es-nav .es-nav-main .es-nav-title .es-collapse-handle.es-icon-zengjiasuojinliang{right:50%;margin-right:-10px}.es-nav .es-nav-main .es-nav-title .el-tooltip{text-align:center;text-overflow:ellipsis;white-space:nowrap;overflow:hidden;position:relative;padding:0 4px}.es-nav .es-nav-main .es-nav-title .el-tooltip.es-nav-title-filter{padding-right:10px;cursor:pointer}.es-nav .es-nav-main .es-nav-title .el-tooltip.es-nav-title-filter .el-icon--right{position:absolute;right:6px;top:50%;margin-top:-4px}.es-nav .es-nav-initial{width:70px;-webkit-box-shadow:0 6px 30px 5px rgba(0,0,0,.05),0 16px 24px 2px rgba(0,0,0,.04),0 8px 10px -5px rgba(0,0,0,.08);box-shadow:0 6px 30px 5px rgba(0,0,0,.05),0 16px 24px 2px rgba(0,0,0,.04),0 8px 10px -5px rgba(0,0,0,.08);position:relative;z-index:2;height:100%;background:#003a8c}.es-nav .es-nav-initial .el-menu-item,.es-nav .es-nav-initial .es-menu-vertical{height:auto}.es-nav .es-nav-initial .el-menu-item.is-active,.es-nav .es-nav-initial .es-menu-vertical.is-active{background:#096dd9}.es-nav.es-nav-biserial{position:relative}.es-nav.es-nav-biserial .es-nav-main{position:absolute;left:70px;top:0;bottom:0}.es-nav.es-nav-biserial .es-menu-title-vertical{margin-right:0}

package/lib/tips.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 62);
+/******/ 	return __webpack_require__(__webpack_require__.s = 63);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2523,7 +2523,6 @@ var setStorage = function setStorage(_ref14) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - 连接地址
- * @param {String} [send] - 是否发送消息
  * @param {String} [take] - 订阅地址
  * @param {String} [debug] - 调试
  * @param {String} [interval] - 重连间隔时间
@@ -2531,16 +2530,8 @@ var setStorage = function setStorage(_ref14) {
  * @param {Function} [error] - 重连间隔时间
  **/
 function socket(option, vm) {
-  var options = {};
-  for (var i in option) {
-    if (i === 'send') {
-      options['isSend'] = option[i];
-    } else {
-      options[i] = option[i];
-    }
-  }
   var socket = new _webSocket__WEBPACK_IMPORTED_MODULE_4__[/* default */ "a"]();
-  socket.init(options, vm);
+  socket.init(option, vm);
   return socket;
 }
 /**
@@ -3462,7 +3453,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 62:
+/***/ 63:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3723,7 +3714,6 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
-    this.isSend = false;
   }
 
   /** socket连接 */
@@ -3751,9 +3741,7 @@ var WebSocket = function () {
       // tryTimes定义重置
       _this.connects = 1;
       // 订阅消息
-      // if (!this.isSend) {
       _this.subscribe();
-      // }
     }, function (error) {
       var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
       if (_this.connects > 5 && diffSecond < _this.interval) {

package/lib/toolbar.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 78);
+/******/ 	return __webpack_require__(__webpack_require__.s = 79);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,7 +192,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 78:
+/***/ 79:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/tree-group.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 64);
+/******/ 	return __webpack_require__(__webpack_require__.s = 65);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2523,7 +2523,6 @@ var setStorage = function setStorage(_ref14) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - 连接地址
- * @param {String} [send] - 是否发送消息
  * @param {String} [take] - 订阅地址
  * @param {String} [debug] - 调试
  * @param {String} [interval] - 重连间隔时间
@@ -2531,16 +2530,8 @@ var setStorage = function setStorage(_ref14) {
  * @param {Function} [error] - 重连间隔时间
  **/
 function socket(option, vm) {
-  var options = {};
-  for (var i in option) {
-    if (i === 'send') {
-      options['isSend'] = option[i];
-    } else {
-      options[i] = option[i];
-    }
-  }
   var socket = new _webSocket__WEBPACK_IMPORTED_MODULE_4__[/* default */ "a"]();
-  socket.init(options, vm);
+  socket.init(option, vm);
   return socket;
 }
 /**
@@ -3462,7 +3453,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 64:
+/***/ 65:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4342,7 +4333,6 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
-    this.isSend = false;
   }
 
   /** socket连接 */
@@ -4370,9 +4360,7 @@ var WebSocket = function () {
       // tryTimes定义重置
       _this.connects = 1;
       // 订阅消息
-      // if (!this.isSend) {
       _this.subscribe();
-      // }
     }, function (error) {
       var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
       if (_this.connects > 5 && diffSecond < _this.interval) {

package/lib/tree.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 63);
+/******/ 	return __webpack_require__(__webpack_require__.s = 64);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2523,7 +2523,6 @@ var setStorage = function setStorage(_ref14) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - 连接地址
- * @param {String} [send] - 是否发送消息
  * @param {String} [take] - 订阅地址
  * @param {String} [debug] - 调试
  * @param {String} [interval] - 重连间隔时间
@@ -2531,16 +2530,8 @@ var setStorage = function setStorage(_ref14) {
  * @param {Function} [error] - 重连间隔时间
  **/
 function socket(option, vm) {
-  var options = {};
-  for (var i in option) {
-    if (i === 'send') {
-      options['isSend'] = option[i];
-    } else {
-      options[i] = option[i];
-    }
-  }
   var socket = new _webSocket__WEBPACK_IMPORTED_MODULE_4__[/* default */ "a"]();
-  socket.init(options, vm);
+  socket.init(option, vm);
   return socket;
 }
 /**
@@ -3462,7 +3453,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 63:
+/***/ 64:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -4411,7 +4402,6 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
-    this.isSend = false;
   }
 
   /** socket连接 */
@@ -4439,9 +4429,7 @@ var WebSocket = function () {
       // tryTimes定义重置
       _this.connects = 1;
       // 订阅消息
-      // if (!this.isSend) {
       _this.subscribe();
-      // }
     }, function (error) {
       var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
       if (_this.connects > 5 && diffSecond < _this.interval) {

package/lib/upload.js

@@ -2522,7 +2522,6 @@ var setStorage = function setStorage(_ref14) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - 连接地址
- * @param {String} [send] - 是否发送消息
  * @param {String} [take] - 订阅地址
  * @param {String} [debug] - 调试
  * @param {String} [interval] - 重连间隔时间
@@ -2530,16 +2529,8 @@ var setStorage = function setStorage(_ref14) {
  * @param {Function} [error] - 重连间隔时间
  **/
 function socket(option, vm) {
-  var options = {};
-  for (var i in option) {
-    if (i === 'send') {
-      options['isSend'] = option[i];
-    } else {
-      options[i] = option[i];
-    }
-  }
   var socket = new _webSocket__WEBPACK_IMPORTED_MODULE_4__[/* default */ "a"]();
-  socket.init(options, vm);
+  socket.init(option, vm);
   return socket;
 }
 /**
@@ -3477,7 +3468,6 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
-    this.isSend = false;
   }
 
   /** socket连接 */
@@ -3505,9 +3495,7 @@ var WebSocket = function () {
       // tryTimes定义重置
       _this.connects = 1;
       // 订阅消息
-      // if (!this.isSend) {
       _this.subscribe();
-      // }
     }, function (error) {
       var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
       if (_this.connects > 5 && diffSecond < _this.interval) {
@@ -3640,13 +3628,13 @@ window.__store = store;
 /* 22 */,
 /* 23 */,
 /* 24 */,
-/* 25 */
+/* 25 */,
+/* 26 */
 /***/ (function(module, exports) {
 
 module.exports = require("js-base64");
 
 /***/ }),
-/* 26 */,
 /* 27 */,
 /* 28 */,
 /* 29 */,
@@ -4074,7 +4062,7 @@ var util = __webpack_require__(0);
 var store = __webpack_require__(11);
 
 // EXTERNAL MODULE: external "js-base64"
-var external_js_base64_ = __webpack_require__(25);
+var external_js_base64_ = __webpack_require__(26);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=script&lang=js&
 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; };

package/lib/utils/util.js

@@ -2440,7 +2440,6 @@ var setStorage = function setStorage(_ref14) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - 连接地址
- * @param {String} [send] - 是否发送消息
  * @param {String} [take] - 订阅地址
  * @param {String} [debug] - 调试
  * @param {String} [interval] - 重连间隔时间
@@ -2448,16 +2447,8 @@ var setStorage = function setStorage(_ref14) {
  * @param {Function} [error] - 重连间隔时间
  **/
 function socket(option, vm) {
-  var options = {};
-  for (var i in option) {
-    if (i === 'send') {
-      options['isSend'] = option[i];
-    } else {
-      options[i] = option[i];
-    }
-  }
   var socket = new _webSocket2.default();
-  socket.init(options, vm);
+  socket.init(option, vm);
   return socket;
 }
 /**

package/lib/utils/webSocket.js

@@ -29,7 +29,6 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
-    this.isSend = false;
   }
 
   /** socket连接 */
@@ -57,9 +56,7 @@ var WebSocket = function () {
       // tryTimes定义重置
       _this.connects = 1;
       // 订阅消息
-      // if (!this.isSend) {
       _this.subscribe();
-      // }
     }, function (error) {
       var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
       if (_this.connects > 5 && diffSecond < _this.interval) {

package/lib/wujie.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 66);
+/******/ 	return __webpack_require__(__webpack_require__.s = 67);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2523,7 +2523,6 @@ var setStorage = function setStorage(_ref14) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - 连接地址
- * @param {String} [send] - 是否发送消息
  * @param {String} [take] - 订阅地址
  * @param {String} [debug] - 调试
  * @param {String} [interval] - 重连间隔时间
@@ -2531,16 +2530,8 @@ var setStorage = function setStorage(_ref14) {
  * @param {Function} [error] - 重连间隔时间
  **/
 function socket(option, vm) {
-  var options = {};
-  for (var i in option) {
-    if (i === 'send') {
-      options['isSend'] = option[i];
-    } else {
-      options[i] = option[i];
-    }
-  }
   var socket = new _webSocket__WEBPACK_IMPORTED_MODULE_4__[/* default */ "a"]();
-  socket.init(options, vm);
+  socket.init(option, vm);
   return socket;
 }
 /**
@@ -3462,7 +3453,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 66:
+/***/ 67:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3727,7 +3718,6 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
-    this.isSend = false;
   }
 
   /** socket连接 */
@@ -3755,9 +3745,7 @@ var WebSocket = function () {
       // tryTimes定义重置
       _this.connects = 1;
       // 订阅消息
-      // if (!this.isSend) {
       _this.subscribe();
-      // }
     }, function (error) {
       var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
       if (_this.connects > 5 && diffSecond < _this.interval) {

package/lib/wxlogin.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 67);
+/******/ 	return __webpack_require__(__webpack_require__.s = 68);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -2523,7 +2523,6 @@ var setStorage = function setStorage(_ref14) {
  * @author huangbo
  * @date 2022年5月7日
  * @param {String} [url] - 连接地址
- * @param {String} [send] - 是否发送消息
  * @param {String} [take] - 订阅地址
  * @param {String} [debug] - 调试
  * @param {String} [interval] - 重连间隔时间
@@ -2531,16 +2530,8 @@ var setStorage = function setStorage(_ref14) {
  * @param {Function} [error] - 重连间隔时间
  **/
 function socket(option, vm) {
-  var options = {};
-  for (var i in option) {
-    if (i === 'send') {
-      options['isSend'] = option[i];
-    } else {
-      options[i] = option[i];
-    }
-  }
   var socket = new _webSocket__WEBPACK_IMPORTED_MODULE_4__[/* default */ "a"]();
-  socket.init(options, vm);
+  socket.init(option, vm);
   return socket;
 }
 /**
@@ -3462,7 +3453,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 67:
+/***/ 68:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3681,7 +3672,6 @@ var WebSocket = function () {
     this.connects = 1;
     this.recon = false;
     this.sendTimeout = null;
-    this.isSend = false;
   }
 
   /** socket连接 */
@@ -3709,9 +3699,7 @@ var WebSocket = function () {
       // tryTimes定义重置
       _this.connects = 1;
       // 订阅消息
-      // if (!this.isSend) {
       _this.subscribe();
-      // }
     }, function (error) {
       var diffSecond = parseInt((new Date() - _this.nextDate) / 1000, 10);
       if (_this.connects > 5 && diffSecond < _this.interval) {

package/package.json

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

package/packages/checkbox-group/src/main.vue

@@ -57,15 +57,13 @@
 import { findSysCode } from 'eoss-ui/src/config/api.js';
 import store from 'eoss-ui/src/utils/store';
 import util from 'eoss-ui/src/utils/util';
+import bus from 'eoss-ui/src/utils/bus';
 export default {
   name: 'EsCheckboxGroup',
   inheritAttrs: false,
   inject: {
     esForm: {
       default: ''
-    },
-    sysCodes: {
-      default: ''
     }
   },
   props: {
@@ -226,30 +224,11 @@ export default {
       handler() {
         this.url && this.getData(this.url);
       }
-    },
-    sysCodes: {
-      deep: true,
-      handler(val) {
-        if (
-          this.canceled &&
-          val &&
-          ((this.sysCode && val[this.sysCode]) ||
-            (this.dataKey && val[this.dataKey]))
-        ) {
-          if (this.parseData) {
-            this.options = this.parseData(
-              JSON.parse(JSON.stringify(val[this.sysCode || this.dataKey]))
-            );
-          } else {
-            this.options = JSON.parse(
-              JSON.stringify(val[this.sysCode || this.dataKey])
-            );
-          }
-        }
-      }
     }
   },
-  created() {},
+  created() {
+    this.bindEventBus();
+  },
   mounted() {},
   methods: {
     getData(url, sysCode) {
@@ -283,11 +262,10 @@ export default {
           if (res.rCode === 0) {
             this.options = JSON.parse(JSON.stringify(res.results));
             if (sysCode || this.dataKey) {
-              this.esForm &&
-                this.esForm.setSysCodes(
-                  sysCode || this.dataKey,
-                  JSON.parse(JSON.stringify(this.options))
-                );
+              bus.$emit(
+                sysCode || this.dataKey,
+                JSON.parse(JSON.stringify(this.options))
+              );
               store.set(sysCode, JSON.parse(JSON.stringify(res.results)));
             }
           } else {
@@ -315,7 +293,19 @@ export default {
         );
       }
       return util.isObject(res) ? { ...attrs, ...res } : attrs;
+    },
+    setOptions(val) {
+      this.options = val;
+    },
+    bindEventBus() {
+      bus.$on(this.sysCode || this.dataKey, this.setOptions);
+    },
+    unbindEventBus() {
+      bus.$off(this.sysCode || this.dataKey, this.setOptions);
     }
+  },
+  beforeDestroy() {
+    this.unbindEventBus();
   }
 };
 </script>

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

@@ -1,18 +1,14 @@
 <template>
   <column v-bind="$attrs" v-on="$listeners">
-    <template v-if="childrens && childrens.length">
+    <template v-if="childrens.length">
       <template v-for="(item, index) in childrens">
         <children
           v-if="item.hide !== true"
           :key="index"
           v-bind="{
             ...$attrs,
-            filterIcon: false,
-            item: item,
-            width: item.width,
-            index: index,
-            children: item.children,
-            childHead: item.childHead
+            ...item,
+            indexs: index
           }"
           v-on="$listeners"
         ></children
@@ -33,7 +29,7 @@ export default {
   },
   computed: {
     childrens() {
-      return this.children || this.childHead;
+      return this.children || this.childHead || [];
     }
   }
 };