opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' into 5797-cb-integrate-uikit-checkbox-to-cloudbeaver

Browse Source
This commit is contained in:
sergeyteleshev
2025-06-04 16:32:14 +02:00
committed by GitHub
parent 144ed5da00 419f8b562e
commit 7b8e265f7b
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+2 -2
View File
@@ -57,5 +57,5 @@ You can see a live demo of CloudBeaver here: https://demo.cloudbeaver.io
As a community-driven open-source project, we warmly welcome contributions through GitHub pull requests.
[We are happy to reward](https://dbeaver.com/help-dbeaver/) our most active contributors every major sprint.
The most significant contribution to our code for the major release 24.3.0 was made by:
1. [cashlifei](https://github.com/cashlifei)
The most significant contribution to our code for the major release 25.1.0 was made by:
1. [0xhanh](https://github.com/0xhanh) - for Vietnamese localization.
deploy/docker/cloudbeaver-ce/Dockerfile
-3
View File
@@ -5,9 +5,6 @@ MAINTAINER DBeaver Corp, devops@dbeaver.com
ENV DBEAVER_GID=8978
ENV DBEAVER_UID=8978
RUN apt-get update && \
apt-get upgrade -y
RUN groupadd -g $DBEAVER_GID dbeaver && \
useradd -g $DBEAVER_GID -m -u $DBEAVER_UID -s /bin/bash dbeaver
webapp/packages/plugin-data-spreadsheet-new/src/DataGrid/DataGridTable.tsx
+13 -5
View File
@@ -80,7 +80,6 @@ export const DataGridTable = observer<IDataPresentationProps>(function DataGridT
const selectionAction = (model.source as unknown as ResultSetDataSource).getAction(resultIndex, ResultSetSelectAction);
const viewAction = (model.source as unknown as ResultSetDataSource).getAction(resultIndex, ResultSetViewAction);
const constraintsAction = (model.source as unknown as ResultSetDataSource).tryGetAction(resultIndex, DatabaseDataConstraintAction);
const tableData = useTableData(model as unknown as IDatabaseDataModel<ResultSetDataSource>, resultIndex, dataGridDivRef);
const gridSelectionContext = useGridSelectionContext(tableData, selectionAction);
@@ -339,6 +338,10 @@ export const DataGridTable = observer<IDataPresentationProps>(function DataGridT
);
function getColumnSortable(colIdx: number) {
if (!isResultSetDataModel(model)) {
return false;
}
const constraintsAction = (model.source as unknown as ResultSetDataSource).tryGetAction(resultIndex, DatabaseDataConstraintAction);
return (
Boolean(tableData.getColumn(colIdx) && constraintsAction?.supported && isResultSetDataModel(model) && !model.isDisabled(resultIndex)) &&
colIdx !== 0
@@ -348,12 +351,16 @@ export const DataGridTable = observer<IDataPresentationProps>(function DataGridT
const columnSortable = useCreateGridReactiveValue(
getColumnSortable,
(onValueChange, colIdx) => reaction(() => getColumnSortable(colIdx), onValueChange),
[tableData, constraintsAction, model],
[tableData, model],
);
function getColumnSortingState(colIdx: number) {
if (!isResultSetDataModel(model)) {
return null;
}
const constraintsAction = (model.source as unknown as ResultSetDataSource).tryGetAction(resultIndex, DatabaseDataConstraintAction);
const column = tableData.getColumn(colIdx)?.key;
if (!column || !constraintsAction) {
if (!column || !constraintsAction?.supported) {
return null;
}
const resultColumn = tableData.getColumnInfo(column);
@@ -363,18 +370,19 @@ export const DataGridTable = observer<IDataPresentationProps>(function DataGridT
const columnSortingState = useCreateGridReactiveValue(
getColumnSortingState,
(onValueChange, colIdx) => reaction(() => getColumnSortingState(colIdx), onValueChange),
[tableData, constraintsAction, model],
[tableData, model],
);
function handleSort(colIdx: number, order: 'asc' | 'desc' | null, isMultiple: boolean) {
const column = tableData.getColumn(colIdx)?.key;
if (!column || !constraintsAction) {
if (!column) {
return;
}
const resultColumn = tableData.getColumnInfo(column);
if (!resultColumn) {
return;
}
const constraintsAction = (model.source as unknown as ResultSetDataSource).tryGetAction(resultIndex, DatabaseDataConstraintAction);
const currentOrder = constraintsAction!.getOrder(resultColumn.position);
const nextOrder = getNextOrder(currentOrder);
model.request(() => {