eoss-ui 0.4.72 → 0.4.74

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=2cfa653a&
+// 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 render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3675,65 +3675,69 @@ var render = function () {
                 "div",
                 { staticClass: "es-body" },
                 [
-                  _c(
-                    "div",
-                    {
-                      directives: [
+                  _vm.showPage
+                    ? _c(
+                        "div",
                         {
-                          name: "loading",
-                          rawName: "v-loading",
-                          value: _vm.pageLoading,
-                          expression: "pageLoading",
-                        },
-                      ],
-                      staticClass: "es-body-main",
-                      attrs: {
-                        "element-loading-background": "rgba(0, 0, 0, 0.5)",
-                      },
-                    },
-                    [
-                      _vm.method === "iframe"
-                        ? _c("iframe", {
-                            attrs: {
-                              id: _vm.iframeId,
-                              name: _vm.iframeId,
-                              frameborder: "0",
-                              width: "100%",
-                              height: "100%",
-                              src: _vm.page,
+                          directives: [
+                            {
+                              name: "loading",
+                              rawName: "v-loading",
+                              value: _vm.pageLoading,
+                              expression: "pageLoading",
                             },
-                          })
-                        : _vm.method === "wujie" && _vm.refresh
-                        ? [
-                            _c("es-wujie", {
-                              attrs: {
-                                show: true,
-                                props: _vm.wjProps,
-                                attrs: _vm.wjAttrs,
-                                name: _vm.wjName,
-                                url: _vm.page,
-                              },
-                            }),
-                          ]
-                        : _vm.method === "router" && _vm.refresh
-                        ? [
-                            !_vm.isKeepAlive
-                              ? _c("router-view", { key: _vm.routerKey })
-                              : _vm._e(),
-                            _c(
-                              "keep-alive",
-                              [
-                                _vm.isKeepAlive
+                          ],
+                          staticClass: "es-body-main",
+                          attrs: {
+                            "element-loading-background": "rgba(0, 0, 0, 0.5)",
+                          },
+                        },
+                        [
+                          _vm.method === "iframe"
+                            ? _c("iframe", {
+                                attrs: {
+                                  id: _vm.iframeId,
+                                  name: _vm.iframeId,
+                                  frameborder: "0",
+                                  width: "100%",
+                                  height: "100%",
+                                  src: _vm.page,
+                                },
+                              })
+                            : _vm.method === "wujie" && _vm.refresh
+                            ? [
+                                _c("es-wujie", {
+                                  attrs: {
+                                    show: true,
+                                    props: _vm.wjProps,
+                                    attrs: _vm.wjAttrs,
+                                    name: _vm.wjName,
+                                    url: _vm.page,
+                                  },
+                                }),
+                              ]
+                            : _vm.method === "router" && _vm.refresh
+                            ? [
+                                !_vm.isKeepAlive
                                   ? _c("router-view", { key: _vm.routerKey })
                                   : _vm._e(),
-                              ],
-                              1
-                            ),
-                          ]
-                        : _vm._e(),
-                    ],
-                    2
-                  ),
+                                _c(
+                                  "keep-alive",
+                                  [
+                                    _vm.isKeepAlive
+                                      ? _c("router-view", {
+                                          key: _vm.routerKey,
+                                        })
+                                      : _vm._e(),
+                                  ],
+                                  1
+                                ),
+                              ]
+                            : _vm._e(),
+                        ],
+                        2
+                      )
+                    : _vm._e(),
                   _vm.themeJSON.copyright.comp
                     ? _c(
                         "AsyncComponent",
@@ -3856,7 +3860,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=2cfa653a&
+// CONCATENATED MODULE: ./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/userinfo.vue?vue&type=template&id=799780ee&
 var userinfovue_type_template_id_799780ee_render = function () {
@@ -5915,6 +5919,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
+//
 
 
 
@@ -6267,7 +6272,8 @@ var log = util["a" /* default */].getParams('console');
       isSide: null,
       navIds: null,
       timer: null,
-      pid: null
+      pid: null,
+      showPage: false
     };
   },
   created: function created() {
@@ -6904,6 +6910,7 @@ var log = util["a" /* default */].getParams('console');
         }
         this.tabsId = active[active.length - 1];
       }
+      this.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=2522b075&
+// 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=2522b075&
+// 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,8 +4105,8 @@ 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) {
-        this.checkeds = res.children[0];
+      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.72",
+  "version": "0.4.74",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

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

@@ -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

@@ -159,6 +159,7 @@
             class="es-body-main"
             v-loading="pageLoading"
             element-loading-background="rgba(0, 0, 0, 0.5)"
+            v-if="showPage"
           >
             <iframe
               v-if="method === 'iframe'"
@@ -611,7 +612,8 @@ export default {
       isSide: null,
       navIds: null,
       timer: null,
-      pid: null
+      pid: null,
+      showPage: false
     };
   },
   created() {
@@ -1306,6 +1308,7 @@ export default {
         }
         this.tabsId = active[active.length - 1];
       }
+      this.showPage = true;
     },
     //获取页面类型及地址
     getUrl(res, active, index) {

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,10 +451,10 @@ export default {
       if (
         (this.tree.showCheckbox &&
           this.tree.checkedFirst &&
-          this.checkedsAsSearch) ||
+          this.checkedAsSearch) ||
         this.tree.currentFirst
       ) {
-        this.checkeds = res.children[0];
+        this.checkeds = res[0];
       }
       this.$emit('results', res);
     },

package/src/index.js

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