Merge branch 'main' of https://github.com/dataease/SQLBot

Author: dataeaseShu

backend/apps/datasource/api/datasource.py

@@ -9,10 +9,10 @@
 from apps.db.engine import create_table, get_data_engine, insert_data
 from common.core.deps import SessionDep, CurrentUser
 from ..crud.datasource import get_datasource_list, check_status, create_ds, update_ds, delete_ds, getTables, getFields, \
-    execSql, update_table_and_fields, getTablesByDs, chooseTables, preview
+    execSql, update_table_and_fields, getTablesByDs, chooseTables, preview, updateTable, updateField
 from ..crud.field import get_fields_by_table_id
 from ..crud.table import get_tables_by_ds_id
-from ..models.datasource import CoreDatasource, CreateDatasource, TableObj, CoreTable
+from ..models.datasource import CoreDatasource, CreateDatasource, TableObj, CoreTable, CoreField
 
 router = APIRouter(tags=["datasource"], prefix="/datasource")
 path = "/opt/sqlbot/data/excel"
@@ -83,6 +83,16 @@ async def edit_local(session: SessionDep, data: TableObj):
     update_table_and_fields(session, data)
 
 
+@router.post("/editTable")
+async def edit_table(session: SessionDep, table: CoreTable):
+    updateTable(session, table)
+
+
+@router.post("/editField")
+async def edit_field(session: SessionDep, field: CoreField):
+    updateField(session, field)
+
+
 @router.post("/previewData/{id}")
 async def edit_local(session: SessionDep, id: int, data: TableObj):
     return preview(session, id, data)

backend/apps/datasource/crud/datasource.py

@@ -192,6 +192,14 @@ def update_table_and_fields(session: SessionDep, data: TableObj):
         update_field(session, field)
 
 
+def updateTable(session: SessionDep, table: CoreTable):
+    update_table(session, table)
+
+
+def updateField(session: SessionDep, field: CoreField):
+    update_field(session, field)
+
+
 def preview(session: SessionDep, id: int, data: TableObj):
     ds = session.query(CoreDatasource).filter(CoreDatasource.id == id).first()
     conf = DatasourceConf(**json.loads(aes_decrypt(ds.configuration))) if ds.type != "excel" else get_engine_config()

frontend/src/views/ds/DatasourceItemCard.vue

@@ -11,17 +11,17 @@ defineProps<{
   ds: any
 }>()
 
-const getStatus = (status: string) => {
-  if (status === 'Success') {
-    return 'connected'
-  }
-  if (status === 'Fail') {
-    return 'failed'
-  }
-  if (status === 'Checking') {
-    return 'needs-verification'
-  }
-}
+// const getStatus = (status: string) => {
+//   if (status === 'Success') {
+//     return 'connected'
+//   }
+//   if (status === 'Fail') {
+//     return 'failed'
+//   }
+//   if (status === 'Checking') {
+//     return 'needs-verification'
+//   }
+// }
 
 </script>
 
@@ -44,7 +44,7 @@ const getStatus = (status: string) => {
       <div class="connection-host">{{ ds.description }}</div>
       <div class="connection-last">{{ datetimeFormat(ds.create_time) }}</div>
     </div>
-    <div class="connection-status" :class="`${getStatus(ds.status)}`">{{ ds.status }}</div>
+    <!-- <div class="connection-status" :class="`${getStatus(ds.status)}`">{{ ds.status }}</div> -->
     <slot></slot>
   </div>
 </template>