From b13d27ccd659a61a9c599a9d7bd29856ac97df1a Mon Sep 17 00:00:00 2001 From: zongyangleo Date: Thu, 21 Mar 2024 03:35:18 +0000 Subject: [PATCH] =?UTF-8?q?!109=20refactor=EF=BC=9Addl=E7=94=9F=E6=88=90?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E9=87=8D=E6=9E=84=EF=BC=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=92=8C=E9=95=BF=E5=BA=A6=E9=87=8D=E6=9E=84?= =?UTF-8?q?=EF=BC=8C=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=81?= =?UTF-8?q?=E7=A7=BB=E8=B0=83=E8=AF=95=20*=20feat=EF=BC=9A=E5=90=8C?= =?UTF-8?q?=E6=AD=A5sqlite=E5=85=A8=E9=87=8Fsql=20*=20refactor=EF=BC=9Addl?= =?UTF-8?q?=E7=94=9F=E6=88=90=E6=96=B9=E5=BC=8F=E9=87=8D=E6=9E=84=EF=BC=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=92=8C=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E9=87=8D=E6=9E=84=EF=BC=8C=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E8=BF=81=E7=A7=BB=E8=B0=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/ops/db/SyncTaskEdit.vue | 2 +- .../ops/db/component/table/DbTableData.vue | 6 +- .../db/component/table/DbTableDataForm.vue | 6 +- .../ops/db/component/table/DbTableDataOp.vue | 8 +- .../ops/db/component/table/DbTableOp.vue | 12 +- mayfly_go_web/src/views/ops/db/db.ts | 6 +- .../src/views/ops/db/dialect/mssql_dialect.ts | 2 +- server/internal/db/api/db.go | 2 +- server/internal/db/application/db_transfer.go | 12 +- server/internal/db/dbm/dbi/metadata.go | 37 ++- .../internal/db/dbm/dbi/metasql/dm_meta.sql | 36 +-- .../db/dbm/dbi/metasql/mssql_meta.sql | 135 +------- .../db/dbm/dbi/metasql/pgsql_meta.sql | 125 +------- server/internal/db/dbm/dm/dialect.go | 173 +++-------- server/internal/db/dbm/dm/metadata.go | 207 +++++++++---- server/internal/db/dbm/mssql/dialect.go | 226 +++----------- server/internal/db/dbm/mssql/metadata.go | 288 +++++++++++++----- server/internal/db/dbm/mysql/dialect.go | 103 ++----- server/internal/db/dbm/mysql/metadata.go | 145 ++++++++- server/internal/db/dbm/oracle/dialect.go | 240 +++------------ server/internal/db/dbm/oracle/metadata.go | 230 ++++++++++---- server/internal/db/dbm/postgres/dialect.go | 218 +++---------- server/internal/db/dbm/postgres/meta.go | 10 +- server/internal/db/dbm/postgres/metadata.go | 219 ++++++++++++- server/internal/db/dbm/sqlite/dialect.go | 145 ++------- server/internal/db/dbm/sqlite/metadata.go | 121 +++++++- server/resources/data/mayfly-go.sqlite | Bin 274432 -> 516096 bytes 27 files changed, 1309 insertions(+), 1405 deletions(-) diff --git a/mayfly_go_web/src/views/ops/db/SyncTaskEdit.vue b/mayfly_go_web/src/views/ops/db/SyncTaskEdit.vue index 950428cb..ff0242c1 100644 --- a/mayfly_go_web/src/views/ops/db/SyncTaskEdit.vue +++ b/mayfly_go_web/src/views/ops/db/SyncTaskEdit.vue @@ -115,7 +115,7 @@ diff --git a/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue b/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue index 9262d10f..382e1b49 100644 --- a/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue +++ b/mayfly_go_web/src/views/ops/db/component/table/DbTableData.vue @@ -461,7 +461,7 @@ const formatDataValues = (datas: any) => { for (let data of datas) { for (let column of props.columns!) { - data[column.columnName] = getFormatTimeValue(dbDialect.getDataType(column.columnType), data[column.columnName]); + data[column.columnName] = getFormatTimeValue(dbDialect.getDataType(column.dataType), data[column.columnName]); } } }; @@ -479,9 +479,9 @@ const setTableColumns = (columns: any) => { state.columns = columns.map((x: any) => { const columnName = x.columnName; // 数据类型 - x.dataType = dbDialect.getDataType(x.columnType); + x.dataType = dbDialect.getDataType(x.dataType); x.dataTypeSubscript = ColumnTypeSubscript[x.dataType]; - x.remark = `${x.columnType} ${x.columnComment ? ' | ' + x.columnComment : ''}`; + x.remark = `${x.showDataType} ${x.columnComment ? ' | ' + x.columnComment : ''}`; return { ...x, diff --git a/mayfly_go_web/src/views/ops/db/component/table/DbTableDataForm.vue b/mayfly_go_web/src/views/ops/db/component/table/DbTableDataForm.vue index 19244e71..32792258 100644 --- a/mayfly_go_web/src/views/ops/db/component/table/DbTableDataForm.vue +++ b/mayfly_go_web/src/views/ops/db/component/table/DbTableDataForm.vue @@ -9,15 +9,15 @@ :required="column.nullable != 'YES' && !column.isPrimaryKey && !column.isIdentity" > diff --git a/mayfly_go_web/src/views/ops/db/component/table/DbTableDataOp.vue b/mayfly_go_web/src/views/ops/db/component/table/DbTableDataOp.vue index 1defc336..b47ab31a 100644 --- a/mayfly_go_web/src/views/ops/db/component/table/DbTableDataOp.vue +++ b/mayfly_go_web/src/views/ops/db/component/table/DbTableDataOp.vue @@ -98,7 +98,7 @@ - {{ item.columnType }} + {{ item.showDataType }}