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

fix: 已知bug

Browse Source
This commit is contained in:
kuaifan 2023-06-09 11:11:04 +08:00
parent aea2124d61
commit a233c492e6
8 changed files with 65 additions and 12 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": "^6.1.1",
"@electron-forge/maker-zip": "^6.1.1",
"dotenv": "^16.0.3",
"electron": "^25.1.0",
"electron": "^23.3.6",
"electron-builder": "^23.6.0",
"electron-notarize": "^1.2.2",
"form-data": "^4.0.0",

2
language/original-web.txt
View File

@ -1225,3 +1225,5 @@ Markdown 格式发送
内容
添加评论
请输入内容！
支持 Markdown 格式

36
resources/assets/js/components/MDEditor/components/preview/nostyle.vue Normal file
View File

@ -0,0 +1,36 @@
<template>
<div class="markdown-preview-nostyle" v-html="html"></div>
</template>
<script>
import marked from '../../config/marked';
export default {
name: 'markdown-preview-nostyle',
props: {
initialValue: {
type: String,
default: ''
},
},
data() {
return {
html: '',
};
},
mounted() {
this.translateMarkdown();
},
methods: {
translateMarkdown() {
this.html = marked(this.initialValue, {
sanitize: false,
}).replace(/href="/gi, 'target="_blank" href="');
},
},
watch: {
initialValue() {
this.translateMarkdown();
}
}
};
</script>

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

@ -552,6 +552,10 @@ export default {
type: Boolean,
default: false
},
isMessenger: {
type: Boolean,
default: false
},
beforeBack: Function
},
@ -843,10 +847,10 @@ export default {
return null
},
footerStyle() {
const {keyboardType, keyboardHeight, safeAreaBottom, windowScrollY} = this
footerStyle({keyboardType, keyboardHeight, safeAreaBottom, windowScrollY, isMessenger}) {
const style = {};
if (windowScrollY === 0
&& isMessenger
&& keyboardType === "show"
&& keyboardHeight > 0
&& keyboardHeight < 120) {

8
resources/assets/js/pages/manage/components/ProjectPanel.vue
View File

@ -73,7 +73,9 @@
</ul>
</div>
<div class="project-subbox">
<div class="project-subtitle" @click="showDesc">{{projectData.desc}}</div>
<div class="project-subtitle" @click="showDesc">
<MarkdownPreviewNostyle :initialValue="projectData.desc"/>
</div>
<div class="project-switch">
<div v-if="completedCount > 0" class="project-checkbox">
<Checkbox :value="projectData.cacheParameter.completedTask" @on-change="toggleCompleted">{{$L('显示已完成')}}</Checkbox>
@ -331,7 +333,7 @@
<Input ref="projectName" type="text" v-model="settingData.name" :maxlength="32" :placeholder="$L('必填')"></Input>
</FormItem>
<FormItem prop="desc" :label="$L('项目介绍')">
<Input ref="projectDesc" type="textarea" :autosize="{ minRows: 3, maxRows: 5 }" v-model="settingData.desc" :maxlength="255" :placeholder="$L('选填')"></Input>
<Input ref="projectDesc" type="textarea" :autosize="{ minRows: 3, maxRows: 5 }" v-model="settingData.desc" :maxlength="255" :placeholder="`${$L('选填')} (${$L('支持 Markdown 格式')})`"></Input>
</FormItem>
</Form>
<div slot="footer" class="adaption">
@ -472,10 +474,12 @@ import ProjectWorkflow from "./ProjectWorkflow";
import TaskMenu from "./TaskMenu";
import TaskDeleted from "./TaskDeleted";
import ProjectGantt from "./ProjectGantt";
import MarkdownPreviewNostyle from "../../../components/MDEditor/components/preview/nostyle.vue";
export default {
name: "ProjectPanel",
components: {
MarkdownPreviewNostyle,
TaskMenu,
ProjectWorkflow,
DrawerOverlay,

2
resources/assets/js/pages/manage/messenger.vue
View File

@ -177,7 +177,7 @@
<div class="msg-dialog-bg-icon"><Icon type="ios-chatbubbles" /></div>
<div class="msg-dialog-bg-text">{{$L('选择一个会话开始聊天')}}</div>
</div>
<DialogWrapper v-if="windowLandscape && dialogId > 0" :dialogId="dialogId" @on-active="scrollIntoActive" :auto-focus="$A.isDesktop()"/>
<DialogWrapper v-if="windowLandscape && dialogId > 0" :dialogId="dialogId" @on-active="scrollIntoActive" :auto-focus="$A.isDesktop()" is-messenger/>
</div>
</div>
</div>

9
resources/assets/sass/pages/components/project-panel.scss vendored
View File

@ -126,8 +126,10 @@
.project-subtitle {
float: left;
color: $primary-desc-color;
line-height: 24px;
margin: 6px 0;
line-height: 1.5;
margin: 8px 0 7px;
max-height: 220px;
overflow: auto;
}
.project-switch {
float: right;
@ -493,6 +495,9 @@
align-items: center;
overflow: auto;
margin-right: 24px;
&::-webkit-scrollbar {
display: none;
}
> li {
list-style: none;
margin-left: -6px;

10
resources/assets/sass/pages/page-manage.scss vendored
View File

@ -27,6 +27,8 @@
position: sticky;
top: 0;
z-index: 1;
margin: 0 auto;
width: 80%;
background: #F4F5F7;
ul {
flex: 1;
@ -41,8 +43,7 @@
color: #6b6e72;
cursor: pointer;
position: relative;
width: 80%;
max-width: 100%;
width: 100%;
margin: 5px auto;
padding: 0 4%;
border-radius: 4px;
@ -77,7 +78,8 @@
align-items: center;
padding: 12px 0 0;
cursor: default;
width: 100%;
margin: 0 auto;
width: 80%;
> ul {
width: 100%;
> li {
@ -85,7 +87,7 @@
flex-direction: column;
list-style: none;
cursor: pointer;
width: 80%;
width: 100%;
margin: 2px auto;
border: 2px solid transparent;
.project-h1 {