@xizs/nuxt-antui 0.0.7 → 0.0.9

package/app/components/global/FormTable.tsx

@@ -12,18 +12,23 @@ type TableFormItemType = {
 }
 
 export type TablePropsType = {
-  form?: TableFormItemType[]
-  table: {
+    form?: TableFormItemType[],
+    formOptions: {
+        search: boolean,
+        reset: boolean,
+        export: boolean,
+    },
+    table: {
+        'v-slots'?:any
+        enableSelection?: boolean
+        columns: TableColumnType[]
+        rowKey: (row: any) => any
+        data: (params:any) => any
+    },
+    footerOptions?: {
+        show: boolean
+    },
     'v-slots'?:any
-    enableSelection?: boolean
-    columns: TableColumnType[]
-    rowKey: (row: any) => any
-    data: (params:any) => any
-  },
-  footerOptions?: {
-    show: boolean
-  },
-  'v-slots'?:any
 }
 
 export type AttributeType = {
@@ -51,13 +56,18 @@ let dateRange = defineComponent({
         let {t:$t} = useI18n()
       
         let value = watchRef(ref([]),(nv,ov)=>{
-        if(nv?.length>0){
-            props.form[props.item.key[0] as string] = nv[0].format('YYYY-MM-DD 00:00:00')
-            props.form[props.item.key[1] as string] = nv[1].format('YYYY-MM-DD 23:59:59')
-        }else{
-            props.form[props.item.key[0] as string] = ''
-            props.form[props.item.key[1] as string] = ''
-        }
+            if(nv?.length>0){
+                props.form[props.item.key[0] as string] = nv[0].format('YYYY-MM-DD 00:00:00')
+                props.form[props.item.key[1] as string] = nv[1].format('YYYY-MM-DD 23:59:59')
+            }else{
+                props.form[props.item.key[0] as string] = ''
+                props.form[props.item.key[1] as string] = ''
+            }
+        })
+        watch([() => props.form[props.item.key[0] as string],()=>props.form[props.item.key[1] as string]], (nv) => { 
+            console.log(nv)
+            value.value[0]=nv[0]
+            value.value[1]=nv[1]
         })
         const rangePresets = ref([
             { label: $t('今天'), value: [dayjs(), dayjs()] },
@@ -80,8 +90,16 @@ const FormItems:Record<string, (form: any, item: TableFormItemType) => any> = {
         let {t:$t} = useI18n()
         return <ASelect allowClear class="min-w-[150px]" v-model:value={form[item.key]} options={item.bind?.options} placeholder={$t(`请选择{label}`,{label:$t(item.label)})}></ASelect>
     },
+    selectTenant: (form: any, item: TableFormItemType) => { 
+        let { t: $t } = useI18n()
+        watch(Const.TenantSelectList(), (nv) => { 
+            console.log(nv)
+        }, {
+            once: true
+        })
+        return <ASelect allowClear class="min-w-[150px]" v-model:value={form[item.key]} options={Const.TenantSelectList().value} placeholder={$t(`请选择{label}`,{label:$t(item.label)})}></ASelect>
+    },
     dateRange:(form:any,item:TableFormItemType)=>{
-        
         return h(dateRange,{form,item})
     }
 }
@@ -93,12 +111,7 @@ export const FormTableProps = {
       required: false
     },
     formOptions:{
-      type:Object as () => {
-        search:boolean,
-        reset:boolean,
-        export:boolean,
-        opther?:()=>any
-      },
+      type:Object as ()=> TablePropsType['formOptions'],
       default:()=>({
         search:true,
         reset:true,
@@ -143,7 +156,14 @@ export default defineComponent({
         const form = ref<any>({})
         props.form?.forEach((item) => {
             
-            form.value[item.key] = item.value
+            if (Array.isArray(item.key)) {
+                item.key.forEach((key,index) => {
+                    form.value[key] =  item.value?.[index]??''
+                })
+                
+            } else {
+                form.value[item.key] = item.value??''
+            }
         })
         props.attribute.form = form.value
         const metaForm = JSON.parse(JSON.stringify(form.value))
@@ -195,6 +215,7 @@ export default defineComponent({
         
         return () => (
             <div class="flex flex-col gap-2 h-full  ">
+                {/* {JSON.stringify(form.value)} */}
                 {props.form&&<AForm layout="inline gap-2">
                     {props.form?.map((item: TableFormItemType) => {
                         return (
@@ -205,7 +226,7 @@ export default defineComponent({
                     })}
                     <div class="flex gap-2">
                         {props.formOptions.search && <AButton type="primary" onClick={()=>tableData.load()}>{$t('搜索')}</AButton>}
-                        {props.formOptions.reset && <AButton onClick={() => patch(metaForm,form.value)}>{$t('重置')}</AButton>}
+                        {props.formOptions.reset && <AButton onClick={() => patch(metaForm,form.value,true)}>{$t('重置')}</AButton>}
                         {props.formOptions.export && <AButton type="primary">{$t('导出')}</AButton>}
                     </div> 
                 </AForm>}

package/app/composables/antdv.ts

@@ -0,0 +1,5 @@
+import zhCN from 'ant-design-vue/es/locale/zh_CN';
+
+export const useAntLocale = () => useState(() => {
+    return zhCN
+})

package/app/composables/modal.ts

@@ -1,6 +1,8 @@
 import { createVNode, render } from "vue"
 import Form from "../components/global/Form"
-import { AModal } from "#components"
+import { AConfigProvider, AModal } from "#components"
+
+import zhCN from 'ant-design-vue/es/locale/zh_CN';
 
 export const NormalModal = (el) => {
     let control = { close: () => { } }
@@ -12,27 +14,29 @@ export const NormalModal = (el) => {
             control.close = () => {
                 open.value = false
             }
-            return () => h(el, {
-                open: open.value, // 等价于 v-model:open
-                'onUpdate:open': (val: boolean) => {
-                    open.value = val
-                    if (!val) {
-                        setTimeout(() => {
-                            render(null, container) // 卸载组件
-                            if (container.parentNode) {
-                                container.parentNode.removeChild(container) // 移除 DOM
-                            }
-                        }, 1000);
-                    }
-                },
-            })
+            return () => h(AConfigProvider, { locale: useAntLocale().value }, [
+                h(el, {
+                    open: open.value, // 等价于 v-model:open
+                    'onUpdate:open': (val: boolean) => {
+                        open.value = val
+                        if (!val) {
+                            setTimeout(() => {
+                                render(null, container) // 卸载组件
+                                if (container.parentNode) {
+                                    container.parentNode.removeChild(container) // 移除 DOM
+                                }
+                            }, 1000);
+                        }
+                    },
+                })
+            ])
         }
     })
 
     const vnode = h(com)
     vnode.appContext = useNuxtApp().vueApp._context
     render(vnode, container)
-    document.body.appendChild(container)
+    // document.getElementById('aaaa')!.appendChild(container)
 
     return control
 
@@ -55,32 +59,6 @@ export const FormModal = (params: FormModalParamsType) => {
 
     let submit: () => void
 
-    // let control = NormalModal(h(AModal,{
-    //     title: params.title,
-    //     okText: '提交'+loading?.value,
-    //     cancelText: '取消',
-    //     onOk: async ()=>{
-    //         await submit()
-    //         control.close()
-    //     }
-
-    // },h(defineComponent({
-    //     setup(){
-    //         let formRef = ref(null)
-
-    //         onMounted(()=>{
-    //             submit =  formRef.value.submit
-    //             loading = formRef.value.loading
-    //         })
-
-    //         return ()=>h(Form,{
-    //             ref: formRef,
-    //             form: params.form,
-    //             submit:params.submit,
-    //             showSubmit: false
-    //         })
-    //     }
-    // }))))
 
     let control = NormalModal(h(defineComponent({
         setup() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xizs/nuxt-antui",
   "type": "module",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",