Merge remote-tracking branch 'origin/main' into release/0.5.6

# Conflicts:
#	frontend/src/utils/sql.ts

frontend/src/components/ConnectionModal.tsx

@@ -1179,7 +1179,8 @@ const ConnectionModal: React.FC<{
 
   const handleOk = async () => {
     try {
-      const values = await form.validateFields();
+      await form.validateFields();
+      const values = form.getFieldsValue(true);
       const unavailableReason = await resolveDriverUnavailableReason(values.type);
       if (unavailableReason) {
           message.warning(unavailableReason);
@@ -1241,7 +1242,8 @@ const ConnectionModal: React.FC<{
       if (testInFlightRef.current) return;
       testInFlightRef.current = true;
       try {
-          const values = await form.validateFields();
+          await form.validateFields();
+          const values = form.getFieldsValue(true);
           const unavailableReason = await resolveDriverUnavailableReason(values.type);
           if (unavailableReason) {
               const failMessage = buildTestFailureMessage(unavailableReason, '驱动未安装启用');
@@ -1311,7 +1313,8 @@ const ConnectionModal: React.FC<{
           return;
       }
       try {
-          const values = await form.validateFields();
+          await form.validateFields();
+          const values = form.getFieldsValue(true);
           setDiscoveringMembers(true);
           const config = await buildConfig(values, false);
           const result = await MongoDiscoverMembers(config as any);

frontend/src/components/DataGrid.tsx

@@ -1202,11 +1202,11 @@ const DataGrid: React.FC<DataGridProps> = ({
 
   // 直接操作 DOM 更新选中效果，避免 React 重渲染
   const updateCellSelection = useCallback((newSelection: Set<string>) => {
-    const tableBody = containerRef.current?.querySelector('.ant-table-body');
-    if (!tableBody) return;
+    const container = containerRef.current;
+    if (!container) return;
 
-    // 只同步可见单元格（兼容 virtual 渲染 + 极大选区）
-    const visibleCells = tableBody.querySelectorAll('td[data-row-key][data-col-name]');
+    // 只同步可见单元格，严格限定 `.ant-table-cell`，避免虚拟列表中内嵌的 EditableCell 被重复获取并打上 selected 样式从而产生白边。
+    const visibleCells = container.querySelectorAll('.ant-table-cell[data-row-key][data-col-name]');
     visibleCells.forEach((cell) => {
       const el = cell as HTMLElement;
       const rowKey = el.getAttribute('data-row-key');
@@ -1334,10 +1334,10 @@ const DataGrid: React.FC<DataGridProps> = ({
 
     const getCellInfo = (target: HTMLElement | null): { rowKey: string; colName: string } | null => {
       if (!target) return null;
-      const td = target.closest('td[data-row-key][data-col-name]') as HTMLElement;
-      if (!td) return null;
-      const rowKey = td.getAttribute('data-row-key');
-      const colName = td.getAttribute('data-col-name');
+      const cell = target.closest('[data-row-key][data-col-name]') as HTMLElement;
+      if (!cell) return null;
+      const rowKey = cell.getAttribute('data-row-key');
+      const colName = cell.getAttribute('data-col-name');
       if (!rowKey || !colName) return null;
       return { rowKey, colName };
     };
@@ -2105,16 +2105,9 @@ const DataGrid: React.FC<DataGridProps> = ({
       closeRowEditor();
   }, [rowEditorRowKey, rowEditorForm, addedRows, columnNames, rowKeyStr, closeRowEditor]);
 
-  const estimatedVisibleCellCount = mergedDisplayData.length * Math.max(columnNames.length, 1);
-  const enableLargeResultOptimizedEditing =
-      viewMode === 'table' && (
-          mergedDisplayData.length >= 60 ||
-          estimatedVisibleCellCount >= 1600 ||
-          columnNames.length >= 36 ||
-          (isMacLike && columnNames.length >= 24)
-      );
-  const enableVirtual = enableLargeResultOptimizedEditing;
-  const enableInlineEditableCell = canModifyData && !enableLargeResultOptimizedEditing;
+
+  const enableVirtual = viewMode === 'table';
+  const enableInlineEditableCell = canModifyData;
 
   const columns = useMemo(() => {
       return columnNames.map(key => ({
@@ -2169,22 +2162,28 @@ const DataGrid: React.FC<DataGridProps> = ({
       return {
           ...col,
           onCell: (record: Item) => {
-              if (!enableInlineEditableCell) {
-                  const rowKey = record?.[GONAVI_ROW_KEY];
-                  return {
-                      'data-row-key': rowKey === undefined || rowKey === null ? undefined : String(rowKey),
-                      'data-col-name': dataIndex,
-                      onDoubleClick: () => handleVirtualCellActivate(record, dataIndex, dataIndex),
-                  };
-              }
-              return {
-                  record,
-                  editable: col.editable,
-                  dataIndex: col.dataIndex,
-                  title: dataIndex,
-                  handleSave: handleCellSave,
-                  focusCell: openCellEditor,
+              const rowKey = record?.[GONAVI_ROW_KEY];
+              const cellProps: any = {
+                  'data-row-key': rowKey === undefined || rowKey === null ? undefined : String(rowKey),
+                  'data-col-name': dataIndex,
               };
+
+              if (!enableInlineEditableCell) {
+                  cellProps.onDoubleClick = () => handleVirtualCellActivate(record, dataIndex, dataIndex);
+                  cellProps.onContextMenu = (e: React.MouseEvent) => {
+                      e.preventDefault();
+                      e.stopPropagation();
+                      showCellContextMenu(e, record, dataIndex, dataIndex);
+                  };
+              } else {
+                  cellProps.record = record;
+                  cellProps.editable = col.editable;
+                  cellProps.dataIndex = col.dataIndex;
+                  cellProps.title = dataIndex;
+                  cellProps.handleSave = handleCellSave;
+                  cellProps.focusCell = openCellEditor;
+              }
+              return cellProps;
           },
           render: (text: any, record: Item, index: number) => {
               const originalRenderContent = col.render ? (col.render as any)(text, record, index) : text;
@@ -2204,10 +2203,24 @@ const DataGrid: React.FC<DataGridProps> = ({
                       </EditableCell>
                   );
               }
+              if (enableVirtual) {
+                  return (
+                      <div
+                          style={{ margin: -8, padding: '8px 8px 8px 8px' }}
+                          onContextMenu={(e) => {
+                              e.preventDefault();
+                              e.stopPropagation();
+                              showCellContextMenu(e, record, dataIndex, dataIndex);
+                          }}
+                      >
+                          {originalRenderContent}
+                      </div>
+                  );
+              }
               return originalRenderContent;
           }
       };
-  }), [columns, enableInlineEditableCell, enableVirtual, handleCellSave, openCellEditor, handleVirtualCellActivate]);
+  }), [columns, enableInlineEditableCell, enableVirtual, handleCellSave, openCellEditor, handleVirtualCellActivate, showCellContextMenu]);
 
   const handleAddRow = () => {
       const newKey = `new-${Date.now()}`;
@@ -2746,7 +2759,7 @@ const DataGrid: React.FC<DataGridProps> = ({
       handleExportSelected,
       copyToClipboard,
       tableName,
-      enableRowContextMenu: !canModifyData,
+      enableRowContextMenu: false,
       supportsCopyInsert,
   }), [handleCopyCsv, handleCopyInsert, handleCopyJson, handleExportSelected, copyToClipboard, tableName, canModifyData, supportsCopyInsert]);
 
@@ -2764,7 +2777,7 @@ const DataGrid: React.FC<DataGridProps> = ({
   const rowPropsFactory = useCallback((record: any) => ({ record } as any), []);
 
   const totalWidth = columns.reduce((sum, col) => sum + (Number(col.width) || 200), 0) + selectionColumnWidth;
-  const useContextMenuRow = !canModifyData;
+  const useContextMenuRow = false;
   const tableScrollX = useMemo(() => {
       const baseWidth = Math.max(totalWidth, 1000);
       if (!isMacLike || tableViewportWidth <= 0) return baseWidth;
@@ -3756,6 +3769,8 @@ const DataGrid: React.FC<DataGridProps> = ({
                 }}
                 onClick={(e) => e.stopPropagation()}
             >
+                {canModifyData && (
+                    <>
                 <div
                     style={{
                         padding: '8px 12px',
@@ -3789,6 +3804,8 @@ const DataGrid: React.FC<DataGridProps> = ({
                     填充到选中行 ({selectedRowKeys.length})
                 </div>
                 <div style={{ height: 1, background: darkMode ? '#303030' : '#f0f0f0', margin: '4px 0' }} />
+                    </>
+                )}
                 {supportsCopyInsert && (
                     <div
                         style={{
@@ -4021,12 +4038,13 @@ const DataGrid: React.FC<DataGridProps> = ({
                 .${gridId} .ant-table-tbody .ant-table-row.row-added:hover > .ant-table-cell { background-color: ${rowAddedHover} !important; }
                 .${gridId} .ant-table-tbody > tr.row-modified:hover > td,
                 .${gridId} .ant-table-tbody .ant-table-row.row-modified:hover > .ant-table-cell { background-color: ${rowModHover} !important; }
-                .${gridId}.cell-edit-mode .ant-table-tbody > tr > td[data-col-name],
-                .${gridId}.cell-edit-mode .ant-table-tbody .ant-table-row > .ant-table-cell[data-col-name] { user-select: none; -webkit-user-select: none; cursor: crosshair; }
-                .${gridId}.cell-edit-mode .ant-table-tbody > tr > td[data-cell-selected="true"],
-                .${gridId}.cell-edit-mode .ant-table-tbody .ant-table-row > .ant-table-cell[data-cell-selected="true"] {
-                    box-shadow: inset 0 0 0 2px ${selectionAccentHex};
-                    background-image: linear-gradient(${darkMode ? `rgba(${selectionAccentRgb}, 0.20)` : `rgba(${selectionAccentRgb}, 0.08)`}, ${darkMode ? `rgba(${selectionAccentRgb}, 0.20)` : `rgba(${selectionAccentRgb}, 0.08)`});
+                .${gridId} .ant-table-tbody > tr > td[data-col-name],
+                .${gridId} .ant-table-tbody .ant-table-row > .ant-table-cell[data-col-name] { user-select: none; -webkit-user-select: none; cursor: crosshair; }
+                .${gridId} .ant-table-tbody > tr > td[data-cell-selected="true"],
+                .${gridId} .ant-table-tbody .ant-table-row > .ant-table-cell[data-cell-selected="true"],
+                .${gridId} [data-cell-selected="true"] {
+                    box-shadow: inset 0 0 0 2px ${selectionAccentHex} !important;
+                    background-image: linear-gradient(${darkMode ? `rgba(${selectionAccentRgb}, 0.20)` : `rgba(${selectionAccentRgb}, 0.08)`}, ${darkMode ? `rgba(${selectionAccentRgb}, 0.20)` : `rgba(${selectionAccentRgb}, 0.08)`}) !important;
                 }
                 .${gridId} .ant-table-content,
                 .${gridId} .ant-table-body {

frontend/src/utils/sql.ts

@@ -50,6 +50,11 @@ export const quoteIdentPart = (dbType: string, ident: string) => {
     return raw;
   }
 
+  // SQL Server 使用 [bracket] 标识符
+  if (dbTypeLower === 'sqlserver' || dbTypeLower === 'mssql') {
+    return `[${raw.replace(/]/g, ']]')}]`;
+  }
+
   // 其他数据库默认加双引号
   return `"${raw.replace(/"/g, '""')}"`;
 };
@@ -160,7 +165,8 @@ export const buildPaginatedSelectSQL = (
       }
       return `SELECT * FROM (SELECT "__gonavi_page__".*, ROWNUM "__gonavi_rn__" FROM (${orderedSql}) "__gonavi_page__" WHERE ROWNUM <= ${upperBound}) WHERE "__gonavi_rn__" > ${safeOffset}`;
     }
-    case 'sqlserver': {
+    case 'sqlserver':
+    case 'mssql': {
       const effectiveOrderBy = orderBy.trim() ? orderBy : ' ORDER BY (SELECT NULL)';
       return `${base}${effectiveOrderBy} OFFSET ${safeOffset} ROWS FETCH NEXT ${safeLimit} ROWS ONLY`;
     }

internal/db/mongodb_impl.go

@@ -251,6 +251,11 @@ func (m *MongoDB) getURI(config connection.ConnectionConfig) string {
 		params.Set("authMechanism", authMechanism)
 	}
 
+	// 单机模式且未指定副本集名称时，启用 directConnection 避免驱动自动跟随副本集成员发现
+	if strings.TrimSpace(config.Topology) != "replica" && strings.TrimSpace(config.ReplicaSet) == "" && !config.MongoSRV {
+		params.Set("directConnection", "true")
+	}
+
 	if encoded := params.Encode(); encoded != "" {
 		uri += "?" + encoded
 	}

internal/db/mongodb_impl_v1.go

@@ -252,6 +252,11 @@ func (m *MongoDBV1) getURI(config connection.ConnectionConfig) string {
 		params.Set("authMechanism", authMechanism)
 	}
 
+	// 单机模式且未指定副本集名称时，启用 directConnection 避免驱动自动跟随副本集成员发现
+	if strings.TrimSpace(config.Topology) != "replica" && strings.TrimSpace(config.ReplicaSet) == "" && !config.MongoSRV {
+		params.Set("directConnection", "true")
+	}
+
 	if encoded := params.Encode(); encoded != "" {
 		uri += "?" + encoded
 	}