@lx-frontend/wrap-element-ui 1.0.16-beta.3 → 1.0.17-beta.0

package/package.json

@@ -1,22 +1,10 @@
 {
   "name": "@lx-frontend/wrap-element-ui",
-  "version": "1.0.16-beta.3",
+  "version": "1.0.17-beta.0",
   "description": "wrap-element-ui",
   "author": "",
   "main": "src/components/index.ts",
   "private": false,
-  "scripts": {
-    "clean": "rimraf dist",
-    "dev": "cross-env MODE=development storybook dev -p 6006",
-    "dist": "cross-env MODE=production pnpm build:lib && storybook dev -p 6006",
-    "build:lib": "pnpm clean && vite build",
-    "build:sb": "cross-env MODE=production rimraf storybook-static && pnpm build:lib && storybook build",
-    "preview": "serve ./storybook-static",
-    "publish:dev": "npm publish --access public --tag beta",
-    "publish:prod": "npm publish --access public",
-    "cdn": "gulp oss",
-    "lint": "eslint src"
-  },
   "files": [
     "README.md",
     "package.json",
@@ -52,7 +40,6 @@
     "ali-oss": "^6.20.0",
     "autoprefixer": "^10.4.19",
     "cross-env": "^7.0.3",
-    "dayjs": "^1.11.13",
     "eslint": "^8.57.0",
     "eslint-plugin-vue": "^9.27.0",
     "gulp": "^4.0.2",
@@ -70,5 +57,17 @@
     "vite-plugin-lib-inject-css": "^2.1.1",
     "vite-tsconfig-paths": "^4.3.2",
     "vue-template-compiler": "^2.6.10"
+  },
+  "scripts": {
+    "clean": "rimraf dist",
+    "dev": "cross-env MODE=development storybook dev -p 6006",
+    "dist": "cross-env MODE=production pnpm build:lib && storybook dev -p 6006",
+    "build:lib": "pnpm clean && vite build",
+    "build:sb": "cross-env MODE=production rimraf storybook-static && pnpm build:lib && storybook build",
+    "preview": "serve ./storybook-static",
+    "publish:dev": "npm publish --access public --tag beta",
+    "publish:prod": "npm publish --access public",
+    "cdn": "gulp oss",
+    "lint": "eslint src"
   }
 }

package/src/components/EditableTable/features/bizEditCell.vue

@@ -31,6 +31,7 @@
 </template>
 
 <script setup lang="ts">
+import { defineEmits, defineProps } from 'vue';
 import { IColumnConfig } from '../types'
 
 defineProps<{
@@ -38,6 +39,7 @@ defineProps<{
   value: any;
 }>()
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const emit = defineEmits<{
   (e: 'input', value: any): void;
 }>()

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

@@ -16,12 +16,7 @@
         :title="item.text"
         class="editable-table-sort-filter__filter-checkbox"
       >
-        <slot
-          name="filter-item"
-          v-bind="item"
-        >
-          {{ item.text }}
-        </slot>
+        {{ item.text }}
       </el-checkbox>
     </el-checkbox-group>
   </div>

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

@@ -15,12 +15,7 @@
         :label="item.value"
         :title="item.text"
       >
-        <slot
-          name="filter-item"
-          v-bind="item"
-        >
-          {{ item.text }}
-        </slot>
+        {{ item.text }}
       </el-radio>
     </el-radio-group>
   </div>

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

@@ -9,18 +9,15 @@
     @show="() => emit('popover-show')"
   >
     <template slot="reference">
-      <slot
-        v-if="column.customColorLabel"
-        name="custom"
-      />
-      <!-- 筛选中，或排序中，高亮 -->
-      <span
-        v-else
-        :class="['editable-table__sort-reference', headActive && 'editable-table__sort-reference--active']"
-      >
-        {{ column.label }}
-        <div :class="['editable-table__sort-icon', headActive && 'editable-table__sort-icon--active']" />
-      </span>
+      <slot name="custom">
+        <!-- 筛选中，或排序中，高亮 -->
+        <span
+          :class="['editable-table__sort-reference', headActive && 'editable-table__sort-reference--active']"
+        >
+          {{ column.label }}
+          <div :class="['editable-table__sort-icon', headActive && 'editable-table__sort-icon--active']" />
+        </span>
+      </slot>
     </template>
     <div class="editable-table-sort-filter">
       <div class="editable-table-sort-filter__column-title">

package/src/components/EditableTable/features/bizTableOperatePopover.vue

@@ -41,7 +41,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref } from 'vue';
+import { defineEmits, defineExpose, defineProps, ref } from 'vue';
 import { IDefaultOperationType } from '../types';
 
 defineProps<{
@@ -53,6 +53,7 @@ defineProps<{
   scope: any
 }>()
 
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const emit = defineEmits<{
   (e: 'edit'): void
   (e: 'delete'): void

package/src/components/EditableTable/index.vue

@@ -124,14 +124,6 @@
             <template #custom>
               <div class="editable-table__color-icon" />
             </template>
-            <template #filter-item="item">
-              <slot
-                :name="colorFilterConfig.prop + '-filter-item'"
-                v-bind="item"
-              >
-                {{ item.text }}
-              </slot>
-            </template>
           </biz-table-header-popover>
           <div
             v-else
@@ -174,14 +166,6 @@
             @reset="() => handleHeaderOperationReset(column)"
             @confirm="() => handleHeaderOperationConfirm(column)"
           >
-            <template #filter-item="item">
-              <slot
-                :name="column.prop + '-filter-item'"
-                v-bind="item"
-              >
-                {{ item.text }}
-              </slot>
-            </template>
             <template #summay-item>
               <slot
                 :name="column.prop + '-summay-item'"
@@ -331,8 +315,9 @@ import BizTableHeaderPopover from './features/bizTableHeaderPopover/index.vue'
 import BizEditCell from './features/bizEditCell.vue'
 import BizTableOperatePopover from './features/bizTableOperatePopover.vue'
 
-import { computed, nextTick, ref, watch } from 'vue';
+import { computed, defineExpose, nextTick, ref, watch } from 'vue';
 import { Message } from 'element-ui';
+import omit from 'lodash/omit';
 
 import {
   usePagination,
@@ -573,6 +558,8 @@ const beforeDragStart = () => {
   return true;
 };
 
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-ignore
 useDragSort({
   emit,
   props,
@@ -590,9 +577,14 @@ const doTableLayout = async () => {
 
 // 过滤出自定义属性，将其它属性全部透传给 el-table-column
 const getColumnBindProps = (column: IColumnConfig) => {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  const { editType, slotName, inputType, options, filters, ...rest } = column;
-  return rest;
+  // 过滤掉自定义属性，只保留 el-table-column 支持的属性
+  return omit(column, [
+    'editType',
+    'slotName',
+    'inputType',
+    'options',
+    'filters'
+  ]);
 };
 
 const setRowClassName = (scope) => {

package/src/components/EditableTable/types/index.ts

@@ -88,6 +88,7 @@ type _IColumnConfigRequired = {
   /** 自定义颜色表头label */
   customColorLabel?: boolean;
   filters?: FilterListType;
+  selectOptions?: { label: string; value: string }[];
 }
 
 export type IColumnConfigRequired = _IColumnConfigRequired & Partial<Omit<TableColumn, keyof _IColumnConfigRequired>>