eoss-ui 0.8.9 → 0.8.11

package/lib/eoss-ui.common.js

@@ -37532,8 +37532,8 @@ var TimeLimit_component = normalizeComponent(
 )
 
 /* harmony default export */ var TimeLimit = (TimeLimit_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processReject.vue?vue&type=template&id=364df082&
-var processRejectvue_type_template_id_364df082_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processReject.vue?vue&type=template&id=d881d334&
+var processRejectvue_type_template_id_d881d334_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -37651,9 +37651,10 @@ var processRejectvue_type_template_id_364df082_render = function () {
                       rawName: "v-show",
                       value:
                         _vm.nextNode.noticeList.length != 0 &&
-                        _vm.rejectObj.length != 0,
+                        _vm.rejectObj.length != 0 &&
+                        !_vm.hideMessage,
                       expression:
-                        "nextNode.noticeList.length != 0 && rejectObj.length != 0",
+                        "nextNode.noticeList.length != 0 && rejectObj.length != 0 && !hideMessage",
                     },
                   ],
                   attrs: { prop: "noticeType", label: "通知方式" },
@@ -37767,11 +37768,11 @@ var processRejectvue_type_template_id_364df082_render = function () {
     1
   )
 }
-var processRejectvue_type_template_id_364df082_staticRenderFns = []
-processRejectvue_type_template_id_364df082_render._withStripped = true
+var processRejectvue_type_template_id_d881d334_staticRenderFns = []
+processRejectvue_type_template_id_d881d334_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processReject.vue?vue&type=template&id=364df082&
+// CONCATENATED MODULE: ./packages/flow/src/processReject.vue?vue&type=template&id=d881d334&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processReject.vue?vue&type=script&lang=js&
 //
@@ -38092,8 +38093,8 @@ processRejectvue_type_template_id_364df082_render._withStripped = true
 
 var processReject_component = normalizeComponent(
   src_processRejectvue_type_script_lang_js_,
-  processRejectvue_type_template_id_364df082_render,
-  processRejectvue_type_template_id_364df082_staticRenderFns,
+  processRejectvue_type_template_id_d881d334_render,
+  processRejectvue_type_template_id_d881d334_staticRenderFns,
   false,
   null,
   null,
@@ -94225,8 +94226,8 @@ tips_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_tips = (tips_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/src/main.vue?vue&type=template&id=39950d7e&
-var mainvue_type_template_id_39950d7e_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/src/main.vue?vue&type=template&id=78570bab&
+var mainvue_type_template_id_78570bab_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -94423,13 +94424,15 @@ var mainvue_type_template_id_39950d7e_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_39950d7e_staticRenderFns = []
-mainvue_type_template_id_39950d7e_render._withStripped = true
+var mainvue_type_template_id_78570bab_staticRenderFns = []
+mainvue_type_template_id_78570bab_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&
 
 // 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 tree_src_mainvue_type_script_lang_js_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; };
+
 //
 //
 //
@@ -94635,6 +94638,11 @@ mainvue_type_template_id_39950d7e_render._withStripped = true
       type: Boolean,
       default: false
     },
+    //是否默认所有节点都是父节点
+    enableSubNode: {
+      type: Boolean,
+      default: false
+    },
     onChange: Function,
     onSearch: Function,
 
@@ -94863,7 +94871,11 @@ mainvue_type_template_id_39950d7e_render._withStripped = true
               return item.id;
             }
           });
-          _this2.treeList = treeList;
+          if (_this2.enableSubNode) {
+            _this2.treeList = _this2.addSubNode(treeList);
+          } else {
+            _this2.treeList = treeList;
+          }
         }
       }).catch(function (err) {
         _this2.loading = false;
@@ -94873,9 +94885,30 @@ mainvue_type_template_id_39950d7e_render._withStripped = true
       });
     },
 
