eoss-ui 0.4.68 → 0.4.70

package/lib/main.js

@@ -4285,8 +4285,8 @@ var settings_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var settings = (settings_component.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/message.vue?vue&type=template&id=3f717098&
-var messagevue_type_template_id_3f717098_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/message.vue?vue&type=template&id=0fefa521&
+var messagevue_type_template_id_0fefa521_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4423,11 +4423,11 @@ var messagevue_type_template_id_3f717098_render = function () {
     1
   )
 }
-var messagevue_type_template_id_3f717098_staticRenderFns = []
-messagevue_type_template_id_3f717098_render._withStripped = true
+var messagevue_type_template_id_0fefa521_staticRenderFns = []
+messagevue_type_template_id_0fefa521_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/message.vue?vue&type=template&id=3f717098&
+// CONCATENATED MODULE: ./packages/main/src/message.vue?vue&type=template&id=0fefa521&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/message.vue?vue&type=script&lang=js&
 //
@@ -4527,7 +4527,6 @@ messagevue_type_template_id_3f717098_render._withStripped = true
       return this.msgs.length >= this.count;
     },
     disabled: function disabled() {
-      console.log(this.loading, this.noMore);
       return this.loading || this.noMore;
     }
   },
@@ -4678,8 +4677,8 @@ messagevue_type_template_id_3f717098_render._withStripped = true
 
 var message_component = Object(componentNormalizer["a" /* default */])(
   src_messagevue_type_script_lang_js_,
-  messagevue_type_template_id_3f717098_render,
-  messagevue_type_template_id_3f717098_staticRenderFns,
+  messagevue_type_template_id_0fefa521_render,
+  messagevue_type_template_id_0fefa521_staticRenderFns,
   false,
   null,
   null,

package/lib/tabs-panel.js

@@ -199,7 +199,7 @@ function normalizeComponent(
 // 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/tabs-panel/src/main.vue?vue&type=template&id=50119e1e&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tabs-panel/src/main.vue?vue&type=template&id=31df5211&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -207,7 +207,14 @@ var render = function () {
   return _c(
     "div",
     { staticClass: "es-tabs-panel" },
-    [_vm._t("default", null, null, _vm.$attrs)],
+    [
+      _vm._t(
+        "default",
+        null,
+        { show: _vm.show, isShow: _vm.isShow },
+        _vm.$attrs
+      ),
+    ],
     2
   )
 }
@@ -215,7 +222,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tabs-panel/src/main.vue?vue&type=template&id=50119e1e&
+// CONCATENATED MODULE: ./packages/tabs-panel/src/main.vue?vue&type=template&id=31df5211&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/tabs-panel/src/main.vue?vue&type=script&lang=js&
 //
@@ -228,10 +235,21 @@ render._withStripped = true
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: 'EsTabsPanel',
   inheritAttrs: false,
-  props: {},
-  watch: {},
+  props: {
+    show: Boolean
+  },
+  watch: {
+    show: {
+      immediate: true,
+      handler: function handler(val) {
+        val && (this.isShow = true);
+      }
+    }
+  },
   data: function data() {
-    return {};
+    return {
+      isShow: false
+    };
   },
   mounted: function mounted() {}
 });

package/lib/tabs.js

@@ -2879,7 +2879,7 @@ module.exports = require("axios");
 // 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/tabs/src/main.vue?vue&type=template&id=88ab1cd4&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tabs/src/main.vue?vue&type=template&id=69164e0e&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -2972,6 +2972,7 @@ var render = function () {
                               var data = ref.data
                               var title = ref.title
                               var show = ref.show
