Fix bug and README.md update

src/components/Modal/src/basicModal.vue

@@ -50,6 +50,11 @@
     return { ...props, ...(unref(propsRef) as any) };
   });
 
+  const subBtuText = computed(() => {
+    const { subBtuText } = propsRef.value as any
+    return subBtuText;
+  })
+
   async function setProps(modalProps: Partial<ModalProps>): Promise<void> {
     propsRef.value = deepMerge(unref(propsRef) || ({} as any), modalProps);
   }

src/views/comp/form/basic.vue

@@ -77,10 +77,10 @@
       field: 'makeDate',
       component: 'NDatePicker',
       label: '预约时间',
+      defaultValue: 1183135260000,
       componentProps: {
         type: 'date',
         clearable: true,
-        defaultValue: 1183135260000,
         onUpdateValue: (e: any) => {
           console.log(e);
         },

src/views/comp/form/useForm.vue

@@ -79,10 +79,10 @@
       giProps: {
         //span: 24,
       },
+      defaultValue: 1183135260000,
       componentProps: {
         type: 'date',
         clearable: true,
-        defaultValue: 1183135260000,
         onUpdateValue: (e: any) => {
           console.log(e);
         },

src/views/comp/modal/index.vue

@@ -120,10 +120,10 @@
       giProps: {
         //span: 24,
       },
+      defaultValue: 1183135260000,
       componentProps: {
         type: 'date',
         clearable: true,
-        defaultValue: 1183135260000,
         onUpdateValue: (e: any) => {
           console.log(e);
         },

src/views/comp/table/basic.vue

@@ -73,7 +73,7 @@
   }
 
   const loadDataTable = async (res) => {
-    return await getTableList({...res,...params});
+    return await getTableList({ ...params, ...res });
   };
 
   function onCheckedRow(rowKeys) {

src/views/comp/table/editCell.vue

@@ -39,7 +39,7 @@
   }
 
   const loadDataTable = async (res) => {
-    return await getTableList({ ...res, ...params });
+    return await getTableList({ ...params, ...res });
   };
 
   function onCheckedRow(rowKeys) {

src/views/comp/table/editRow.vue

@@ -94,7 +94,7 @@
   }
 
   const loadDataTable = async (res) => {
-    return await getTableList({ ...res, ...params });
+    return await getTableList({ ...params, ...res });
   };
 
   function onCheckedRow(rowKeys) {

src/views/list/basicList/index.vue

@@ -141,10 +141,10 @@
       field: 'makeDate',
       component: 'NDatePicker',
       label: '预约时间',
+      defaultValue: 1183135260000,
       componentProps: {
         type: 'date',
         clearable: true,
-        defaultValue: 1183135260000,
         onUpdateValue: (e: any) => {
           console.log(e);
         },
@@ -296,7 +296,7 @@
   }
 
   const loadDataTable = async (res) => {
-    return await getTableList({...res, ...formParams, ...params.value});
+    return await getTableList({ ...formParams, ...params.value, ...res });
   };
 
   function onCheckedRow(rowKeys) {

src/views/system/role/role.vue

@@ -136,8 +136,8 @@
 
   const loadDataTable = async (res: any) => {
     let _params = {
-      ...res,
       ...unref(params),
+      ...res,
     };
     return await getRoleList(_params);
   };