github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-02-28 04:40:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2022-07-19 15:50:25 +08:00
parent 4c6b58cbd5
commit 3fa2814531
3 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/WebSocketDialogMsg.php
View File

@ -307,7 +307,7 @@ class WebSocketDialogMsg extends AbstractModel
public function toggleTodoMsg($sender, $userids = []) public function toggleTodoMsg($sender, $userids = [])
{ {
if (in_array($this->type, ['tag', 'todo', 'notice'])) { if (in_array($this->type, ['tag', 'todo', 'notice'])) {
return Base::retError('此消息不支持社待办'); return Base::retError('此消息不支持设待办');
} }
if ($this->todo && $this->todo != $sender) { if ($this->todo && $this->todo != $sender) {
return Base::retError('仅支持设此待办人员【' . User::userid2nickname($this->todo) . '】取消'); return Base::retError('仅支持设此待办人员【' . User::userid2nickname($this->todo) . '】取消');

22
resources/assets/js/pages/manage/components/DialogModal.vue
View File

@ -4,13 +4,11 @@
:mask="false" :mask="false"
:mask-closable="false" :mask-closable="false"
:footer-hide="true" :footer-hide="true"
:transition-names="['', '']" :transition-names="[transition, '']"
:beforeClose="onBeforeClose" :beforeClose="onBeforeClose"
class-name="dialog-modal" class-name="dialog-modal"
fullscreen> fullscreen>
<transition :name="transition"> <DialogWrapper v-if="windowSmall && dialogId > 0" :dialogId="dialogId" :beforeBack="onBeforeClose"/>
<DialogWrapper v-if="windowSmall && dialogId > 0" :dialogId="dialogId" :beforeBack="onBeforeClose"/>
</transition>
</Modal> </Modal>
</template> </template>
@ -56,7 +54,6 @@ export default {
data() { data() {
return { return {
timer: null, timer: null,
visible: false,
transition: $A.isIos() ? 'mobile-dialog' : '' transition: $A.isIos() ? 'mobile-dialog' : ''
} }
}, },
@ -64,24 +61,11 @@ export default {
computed: { computed: {
...mapState(['dialogId']), ...mapState(['dialogId']),
show() { visible() {
return this.dialogId > 0 && this.windowSmall return this.dialogId > 0 && this.windowSmall
} }
}, },
watch: {
show(v) {
this.timer && clearTimeout(this.timer);
if (v) {
this.visible = true;
} else {
this.timer = setTimeout(_ => {
this.visible = false;
}, 300);
}
}
},
methods: { methods: {
onBeforeClose() { onBeforeClose() {
return new Promise(_ => { return new Promise(_ => {

15
resources/assets/sass/pages/components/dialog-wrapper.scss vendored
View File

@ -1649,3 +1649,18 @@
} }
} }
} }
@media (max-width: 768px) and (min-width: 390px){
.dialog-wrapper-operate {
.operate-action {
width: 376px;
}
.operate-emoji {
width: 376px;
> li {
width: 46px;
}
}
}
}