eoss-ui 0.8.9 → 0.8.11

package/lib/tree.js

@@ -4640,7 +4640,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=39950d7e&
+// 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=78570bab&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4842,7 +4842,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=39950d7e&
+// CONCATENATED MODULE: ./packages/tree/src/main.vue?vue&type=template&id=78570bab&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4854,6 +4854,8 @@ var external_throttle_debounce_ = __webpack_require__(13);
 var util = __webpack_require__(0);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree/src/main.vue?vue&type=script&lang=js&
+var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 //
 //
 //
@@ -5059,6 +5061,11 @@ var util = __webpack_require__(0);
       type: Boolean,
       default: false
     },
+    //是否默认所有节点都是父节点
+    enableSubNode: {
+      type: Boolean,
+      default: false
+    },
     onChange: Function,
     onSearch: Function,
 
@@ -5287,7 +5294,11 @@ var util = __webpack_require__(0);
               return item.id;
             }
           });
-          _this2.treeList = treeList;
+          if (_this2.enableSubNode) {
+            _this2.treeList = _this2.addSubNode(treeList);
+          } else {
+            _this2.treeList = treeList;
+          }
         }
       }).catch(function (err) {
         _this2.loading = false;
@@ -5297,9 +5308,30 @@ var util = __webpack_require__(0);
       });
     },
 
+    //给每个树节点默认加subNode属性，递归执行
+    addSubNode: function addSubNode(data) {
+      var _this3 = this;
+
+      if (!data) return data;
+      if (Array.isArray(data)) {
+        return data.map(function (item) {
+          return _this3.addSubNode(item);
+        });
+      }
+      var result = _extends({}, data, { subNode: true });
+      if (result.children && result.children.length > 0) {
+        result.open = true;
+        result.children = this.addSubNode(result.children);
+      } else {
+        result.open = false;
+      }
+      return result;
+    },
+
+
     //请求子节点数据
     loadsub: function loadsub(data, node) {
-      var _this3 = this;
+      var _this4 = this;
 
       if (data.state !== '' && (!data.children || data.children.length === 0)) {
         var params = util["a" /* default */].extend({}, this.param, this.where, {
@@ -5311,10 +5343,11 @@ var util = __webpack_require__(0);
         if (this.parseParams) {
           params = this.parseParams({ data: data, params: params, node: node });
         }
+        this.loading = true;
         if (this.onLoadsub) {
           this.onLoadsub({ data: data, params: params, node: node }).then(function (res) {
-            _this3.loading = false;
-            _this3.$set(data, 'children', JSON.parse(JSON.stringify(res)));
+            _this4.loading = false;
+            _this4.$set(data, 'children', JSON.parse(JSON.stringify(res)));
           }).catch(function (e) {});
         } else {
           util["a" /* default */].ajax({
@@ -5324,25 +5357,45 @@ var util = __webpack_require__(0);
             params: params
           }).then(function (res) {
             if (res.rCode === 0) {
-              _this3.loading = false;
-              var results = _this3.parseData ? _this3.parseData(JSON.parse(JSON.stringify(res.results)), 'sub-results') : JSON.parse(JSON.stringify(res.results));
-              _this3.$emit('sub-results', results);
+              _this4.loading = false;
+              var results = _this4.parseData ? _this4.parseData(JSON.parse(JSON.stringify(res.results)), 'sub-results') : JSON.parse(JSON.stringify(res.results));
+              _this4.$emit('sub-results', results);
               if (Array.isArray(results)) {
-                if (data.id === results[0].id) {
-                  _this3.$set(data, 'children', results[0].children);
+                if (results.length > 0 && data.id === results[0].id) {
+                  _this4.$set(data, 'children', results[0].children.map(function (item) {
+                    return _extends({}, item, {
+                      subNode: _this4.enableSubNode,
+                      open: false
+                    });
+                  }));
+                } else if (results.length <= 0) {
+                  node.isLeaf = true;
+                  console.log('node', node);
+                  _this4.$set(data, 'children', []);
                 } else {
-                  _this3.$set(data, 'children', results);
+                  _this4.$set(data, 'children', results.map(function (item) {
+                    return _extends({}, item, {
+                      subNode: _this4.enableSubNode,
+                      open: false
+                    });
+                  }));
                 }
               } else if (data.id === results.id) {
-                _this3.$set(data, 'children', results.children);
+                _this4.$set(data, 'children', results.children.map(function (item) {
+                  return _extends({}, item, {
+                    subNode: _this4.enableSubNode,
+                    open: false
+                  });
+                }));
               } else {
                 console.error('tree数据格式错误');
               }
             }
           }).catch(function (err) {
-            _this3.loading = false;
+            _this4.loading = false;
+            console.log('errr', err);
             if (err.message && err.message !== 'canceled') {
-              _this3.$message.error(err.message);
+              _this4.$message.error(err.message);
             }
           });
         }
@@ -5370,13 +5423,13 @@ var util = __webpack_require__(0);
       this.$emit('load', node, resolve);
     },
     sortTree: function sortTree(arr) {
-      var _this4 = this;
+      var _this5 = this;
 
       return arr.sort(function (a, b) {
-        if (_this4.order === 'asc' && a[_this4.sort]) {
-          return a[_this4.sort] - b[_this4.sort];
+        if (_this5.order === 'asc' && a[_this5.sort]) {
+          return a[_this5.sort] - b[_this5.sort];
         } else {
-          return b[_this4.sort] - a[_this4.sort];
+          return b[_this5.sort] - a[_this5.sort];
         }
       });
     },
@@ -5437,7 +5490,7 @@ var util = __webpack_require__(0);
       }
     },
     handleCheckChange: function handleCheckChange(data, checked, indeterminate) {
-      var _this5 = this;
+      var _this6 = this;
 
       if (this.esPage && this.changeData) {
         var checkeds = this.getCheckedNodes();
@@ -5445,7 +5498,7 @@ var util = __webpack_require__(0);
         if (util["a" /* default */].isObject(this.changeData)) {
           var _loop = function _loop(_i2) {
             changeData[_i2] = checkeds.map(function (item) {
-              return item[_this5.changeData[_i2]];
+              return item[_this6.changeData[_i2]];
             });
           };
 
@@ -5455,7 +5508,7 @@ var util = __webpack_require__(0);
         } else if (Array.isArray(this.changeData)) {
           this.changeData.forEach(function (item) {
             changeData[item] = checkeds.map(function (ele) {
-              return ele[_this5.changeData[i]];
+              return ele[_this6.changeData[i]];
             });
           });
         } else {
@@ -5532,12 +5585,12 @@ var util = __webpack_require__(0);
       return this.$refs.oaTree.insertAfter(data, refNode);
     },
     getKeys: function getKeys(data, result) {
-      var _this6 = this;
+      var _this7 = this;
 
       data.forEach(function (item) {
         result.push(item.id);
         if (Object.prototype.hasOwnProperty.call(item, 'children') && item.children.length) {
-          _this6.getKeys(item.children, result);
+          _this7.getKeys(item.children, result);
         }
       });
     },

package/package.json

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

package/packages/flow/src/processReject.vue

@@ -40,7 +40,7 @@
         <el-form-item
           prop="noticeType"
           label="通知方式"
-          v-show="nextNode.noticeList.length != 0 && rejectObj.length != 0"
+          v-show="nextNode.noticeList.length != 0 && rejectObj.length != 0 && !hideMessage"
         >
           <el-checkbox-group v-model="nextNode.noticeType">
             <el-checkbox

package/packages/tree/src/main.vue

@@ -221,6 +221,11 @@ export default {
       type: Boolean,
       default: false
     },
+    //是否默认所有节点都是父节点
+    enableSubNode: {
+      type: Boolean,
+      default: false
+    },
     onChange: Function,
     onSearch: Function,
 
@@ -452,7 +457,11 @@ export default {
                 return item.id;
               }
             });
-            this.treeList = treeList;
+            if (this.enableSubNode) {
+              this.treeList = this.addSubNode(treeList);
+            } else {
+              this.treeList = treeList;
+            }
           }
         })
         .catch((err) => {
@@ -462,6 +471,22 @@ export default {
           }
         });
     },