+    //给每个树节点默认加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 = tree_src_mainvue_type_script_lang_js_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 = utils_util.extend({}, this.param, this.where, {
@@ -94887,10 +94920,11 @@ mainvue_type_template_id_39950d7e_render._withStripped = true
         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 {
           utils_util.ajax({
@@ -94900,25 +94934,45 @@ mainvue_type_template_id_39950d7e_render._withStripped = true
             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 tree_src_mainvue_type_script_lang_js_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 tree_src_mainvue_type_script_lang_js_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 tree_src_mainvue_type_script_lang_js_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);
             }
           });
         }
@@ -94946,13 +95000,13 @@ mainvue_type_template_id_39950d7e_render._withStripped = true
       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];
         }
       });
     },
@@ -95013,7 +95067,7 @@ mainvue_type_template_id_39950d7e_render._withStripped = true
       }
     },
     handleCheckChange: function handleCheckChange(data, checked, indeterminate) {
-      var _this5 = this;
+      var _this6 = this;
 
       if (this.esPage && this.changeData) {
         var checkeds = this.getCheckedNodes();
@@ -95021,7 +95075,7 @@ mainvue_type_template_id_39950d7e_render._withStripped = true
         if (utils_util.isObject(this.changeData)) {
           var _loop = function _loop(_i2) {
             changeData[_i2] = checkeds.map(function (item) {
-              return item[_this5.changeData[_i2]];
+              return item[_this6.changeData[_i2]];
             });
           };
 
@@ -95031,7 +95085,7 @@ mainvue_type_template_id_39950d7e_render._withStripped = true
         } 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 {
@@ -95108,12 +95162,12 @@ mainvue_type_template_id_39950d7e_render._withStripped = true
       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);
         }
       });
     },
@@ -95143,8 +95197,8 @@ mainvue_type_template_id_39950d7e_render._withStripped = true
 
 var tree_src_main_component = normalizeComponent(
   packages_tree_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_39950d7e_render,
-  mainvue_type_template_id_39950d7e_staticRenderFns,
+  mainvue_type_template_id_78570bab_render,
+  mainvue_type_template_id_78570bab_staticRenderFns,
   false,
   null,
   null,
@@ -102890,7 +102944,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.8.9',
+  version: '0.8.11',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow.js

@@ -13807,8 +13807,8 @@ var TimeLimit_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var TimeLimit = (TimeLimit_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processReject.vue?vue&type=template&id=364df082&
-var processRejectvue_type_template_id_364df082_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processReject.vue?vue&type=template&id=d881d334&
+var processRejectvue_type_template_id_d881d334_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -13926,9 +13926,10 @@ var processRejectvue_type_template_id_364df082_render = function () {
                       rawName: "v-show",
                       value:
                         _vm.nextNode.noticeList.length != 0 &&
-                        _vm.rejectObj.length != 0,
+                        _vm.rejectObj.length != 0 &&
+                        !_vm.hideMessage,
                       expression:
-                        "nextNode.noticeList.length != 0 && rejectObj.length != 0",
+                        "nextNode.noticeList.length != 0 && rejectObj.length != 0 && !hideMessage",
                     },
                   ],
                   attrs: { prop: "noticeType", label: "通知方式" },
@@ -14042,11 +14043,11 @@ var processRejectvue_type_template_id_364df082_render = function () {
     1
   )
 }
-var processRejectvue_type_template_id_364df082_staticRenderFns = []
-processRejectvue_type_template_id_364df082_render._withStripped = true
+var processRejectvue_type_template_id_d881d334_staticRenderFns = []
+processRejectvue_type_template_id_d881d334_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/processReject.vue?vue&type=template&id=364df082&
+// CONCATENATED MODULE: ./packages/flow/src/processReject.vue?vue&type=template&id=d881d334&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/processReject.vue?vue&type=script&lang=js&
 //
@@ -14367,8 +14368,8 @@ processRejectvue_type_template_id_364df082_render._withStripped = true
 
 var processReject_component = Object(componentNormalizer["a" /* default */])(
   src_processRejectvue_type_script_lang_js_,
-  processRejectvue_type_template_id_364df082_render,
-  processRejectvue_type_template_id_364df082_staticRenderFns,
+  processRejectvue_type_template_id_d881d334_render,
+  processRejectvue_type_template_id_d881d334_staticRenderFns,
   false,
   null,
   null,