element-ui-root 3.0.6 → 3.0.7

package/dist/index.common.js

@@ -13492,7 +13492,7 @@ __webpack_require__.r(__webpack_exports__);
     },
     gutter: {
       type: String,
-      default: () => '8'
+      default: () => '16'
     },
     config: {
       type: Object,
@@ -13545,9 +13545,6 @@ __webpack_require__.r(__webpack_exports__);
           r.default && (this.form[a] = r.default || '');
         }
       });
-      this.$nextTick(() => {
-        Object.keys(this.value).forEach(a => typeof this.value[a] == 'number' && (this.form[a] = `${this.value[a]}`));
-      });
     },
     create(a, b) {
       const h = this.$createElement;
@@ -13616,9 +13613,15 @@ __webpack_require__.r(__webpack_exports__);
           let {
             ...r
           } = child[c];
+          let space = a.gutter ? a.gutter / 2 : this.gutter / 4;
+          let style = {
+            padding: `0 ${space}px`
+          };
+          r.type = r.type ? r.type : a.type;
           if (r.span) {
             return h("el-col", {
               "key": d,
+              "style": style,
               "attrs": {
                 "span": Number(r.span)
               }
@@ -13628,7 +13631,8 @@ __webpack_require__.r(__webpack_exports__);
             return h("el-col", {
               "key": d,
               "style": {
-                width
+                width,
+                ...style
               }
             }, [this.format(r, c)]);
           }
@@ -13638,6 +13642,7 @@ __webpack_require__.r(__webpack_exports__);
           change: () => this.change(),
           form: this.form,
           field: b,
+          clearable: !a.default,
           ...a
         };
         return h(_components_AformItem__WEBPACK_IMPORTED_MODULE_1__["default"], {
@@ -13773,15 +13778,16 @@ __webpack_require__.r(__webpack_exports__);
       "style": {
         height: this.opened ? `${this.height}px` : '0'
       }
-    }, [Object.keys(this.config).map((a, b) => b > this.cols - 1 && this.create(a, b))])]), (submit || cancel || action.length > 0) && h("el-form-item", {
-      "attrs": {
-        "name": "action",
-        "label": "action"
-      },
+    }, [Object.keys(this.config).map((a, b) => b > this.cols - 1 && this.create(a, b))])]), (submit || cancel || action.length > 0) && h("div", {
       "class": "action",
       "style": {
         paddingLeft: `${this.gutter}px`
       }
+    }, [h("el-form-item", {
+      "attrs": {
+        "name": "action",
+        "label": "action"
+      }
     }, [Object.keys(this.config).length > this.cols && !this.inline && h("el-button", {
       "attrs": {
         "disabled": loading,
@@ -13813,8 +13819,11 @@ __webpack_require__.r(__webpack_exports__);
       "key": b,
       "attrs": {
         "disabled": loading
+      },
+      "on": {
+        "click": e => a.click(this.filter(), this.form, this.option, e)
       }
-    }, a]), [a.label || a.title || a.text || '']))])])]);
+    }, a]), [a.label || a.title || a.text || '']))])])])]);
   }
 });
 
@@ -60730,18 +60739,6 @@ __webpack_require__.r(__webpack_exports__);
     Aform: _components_Aform__WEBPACK_IMPORTED_MODULE_0__["default"]
   },
   props: {
-    visible: {
-      type: Boolean,
-      default: () => false
-    },
-    title: {
-      type: String,
-      default: () => '编辑'
-    },
-    width: {
-      type: String,
-      default: () => '600px'
-    },
     rule: {
       type: Boolean,
       default: () => true
@@ -60755,10 +60752,6 @@ __webpack_require__.r(__webpack_exports__);
       default: () => true
     },
     config: {
-      type: Array,
-      default: () => []
-    },
-    object: {
       type: Object,
       default: () => ({})
     },
@@ -60778,34 +60771,17 @@ __webpack_require__.r(__webpack_exports__);
       type: String,
       default: () => '取消'
     },
-    loading: {
-      type: Boolean,
-      default: () => false
-    },
     labelPosition: {
       type: String,
       default: () => 'top'
     }
   },
