diff --git a/app/Http/Controllers/Api/FileController.php b/app/Http/Controllers/Api/FileController.php index 989648fa9..138b9335e 100755 --- a/app/Http/Controllers/Api/FileController.php +++ b/app/Http/Controllers/Api/FileController.php @@ -480,6 +480,8 @@ class FileController extends AbstractController $only_update_at = Request::input('only_update_at', 'no'); $history_id = intval(Request::input('history_id')); // + Base::checkClientVersion('0.31.75'); + // if (Base::isNumber($id)) { $user = User::auth(); $file = File::permissionFind(intval($id), $user, $down == 'yes' ? 1 : 0); diff --git a/language/original-web.txt b/language/original-web.txt index 3a4d14960..397843d56 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -1251,6 +1251,7 @@ Markdown 格式发送 会议组件加载失败! OKR管理 +OKR结果 OKR结果分析 计划时间冲突提示 忽略并继续 @@ -1418,3 +1419,4 @@ APP推送 移动任务 任务协助人 搜索项目名称 +服务器版本过低,请升级服务器。 diff --git a/resources/assets/js/components/Mobile/Tabbar.vue b/resources/assets/js/components/Mobile/Tabbar.vue index e99af93c1..b0bf174bc 100644 --- a/resources/assets/js/components/Mobile/Tabbar.vue +++ b/resources/assets/js/components/Mobile/Tabbar.vue @@ -105,7 +105,7 @@ export default { } if (this.userIsAdmin) { this.navMore[2].splice(0, 0, {icon: '', name: 'allUser', label: '团队管理'}) - this.navMore[2].push({icon: '', name: 'okrAnalyze', label: 'OKR结果分析'}) + this.navMore[2].push({icon: '', name: 'okrAnalyze', label: 'OKR结果'}) } }, @@ -290,14 +290,14 @@ export default { case 'contacts': location = {name: 'manage-messenger', params: {dialogAction: 'contacts'}}; break; - + case 'okrManage': case 'okrAnalyze': - this.goForward({ - path:'/manage/apps/' + ( path == 'okrManage' ? '/#/list' : '/#/analysis') , + this.goForward({ + path:'/manage/apps/' + ( path == 'okrManage' ? '/#/list' : '/#/analysis') , query: { baseUrl: this.okrUrl - } + } }); return; diff --git a/resources/assets/js/components/OnlyOffice.vue b/resources/assets/js/components/OnlyOffice.vue index f4216c744..0598bf48b 100644 --- a/resources/assets/js/components/OnlyOffice.vue +++ b/resources/assets/js/components/OnlyOffice.vue @@ -163,7 +163,9 @@ export default { } const documentKey = this.documentKey(); if (documentKey && documentKey.then) { - documentKey.then(this.loadFile); + documentKey.then(this.loadFile).catch(({msg})=>{ + $A.modalError({content: msg}); + }); } else { this.loadFile(); } @@ -280,6 +282,14 @@ export default { } // }).catch(({msg}) => { + if( msg.indexOf("404 not found") !== -1 ){ + $A.modalInfo({ + language: false, + title: '版本过低', + content: '服务器版本过低,请升级服务器。', + }) + return; + } $A.modalError({content: msg}); }); }) diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 81278642b..0e520e350 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -48,7 +48,8 @@ v-else-if="item.path === 'team'" transfer transfer-class-name="page-manage-menu-dropdown" - placement="right-start"> + placement="right-start" + class="display-block" >
{{$L(item.name)}} @@ -125,22 +126,22 @@
  • - +
  • - +
  • - +
  • - +
  • diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue index f69c27403..9e3e7ff85 100644 --- a/resources/assets/js/pages/manage/application.vue +++ b/resources/assets/js/pages/manage/application.vue @@ -326,7 +326,7 @@ export default { ]; // 管理员 let adminApplyList = !this.userIsAdmin ? [] : [ - { value: "okrAnalyze", label: "OKR结果分析" }, + { value: "okrAnalyze", label: "OKR结果" }, { value: "ldap", label: "LDAP" }, { value: "mail", label: "邮件" }, { value: "appPush", label: "APP推送" }, diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 73c60451b..e750073e6 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -1212,6 +1212,11 @@ export default { * @param type */ sendMsg(text, type) { + + console.log( this.$refs.scroller.getSizes() ) + + return; + let textBody, textType = "text", silence = "no", @@ -2226,6 +2231,8 @@ export default { this.msgNew = 0; } // + console.log(this.allMsgs) + // this.scrollAction = event.target.scrollTop; this.scrollDirection = this.scrollTmp <= this.scrollAction ? 'down' : 'up'; setTimeout(_ => this.scrollTmp = this.scrollAction, 0); diff --git a/resources/assets/js/pages/manage/components/FileContent.vue b/resources/assets/js/pages/manage/components/FileContent.vue index aa774ff1d..81f9d2d8e 100644 --- a/resources/assets/js/pages/manage/components/FileContent.vue +++ b/resources/assets/js/pages/manage/components/FileContent.vue @@ -599,7 +599,7 @@ export default { }, documentKey() { - return new Promise(resolve => { + return new Promise((resolve,reject) => { this.$store.dispatch("call", { url: 'file/content', data: { @@ -608,8 +608,8 @@ export default { }, }).then(({data}) => { resolve(`${data.id}-${$A.Time(data.update_at)}`) - }).catch(() => { - resolve(0) + }).catch((res) => { + reject(res) }); }) }, diff --git a/resources/assets/js/pages/manage/components/FilePreview.vue b/resources/assets/js/pages/manage/components/FilePreview.vue index 4c07812b8..2d8aa318d 100644 --- a/resources/assets/js/pages/manage/components/FilePreview.vue +++ b/resources/assets/js/pages/manage/components/FilePreview.vue @@ -144,7 +144,7 @@ export default { }, documentKey() { - return new Promise(resolve => { + return new Promise((resolve,reject) => { this.$store.dispatch("call", { url: 'file/content', data: { @@ -153,8 +153,8 @@ export default { }, }).then(({data}) => { resolve(`${data.id}-${$A.Time(data.update_at)}`) - }).catch(() => { - resolve(0) + }).catch((res) => { + reject(res) }); }) }, diff --git a/resources/assets/js/pages/single/fileMsg.vue b/resources/assets/js/pages/single/fileMsg.vue index 4715d5f02..ce0118cf0 100644 --- a/resources/assets/js/pages/single/fileMsg.vue +++ b/resources/assets/js/pages/single/fileMsg.vue @@ -168,7 +168,7 @@ export default { }, documentKey() { - return new Promise(resolve => { + return new Promise((resolve,reject) => { this.$store.dispatch("call", { url: 'dialog/msg/detail', data: { @@ -177,8 +177,8 @@ export default { }, }).then(({data}) => { resolve(`${data.id}-${$A.Time(data.update_at)}`) - }).catch(() => { - resolve(0) + }).catch((res) => { + reject(res) }); }); }, diff --git a/resources/assets/js/pages/single/fileTask.vue b/resources/assets/js/pages/single/fileTask.vue index c3096c2c5..b61272692 100644 --- a/resources/assets/js/pages/single/fileTask.vue +++ b/resources/assets/js/pages/single/fileTask.vue @@ -155,7 +155,7 @@ export default { }); }, documentKey() { - return new Promise(resolve => { + return new Promise((resolve,reject) => { this.$store.dispatch("call", { url: 'project/task/filedetail', data: { @@ -164,8 +164,8 @@ export default { }, }).then(({data}) => { resolve(`${data.id}-${$A.Time(data.update_at)}`) - }).catch(() => { - resolve(0) + }).catch((res) => { + reject(res) }); }) } diff --git a/resources/assets/sass/pages/common.scss b/resources/assets/sass/pages/common.scss index 02011b5e2..86536cf8c 100755 --- a/resources/assets/sass/pages/common.scss +++ b/resources/assets/sass/pages/common.scss @@ -1,6 +1,10 @@ body { overflow: hidden; + .display-block{ + display: block; + } + &.touch-back { .scrollbar-container .scrollbar-content, .dialog-wrapper .vue-recycle-scroller.direction-vertical:not(.page-mode), diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index 9175c4ea4..ea00b32c3 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -730,7 +730,7 @@ } .open-approve-details { - width: 245px; + width: 275px; display: inline-block; max-width: 100%;