@xizs/nuxt-antui 0.0.20 → 0.0.22

package/app/components/global/FormTable2.tsx

@@ -9,7 +9,8 @@ type TableFormLabelsItemType = {
     key: string | string[],
     is: string,
     bind?: any,
-    value?:any
+    value?:any,
+    filter?:()=>boolean
 }
 
 export type TableParamsType = {
@@ -42,6 +43,7 @@ export type AttributeType = {
     selectKeys:any[],
     page:number,
     pageSize: number,
+    reqData:any,
     tableData: any[],
     metaTableData:any[],
     form:any
@@ -164,7 +166,7 @@ export default defineComponent({
 
         //form 初始化
         const form = ref<any>({})
-        props.form?.labels?.forEach((item) => {
+        props.form?.labels?.filter(item=>item.filter==null||item.filter(item)).forEach((item) => {
             
             if (Array.isArray(item.key)) {
                 item.key.forEach((key,index) => {
@@ -214,11 +216,16 @@ export default defineComponent({
             pagination.total = res.meta.pagination.total
             pagination.pageSize = res.meta.pagination.per_page
             pagination.page = res.meta.pagination.current_page
+            props.attribute.reqData = res
             props.attribute.metaTableData = JSON.parse(JSON.stringify(res.list))
             props.attribute.tableData = res.list
             return res.list
         },[])
 
+        watch(()=>tableData.loading,(nv)=>{
+            props.attribute.loading = nv
+        })
+
 
         const rowSelection = { 
             selectedRowKeys: props.attribute?.selectKeys, 
@@ -244,7 +251,9 @@ export default defineComponent({
                     <div class="flex gap-2">
                         {props.form?.option?.search !== false && <AButton type="primary" onClick={()=>tableData.load()}>{$t('搜索')}</AButton>}
                         {props.form?.option?.reset  !== false && <AButton onClick={() => patch(metaForm,form.value,true)}>{$t('重置')}</AButton>}
-                        {props.form?.option?.export === true && <AButton type="primary">{$t('导出')}</AButton>}
+                        {props.form?.option?.export === true && <AButton type="primary" onClick={()=>{
+                            props.form.export?.(form.value)
+                        }}>{$t('导出')}</AButton>}
                     </div> 
 
                     <div class="flex ml-auto">
@@ -255,24 +264,26 @@ export default defineComponent({
                 <div class="flex-1 relative overflow-scroll flex flex-col">
                     {slots.content?.(tableData.value) ??< div class="absolute inset-0 ">
                             <ATable
+                                bordered
                                 row-selection={props.table.enableSelection ? rowSelection : null}
                                 rowKey={props.table.rowKey ?? ((row) => row.id)}
                                 loading={tableData.loading}
-                                scroll={{ x: true,}}
                                 columns={props.table.columns}
                                 pagination={false}
-                                sticky={tableData.value.length>0}
                                 v-slots={{
-                                    headerCell: ({ title, column }: any) => (
-                                        <div style={{ 'white-space': 'nowrap' }}>
-                                            {title}
+                                    headerCell: (row) => {
+                                        if (row.column?.customHeaderCell != null) {
+                                            return row.column.customHeaderCell()
+                                        }
+                                        return <div style={{ 'white-space': 'nowrap',}}>
+                                            {row.title}
                                         </div>
-                                    ),
+                                    },
                                     bodyCell: (row: any) => {
                                         if (row.column?.customRender != null) {
                                             return row.column.customRender(row)
                                         }
-                                        return <div class="whitespace-nowrap" style={{ width: row.column.width ?? '100px' }}>{row.text}</div>
+                                        return <div class="whitespace-nowrap" >{row.text}</div>
                                     },
                                     ...props.table['v-slots']
                                 }}

package/app/components/layout/Base.vue

@@ -68,7 +68,7 @@
             </div>
         </div> -->
         <a-layout-content :style="{ }" class="relative   m-4">
-            <div class="absolute top-0 left-0 right-0 bottom-0 overflow-scroll">
+            <div class="absolute top-0 left-0 right-0 bottom-0 overflow-scroll scrollbar-hide">
                 <slot ></slot>
             </div>
         </a-layout-content>

package/app/composables/table.ts

@@ -31,6 +31,7 @@ export const FormTable2 = (props: TableParamsType) => {
     const attribute = reactive({
         selectItems: [],
         selectKeys: [],
+        loading:false,
         page: 1,
         pageSize: 10,
         tableData: [],

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xizs/nuxt-antui",
   "type": "module",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",
@@ -15,7 +15,7 @@
     "@ant-design-vue/nuxt": "1.4.6",
     "@nuxtjs/i18n": "9.5.4",
     "@tailwindcss/vite": "^4.1.3",
-    "@xizs/nuxt-base": "0.0.4",
+    "@xizs/nuxt-base": "0.0.5",
     "ant-design-vue": ">=4",
     "nuxt": "^3.16.2",
     "tailwindcss": "^4.0.14",