-  methods: {
-    finish(form) {
-      this.$emit('finish', form);
-    },
-    submit(form) {
-      this.$emit('submit', form);
-    },
-    cancel(form) {
-      this.$emit('cancel', form);
-    }
-  },
   render() {
     const h = arguments[0];
     const {
       rule,
       rules,
-      action,
       config,
-      object,
       values,
       finishText,
       submitText,
@@ -60813,21 +60789,30 @@ __webpack_require__.r(__webpack_exports__);
       labelPosition
     } = this.$props;
     const {
+      title = '编辑',
+      width = '600px',
+      visible = false,
+      loading = false,
       ...props
     } = this.$attrs;
+    const {
+      finish,
+      submit,
+      cancel
+    } = this.$listeners;
     return h("div", {
       "class": this.loading ? 'a-modal loading' : 'a-modal'
     }, [h("el-dialog", {
       "attrs": {
-        "visible": this.visible,
-        "title": this.title,
-        "width": this.width,
+        "visible": visible,
+        "title": title,
+        "width": width,
         "lock-scroll": true,
         "destroy-on-close": true,
         "close-on-click-modal": false
       },
       "on": {
-        "close": this.cancel
+        "close": cancel
       },
       "props": {
         ...props
@@ -60836,23 +60821,22 @@ __webpack_require__.r(__webpack_exports__);
       "class": "a-modal-body"
     }, [h(_components_Aform__WEBPACK_IMPORTED_MODULE_0__["default"], {
       "attrs": {
+        "cols": "1",
         "size": "mini",
         "rule": rule,
         "rules": rules,
-        "action": action,
-        "object": config && config.length > 0 ? {} : object,
-        "config": config && config.length > 0 ? config : [],
+        "config": config,
         "values": values,
+        "loading": loading,
         "finishText": finishText,
         "submitText": submitText,
         "cancelText": cancelText,
-        "loading": this.loading,
         "labelPosition": labelPosition
       },
       "on": {
-        "finish": this.finish,
-        "submit": this.submit,
-        "cancel": this.cancel
+        "finish": finish,
+        "submit": submit,
+        "cancel": cancel
       }
     })]), this.$slots.default, h("div", {
       "class": this.action ? 'a-modal-foot custom' : ''
@@ -132351,12 +132335,16 @@ __webpack_require__.r(__webpack_exports__);
     },
     gutter: {
       type: String,
-      default: () => '8'
+      default: () => '16'
     },
     config: {
       type: Object,
       default: () => ({})
     },
+    values: {
+      type: Object,
+      default: () => ({})
+    },
     global: {
       type: Boolean,
       default: () => false
@@ -132373,14 +132361,24 @@ __webpack_require__.r(__webpack_exports__);
     };
   },
   watch: {
-    form() {
-      this.relate(this.config);
+    config: {
+      immediate: true,
+      deep: true,
+      handler() {
+        this.relate(this.config);
+      }
+    },
+    values: {
+      immediate: true,
+      deep: true,
+      handler() {
+        this.relate(this.config);
+      }
     }
   },
   created() {
     this.relate(this.config);
   },
-  mounted() {},
   methods: {
     input() {
       this.$emit('input', this.filter());
@@ -132389,6 +132387,7 @@ __webpack_require__.r(__webpack_exports__);
       this.$emit('change', this.filter(), this.form, this.option);
     },
     relate(config = {}) {
+      let data = {};
       Object.keys(config).forEach(a => {
         let {
           ...r
@@ -132397,12 +132396,18 @@ __webpack_require__.r(__webpack_exports__);
         if (child && Object.keys(child).length > 0) {
           this.relate(child);
         } else {
-          r.default && (this.form[a] = r.default || '');
+          if (r.type == 'password') {
+            data[a] = '';
+          } else {
+            if (this.values[a] != undefined) {
+              data[a] = `${this.values[a]}`;
+            } else if (r.default) {
+              data[a] = r.default;
+            }
+          }
         }
       });
-      this.$nextTick(() => {
-        Object.keys(this.value).forEach(a => typeof this.value[a] == 'number' && (this.form[a] = `${this.value[a]}`));
-      });
+      this.form = data;
     },
     create(a, b) {
       const h = this.$createElement;
@@ -132471,9 +132476,15 @@ __webpack_require__.r(__webpack_exports__);
           let {
             ...r
           } = child[c];
+          let space = a.gutter ? a.gutter / 2 : this.gutter / 4;
+          let style = {
+            padding: `0 ${space}px`
+          };
+          r.type = r.type ? r.type : a.type;
           if (r.span) {
             return h("el-col", {
               "key": d,
+              "style": style,
               "attrs": {
                 "span": Number(r.span)
               }
@@ -132483,7 +132494,8 @@ __webpack_require__.r(__webpack_exports__);
             return h("el-col", {
               "key": d,
               "style": {
-                width
+                width,
+                ...style
               }
             }, [this.format(r, c)]);
           }
@@ -132493,6 +132505,7 @@ __webpack_require__.r(__webpack_exports__);
           change: () => this.change(),
           form: this.form,
           field: b,
+          clearable: !a.default,
           ...a
         };
         return h(_components_AformItem__WEBPACK_IMPORTED_MODULE_1__["default"], {
@@ -132565,9 +132578,9 @@ __webpack_require__.r(__webpack_exports__);
       labelWidth = 'auto',
       labelPosition = 'top',
       finishText = '保存',
-      submitText = '搜索',
+      submitText = '提交',
       rejectText = '驳回',
-      cancelText = '重置',
+      cancelText = '取消',
       action = [],
       ...rest
     } = this.$attrs;
@@ -132608,15 +132621,16 @@ __webpack_require__.r(__webpack_exports__);
         "gutter": Number(this.gutter)
       },
       "class": "main-rows"
-    }, [Object.keys(this.config).map((a, b) => this.create(a, b))])]), (finish || submit || reject || cancel || action.length > 0) && h("el-form-item", {
-      "attrs": {
-        "name": "action",
-        "label": "action"
-      },
+    }, [Object.keys(this.config).map((a, b) => this.create(a, b))])]), (finish || submit || reject || cancel || action.length > 0) && h("div", {
       "class": "action",
       "style": {
         paddingLeft: `${this.gutter}px`
       }
+    }, [h("el-form-item", {
+      "attrs": {
+        "name": "action",
+        "label": "action"
+      }
     }, [finish && h("el-button", {
       "attrs": {
         "disabled": loading,
@@ -132653,8 +132667,11 @@ __webpack_require__.r(__webpack_exports__);
       "key": b,
       "attrs": {
         "disabled": loading
+      },
+      "on": {
+        "click": e => a.click(this.filter(), this.form, this.option, e)
       }
-    }, a]), [a.label || a.title || a.text || '']))])])]);
+    }, a]), [a.label || a.title || a.text || '']))])])])]);
   }
 });
 
@@ -134402,6 +134419,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony default export */ __webpack_exports__["default"] = ({
   name: 'AfEditor',
   props: {
+    value: {
+      type: Object,
+      default: () => ({})
+    },
     must: {
       type: Boolean,
       default: () => false
@@ -134416,7 +134437,7 @@ __webpack_require__.r(__webpack_exports__);
     },
     gutter: {
       type: String,
-      default: () => '8'
+      default: () => '16'
     },
     config: {
       type: Object,
@@ -134437,15 +134458,17 @@ __webpack_require__.r(__webpack_exports__);
   },
   data() {
     return {
-      form: this.values,
-      option: {},
-      opened: false,
-      height: 'auto'
+      form: this.value,
+      option: {}
     };
   },
   watch: {
-    form() {
-      this.relate(this.config);
+    config: {
+      immediate: true,
+      deep: true,
+      handler() {
+        this.relate(this.config);
+      }
     }
   },
   created() {
@@ -134460,6 +134483,7 @@ __webpack_require__.r(__webpack_exports__);
       this.$emit('change', this.filter(), this.form, this.option);
     },
     relate(config = {}) {
+      let data = {};
       Object.keys(config).forEach(a => {
         let {
           ...r
@@ -134468,12 +134492,18 @@ __webpack_require__.r(__webpack_exports__);
         if (child && Object.keys(child).length > 0) {
           this.relate(child);
         } else {
-          r.default && (this.form[a] = r.default || '');
+          if (r.type == 'password') {
+            data[a] = '';
+          } else {
+            if (this.values[a] != undefined) {
+              data[a] = `${this.values[a]}`;
+            } else if (r.default) {
+              data[a] = r.default;
+            }
+          }
         }
       });
-      this.$nextTick(() => {
-        Object.keys(this.values).forEach(a => typeof this.values[a] == 'number' && (this.form[a] = `${this.values[a]}`));
-      });
+      this.form = data;
     },
     create(a, b) {
       const h = this.$createElement;
@@ -134542,9 +134572,15 @@ __webpack_require__.r(__webpack_exports__);
           let {
             ...r
           } = child[c];
+          let space = a.gutter ? a.gutter / 2 : this.gutter / 4;
+          let style = {
+            padding: `0 ${space}px`
+          };
+          r.type = r.type ? r.type : a.type;
           if (r.span) {
             return h("el-col", {
               "key": d,
+              "style": style,
               "attrs": {
                 "span": Number(r.span)
               }
@@ -134554,7 +134590,8 @@ __webpack_require__.r(__webpack_exports__);
             return h("el-col", {
               "key": d,
               "style": {
-                width
+                width,
+                ...style
               }
             }, [this.format(r, c)]);
           }
@@ -134564,6 +134601,7 @@ __webpack_require__.r(__webpack_exports__);
           change: () => this.change(),
           form: this.form,
           field: b,
+          clearable: !a.default,
           ...a
         };
         return h(_components_AformItem__WEBPACK_IMPORTED_MODULE_1__["default"], {
@@ -134636,7 +134674,7 @@ __webpack_require__.r(__webpack_exports__);
       labelWidth = 'auto',
       labelPosition = 'top',
       finishText = '保存',
-      submitText = '搜索',
+      submitText = '提交',
       rejectText = '驳回',
       cancelText = '取消',
       action = [],
@@ -134677,12 +134715,13 @@ __webpack_require__.r(__webpack_exports__);
         "gutter": Number(this.gutter)
       },
       "class": "main-rows"
-    }, [Object.keys(this.config).map((a, b) => this.create(a, b)), this.$slots.default]), (finish || submit || reject || cancel || action.length > 0) && h("el-form-item", {
+    }, [Object.keys(this.config).map((a, b) => this.create(a, b)), this.$slots.default]), (finish || submit || reject || cancel || action.length > 0) && h("div", {
+      "class": "action"
+    }, [h("el-form-item", {
       "attrs": {
         "name": "action",
         "label": "action"
-      },
-      "class": "action"
+      }
     }, [finish && h("el-button", {
       "attrs": {
         "disabled": loading,
@@ -134719,8 +134758,11 @@ __webpack_require__.r(__webpack_exports__);
       "key": b,
       "attrs": {
         "disabled": loading
+      },
+      "on": {
+        "click": e => a.click(this.filter(), this.form, this.option, e)
       }
-    }, a]), [a.label || a.title || a.text || '']))])])]);
+    }, a]), [a.label || a.title || a.text || '']))])])])]);
   }
 });
 
