element-assits 0.0.48 → 0.0.49

package/lib/index.js

@@ -1771,17 +1771,15 @@ const Px = {
         ue(r.rules) && d.push(...r.rules);
       const v = {};
       be(r.on) ? Object.assign(v, r.on(...i)) : It(r.on) && Object.assign(v, r.on);
-      const m = { clearable: !0, placeholder: r.label };
-      Object.assign(m, be(r.bind) ? r.bind(...i) : r.bind);
-      const b = be(r.label) ? r.label(...i) : r.label, S = be(r.labelTooltip) ? r.labelTooltip(...i) : r.labelTooltip;
-      return Object.assign({}, r, o, {
+      const m = be(r.label) ? r.label(...i) : r.label, b = be(r.labelTooltip) ? r.labelTooltip(...i) : r.labelTooltip, S = { clearable: !0, placeholder: m };
+      return Object.assign(S, be(r.bind) ? r.bind(...i) : r.bind), Object.assign({}, r, o, {
         __key: n,
-        __label: b,
-        __labelTooltip: S,
+        __label: m,
+        __labelTooltip: b,
         __component: u,
         __rules: d,
         __on: v,
-        __bind: m
+        __bind: S
       });
     },
     deleteLostProp(r, n) {

package/lib/style.scss

@@ -128,6 +128,36 @@ $--color-border-extralight: #F2F6FC !default;
   transform: scaleY(0);
 }
 
+.ea-select {
+  display: inline-block;
+  position: relative;
+  .el-select {
+    width: 100%;
+  }
+  .async-loading.el-icon-loading {
+    position: absolute;
+    top: 10px;
+    right: 28px;
+    color: #999;
+  }
+}
+.ea-select-popover {
+  .el-select-dropdown__item {
+    display: flex;
+    justify-content: space-between;
+    .select-item-value {
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+    .select-item-desc {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      color: #8492a6;
+      margin-left: 8px;
+    }
+  }
+}
+
 .ea-data-table {
   .edt-row {
     display: flex;
@@ -250,48 +280,6 @@ td {
   }
 }
 
-.ea-select {
-  display: inline-block;
-  position: relative;
-  .el-select {
-    width: 100%;
-  }
-  .async-loading.el-icon-loading {
-    position: absolute;
-    top: 10px;
-    right: 28px;
-    color: #999;
-  }
-}
-.ea-select-popover {
-  .el-select-dropdown__item {
-    display: flex;
-    justify-content: space-between;
-    .select-item-value {
-      overflow: hidden;
-      text-overflow: ellipsis;
-    }
-    .select-item-desc {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      color: #8492a6;
-      margin-left: 8px;
-    }
-  }
-}
-
-.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 {
@@ -343,8 +331,16 @@ td {
   }
 }
 
-.ea-number .el-input__inner {
-  text-align: left;
+.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-list {
@@ -399,61 +395,8 @@ 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;
+.ea-number .el-input__inner {
+  text-align: left;
 }
 
 .file-upload-dialog {
@@ -682,6 +625,63 @@ 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-table-modal {
   overflow: visible;
   right: unset;
@@ -772,23 +772,6 @@ 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;
@@ -829,6 +812,23 @@ 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.48",
+  "version": "0.0.49",
   "description": "element-ui 的扩展组件库",
   "main": "lib/index.js",
   "type": "module",