Ver código fonte

工作链偶尔点击无反应bug修复 新建项目阻塞bug修复

dev-version-manage
kim131 4 anos atrás
pai
commit
6b2d190bc6
4 arquivos alterados com 77 adições e 69 exclusões
  1. +50
    -46
      src/components/app-header/app-header.vue
  2. +5
    -1
      src/components/app-header/components/nav.vue
  3. +8
    -12
      src/views/components_web/project/newProj.vue
  4. +14
    -10
      src/views/main_web/workspace/components/workLine.vue

+ 50
- 46
src/components/app-header/app-header.vue Ver arquivo

@@ -1,55 +1,59 @@
<template>
<div class="app-header" :class="{ white: theme === 'white' || isWindowScrollIng , black: theme === 'black', 'black-bg-color': isWindowScrollIng && theme === 'black' }">
<div class="app-header-top" v-if="isClient">
<div class="top-left" :class="{'hide-state': true}">
<div class="dot"></div>
<div class="state" :class="{'white-color': theme === 'white', black: theme === 'black'}">在线</div>
</div>
<div class="top-center"></div>
<div class="top-right">
<div class="min"
@click.stop="shrinkBrowserWindow"
>
<img src="/static/img/operate-window/缩小.svg" alt="" class="min-icon vert-hori-center "/>
</div>
<div class="my-max"
@click.stop="judgeIsMaxBrowserWindow"
>
<img v-if="isMaxWindowNow" src="/static/img/operate-window/小窗口化.svg" alt="" class="to-max-icon vert-hori-center ">
<img v-else src="/static/img/operate-window/放大.svg" alt="" class="to-max-icon vert-hori-center ">
</div>
<div class="close"
@mouseenter="isCloseHover = true"
@mouseleave="isCloseHover = false"
@click.stop="closeBrowserWindow"
>
<img v-show="!isCloseHover" src="/static/img/operate-window/关闭.svg" alt="" class="close-icon vert-hori-center "/>
<img v-show="isCloseHover" src="/static/img/operate-window/关闭激活.svg" alt="" class="close-icon vert-hori-center "/>
</div>
</div>
<div class="app-header"
:class="{ white: theme === 'white' || isWindowScrollIng ,
black: theme === 'black',
'black-bg-color': isWindowScrollIng && theme === 'black' }"
>
<div class="app-header-top" v-if="isClient">
<div class="top-left" :class="{'hide-state': true}">
<div class="dot"></div>
<div class="state" :class="{'white-color': theme === 'white', black: theme === 'black'}">在线</div>
</div>
<div v-if="(isWorkspaceTopBar && !isClient) || (isShowTopBar && !isClient)" class="app-header-top"></div>
<div class="app-header-content" :class="{'adjust-content-pos': isWorkspaceTopBar && !isClient}">
<div class="app-header-content-left">
<slot name="left">
<i class="yiyun_icon app-header-back-btn no-drag" :class="{ icon_topback_left: theme === 'white' || theme === 'basis', icon_topback_left_baise: theme === 'black' }" @click="navBack()" v-show="showBackBtn" />
<span class="back_title no-drag" @click="navBack()" v-show="backBtnTitle">{{backBtnTitle}}</span>
</slot>
<div class="top-center"></div>
<div class="top-right">
<div class="min"
@click.stop="shrinkBrowserWindow"
>
<img src="/static/img/operate-window/缩小.svg" alt="" class="min-icon vert-hori-center "/>
</div>
<div class="app-header-center">
<div class="no-drag"><slot name="center">{{title}}</slot></div>
<div class="my-max"
@click.stop="judgeIsMaxBrowserWindow"
>
<img v-if="isMaxWindowNow" src="/static/img/operate-window/小窗口化.svg" alt="" class="to-max-icon vert-hori-center ">
<img v-else src="/static/img/operate-window/放大.svg" alt="" class="to-max-icon vert-hori-center ">
</div>
<div class="app-header-content-right no-drag">
<slot name="right"></slot>
<!-- <span @click="toRecycle" v-if="showUserCenter">
<i
class="Cicon icon font_family icon-icon_huishouzhan"
:class="{inRecycle:isInRecycle}"
/>
</span> -->
<user-center v-if="showUserCenter" />
<div class="close"
@mouseenter="isCloseHover = true"
@mouseleave="isCloseHover = false"
@click.stop="closeBrowserWindow"
>
<img v-show="!isCloseHover" src="/static/img/operate-window/关闭.svg" alt="" class="close-icon vert-hori-center "/>
<img v-show="isCloseHover" src="/static/img/operate-window/关闭激活.svg" alt="" class="close-icon vert-hori-center "/>
</div>
</div>
</div>
<div v-if="(isWorkspaceTopBar && !isClient) || (isShowTopBar && !isClient)" class="app-header-top"></div>
<div class="app-header-content" :class="{'adjust-content-pos': isWorkspaceTopBar && !isClient}">
<div class="app-header-content-left">
<slot name="left">
<i class="yiyun_icon app-header-back-btn no-drag" :class="{ icon_topback_left: theme === 'white' || theme === 'basis', icon_topback_left_baise: theme === 'black' }" @click="navBack()" v-show="showBackBtn" />
<span class="back_title no-drag" @click="navBack()" v-show="backBtnTitle">{{backBtnTitle}}</span>
</slot>
</div>
<div class="app-header-center">
<slot name="center">{{title}}</slot>
</div>
<div class="app-header-content-right no-drag">
<slot name="right"></slot>
<!-- <span @click="toRecycle" v-if="showUserCenter">
<i
class="Cicon icon font_family icon-icon_huishouzhan"
:class="{inRecycle:isInRecycle}"
/>
</span> -->
<user-center v-if="showUserCenter" />
</div>
</div>
</div>
</template>



