diff --git a/README.md b/README.md
index 92b267a..389a4ca 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,49 @@
+##通知
+
+自`Naive Ui Admin`发布`1.x`版本之后，受到了许多小伙伴使用和热爱，当中也收到了不少的建议和反馈，比如：文档访问稳定性，详细程度，组件和页面丰富性，版本更新频率等...
+至此我们团队为了给大家更好的体验，以及能够真正做一款相对完善的`开箱即用中后台框架`，我们从`2021-08-14`号，决定停止更新`1.x`版本，重点构造一个`全新v2大版本`，
+并更名为`NaiveAdmin`，发布将定义为商业版本，详情可移步官网查看 [NaiveAdmin](https://naiveadmin.com)，感谢大家给予的每一个建议包括，Pr，Star，
+谢谢大家支持！
+
+## 💄 v2更新如下
+### ✨ Features
+🔥🔥🔥 代码重构 `script setup` 语法，源码更加易读，性能更优，ts 类型更加全面
+#### 💻 页面
+- 🌟 `全新登录/注册页面`
+- 🌟 `全新主控台页面`
+- 🌟 `用户管理`
+- 🌟 `字典管理`
+#### ✨ 优化
+- 🌟 `主结构布局优化`
+- 🌟 `表格主从结构`
+- 🌟 `多标签页可关闭左右侧标签`
+- 🌟 `多标签页可自动滚动到当前页面`
+- 🌟 `弹窗组件拖拽可配置`
+#### 🏷️ 功能
+- 🌟 `右键菜单`
+- 🌟 `文件下载`
+- 🌟 `Excel导出`
+- 🌟 `剪贴板`
+- 🌟 `打印`
+- 🌟 `滚动条`
+- 🌟 `消息通知`
+- 🌟 `主控台图表示例`
+- 🌟 `引导`
+- 🌟 `修改密码`
+- 🌟 `固定主体区域可配置`
+- 🌟 `pinia 持久化存储`
+#### 📦 组件
+- 🌟 `省市区`
+- 🌟 `顶部搜索`
+- 🌟 `二维码`
+- 🌟 `密码强度`
+- 🌟 `图片裁剪，支持圆形矩形`
+- 🌟 `选择器增强，支持缓存`
+
+
+## 关于本仓库
+该仓库将不再添加新功能，只修bug（过程可能会慢一些），有效pr会合并，所以当你选择这个版本的时候，需要衡量一下。
+
 ## 简介
 
 [Naive Ui Admin](https://github.com/jekip/naive-ui-admin) 是一个基于 [Vue3.0](https://github.com/vuejs/vue-next)、[Vite](https://github.com/vitejs/vite)、 [Naive UI](https://www.naiveui.com/)、[TypeScript](https://www.typescriptlang.org/) 的中后台解决方案，它使用了最新的前端技术栈，并提炼了典型的业务模型，页面，包括二次封装组件、动态菜单、权限校验、粒子化权限控制等功能，它可以帮助你快速搭建企业级中后台项目，相信不管是从新技术使用还是其他方面，都能帮助到你。
@@ -64,9 +110,6 @@ yarn build
 
 [CHANGELOG](./CHANGELOG.md)
 
-## 感谢
-[@Vben](https://github.com/anncwb/vue-vben-admin) 借鉴 vue-vben-admin 实现的骨架，同时也使用作者开发的 vite 插件，再次感谢作者。
-
 
 ## 如何贡献
 
diff --git a/src/components/Modal/src/basicModal.vue b/src/components/Modal/src/basicModal.vue
index f1bafb7..b635437 100644
--- a/src/components/Modal/src/basicModal.vue
+++ b/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);
   }
diff --git a/src/views/comp/form/basic.vue b/src/views/comp/form/basic.vue
index c45659a..c808ca2 100644
--- a/src/views/comp/form/basic.vue
+++ b/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);
         },
diff --git a/src/views/comp/form/useForm.vue b/src/views/comp/form/useForm.vue
index 4d722f5..4614741 100644
--- a/src/views/comp/form/useForm.vue
+++ b/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);
         },
diff --git a/src/views/comp/modal/index.vue b/src/views/comp/modal/index.vue
index 976926b..18e4d83 100644
--- a/src/views/comp/modal/index.vue
+++ b/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);
         },
diff --git a/src/views/comp/table/basic.vue b/src/views/comp/table/basic.vue
index 00b8c45..4750cf3 100644
--- a/src/views/comp/table/basic.vue
+++ b/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) {
diff --git a/src/views/comp/table/editCell.vue b/src/views/comp/table/editCell.vue
index 9d0c20f..18fb565 100644
--- a/src/views/comp/table/editCell.vue
+++ b/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) {
diff --git a/src/views/comp/table/editRow.vue b/src/views/comp/table/editRow.vue
index c50eeaf..8adab09 100644
--- a/src/views/comp/table/editRow.vue
+++ b/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) {
diff --git a/src/views/list/basicList/index.vue b/src/views/list/basicList/index.vue
index ebc5275..a3f6c38 100644
--- a/src/views/list/basicList/index.vue
+++ b/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) {
diff --git a/src/views/system/role/role.vue b/src/views/system/role/role.vue
index d0366e4..42cc2e7 100644
--- a/src/views/system/role/role.vue
+++ b/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);
   };