forked from mirrors/misskey
Merge branch 'develop'
This commit is contained in:
commit
26b268588f
|
@ -7,6 +7,11 @@
|
||||||
|
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
## 12.93.2 (2021/10/23)
|
||||||
|
|
||||||
|
### Bugfixes
|
||||||
|
- クライアント: ウィジェットを追加できない問題を修正
|
||||||
|
|
||||||
## 12.93.1 (2021/10/23)
|
## 12.93.1 (2021/10/23)
|
||||||
|
|
||||||
### Bugfixes
|
### Bugfixes
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "misskey",
|
"name": "misskey",
|
||||||
"author": "syuilo <syuilotan@yahoo.co.jp>",
|
"author": "syuilo <syuilotan@yahoo.co.jp>",
|
||||||
"version": "12.93.1",
|
"version": "12.93.2",
|
||||||
"codename": "indigo",
|
"codename": "indigo",
|
||||||
"repository": {
|
"repository": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
<template>
|
<template>
|
||||||
<canvas ref="chartEl"></canvas>
|
<div class="cbbedffa">
|
||||||
|
<canvas ref="chartEl"></canvas>
|
||||||
|
<div v-if="fetching" class="fetching">
|
||||||
|
<MkLoading/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
|
@ -622,7 +627,28 @@ export default defineComponent({
|
||||||
|
|
||||||
return {
|
return {
|
||||||
chartEl,
|
chartEl,
|
||||||
|
fetching,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
<style lang="scss" scoped>
|
||||||
|
.cbbedffa {
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
> .fetching {
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
-webkit-backdrop-filter: var(--blur, blur(12px));
|
||||||
|
backdrop-filter: var(--blur, blur(12px));
|
||||||
|
display: flex;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
cursor: wait;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue';
|
import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs, VNode } from 'vue';
|
||||||
import MkButton from '@client/components/ui/button.vue';
|
import MkButton from '@client/components/ui/button.vue';
|
||||||
import * as os from '@client/os';
|
import * as os from '@client/os';
|
||||||
|
|
||||||
|
@ -140,6 +140,16 @@ export default defineComponent({
|
||||||
const menu = [];
|
const menu = [];
|
||||||
let options = context.slots.default();
|
let options = context.slots.default();
|
||||||
|
|
||||||
|
const pushOption = (option: VNode) => {
|
||||||
|
menu.push({
|
||||||
|
text: option.children,
|
||||||
|
active: v.value === option.props.value,
|
||||||
|
action: () => {
|
||||||
|
v.value = option.props.value;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
for (const optionOrOptgroup of options) {
|
for (const optionOrOptgroup of options) {
|
||||||
if (optionOrOptgroup.type === 'optgroup') {
|
if (optionOrOptgroup.type === 'optgroup') {
|
||||||
const optgroup = optionOrOptgroup;
|
const optgroup = optionOrOptgroup;
|
||||||
|
@ -148,23 +158,16 @@ export default defineComponent({
|
||||||
text: optgroup.props.label,
|
text: optgroup.props.label,
|
||||||
});
|
});
|
||||||
for (const option of optgroup.children) {
|
for (const option of optgroup.children) {
|
||||||
menu.push({
|
pushOption(option);
|
||||||
text: option.children,
|
}
|
||||||
active: v.value === option.props.value,
|
} else if (Array.isArray(optionOrOptgroup.children)) { // 何故かフラグメントになってくることがある
|
||||||
action: () => {
|
const fragment = optionOrOptgroup;
|
||||||
v.value = option.props.value;
|
for (const option of fragment.children) {
|
||||||
},
|
pushOption(option);
|
||||||
});
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
const option = optionOrOptgroup;
|
const option = optionOrOptgroup;
|
||||||
menu.push({
|
pushOption(option);
|
||||||
text: option.children,
|
|
||||||
active: v.value === option.props.value,
|
|
||||||
action: () => {
|
|
||||||
v.value = option.props.value;
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue