usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix bugs

This commit is contained in:
samunohito 2024-02-29 07:50:19 +09:00
parent da13426b89
commit 9289d013b6
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/src/core/CustomEmojiService.ts
View File

@ -464,11 +464,11 @@ export class CustomEmojiService implements OnApplicationShutdown {
const q = params.query; const q = params.query;
if (q.updatedAtFrom) { if (q.updatedAtFrom) {
// noIndexScan // noIndexScan
builder.andWhere('emoji.updatedAt >= :updateAtFrom', { updateAtFrom: q.updatedAtFrom }); builder.andWhere('CAST(emoji.updatedAt AS DATE) >= :updateAtFrom', { updateAtFrom: q.updatedAtFrom });
} }
if (q.updatedAtTo) { if (q.updatedAtTo) {
// noIndexScan // noIndexScan
builder.andWhere('emoji.updatedAt <= :updateAtTo', { updateAtTo: q.updatedAtTo }); builder.andWhere('CAST(emoji.updatedAt AS DATE) <= :updateAtTo', { updateAtTo: q.updatedAtTo });
} }
if (q.name) { if (q.name) {
multipleWordsToQuery(q.name, builder, (qb, idx, word) => { multipleWordsToQuery(q.name, builder, (qb, idx, word) => {

4
packages/frontend/src/components/grid/grid-utils.ts
View File

@ -148,8 +148,10 @@ export async function pasteToGridFromClipboard(
// 単独文字列の場合は選択範囲全体に同じテキストを貼り付ける // 単独文字列の場合は選択範囲全体に同じテキストを貼り付ける
const ranges = context.rangedCells; const ranges = context.rangedCells;
for (const cell of ranges) { for (const cell of ranges) {
if (cell.column.setting.editable) {
callback(cell.row, cell.column, parseValue(lines[0][0], cell.column.setting)); callback(cell.row, cell.column, parseValue(lines[0][0], cell.column.setting));
} }
}
} else { } else {
// 表形式文字列の場合は表形式にパースし、選択範囲に合うように貼り付ける // 表形式文字列の場合は表形式にパースし、選択範囲に合うように貼り付ける
const offsetRow = bounds.leftTop.row; const offsetRow = bounds.leftTop.row;
@ -170,10 +172,12 @@ export async function pasteToGridFromClipboard(
break; break;
} }
if (columns[col].setting.editable) {
callback(rows[row], columns[col], parseValue(items[colIdx], columns[col].setting)); callback(rows[row], columns[col], parseValue(items[colIdx], columns[col].setting));
} }
} }
} }
}
} }
/** /**