@dt-frames/ui 1.0.5 → 1.0.8

package/src/components/table/src/components/setting/Fullscreen.vue

@@ -30,7 +30,7 @@
                 if( !el || !el.parentNode ) return null
                 
                 // 找到路由的下一层 进行全屏
-                if(el.parentNode.className.indexOf('dt-layout-content') !== -1) {
+                if(el.parentNode.className?.indexOf('dt-layout-content') !== -1) {
                     wrapEl.value = el.parentNode
                 } else {
                     getParent( el.parentNode )

package/src/components/table/src/components/setting/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <Download></Download>
+    <Download v-if="getSetting.download"></Download>
     <SizeSetting v-if="getSetting.size" />
     <ColumnSetting
         v-if="getSetting.setting"
@@ -43,7 +43,7 @@
         setup(props, { emit }) {
             const getSetting = computed((): TableSetting => {
                 return {
-                    redo: true,
+                    download: true,
                     size: true,
                     setting: true,
                     fullscreen: true,

package/src/components/table/src/hooks/useDataSource.ts

@@ -24,6 +24,19 @@ export function useDataSource(
     // 拷贝一份表格数据 然后再做数据处理
     const dataSourceRef = ref<Recordable[]>([])
 
+    // const { defSort, onTableChange } = unref( propsRef )
+    // const { appConf } = useAppStore()
+
+    // onTableChange({
+    //     pagination: {
+    //         current: 1,
+    //         pageSize: appConf.ui.table.defaultPageSize
+    //     },
+    //     sort:defSort,
+    //     filter: null,
+    //     showBtnLoading: false
+    // }, false)
+
     watch(
         () => unref(propsRef).dataSource,
         (dataSource) => {
@@ -75,20 +88,18 @@ export function useDataSource(
     }
 
 
-    onMounted(() => {
-        const { defSort, onTableChange } = unref( propsRef )
-        const { appConf } = useAppStore()
+    const { defSort, onTableChange } = unref( propsRef )
+    const { appConf } = useAppStore()
 
-        onTableChange({
-            pagination: {
-                current: 1,
-                pageSize: appConf.ui.table.defaultPageSize
-            },
-            sort:defSort,
-            filter: null,
-            showBtnLoading: false
-        }, false)
-    })
+    onTableChange({
+        pagination: {
+            current: 1,
+            pageSize: appConf.ui.table.defaultPageSize
+        },
+        sort:defSort,
+        filter: null,
+        showBtnLoading: false
+    }, false)
 
 
     return {

package/src/components/table/src/hooks/useHeaderCode.ts

@@ -1,9 +1,10 @@
 import { error, http, Recordable, useAppStore } from "@dt-frames/core"
-import { BasicColumn, CellFormat } from "../types/table.type"
+import { BasicColumn } from "../types/table.type"
 
+const codeMap = new Map()
 
 // 解析header
-export function useHeaderCode(code: string, templates: CellFormat = {}, changeColumns: ( rows: BasicColumn[] ) => void) {
+export function useHeaderCode(code: string, templates: Recordable = {}, changeColumns: ( rows: BasicColumn[] ) => void) {
     const { appConf } = useAppStore()
 
     if( !appConf.pages.queryColumnApi ) {
@@ -46,6 +47,11 @@ export function useHeaderCode(code: string, templates: CellFormat = {}, changeCo
 
 
     function getColumns() {
+        if( codeMap.get(code ) ) {
+            changeColumns( codeMap.get(code ) )
+            return
+        }
+        
         http.post(
             appConf.pages.queryColumnApi,
             { tableCode: code }
@@ -74,6 +80,7 @@ export function useHeaderCode(code: string, templates: CellFormat = {}, changeCo
             rows.push(obj)
         } )
 
+        codeMap.set(code, rows )
         changeColumns( rows )
     }
 

package/src/components/table/src/hooks/useTable.ts

@@ -1,6 +1,6 @@
-import { DynamicProps, Nullable, getDynamicProps, error } from '@dt-frames/core'
+import { DynamicProps, Nullable, getDynamicProps, error, Recordable } from '@dt-frames/core'
 import { onUnmounted, ref, toRaw, unref, watch } from 'vue'
-import { BasicColumn, BasicTableProps, CellFormat, TableActionType } from '../types/table.type'
+import { BasicColumn, BasicTableProps, TableActionType } from '../types/table.type'
 import { useHeaderCode } from './useHeaderCode'
 
 
@@ -23,14 +23,15 @@ export function useTable(tableProps?: Props) {
         if( tableProps.columnCode ) {
             useHeaderCode( 
                 tableProps.columnCode as string, 
-                tableProps.templates as CellFormat, 
+                tableProps.templates as Recordable, 
                 (columns: BasicColumn[]) => {
                     tableProps.columns = columns
+
+                    instance.setProps(getDynamicProps(tableProps))
                 }
             )
         }
 
-        tableProps && instance.setProps(getDynamicProps(tableProps))
 
         watch(
             () => tableProps,

package/src/components/table/src/hooks/useTableHeader.ts

@@ -12,7 +12,7 @@ export function useTableHeader(
         const { tableSetting, toolbar } = unref(propsRef)
 
         const { getSlot } = useSlots()
-        const hideTitle = !slots.toolbar && !slots.headerTop && (!tableSetting || !tableSetting.length)
+        const hideTitle = !slots.toolbar && !slots.headerTop && !tableSetting
 
         return {
             title: hideTitle 
@@ -21,7 +21,7 @@ export function useTableHeader(
                 h(
                     TableHeader,
                     {
-                        tableSetting,
+                        tableTools: tableSetting,
                         toolbar,
                         onColumnsChange: handlers.onColumnsChange
                     } as Recordable,

package/src/components/table/src/index.vue

@@ -32,7 +32,6 @@
     import { usePagination } from "./hooks/usePagination"
     import { useDataSource } from "./hooks/useDataSource"
     import { useRowSelection } from "./hooks/useRowSelection"
-    import TableHeader from './components/TableHeader.vue'
     import TableRender from './components/TableRender.vue'
     import { createTableInstance } from "./hooks/useTableInstance"
     import { useColumns } from "./hooks/useColumns"
@@ -45,7 +44,6 @@
         props: TableProps,
         components: {
             Table,
-            TableHeader,
             TableRender
         },
         emits: [

package/src/components/table/src/props.ts

@@ -3,7 +3,7 @@ import { PropType } from 'vue'
 import { DEFAULT_SORT_FN } from './const'
 import type { PaginationProps } from 'ant-design-vue/lib/pagination'
 import type { TableRowSelection } from 'ant-design-vue/lib/table/interface'
-import { ActionType, BasicColumn, BtnsType, CellFormat, SizeType } from './types/table.type'
+import { ActionType, BasicColumn, BtnsType, SizeType, TableSetting } from './types/table.type'
 import { ButtonProps } from '../../forms'
 import { DownloadType } from './types/tableHeader.type'
 
@@ -12,7 +12,7 @@ export const TableProps = {
     clickRowSelect: { type: Boolean, default: false },
 
     // 表格设置
-    tableSetting: {type: Array, default: ['redo', 'size', 'setting', 'fullscreen']},
+    tableSetting: {type: Object as PropType<TableSetting>, default: () => ({})},
 
     // 是否显示斑马条纹
     striped: { type: Boolean, default: true },
@@ -53,7 +53,7 @@ export const TableProps = {
     // 列code编码
     columnCode: { type: String },
     // 列自定义的模板
-    templates: { type: Object as PropType<CellFormat> },
+    templates: { type: Object as PropType<Recordable>, default: {} },
 
     // 列 
     columns: { type: [Array] as PropType<BasicColumn[]>, default: () => [] },

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

@@ -21,7 +21,7 @@ export interface TableRowSelection<T = any> extends ITableRowSelection {
 
 export type TableSetting = {
     // 表格刷新
-    redo?: boolean
+    download?: boolean
     // 表格的尺寸
     size?: boolean
     // 是否显示列控制
@@ -50,7 +50,7 @@ export type SorterResult = {
 }
 
 export type CellFormat =
-  | ((text: string, record: Recordable, index: number) => any)
+  | ((record: Recordable, index: number, text: string) => any)
   | { dict: DictType }
   | { number: string }
   | { date: string }