From 0807d9c02a24dc907e94d8c53655ad7bb4322fb7 Mon Sep 17 00:00:00 2001
From: ktianc <ktianc2000@163.com>
Date: Sun, 16 Jul 2023 21:40:10 +0800
Subject: [PATCH] =?UTF-8?q?perf=EF=BC=9A=E7=94=A8=E6=88=B7=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/vadmin/auth/user/components/Import.vue  |  2 ++
 kinit-api/apps/vadmin/auth/schemas/user.py            |  2 +-
 kinit-api/utils/excel/import_manage.py                | 11 +++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/kinit-admin/src/views/vadmin/auth/user/components/Import.vue b/kinit-admin/src/views/vadmin/auth/user/components/Import.vue
index d2c36c9..916059a 100644
--- a/kinit-admin/src/views/vadmin/auth/user/components/Import.vue
+++ b/kinit-admin/src/views/vadmin/auth/user/components/Import.vue
@@ -77,6 +77,7 @@ const handleImport = async () => {
 }
 
 const downloadTemplate = async () => {
+  ElMessage.info('正在下载请稍等！')
   const res = await getImportTemplateApi()
   if (res) {
     const a = document.createElement('a')
@@ -90,6 +91,7 @@ const downloadTemplate = async () => {
 }
 
 const downloadErrorFile = async (row: Recordable) => {
+  ElMessage.info('正在下载请稍等！')
   const a = document.createElement('a')
   a.style.display = 'none'
   a.href = row.error_url
diff --git a/kinit-api/apps/vadmin/auth/schemas/user.py b/kinit-api/apps/vadmin/auth/schemas/user.py
index 1ddb728..59c6306 100644
--- a/kinit-api/apps/vadmin/auth/schemas/user.py
+++ b/kinit-api/apps/vadmin/auth/schemas/user.py
@@ -22,7 +22,7 @@ class User(BaseModel):
     nickname: Optional[str] = None
     avatar: Optional[str] = None
     is_active: Optional[bool] = True
-    is_staff: Optional[bool] = False
+    is_staff: Optional[bool] = True
     gender: Optional[str] = "0"
     is_wx_server_openid: Optional[bool] = False
 
diff --git a/kinit-api/utils/excel/import_manage.py b/kinit-api/utils/excel/import_manage.py
index 957d73a..0bc6e10 100644
--- a/kinit-api/utils/excel/import_manage.py
+++ b/kinit-api/utils/excel/import_manage.py
@@ -57,15 +57,18 @@ class ImportManage:
         if file.content_type not in cls.file_type:
             raise CustomException(msg="文件类型必须为xlsx类型", code=status.HTTP_ERROR)
 
-    async def get_table_data(self) -> None:
+    async def get_table_data(self, header_row: int = 1, data_row: int = 2) -> None:
         """
         获取表格数据与表头
+
+        :param header_row: 表头在第几行
+        :param data_row: 数据开始行
         """
         self.__filename = await FileManage.save_tmp_file(self.file)
         es = ExcelManage()
-        es.open_sheet(self.__filename, read_only=True)
-        self.__table_header = es.get_header(1, len(self.headers), asterisk=True)
-        self.__table_data = es.readlines(min_row=2, max_col=len(self.headers))
+        es.open_sheet(file=self.__filename, read_only=True)
+        self.__table_header = es.get_header(header_row, len(self.headers), asterisk=True)
+        self.__table_data = es.readlines(min_row=data_row, max_col=len(self.headers))
         es.close()
 
     def check_table_data(self) -> None: