fm453/kinit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf：用户导入功能优化

Browse Source
This commit is contained in:
ktianc 2023-07-16 21:40:10 +08:00
parent 0d0b3a7308
commit 0807d9c02a
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kinit-admin/src/views/vadmin/auth/user/components/Import.vue
View File

@ -77,6 +77,7 @@ const handleImport = async () => {
} }
const downloadTemplate = async () => { const downloadTemplate = async () => {
ElMessage.info('正在下载请稍等！')
const res = await getImportTemplateApi() const res = await getImportTemplateApi()
if (res) { if (res) {
const a = document.createElement('a') const a = document.createElement('a')
@ -90,6 +91,7 @@ const downloadTemplate = async () => {
} }
const downloadErrorFile = async (row: Recordable) => { const downloadErrorFile = async (row: Recordable) => {
ElMessage.info('正在下载请稍等！')
const a = document.createElement('a') const a = document.createElement('a')
a.style.display = 'none' a.style.display = 'none'
a.href = row.error_url a.href = row.error_url

2
kinit-api/apps/vadmin/auth/schemas/user.py
View File

@ -22,7 +22,7 @@ class User(BaseModel):
nickname: Optional[str] = None nickname: Optional[str] = None
avatar: Optional[str] = None avatar: Optional[str] = None
is_active: Optional[bool] = True is_active: Optional[bool] = True
is_staff: Optional[bool] = False is_staff: Optional[bool] = True
gender: Optional[str] = "0" gender: Optional[str] = "0"
is_wx_server_openid: Optional[bool] = False is_wx_server_openid: Optional[bool] = False

11
kinit-api/utils/excel/import_manage.py
View File

@ -57,15 +57,18 @@ class ImportManage:
if file.content_type not in cls.file_type: if file.content_type not in cls.file_type:
raise CustomException(msg="文件类型必须为xlsx类型", code=status.HTTP_ERROR) 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) self.__filename = await FileManage.save_tmp_file(self.file)
es = ExcelManage() es = ExcelManage()
es.open_sheet(self.__filename, read_only=True) es.open_sheet(file=self.__filename, read_only=True)
self.__table_header = es.get_header(1, len(self.headers), asterisk=True) self.__table_header = es.get_header(header_row, len(self.headers), asterisk=True)
self.__table_data = es.readlines(min_row=2, max_col=len(self.headers)) self.__table_data = es.readlines(min_row=data_row, max_col=len(self.headers))
es.close() es.close()
def check_table_data(self) -> None: def check_table_data(self) -> None: