element-ui-root 2.9.9 → 3.0.1

package/dist/index.common.js

@@ -19245,6 +19245,7 @@ __webpack_require__.r(__webpack_exports__);
             "attrs": {
               "clearable": true,
               "filterable": true,
+              "collapse-tags": true,
               "placeholder": props.placeholder || `请选择${words}`
             },
             "on": {
@@ -61785,27 +61786,38 @@ __webpack_require__.r(__webpack_exports__);
   },
   methods: {
     create() {
-      const h = this.$createElement;
       let column = [...this.column, this.suffix()];
-      return column.map((a, b) => {
-        if (a && Object.keys(a).length > 0) {
-          let {
-            type = null,
-            render = null,
-            header = null,
-            ...r
-          } = a;
-          let field = a.field || a.index || a.name || a.prop;
-          let label = a.label || a.title || a.text;
-          let props = {
-            key: b,
-            prop: field,
-            scopedSlot: field,
-            sortable: field ? a.sortable ? a.sortable : this.sortable : false,
-            formatter: render ? render : type ? (e, f, g, h) => this.format(a, b, e, h) : null,
-            showOverflowTooltip: a.showOverflowTooltip ? a.showOverflowTooltip : this.showOverflowTooltip,
-            ...r
-          };
+      return column.map((a, b) => this.output(a, b));
+    },
+    output(a, b) {
+      const h = this.$createElement;
+      if (a && Object.keys(a).length > 0) {
+        let {
+          type = null,
+          render = null,
+          header = null,
+          ...r
+        } = a;
+        let child = a.children || a.child || a.node || a.list || [];
+        let field = a.field || a.index || a.name || a.prop;
+        let label = a.label || a.title || a.text;
+        let props = {
+          key: b,
+          prop: field,
+          scopedSlot: field,
+          sortable: field ? a.sortable ? a.sortable : this.sortable : false,
+          formatter: render ? render : type ? (e, f, g, h) => this.format(a, b, e, h) : null,
+          showOverflowTooltip: a.showOverflowTooltip ? a.showOverflowTooltip : this.showOverflowTooltip,
+          ...r
+        };
+        if (child.length > 0) {
+          return h("el-table-column", {
+            "key": b,
+            "attrs": {
+              "label": label
+            }
+          }, [child.map((c, d) => this.output(c, `${b}-${d}`))]);
+        } else {
           return h("el-table-column", {
             "props": {
               ...props
@@ -61827,7 +61839,7 @@ __webpack_require__.r(__webpack_exports__);
             }
           }, [label])])]);
         }
-      });
+      }
     },
     suffix() {
       const h = this.$createElement;
@@ -136186,27 +136198,38 @@ __webpack_require__.r(__webpack_exports__);
   },
   methods: {
     create() {
-      const h = this.$createElement;
       let column = [...this.column, this.suffix()];
-      return column.map((a, b) => {
-        if (a && Object.keys(a).length > 0) {
-          let {
-            type = null,
-            render = null,
-            header = null,
-            ...r
-          } = a;
-          let field = a.field || a.index || a.name || a.prop;
-          let label = a.label || a.title || a.text;
-          let props = {
-            key: b,
-            prop: field,
-            scopedSlot: field,
-            sortable: field ? a.sortable ? a.sortable : this.sortable : false,
-            formatter: render ? render : type ? (e, f, g, h) => this.format(a, b, e, h) : null,
-            showOverflowTooltip: a.showOverflowTooltip ? a.showOverflowTooltip : this.showOverflowTooltip,
-            ...r
-          };
+      return column.map((a, b) => this.output(a, b));
+    },
+    output(a, b) {
+      const h = this.$createElement;
+      if (a && Object.keys(a).length > 0) {
+        let {
+          type = null,
+          render = null,
+          header = null,
+          ...r
+        } = a;
+        let child = a.children || a.child || a.node || a.list || [];
+        let field = a.field || a.index || a.name || a.prop;
+        let label = a.label || a.title || a.text;
+        let props = {
+          key: b,
+          prop: field,
+          scopedSlot: field,
+          sortable: field ? a.sortable ? a.sortable : this.sortable : false,
+          formatter: render ? render : type ? (e, f, g, h) => this.format(a, b, e, h) : null,
+          showOverflowTooltip: a.showOverflowTooltip ? a.showOverflowTooltip : this.showOverflowTooltip,
+          ...r
+        };
+        if (child.length > 0) {
+          return h("el-table-column", {
+            "key": b,
+            "attrs": {
+              "label": label
+            }
+          }, [child.map((c, d) => this.output(c, `${b}-${d}`))]);
+        } else {
           return h("el-table-column", {
             "props": {
               ...props
@@ -136228,7 +136251,7 @@ __webpack_require__.r(__webpack_exports__);
             }
           }, [label])])]);
         }
-      });
+      }
     },
     suffix() {
       const h = this.$createElement;
@@ -162439,6 +162462,10 @@ __webpack_require__.r(__webpack_exports__);
       type: String,
       default: () => ''
     },
+    margin: {
+      type: String,
+      default: () => '0'
+    },
     padding: {
       type: String,
       default: () => '20px'
@@ -162578,6 +162605,10 @@ __webpack_require__.r(__webpack_exports__);
       ...props
     } = this.$attrs;
     return h("div", {
+      "style": {
+        padding: this.margin
+      }
+    }, [h("div", {
       "attrs": {
         "id": this.id
       },
@@ -162645,7 +162676,7 @@ __webpack_require__.r(__webpack_exports__);
         "size": "small",
         "disabled": this.loading
       }
-    }, [this.cancelText]), this.actionRender])]);
+    }, [this.cancelText]), this.actionRender])])]);
   }
 });
 

