mirror of
https://activitypub.software/TransFem-org/Sharkey.git
synced 2024-12-16 10:11:54 +01:00
a6a91fec3a
* add: safeFloatParserを追加 * fix: 欠けていた型を追加 * refactor: pageBlockTypesをjson-schemaに移植 * refactor: components/global内の型エラーが出ている箇所を修正 * lint: fix null check style * refactor: fix type error * refactor: fix some type errors * fix: 翻訳が抜けていた箇所を修正 * refactor: getJsonSchemaで正しいスキーマが返されるように修正 * fix: MkChartの型エラーとbytesオプションが機能していない問題を修正 * fix(misskey-js): `drive`->`folderUpdated`のpayloadの型が間違っていたのを修正 * refactor: fix some type errors * change: Captcha読み込み中の文言をLoadingに変更 * refactor(backend/misskey-js): MainEventの型を改善 * refactor: chartjs-plugin-gradientが二重でpluginに登録されていたのを修正 * update: misskey-js.api.md * refactor: fix some type errors * fix: backendのtypecheckが落ちていたのを修正 * update: misskey-js.api.md * add: json-schemaのnoteにpollの型定義を追加 * refactor: noteのjson-schemaの型を改善 * refactor: MkPoll * refactor: fix some type errors * change: UserLiteにisLockedを持たせるように * fix: notificationスキーマにroleが含まれていないのを修正 * Revert "change: UserLiteにisLockedを持たせるように" This reverts commit 1bb0c8e7a9b19a4e9f21bf7381712b98f27672a5. * fix: フォロー通知から鍵垢へのフォローを行うと処理中のまま止まってしまう問題を修正 * refactor: noteスキーマのvisibilityにenumを追加 * change: deepCloneのCloneableTypeにundefinedを追加 * refactor: fix some type errors * refactor: `allowEmpty: false`を使用していた箇所を`minLength: 1`に置き換え * enhance: API 'retension' のresponseの型を追加 * fix: Chart関連のtooltipが正しい位置に表示されない問題を修正 * refactor: fix some type errors * fix: 型情報が不足していたのを修正 * enhance: announcementスキーマにenumを追加 * enhance: ロールポリシーの型定義をRoleServiceからjson-schemaに移植 * refactor: policiesを`ref: RolePolicies`に統一 * fix: API `meta` のレスポンスの型にpoliciesが含まれていないのを修正 * refactor: fix some type errors * fix: backendのlintが落ちているのを修正 * fix: MkFoldableSectionの開閉時のanimationが適用されていない問題を修正 * fix: backendのtypecheckが落ちているのを修正 * update: run build-misskey-js-with-types * fix: MkDialogのmount時に文字数制限の判定が行われない問題を修正 * update: CHANGELOG.md * refactor: MkUserSelectDialogの型を改善 * fix: deepCloneでundefinedはcloneしないように (#9207) * change: frontendのcloneをbackend側にも反映 * update: CHANGELOG.md * fix: RoleServiceからPackを通して型RolePoliciesに依存させないように * Update packages/frontend/src/scripts/get-note-summary.ts * revert RoleService.ts changes * change: optional chaining -> non-null assertion * remove: unused import * fix: propsで渡されたuserがUserLiteの場合に意図しない動作になってしまうのを修正 * change: fix null check style * refactor: fix type error * change: fix null check style * Update packages/frontend/src/components/MkDrive.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * refactor: css moduleでglobalを使わないように * refactor: roleのiconUrlは必ず存在するものとして扱うように * enhance: MenuButtonのactiveにcomputedを受け付けられるように * Update packages/frontend/src/components/MkNotePreview.vue * Update MkWindow.vue * refactor: notification.noteは必ず存在するものとして扱うように * Update packages/frontend/src/components/MkNotification.vue Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * fix: MkSignupDialogでdoneのemit時にresを含んでいなかったのを修正 * Update packages/frontend/src/scripts/clone.ts Co-authored-by: syuilo <Syuilotan@yahoo.co.jp> * refactor: 不要な返り値の型を削除 * refactor: 不要なnullチェックを削除 * update: misskey-js-autogen * update: clone.ts * refactor * Update MkNotification.vue * Update MkNotification.vue * ✌️ * Update MkNotification.vue * Update MkNotification.vue * Update MkNotification.vue * Update MkNotifications.vue * Update MkUserSetupDialog.Profile.vue * Update MkUserCardMini.vue * ✌️ * Update MkMenu.vue --------- Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
222 lines
5.4 KiB
Vue
222 lines
5.4 KiB
Vue
<!--
|
|
SPDX-FileCopyrightText: syuilo and other misskey contributors
|
|
SPDX-License-Identifier: AGPL-3.0-only
|
|
-->
|
|
|
|
<template>
|
|
<div class="zmdxowus">
|
|
<p v-if="choices.length < 2" class="caution">
|
|
<i class="ti ti-alert-triangle"></i>{{ i18n.ts._poll.noOnlyOneChoice }}
|
|
</p>
|
|
<ul>
|
|
<li v-for="(choice, i) in choices" :key="i">
|
|
<MkInput class="input" small :modelValue="choice" :placeholder="i18n.tsx._poll.choiceN({ n: i + 1 })" @update:modelValue="onInput(i, $event)">
|
|
</MkInput>
|
|
<button class="_button" @click="remove(i)">
|
|
<i class="ti ti-x"></i>
|
|
</button>
|
|
</li>
|
|
</ul>
|
|
<MkButton v-if="choices.length < 10" class="add" @click="add">{{ i18n.ts.add }}</MkButton>
|
|
<MkButton v-else class="add" disabled>{{ i18n.ts._poll.noMore }}</MkButton>
|
|
<MkSwitch v-model="multiple">{{ i18n.ts._poll.canMultipleVote }}</MkSwitch>
|
|
<section>
|
|
<div>
|
|
<MkSelect v-model="expiration" small>
|
|
<template #label>{{ i18n.ts._poll.expiration }}</template>
|
|
<option value="infinite">{{ i18n.ts._poll.infinite }}</option>
|
|
<option value="at">{{ i18n.ts._poll.at }}</option>
|
|
<option value="after">{{ i18n.ts._poll.after }}</option>
|
|
</MkSelect>
|
|
<section v-if="expiration === 'at'">
|
|
<MkInput v-model="atDate" small type="date" class="input">
|
|
<template #label>{{ i18n.ts._poll.deadlineDate }}</template>
|
|
</MkInput>
|
|
<MkInput v-model="atTime" small type="time" class="input">
|
|
<template #label>{{ i18n.ts._poll.deadlineTime }}</template>
|
|
</MkInput>
|
|
</section>
|
|
<section v-else-if="expiration === 'after'">
|
|
<MkInput v-model="after" small type="number" class="input">
|
|
<template #label>{{ i18n.ts._poll.duration }}</template>
|
|
</MkInput>
|
|
<MkSelect v-model="unit" small>
|
|
<option value="second">{{ i18n.ts._time.second }}</option>
|
|
<option value="minute">{{ i18n.ts._time.minute }}</option>
|
|
<option value="hour">{{ i18n.ts._time.hour }}</option>
|
|
<option value="day">{{ i18n.ts._time.day }}</option>
|
|
</MkSelect>
|
|
</section>
|
|
</div>
|
|
</section>
|
|
</div>
|
|
</template>
|
|
|
|
<script lang="ts" setup>
|
|
import { ref, watch } from 'vue';
|
|
import MkInput from './MkInput.vue';
|
|
import MkSelect from './MkSelect.vue';
|
|
import MkSwitch from './MkSwitch.vue';
|
|
import MkButton from './MkButton.vue';
|
|
import { formatDateTimeString } from '@/scripts/format-time-string.js';
|
|
import { addTime } from '@/scripts/time.js';
|
|
import { i18n } from '@/i18n.js';
|
|
|
|
export type PollEditorModelValue = {
|
|
expiresAt: number | null;
|
|
expiredAfter: number | null;
|
|
choices: string[];
|
|
multiple: boolean;
|
|
};
|
|
|
|
const props = defineProps<{
|
|
modelValue: PollEditorModelValue;
|
|
}>();
|
|
const emit = defineEmits<{
|
|
(ev: 'update:modelValue', v: PollEditorModelValue): void;
|
|
}>();
|
|
|
|
const choices = ref(props.modelValue.choices);
|
|
const multiple = ref(props.modelValue.multiple);
|
|
const expiration = ref('infinite');
|
|
const atDate = ref(formatDateTimeString(addTime(new Date(), 1, 'day'), 'yyyy-MM-dd'));
|
|
const atTime = ref('00:00');
|
|
const after = ref(0);
|
|
const unit = ref('second');
|
|
|
|
if (props.modelValue.expiresAt) {
|
|
expiration.value = 'at';
|
|
const expiresAt = new Date(props.modelValue.expiresAt);
|
|
atDate.value = formatDateTimeString(expiresAt, 'yyyy-MM-dd');
|
|
atTime.value = formatDateTimeString(expiresAt, 'HH:mm');
|
|
} else if (typeof props.modelValue.expiredAfter === 'number') {
|
|
expiration.value = 'after';
|
|
after.value = props.modelValue.expiredAfter / 1000;
|
|
} else {
|
|
expiration.value = 'infinite';
|
|
}
|
|
|
|
function onInput(i, value) {
|
|
choices.value[i] = value;
|
|
}
|
|
|
|
function add() {
|
|
choices.value.push('');
|
|
// TODO
|
|
// nextTick(() => {
|
|
// (this.$refs.choices as any).childNodes[this.choices.length - 1].childNodes[0].focus();
|
|
// });
|
|
}
|
|
|
|
function remove(i) {
|
|
choices.value = choices.value.filter((_, _i) => _i !== i);
|
|
}
|
|
|
|
function get(): PollEditorModelValue {
|
|
const calcAt = () => {
|
|
return new Date(`${atDate.value} ${atTime.value}`).getTime();
|
|
};
|
|
|
|
const calcAfter = () => {
|
|
let base = parseInt(after.value.toString());
|
|
switch (unit.value) {
|
|
// @ts-expect-error fallthrough
|
|
case 'day': base *= 24;
|
|
// @ts-expect-error fallthrough
|
|
case 'hour': base *= 60;
|
|
// @ts-expect-error fallthrough
|
|
case 'minute': base *= 60;
|
|
// eslint-disable-next-line no-fallthrough
|
|
case 'second': return base *= 1000;
|
|
default: return null;
|
|
}
|
|
};
|
|
|
|
return {
|
|
choices: choices.value,
|
|
multiple: multiple.value,
|
|
expiresAt: expiration.value === 'at' ? calcAt() : null,
|
|
expiredAfter: expiration.value === 'after' ? calcAfter() : null,
|
|
};
|
|
}
|
|
|
|
watch([choices, multiple, expiration, atDate, atTime, after, unit], () => emit('update:modelValue', get()), {
|
|
deep: true,
|
|
});
|
|
</script>
|
|
|
|
<style lang="scss" scoped>
|
|
.zmdxowus {
|
|
padding: 8px 16px;
|
|
|
|
> .caution {
|
|
margin: 0 0 8px 0;
|
|
font-size: 0.8em;
|
|
color: #f00;
|
|
|
|
> i {
|
|
margin-right: 4px;
|
|
}
|
|
}
|
|
|
|
> ul {
|
|
display: block;
|
|
margin: 0;
|
|
padding: 0;
|
|
list-style: none;
|
|
|
|
> li {
|
|
display: flex;
|
|
margin: 8px 0;
|
|
padding: 0;
|
|
width: 100%;
|
|
|
|
> .input {
|
|
flex: 1;
|
|
}
|
|
|
|
> button {
|
|
width: 32px;
|
|
padding: 4px 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
> .add {
|
|
margin: 8px 0;
|
|
z-index: 1;
|
|
}
|
|
|
|
> section {
|
|
margin: 16px 0 0 0;
|
|
|
|
> div {
|
|
margin: 0 8px;
|
|
display: flex;
|
|
flex-direction: row;
|
|
flex-wrap: wrap;
|
|
gap: 12px;
|
|
|
|
&:last-child {
|
|
flex: 1 0 auto;
|
|
|
|
> div {
|
|
flex-grow: 1;
|
|
}
|
|
|
|
> section {
|
|
// MAGIC: Prevent div above from growing unless wrapped to its own line
|
|
flex-grow: 9999;
|
|
align-items: end;
|
|
display: flex;
|
|
gap: 4px;
|
|
|
|
> .input {
|
|
flex: 1 1 auto;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
</style>
|