+    //给每个树节点默认加subNode属性，递归执行
+    addSubNode(data) {
+      if (!data) return data;
+      if (Array.isArray(data)) {
+        return data.map((item) => this.addSubNode(item));
+      }
+      const result = { ...data, subNode: true };
+      if (result.children && result.children.length > 0) {
+        result.open = true;
+        result.children = this.addSubNode(result.children);
+      } else {
+        result.open = false;
+      }
+      return result;
+    },
+
     //请求子节点数据
     loadsub(data, node) {
       if (data.state !== '' && (!data.children || data.children.length === 0)) {
@@ -474,6 +499,7 @@ export default {
         if (this.parseParams) {
           params = this.parseParams({ data, params, node });
         }
+        this.loading = true;
         if (this.onLoadsub) {
           this.onLoadsub({ data, params, node })
             .then((res) => {
@@ -500,13 +526,47 @@ export default {
                   : 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);
+                  if (results.length > 0 && data.id === results[0].id) {
+                    this.$set(
+                      data,
+                      'children',
+                      results[0].children.map((item) => {
+                        return {
+                          ...item,
+                          subNode: this.enableSubNode,
+                          open: false
+                        };
+                      })
+                    );
+                  } else if (results.length <= 0) {
+                    node.isLeaf = true;
+                    console.log('node', node);
+                    this.$set(data, 'children', []);
                   } else {
-                    this.$set(data, 'children', results);
+                    this.$set(
+                      data,
+                      'children',
+                      results.map((item) => {
+                        return {
+                          ...item,
+                          subNode: this.enableSubNode,
+                          open: false
+                        };
+                      })
+                    );
                   }
                 } else if (data.id === results.id) {
-                  this.$set(data, 'children', results.children);
+                  this.$set(
+                    data,
+                    'children',
+                    results.children.map((item) => {
+                      return {
+                        ...item,
+                        subNode: this.enableSubNode,
+                        open: false
+                      };
+                    })
+                  );
                 } else {
                   console.error('tree数据格式错误');
                 }
@@ -514,6 +574,7 @@ export default {
             })
             .catch((err) => {
               this.loading = false;
+              console.log('errr', err);
               if (err.message && err.message !== 'canceled') {
                 this.$message.error(err.message);
               }

package/src/index.js

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