eoss-ui 0.4.73 → 0.4.75

package/lib/input-number.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/input.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/login.js

@@ -1513,8 +1513,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/main.js

@@ -1513,8 +1513,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {
@@ -3430,7 +3430,7 @@ module.exports = require("stompjs");
 // 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/main/src/main.vue?vue&type=template&id=da442792&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=9f5f5106&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3860,7 +3860,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=da442792&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=9f5f5106&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=799780ee&
 var userinfovue_type_template_id_799780ee_render = function () {
@@ -7283,6 +7283,9 @@ var log = util["a" /* default */].getParams('console');
           }
         }
       }
+      this.$nextTick(function () {
+        _this9.showPage = true;
+      });
     },
 
     //设置回调

package/lib/nav.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/page.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/player.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/qr-code.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/radio-group.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/retrial-auth.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/select-ganged.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/select.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/selector-panel.js

@@ -1513,8 +1513,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/selector.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/sizer.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/steps.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/switch.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/table-form.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/tabs.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/tips.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/tree-group.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {
@@ -3366,7 +3366,7 @@ module.exports = require("json-bigint");
 // 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/tree-group/src/main.vue?vue&type=template&id=7c060708&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree-group/src/main.vue?vue&type=template&id=11d86630&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3679,7 +3679,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=7c060708&
+// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=11d86630&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3880,7 +3880,11 @@ var util = __webpack_require__(0);
       default: '#/empty'
     },
     zoom: false,
-    checkedsAsSearch: {
+    clickedAsSearch: {
+      type: Boolean,
+      default: true
+    },
+    checkedAsSearch: {
       type: Boolean,
       default: true
     }
@@ -4072,7 +4076,9 @@ var util = __webpack_require__(0);
       this.$emit('tab-click', this.tabs[parseInt(this.active, 10)]);
     },
     handleNodeClick: function handleNodeClick(data, node) {
-      this.checkeds = data;
+      if (this.clickedAsSearch) {
+        this.checkeds = data;
+      }
       if (this.onNodeClick) {
         this.onNodeClick(this, data, node);
       } else {
@@ -4082,7 +4088,7 @@ var util = __webpack_require__(0);
     handleCheckChange: function handleCheckChange() {
       var ref = this.tabs && this.tabs.length ? this.tabs[Number(this.active)].ref ? this.tabs[Number(this.active)].ref : 'groupTree' + this.active : 'groupTree';
       var checkeds = this.$refs[ref].getCheckedNodes();
-      if (this.checkedsAsSearch) {
+      if (this.checkedAsSearch) {
         this.checkeds = checkeds;
       }
       if (this.onCheckChange) {
@@ -4099,7 +4105,7 @@ var util = __webpack_require__(0);
       this.$emit('enterprise-confirm', res);
     },
     handleResults: function handleResults(res) {
-      if (this.tree.showCheckbox && this.tree.checkedFirst && this.checkedsAsSearch || this.tree.currentFirst) {
+      if (this.tree.showCheckbox && this.tree.checkedFirst && this.checkedAsSearch || this.tree.currentFirst) {
         this.checkeds = res[0];
       }
       this.$emit('results', res);

package/lib/tree.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/upload.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/utils/util.js

@@ -1429,8 +1429,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/wujie.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/lib/wxlogin.js

@@ -1514,8 +1514,8 @@ var getStorage = function getStorage(key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-var getStyle = function getStyle(dom, attr) {
-  if (dom.style[attr]) {
+var getStyle = function getStyle(dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {

package/package.json

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

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

@@ -808,14 +808,14 @@ export default {
               });
           } else {
             this.list = [];
-            this.tableHeight = false;
+            //this.tableHeight = false;
             let msg = res.msg || '系统错误，请联系管理员！';
             this.$message.error(msg);
           }
           this.$emit('success', res);
         })
         .catch((err) => {
-          this.tableHeight = false;
+          //this.tableHeight = false;
           if (err.message && err.message !== 'canceled') {
             this.$message.error(err.message);
           }
@@ -1208,7 +1208,10 @@ export default {
     },
     resetHeight(warn) {
       if (this.full && !this.height && !this.maxHeight) {
-        let height = parseInt(util.getStyle(this.$el.parentNode, 'height'), 10);
+        let height = parseInt(
+          util.getStyle(this.$el.parentNode, 'height', '%'),
+          10
+        );
         height =
           (height == NaN ? 0 : height) -
           parseInt(util.getStyle(this.$el.parentNode, 'padding-top'), 10) -

package/packages/main/src/main.vue

@@ -1692,6 +1692,9 @@ export default {
           }
         }
       }
+      this.$nextTick(() => {
+        this.showPage = true;
+      });
     },
     //设置回调
     handleChange(res) {

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

@@ -193,7 +193,11 @@ export default {
       default: '#/empty'
     },
     zoom: false,
-    checkedsAsSearch: {
+    clickedAsSearch: {
+      type: Boolean,
+      default: true
+    },
+    checkedAsSearch: {
       type: Boolean,
       default: true
     }
@@ -410,7 +414,9 @@ export default {
       this.$emit('tab-click', this.tabs[parseInt(this.active, 10)]);
     },
     handleNodeClick(data, node) {
-      this.checkeds = data;
+      if (this.clickedAsSearch) {
+        this.checkeds = data;
+      }
       if (this.onNodeClick) {
         this.onNodeClick(this, data, node);
       } else {
@@ -425,7 +431,7 @@ export default {
             : 'groupTree' + this.active
           : 'groupTree';
       let checkeds = this.$refs[ref].getCheckedNodes();
-      if (this.checkedsAsSearch) {
+      if (this.checkedAsSearch) {
         this.checkeds = checkeds;
       }
       if (this.onCheckChange) {
@@ -445,7 +451,7 @@ export default {
       if (
         (this.tree.showCheckbox &&
           this.tree.checkedFirst &&
-          this.checkedsAsSearch) ||
+          this.checkedAsSearch) ||
         this.tree.currentFirst
       ) {
         this.checkeds = res[0];

package/src/index.js

@@ -115,7 +115,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.73',
+  version: '0.4.75',
   install,
   Button,
   ButtonGroup,

package/src/utils/util.js

@@ -1440,8 +1440,8 @@ const getStorage = function (key) {
  * @param {String} [attr] - 样式属性名
  **/
 
-const getStyle = function (dom, attr) {
-  if (dom.style[attr]) {
+const getStyle = function (dom, attr, exclude) {
+  if (dom.style[attr] && dom.style[attr].indexOf(exclude) === -1) {
     return dom.style[attr];
   }
   if (win.getComputedStyle) {