eoss-ui 0.5.68 → 0.5.70

package/lib/data-table.js

@@ -153,21 +153,17 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
  **/
 // 请求
-var pendingRequest = new Map();
-function getRequestKey(config) {
-  var method = config.method,
-      url = config.url,
-      params = config.params,
-      data = config.data;
-
-  return [method, url, qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(params), qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data)].join('&');
-};
-function delPendingRequest(config) {
-  var requestKey = getRequestKey(config);
-  if (pendingRequest.has(requestKey)) {
-    pendingRequest.delete(requestKey);
-  }
-}
+// const pendingRequest = new Map();
+// function getRequestKey(config) {
+//   const { method, url, params, data } = config;
+//   return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
+// };
+// function delPendingRequest(config) {
+//   let requestKey = getRequestKey(config);
+//   if (pendingRequest.has(requestKey)) {
+//     pendingRequest.delete(requestKey);
+//   }
+// }
 var ajax = function ajax(_ref) {
   var headers = _ref.headers,
       method = _ref.method,
@@ -216,30 +212,32 @@ var ajax = function ajax(_ref) {
   http.interceptors.request.use(function (config) {
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
-    var requestKey = getRequestKey(config);
-    // 判断请求是否重复
-    if (pendingRequest.has(requestKey)) {
-      // 取消上次请求
-      var cancel = pendingRequest.get(requestKey);
-      cancel();
-      // 删除请求信息
-      pendingRequest.delete(requestKey);
-    }
-    // 把请求信息,添加请求到map当中
-    // 生成取消方法
-    config.cancelToken = config.cancelToken || new axios__WEBPACK_IMPORTED_MODULE_1___default.a.CancelToken(function (cancel) {
-      // 把取消方法添加到map
-      if (!pendingRequest.has(requestKey)) {
-        pendingRequest.set(requestKey, cancel);
-      }
-    });
+    // let requestKey = getRequestKey(config);
+    // // 判断请求是否重复
+    // if (pendingRequest.has(requestKey)) {
+    //   // 取消上次请求
+    //   let cancel = pendingRequest.get(requestKey);
+    //   cancel();
+    //   // 删除请求信息
+    //   pendingRequest.delete(requestKey);
+    // }
+    // // 把请求信息,添加请求到map当中
+    // // 生成取消方法
+    // config.cancelToken =
+    //   config.cancelToken ||
+    //   new axios.CancelToken(cancel => {
+    //     // 把取消方法添加到map
+    //     if (!pendingRequest.has(requestKey)) {
+    //       pendingRequest.set(requestKey, cancel);
+    //     }
+    //   });
     return config;
   }, function (err) {
     return err;
   });
   // 响应拦截
   http.interceptors.response.use(function (response) {
-    delPendingRequest(response.config);
+    // delPendingRequest(response.config);
     loading && loading.close();
     if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
       if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
@@ -356,9 +354,9 @@ var ajax = function ajax(_ref) {
     }
   }, function (error) {
     loading && loading.close();
-    if (!axios__WEBPACK_IMPORTED_MODULE_1___default.a.isCancel(error)) {
-      delPendingRequest(error.config || {});
-    }
+    // if (!axios.isCancel(error)) {
+    //   delPendingRequest(error.config || {});
+    // }
     if (error && error.response) {
       if (error.response.status) {
         switch (error.response.status) {
@@ -3765,40 +3763,40 @@ module.exports = require("stompjs");
 module.exports = require("sm-crypto");
 
 /***/ }),
-/* 11 */,
-/* 12 */
+/* 11 */
+/***/ (function(module, exports) {
+
+module.exports = require("throttle-debounce");
+
+/***/ }),
+/* 12 */,
+/* 13 */
 /***/ (function(module, exports) {
 
 module.exports = require("babel-runtime/regenerator");
 
 /***/ }),
-/* 13 */,
-/* 14 */
+/* 14 */,
+/* 15 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15);
+/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16);
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(vue__WEBPACK_IMPORTED_MODULE_0__);
 
 
 /* harmony default export */ __webpack_exports__["a"] = (new vue__WEBPACK_IMPORTED_MODULE_0___default.a());
 
 /***/ }),
-/* 15 */
+/* 16 */
 /***/ (function(module, exports) {
 
 module.exports = require("vue");
 
 /***/ }),
-/* 16 */,
 /* 17 */,
 /* 18 */,
-/* 19 */
-/***/ (function(module, exports) {
-
-module.exports = require("throttle-debounce");
-
-/***/ }),
+/* 19 */,
 /* 20 */,
 /* 21 */,
 /* 22 */,
@@ -3818,8 +3816,8 @@ module.exports = require("throttle-debounce");
 // 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/data-table/src/main.vue?vue&type=template&id=5d38af04&
-var mainvue_type_template_id_5d38af04_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=1e1368ab&
+var mainvue_type_template_id_1e1368ab_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3948,8 +3946,12 @@ var mainvue_type_template_id_5d38af04_render = function () {
                         ? [
                             item.type === "sort"
                               ? _c("el-table-column", {
-                                  key: index,
-                                  attrs: { width: "32" },
+                                  key: item.key || index,
+                                  attrs: {
+                                    width: "32",
+                                    prop: "id",
+                                    label: " ",
+                                  },
                                   scopedSlots: _vm._u([
                                     {
                                       key: "default",
@@ -3971,7 +3973,7 @@ var mainvue_type_template_id_5d38af04_render = function () {
                               ? _c(
                                   "el-table-column",
                                   _vm._b(
-                                    { key: index },
+                                    { key: item.key || index },
                                     "el-table-column",
                                     _vm.dragSort
                                       ? Object.assign({}, item, {
@@ -4126,16 +4128,16 @@ var mainvue_type_template_id_5d38af04_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_5d38af04_render._withStripped = true
+mainvue_type_template_id_1e1368ab_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=5d38af04&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=1e1368ab&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
 
 // EXTERNAL MODULE: external "throttle-debounce"
-var external_throttle_debounce_ = __webpack_require__(19);
+var external_throttle_debounce_ = __webpack_require__(11);
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=44b7ff61&
 var childrenvue_type_template_id_44b7ff61_render = function () {
@@ -4912,7 +4914,7 @@ columnvue_type_template_id_2dabb50c_render._withStripped = true
 // CONCATENATED MODULE: ./packages/data-table/src/column.vue?vue&type=template&id=2dabb50c&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
-var regenerator_ = __webpack_require__(12);
+var regenerator_ = __webpack_require__(13);
 var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
 
 // EXTERNAL MODULE: ./src/utils/util.js
@@ -6086,7 +6088,7 @@ var sizer_component = Object(componentNormalizer["a" /* default */])(
 
 /* harmony default export */ var sizer = (sizer_component.exports);
 // EXTERNAL MODULE: ./src/utils/bus.js
-var bus = __webpack_require__(14);
+var bus = __webpack_require__(15);
 
 // EXTERNAL MODULE: external "qs"
 var external_qs_ = __webpack_require__(4);
@@ -6268,6 +6270,8 @@ var mainvue_type_script_lang_js_components, _watch;
 //
 //
 //
+//
+//
 
 
 
@@ -6578,7 +6582,8 @@ var mainvue_type_script_lang_js_components, _watch;
         });
         if (this.dragSort && !types.includes('sort')) {
           thead.push({
-            type: 'sort'
+            type: 'sort',
+            key: 'es-sort'
           });
         }
         if (this.checkbox && !types.includes('selection')) {
@@ -6588,7 +6593,8 @@ var mainvue_type_script_lang_js_components, _watch;
             align: 'center',
             fixed: 'left',
             selectable: this.selectable,
-            reserveSelection: this.reserveSelection
+            reserveSelection: this.reserveSelection,
+            key: 'es-checkbox'
           });
         }
         if (this.numbers && !types.includes('index')) {
@@ -6605,7 +6611,8 @@ var mainvue_type_script_lang_js_components, _watch;
             align: 'center',
             fixed: 'left',
             index: index,
-            filterIcon: this.filter ? 'es-icon-biao' : undefined
+            filterIcon: this.filter ? 'es-icon-biao' : undefined,
+            key: 'es-index'
           });
         }
         if (this.theadData.length) {
@@ -6778,12 +6785,14 @@ var mainvue_type_script_lang_js_components, _watch;
       this.doLayout();
     }
   }, _watch),
-  created: function created() {
+  beforeCreate: function beforeCreate() {
     var _this2 = this;
 
     this.getTableData = Object(external_throttle_debounce_["debounce"])(300, function (res) {
       _this2.getTableDatas(res);
     });
+  },
+  created: function created() {
     if (Array.isArray(this.thead) && this.thead.length) {
       this.getOptions(this.thead);
     }
@@ -7555,7 +7564,7 @@ var mainvue_type_script_lang_js_components, _watch;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_5d38af04_render,
+  mainvue_type_template_id_1e1368ab_render,
   staticRenderFns,
   false,
   null,

package/lib/date-picker.js

@@ -154,21 +154,17 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
  **/
 // 请求
-var pendingRequest = new Map();
-function getRequestKey(config) {
-  var method = config.method,
-      url = config.url,
-      params = config.params,
-      data = config.data;
-
-  return [method, url, qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(params), qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data)].join('&');
-};
-function delPendingRequest(config) {
-  var requestKey = getRequestKey(config);
-  if (pendingRequest.has(requestKey)) {
-    pendingRequest.delete(requestKey);
-  }
-}
+// const pendingRequest = new Map();
+// function getRequestKey(config) {
+//   const { method, url, params, data } = config;
+//   return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
+// };
+// function delPendingRequest(config) {
+//   let requestKey = getRequestKey(config);
+//   if (pendingRequest.has(requestKey)) {
+//     pendingRequest.delete(requestKey);
+//   }
+// }
 var ajax = function ajax(_ref) {
   var headers = _ref.headers,
       method = _ref.method,
@@ -217,30 +213,32 @@ var ajax = function ajax(_ref) {
   http.interceptors.request.use(function (config) {
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
-    var requestKey = getRequestKey(config);
-    // 判断请求是否重复
-    if (pendingRequest.has(requestKey)) {
-      // 取消上次请求
-      var cancel = pendingRequest.get(requestKey);
-      cancel();
-      // 删除请求信息
-      pendingRequest.delete(requestKey);
-    }
-    // 把请求信息,添加请求到map当中
-    // 生成取消方法
-    config.cancelToken = config.cancelToken || new axios__WEBPACK_IMPORTED_MODULE_1___default.a.CancelToken(function (cancel) {
-      // 把取消方法添加到map
-      if (!pendingRequest.has(requestKey)) {
-        pendingRequest.set(requestKey, cancel);
-      }
-    });
+    // let requestKey = getRequestKey(config);
+    // // 判断请求是否重复
+    // if (pendingRequest.has(requestKey)) {
+    //   // 取消上次请求
+    //   let cancel = pendingRequest.get(requestKey);
+    //   cancel();
+    //   // 删除请求信息
+    //   pendingRequest.delete(requestKey);
+    // }
+    // // 把请求信息,添加请求到map当中
+    // // 生成取消方法
+    // config.cancelToken =
+    //   config.cancelToken ||
+    //   new axios.CancelToken(cancel => {
+    //     // 把取消方法添加到map
+    //     if (!pendingRequest.has(requestKey)) {
+    //       pendingRequest.set(requestKey, cancel);
+    //     }
+    //   });
     return config;
   }, function (err) {
     return err;
   });
   // 响应拦截
   http.interceptors.response.use(function (response) {
-    delPendingRequest(response.config);
+    // delPendingRequest(response.config);
     loading && loading.close();
     if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
       if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
@@ -357,9 +355,9 @@ var ajax = function ajax(_ref) {
     }
   }, function (error) {
     loading && loading.close();
-    if (!axios__WEBPACK_IMPORTED_MODULE_1___default.a.isCancel(error)) {
-      delPendingRequest(error.config || {});
-    }
+    // if (!axios.isCancel(error)) {
+    //   delPendingRequest(error.config || {});
+    // }
     if (error && error.response) {
       if (error.response.status) {
         switch (error.response.status) {

package/lib/dialog.js

@@ -153,21 +153,17 @@ var JSONbigToString = json_bigint__WEBPACK_IMPORTED_MODULE_3___default()({ store
  * @param {Array} [encodes] - 需要对参数值进行encodeURIComponent编码的参数值名称
  **/
 // 请求
-var pendingRequest = new Map();
-function getRequestKey(config) {
-  var method = config.method,
-      url = config.url,
-      params = config.params,
-      data = config.data;
-
-  return [method, url, qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(params), qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data)].join('&');
-};
-function delPendingRequest(config) {
-  var requestKey = getRequestKey(config);
-  if (pendingRequest.has(requestKey)) {
-    pendingRequest.delete(requestKey);
-  }
-}
+// const pendingRequest = new Map();
+// function getRequestKey(config) {
+//   const { method, url, params, data } = config;
+//   return [method, url, qs.stringify(params), qs.stringify(data)].join('&');
+// };
+// function delPendingRequest(config) {
+//   let requestKey = getRequestKey(config);
+//   if (pendingRequest.has(requestKey)) {
+//     pendingRequest.delete(requestKey);
+//   }
+// }
 var ajax = function ajax(_ref) {
   var headers = _ref.headers,
       method = _ref.method,
@@ -216,30 +212,32 @@ var ajax = function ajax(_ref) {
   http.interceptors.request.use(function (config) {
     config.headers.common = getStorage();
     // 根据请求的信息(请求方式,url,请求get/post数据),产生map的key
-    var requestKey = getRequestKey(config);
-    // 判断请求是否重复
-    if (pendingRequest.has(requestKey)) {
-      // 取消上次请求
-      var cancel = pendingRequest.get(requestKey);
-      cancel();
-      // 删除请求信息
-      pendingRequest.delete(requestKey);
-    }
-    // 把请求信息,添加请求到map当中
-    // 生成取消方法
-    config.cancelToken = config.cancelToken || new axios__WEBPACK_IMPORTED_MODULE_1___default.a.CancelToken(function (cancel) {
-      // 把取消方法添加到map
-      if (!pendingRequest.has(requestKey)) {
-        pendingRequest.set(requestKey, cancel);
-      }
-    });
+    // let requestKey = getRequestKey(config);
+    // // 判断请求是否重复
+    // if (pendingRequest.has(requestKey)) {
+    //   // 取消上次请求
+    //   let cancel = pendingRequest.get(requestKey);
+    //   cancel();
+    //   // 删除请求信息
+    //   pendingRequest.delete(requestKey);
+    // }
+    // // 把请求信息,添加请求到map当中
+    // // 生成取消方法
+    // config.cancelToken =
+    //   config.cancelToken ||
+    //   new axios.CancelToken(cancel => {
+    //     // 把取消方法添加到map
+    //     if (!pendingRequest.has(requestKey)) {
+    //       pendingRequest.set(requestKey, cancel);
+    //     }
+    //   });
     return config;
   }, function (err) {
     return err;
   });
   // 响应拦截
   http.interceptors.response.use(function (response) {
-    delPendingRequest(response.config);
+    // delPendingRequest(response.config);
     loading && loading.close();
     if (response.headers.authorization && response.headers.authorization !== getStorage('token')) {
       if (localStorage.getItem('storage') === 'localStorage' || localStorage.getItem('token') || localStorage.getItem('Authorization')) {
@@ -356,9 +354,9 @@ var ajax = function ajax(_ref) {
     }
   }, function (error) {
     loading && loading.close();
-    if (!axios__WEBPACK_IMPORTED_MODULE_1___default.a.isCancel(error)) {
-      delPendingRequest(error.config || {});
-    }
+    // if (!axios.isCancel(error)) {
+    //   delPendingRequest(error.config || {});
+    // }
     if (error && error.response) {
       if (error.response.status) {
         switch (error.response.status) {
@@ -3766,31 +3764,31 @@ module.exports = require("sm-crypto");
 
 /***/ }),
 /* 11 */,
-/* 12 */
+/* 12 */,
+/* 13 */
 /***/ (function(module, exports) {
 
 module.exports = require("babel-runtime/regenerator");
 
 /***/ }),
-/* 13 */,
-/* 14 */
+/* 14 */,
+/* 15 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(15);
+/* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(16);
 /* harmony import */ var vue__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(vue__WEBPACK_IMPORTED_MODULE_0__);
 
 
 /* harmony default export */ __webpack_exports__["a"] = (new vue__WEBPACK_IMPORTED_MODULE_0___default.a());
 
 /***/ }),
-/* 15 */
+/* 16 */
 /***/ (function(module, exports) {
 
 module.exports = require("vue");
 
 /***/ }),
-/* 16 */,
 /* 17 */,
 /* 18 */,
 /* 19 */,
@@ -3828,7 +3826,7 @@ module.exports = require("wujie-vue2");
 // 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/dialog/src/main.vue?vue&type=template&id=39199bdc&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/main.vue?vue&type=template&id=55a176e4&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3857,15 +3855,16 @@ var render = function () {
             "update:visible": function ($event) {
               _vm.show = $event
             },
-            close: _vm.handleClosed,
-            scale: _vm.handleScale,
           },
         },
         "el-dialog",
         _vm.$attrs,
         false
       ),
-      _vm.$listeners
+      Object.assign({}, _vm.$listeners, {
+        close: _vm.handleClosed,
+        scale: _vm.handleScale,
+      })
     ),
     [
       _vm._t("default"),
@@ -4342,10 +4341,10 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=39199bdc&
+// CONCATENATED MODULE: ./packages/dialog/src/main.vue?vue&type=template&id=55a176e4&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
-var regenerator_ = __webpack_require__(12);
+var regenerator_ = __webpack_require__(13);
 var regenerator_default = /*#__PURE__*/__webpack_require__.n(regenerator_);
 
 // EXTERNAL MODULE: external "wujie-vue2"
@@ -4356,7 +4355,7 @@ var external_wujie_vue2_default = /*#__PURE__*/__webpack_require__.n(external_wu
 var util = __webpack_require__(0);
 
 // EXTERNAL MODULE: ./src/utils/bus.js
-var bus = __webpack_require__(14);
+var bus = __webpack_require__(15);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/dialog/src/main.vue?vue&type=script&lang=js&
 
@@ -4626,8 +4625,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 //
 //
 //
-//
-//
 
 
 
@@ -4872,6 +4869,7 @@ var mainvue_type_script_lang_js_bus = external_wujie_vue2_default.a.bus;
       this.show = false;
       this.$emit('close', res, this);
       if (this.closeParent && this.esDialog) {
+        console.log(12121);
         this.esDialog.handleClosed(res);
       }
     },