@lx-frontend/wrap-element-ui 1.0.0-beta.6 → 1.0.1-beta.1

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@lx-frontend/wrap-element-ui",
-  "version": "1.0.0-beta.6",
+  "version": "1.0.1-beta.1",
   "description": "wrap-element-ui",
   "author": "",
   "main": "dist/index.mjs",
-  "types": "dist/index.d.ts",
   "private": false,
   "scripts": {
     "clean": "rimraf dist",
@@ -65,7 +64,7 @@
     "storybook": "7.6.19",
     "through2": "^4.0.2",
     "typescript": "^4.9.5",
-    "vite": "^3.2.7",
+    "vite": "^4.5.3",
     "vite-plugin-dts": "^3.9.1",
     "vite-plugin-lib-inject-css": "^2.1.1",
     "vite-tsconfig-paths": "^4.3.2",

package/src/components/AddMembers/index.vue

@@ -4,37 +4,40 @@
       :title="title"
       :with-submit-btn="false"
       :width="360"
-      @on-change="handleCloseTechniciansSelectPopup"
+      @on-change="handleCloseSelectPopup"
     >
       <div
         slot="form"
-        class="team-setting__technicians-popover"
+        class="team-setting__members-popover"
       >
-        <div class="team-setting__technicians-select">
+        <div class="team-setting__members-select">
           <el-input
-            v-model="techniciansSearchQuery"
+            v-model="searchQuery"
             placeholder="请输入姓名"
-            @input="handleInputTechniciansSearch"
+            @input="handleInputSearch(searchQuery, $attrs.keyId)"
           />
         </div>
         <div
-          v-if="techniciansSearchQuery && !technicianOptions.length && !fetchTechniciansLoading"
-          class="team-setting__empty-technicians-options"
+          v-if="searchQuery && !options.length && !fetchLoading"
+          class="team-setting__empty-members-options"
         >
           {{ $attrs.empty || '系统未登记该员工，请先添加员工账号' }}
         </div>
         <ul
           v-else
-          class="team-setting__technicians-options"
+          class="team-setting__members-options"
         >
           <li
-            class="team-setting__technicians-option"
-            v-for="item in technicianOptions"
+            class="team-setting__members-option"
+            v-for="item in options"
             :key="item[$attrs.showConfig.id]"
           >
-            <div class="team-setting__technicians-option-left">
+            <div class="team-setting__members-option-left" v-if="isShowRoles">
               {{ `${item[$attrs.showConfig.name]} | ${item.roles}` }}
             </div>
+            <div class="team-setting__members-option-left" v-else>
+              {{item[$attrs.showConfig.name]}}
+            </div>
             <el-button
               v-if="item.is_selected"
               type="text"
@@ -45,7 +48,7 @@
             <el-button
               v-else
               type="text"
-              @click="handleAddTechnician($attrs.keyId, item)"
+              @click="handleAdd($attrs.keyId, item)"
             >
               添加
             </el-button>
@@ -80,26 +83,31 @@ export default {
       type: String,
       default: '添加成员',
     },
+    /** 角色名称展示 */
+    isShowRoles: {
+      type: Boolean,
+      default: true,
+    },
   },
   data() {
     return {
-      techniciansSearchQuery: '',
+      searchQuery: '',
     }
   },
   watch: {
   },
   methods: {
-    handleCloseTechniciansSelectPopup(show) {
+    handleCloseSelectPopup(show) {
       if (show) return;
-      this.techniciansSearchQuery = '';
-      this.$emit('update:technicianOptions', []);
+      this.searchQuery = '';
+      this.$emit('update:options', []);
     },
-    handleInputTechniciansSearch(query) {
-      this.$emit('fetchTechniciansMethods', query);
+    handleInputSearch(query, keyId) {
+      this.$emit('fetchMethods', { query, keyId });
     },
-    handleAddTechnician(id, item) {
+    handleAdd(id, item) {
       const query = { id, item };
-      this.$emit('handleAddTechnician', query);
+      this.$emit('handleAdd', query);
     },
   },
 };
@@ -107,25 +115,25 @@ export default {
 
 <style lang="less">
 .team-setting {
-  &__technicians-popover {
-    padding: 20px;
+  &__members-popover {
+    padding: 20px 0;
+    margin: 0 20px;
     height: 350px;
     overflow-y: auto;
   }
-  &__technicians-select {
-    width: 320px;
-  }
-  &__empty-technicians-options {
-    font-size: 12px;
-    color: #80838e;
-    text-align: center;
-    margin-top: 10px;
+  &__empty-members {
+    &-options {
+      font-size: 12px;
+      color: #80838e;
+      text-align: center;
+      margin-top: 10px;
+    }
   }
-  &__technicians-options {
+  &__members-options {
     display: flex;
     flex-direction: column;
   }
-  &__technicians-option {
+  &__members-option {
     display: flex;
     justify-content: space-between;
     align-items: center;

package/src/components/EditableTable/index.less

@@ -180,31 +180,6 @@
       border-right: 2px #e4e8ef solid;
     }
   }
-
-  .el-table-filter,
-  th.el-table__cell .el-table__column-filter-trigger,
-  th.is-sortable .caret-wrapper {
-    display: none;
-  }
-
-  .el-table__body tr.current-row > td,
-  .el-table__body tr.hover-row > td {
-    background-color: #fafafa;
-  }
-
-  table tbody tr td {
-    & .el-date-editor.el-input {
-      width: 100%;
-    }
-
-    & .cell {
-      font-size: 14px;
-    }
-  }
-
-  .el-table__fixed-body-wrapper {
-    background: #fff;
-  }
 }
 
 .view-setting {
@@ -232,7 +207,7 @@
     padding: 0px;
 
     .el-dialog__body {
-      max-height: 70vh;
+      max-height: 800px;
     }
 
     .el-dialog__body {
@@ -522,12 +497,6 @@
     background-color: @--theme-blue--;
     border-color: @--theme-blue--;
   }
-
-  .el-checkbox__input.is-checked .el-checkbox__inner,
-  .el-radio__input.is-checked .el-radio__inner {
-    background: #2468f2;
-    border-color: #2468f2;
-  }
 }
 
 .btn-pointer {
@@ -607,8 +576,6 @@
   margin-top: 12px;
 
   & .el-pagination {
-    padding: 0;
-
     .el-pager li.number {
       background-color: #fff;
       border: 1px solid #d6dbe3;
@@ -638,7 +605,26 @@
   }
 }
 
+.el-table__body tr.current-row > td,
+.el-table__body tr.hover-row > td {
+  background-color: #fafafa;
+}
+
+.el-table-filter,
+th.el-table__cell .el-table__column-filter-trigger,
+th.is-sortable .caret-wrapper {
+  display: none;
+}
 
+table tbody tr td {
+  & .el-date-editor.el-input {
+    width: 100%;
+  }
+
+  & .cell {
+    font-size: 14px;
+  }
+}
 
 .editable-table {
   & table th {
@@ -688,6 +674,12 @@
   }
 }
 
+.el-select-dropdown {
+  &__item {
+    text-align: center;
+  }
+}
+
 .el-dialog__header {
   display: flex;
   justify-content: space-between;

package/src/components/EditableTable/index.vue

@@ -1,10 +1,7 @@
 <template>
   <div class="editable-table">
     <div class="view-setting">
-      <div
-        v-if="!hideViewSettingBtn"
-        class="view-setting__btn-wrapper"
-      >
+      <div class="view-setting__btn-wrapper">
         <div
           class="view-setting__btn btn-pointer"
           @click="handleViewSettingShow"
@@ -20,7 +17,6 @@
         title="显示设置"
         :visible.sync="viewSettingVisible"
         width="750px"
-        top="12vh"
         :close-on-click-modal="false"
         :append-to-body="true"
         custom-class="view-setting__dialog"
@@ -55,9 +51,8 @@
             <div class="view-setting__content-right-frize">
               冻结前
               <el-input
+                v-model="leftFixedColumnCount"
                 class="view-setting__content-right-input"
-                :value="tempLeftFixedColumnCount"
-                @input="handleInputTempLeftFixedColumnCount"
               />
               列
             </div>
@@ -223,7 +218,7 @@
         :key="column.prop + index"
         resizable
         class-name="editable-table__data-column"
-        :filtered-value="Array.isArray(filteredValue[column.prop]) ? filteredValue[column.prop] : []"
+        :filtered-value="filteredValue[column.prop] || []"
         v-bind="getColumnBindProps(column)"
       >
         <template
@@ -272,7 +267,7 @@
                 </div>
               </div>
               <div
-                v-if="column.search && !Array.isArray(column.search)"
+                v-if="column.isColumnSearchAble"
                 class="sort-filter__search"
               >
                 <div class="sort-filter__search-title">
@@ -284,41 +279,19 @@
                   placeholder="请输入内容"
                 />
               </div>
-
               <div
-                v-if="column.search && Array.isArray(column.search)"
-                class="sort-filter__search"
-                style="display: flex;flex-direction: column;gap: 12px;"
-              >
-                <div
-                  v-for="item in column.search"
-                  :key="item.prop"
-                >
-                  <div class="sort-filter__search-title">
-                    {{ item.label }}
-                  </div>
-                  <el-input
-                    v-model="tempSearchValue[item.prop]"
-                    class="sort-filter__search-input"
-                    placeholder="请输入内容"
-                  />
-                </div>
-              </div>
-
-              <div
-                v-if="column.filters && ((Array.isArray(column.filters) ? column.filters : column.filters.options).length > 0)"
+                v-if="column.filters && column.filters.length > 0"
                 class="sort-filter__filter"
               >
                 <div class="sort-filter__filter-title">
                   筛选
                 </div>
                 <el-checkbox-group
-                  v-if="column.filters && (Array.isArray(column.filters) || column.filters.type === 'checkbox')"
                   v-model="tempFilteredValue[column.prop]"
                   class="sort-filter__filter-checkbox-group"
                 >
                   <el-checkbox
-                    v-for="item in (Array.isArray(column.filters) ? column.filters : column.filters.options)"
+                    v-for="item in column.filters"
                     :key="item.value"
                     :label="item.value"
                     class="sort-filter__filter-checkbox"
@@ -331,25 +304,6 @@
                     </slot>
                   </el-checkbox>
                 </el-checkbox-group>
-
-                <el-radio-group
-                  v-if="column.filters && !Array.isArray(column.filters) && column.filters.type === 'radio'"
-                  v-model="tempFilteredValue[column.prop]"
-                  style="display: flex;flex-direction: column;gap: 6px;"
-                >
-                  <el-radio
-                    v-for="item in column.filters.options"
-                    :key="item.value"
-                    :label="item.value"
-                  >
-                    <slot
-                      :name="column.prop + '-filter-item'"
-                      v-bind="item"
-                    >
-                      {{ item.text }}
-                    </slot>
-                  </el-radio>
-                </el-radio-group>
               </div>
               <div
                 v-if="column.summary"
@@ -385,7 +339,7 @@
                 <el-button
                   class="sort-filter__confirm-btn"
                   type="primary"
-                  @click="handleHeaderOperationConfirm(column, scope)"
+                  @click="handleHeaderOperationConfirm(scope)"
                 >
                   确定
                 </el-button>
@@ -584,7 +538,7 @@
         :page-sizes="[10, 15, 30, 60, 100]"
         :page-size.sync="pageSize"
         :pager-count="11"
-        :current-page="currentPage"
+        :current-page.sync="currentPage"
         :total="total"
         @size-change="handlePageSizeChange"
         @current-change="handleCurrPageChange"
@@ -611,7 +565,7 @@ interface IProps {
   dataList: ITableDataItem[];
   /** 列配置 */
   columnConfig: IColumnConfig[];
-  /** 是否展示展开行 */
+  /** 是否展示展开行 */ 
   hasExpandRow?: boolean;
   /** 是否展示序号 */
   hasIndexColumn?: boolean;
@@ -631,16 +585,6 @@ interface IProps {
   dragSemiRange?: number;
   /** 是否显示加载 */
   loading?: boolean;
-  /** 是否隐藏显示设置按钮 */
-  hideViewSettingBtn?: boolean
-  /** 设置的缓存的key */
-  settingStorgeKey?: string
-  /** 前端排序，默认关闭 */
-  localSort?: boolean
-  /** 前端过滤，默认关闭 */
-  localFilter?: boolean
-  /** 页码 */
-  currentPage: number
 }
 
 interface IEmits {
@@ -662,10 +606,6 @@ interface IEmits {
   (e: 'row-edit-cancel', param: { row: any; page: number; size: number;}): void
   /** 页码改变 */
   (e: 'page-change', param: { page: number, size: number }): void
-  /** 查询 */
-  (e: 'search', param: Record<string, any>): void
-  /** 排序 */
-  (e: 'sort-change', param: { order: 'descending' | 'ascending' | null, prop: string }): void
 }
 
 const props = withDefaults(defineProps<IProps>(), {
@@ -680,12 +620,7 @@ const props = withDefaults(defineProps<IProps>(), {
   colorList: () => [],
   leftFixedCount: 1,
   dragSemiRange: 15,
-  loading: false,
-  hideViewSettingBtn: false,
-  settingStorgeKey: '',
-  localSort: false,
-  localFilter: false,
-  currentPage: 1,
+  loading: false
 })
 
 // 同defineProps一样，不支持泛型参数从外部导入
@@ -705,14 +640,16 @@ const actualColumns = computed(() => {
       isColumnSortable: rawItem.sortable,
       sortable: inSorting.value ? rawItem.sortable : false
     };
-    if (cnt > 0) {
-      item.fixed = 'left';
-      // eslint-disable-next-line no-plusplus
-      cnt--;
-    } else {
-      item.fixed = undefined;
+    if (item) {
+      if (cnt > 0) {
+        item.fixed = 'left';
+        // eslint-disable-next-line no-plusplus
+        cnt--;
+      } else {
+        item.fixed = undefined;
+      }
+      res.push(item);
     }
-    res.push(item);
   }
 
   // 使用默认操作项，添加默认操作列。该列在编辑模式下隐藏
@@ -738,8 +675,9 @@ const beforePageChange = () => {
 }
 const {
   pageSize,
+  currentPage,
   handleCurrPageChange,
-  handlePageSizeChange,
+  handlePageSizeChange
 } = usePagination({
   emit,
   beforePageChange
@@ -779,7 +717,7 @@ const {
   emit,
   tableDomRef,
   pageSize,
-  props,
+  currentPage,
   hasExpandRow: props.hasExpandRow
 })
 
@@ -789,8 +727,6 @@ const {
   columnsToBeShown,
   viewSettingVisible,
   leftFixedColumnCount,
-  tempLeftFixedColumnCount,
-  handleInputTempLeftFixedColumnCount,
   handleViewSettingShow,
   handleViewSettingClose,
   handleViewSettingConfirm
@@ -803,9 +739,6 @@ const {
 
 /************ 列头部操作相关 ************ */
 const {
-  setSort,
-  clearSort,
-  setSearchParams,
   isColumnHeadActive,
   handleSort,
   handleHeaderPopoverShow,
@@ -823,13 +756,11 @@ const {
   sortingColumn,
   isColumnFiltering,
   searchValue,
-  inSorting,
+  inSorting
 } = useColumnHeaderOperation({
   tableDomRef,
   sortFilterPopoverRef,
-  props,
-  emit,
-  showingColumns,
+  props
 })
 
 /************ 表格行拖拽和显示设置列拖拽 ************ */
@@ -856,6 +787,7 @@ useDragSort({
   props,
   viewSettingDragSortOptions,
   beforeDragStart,
+  currentPage,
   pageSize,
   currScope,
   tableDomRef,
@@ -866,10 +798,18 @@ const doTableLayout = async () => {
   tableDomRef.value?.doLayout();
 }
 
+watch(
+  () => props.columnConfig,
+  (val) => {
+    showingColumns.value = val.map(c => c.prop);
+  },
+  { immediate: true }
+)
+
 // 过滤出自定义属性，将其它属性全部透传给 el-table-column
 const getColumnBindProps = (column: IColumnConfig) => {
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const { editAble, editType, slotName, inputType, options, filters, ...rest } = column;
+  const { editAble, editType, slotName, inputType, options, ...rest } = column;
   return rest;
 }
 
@@ -892,20 +832,7 @@ const handleColumnClose = (item) => {
 
 defineExpose({
   closeAllExpandedRows,
-  openViewSetting: handleViewSettingShow,
-  elTableRef: tableDomRef,
-  setSort,
-  clearSort,
-  setSearchParams,
-})
-
-// loading 结束和页码变化时滚动到顶部
-watch([
-  () => props.loading,
-  () => props.currentPage,
-], ([loading]) => {
-  if (loading) return;
-  tableDomRef.value.$el.querySelector('.el-table__body-wrapper').scrollTop = 0
+  elTableRef: tableDomRef
 })
 
 </script>

package/src/components/EditableTable/types.ts

@@ -11,40 +11,24 @@ export interface IColumnConfigRequired {
   sortable?: boolean; // 该列是否允许排序，ture则表头弹窗会显示升降序按钮
   slotName?: string; // 如果要自定义，传入 slotName
   isAlwaysShow?: boolean; // 不可隐藏，显示设置中，该列不允许隐藏
-  /** 默认隐藏，显示设置中，该列默认隐藏 */
-  defaultHide?: boolean;
-  /** 列是否允许搜索，true则表头弹窗会多一个搜索框，一列中有多个搜索字段时传数组进行配置 */
-  search?: boolean | ISearchOptions
+  isColumnSearchAble?: boolean; // 列是否允许搜索，true则表头弹窗会多一个搜索框
   summary?: boolean; // 是否可以显示该列的统计
   summaryMethod?: (values: any[]) => string | number; // 这一列的统计方法，values为该列的所有值
-  /** 过滤，传数组时默认复选框 */
-  filters?: {
-    type?: 'checkbox' | 'radio',
-    options: FiltersOption[]
-    default?: string | number | string[] | number[]
-  } | FiltersOption[]
+  // filters?: {value: string | number; text: string; [key: string]: any}[];
   // 透传el-table column有的属性， https://element.eleme.cn/#/en-US/component/table#table-column-attributes
   [key: string]: any;
 }
 
-type FiltersOption = { value: string | number; text: string; [key: string]: any }
-
-type ISearchOptions = {
-  prop: string,
-  label: string,
-  validator?: (value: string) => boolean
-}[]
-
 type IInputColumn = IColumnConfigRequired & {
   inputType: string | number;
 }
 
 type ISelectColumn = IColumnConfigRequired & {
-  options: { key: string; value: string | number; [key: string]: any }[];
+  options: {key: string; value: string | number; [key: string]: any}[];
 }
 
-type IDateOnlyColumn = IColumnConfigRequired
-type IDateTimeColumn = IColumnConfigRequired
+type IDateOnlyColumn = IColumnConfigRequired & {}
+type IDateTimeColumn = IColumnConfigRequired & {}
 
 export type IColumnConfig = IInputColumn | ISelectColumn | IDateOnlyColumn | IDateTimeColumn
 
@@ -95,22 +79,16 @@ export interface IProps {
   leftFixedCount?: number;
   dragSemiRange?: number;
   loading?: boolean;
-  settingStorgeKey?: string
-  localSort?: boolean
-  localFilter?: boolean
-  currentPage: number
 }
 
 export interface IEmits {
   (e: 'selection-change', selection: any): void
-  (e: 'row-bg-change', param: { colorId: number; row: ITableDataItem; rowIndex: number }): void
-  (e: 'row-drag-drop', param: { row: any; fromIndex: number; toIndex: number; page: number; size: number; }): void
+  (e: 'row-bg-change', param: {colorId: number; row: ITableDataItem; rowIndex: number}): void
+  (e: 'row-drag-drop', param: { row: any; fromIndex: number; toIndex: number; page: number; size: number;}): void
   (e: 'row-delete', param: { row: any; index: number; page: number; size: number; }): void
-  (e: 'row-edit', param: { row: any, index: number; page: number; size: number; }): void
-  (e: 'row-pin-to-top', param: { row: any, rawIndex: number; page: number; size: number; }): void
+  (e: 'row-edit', param: { row: any, index: number; page: number; size: number;}): void
+  (e: 'row-pin-to-top', param: { row: any, rawIndex: number; page: number; size: number;}): void
   (e: 'row-edit-save', param: { page: number; size: number; row: any; changedData: Record<string, any>; }): void
-  (e: 'row-edit-cancel', param: { row: any; page: number; size: number; }): void
+  (e: 'row-edit-cancel', param: { row: any; page: number; size: number;}): void
   (e: 'page-change', param: { page: number, size: number }): void
-  (e: 'search', param: Record<string, any>): void
-  (e: 'sort-change', param: { order: 'descending' | 'ascending' | null, prop: string }): void
 }