Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: table cells order on publish (#6064)

Browse Source
This commit is contained in:
Kilu.He 2024-08-25 17:27:44 +08:00 committed by GitHub
parent d1ed45c312
commit 2a2dc903c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 46 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/appflowy_web_app/src/application/services/js-services/cache/index.ts vendored
View File

@ -73,7 +73,7 @@ export async function getPublishViewMeta<
namespace: string;
publishName: string;
},
strategy: StrategyType = StrategyType.CACHE_AND_NETWORK
strategy: StrategyType = StrategyType.CACHE_AND_NETWORK,
) {
const name = `${namespace}_${publishName}`;
const exist = await hasViewMetaCache(name);
@ -133,7 +133,7 @@ export async function getPublishView<
namespace: string;
publishName: string;
},
strategy: StrategyType = StrategyType.CACHE_AND_NETWORK
strategy: StrategyType = StrategyType.CACHE_AND_NETWORK,
) {
const name = `${namespace}_${publishName}`;
const doc = await openCollabDB(name);
@ -211,7 +211,7 @@ export async function revalidatePublishViewMeta<
visible_view_ids: dbView?.visible_view_ids ?? [],
database_relations: dbView?.database_relations ?? {},
},
name
name,
);
return db.view_metas.get(name);
@ -237,7 +237,7 @@ export async function revalidatePublishView<
visible_view_ids: visibleViewIds,
database_relations: relations,
},
name
name,
);
if (rows) {
@ -260,8 +260,6 @@ export async function revalidatePublishView<
}
}
console.log('====', data);
applyYDoc(collab, data);
}

6
frontend/appflowy_web_app/src/application/slate-yjs/utils/convert.ts
View File

@ -10,7 +10,9 @@ import {
BlockData,
BlockType,
} from '@/application/collab.type';
import { sortTableCells } from '@/application/slate-yjs/utils/table';
import { BlockJson } from '@/application/slate-yjs/utils/types';
import { TableCellNode } from '@/components/editor/editor.type';
import { Element, Text } from 'slate';
export function yDataToSlateContent ({
@ -38,7 +40,11 @@ export function yDataToSlateContent({
const slateNode = blockToSlateNode(block);
if (slateNode.type === BlockType.TableBlock) {
slateNode.children = sortTableCells(children as TableCellNode[]);
} else {
slateNode.children = children;
}
if (slateNode.type === BlockType.Page) {
return slateNode;

16
frontend/appflowy_web_app/src/application/slate-yjs/utils/table.ts Normal file
View File

@ -0,0 +1,16 @@
import { TableCellNode } from '@/components/editor/editor.type';
import { isUndefined } from 'lodash-es';
export function sortTableCells (cells: TableCellNode[]): TableCellNode[] {
return cells.sort((a, b) => {
if (isUndefined(a.data.colPosition) || isUndefined(a.data.rowPosition) || isUndefined(b.data.colPosition) || isUndefined(b.data.rowPosition)) {
return 0;
}
if (a.data.colPosition === b.data.colPosition) {
return a.data.rowPosition - b.data.rowPosition;
}
return a.data.colPosition - b.data.colPosition;
});
}

5
frontend/appflowy_web_app/src/components/editor/components/blocks/table/TableCell.tsx
View File

@ -13,16 +13,17 @@ const TableCell = memo(
ref={ref}
{...attributes}
style={{
fontSize: '15px',
...attributes.style,
backgroundColor:
rowBackgroundColor || colBackgroundColor ? renderColor(colBackgroundColor || rowBackgroundColor) : undefined,
}}
className={`relative table-cell text-left ${className || ''}`}
className={`relative px-1 table-cell text-left ${className || ''}`}
>
{children}
</div>
);
})
}),
);
export default TableCell;