@lx-frontend/wrap-element-ui 1.0.15-beta.3 → 1.0.15-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lx-frontend/wrap-element-ui",
-  "version": "1.0.15-beta.3",
+  "version": "1.0.15-beta.5",
   "description": "wrap-element-ui",
   "author": "",
   "main": "src/components/index.ts",

package/src/components/EditableTable/features/bizTableHeaderPopover/index.vue

@@ -27,22 +27,21 @@
         {{ column.label }}
       </div>
 
-      <BizSortFilter
-        v-if="column.isColumnSortable"
-        :column="column"
-        :temp-sort-prop="tempSortProp"
-        :temp-sort-type="tempSortType"
-        @update:sort="(type, prop) => emit('update:sort', type, prop)"
-      />
+      <div class="editable-table-sort-filter__item">
+        <BizSortFilter
+          v-if="column.isColumnSortable"
+          :column="column"
+          :temp-sort-prop="tempSortProp"
+          :temp-sort-type="tempSortType"
+          @update:sort="(type, prop) => emit('update:sort', type, prop)"
+        />
+      </div>
 
-      <div
-        v-if="column.filters"
-        class="editable-table__filter-group"
-      >
+      <template v-if="column.filters">
         <div
           v-for="(filterItem, index) in column.filters"
           :key="index"
-          class="editable-table__filter-group__filter"
+          class="editable-table-sort-filter__item editable-table__filter-group__filter"
         >
           <component
             :is="componentMap[filterItem.type]"
@@ -51,11 +50,11 @@
             @update:tempFilteredValue="onUpdate"
           />
         </div>
-      </div>
+      </template>
 
       <div
         v-if="column.summary"
-        class="editable-table-sort-filter__filter"
+        class="editable-table-sort-filter__item editable-table-sort-filter__filter"
       >
         <div class="editable-table-sort-filter__filter-title">
           统计

package/src/components/EditableTable/index.less

@@ -387,9 +387,13 @@
       border-bottom: 1px solid #d6dbe3;
     }
 
+    &__item {
+      margin-top: 14px;
+    }
+
     &__filter,
     &__search {
-      padding: 14px;
+      padding: 0 14px;
 
       .el-radio {
         width: 100%;
@@ -422,7 +426,6 @@
     }
 
     &__filter {
-      padding-top: 0;
 
       .el-radio-group,
       .el-checkbox-group {
@@ -433,7 +436,7 @@
     }
 
     &__sort {
-      padding: 14px;
+      padding: 0 14px;
       display: flex;
       flex-direction: column;
       gap: 8px;
@@ -454,22 +457,19 @@
           height: 32px;
         }
       }
+
       &__date-range {
         display: flex;
         flex-direction: column;
         gap: 12px;
 
-        .el-date-editor.el-input, .el-date-editor.el-input__inner {
+        .el-date-editor.el-input,
+        .el-date-editor.el-input__inner {
           width: 100%;
         }
       }
     }
 
-    &__filter-title {
-      border-top: 1px solid #f3f3f3;
-      padding-top: 14px;
-    }
-
     &__sort-btns {
       display: flex;
       justify-content: space-between;
@@ -543,6 +543,7 @@
       justify-content: flex-end;
       align-items: center;
       padding: 0 15px;
+      margin-top: 14px;
     }
 
     &__reset-btn,
@@ -802,4 +803,4 @@
   &::before {
     bottom: -4px;
   }
-}
+}