diff --git a/electron/electron.js b/electron/electron.js index d2a303f51..5b2d720fd 100644 --- a/electron/electron.js +++ b/electron/electron.js @@ -343,6 +343,8 @@ function createWebTabWindow(args) { if (utils.isMetaOrControl(input) && input.key.toLowerCase() === 'r') { reloadWebTab(0) event.preventDefault() + } else if (utils.isMetaOrControl(input) && input.shift && input.key.toLowerCase() === 'i') { + devToolsWebTab(0) } }) @@ -424,7 +426,7 @@ function createWebTabWindow(args) { if (utils.isMetaOrControl(input) && input.key.toLowerCase() === 'r') { browserView.webContents.reload() event.preventDefault() - } else if (input.meta && input.shift && input.key.toLowerCase() === 'i') { + } else if (utils.isMetaOrControl(input) && input.shift && input.key.toLowerCase() === 'i') { browserView.webContents.toggleDevTools() } }) @@ -469,6 +471,18 @@ function reloadWebTab(id) { item.view.webContents.reload() } +/** + * 内置浏览器标签打开开发者工具 + * @param id + */ +function devToolsWebTab(id) { + const item = id === 0 ? currentWebTab() : webTabView.find(item => item.id == id) + if (!item) { + return + } + item.view.webContents.toggleDevTools() +} + /** * 调整内置浏览器标签尺寸 * @param id diff --git a/language/original-web.txt b/language/original-web.txt index fa1044860..540e5e255 100644 --- a/language/original-web.txt +++ b/language/original-web.txt @@ -1541,3 +1541,13 @@ License Key 文件(*)已存在,是否替换? 保留两者 替换 + +端到端加密 +关闭端到端加密传输数据。 +等(*)个文件 +你确定要删除【(*)】等2个文件吗? +审批详情 +天前 +月前 +请输入用户名 +是否拨打电话给(*)? diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index c612c108b..6f4dbbc4c 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -99,20 +99,18 @@ export default { handler() { this.$store.dispatch("websocketConnection"); // - if (this.userId > 0) { - if (this.$isEEUiApp) { + if (this.userId > 0 && this.$isEEUiApp) { + $A.eeuiAppSendMessage({ + action: 'intiUmeng', + }); + setTimeout(_ => { $A.eeuiAppSendMessage({ - action: 'intiUmeng', + action: 'setUmengAlias', + userid: this.userId, + token: this.userToken, + url: $A.apiUrl('users/umeng/alias') }); - setTimeout(_ => { - $A.eeuiAppSendMessage({ - action: 'setUmengAlias', - userid: this.userId, - token: this.userToken, - url: $A.apiUrl('users/umeng/alias') - }); - }, 6000) - } + }, 6000) } }, immediate: true diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue index 31785dccc..66e98ae79 100644 --- a/resources/assets/js/pages/manage/file.vue +++ b/resources/assets/js/pages/manage/file.vue @@ -43,7 +43,7 @@