PullRequest: 463 fix/fix-issue-1615

Merge branch 'fix/fix-issue-1615 of git@code.alipay.com:oceanbase/oceanbase-developer-center.git into dev-4.3.1

https://code.alipay.com/oceanbase/oceanbase-developer-center/pull_requests/463


Signed-off-by: 晓康 <xxk268858@oceanbase.com>


* fix: fix issue 1615
* fix: fix issue 1615 oracle nls 类型全部返回时间戳转换数值
* fix: fix issue 1615 oracle nls 类型全部返回时间戳转换数值 - 修复数值多次来回转换会有误差的问题
* feat: change the parameter name of exportToSQL
* refactor: change the type of the rows parameter of exportToSQL
* feat: rows 调整
* fix: 多行逻辑处理
* refactor: delete console.log
* refactor: delete unused code
* fix: 搜索后 rows 数据处理
* refactor: delete console.log
* feat: 按行、列选中表格导出 SQL 语句
* refactor: Refactor code organization and add comments.
* feat: Enhance handling of boundary conditions.
* fix: Fix the issue with incorrect row data when exporting SQL for selected rows.

Author: 之瑛

src/page/Workspace/components/DDLResultSet/index.tsx

@@ -462,9 +462,15 @@ const DDLResultSet: React.FC<IProps> = function (props) {
       }
       function clipSQL() {
         if (!tableColumns || (!columnName && !isSelectedRow)) {
-          copyToSQL(gridRef.current, columns, undefined, session?.connection?.dialectType);
+          copyToSQL(gridRef.current, columns, undefined, session?.connection?.dialectType, rows);
         } else {
-          copyToSQL(gridRef.current, columns, table?.tableName, session?.connection?.dialectType);
+          copyToSQL(
+            gridRef.current,
+            columns,
+            table?.tableName,
+            session?.connection?.dialectType,
+            rows,
+          );
         }
       }
       function clipCsv() {

src/page/Workspace/components/DDLResultSet/util.tsx

@@ -43,17 +43,60 @@ export function wrapRow(row, columns: ResultSetColumn[]) {
   return newRow;
 }
 
+const getSelectedColumnsData = (selectedColumns, rows, columns) => {
+  const data = [];
+  const selectedColumnsDataHead = [];
+  for (let i = 0; i < columns?.length; i++) {
+    if (selectedColumns.has(columns[i].key)) {
+      selectedColumnsDataHead.push(columns[i].name);
+    }
+  }
+  data.push(selectedColumnsDataHead);
+  for (let i = 0; i < rows?.length; i++) {
+    const selectedRow = [];
+    for (const item of selectedColumns) {
+      selectedRow.push(rows?.[i]?.[item]);
+    }
+    data.push(selectedRow);
+  }
+  return data;
+};
+
 export function copyToSQL(
   gridRef: DataGridRef,
   columns: ResultSetColumn[],
   tableName: string = 'tmp_table',
   dbMode: ConnectionMode,
+  allRows?: any,
 ) {
+  let newRows = [];
+  const { selectedRows, selectedColumns, rows } = gridRef;
+
+  // export SQL by selected columns
+  if (selectedColumns?.size > 0) {
+    const selectedColumnsData = getSelectedColumnsData(selectedColumns, rows, columns);
+    newRows = rows;
+    copy(exportToSQL(selectedColumnsData, columns, tableName, dbMode, newRows));
+    return;
+  }
+
   const selectData = getSelectedRangeData(gridRef);
-  if (!selectData) {
+  if (!selectData) return;
+
+  // export SQL by selected rows
+  if (selectedRows?.size > 0) {
+    for (let item of selectedRows) {
+      newRows.push(allRows?.[item]);
+    }
+    copy(exportToSQL(selectData, columns, tableName, dbMode, newRows));
     return;
   }
+
+  // export SQL by selected cells
   const { rowIdx, endRowIdx } = gridRef.selectedRange;
-  const newRows = gridRef?.rows.slice(rowIdx, endRowIdx + 1);
-  copy(exportToSQL(selectData, columns, tableName, dbMode, newRows));
+  if (rowIdx > -1 && endRowIdx > -1) {
+    newRows = gridRef?.rows?.slice(rowIdx, endRowIdx + 1);
+    copy(exportToSQL(selectData, columns, tableName, dbMode, newRows));
+    return;
+  }
 }

src/util/sqlExport/index.ts

@@ -36,35 +36,40 @@ export default function exportToSQL(
   const columnMap: {
     [key: string]: ResultSetColumn;
   } = {};
+
   columns.forEach((column: ResultSetColumn, index: number) => {
     columnMap[column.name] = column;
   });
+
   const columnsText = headerColumnNames
     .map((columnName) => getQuoteTableName(columnName, dbMode))
     .join(',');
+
+  const handleRowsText = (rowData, columnIndex) => {
+    const rowsText = rowData
+      .map((item, i: number) => {
+        const columnName = headerColumnNames[i];
+        const column = columnMap[columnName];
+        const isMasked = column.masked;
+        if (isMasked) {
+          return item || 'NULL';
+        }
+        const nlsValueKey = getNlsValueKey(column.key);
+        const timestamp = rows[columnIndex]?.[nlsValueKey]?.timestamp;
+        return isMySQL
+          ? mysqlConvertValueToSQLString(item, column.columnType)
+          : oracleConvertValueToSQLString(item, column.columnType, timestamp);
+      })
+      .join(',');
+    return `insert into ${getQuoteTableName(
+      tableName,
+      dbMode,
+    )}(${columnsText}) values(${rowsText})`;
+  };
+
   return selectData
     .slice(1)
-    .map((rowData, columnIndex) => {
-      const rowsText = rowData
-        .map((item, i: number) => {
-          const columnName = headerColumnNames[i];
-          const column = columnMap[columnName];
-          const isMasked = column.masked;
-          if (isMasked) {
-            return item || 'NULL';
-          }
-          const nlsValueKey = getNlsValueKey(column.key);
-          const timestamp = rows[columnIndex]?.[nlsValueKey]?.timestamp;
-          return isMySQL
-            ? mysqlConvertValueToSQLString(item, column.columnType)
-            : oracleConvertValueToSQLString(item, column.columnType, timestamp);
-        })
-        .join(',');
-      return `insert into ${getQuoteTableName(
-        tableName,
-        dbMode,
-      )}(${columnsText}) values(${rowsText})`;
-    })
+    .map((rowData, columnIndex) => handleRowsText(rowData, columnIndex))
     .join(';\n');
 }