mirror of
https://github.com/kuaifan/dootask.git
synced 2025-12-12 19:35:50 +00:00
fix: 已知bug
This commit is contained in:
parent
aea2124d61
commit
a233c492e6
@ -32,7 +32,7 @@
|
|||||||
"@electron-forge/maker-squirrel": "^6.1.1",
|
"@electron-forge/maker-squirrel": "^6.1.1",
|
||||||
"@electron-forge/maker-zip": "^6.1.1",
|
"@electron-forge/maker-zip": "^6.1.1",
|
||||||
"dotenv": "^16.0.3",
|
"dotenv": "^16.0.3",
|
||||||
"electron": "^25.1.0",
|
"electron": "^23.3.6",
|
||||||
"electron-builder": "^23.6.0",
|
"electron-builder": "^23.6.0",
|
||||||
"electron-notarize": "^1.2.2",
|
"electron-notarize": "^1.2.2",
|
||||||
"form-data": "^4.0.0",
|
"form-data": "^4.0.0",
|
||||||
|
|||||||
@ -1225,3 +1225,5 @@ Markdown 格式发送
|
|||||||
内容
|
内容
|
||||||
添加评论
|
添加评论
|
||||||
请输入内容!
|
请输入内容!
|
||||||
|
|
||||||
|
支持 Markdown 格式
|
||||||
|
|||||||
@ -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>
|
||||||
@ -552,6 +552,10 @@ export default {
|
|||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
},
|
},
|
||||||
|
isMessenger: {
|
||||||
|
type: Boolean,
|
||||||
|
default: false
|
||||||
|
},
|
||||||
beforeBack: Function
|
beforeBack: Function
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -843,10 +847,10 @@ export default {
|
|||||||
return null
|
return null
|
||||||
},
|
},
|
||||||
|
|
||||||
footerStyle() {
|
footerStyle({keyboardType, keyboardHeight, safeAreaBottom, windowScrollY, isMessenger}) {
|
||||||
const {keyboardType, keyboardHeight, safeAreaBottom, windowScrollY} = this
|
|
||||||
const style = {};
|
const style = {};
|
||||||
if (windowScrollY === 0
|
if (windowScrollY === 0
|
||||||
|
&& isMessenger
|
||||||
&& keyboardType === "show"
|
&& keyboardType === "show"
|
||||||
&& keyboardHeight > 0
|
&& keyboardHeight > 0
|
||||||
&& keyboardHeight < 120) {
|
&& keyboardHeight < 120) {
|
||||||
|
|||||||
@ -73,7 +73,9 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="project-subbox">
|
<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 class="project-switch">
|
||||||
<div v-if="completedCount > 0" class="project-checkbox">
|
<div v-if="completedCount > 0" class="project-checkbox">
|
||||||
<Checkbox :value="projectData.cacheParameter.completedTask" @on-change="toggleCompleted">{{$L('显示已完成')}}</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>
|
<Input ref="projectName" type="text" v-model="settingData.name" :maxlength="32" :placeholder="$L('必填')"></Input>
|
||||||
</FormItem>
|
</FormItem>
|
||||||
<FormItem prop="desc" :label="$L('项目介绍')">
|
<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>
|
</FormItem>
|
||||||
</Form>
|
</Form>
|
||||||
<div slot="footer" class="adaption">
|
<div slot="footer" class="adaption">
|
||||||
@ -472,10 +474,12 @@ import ProjectWorkflow from "./ProjectWorkflow";
|
|||||||
import TaskMenu from "./TaskMenu";
|
import TaskMenu from "./TaskMenu";
|
||||||
import TaskDeleted from "./TaskDeleted";
|
import TaskDeleted from "./TaskDeleted";
|
||||||
import ProjectGantt from "./ProjectGantt";
|
import ProjectGantt from "./ProjectGantt";
|
||||||
|
import MarkdownPreviewNostyle from "../../../components/MDEditor/components/preview/nostyle.vue";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "ProjectPanel",
|
name: "ProjectPanel",
|
||||||
components: {
|
components: {
|
||||||
|
MarkdownPreviewNostyle,
|
||||||
TaskMenu,
|
TaskMenu,
|
||||||
ProjectWorkflow,
|
ProjectWorkflow,
|
||||||
DrawerOverlay,
|
DrawerOverlay,
|
||||||
|
|||||||
@ -177,7 +177,7 @@
|
|||||||
<div class="msg-dialog-bg-icon"><Icon type="ios-chatbubbles" /></div>
|
<div class="msg-dialog-bg-icon"><Icon type="ios-chatbubbles" /></div>
|
||||||
<div class="msg-dialog-bg-text">{{$L('选择一个会话开始聊天')}}</div>
|
<div class="msg-dialog-bg-text">{{$L('选择一个会话开始聊天')}}</div>
|
||||||
</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>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -126,8 +126,10 @@
|
|||||||
.project-subtitle {
|
.project-subtitle {
|
||||||
float: left;
|
float: left;
|
||||||
color: $primary-desc-color;
|
color: $primary-desc-color;
|
||||||
line-height: 24px;
|
line-height: 1.5;
|
||||||
margin: 6px 0;
|
margin: 8px 0 7px;
|
||||||
|
max-height: 220px;
|
||||||
|
overflow: auto;
|
||||||
}
|
}
|
||||||
.project-switch {
|
.project-switch {
|
||||||
float: right;
|
float: right;
|
||||||
@ -493,6 +495,9 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
margin-right: 24px;
|
margin-right: 24px;
|
||||||
|
&::-webkit-scrollbar {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
> li {
|
> li {
|
||||||
list-style: none;
|
list-style: none;
|
||||||
margin-left: -6px;
|
margin-left: -6px;
|
||||||
|
|||||||
10
resources/assets/sass/pages/page-manage.scss
vendored
10
resources/assets/sass/pages/page-manage.scss
vendored
@ -27,6 +27,8 @@
|
|||||||
position: sticky;
|
position: sticky;
|
||||||
top: 0;
|
top: 0;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
|
margin: 0 auto;
|
||||||
|
width: 80%;
|
||||||
background: #F4F5F7;
|
background: #F4F5F7;
|
||||||
ul {
|
ul {
|
||||||
flex: 1;
|
flex: 1;
|
||||||
@ -41,8 +43,7 @@
|
|||||||
color: #6b6e72;
|
color: #6b6e72;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
position: relative;
|
position: relative;
|
||||||
width: 80%;
|
width: 100%;
|
||||||
max-width: 100%;
|
|
||||||
margin: 5px auto;
|
margin: 5px auto;
|
||||||
padding: 0 4%;
|
padding: 0 4%;
|
||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
@ -77,7 +78,8 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
padding: 12px 0 0;
|
padding: 12px 0 0;
|
||||||
cursor: default;
|
cursor: default;
|
||||||
width: 100%;
|
margin: 0 auto;
|
||||||
|
width: 80%;
|
||||||
> ul {
|
> ul {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
> li {
|
> li {
|
||||||
@ -85,7 +87,7 @@
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
list-style: none;
|
list-style: none;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
width: 80%;
|
width: 100%;
|
||||||
margin: 2px auto;
|
margin: 2px auto;
|
||||||
border: 2px solid transparent;
|
border: 2px solid transparent;
|
||||||
.project-h1 {
|
.project-h1 {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user