From 13e752ed9def3031e1069cccbc274bcfa1e2f4d7 Mon Sep 17 00:00:00 2001 From: kim131 <1035828775@qq.com> Date: Tue, 12 Jan 2021 15:35:38 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8FUI=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E6=A3=80=E6=9F=A5=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/css/main.css | 14 +---- .../img/operate-window/小窗口化.svg | 9 +++ public/static/img/搜索激活.svg | 7 +++ src/components/app-header/app-header.vue | 7 ++- .../app-header/components/user_center.vue | 15 ++--- src/components/search-bar/search-bar.vue | 55 +++++++++++++++++-- src/services/system.js | 16 +++--- src/views/main_web/index/index.vue | 26 ++++++--- .../main_web/workspace/workspace.new.vue | 14 +++-- 9 files changed, 110 insertions(+), 53 deletions(-) create mode 100644 public/static/img/operate-window/小窗口化.svg create mode 100644 public/static/img/搜索激活.svg diff --git a/public/static/css/main.css b/public/static/css/main.css index 631b7442..06db3151 100644 --- a/public/static/css/main.css +++ b/public/static/css/main.css @@ -4114,8 +4114,9 @@ button:focus { z-index: 9; } .Cicon{ - font-size: 28px; - line-height: 30px; + /* font-size: 28px; */ + font-size: 32px; + line-height: 32px; color: #A7A8B7; transition: ease all 0.5s; cursor: pointer; @@ -9066,15 +9067,6 @@ h5.dulilabel{ .border-box { box-sizing: border-box; } - - /* 搜索功能 搜索入口 */ - .search-entry { - position: relative; - width: 26px; - height: 26px; - background: url('/static/img/搜索.svg') center/100%; - cursor: pointer; - } /* 文件左上角图标 */ .green-icon, .gray-icon , .blue-icon { diff --git a/public/static/img/operate-window/小窗口化.svg b/public/static/img/operate-window/小窗口化.svg new file mode 100644 index 00000000..52fbc949 --- /dev/null +++ b/public/static/img/operate-window/小窗口化.svg @@ -0,0 +1,9 @@ + + + 小窗口化 + + + + + + \ No newline at end of file diff --git a/public/static/img/搜索激活.svg b/public/static/img/搜索激活.svg new file mode 100644 index 00000000..7fcd856e --- /dev/null +++ b/public/static/img/搜索激活.svg @@ -0,0 +1,7 @@ + + + 符号/基础/搜索 + + + + \ No newline at end of file diff --git a/src/components/app-header/app-header.vue b/src/components/app-header/app-header.vue index 4842b9ff..9f2b11cc 100644 --- a/src/components/app-header/app-header.vue +++ b/src/components/app-header/app-header.vue @@ -15,7 +15,8 @@
- + +
span, > div { - margin-left: 10px; + margin-left: 8px; } } &-left { diff --git a/src/components/app-header/components/user_center.vue b/src/components/app-header/components/user_center.vue index 7fe2319c..80e02317 100644 --- a/src/components/app-header/components/user_center.vue +++ b/src/components/app-header/components/user_center.vue @@ -187,9 +187,9 @@ > 版本V2.1.0.4 - +
  • + 检查更新 +
    • @@ -1969,13 +1969,6 @@ export default { display: flex; align-items: center; } -.dot { - display: inline-block; - width: 8px; - height: 8px; - border-radius: 50%; - background-color: gold; - margin: 0 0 0 10px; - } + \ No newline at end of file diff --git a/src/components/search-bar/search-bar.vue b/src/components/search-bar/search-bar.vue index d35348da..3f0064b5 100644 --- a/src/components/search-bar/search-bar.vue +++ b/src/components/search-bar/search-bar.vue @@ -1,9 +1,19 @@ @@ -12,6 +22,8 @@ data() { return { searchContent: '', + isSearchHover: false, + isShowSearchBar: false, } }, props: { @@ -42,17 +54,40 @@ this.$emit('goToSearch'); }, hideSearchBar() { + this.isShowSearchBar = false; this.$emit('hideSearchBar'); }, + showSearchBar() { + this.searchContent = ""; + this.isShowSearchBar = true; + this.$emit('showSearchBar'); + } } } \ No newline at end of file diff --git a/src/services/system.js b/src/services/system.js index 6d944d06..b3273590 100644 --- a/src/services/system.js +++ b/src/services/system.js @@ -97,14 +97,14 @@ const system = { updates.send(flag); }) updates.on('message', (e) => { - if(e.data === '-1') { - Vue.prototype.$notify({ - message:`检查更新出现错误, 请稍后重试。`, - type:['error'], - }) - errorHandler(e); - return; - } + // if(e.data === '-1') { + // Vue.prototype.$notify({ + // message:`检查更新出现错误, 请稍后重试。`, + // type:['error'], + // }) + // errorHandler(e); + // return; + // } }) }), // 客户端文件打开方式 diff --git a/src/views/main_web/index/index.vue b/src/views/main_web/index/index.vue index ef2e225b..e5506c5c 100644 --- a/src/views/main_web/index/index.vue +++ b/src/views/main_web/index/index.vue @@ -24,14 +24,19 @@ {{currentPlatform.orgName}} @@ -87,7 +87,7 @@ @dragstart.native="onfileDragStart(file, $event)" draggable /> -
    搜索不到与“{{searchContent}}”相关的文件
    +
    搜索不到与“{{searchContent}}”相关的协作文件
    @@ -635,7 +635,7 @@ export default { exchangeNodeListsInCoop: [],//存储与当前节点具有交换关系的节点列表 reverseLocalFileHashMap: {},//键名是 ipfscid 键值是localFileHashMap的键名 - currentBtnIndex: -1,//0 是工作文件按钮 1是协作文件按钮 + currentBtnIndex: 0,//0 是工作文件按钮 1是协作文件按钮 titleList: ['工作文件', '协作文件'], isShowSearchBar: false,//控制搜索框显示隐藏 searchContent: '',//搜索的文件名称 @@ -728,6 +728,10 @@ export default { hideSearchBar() { this.isShowSearchBar = false; this.searchContent = ''; + this.currentBtnIndex = 0; + }, + showSearchBar() { + this.isShowSearchBar = true; }, searchForFile: debounce(async function() { const rg = /^\s*$/;