+                              var isShow = ref.isShow
                               return [
                                 Array.isArray(contents)
                                   ? [
@@ -4467,7 +4468,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tabs/src/main.vue?vue&type=template&id=88ab1cd4&
+// CONCATENATED MODULE: ./packages/tabs/src/main.vue?vue&type=template&id=69164e0e&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -5083,6 +5084,8 @@ var util = __webpack_require__(0);
 //
 //
 //
+//
+//
 
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({

package/lib/tree.js

@@ -2886,7 +2886,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/src/main.vue?vue&type=template&id=bb0b8d78&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/main.vue?vue&type=template&id=1caf3025&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3034,6 +3034,7 @@ var render = function () {
                             "expand-on-click-node": false,
                             "highlight-current": true,
                             "show-checkbox": _vm.showCheckbox,
+                            "default-checked-keys": _vm.defaultCheckeds,
                             "current-node-key": _vm.currentNodeKey,
                           },
                           scopedSlots: _vm._u([
@@ -3079,7 +3080,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=bb0b8d78&
+// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=1caf3025&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(2);
@@ -3172,6 +3173,7 @@ var util = __webpack_require__(0);
 //
 //
 //
+//
 
 
 
@@ -3232,7 +3234,9 @@ var util = __webpack_require__(0);
     },
     // 	选择项本地数据
     data: Array,
+    //是否选中首级节点
     currentFirst: Boolean,
+    //当前选中的节点
     currentNodeKey: [String, Number],
     icon: {
       type: Boolean,
@@ -3312,10 +3316,20 @@ var util = __webpack_require__(0);
         return {};
       }
     },
+    //节点是否可被选择
     showCheckbox: {
       type: Boolean,
       default: false
     },
+    //是否勾选首级节点
+    checkedFirst: Boolean,
+    //默认勾选的节点的 key 的数组
+    defaultCheckedKeys: {
+      type: Array,
+      default: function _default() {
+        return [];
+      }
+    },
     multiple: {
       type: Boolean,
       default: false
@@ -3383,7 +3397,8 @@ var util = __webpack_require__(0);
       loading: false,
       searchValue: '',
       expandedKeys: [],
-      treeList: []
+      treeList: [],
+      checkedKeys: this.defaultCheckedKeys
     };
   },
 
@@ -3410,6 +3425,9 @@ var util = __webpack_require__(0);
         return false;
       }
       return this.remote;
+    },
+    defaultCheckeds: function defaultCheckeds() {
+      return [].concat(this.defaultCheckedKeys, this.checkedKeys);
     }
   },
   watch: {
@@ -3458,21 +3476,28 @@ var util = __webpack_require__(0);
       }).then(function (res) {
         _this.loading = false;
         if (res.rCode === 0) {
-          _this.treeList = JSON.parse(JSON.stringify(res.results));
+          var treeList = JSON.parse(JSON.stringify(res.results));
+          _this.$emit('results', treeList);
           if (_this.currentFirst) {
-            var currentNode = _this.treeList[0].id;
-            _this.$emit('current-first', _this.treeList[0]);
-            if (!_this.currentNodeKey) {
+            var currentNode = treeList[0].id;
+            if (!_this.currentNodeKey && _this.currentNodeKey != 0) {
               _this.$nextTick(function () {
                 _this.$refs.oaTree.setCurrentKey(currentNode);
               });
             }
           }
-          _this.expandedKeys = _this.treeList.filter(function (item) {
+          if (_this.checkedFirst) {
+            var checkedNode = treeList[0].id;
+            if (_this.defaultCheckedKeys && _this.defaultCheckedKeys.indexOf(checkedNode) == -1) {
+              _this.checkedKeys = [checkedNode];
+            }
+          }
+          _this.expandedKeys = treeList.filter(function (item) {
             if (item.open) {
               return item.id;
             }
           });
+          _this.treeList = treeList;
         }
       }).catch(function (err) {
         if (err.message && err.message !== 'canceled') {
@@ -3510,6 +3535,7 @@ var util = __webpack_require__(0);
             if (res.rCode === 0) {
               _this2.loading = false;
               var results = JSON.parse(JSON.stringify(res.results));
+              _this2.$emit('sub-results', results);
               if (Array.isArray(results)) {
                 if (data.id === results[0].id) {
                   _this2.$set(data, 'children', results[0].children);

package/package.json

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

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

@@ -1206,11 +1206,11 @@ export default {
         this.getTableData({ where: obj && obj.where ? obj.where : {}, first });
       }
     },
-    resetHeight() {
-      //this.$nextTick(() => {
+    resetHeight(warn) {
       if (this.full && !this.height && !this.maxHeight) {
-        let height =
-          this.$el.parentNode.offsetHeight -
+        let height = parseInt(util.getStyle(this.$el.parentNode, 'height'), 10);
+        height =
+          (height == NaN ? 0 : height) -
           parseInt(util.getStyle(this.$el.parentNode, 'padding-top'), 10) -
           parseInt(util.getStyle(this.$el.parentNode, 'padding-bottom'), 10);
         for (let i = 0; i < this.$el.parentNode.childNodes.length; i++) {
@@ -1246,8 +1246,12 @@ export default {
         }
         if (height > 1 && height - eht > 1) {
           this.tableHeight = height;
-        } else {
+        } else if (warn) {
           console.warn(this.$el.parentNode, `获取不到高度！`);
+        } else {
+          this.$nextTick(() => {
+            this.resetHeight(true);
+          });
         }
       }
     },