github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-12 03:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
kuaifan 2024-01-08 17:46:34 +08:00
parent 221e42d02b
commit 8080d0bb4e
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electron/package.json
View File

@ -32,7 +32,7 @@
"@electron-forge/maker-squirrel": "^7.2.0", "@electron-forge/maker-squirrel": "^7.2.0",
"@electron-forge/maker-zip": "^7.2.0", "@electron-forge/maker-zip": "^7.2.0",
"dotenv": "^16.3.1", "dotenv": "^16.3.1",
"electron": "^28.1.0", "electron": "^28.1.1",
"electron-builder": "^24.9.1", "electron-builder": "^24.9.1",
"electron-notarize": "^1.2.2", "electron-notarize": "^1.2.2",
"form-data": "^4.0.0", "form-data": "^4.0.0",

17
resources/assets/js/pages/manage/components/DialogWrapper.vue
View File

@ -140,7 +140,7 @@
<div v-if="topShow" class="dialog-top-message" @click="onPosTop"> <div v-if="topShow" class="dialog-top-message" @click="onPosTop">
<div class="dialog-top-message-warp"> <div class="dialog-top-message-warp">
<div class="dialog-top-message-font"> <div class="dialog-top-message-font">
<i class="taskfont">&#xe7e4;</i> <i class="taskfont">&#xe7e6;</i>
</div> </div>
<div class="dialog-top-message-content"> <div class="dialog-top-message-content">
<p class="content"> <p class="content">
@ -318,7 +318,7 @@
<span>{{ $L(operateItem.todo ? '取消待办' : '设待办') }}</span> <span>{{ $L(operateItem.todo ? '取消待办' : '设待办') }}</span>
</li> </li>
<li @click="onOperate('top')"> <li @click="onOperate('top')">
<i class="taskfont" v-html="dialogData.top_msg_id == operateItem.id ? '&#xe7e2;' : '&#xe7e4;'"></i> <i class="taskfont" v-html="dialogData.top_msg_id == operateItem.id ? '&#xe7e3;' : '&#xe7e6;'"></i>
<span>{{ $L(dialogData.top_msg_id == operateItem.id ? '取消置顶' : '置顶') }}</span> <span>{{ $L(dialogData.top_msg_id == operateItem.id ? '取消置顶' : '置顶') }}</span>
</li> </li>
<li v-if="msgType !== ''" @click="onOperate('pos')"> <li v-if="msgType !== ''" @click="onOperate('pos')">
@ -956,20 +956,24 @@ export default {
}); });
}, },
isDefaultSize() {
return this.windowScrollY === 0 && !this.androidKeyboardVisible
},
quickShow() { quickShow() {
return this.quickMsgs.length > 0 && this.windowScrollY === 0 && this.quoteId === 0 return this.quickMsgs.length > 0 && this.isDefaultSize && this.quoteId === 0
}, },
todoShow() { todoShow() {
return this.todoList.length > 0 && this.windowScrollY === 0 && this.quoteId === 0 return this.todoList.length > 0 && this.isDefaultSize && this.quoteId === 0
}, },
tagShow() { tagShow() {
return this.msgTags.length > 1 && this.windowScrollY === 0 && !this.searchShow return this.msgTags.length > 1 && this.isDefaultSize && !this.searchShow
}, },
topShow() { topShow() {
return this.topMsg && this.windowScrollY === 0 && !this.searchShow && this.msgType === '' return this.topMsg && this.isDefaultSize && !this.searchShow && this.msgType === ''
}, },
wrapperClass() { wrapperClass() {
@ -1358,6 +1362,7 @@ export default {
windowHeight() { windowHeight() {
this.androidKeyboardVisible = $A.isAndroid() && $A.eeuiAppKeyboardStatus() this.androidKeyboardVisible = $A.isAndroid() && $A.eeuiAppKeyboardStatus()
requestAnimationFrame(this.$refs.input.updateTools)
}, },
dialogDrag(val) { dialogDrag(val) {

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

@ -521,7 +521,8 @@
.dialog-position { .dialog-position {
position: relative; position: relative;
z-index: 2; z-index: 2;
height: 0; height: 1px; // 不加高度iOS动画无效果
margin-bottom: -1px;
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
@ -2434,11 +2435,11 @@ body.window-portrait {
@keyframes position-in-animation { @keyframes position-in-animation {
from { from {
transform: translate3d(100%, 0, 0);
opacity: 0; opacity: 0;
transform: translateX(100%);
} }
to { to {
transform: translate3d(0%, 0, 0);
opacity: 1; opacity: 1;
transform: translateX(0);
} }
} }

2
resources/mobile

@ -1 +1 @@
Subproject commit 53efe745c063f9bce1cfa9f3a3055a83ca6153c4 Subproject commit c24690c754533852f7ef596c14718bec6edbfcb3