eoss-ui 0.5.85 → 0.5.87

package/lib/button-group.js

@@ -2015,19 +2015,19 @@ var identical = function identical(_ref7) {
  * @date 2022年5月7日
  * @param {Array} [arry] - 被查找的数组
  * @param {Object} [target] - 目标对象
- * @param {String} [key] - 目标对象的属性名
+ * @param {String/Array} [key] - 目标对象的属性名
  **/
 var indexOfObj = function indexOfObj(arry, target, key) {
   for (var i = 0; i < arry.length; i++) {
     if (key) {
-      if (key.indexOf(',') > -1) {
-        var keys = key.split(',');
+      if (key.indexOf(',') > -1 || Array.isArray(key)) {
+        var keys = key.indexOf(',') > -1 ? key.split(',') : key;
         for (var n = 0; n < keys.length; n++) {
           var k = keys[n];
           if (typeof target === 'string' && arry[i][k] === target) {
             return i;
           }
-          if (target[k] === arry[i][k]) {
+          if (target[k] && arry[i][k] && target[k] === arry[i][k]) {
             return i;
           }
         }

package/lib/button.js

@@ -2016,19 +2016,19 @@ var identical = function identical(_ref7) {
  * @date 2022年5月7日
  * @param {Array} [arry] - 被查找的数组
  * @param {Object} [target] - 目标对象
- * @param {String} [key] - 目标对象的属性名
+ * @param {String/Array} [key] - 目标对象的属性名
  **/
 var indexOfObj = function indexOfObj(arry, target, key) {
   for (var i = 0; i < arry.length; i++) {
     if (key) {
-      if (key.indexOf(',') > -1) {
-        var keys = key.split(',');
+      if (key.indexOf(',') > -1 || Array.isArray(key)) {
+        var keys = key.indexOf(',') > -1 ? key.split(',') : key;
         for (var n = 0; n < keys.length; n++) {
           var k = keys[n];
           if (typeof target === 'string' && arry[i][k] === target) {
             return i;
           }
-          if (target[k] === arry[i][k]) {
+          if (target[k] && arry[i][k] && target[k] === arry[i][k]) {
             return i;
           }
         }

package/lib/checkbox-group.js

@@ -2015,19 +2015,19 @@ var identical = function identical(_ref7) {
  * @date 2022年5月7日
  * @param {Array} [arry] - 被查找的数组
  * @param {Object} [target] - 目标对象
- * @param {String} [key] - 目标对象的属性名
+ * @param {String/Array} [key] - 目标对象的属性名
  **/
 var indexOfObj = function indexOfObj(arry, target, key) {
   for (var i = 0; i < arry.length; i++) {
     if (key) {
-      if (key.indexOf(',') > -1) {
-        var keys = key.split(',');
+      if (key.indexOf(',') > -1 || Array.isArray(key)) {
+        var keys = key.indexOf(',') > -1 ? key.split(',') : key;
         for (var n = 0; n < keys.length; n++) {
           var k = keys[n];
           if (typeof target === 'string' && arry[i][k] === target) {
             return i;
           }
-          if (target[k] === arry[i][k]) {
+          if (target[k] && arry[i][k] && target[k] === arry[i][k]) {
             return i;
           }
         }

package/lib/data-table-form.js

@@ -2015,19 +2015,19 @@ var identical = function identical(_ref7) {
  * @date 2022年5月7日
  * @param {Array} [arry] - 被查找的数组
  * @param {Object} [target] - 目标对象
- * @param {String} [key] - 目标对象的属性名
+ * @param {String/Array} [key] - 目标对象的属性名
  **/
 var indexOfObj = function indexOfObj(arry, target, key) {
   for (var i = 0; i < arry.length; i++) {
     if (key) {
-      if (key.indexOf(',') > -1) {
-        var keys = key.split(',');
+      if (key.indexOf(',') > -1 || Array.isArray(key)) {
+        var keys = key.indexOf(',') > -1 ? key.split(',') : key;
         for (var n = 0; n < keys.length; n++) {
           var k = keys[n];
           if (typeof target === 'string' && arry[i][k] === target) {
             return i;
           }
-          if (target[k] === arry[i][k]) {
+          if (target[k] && arry[i][k] && target[k] === arry[i][k]) {
             return i;
           }
         }

package/lib/data-table.js

@@ -2015,19 +2015,19 @@ var identical = function identical(_ref7) {
  * @date 2022年5月7日
  * @param {Array} [arry] - 被查找的数组
  * @param {Object} [target] - 目标对象
- * @param {String} [key] - 目标对象的属性名
+ * @param {String/Array} [key] - 目标对象的属性名
  **/
 var indexOfObj = function indexOfObj(arry, target, key) {
   for (var i = 0; i < arry.length; i++) {
     if (key) {
-      if (key.indexOf(',') > -1) {
-        var keys = key.split(',');
+      if (key.indexOf(',') > -1 || Array.isArray(key)) {
+        var keys = key.indexOf(',') > -1 ? key.split(',') : key;
         for (var n = 0; n < keys.length; n++) {
           var k = keys[n];
           if (typeof target === 'string' && arry[i][k] === target) {
             return i;
           }
-          if (target[k] === arry[i][k]) {
+          if (target[k] && arry[i][k] && target[k] === arry[i][k]) {
             return i;
           }
         }
@@ -3955,8 +3955,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=d6bac15c&
-var mainvue_type_template_id_d6bac15c_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=4f432fee&
+var mainvue_type_template_id_4f432fee_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3964,6 +3964,12 @@ var mainvue_type_template_id_d6bac15c_render = function () {
     _vm.tag,
     {
       directives: [
+        {
+          name: "show",
+          rawName: "v-show",
+          value: _vm.showTable,
+          expression: "showTable",
+        },
         {
           name: "loading",
           rawName: "v-loading",
@@ -4317,10 +4323,10 @@ var mainvue_type_template_id_d6bac15c_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_d6bac15c_render._withStripped = true
+mainvue_type_template_id_4f432fee_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=d6bac15c&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=4f432fee&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -6685,6 +6691,7 @@ var mainvue_type_script_lang_js_extends = Object.assign || function (target) { f
 //
 //
 //
+//
 
 
 
@@ -6947,6 +6954,7 @@ var pageView = util["a" /* default */].getParams('pageView');
     least: Boolean,
     //保留搜索参数
     retainSearh: Boolean,
+    //无线滚动
     infiniteScroll: Boolean,
     isJoin: {
       type: Boolean,
@@ -6994,11 +7002,13 @@ var pageView = util["a" /* default */].getParams('pageView');
       options: {},
       icon: true,
       sysCodes: [],
-      infiniteDisabled: this.infiniteScroll,
+      infiniteDisabled: !this.infiniteScroll,
       isReload: false,
       pageView: null,
       showSizer: false,
-      show: true
+      show: true,
+      isSetHeight: false,
+      showTable: false
     };
   },
 
@@ -7284,6 +7294,8 @@ var pageView = util["a" /* default */].getParams('pageView');
     this.chekOpenTotalArea();
   },
   mounted: function mounted() {
+    this.isSetHeight = util["a" /* default */].getStyle(this.$el.parentNode, 'height') == '0px' ? false : true;
+    this.showTable = true;
     if (this.data.length) {
       this.list = this.setData();
     }
@@ -7992,14 +8004,14 @@ var pageView = util["a" /* default */].getParams('pageView');
       var _this15 = this;
 
       this.$nextTick(function () {
-        if (_this15.full && !_this15.height && !_this15.maxHeight) {
+        if (_this15.full && !_this15.height && !_this15.maxHeight && _this15.isSetHeight) {
           var height = _this15.$el.parentNode.offsetHeight;
           if (height) {
             height = parseInt(util["a" /* default */].getStyle(_this15.$el.parentNode, 'height', '%'), 10);
             height = (height == NaN ? 0 : height) - parseInt(util["a" /* default */].getStyle(_this15.$el.parentNode, 'padding-top'), 10) - parseInt(util["a" /* default */].getStyle(_this15.$el.parentNode, 'padding-bottom'), 10);
             for (var i = 0; i < _this15.$el.parentNode.childNodes.length; i++) {
               var ele = _this15.$el.parentNode.childNodes[i];
-              if (ele.offsetHeight !== undefined) {
+              if (_this15.$el && ele.offsetHeight !== undefined && ele != _this15.$el) {
                 height = height - ele.offsetHeight - parseInt(util["a" /* default */].getStyle(ele, 'margin-top'), 10) - parseInt(util["a" /* default */].getStyle(ele, 'margin-bottom'), 10);
               }
             }
@@ -8115,7 +8127,7 @@ var pageView = util["a" /* default */].getParams('pageView');
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_d6bac15c_render,
+  mainvue_type_template_id_4f432fee_render,
   staticRenderFns,
   false,
   null,

package/lib/date-picker.js

@@ -2016,19 +2016,19 @@ var identical = function identical(_ref7) {
  * @date 2022年5月7日
  * @param {Array} [arry] - 被查找的数组
  * @param {Object} [target] - 目标对象
- * @param {String} [key] - 目标对象的属性名
+ * @param {String/Array} [key] - 目标对象的属性名
  **/
 var indexOfObj = function indexOfObj(arry, target, key) {
   for (var i = 0; i < arry.length; i++) {
     if (key) {
-      if (key.indexOf(',') > -1) {
-        var keys = key.split(',');
+      if (key.indexOf(',') > -1 || Array.isArray(key)) {
+        var keys = key.indexOf(',') > -1 ? key.split(',') : key;
         for (var n = 0; n < keys.length; n++) {
           var k = keys[n];
           if (typeof target === 'string' && arry[i][k] === target) {
             return i;
           }
-          if (target[k] === arry[i][k]) {
+          if (target[k] && arry[i][k] && target[k] === arry[i][k]) {
             return i;
           }
         }

package/lib/dialog.js

@@ -2015,19 +2015,19 @@ var identical = function identical(_ref7) {
  * @date 2022年5月7日
  * @param {Array} [arry] - 被查找的数组
  * @param {Object} [target] - 目标对象
- * @param {String} [key] - 目标对象的属性名
+ * @param {String/Array} [key] - 目标对象的属性名
  **/
 var indexOfObj = function indexOfObj(arry, target, key) {
   for (var i = 0; i < arry.length; i++) {
     if (key) {
-      if (key.indexOf(',') > -1) {
-        var keys = key.split(',');
+      if (key.indexOf(',') > -1 || Array.isArray(key)) {
+        var keys = key.indexOf(',') > -1 ? key.split(',') : key;
         for (var n = 0; n < keys.length; n++) {
           var k = keys[n];
           if (typeof target === 'string' && arry[i][k] === target) {
             return i;
           }
-          if (target[k] === arry[i][k]) {
+          if (target[k] && arry[i][k] && target[k] === arry[i][k]) {
             return i;
           }
         }