diff --git a/packages/backend/src/core/CustomEmojiService.ts b/packages/backend/src/core/CustomEmojiService.ts index 2d195f3b5b..2a1ee2aede 100644 --- a/packages/backend/src/core/CustomEmojiService.ts +++ b/packages/backend/src/core/CustomEmojiService.ts @@ -464,11 +464,11 @@ export class CustomEmojiService implements OnApplicationShutdown { const q = params.query; if (q.updatedAtFrom) { // noIndexScan - builder.andWhere('emoji.updatedAt >= :updateAtFrom', { updateAtFrom: q.updatedAtFrom }); + builder.andWhere('CAST(emoji.updatedAt AS DATE) >= :updateAtFrom', { updateAtFrom: q.updatedAtFrom }); } if (q.updatedAtTo) { // noIndexScan - builder.andWhere('emoji.updatedAt <= :updateAtTo', { updateAtTo: q.updatedAtTo }); + builder.andWhere('CAST(emoji.updatedAt AS DATE) <= :updateAtTo', { updateAtTo: q.updatedAtTo }); } if (q.name) { multipleWordsToQuery(q.name, builder, (qb, idx, word) => { diff --git a/packages/frontend/src/components/grid/grid-utils.ts b/packages/frontend/src/components/grid/grid-utils.ts index 4a8c840c48..c59908571f 100644 --- a/packages/frontend/src/components/grid/grid-utils.ts +++ b/packages/frontend/src/components/grid/grid-utils.ts @@ -148,7 +148,9 @@ export async function pasteToGridFromClipboard( // 単独文字列の場合は選択範囲全体に同じテキストを貼り付ける const ranges = context.rangedCells; for (const cell of ranges) { - callback(cell.row, cell.column, parseValue(lines[0][0], cell.column.setting)); + if (cell.column.setting.editable) { + callback(cell.row, cell.column, parseValue(lines[0][0], cell.column.setting)); + } } } else { // 表形式文字列の場合は表形式にパースし、選択範囲に合うように貼り付ける @@ -170,7 +172,9 @@ export async function pasteToGridFromClipboard( break; } - callback(rows[row], columns[col], parseValue(items[colIdx], columns[col].setting)); + if (columns[col].setting.editable) { + callback(rows[row], columns[col], parseValue(items[colIdx], columns[col].setting)); + } } } }