eoss-ui 0.4.69 → 0.4.71

package/lib/tree-group.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-group/src/main.vue?vue&type=template&id=8d1a3b86&
+// 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&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3002,7 +3002,8 @@ var render = function () {
                       on: {
                         "node-click": _vm.handleNodeClick,
                         "check-change": _vm.handleCheckChange,
-                        "current-first": _vm.handleCurrentFirst,
+                        results: _vm.handleResults,
+                        "sub-results": _vm.handleSubResults,
                       },
                     },
                     "es-tree",
@@ -3198,7 +3199,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=8d1a3b86&
+// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=2522b075&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -3353,6 +3354,7 @@ var util = __webpack_require__(0);
 //
 //
 //
+//
 
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
@@ -3397,7 +3399,11 @@ var util = __webpack_require__(0);
       type: String,
       default: '#/empty'
     },
-    zoom: false
+    zoom: false,
+    checkedsAsSearch: {
+      type: Boolean,
+      default: true
+    }
   },
   computed: {
     wujieName: function wujieName() {
@@ -3595,11 +3601,14 @@ 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';
-      this.checkeds = this.$refs[ref].getCheckedNodes();
+      var checkeds = this.$refs[ref].getCheckedNodes();
+      if (this.checkedsAsSearch) {
+        this.checkeds = checkeds;
+      }
       if (this.onCheckChange) {
-        this.onCheckChange.apply(this, [this].concat(Array.prototype.slice.call(arguments)));
+        this.onCheckChange.apply(this, [checkeds].concat(Array.prototype.slice.call(arguments), [this]));
       } else {
-        this.$emit.apply(this, ['check-change', this].concat(Array.prototype.slice.call(arguments)));
+        this.$emit.apply(this, ['check-change', checkeds].concat(Array.prototype.slice.call(arguments), [this]));
       }
     },
     handleChange: function handleChange(res) {
@@ -3609,9 +3618,14 @@ var util = __webpack_require__(0);
       this.checkeds = res;
       this.$emit('enterprise-confirm', res);
     },
-    handleCurrentFirst: function handleCurrentFirst(res) {
-      this.checkeds = res.children[0];
-      this.$emit('current-first', res);
+    handleResults: function handleResults(res) {
+      if (this.tree.showCheckbox && this.tree.checkedFirst && this.checkedsAsSearch || this.tree.currentFirst) {
+        this.checkeds = res.children[0];
+      }
+      this.$emit('results', res);
+    },
+    handleSubResults: function handleSubResults(res) {
+      this.$emit('sub-results', res);
     },
     setCurrentKey: function setCurrentKey(keys, leafOnly) {
       var _this2 = this;

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.69",
+  "version": "0.4.71",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

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

@@ -1206,7 +1206,7 @@ export default {
         this.getTableData({ where: obj && obj.where ? obj.where : {}, first });
       }
     },
-    resetHeight() {
+    resetHeight(warn) {
       if (this.full && !this.height && !this.maxHeight) {
         let height = parseInt(util.getStyle(this.$el.parentNode, 'height'), 10);
         height =
@@ -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);
+          });
         }
       }
     },

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

@@ -399,8 +399,7 @@
     <es-flow
       v-if="isShow"
       class="es-group-flow"
-      :pendingId="pendingId"
-      v-bind="flow"
+      v-bind="_flow"
       :style="{ width: _width }"
       :before-submit="handleSubmit"
       :businessId="businessId"