+ 5
- 1
src/components/app-header/components/nav.vue Ver arquivo

@@ -1,7 +1,7 @@
<template>
<div class="app-nav">
<div
class="app-nav-item"
class="app-nav-item no-drag"
v-for="navItem in list"
:key="navItem.key"
:class="{ 'app-nav-item-active': currentKey.indexOf(navItem.key) === 0 }"
@@ -45,4 +45,8 @@ export default {
border-bottom: 2px solid #8C00FF;
}
}

.no-drag {
-webkit-app-region: no-drag;
}
</style>

+ 8
- 12
src/views/components_web/project/newProj.vue Ver arquivo

@@ -17,7 +17,7 @@
<div class="newProj_title">
输入项目名称
</div>
<div type="primary" class="nextbtn" @click="enterTemplateSelect()">下一步</div>
<div type="primary" class="nextbtn" @click.stop="enterTemplateSelect()">下一步</div>
</div>
<div class="newProj_content">
<div class="upload_img">
@@ -29,7 +29,7 @@
>
<span>编辑</span>
</file-uploader>
<span class="faceBtn" @click="setSystemCoverRandom">使用随机封面</span>
<span class="faceBtn" @click.stop="setSystemCoverRandom">使用随机封面</span>
</div>
</div>
<div>
@@ -48,10 +48,10 @@
ref="projdesc"
:class="{'header-bottom-shadow': isProjDescScroll}"
>
<div class="slot_btn" slot="right" @click="enterTemplateImprove()">选定模板</div>
<div class="slot_btn" slot="right" @click.stop="enterTemplateImprove()">选定模板</div>
</TopHeader>
<div class="template_select_content">
<div class="template_info" v-for="(item,index) in templateList" :key="item.Id" @click="isChecked(index,item)">
<div class="template_info" v-for="(item,index) in templateList" :key="item.Id" @click.stop="isChecked(index,item)">
<div class="check_box" :class="{checked:checkedIndex == index}"><i class="el-icon-check"></i></div>
<span class="template_info_name">{{item.TempName}}</span>
</div>
@@ -67,7 +67,7 @@
:onBackBtnClick="enterTemplateSelect"
title="完善模板信息"
>
<div type="primary" class="slot_btn" slot="right" @click="createProject()">创建</div>
<div type="primary" class="slot_btn" slot="right" @click.stop="createProject()">创建</div>
</TopHeader>
<div class="template_improve_content" >
<div class="template_improve_info">
@@ -175,8 +175,7 @@ export default {
this.$notify({
message: "请输入项目名称。",
type: ["warning"],
offset: 100,
duration: 2500
});
return;
}
@@ -185,8 +184,7 @@ export default {
this.$notify({
message: "项目名称请不要包含'/' '\\'等字符。",
type: ["warning"],
offset: 100,
duration: 2500
});
return;
}
@@ -194,10 +192,8 @@ export default {
this.$notify({
message: "项目名称不得超出35个字符。",
type: "warning",
offset: 100,
duration: 2500
});
return;
return;
}
this.isProjName = false;
this.isTemSelect = true;


+ 14
- 10
src/views/main_web/workspace/components/workLine.vue Ver arquivo

@@ -218,28 +218,28 @@
</div>
</div> -->
<div class="worklinkBtngroup use-flex2 set-transition" :style="setTranslate" :class="{'height-0': isHideWorkFolders}">
<div class="worklinkBtngroup use-flex2 set-transition no-drag" :style="setTranslate" :class="{'height-0': isHideWorkFolders}">
<div class="has-prev-node" v-if="nowFolderIndex > 2 && isCalcuteExchangeNode"></div>
<template v-for="(currFolder, index) in listUserFolders">
<template v-for="(currFolder, index) in listUserFolders" class="">
<button ref="nowFolderEl"
type="button"
v-if="
!isShowworklink
"
:class="{'nowfolder-wrap yiyuntitle nowFolderName': index == nowFolderIndex,
'yiyuntitle sectitle': index !== nowFolderIndex,
'hide-folder': Math.abs(index - nowFolderIndex) > 2}"
:key="index"
@click="nowFolderClick(index)"
>
<div :class="{'now-folder-text': index === nowFolderIndex, 'other-folder-text': index !== nowFolderIndex }"
class="use-ellipsis">{{ currFolder.folderName }}</div>
<div class="jump-icon-wrap">
<img v-if="index == nowFolderIndex" @click.stop="showWorklinkPage"
class="jump-icon"
src="/static/img/下拉箭头.svg"/>
</div>
<div :class="{'now-folder-text': index === nowFolderIndex, 'other-folder-text': index !== nowFolderIndex }"
class="use-ellipsis">{{ currFolder.folderName }}
</div>
<div class="jump-icon-wrap">
<img v-if="index == nowFolderIndex" @click.stop="showWorklinkPage"
class="jump-icon"
src="/static/img/下拉箭头.svg"/>
</div>
</button>
</template>
<div class="has-next-node" v-if="totalNodeNum - nowFolderIndex > 2 && isCalcuteExchangeNode && totalNodeNum > 5 "></div>
@@ -609,4 +609,8 @@ export default {
.height-0 {
height: 0;
}

.no-drag {
-webkit-app-region: no-drag;
}
</style>

Carregando…
Cancelar
Salvar