dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-19 06:06:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Jan Prochazka
2024-08-23 09:20:01 +02:00
parent 9d4803edc7 b27f58be9f
commit 4ea55644c4
6 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/web/src/datagrid/DataGridCore.svelte
View File

@@ -559,7 +559,7 @@
for (const column of display.columns) {
if (column.uniquePath.length > 1) continue;
if (column.autoIncrement) continue;
if (column.columnName == '_id' && isDynamicStructure) continue;
if (column.isClusterKey) continue;
grider.setCellValue(rowIndex, column.uniqueName, grider.getRowData(index)[column.uniqueName]);
}
@@ -959,7 +959,9 @@
export async function mergeSelectionIntoMirror({ fullRows, mergeMode = 'merge' }) {
const file = display.baseTableOrSimilar?.pureName;
const mergeKey = display.baseCollection ? ['_id'] : display.baseTable?.primaryKey.columns.map(x => x.columnName);
const mergeKey = display.baseCollection
? display.baseCollection?.uniqueKey?.map(x => x.columnName)
: display.baseTable?.primaryKey.columns.map(x => x.columnName);
const cells = cellsToRegularCells(selectedCells);
const rowIndexes = _.sortBy(_.uniq(cells.map(x => x[0])));