@@ -486,6 +485,11 @@ export default {
     },
     _width() {
       return parseInt(this.width, 10) + 'px';
+    },
+    _flow() {
+      return !this.flow.pendingId
+        ? { ...this.flow, pendingId: this.pendingId }
+        : this.flow;
     }
   },
   watch: {
@@ -497,9 +501,8 @@ export default {
     }
   },
   created() {
-    if (this.flow.businessId || this.pendingId || this.flow.pendingId) {
-      this.businessId =
-        this.flow.businessId || this.pendingId || this.flow.pendingId;
+    if (this.flow.businessId || this.flow.pendingId) {
+      this.businessId = this.flow.businessId || this.flow.pendingId;
     }
   },
   mounted() {},

package/packages/form/src/main.vue

@@ -357,16 +357,6 @@
                         v-model="models[item.name]"
                         :plain="item.plain || item.name === undefined"
                         :readonly="readonly ? readonly : item.readonly"
-                        @blur="
-                          (event) => {
-                            handleBlur(item, event);
-                          }
-                        "
-                        @focus="
-                          (event) => {
-                            handleFocus(item, event);
-                          }
-                        "
                         @change="
                           (val) => {
                             handleChange(item, val);

package/packages/tree/src/main.vue

@@ -61,6 +61,7 @@
           :expand-on-click-node="false"
           :highlight-current="true"
           :show-checkbox="showCheckbox"
+          :default-checked-keys="defaultCheckeds"
           :current-node-key="currentNodeKey"
           v-on="{
             ...$listeners,
@@ -160,7 +161,9 @@ export default {
     },
     // 	选择项本地数据
     data: Array,
+    //是否选中首级节点
     currentFirst: Boolean,
+    //当前选中的节点
     currentNodeKey: [String, Number],
     icon: {
       type: Boolean,
@@ -240,10 +243,20 @@ export default {
         return {};
       }
     },
+    //节点是否可被选择
     showCheckbox: {
       type: Boolean,
       default: false
     },
+    //是否勾选首级节点
+    checkedFirst: Boolean,
+    //默认勾选的节点的 key 的数组
+    defaultCheckedKeys: {
+      type: Array,
+      default() {
+        return [];
+      }
+    },
     multiple: {
       type: Boolean,
       default: false
@@ -311,7 +324,8 @@ export default {
       loading: false,
       searchValue: '',
       expandedKeys: [],
-      treeList: []
+      treeList: [],
+      checkedKeys: this.defaultCheckedKeys
     };
   },
   computed: {
@@ -337,6 +351,9 @@ export default {
         return false;
       }
       return this.remote;
+    },
+    defaultCheckeds() {
+      return [...this.defaultCheckedKeys, ...this.checkedKeys];
     }
   },
   watch: {
@@ -383,21 +400,31 @@ export default {
         .then((res) => {
           this.loading = false;
           if (res.rCode === 0) {
-            this.treeList = JSON.parse(JSON.stringify(res.results));
+            let treeList = JSON.parse(JSON.stringify(res.results));
+            this.$emit('results', treeList);
             if (this.currentFirst) {
-              let currentNode = this.treeList[0].id;
-              this.$emit('current-first', this.treeList[0]);
-              if (!this.currentNodeKey) {
+              let currentNode = treeList[0].id;
+              if (!this.currentNodeKey && this.currentNodeKey != 0) {
                 this.$nextTick(() => {
                   this.$refs.oaTree.setCurrentKey(currentNode);
                 });
               }
             }
-            this.expandedKeys = this.treeList.filter((item) => {
+            if (this.checkedFirst) {
+              let checkedNode = treeList[0].id;
+              if (
+                this.defaultCheckedKeys &&
+                this.defaultCheckedKeys.indexOf(checkedNode) == -1
+              ) {
+                this.checkedKeys = [checkedNode];
+              }
+            }
+            this.expandedKeys = treeList.filter((item) => {
               if (item.open) {
                 return item.id;
               }
             });
+            this.treeList = treeList;
           }
         })
         .catch((err) => {
@@ -437,6 +464,7 @@ export default {
               if (res.rCode === 0) {
                 this.loading = false;
                 let results = JSON.parse(JSON.stringify(res.results));
+                this.$emit('sub-results', results);
                 if (Array.isArray(results)) {
                   if (data.id === results[0].id) {
                     this.$set(data, 'children', results[0].children);

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

@@ -49,7 +49,8 @@
         ref="groupTree"
         @node-click="handleNodeClick"
         @check-change="handleCheckChange"
-        @current-first="handleCurrentFirst"
+        @results="handleResults"
+        @sub-results="handleSubResults"
         v-on="tree.events ? tree.events : {}"
       >
         <template v-if="enterprise" slot="filtrate">
@@ -191,7 +192,11 @@ export default {
       type: String,
       default: '#/empty'
     },
-    zoom: false
+    zoom: false,
+    checkedsAsSearch: {
+      type: Boolean,
+      default: true
+    }
   },
   computed: {
     wujieName() {
@@ -419,11 +424,14 @@ export default {
             ? this.tabs[Number(this.active)].ref
             : 'groupTree' + this.active
           : 'groupTree';
-      this.checkeds = this.$refs[ref].getCheckedNodes();
+      let checkeds = this.$refs[ref].getCheckedNodes();
+      if (this.checkedsAsSearch) {
+        this.checkeds = checkeds;
+      }
       if (this.onCheckChange) {
-        this.onCheckChange(this, ...arguments);
+        this.onCheckChange(checkeds, ...arguments, this);
       } else {
-        this.$emit('check-change', this, ...arguments);
+        this.$emit('check-change', checkeds, ...arguments, this);
       }
     },
     handleChange(res) {
@@ -433,9 +441,19 @@ export default {
       this.checkeds = res;
       this.$emit('enterprise-confirm', res);
     },
-    handleCurrentFirst(res) {
-      this.checkeds = res.children[0];
-      this.$emit('current-first', res);
+    handleResults(res) {
+      if (
+        (this.tree.showCheckbox &&
+          this.tree.checkedFirst &&
+          this.checkedsAsSearch) ||
+        this.tree.currentFirst
+      ) {
+        this.checkeds = res.children[0];
+      }
+      this.$emit('results', res);
+    },
+    handleSubResults(res) {
+      this.$emit('sub-results', res);
     },
     setCurrentKey(keys, leafOnly) {
       let ref =

package/src/index.js

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