package/dist/index.umd.js

@@ -19254,6 +19254,7 @@ __webpack_require__.r(__webpack_exports__);
             "attrs": {
               "clearable": true,
               "filterable": true,
+              "collapse-tags": true,
               "placeholder": props.placeholder || `请选择${words}`
             },
             "on": {
@@ -61794,27 +61795,38 @@ __webpack_require__.r(__webpack_exports__);
   },
   methods: {
     create() {
-      const h = this.$createElement;
       let column = [...this.column, this.suffix()];
-      return column.map((a, b) => {
-        if (a && Object.keys(a).length > 0) {
-          let {
-            type = null,
-            render = null,
-            header = null,
-            ...r
-          } = a;
-          let field = a.field || a.index || a.name || a.prop;
-          let label = a.label || a.title || a.text;
-          let props = {
-            key: b,
-            prop: field,
-            scopedSlot: field,
-            sortable: field ? a.sortable ? a.sortable : this.sortable : false,
-            formatter: render ? render : type ? (e, f, g, h) => this.format(a, b, e, h) : null,
-            showOverflowTooltip: a.showOverflowTooltip ? a.showOverflowTooltip : this.showOverflowTooltip,
-            ...r
-          };
+      return column.map((a, b) => this.output(a, b));
+    },
+    output(a, b) {
+      const h = this.$createElement;
+      if (a && Object.keys(a).length > 0) {
+        let {
+          type = null,
+          render = null,
+          header = null,
+          ...r
+        } = a;
+        let child = a.children || a.child || a.node || a.list || [];
+        let field = a.field || a.index || a.name || a.prop;
+        let label = a.label || a.title || a.text;
+        let props = {
+          key: b,
+          prop: field,
+          scopedSlot: field,
+          sortable: field ? a.sortable ? a.sortable : this.sortable : false,
+          formatter: render ? render : type ? (e, f, g, h) => this.format(a, b, e, h) : null,
+          showOverflowTooltip: a.showOverflowTooltip ? a.showOverflowTooltip : this.showOverflowTooltip,
+          ...r
+        };
+        if (child.length > 0) {
+          return h("el-table-column", {
+            "key": b,
+            "attrs": {
+              "label": label
+            }
+          }, [child.map((c, d) => this.output(c, `${b}-${d}`))]);
+        } else {
           return h("el-table-column", {
             "props": {
               ...props
@@ -61836,7 +61848,7 @@ __webpack_require__.r(__webpack_exports__);
             }
           }, [label])])]);
         }
-      });
+      }
     },
     suffix() {
       const h = this.$createElement;
@@ -136195,27 +136207,38 @@ __webpack_require__.r(__webpack_exports__);
   },
   methods: {
     create() {
-      const h = this.$createElement;
       let column = [...this.column, this.suffix()];
-      return column.map((a, b) => {
-        if (a && Object.keys(a).length > 0) {
-          let {
-            type = null,
-            render = null,
-            header = null,
-            ...r
-          } = a;
-          let field = a.field || a.index || a.name || a.prop;
-          let label = a.label || a.title || a.text;
-          let props = {
-            key: b,
-            prop: field,
-            scopedSlot: field,
-            sortable: field ? a.sortable ? a.sortable : this.sortable : false,
-            formatter: render ? render : type ? (e, f, g, h) => this.format(a, b, e, h) : null,
-            showOverflowTooltip: a.showOverflowTooltip ? a.showOverflowTooltip : this.showOverflowTooltip,
-            ...r
-          };
+      return column.map((a, b) => this.output(a, b));
+    },
+    output(a, b) {
+      const h = this.$createElement;
+      if (a && Object.keys(a).length > 0) {
+        let {
+          type = null,
+          render = null,
+          header = null,
+          ...r
+        } = a;
+        let child = a.children || a.child || a.node || a.list || [];
+        let field = a.field || a.index || a.name || a.prop;
+        let label = a.label || a.title || a.text;
+        let props = {
+          key: b,
+          prop: field,
+          scopedSlot: field,
+          sortable: field ? a.sortable ? a.sortable : this.sortable : false,
+          formatter: render ? render : type ? (e, f, g, h) => this.format(a, b, e, h) : null,
+          showOverflowTooltip: a.showOverflowTooltip ? a.showOverflowTooltip : this.showOverflowTooltip,
+          ...r
+        };
+        if (child.length > 0) {
+          return h("el-table-column", {
+            "key": b,
+            "attrs": {
+              "label": label
+            }
+          }, [child.map((c, d) => this.output(c, `${b}-${d}`))]);
+        } else {
           return h("el-table-column", {
             "props": {
               ...props
@@ -136237,7 +136260,7 @@ __webpack_require__.r(__webpack_exports__);
             }
           }, [label])])]);
         }
-      });
+      }
     },
     suffix() {
       const h = this.$createElement;
@@ -162448,6 +162471,10 @@ __webpack_require__.r(__webpack_exports__);
       type: String,
       default: () => ''
     },
+    margin: {
+      type: String,
+      default: () => '0'
+    },
     padding: {
       type: String,
       default: () => '20px'
@@ -162587,6 +162614,10 @@ __webpack_require__.r(__webpack_exports__);
       ...props
     } = this.$attrs;
     return h("div", {
+      "style": {
+        padding: this.margin
+      }
+    }, [h("div", {
       "attrs": {
         "id": this.id
       },
@@ -162654,7 +162685,7 @@ __webpack_require__.r(__webpack_exports__);
         "size": "small",
         "disabled": this.loading
       }
-    }, [this.cancelText]), this.actionRender])]);
+    }, [this.cancelText]), this.actionRender])])]);
   }
 });