gi-component 0.0.24 → 0.0.26

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "gi-component",
   "type": "module",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "description": "Vue3中基于Element Plus二次封装基础组件库",
   "author": "lin",
   "license": "MIT",

package/packages/components/button/src/button.vue

@@ -39,12 +39,12 @@ const obj: Record<string, { btnProps: Partial<ButtonProps>, btnText: string }>
   delete: { btnProps: { icon: Delete, type: 'danger' }, btnText: '删除' },
   search: { btnProps: { icon: Search, type: 'primary' }, btnText: '搜索' },
   reset: { btnProps: { type: undefined }, btnText: '重置' },
-  upload: { btnProps: { icon: Upload, type: 'primary' }, btnText: '上传' },
+  upload: { btnProps: { icon: Upload }, btnText: '上传' },
   download: {
-    btnProps: { icon: Download, type: 'primary' },
+    btnProps: { icon: Download },
     btnText: '下载'
   },
-  print: { btnProps: { icon: Printer, type: 'primary' }, btnText: '打印' }
+  print: { btnProps: { icon: Printer }, btnText: '打印' }
 }
 
 const bindProps = computed(() => {

package/packages/components/table/src/table.vue

@@ -16,21 +16,28 @@
   </div>
 </template>
 
-<script lang="ts" setup>
-import type { TableProps } from './type'
+<script lang="ts" setup generic="T extends DefaultRow">
+import type { DefaultRow, TableProps, TableSlotScope } from './type'
 import { ElPagination, ElRow, ElTable } from 'element-plus'
 import { computed, useAttrs, useTemplateRef } from 'vue'
 import { useBemClass } from '../../../hooks'
 import TableColumn from './TableColumn.vue'
 
-const props = withDefaults(defineProps<TableProps>(), {
+const props = withDefaults(defineProps<TableProps<T>>(), {
   fit: true,
   showHeader: true,
   selectOnIndeterminate: true,
+  data: () => [],
   columns: () => [],
   pagination: () => ({})
 })
 
+defineSlots<{
+  append: () => void
+  empty: () => void
+  [propsName: string]: (props: TableSlotScope<T>) => void
+}>()
+
 const attrs = useAttrs()
 const { b } = useBemClass()
 const tableRef = useTemplateRef('tableRef')

package/packages/components/table/src/type.ts

@@ -1,14 +1,24 @@
 import type { TableProps as ElTableProps, PaginationProps, TableColumnInstance } from 'element-plus'
 import type { ExtractPropTypes, VNode } from 'vue'
 
-type DefaultRow = Record<PropertyKey, any>
-export interface TableColumnItem<T extends DefaultRow = DefaultRow> extends Omit<TableColumnInstance['$props'], never> {
+export type DefaultRow = Record<PropertyKey, any>
+
+export interface TableColumnItem<T extends DefaultRow = any> extends Omit<TableColumnInstance['$props'], never> {
   slotName?: string
   children?: TableColumnItem[]
-  render?: (scope: { $index: number, cellIndex: number, column: TableColumnItem<T>, row: T }) => VNode | VNode[] | string
+  render?: (scope: TableSlotScope<T>) => VNode | VNode[] | string
+}
+
+export type TableSlotScope<T extends DefaultRow = any> = {
+  $index: number
+  cellIndex: number
+  column: TableColumnInstance['$props']
+  row: T
+  expanded: boolean
 }
 
-export interface TableProps extends ExtractPropTypes<ElTableProps<Record<string | number | symbol, any>>> {
+export interface TableProps<T extends DefaultRow = any> extends ExtractPropTypes<ElTableProps<Record<string | number | symbol, any>>> {
+  data?: T[]
   columns?: TableColumnItem[]
   pagination?: Partial<PaginationProps> | boolean
 }