eoss-ui 0.4.73 → 0.4.75

package/lib/button-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/button.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/checkbox-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/data-table-form.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/data-table.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) {
@@ -3405,8 +3405,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=40481d3e&
-var mainvue_type_template_id_40481d3e_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=620c8a78&
+var mainvue_type_template_id_620c8a78_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3742,10 +3742,10 @@ var mainvue_type_template_id_40481d3e_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_40481d3e_render._withStripped = true
+mainvue_type_template_id_620c8a78_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=40481d3e&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=620c8a78&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -6791,13 +6791,13 @@ var mainvue_type_script_lang_js_components;
           });
         } else {
           _this6.list = [];
-          _this6.tableHeight = false;
+          //this.tableHeight = false;
           var msg = res.msg || '系统错误，请联系管理员！';
           _this6.$message.error(msg);
         }
         _this6.$emit('success', res);
       }).catch(function (err) {
-        _this6.tableHeight = false;
+        //this.tableHeight = false;
         if (err.message && err.message !== 'canceled') {
           _this6.$message.error(err.message);
         }
@@ -7179,7 +7179,7 @@ var mainvue_type_script_lang_js_components;
       var _this9 = this;
 
       if (this.full && !this.height && !this.maxHeight) {
-        var height = parseInt(util["a" /* default */].getStyle(this.$el.parentNode, 'height'), 10);
+        var height = parseInt(util["a" /* default */].getStyle(this.$el.parentNode, 'height', '%'), 10);
         height = (height == NaN ? 0 : height) - parseInt(util["a" /* default */].getStyle(this.$el.parentNode, 'padding-top'), 10) - parseInt(util["a" /* default */].getStyle(this.$el.parentNode, 'padding-bottom'), 10);
         for (var i = 0; i < this.$el.parentNode.childNodes.length; i++) {
           var ele = this.$el.parentNode.childNodes[i];
@@ -7254,7 +7254,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_40481d3e_render,
+  mainvue_type_template_id_620c8a78_render,
   staticRenderFns,
   false,
   null,

package/lib/date-picker.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/dialog.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/eoss-ui.common.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) {
@@ -5258,8 +5258,8 @@ clients_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var clients = (clients_src_main);
-// 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=40481d3e&
-var mainvue_type_template_id_40481d3e_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=620c8a78&
+var mainvue_type_template_id_620c8a78_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5594,11 +5594,11 @@ var mainvue_type_template_id_40481d3e_render = function () {
     1
   )
 }
-var mainvue_type_template_id_40481d3e_staticRenderFns = []
-mainvue_type_template_id_40481d3e_render._withStripped = true
+var mainvue_type_template_id_620c8a78_staticRenderFns = []
+mainvue_type_template_id_620c8a78_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=40481d3e&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=620c8a78&
 
 // 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=796433ee&
 var childrenvue_type_template_id_796433ee_render = function () {
@@ -8640,13 +8640,13 @@ var mainvue_type_script_lang_js_components;
           });
         } else {
           _this6.list = [];
-          _this6.tableHeight = false;
+          //this.tableHeight = false;
           var msg = res.msg || '系统错误，请联系管理员！';
           _this6.$message.error(msg);
         }
         _this6.$emit('success', res);
       }).catch(function (err) {
-        _this6.tableHeight = false;
+        //this.tableHeight = false;
         if (err.message && err.message !== 'canceled') {
           _this6.$message.error(err.message);
         }
@@ -9028,7 +9028,7 @@ var mainvue_type_script_lang_js_components;
       var _this9 = this;
 
       if (this.full && !this.height && !this.maxHeight) {
-        var height = parseInt(utils_util["a" /* default */].getStyle(this.$el.parentNode, 'height'), 10);
+        var height = parseInt(utils_util["a" /* default */].getStyle(this.$el.parentNode, 'height', '%'), 10);
         height = (height == NaN ? 0 : height) - parseInt(utils_util["a" /* default */].getStyle(this.$el.parentNode, 'padding-top'), 10) - parseInt(utils_util["a" /* default */].getStyle(this.$el.parentNode, 'padding-bottom'), 10);
         for (var i = 0; i < this.$el.parentNode.childNodes.length; i++) {
           var ele = this.$el.parentNode.childNodes[i];
@@ -9103,8 +9103,8 @@ var mainvue_type_script_lang_js_components;
 
 var data_table_src_main_component = normalizeComponent(
   packages_data_table_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_40481d3e_render,
-  mainvue_type_template_id_40481d3e_staticRenderFns,
+  mainvue_type_template_id_620c8a78_render,
+  mainvue_type_template_id_620c8a78_staticRenderFns,
   false,
   null,
   null,
@@ -46192,8 +46192,8 @@ login_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var login = (login_src_main);
-// 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&
-var mainvue_type_template_id_da442792_render = function () {
+// 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 mainvue_type_template_id_9f5f5106_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -46618,11 +46618,11 @@ var mainvue_type_template_id_da442792_render = function () {
     1
   )
 }
-var mainvue_type_template_id_da442792_staticRenderFns = []
-mainvue_type_template_id_da442792_render._withStripped = true
+var mainvue_type_template_id_9f5f5106_staticRenderFns = []
+mainvue_type_template_id_9f5f5106_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 () {
@@ -50029,6 +50029,9 @@ var log = utils_util["a" /* default */].getParams('console');
           }
         }
       }
+      this.$nextTick(function () {
+        _this9.showPage = true;
+      });
     },
 
     //设置回调
@@ -50337,8 +50340,8 @@ var log = utils_util["a" /* default */].getParams('console');
 
 var main_src_main_component = normalizeComponent(
   packages_main_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_da442792_render,
-  mainvue_type_template_id_da442792_staticRenderFns,
+  mainvue_type_template_id_9f5f5106_render,
+  mainvue_type_template_id_9f5f5106_staticRenderFns,
   false,
   null,
   null,
@@ -62312,8 +62315,8 @@ tree_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_tree = (tree_src_main);
-// 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&
-var mainvue_type_template_id_7c060708_render = function () {
+// 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 mainvue_type_template_id_11d86630_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -62621,11 +62624,11 @@ var mainvue_type_template_id_7c060708_render = function () {
     2
   )
 }
-var mainvue_type_template_id_7c060708_staticRenderFns = []
-mainvue_type_template_id_7c060708_render._withStripped = true
+var mainvue_type_template_id_11d86630_staticRenderFns = []
+mainvue_type_template_id_11d86630_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&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree-group/src/main.vue?vue&type=script&lang=js&
 //
@@ -62823,7 +62826,11 @@ mainvue_type_template_id_7c060708_render._withStripped = true
       default: '#/empty'
     },
     zoom: false,
-    checkedsAsSearch: {
+    clickedAsSearch: {
+      type: Boolean,
+      default: true
+    },
+    checkedAsSearch: {
       type: Boolean,
       default: true
     }
@@ -63015,7 +63022,9 @@ mainvue_type_template_id_7c060708_render._withStripped = true
       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 {
@@ -63025,7 +63034,7 @@ mainvue_type_template_id_7c060708_render._withStripped = true
     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) {
@@ -63042,7 +63051,7 @@ mainvue_type_template_id_7c060708_render._withStripped = true
       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);
@@ -63076,8 +63085,8 @@ mainvue_type_template_id_7c060708_render._withStripped = true
 
 var tree_group_src_main_component = normalizeComponent(
   packages_tree_group_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_7c060708_render,
-  mainvue_type_template_id_7c060708_staticRenderFns,
+  mainvue_type_template_id_11d86630_render,
+  mainvue_type_template_id_11d86630_staticRenderFns,
   false,
   null,
   null,
@@ -69259,7 +69268,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.4.73',
+  version: '0.4.75',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow-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/flow-list.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/flow.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/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/handle-user.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/handler.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) {