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

移动端取消Tooltip提示

Browse Source
This commit is contained in:
kuaifan 2022-05-17 13:44:07 +08:00
parent a9c10a3e0b
commit 040f1e8c86
23 changed files with 55 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/assets/js/app.js vendored
View File

@ -109,6 +109,7 @@ Vue.prototype.$Platform = "web";
Vue.prototype.$isMainElectron = false; Vue.prototype.$isMainElectron = false;
Vue.prototype.$isSubElectron = false; Vue.prototype.$isSubElectron = false;
Vue.prototype.$isEEUiApp = isEEUiApp; Vue.prototype.$isEEUiApp = isEEUiApp;
Vue.prototype.$isDesktop = $A.isDesktop();
if (isElectron) { if (isElectron) {
Vue.prototype.$Electron = electron; Vue.prototype.$Electron = electron;
Vue.prototype.$Platform = /macintosh|mac os x/i.test(navigator.userAgent) ? "mac" : "win"; Vue.prototype.$Platform = /macintosh|mac os x/i.test(navigator.userAgent) ? "mac" : "win";
@ -141,6 +142,7 @@ $A.Platform = app.$Platform;
$A.isMainElectron = app.$isMainElectron; $A.isMainElectron = app.$isMainElectron;
$A.isSubElectron = app.$isSubElectron; $A.isSubElectron = app.$isSubElectron;
$A.isEEUiApp = app.$isEEUiApp; $A.isEEUiApp = app.$isEEUiApp;
$A.isDesktop = app.$isDesktop;
$A.execMainDispatch = (action, data) => { $A.execMainDispatch = (action, data) => {
if ($A.isSubElectron) { if ($A.isSubElectron) {
$A.Electron.sendMessage('sendForwardMain', { $A.Electron.sendMessage('sendForwardMain', {

2
resources/assets/js/components/AutoTip.vue
View File

@ -4,7 +4,7 @@
:placement="placement" :placement="placement"
:effect="tooltipTheme" :effect="tooltipTheme"
:delay="delay" :delay="delay"
:disabled="!showTooltip || disabled" :disabled="!$isDesktop || !showTooltip || disabled"
:max-width="tooltipMaxWidth" :max-width="tooltipMaxWidth"
transfer> transfer>
<span ref="content" @mouseenter="handleTooltipIn" class="common-auto-tip" @click="onClick"> <span ref="content" @mouseenter="handleTooltipIn" class="common-auto-tip" @click="onClick">

2
resources/assets/js/components/Loading.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<ETooltip :disabled="content == ''" :content="content"> <ETooltip :disabled="!$isDesktop || content == ''" :content="content">
<svg viewBox="25 25 50 50" class="common-loading"> <svg viewBox="25 25 50 50" class="common-loading">
<circle cx="50" cy="50" r="20" fill="none" stroke-width="5" stroke-miterlimit="10" class="common-path"></circle> <circle cx="50" cy="50" r="20" fill="none" stroke-width="5" stroke-miterlimit="10" class="common-path"></circle>
</svg> </svg>

12
resources/assets/js/components/Minder/minder.vue
View File

@ -1,13 +1,13 @@
<template> <template>
<div class="minder-editor-container"> <div class="minder-editor-container">
<div class="quickbar"> <div class="quickbar">
<ETooltip placement="top" effect="light"> <ETooltip :disabled="!$isDesktop" placement="top" effect="light">
<div><i class="ft icon" :title="$L('缩放')">&#xE7B3;</i></div> <div><i class="ft icon" :title="$L('缩放')">&#xE7B3;</i></div>
<div slot="content" class="minder-editor-slider"> <div slot="content" class="minder-editor-slider">
<Slider v-model="zoom" :min="10" :max="300"></Slider> <Slider v-model="zoom" :min="10" :max="300"></Slider>
</div> </div>
</ETooltip> </ETooltip>
<ETooltip v-if="readOnly!==true" placement="top" effect="light"> <ETooltip v-if="readOnly!==true" :disabled="!$isDesktop" placement="top" effect="light">
<div><i class="ft icon" :title="$L('图形')">&#xE621;</i></div> <div><i class="ft icon" :title="$L('图形')">&#xE621;</i></div>
<div slot="content"> <div slot="content">
<ul class="minder-editor-quickul mold"> <ul class="minder-editor-quickul mold">
@ -20,7 +20,7 @@
</ul> </ul>
</div> </div>
</ETooltip> </ETooltip>
<ETooltip v-if="readOnly!==true" placement="top" effect="light"> <ETooltip v-if="readOnly!==true" :disabled="!$isDesktop" placement="top" effect="light">
<div><i class="ft icon" :title="$L('样式')">&#xE678;</i></div> <div><i class="ft icon" :title="$L('样式')">&#xE678;</i></div>
<div slot="content"> <div slot="content">
<ul class="minder-editor-quickul"> <ul class="minder-editor-quickul">
@ -36,7 +36,7 @@
</ul> </ul>
</div> </div>
</ETooltip> </ETooltip>
<ETooltip placement="top" effect="light"> <ETooltip :disabled="!$isDesktop" placement="top" effect="light">
<div><i class="ft icon" :title="$L('折叠')">&#xE779;</i></div> <div><i class="ft icon" :title="$L('折叠')">&#xE779;</i></div>
<div slot="content"> <div slot="content">
<ul class="minder-editor-quickul"> <ul class="minder-editor-quickul">
@ -49,10 +49,10 @@
</ul> </ul>
</div> </div>
</ETooltip> </ETooltip>
<ETooltip placement="top" :content="$L('居中')"> <ETooltip :disabled="!$isDesktop" placement="top" :content="$L('居中')">
<div @click="minder.execCommand('camera', minder.getRoot(), 600)"><i class="ft icon">&#xE61F;</i></div> <div @click="minder.execCommand('camera', minder.getRoot(), 600)"><i class="ft icon">&#xE61F;</i></div>
</ETooltip> </ETooltip>
<ETooltip placement="top" :content="$L('移动')"> <ETooltip :disabled="!$isDesktop" placement="top" :content="$L('移动')">
<div @click="[minder.execCommand('Hand'),isHand=!isHand]"><i class="ft icon" :class="{active:isHand}">&#xE6CF;</i></div> <div @click="[minder.execCommand('Hand'),isHand=!isHand]"><i class="ft icon" :class="{active:isHand}">&#xE6CF;</i></div>
</ETooltip> </ETooltip>
</div> </div>

6
resources/assets/js/components/RightBottom.vue
View File

@ -84,10 +84,6 @@ export default {
}, },
computed: { computed: {
...mapState([
'isDesktop',
]),
isSoftware() { isSoftware() {
return this.$Electron || this.$isEEUiApp; return this.$Electron || this.$isEEUiApp;
}, },
@ -97,7 +93,7 @@ export default {
}, },
showDown() { showDown() {
return this.isDesktop && ['login', 'index', 'manage-dashboard'].includes(this.$route.name) return this.$isDesktop && ['login', 'index', 'manage-dashboard'].includes(this.$route.name)
} }
}, },

2
resources/assets/js/components/TableAction.vue
View File

@ -12,7 +12,7 @@
v-if="item.hidden !== true" v-if="item.hidden !== true"
placement="top" placement="top"
:key="key" :key="key"
:disabled="!item.title" :disabled="!$isDesktop || !item.title"
:content="item.title" :content="item.title"
:enterable="false" :enterable="false"
:open-delay="600"> :open-delay="600">

2
resources/assets/js/components/UserAvatar.vue
View File

@ -3,7 +3,7 @@
v-if="user" v-if="user"
class="common-avatar" class="common-avatar"
:open-delay="openDelay" :open-delay="openDelay"
:disabled="tooltipDisabled" :disabled="!$isDesktop || tooltipDisabled"
:placement="tooltipPlacement"> :placement="tooltipPlacement">
<div slot="content" class="common-avatar-transfer"> <div slot="content" class="common-avatar-transfer">
<slot/> <slot/>

10
resources/assets/js/pages/manage/components/ChatInput/index.vue
View File

@ -8,16 +8,16 @@
v-model="showEmoji" v-model="showEmoji"
:visibleArrow="false" :visibleArrow="false"
popperClass="chat-input-emoji-popover"> popperClass="chat-input-emoji-popover">
<ETooltip slot="reference" ref="emojiTip" :disabled="showEmoji" placement="top" :content="$L('表情')"> <ETooltip slot="reference" ref="emojiTip" :disabled="!$isDesktop || showEmoji" placement="top" :content="$L('表情')">
<i class="taskfont" @click="onToolbar('emoji')">&#xe7ad;</i> <i class="taskfont" @click="onToolbar('emoji')">&#xe7ad;</i>
</ETooltip> </ETooltip>
<ChatEmoji @on-select="onSelectEmoji"/> <ChatEmoji @on-select="onSelectEmoji"/>
</EPopover> </EPopover>
<ETooltip placement="top" :content="$L('选择会员')"> <ETooltip placement="top" :disabled="!$isDesktop" :content="$L('选择会员')">
<i class="taskfont" @click="onToolbar('user')">&#xe78f;</i> <i class="taskfont" @click="onToolbar('user')">&#xe78f;</i>
</ETooltip> </ETooltip>
<ETooltip placement="top" :content="$L('选择任务')"> <ETooltip placement="top" :disabled="!$isDesktop" :content="$L('选择任务')">
<i class="taskfont" @click="onToolbar('task')">&#xe7d6;</i> <i class="taskfont" @click="onToolbar('task')">&#xe7d6;</i>
</ETooltip> </ETooltip>
@ -25,7 +25,7 @@
v-model="showMore" v-model="showMore"
:visibleArrow="false" :visibleArrow="false"
popperClass="chat-input-more-popover"> popperClass="chat-input-more-popover">
<ETooltip slot="reference" ref="moreTip" :disabled="showMore" placement="top" :content="$L('展开')"> <ETooltip slot="reference" ref="moreTip" :disabled="!$isDesktop || showMore" placement="top" :content="$L('展开')">
<i class="taskfont">&#xe790;</i> <i class="taskfont">&#xe790;</i>
</ETooltip> </ETooltip>
<div class="chat-input-popover-item" @click="onToolbar('image')"> <div class="chat-input-popover-item" @click="onToolbar('image')">
@ -41,7 +41,7 @@
<div class="toolbar-spacing"></div> <div class="toolbar-spacing"></div>
<Loading v-if="loading"/> <Loading v-if="loading"/>
<ETooltip v-else placement="top" :content="$L('发送')"><Icon :class="[value ? '' : 'disabled']" type="md-send" @click="send"/></ETooltip> <ETooltip v-else placement="top" :disabled="!$isDesktop" :content="$L('发送')"><Icon :class="[value ? '' : 'disabled']" type="md-send" @click="send"/></ETooltip>
<slot name="toolbarAfter"/> <slot name="toolbarAfter"/>
</div> </div>

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

@ -42,11 +42,16 @@
</div> </div>
<template v-if="dialogData.type === 'group'"> <template v-if="dialogData.type === 'group'">
<ETooltip v-if="dialogData.group_type === 'user'" placement="top" :openDelay="600" :content="$L('群设置')"> <ETooltip
v-if="dialogData.group_type === 'user'"
placement="top"
:disabled="!$isDesktop"
:openDelay="600"
:content="$L('群设置')">
<i class="taskfont dialog-create" @click="groupInfoShow = true">&#xe6e9;</i> <i class="taskfont dialog-create" @click="groupInfoShow = true">&#xe6e9;</i>
</ETooltip> </ETooltip>
</template> </template>
<ETooltip v-else-if="dialogData.type === 'user'" placement="top" :content="$L('创建群组')"> <ETooltip v-else-if="dialogData.type === 'user'" placement="top" :disabled="!$isDesktop" :content="$L('创建群组')">
<i class="taskfont dialog-create" @click="openCreateGroup">&#xe646;</i> <i class="taskfont dialog-create" @click="openCreateGroup">&#xe646;</i>
</ETooltip> </ETooltip>
</div> </div>
@ -220,7 +225,6 @@ export default {
computed: { computed: {
...mapState([ ...mapState([
'isDesktop',
'userId', 'userId',
'cacheDialogs', 'cacheDialogs',
'dialogMsgs', 'dialogMsgs',

4
resources/assets/js/pages/manage/components/FileContent.vue
View File

@ -56,14 +56,14 @@
</Dropdown> </Dropdown>
<template v-if="!file.only_view"> <template v-if="!file.only_view">
<div class="header-icons"> <div class="header-icons">
<ETooltip :content="$L('文件链接')"> <ETooltip :disabled="!$isDesktop" :content="$L('文件链接')">
<div class="header-icon" @click="handleClick('link')"><i class="taskfont">&#xe785;</i></div> <div class="header-icon" @click="handleClick('link')"><i class="taskfont">&#xe785;</i></div>
</ETooltip> </ETooltip>
<EPopover v-model="historyShow" trigger="click"> <EPopover v-model="historyShow" trigger="click">
<div class="file-content-history"> <div class="file-content-history">
<FileHistory :value="historyShow" :file="file" @on-restore="onRestoreHistory"/> <FileHistory :value="historyShow" :file="file" @on-restore="onRestoreHistory"/>
</div> </div>
<ETooltip slot="reference" ref="historyTip" :disabled="historyShow" :content="$L('历史版本')"> <ETooltip slot="reference" ref="historyTip" :disabled="!$isDesktop || historyShow" :content="$L('历史版本')">
<div class="header-icon"><i class="taskfont">&#xe71d;</i></div> <div class="header-icon"><i class="taskfont">&#xe71d;</i></div>
</ETooltip> </ETooltip>
</EPopover> </EPopover>

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

@ -22,7 +22,7 @@
</li> </li>
<template v-if="!(windowWidth <= 980 || projectData.cacheParameter.chat) && projectUser.length > 0" v-for="item in projectUser"> <template v-if="!(windowWidth <= 980 || projectData.cacheParameter.chat) && projectUser.length > 0" v-for="item in projectUser">
<li v-if="item.userid === -1" class="more"> <li v-if="item.userid === -1" class="more">
<ETooltip :content="$L('共' + (projectData.project_user.length) + '个成员')"> <ETooltip :disabled="!$isDesktop" :content="$L('共' + (projectData.project_user.length) + '个成员')">
<Icon type="ios-more"/> <Icon type="ios-more"/>
</ETooltip> </ETooltip>
</li> </li>
@ -33,7 +33,7 @@
</ul> </ul>
</li> </li>
<li class="project-icon" @click="addTaskOpen(0)"> <li class="project-icon" @click="addTaskOpen(0)">
<ETooltip :content="$L('添加任务')"> <ETooltip :disabled="!$isDesktop" :content="$L('添加任务')">
<Icon class="menu-icon" type="md-add" /> <Icon class="menu-icon" type="md-add" />
</ETooltip> </ETooltip>
</li> </li>
@ -98,7 +98,7 @@
<Draggable <Draggable
:list="columnList" :list="columnList"
:animation="150" :animation="150"
:disabled="sortDisabled || !isDesktop" :disabled="sortDisabled || !$isDesktop"
class="column-list" class="column-list"
tag="ul" tag="ul"
draggable=".column-item" draggable=".column-item"
@ -153,7 +153,7 @@
<Draggable <Draggable
:list="column.tasks" :list="column.tasks"
:animation="150" :animation="150"
:disabled="sortDisabled || !isDesktop" :disabled="sortDisabled || !$isDesktop"
class="task-list" class="task-list"
draggable=".task-draggable" draggable=".task-draggable"
filter=".complete" filter=".complete"
@ -198,6 +198,7 @@
<ETooltip <ETooltip
v-if="item.end_at" v-if="item.end_at"
:class="['task-time', item.today ? 'today' : '', item.overdue ? 'overdue' : '']" :class="['task-time', item.today ? 'today' : '', item.overdue ? 'overdue' : '']"
:disabled="!$isDesktop"
:open-delay="600" :open-delay="600"
:content="item.end_at"> :content="item.end_at">
<div v-if="!item.complete_at"><i class="taskfont">&#xe71d;</i>{{ expiresFormat(item.end_at) }}</div> <div v-if="!item.complete_at"><i class="taskfont">&#xe71d;</i>{{ expiresFormat(item.end_at) }}</div>
@ -538,7 +539,6 @@ export default {
computed: { computed: {
...mapState([ ...mapState([
'isDesktop',
'windowWidth', 'windowWidth',
'userId', 'userId',
@ -850,7 +850,7 @@ export default {
methods: { methods: {
showDesc() { showDesc() {
if (this.isDesktop) { if (this.$isDesktop) {
return; return;
} }
$A.modalInfo({ $A.modalInfo({
@ -1425,7 +1425,7 @@ export default {
if (data === 'completedTask') { if (data === 'completedTask') {
this.$store.dispatch("forgetTaskCompleteTemp", true); this.$store.dispatch("forgetTaskCompleteTemp", true);
} else if (data === 'chat') { } else if (data === 'chat') {
if (!this.isDesktop) { if (!this.$isDesktop) {
this.goForward({name: 'manage-messenger', params: {dialogId: this.projectData.dialog_id}}); this.goForward({name: 'manage-messenger', params: {dialogId: this.projectData.dialog_id}});
return; return;
} }

6
resources/assets/js/pages/manage/components/ProjectWorkflow.vue
View File

@ -67,7 +67,7 @@
<Draggable <Draggable
:list="data.project_flow_item" :list="data.project_flow_item"
:animation="150" :animation="150"
:disabled="!isDesktop" :disabled="!$isDesktop"
class="taskflow-config-table-list-wrapper" class="taskflow-config-table-list-wrapper"
tag="div" tag="div"
draggable=".column-border" draggable=".column-border"
@ -207,10 +207,6 @@ export default {
}, },
computed: {
...mapState(['isDesktop'])
},
watch: { watch: {
projectId: { projectId: {
handler(val) { handler(val) {

4
resources/assets/js/pages/manage/components/ReportEdit.vue
View File

@ -12,13 +12,13 @@
<Radio label="daily" :disabled="id > 0 && reportData.type =='weekly'">{{ $L("日报") }}</Radio> <Radio label="daily" :disabled="id > 0 && reportData.type =='weekly'">{{ $L("日报") }}</Radio>
</RadioGroup> </RadioGroup>
<ButtonGroup v-if="id === 0" class="report-buttongroup"> <ButtonGroup v-if="id === 0" class="report-buttongroup">
<ETooltip :content="prevCycleText" placement="bottom"> <ETooltip :disabled="!$isDesktop" :content="prevCycleText" placement="bottom">
<Button type="primary" @click="prevCycle"> <Button type="primary" @click="prevCycle">
<Icon type="ios-arrow-back" /> <Icon type="ios-arrow-back" />
</Button> </Button>
</ETooltip> </ETooltip>
<div class="report-buttongroup-vertical"></div> <div class="report-buttongroup-vertical"></div>
<ETooltip :disabled="reportData.offset >= 0" :content="nextCycleText" placement="bottom"> <ETooltip :disabled="!$isDesktop || reportData.offset >= 0" :content="nextCycleText" placement="bottom">
<Button type="primary" @click="nextCycle" :disabled="reportData.offset >= 0"> <Button type="primary" @click="nextCycle" :disabled="reportData.offset >= 0">
<Icon type="ios-arrow-forward" /> <Icon type="ios-arrow-forward" />
</Button> </Button>

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

@ -30,7 +30,7 @@
:plugins="taskPlugins" :plugins="taskPlugins"
:options="taskOptions" :options="taskOptions"
:option-full="taskOptionFull" :option-full="taskOptionFull"
:placeholder="$L(isDesktop ? '详细描述，选填...（点击右键使用工具栏）' : '详细描述，选填...')" :placeholder="$L($isDesktop ? '详细描述，选填...（点击右键使用工具栏）' : '详细描述，选填...')"
:placeholderFull="$L('详细描述...')" :placeholderFull="$L('详细描述...')"
inline/> inline/>
</div> </div>
@ -38,7 +38,7 @@
<Button :class="{advanced: advanced}" @click="advanced=!advanced">{{$L('高级选项')}}</Button> <Button :class="{advanced: advanced}" @click="advanced=!advanced">{{$L('高级选项')}}</Button>
<ul class="advanced-priority"> <ul class="advanced-priority">
<li v-for="(item, key) in taskPriority" :key="key"> <li v-for="(item, key) in taskPriority" :key="key">
<ETooltip :content="taskPriorityContent(item)"> <ETooltip :disabled="!$isDesktop" :content="taskPriorityContent(item)">
<i <i
class="taskfont" class="taskfont"
:style="{color:item.color}" :style="{color:item.color}"
@ -86,7 +86,7 @@
:transfer="false"/> :transfer="false"/>
<div v-if="showAddAssist" class="task-add-assist"> <div v-if="showAddAssist" class="task-add-assist">
<Checkbox v-model="addData.add_assist" :true-value="1" :false-value="0">{{$L('加入任务协助人员列表')}}</Checkbox> <Checkbox v-model="addData.add_assist" :true-value="1" :false-value="0">{{$L('加入任务协助人员列表')}}</Checkbox>
<ETooltip :content="$L('你不是任务负责人时建议加入任务协助人员列表')"> <ETooltip :disabled="!$isDesktop" :content="$L('你不是任务负责人时建议加入任务协助人员列表')">
<Icon type="ios-alert-outline" /> <Icon type="ios-alert-outline" />
</ETooltip> </ETooltip>
</div> </div>
@ -232,7 +232,7 @@ export default {
}, },
computed: { computed: {
...mapState(['isDesktop', 'userId', 'cacheProjects', 'projectId', 'cacheColumns', 'taskPriority']), ...mapState(['userId', 'cacheProjects', 'projectId', 'cacheColumns', 'taskPriority']),
taskDays() { taskDays() {
const {times} = this.addData; const {times} = this.addData;

4
resources/assets/js/pages/manage/components/TaskAddSimple.vue
View File

@ -16,7 +16,7 @@
<div v-if="parentId == 0" class="priority"> <div v-if="parentId == 0" class="priority">
<ul> <ul>
<li v-for="(item, key) in taskPriority" :key="key"> <li v-for="(item, key) in taskPriority" :key="key">
<ETooltip v-if="active" :content="taskPriorityContent(item)"> <ETooltip v-if="active" :disabled="!$isDesktop" :content="taskPriorityContent(item)">
<i <i
class="taskfont" class="taskfont"
:style="{color:item.color}" :style="{color:item.color}"
@ -55,7 +55,7 @@
<div class="priority"> <div class="priority">
<ul> <ul>
<li v-for="(item, key) in taskPriority" :key="key"> <li v-for="(item, key) in taskPriority" :key="key">
<ETooltip v-if="active" :content="taskPriorityContent(item)"> <ETooltip v-if="active" :disabled="!$isDesktop" :content="taskPriorityContent(item)">
<i <i
class="taskfont" class="taskfont"
:style="{color:item.color}" :style="{color:item.color}"

2
resources/assets/js/pages/manage/components/TaskDetail.vue
View File

@ -120,7 +120,7 @@
</div> </div>
<Button slot="reference" :loading="ownerLoad > 0" class="pick" type="primary">{{$L('我要领取任务')}}</Button> <Button slot="reference" :loading="ownerLoad > 0" class="pick" type="primary">{{$L('我要领取任务')}}</Button>
</EPopover> </EPopover>
<ETooltip v-if="$Electron" :content="$L('新窗口打开')"> <ETooltip v-if="$Electron" :disabled="!$isDesktop" :content="$L('新窗口打开')">
<i class="taskfont open" @click="openNewWin">&#xe776;</i> <i class="taskfont open" @click="openNewWin">&#xe776;</i>
</ETooltip> </ETooltip>
<div class="menu"> <div class="menu">

1
resources/assets/js/pages/manage/components/TaskRow.vue
View File

@ -86,6 +86,7 @@
<ETooltip <ETooltip
v-if="!item.complete_at && item.end_at" v-if="!item.complete_at && item.end_at"
:class="['task-time', item.today ? 'today' : '', item.overdue ? 'overdue' : '']" :class="['task-time', item.today ? 'today' : '', item.overdue ? 'overdue' : '']"
:disabled="!$isDesktop"
:open-delay="600" :open-delay="600"
:content="item.end_at"> :content="item.end_at">
<div @click="openTask(item)">{{expiresFormat(item.end_at)}}</div> <div @click="openTask(item)">{{expiresFormat(item.end_at)}}</div>

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

@ -66,7 +66,7 @@
<i class="taskfont">&#xe71f;</i> <i class="taskfont">&#xe71f;</i>
<em>{{item.sub_complete}}/{{item.sub_num}}</em> <em>{{item.sub_complete}}/{{item.sub_num}}</em>
</div> </div>
<ETooltip v-if="item.end_at" :content="item.end_at" placement="right"> <ETooltip v-if="item.end_at" :disabled="!$isDesktop" :content="item.end_at" placement="right">
<div :class="['item-icon', item.today ? 'today' : '', item.overdue ? 'overdue' : '']"> <div :class="['item-icon', item.today ? 'today' : '', item.overdue ? 'overdue' : '']">
<i class="taskfont">&#xe71d;</i> <i class="taskfont">&#xe71d;</i>
<em>{{expiresFormat(item.end_at)}}</em> <em>{{expiresFormat(item.end_at)}}</em>

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

@ -159,7 +159,7 @@ export default {
}, },
computed: { computed: {
...mapState(['userId', 'cacheDialogs', 'isDesktop']), ...mapState(['userId', 'cacheDialogs']),
dialogId() { dialogId() {
const {dialogId} = this.$route.params; const {dialogId} = this.$route.params;
@ -313,7 +313,7 @@ export default {
}, },
openContacts(user) { openContacts(user) {
if (this.isDesktop) { if (this.$isDesktop) {
this.tabActive = 'dialog'; this.tabActive = 'dialog';
} }
this.$store.dispatch("openDialogUserid", user.userid).then(({data}) => { this.$store.dispatch("openDialogUserid", user.userid).then(({data}) => {

2
resources/assets/js/pages/manage/setting/components/SystemSetting.vue
View File

@ -52,7 +52,7 @@
<Radio label="close">{{$L('关闭')}}</Radio> <Radio label="close">{{$L('关闭')}}</Radio>
</RadioGroup> </RadioGroup>
<div class="form-tip">{{$L('任务完成后自动归档。')}}</div> <div class="form-tip">{{$L('任务完成后自动归档。')}}</div>
<ETooltip v-if="formDatum.auto_archived=='open'" placement="right"> <ETooltip v-if="formDatum.auto_archived=='open'" placement="right" :disabled="!$isDesktop">
<div class="setting-auto-day"> <div class="setting-auto-day">
<Input v-model="formDatum.archived_day" type="number"> <Input v-model="formDatum.archived_day" type="number">
<span slot="append">{{$L('天')}}</span> <span slot="append">{{$L('天')}}</span>

4
resources/assets/js/pages/manage/setting/components/SystemTaskPriority.vue
View File

@ -4,12 +4,12 @@
<Row class="setting-color"> <Row class="setting-color">
<Col span="12">{{$L('名称')}}</Col> <Col span="12">{{$L('名称')}}</Col>
<Col span="4"> <Col span="4">
<ETooltip :content="$L('数值越小级别越高')" max-width="auto" placement="top" transfer> <ETooltip :disabled="!$isDesktop" :content="$L('数值越小级别越高')" max-width="auto" placement="top" transfer>
<div><Icon class="information" type="ios-information-circle-outline" /> {{$L('级别')}}</div> <div><Icon class="information" type="ios-information-circle-outline" /> {{$L('级别')}}</div>
</ETooltip> </ETooltip>
</Col> </Col>
<Col span="4"> <Col span="4">
<ETooltip :content="$L('任务完成时间')" max-width="auto" placement="top" transfer> <ETooltip :disabled="!$isDesktop" :content="$L('任务完成时间')" max-width="auto" placement="top" transfer>
<div><Icon class="information" type="ios-information-circle-outline" /> {{$L('天数')}}</div> <div><Icon class="information" type="ios-information-circle-outline" /> {{$L('天数')}}</div>
</ETooltip> </ETooltip>
</Col> </Col>

8
resources/assets/js/pages/manage/setting/index.vue
View File

@ -55,7 +55,7 @@ export default {
}, },
computed: { computed: {
...mapState(['userInfo', 'userIsAdmin', 'clientNewVersion', 'isDesktop']), ...mapState(['userInfo', 'userIsAdmin', 'clientNewVersion']),
routeName() { routeName() {
return this.$route.name return this.$route.name
@ -71,7 +71,7 @@ export default {
{path: 'language', name: '语言设置'}, {path: 'language', name: '语言设置'},
{path: 'password', name: '密码设置'}, {path: 'password', name: '密码设置'},
] ]
if (!this.isDesktop) { if (!this.$isDesktop) {
menu.push({path: 'clearCache', name: '清除缓存'}) menu.push({path: 'clearCache', name: '清除缓存'})
} }
if (this.userIsAdmin) { if (this.userIsAdmin) {
@ -103,7 +103,7 @@ export default {
watch: { watch: {
routeName: { routeName: {
handler(name) { handler(name) {
if (name === 'manage-setting' && this.isDesktop) { if (name === 'manage-setting' && this.$isDesktop) {
this.goForward({name: 'manage-setting-personal'}, true); this.goForward({name: 'manage-setting-personal'}, true);
} }
}, },
@ -149,7 +149,7 @@ export default {
classNameRoute(path, divided) { classNameRoute(path, divided) {
return { return {
"active": this.isDesktop && this.routeName === `manage-setting-${path}`, "active": this.$isDesktop && this.routeName === `manage-setting-${path}`,
"divided": !!divided "divided": !!divided
}; };
}, },

3
resources/assets/js/store/state.js vendored
View File

@ -1,7 +1,4 @@
const stateData = { const stateData = {
// 是否桌面端
isDesktop: $A.isDesktop(),
// 浏览器宽高 // 浏览器宽高
windowWidth: window.innerWidth, windowWidth: window.innerWidth,
windowHeight: window.innerHeight, windowHeight: window.innerHeight,