Merge branch 'master' of https://dev.azure.com/alicorn-dev/KintoneAppBuilder/_git/KintoneAppBuilder

backend/app/api/api_v1/routers/kintone.py

@@ -8,16 +8,15 @@ kinton_router = r = APIRouter()
 
 
 @r.post("/upload",)
-async def upload(files:t.List[UploadFile] = File(...)):
+async def upload(file:UploadFile = File(...)):
     dataframes = []
-    for file in files:
+    if file.filename.endswith('.xlsx'):
-        if file.filename.endswith('.xlsx'):
+        try:
-            try:
+            content = await file.read()
-                content = await file.read()
+            df = pd.read_excel(BytesIO(content))
-                df = pd.read_excel(BytesIO(content))
+            dataframes.append(df)
-                dataframes.append(df)
+        except Exception as e:
-            except Exception as e:
+            raise HTTPException(status_code=400, detail=f"Error occurred while parsing file {file.filename}: {str(e)}")
-                raise HTTPException(status_code=400, detail=f"Error occurred while parsing file {file.filename}: {str(e)}")
+    else:
-        else:
+        raise HTTPException(status_code=400, detail=f"File {file.filename} is not an Excel file")
-            raise HTTPException(status_code=400, detail=f"File {file.filename} is not an Excel file")
+    return {"file": file.filename}  
-    return {"files": [file.filename for file in files]}  

backend/app/main.py

@@ -9,12 +9,25 @@ from app.core import config
 # from app.core.auth import get_current_active_user
 from app.core.celery_app import celery_app
 from app import tasks
-
+from fastapi.middleware.cors import CORSMiddleware
 
 app = FastAPI(
     title=config.PROJECT_NAME, docs_url="/api/docs", openapi_url="/api"
 )
 
+origins = [
+    "http://localhost:9000",
+    "http://localhost",
+    "http://localhost:8080",
+]
+
+app.add_middleware(
+    CORSMiddleware,
+    allow_origins=origins,
+    allow_credentials=True,
+    allow_methods=["*"],
+    allow_headers=["*"],
+)
 
 # @app.middleware("http")
 # async def db_session_middleware(request: Request, call_next):

frontend/src/components/DocUpload.vue

@@ -7,6 +7,7 @@
         :label="title"
         accept=".csv,.xlsx"
         :on-rejected="onRejected"
+        field-name="file"
     ></q-uploader>
   </div>