@@ -136822,7 +136864,6 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-
 /* harmony default export */ __webpack_exports__["default"] = ({
   name: 'Atable',
   components: {
@@ -136836,6 +136877,10 @@ __webpack_require__.r(__webpack_exports__);
     Apopconfirm: _components_Apopconfirm__WEBPACK_IMPORTED_MODULE_8__["default"]
   },
   props: {
+    id: {
+      type: String,
+      default: () => `id-a-table-${Math.random()}`
+    },
     margin: {
       type: String,
       default: () => '0'
@@ -136884,7 +136929,7 @@ __webpack_require__.r(__webpack_exports__);
       type: Object,
       default: () => ({})
     },
-    maxHeight: {
+    height: {
       type: String,
       default: () => '480'
     },
@@ -136970,11 +137015,20 @@ __webpack_require__.r(__webpack_exports__);
       type: Boolean,
       default: () => true
     },
+    pages: {
+      type: Object,
+      default: () => ({})
+    },
     page: {
       type: Boolean,
       default: () => true
     }
   },
+  data() {
+    return {
+      maxHeight: this.height
+    };
+  },
   mounted() {
     this.$refs['a-table'].bodyWrapper.addEventListener('wheel', this.scroll);
   },
@@ -137013,7 +137067,7 @@ __webpack_require__.r(__webpack_exports__);
           }
         }, [h("template", {
           "slot": "header"
-        }, [header ? () => header(r) : label && label != '' && label.length && label.length > 8 ? h("el-tooltip", {
+        }, [header ? () => header(r) : label && label != '' && label.length > 8 ? h("el-tooltip", {
           "attrs": {
             "content": label,
             "placement": "top"
@@ -137038,12 +137092,13 @@ __webpack_require__.r(__webpack_exports__);
         handle,
         remove
       } = this.$listeners;
-      if (review || modify || update || handle || remove || this.$listeners.delete || this.$listeners.export) {
+      if (review || modify || update || handle || remove || this.$listeners.delete || this.$listeners.export || this.action.length > 0) {
         return {
           fixed: 'right',
           align: 'center',
           width: this.actionWidth,
           label: this.actionTitle,
+          showOverflowTooltip: false,
           formatter: item => h("div", {
             "class": "action"
           }, [review && h("i", {
@@ -137082,7 +137137,7 @@ __webpack_require__.r(__webpack_exports__);
           }), this.action.map((a, b) => h("el-button", _vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0___default()([{
             "key": b,
             "on": {
-              "click": e => a.click && a.click(item, e)
+              "click": e => a.click(item, e)
             }
           }, a]), [a.label || a.title || a.text]))])
         };
@@ -137125,58 +137180,16 @@ __webpack_require__.r(__webpack_exports__);
       this.$emit('change', pages);
       this.search(pages);
     },
-    format({
-      type = '',
-      name = '',
-      data = [],
-      text = '',
-      label = '',
-      title = '',
-      field = '',
-      dicts = [],
-      ...props
-    }, colIndex, item, rowIndex) {
+    format(a, b, c, d) {
       const h = this.$createElement;
-      if (type == 'enume' || type == 'enumerate') {
-        if (field != '') return h(_components_Aenume__WEBPACK_IMPORTED_MODULE_3__["default"], _vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0___default()([{
-          "key": colIndex + '-' + rowIndex,
-          "attrs": {
-            "field": field,
-            "data": dicts.length > 0 ? dicts : data
-          }
-        }, props, {
-          "model": {
-            value: item[field],
-            callback: $$v => {
-              this.$set(item, field, $$v);
-            }
-          }
-        }]));
-        return h(_components_Aenume__WEBPACK_IMPORTED_MODULE_3__["default"], _vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0___default()([{
-          "key": colIndex + '-' + rowIndex,
-          "attrs": {
-            "field": name,
-            "data": dicts.length > 0 ? dicts : data
-          }
-        }, props, {
-          "model": {
-            value: item[name],
-            callback: $$v => {
-              this.$set(item, name, $$v);
-            }
-          }
-        }]));
-      }
+      let field = a.field || a.index || a.name || a.prop;
       return h(_components_AformItem__WEBPACK_IMPORTED_MODULE_6__["default"], {
-        "key": colIndex + '-' + rowIndex,
+        "key": b + '-' + d,
         "attrs": {
           "config": {
-            type,
-            form: item,
-            dicts: dicts.length > 0 ? dicts : data,
-            field: field != '' ? field : name != '' ? name : '',
-            label: text != '' ? text : label != '' ? label : title != '' ? title : '无栏目名称',
-            ...props
+            form: c,
+            field,
+            ...a
           }
         }
       });
@@ -137199,9 +137212,6 @@ __webpack_require__.r(__webpack_exports__);
   },
   render() {
     const h = arguments[0];
-    const {
-      ...props
-    } = this.$attrs;
     const {
       ...r
     } = this.record;
@@ -137210,11 +137220,15 @@ __webpack_require__.r(__webpack_exports__);
     const {
       pageParams = {}
     } = this.$store.state;
+    const {
+      ...props
+    } = this.$attrs;
     return h("div", {
       "class": this.border ? 'a-table' : 'a-table border'
     }, [h("el-table", {
       "ref": "a-table",
       "attrs": {
+        "id": this.id,
         "data": data,
         "size": this.size,
         "border": this.border,
@@ -137263,7 +137277,7 @@ __webpack_require__.r(__webpack_exports__);
       "attrs": {
         "description": this.emptyText
       }
-    })])]), !this.tree && this.page && data.length > 0 && h(_components_Apages__WEBPACK_IMPORTED_MODULE_7__["default"], {
+    })])]), !this.tree && this.page && data.length > 0 && h(_components_Apages__WEBPACK_IMPORTED_MODULE_7__["default"], _vue_babel_helper_vue_jsx_merge_props__WEBPACK_IMPORTED_MODULE_0___default()([{
       "attrs": {
         "total": Number(size),
         "pages": pageParams
@@ -137271,7 +137285,9 @@ __webpack_require__.r(__webpack_exports__);
       "on": {
         "change": this.change
       }
-    })]);
+    }, {
+      "props": this.pages
+    }]))]);
   }
 });
 
@@ -159151,7 +159167,7 @@ __webpack_require__.r(__webpack_exports__);
     },
     height: {
       type: String,
-      default: () => '72vh'
+      default: () => '68vh'
     },
     loading: {
       type: Boolean,