element-assits 0.0.52 → 0.0.54

package/README.md

@@ -178,7 +178,7 @@ Vue 原型上挂载了 `$asyncLoad` 方法（与asyncLoad相同）
 ### 开关 EaSwitch
 额外支 size="mini" 尺寸
 
-### 滚动容器 EaScroll
+### 滚动容器 EaScrollbar
 el-scrollbar 衍生，优化样式
 #### props
 | 属性名 | 说明 | 类型 | 默认值 |

package/lib/index.js

@@ -1470,10 +1470,10 @@ const bx = {
 };
 var wx = function() {
   var n = this, i = n._self._c;
-  return i("el-form-item", { class: { "hidden-label": n.top.labelWidth === "0" }, style: n.column.style, attrs: { label: n.column.__label, prop: n.column.prop, rules: n.column.__rules }, scopedSlots: n._u([{ key: "label", fn: function() {
+  return i("el-form-item", { ref: "ElFormItem", class: { "hidden-label": n.top.labelWidth === "0" }, style: n.column.style, attrs: { label: n.column.__label, prop: n.column.prop, rules: n.column.__rules }, scopedSlots: n._u([{ key: "label", fn: function() {
     return [n._v(" " + n._s(n.column.__label) + " "), n.column.__labelTooltip ? i("el-tooltip", n._b({}, "el-tooltip", n.tooltip(n.column.__labelTooltip), !1), [i("i", { staticClass: "el-icon-warning-outline" })]) : n._e()];
   }, proxy: !0 }]) }, [i(n.column.__component, n._g(n._b({ tag: "component", on: { change: function(o) {
-    return n.top.$emit("change", n.top.model);
+    n.top.$emit("change", n.top.model), n.$refs.ElFormItem.$emit("el.form.change");
   } }, nativeOn: { keyup: function(o) {
     return !o.type.indexOf("key") && n._k(o.keyCode, "enter", 13, o.key, "Enter") ? null : n.top.$emit("enter");
   } }, model: { value: n.top.model[n.column.prop], callback: function(o) {
@@ -2072,34 +2072,31 @@ class Xx {
   constructor(n, i) {
     this.o = new Array(n.length).fill(0), this.isTrigger = !1, this.callback = i;
   }
-  add({ $index: n }, i) {
-    this.isTrigger || (this.o[n] = i.map((o) => {
-      const u = Rt(o, "componentInstance.$el.innerText");
-      return Math.max(u && u.length, 2) * 14 + 14 + 9;
-    }).reduce((o, u) => o + u, 0) + 14 * 3 + 20, this.o.every(Boolean) && (this.isTrigger = !0, this.callback(Math.max(...this.o))));
+  add({ $index: n }, i, o) {
+    this.isTrigger || (this.o[n] = i.map((u) => {
+      const d = Rt(u, "componentInstance.$el");
+      return Math.max((d && d.offsetWidth || 0) + 10, 50);
+    }).reduce((u, d) => u + d, 0) + 20 + (o ? 50 : 0), this.o.every(Boolean) && (this.isTrigger = !0, this.callback(Math.max(...this.o))));
   }
 }
 function $u(r = 3) {
   const n = this;
   let i, o;
   try {
-    const u = Cu.bind(this)({ row: {}, column: {} });
-    if (i = u.some((d) => d.tag), !(r > 0))
-      throw new Error();
-    if (r === u.length)
+    if (i = Cu.bind(this)({ row: {}, column: {} }).some((d) => d.tag), !(r > 0))
       throw new Error();
     o = {
       props: { scope: { type: Object, default: void 0 } },
       data() {
-        const d = Cu.bind(n)(this.scope).filter((b) => b.tag), g = d.slice(0, r - 1), m = d.slice(r - 1);
+        const d = Cu.bind(n)(this.scope).filter((S) => S.tag), g = d.length > r ? r - 1 : r, m = d.slice(0, g), b = d.slice(g);
         return {
-          children: g,
-          moreChildren: m
+          children: m,
+          moreChildren: b
         };
       },
       mounted() {
         var d;
-        (d = n.fitOpt) == null || d.add(this.scope, this.children);
+        (d = n.fitOpt) == null || d.add(this.scope, this.children, this.moreChildren.length);
       },
       render(d) {
         return d("div", [

package/lib/style.scss

@@ -158,63 +158,6 @@ $--color-border-extralight: #F2F6FC !default;
   }
 }
 
-.ea-data-table {
-  .edt-row {
-    display: flex;
-    .edt-cell {
-      padding: 0 8px;
-      flex: 0 0 auto;
-      box-sizing: border-box;
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
-      word-break: break-all;
-    }
-    &.edt-header {
-      background-color: $--color-border-extralight;
-      color: $--color-primary-text;
-    }
-  }
-  &--border {
-    border: 1px solid $--color-border-light;
-    .edt-row {
-      .edt-cell {
-        border-bottom: 1px solid $--color-border-light;
-        border-left: 1px solid $--color-border-light;
-        &:first-child {
-          border-left: 0;
-        }
-      }
-      &:last-child .edt-cell{
-        border-bottom: 0;
-      }
-    }
-  }
-  .loading-text {
-    color: $--color-secondary-text;
-    text-align: center;
-    font-size: inherit;
-  }
-}
-
-.el-dialog.ea-modal {
-  &.is-closing {
-    margin: 0 0 50px !important;
-  }
-  &.is-fullscreen {
-    border-radius: 0;
-    margin: 0;
-  }
-  .el-dialog__header {
-    color: #555;
-    font-size: 18px;
-    .el-dialog__title {
-      color: inherit;
-      font-size: inherit;
-    }
-  }
-}
-
 .ea-button-tooltip + .ea-button-tooltip {
   margin-left: 10px;
 }
@@ -280,6 +223,75 @@ td {
   }
 }
 
+.ea-data-table {
+  .edt-row {
+    display: flex;
+    .edt-cell {
+      padding: 0 8px;
+      flex: 0 0 auto;
+      box-sizing: border-box;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      word-break: break-all;
+    }
+    &.edt-header {
+      background-color: $--color-border-extralight;
+      color: $--color-primary-text;
+    }
+  }
+  &--border {
+    border: 1px solid $--color-border-light;
+    .edt-row {
+      .edt-cell {
+        border-bottom: 1px solid $--color-border-light;
+        border-left: 1px solid $--color-border-light;
+        &:first-child {
+          border-left: 0;
+        }
+      }
+      &:last-child .edt-cell{
+        border-bottom: 0;
+      }
+    }
+  }
+  .loading-text {
+    color: $--color-secondary-text;
+    text-align: center;
+    font-size: inherit;
+  }
+}
+
+.el-dialog.ea-modal {
+  &.is-closing {
+    margin: 0 0 50px !important;
+  }
+  &.is-fullscreen {
+    border-radius: 0;
+    margin: 0;
+  }
+  .el-dialog__header {
+    color: #555;
+    font-size: 18px;
+    .el-dialog__title {
+      color: inherit;
+      font-size: inherit;
+    }
+  }
+}
+
+.ea-tree {
+  .ea-tree-real {
+    .el-tree-node > .el-tree-node__content{
+      border-radius: 4px;
+    }
+    .el-tree-node.is-current > .el-tree-node__content {
+      color: $--color-primary;
+      background-color: rgba($--color-primary, 0.1);
+    }
+  }
+}
+
 .ea-split-container {
   display: flex;
   &.is-down {
@@ -331,16 +343,8 @@ td {
   }
 }
 
-.ea-tree {
-  .ea-tree-real {
-    .el-tree-node > .el-tree-node__content{
-      border-radius: 4px;
-    }
-    .el-tree-node.is-current > .el-tree-node__content {
-      color: $--color-primary;
-      background-color: rgba($--color-primary, 0.1);
-    }
-  }
+.ea-number .el-input__inner {
+  text-align: left;
 }
 
 .ea-list {
@@ -395,10 +399,6 @@ td {
   }
 }
 
-.ea-number .el-input__inner {
-  text-align: left;
-}
-
 .file-upload-dialog {
   // 拖拽区域铺满
   .el-upload,
@@ -426,63 +426,6 @@ td {
   }
 }
 
-.ea-data-tree-body {
-  &.ea-data-tree-body__border {
-    border: 1px solid $--color-border-light;
-  }
-}
-
-.ea-data-tree-row {
-  height: 32px;
-  line-height: 32px;
-  display: flex;
-  justify-content: flex-start;
-  position: relative;
-  padding-left: 20px;
-  &.odd { background-color: #F8F8F8; }
-  &:hover { background-color: #EBEEF5; }
-  .ea-data-tree-cell {
-    flex: 0 0 auto;
-    height: 100%;
-    font-size: 14px;
-    box-sizing: border-box;
-    padding: 0 8px;
-    position: relative;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
-    word-break: break-all;
-    & > .ea-data-tree-checkbox {
-      position: absolute;
-      top: 0;
-    }
-  }
-  .ea-data-tree-icon {
-    cursor: pointer;
-    position: absolute;
-    height: 100%;
-    color: #CCC;
-    display: flex;
-    align-items: center;
-    z-index: 1;
-    &:hover {
-      color: #333;
-    }
-  }
-}
-
-.ea-data-tree-checkbox .el-checkbox__input.is-indeterminate .el-checkbox__inner {
-  background-color: $--color-secondary-text;
-  border-color: $--color-secondary-text;
-}
-
-.ea-data-tree-empty {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  color: $--color-secondary-text;
-}
-
 .vjs-table {
   position: relative;
   overflow: hidden;
@@ -682,6 +625,87 @@ td {
 .ea-icon-more:before { content: "\e60e" }
 .eafont.ea-icon-conf.has { color: #000 }
 
+.ea-data-tree-body {
+  &.ea-data-tree-body__border {
+    border: 1px solid $--color-border-light;
+  }
+}
+
+.ea-data-tree-row {
+  height: 32px;
+  line-height: 32px;
+  display: flex;
+  justify-content: flex-start;
+  position: relative;
+  padding-left: 20px;
+  &.odd { background-color: #F8F8F8; }
+  &:hover { background-color: #EBEEF5; }
+  .ea-data-tree-cell {
+    flex: 0 0 auto;
+    height: 100%;
+    font-size: 14px;
+    box-sizing: border-box;
+    padding: 0 8px;
+    position: relative;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    word-break: break-all;
+    & > .ea-data-tree-checkbox {
+      position: absolute;
+      top: 0;
+    }
+  }
+  .ea-data-tree-icon {
+    cursor: pointer;
+    position: absolute;
+    height: 100%;
+    color: #CCC;
+    display: flex;
+    align-items: center;
+    z-index: 1;
+    &:hover {
+      color: #333;
+    }
+  }
+}
+
+.ea-data-tree-checkbox .el-checkbox__input.is-indeterminate .el-checkbox__inner {
+  background-color: $--color-secondary-text;
+  border-color: $--color-secondary-text;
+}
+
+.ea-data-tree-empty {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  color: $--color-secondary-text;
+}
+
+.ea-form .form-group-title {
+  position: relative;
+  height: 32px;
+  margin-bottom: 22px;
+  > span {
+    position: absolute;
+    top: 0;
+    left: 20%;
+    padding: 5px 25px;
+    background-color: #fff;
+    z-index: 1;
+    color: $--color-secondary-text;
+  }
+  &::after {
+    content: '';
+    position: absolute;
+    top: 50%;
+    left: 0;
+    width: 100%;
+    height: 0;
+    border-bottom: 1px dashed $--color-border-base;
+  }
+}
+
 .ea-table-modal {
   overflow: visible;
   right: unset;
@@ -736,30 +760,6 @@ td {
   }
 }
 
-.ea-form .form-group-title {
-  position: relative;
-  height: 32px;
-  margin-bottom: 22px;
-  > span {
-    position: absolute;
-    top: 0;
-    left: 20%;
-    padding: 5px 25px;
-    background-color: #fff;
-    z-index: 1;
-    color: $--color-secondary-text;
-  }
-  &::after {
-    content: '';
-    position: absolute;
-    top: 50%;
-    left: 0;
-    width: 100%;
-    height: 0;
-    border-bottom: 1px dashed $--color-border-base;
-  }
-}
-
 .conf-header {
   border-bottom: 1px solid #DDD;
   padding-bottom: 10px;
@@ -772,6 +772,23 @@ td {
   margin-bottom: 8px !important;
 }
 
+.ea-form .el-form-item__content {
+  & > .el-input-number,
+  & > .el-input,
+  & > .ea-select,
+  & > .el-select {
+    width: 100%;
+  }
+}
+.ea-form .el-form-item.hidden-label {
+  > .el-form-item__label {
+    display: none;
+  }
+  > .el-form-item__content {
+    width: 100%;
+  }
+}
+
 .ea-select-container {
   display: flex;
   justify-content: flex-start;
@@ -812,23 +829,6 @@ td {
   }
 }
 
-.ea-form .el-form-item__content {
-  & > .el-input-number,
-  & > .el-input,
-  & > .ea-select,
-  & > .el-select {
-    width: 100%;
-  }
-}
-.ea-form .el-form-item.hidden-label {
-  > .el-form-item__label {
-    display: none;
-  }
-  > .el-form-item__content {
-    width: 100%;
-  }
-}
-
 .ea-switch-mini {
   .el-switch__core {
     width: 30px !important;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "element-assits",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "description": "element-ui 的扩展组件库",
   "main": "lib/index.js",
   "type": "module",