eoss-ui 0.8.8 → 0.8.10

package/packages/tree/index.js

@@ -1,5 +1,5 @@
-import EsTree from './src/main';
-
-EsTree.install = Vue => Vue.component(EsTree.name, EsTree);
-
-export default EsTree;
+import EsTree from './src/main';
+
+EsTree.install = Vue => Vue.component(EsTree.name, EsTree);
+
+export default EsTree;

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/packages/tree-group/index.js

@@ -1,5 +1,5 @@
-import EsTreeGroup from './src/main';
-
-EsTreeGroup.install = Vue => Vue.component(EsTreeGroup.name, EsTreeGroup);
-
-export default EsTreeGroup;
+import EsTreeGroup from './src/main';
+
+EsTreeGroup.install = Vue => Vue.component(EsTreeGroup.name, EsTreeGroup);
+
+export default EsTreeGroup;

package/packages/upload/index.js

@@ -1,5 +1,5 @@
-import EsUpload from './src/main';
-
-EsUpload.install = Vue => Vue.component(EsUpload.name, EsUpload);
-
-export default EsUpload;
+import EsUpload from './src/main';
+
+EsUpload.install = Vue => Vue.component(EsUpload.name, EsUpload);
+
+export default EsUpload;