eoss-ui 0.4.85 → 0.4.86

package/lib/button-group.js

@@ -452,6 +452,10 @@ var ajax = function ajax(_ref) {
     if (!header['content-type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
+  } else {
+    if (!header['content-type']) {
+      header['content-type'] = 'application/json;charset=UTF-8';
+    }
   }
   return http({
     method: method,

package/lib/button.js

@@ -452,6 +452,10 @@ var ajax = function ajax(_ref) {
     if (!header['content-type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
+  } else {
+    if (!header['content-type']) {
+      header['content-type'] = 'application/json;charset=UTF-8';
+    }
   }
   return http({
     method: method,

package/lib/checkbox-group.js

@@ -452,6 +452,10 @@ var ajax = function ajax(_ref) {
     if (!header['content-type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
+  } else {
+    if (!header['content-type']) {
+      header['content-type'] = 'application/json;charset=UTF-8';
+    }
   }
   return http({
     method: method,

package/lib/data-table-form.js

@@ -451,6 +451,10 @@ var ajax = function ajax(_ref) {
     if (!header['content-type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
+  } else {
+    if (!header['content-type']) {
+      header['content-type'] = 'application/json;charset=UTF-8';
+    }
   }
   return http({
     method: method,

package/lib/data-table.js

@@ -451,6 +451,10 @@ var ajax = function ajax(_ref) {
     if (!header['content-type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
+  } else {
+    if (!header['content-type']) {
+      header['content-type'] = 'application/json;charset=UTF-8';
+    }
   }
   return http({
     method: method,
@@ -3455,8 +3459,8 @@ module.exports = require("vue");
 // 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=7556022c&
-var mainvue_type_template_id_7556022c_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=5975d010&
+var mainvue_type_template_id_5975d010_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3792,10 +3796,10 @@ var mainvue_type_template_id_7556022c_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_7556022c_render._withStripped = true
+mainvue_type_template_id_5975d010_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=7556022c&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=5975d010&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -6066,6 +6070,10 @@ var sizer_component = Object(componentNormalizer["a" /* default */])(
 // EXTERNAL MODULE: ./src/utils/bus.js
 var bus = __webpack_require__(13);
 
+// EXTERNAL MODULE: external "qs"
+var external_qs_ = __webpack_require__(3);
+var external_qs_default = /*#__PURE__*/__webpack_require__.n(external_qs_);
+
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=script&lang=js&
 var mainvue_type_script_lang_js_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; };
 
@@ -6275,6 +6283,7 @@ var mainvue_type_script_lang_js_components;
 
 
 
+
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: 'EsDataTable',
   inheritAttrs: false,
@@ -6487,6 +6496,7 @@ var mainvue_type_script_lang_js_components;
   },
   data: function data() {
     return {
+      requests: [],
       theadData: [],
       list: null,
       tableLoading: this.loading,
@@ -6520,7 +6530,7 @@ var mainvue_type_script_lang_js_components;
 
     theads: {
       get: function get() {
-        return this.theadData.length ? this.theadData : this.thead;
+        return typeof this.thead === 'string' ? this.theadData : this.thead;
       },
       set: function set(val) {
         return val;
@@ -6599,20 +6609,19 @@ var mainvue_type_script_lang_js_components;
     },
 
     thead: {
-      immediate: true,
+      deep: true,
       handler: function handler(val) {
         if (typeof val === 'string') {
           this.getTheads();
+        } else {
+          this.getOptions(val);
         }
       }
     },
     theads: {
-      immediate: true,
-      handler: function handler(val) {
+      deep: true,
+      handler: function handler() {
         this.chekOpenTotalArea();
-        if (val && val.length) {
-          this.getOptions(val);
-        }
       }
     },
     param: {
@@ -6652,6 +6661,9 @@ var mainvue_type_script_lang_js_components;
     }
   },
   created: function created() {
+    if (Array.isArray(this.thead) && this.thead.length) {
+      this.getOptions(this.thead);
+    }
     this.immediate && this.getTableData();
   },
   mounted: function mounted() {
@@ -6660,6 +6672,14 @@ var mainvue_type_script_lang_js_components;
   },
 
   methods: {
+    getRequestKey: function getRequestKey(config) {
+      var method = config.method,
+          url = config.url,
+          params = config.params,
+          data = config.data;
+
+      return [method, url, external_qs_default.a.stringify(params), external_qs_default.a.stringify(data)].join('&');
+    },
     getIcon: function getIcon(res) {
       if (this.sizer && this.icon && res !== 'right' && !this.$slots.prepend && !this.$slots.append && !this.$slots.default && !this.form) {
         this.icon = false;
@@ -6673,27 +6693,36 @@ var mainvue_type_script_lang_js_components;
       res.forEach(function (item) {
         if (item.sysCode || item.url) {
           var params = util["a" /* default */].extend({}, item.sysCode ? { sysAppCode: item.sysCode } : {}, item.param ? item.param : {});
-          util["a" /* default */].ajax({
-            url: item.sysCode ? api["u" /* findSysCode */] : item.url,
+          var key = _this2.getRequestKey({
             method: _this2.method,
+            url: item.sysCode ? api["u" /* findSysCode */] : item.url,
             params: params,
-            data: params
-          }).then(function (res) {
-            if (res.rCode === 0) {
-              if (item.type == 'ganged') {
-                _this2.$set(_this2.options, item.field || item.prop, [JSON.parse(JSON.stringify(res.results))]);
+            data: {}
+          });
+          if (!_this2.requests.includes(key)) {
+            util["a" /* default */].ajax({
+              url: item.sysCode ? api["u" /* findSysCode */] : item.url,
+              method: _this2.method,
+              params: params,
+              data: params
+            }).then(function (res) {
+              if (res.rCode === 0) {
+                if (item.type == 'ganged') {
+                  _this2.$set(_this2.options, item.field || item.prop, [JSON.parse(JSON.stringify(res.results))]);
+                } else {
+                  _this2.$set(_this2.options, item.field || item.prop, JSON.parse(JSON.stringify(res.results)));
+                }
+                _this2.requests.push(key);
               } else {
-                _this2.$set(_this2.options, item.field || item.prop, JSON.parse(JSON.stringify(res.results)));
+                var msg = res.msg || '系统错误，请联系管理员！';
+                _this2.$message.error(msg);
               }
-            } else {
-              var msg = res.msg || '系统错误，请联系管理员！';
-              _this2.$message.error(msg);
-            }
-          }).catch(function (err) {
-            if (err.message && err.message !== 'canceled') {
-              _this2.$message.error(err.message);
-            }
-          });
+            }).catch(function (err) {
+              if (err.message && err.message !== 'canceled') {
+                _this2.$message.error(err.message);
+              }
+            });
+          }
         } else {
           if (item.childHead && item.childHead.length) {
             _this2.getOptions(item.childHead);
@@ -6714,7 +6743,7 @@ var mainvue_type_script_lang_js_components;
         this.showTotal = true;
         return;
       }
-      var arr = JSON.parse(JSON.stringify(this.thead));
+      var arr = JSON.parse(JSON.stringify(this.theads));
       arr.forEach(function (item) {
         if (item.total) {
           _this3.showTotal = true;
@@ -6787,6 +6816,7 @@ var mainvue_type_script_lang_js_components;
             _this5.theadData = results.theadData || [];
             _this5.list = results.data || results.records || [];
             _this5.config.totalCount = results.count || results.total || results.totalCount;
+            _this5.getOptions(_this5.theadData);
           }
         } else {
           _this5.theadData = [];
@@ -7020,7 +7050,7 @@ var mainvue_type_script_lang_js_components;
       } else if (row) {
         rows = JSON.parse(JSON.stringify(row));
       }
-      var thead = this.thead;
+      var thead = this.theads;
       if (this.$refs.oaTable) {
         thead = this.$refs.oaTable.getThead();
       }
@@ -7115,8 +7145,8 @@ var mainvue_type_script_lang_js_components;
       } else {
         if (handle.exportXls) {
           var text = '操作';
-          if (this.thead[this.thead.length - 1] && this.thead[this.thead.length - 1].type === 'handle') {
-            text = this.thead[this.thead.length - 1].title;
+          if (this.theads[this.theads.length - 1] && this.theads[this.theads.length - 1].type === 'handle') {
+            text = this.theads[this.theads.length - 1].title;
           }
           thead = thead.map(function (item) {
             return item.filter(function (ele) {
@@ -7305,7 +7335,7 @@ var mainvue_type_script_lang_js_components;
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_7556022c_render,
+  mainvue_type_template_id_5975d010_render,
   staticRenderFns,
   false,
   null,

package/lib/date-picker.js

@@ -452,6 +452,10 @@ var ajax = function ajax(_ref) {
     if (!header['content-type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
+  } else {
+    if (!header['content-type']) {
+      header['content-type'] = 'application/json;charset=UTF-8';
+    }
   }
   return http({
     method: method,

package/lib/dialog.js

@@ -451,6 +451,10 @@ var ajax = function ajax(_ref) {
     if (!header['content-type']) {
       header['content-type'] = 'application/x-www-form-urlencoded;charset=UTF-8';
     }
+  } else {
+    if (!header['content-type']) {
+      header['content-type'] = 'application/json;charset=UTF-8';
+    }
   }
   return http({
     method: method,