this.setState({items: getPaletteItems(e.target.value)}) }
onKeyDown={this._onKeyDown}
diff --git a/app/commands/commandBindings/editor.js b/app/commands/commandBindings/editor.js
index 8460aae1..1a75ebe4 100644
--- a/app/commands/commandBindings/editor.js
+++ b/app/commands/commandBindings/editor.js
@@ -22,4 +22,3 @@ export default {
Pane.split(4, 'row')
}
}
-
diff --git a/app/commands/commandBindings/file.js b/app/commands/commandBindings/file.js
index 2543a271..887b8c0f 100644
--- a/app/commands/commandBindings/file.js
+++ b/app/commands/commandBindings/file.js
@@ -2,14 +2,19 @@ import mobxStore from '../../mobxStore'
import { path as pathUtil } from '../../utils'
import api from '../../backendAPI'
import * as Modal from '../../components/Modal/actions'
+import uniqueId from 'lodash/uniqueId'
import TabStore from 'components/Tab/store'
-import FileState from 'commons/File/state'
+import TabState from 'components/Tab/state'
+import FileState, { extState } from 'commons/File/state'
import FileStore from 'commons/File/store'
-import { notify } from '../../components/Notification/actions'
+import notification from '../../components/Notification'
import i18n from 'utils/createI18n'
import icons from 'file-icons-js'
+import config from 'config'
import { toJS, when } from 'mobx'
import emitter, { FILE_HIGHLIGHT } from 'utils/emitter'
+import qs from 'qs'
+import mime from 'mime-types'
const nodeToNearestDirPath = (node) => {
if (!node) node = { isDir: true, path: '/' } // fake a root node if !node
@@ -24,48 +29,149 @@ const nodeToNearestDirPath = (node) => {
const nodeToParentDirPath = (node) => {
const pathSplitted = node.path.split('/')
- if (pathSplitted.pop() == '') { pathSplitted.pop() }
+ if (pathSplitted.pop() == '') {
+ pathSplitted.pop()
+ }
return `${pathSplitted.join('/')}/`
}
function createFolderAtPath (path) {
- return api.createFolder(path)
- .then((data) => {
- if (data.code < 0) {
- Modal.updateModal({ statusMessage: data.msg }).then(createFolderAtPath)
- } else {
- Modal.dismissModal()
- }
- })
- .then(() => path)
- // if error, try again.
- .catch(err =>
- Modal.updateModal({ statusMessage: err.msg }).then(createFolderAtPath)
+ return (
+ api
+ .createFolder(path)
+ .then((data) => {
+ if (data.code < 0) {
+ Modal.updateModal({ statusMessage: data.msg }).then(createFolderAtPath)
+ } else {
+ Modal.dismissModal()
+ }
+ })
+ .then(() => path)
+ // if error, try again.
+ .catch(err => Modal.updateModal({ statusMessage: err.msg }).then(createFolderAtPath))
)
}
-
-export function openFile (obj, callback) {
- if (!obj.path) return
- // 做一些encoding的调度
- if (FileState.initData.get('_init')) {
- when(() => !FileState.initData.get('_init'), () => {
- const { encoding } = FileState.initData.get(obj.path) || {}
- openFileWithEncoding({ ...obj, encoding, callback })
- FileState.initData.set(obj.path, {})
+const getMIME = (path) => {
+ let contentType = mime.lookup(path)
+ if (contentType) {
+ const exts = ['php', 'javascript']
+ exts.map((ext) => {
+ if (contentType.includes(ext)) {
+ contentType = contentType.replace('application', 'text')
+ }
})
} else {
- const { encoding } = FileState.initData.get(obj.path) || {}
- openFileWithEncoding({ ...obj, encoding, callback })
- FileState.initData.set(obj.path, {})
+ contentType = 'text/plain'
}
+
+ return contentType
+}
+
+const openUrlFile = (files) => {
+ // open file depends on url
+
+ let fileArr = []
+ if (files) {
+ fileArr = files.split(',')
+
+ const baseOpen = (i) => {
+ if (i < fileArr.length) {
+ let path = fileArr[i]
+ if (!path.startsWith('/')) {
+ path = `/${path}`
+ }
+ openFile(
+ {
+ path,
+ contentType: getMIME(path)
+ },
+ () => {
+ i++
+ baseOpen(i)
+ }
+ )
+ }
+ }
+
+ baseOpen(0)
+ }
+}
+
+export function initOpenFile (tabs, tabGroups) {
+ when(
+ () => !FileState.initData.get('_init'),
+ () => {
+ const openedTabs = Object.values(TabState.tabs._data)
+ tabs = tabs.filter((tab) => {
+ let flag = true
+ for (let i = 0, n = openedTabs.length; i < n; i++) {
+ const cc = openedTabs[i]
+ const path = cc.value.file ? cc.value.file.path : ''
+ if (tab.path === path) {
+ flag = false
+ }
+ }
+ if (flag) {
+ return tab
+ }
+ })
+
+ tabs.map((tabValue) => {
+ const { path, editor, contentType, ...others } = tabValue
+ FileStore.loadNodeData({ ...tabValue, isEditorLoading: true })
+ TabStore.createTab({
+ icon: icons.getClassWithColor(path.split('/').pop()) || 'fa fa-file-text-o',
+ contentType,
+ editor: {
+ ...editor,
+ filePath: path
+ },
+ ...others
+ })
+ const { encoding } = FileState.initData.get(path) || {}
+ api.readFile(path, encoding).then((data) => {
+ FileStore.loadNodeData({ ...data, isEditorLoading: false })
+ FileState.initData.set(path, {})
+ })
+ })
+
+ const files = qs.parse(window.location.search.slice(1)).open
+ if (files) {
+ openUrlFile(files)
+ return
+ }
+
+ tabGroups.forEach((tabGroupsValue) => {
+ const activeTabId = tabGroupsValue.activeTabId
+ if (activeTabId) {
+ const index = tabs.findIndex(tab => tab.id === activeTabId)
+ if (index >= 0) {
+ const { path, contentType } = tabs[index]
+ openFile({
+ path,
+ contentType
+ })
+ }
+ }
+ })
+ }
+ )
}
-export function openFileWithEncoding ({ path, editor = {}, others = {}, allGroup = false, encoding, callback }) {
+export function openFile (obj, callback) {
+ const { path, contentType, editor = {}, others = {}, allGroup = false } = obj
+ if (!path) return
+ const { encoding } = FileState.initData.get(path) || {}
const { encoding: currentEncoding } = FileStore.get(path) || {}
- return api.readFile(path, encoding || currentEncoding)
+ return api
+ .readFile(path, encoding || currentEncoding)
.then((data) => {
FileStore.loadNodeData(data)
+ FileState.initData.set(path, {})
+ for (const listener of extState.didOpenListeners) {
+ listener(FileState.entities.get(path))
+ }
return data
})
.then(() => {
@@ -78,35 +184,59 @@ export function openFileWithEncoding ({ path, editor = {}, others = {}, allGroup
if (editor.gitBlame) {
existingTab.editor.gitBlame = editor.gitBlame
}
+ if (editor.selection) {
+ const { startLineNumber, startColumn } = editor.selection
+
+ const pos = {
+ lineNumber: startLineNumber,
+ column: startColumn
+ }
+
+ setTimeout(() => {
+ existingTab.editorInfo.monacoEditor.setSelection(editor.selection)
+ existingTab.editorInfo.monacoEditor.revealPositionInCenter(pos, 1)
+ existingTab.editorInfo.monacoEditor.focus()
+ }, 0)
+ }
+
+ if (editor.debug) {
+ existingTab.editorInfo.debug = true
+ existingTab.editorInfo.line = editor.line
+ existingTab.editorInfo.stoppedReason = editor.stoppedReason
+ existingTab.editorInfo.setDebugDeltaDecorations()
+ }
existingTab.activate()
- if (callback) callback()
+ if (callback) callback(existingTab.id)
} else {
+ const tabId = uniqueId('tab_')
TabStore.createTab({
icon: icons.getClassWithColor(path.split('/').pop()) || 'fa fa-file-text-o',
+ contentType,
editor: {
...editor,
- filePath: path,
+ filePath: path
},
+ id: tabId,
...others
})
if (callback) {
- callback()
+ callback(tabId)
}
}
})
-}
-
-function createTab ({ icon, type }) {
- TabStore.createTab({
- icon,
- type,
- })
+ .catch((e) => {
+ if (callback) {
+ callback(null)
+ }
+ })
}
function createFileWithContent (content) {
return function createFileAtPath (path) {
+ path = path.startsWith('/') ? path : `/${path}`
if (content) {
- return api.createFile(path, content)
+ return api
+ .createFile(path, content)
.then((res) => {
if (res.msg) {
throw new Error(res.msg)
@@ -123,41 +253,51 @@ function createFileWithContent (content) {
TabStore.updateTab({
icon: (path && icons.getClassWithColor(path.split('/').pop())) || 'fa fa-file-text-o',
id: activeTab.id,
- editor: { filePath: path },
+ editor: { filePath: path }
})
})
})
.catch((res) => {
- Modal.updateModal({ statusMessage: res.response ? res.response.data.msg : res.message }).then(createFileAtPath)
+ Modal.updateModal({
+ statusMessage: res.response ? res.response.data.msg : res.message
+ }).then(createFileAtPath)
})
}
- return api.createFile(path, content)
- .then((res) => {
- if (res.msg) {
- throw new Error(res.msg)
- } else {
- Modal.dismissModal()
- }
- })
- .then(() => {
- openFile({ path })
- })
- // if error, try again.
- .catch((res) => {
- Modal.updateModal({ statusMessage: res.response ? res.response.data.msg : res.message }).then(createFileAtPath)
- })
+ return (
+ api
+ .createFile(path, content)
+ .then((res) => {
+ if (res.msg) {
+ throw new Error(res.msg)
+ } else {
+ Modal.dismissModal()
+ return res
+ }
+ })
+ .then((res) => {
+ openFile({ path, contentType: res.contentType })
+ })
+ // if error, try again.
+ .catch((res) => {
+ Modal.updateModal({
+ statusMessage: res.response ? res.response.data.msg : res.message
+ }).then(createFileAtPath)
+ })
+ )
}
}
const fileCommands = {
- 'file:open_file': (c) => { // 在当前 tabgroup 中优先打开已有的 tab
+ 'file:open_file': (c) => {
+ // 在当前 tabgroup 中优先打开已有的 tab
if (typeof c.data === 'string') {
openFile({ path: c.data })
} else {
openFile(c.data)
}
},
- 'file:open_exist_file': (c) => { // 在所有 tabgroup 中优先打开已有的 tab
+ 'file:open_exist_file': (c) => {
+ // 在所有 tabgroup 中优先打开已有的 tab
if (typeof c.data === 'string') {
openFile({ path: c.data, allGroup: true })
} else {
@@ -165,7 +305,6 @@ const fileCommands = {
}
},
'file:highlight_line': (c) => {
- console.log('file:highlight_line', c)
const { path, lineNumber } = c.data
openFile({ path, allGroup: true }, () => {
emitter.emit(FILE_HIGHLIGHT, c.data)
@@ -182,8 +321,7 @@ const fileCommands = {
message: i18n`file.newFilePath`,
defaultValue,
selectionRange: [path.length, defaultValue.length]
- })
- .then(createFile)
+ }).then(createFile)
},
'file:new_folder': (c) => {
const node = c.context
@@ -192,14 +330,13 @@ const fileCommands = {
Modal.showModal('Prompt', {
message: i18n`file.newFileFolderPath`,
defaultValue,
- selectionRange: [path.length, defaultValue.length],
+ selectionRange: [path.length, defaultValue.length]
}).then(createFolderAtPath)
},
'file:save': (c) => {
const { EditorTabState } = mobxStore
const activeTab = EditorTabState.activeTab
- const content = activeTab ? activeTab.editor.cm.getValue() : ''
-
+ const content = activeTab.editorInfo.monacoEditor.getValue()
if (!activeTab.file) {
const createFile = createFileWithContent(content)
const defaultPath = activeTab._title ? `/${activeTab._title}` : '/untitled'
@@ -207,38 +344,50 @@ const fileCommands = {
message: i18n`file.newFilePath`,
defaultValue: defaultPath,
selectionRange: [1, defaultPath.length]
- })
- .then(createFile)
+ }).then(createFile)
} else {
- api.writeFile(activeTab.file.path, content)
- .then((res) => {
- FileStore.updateFile({
- path: activeTab.file.path,
- isSynced: true,
- lastModified: res.lastModified,
- // content,
- })
+ api.writeFile(activeTab.file.path, content).then((res) => {
+ FileStore.updateFile({
+ path: activeTab.file.path,
+ isSynced: true,
+ lastModified: res.lastModified
+ // content,
})
+ })
}
},
-
+ 'file:save_monaco': (context) => {
+ const { data } = context
+ const { EditorTabState } = mobxStore
+ const activeTab = EditorTabState.activeTab
+ if (activeTab.file) {
+ api.writeFile(activeTab.file.path, data).then((res) => {
+ FileStore.updateFile({
+ path: activeTab.file.path,
+ isSynced: true,
+ lastModified: res.lastModified
+ // content,
+ })
+ })
+ }
+ },
'file:rename': (c) => {
const node = c.context
const oldPath = node.path
const parentPath = nodeToParentDirPath(node)
- const existingTabs = TabStore.findTab(
- tab => tab.file && tab.file.path.startsWith(oldPath)
- )
+ const existingTabs = TabStore.findTab(tab => tab.file && tab.file.path.startsWith(oldPath))
const moveFile = (from, to, force) => {
- api.moveFile(from, to, force)
+ api
+ .moveFile(from, to, force)
.then(() => Modal.dismissModal())
.catch(err =>
Modal.updateModal({ statusMessage: err.msg }).then((_to, _force) =>
moveFile(from, _to, _force)
)
- ).then(() => {
+ )
+ .then(() => {
if (existingTabs.length) {
existingTabs.forEach((tab) => {
const newPath = tab.file.path.replace(from, to)
@@ -258,7 +407,6 @@ const fileCommands = {
}).then(newPath => moveFile(oldPath, newPath))
},
-
'file:delete': async (c) => {
const confirmed = await Modal.showModal('Confirm', {
header: i18n`file.deleteHeader`,
@@ -267,10 +415,17 @@ const fileCommands = {
})
if (confirmed) {
- api.deleteFile(c.context.path)
- .then(() => notify({ message: i18n`file.deleteNotifySuccess` }))
+ api
+ .deleteFile(c.context.path)
+ .then(() =>
+ notification.success({
+ description: i18n`file.deleteNotifySuccess`
+ })
+ )
.catch(err =>
- notify({ message: i18n`file.deleteNotifyFailed${err.msg}` })
+ notification.error({
+ description: i18n`file.deleteNotifyFailed${err.msg}`
+ })
)
}
@@ -284,20 +439,93 @@ const fileCommands = {
// 'file:unsaved_files_list':
'file:open_welcome': (c) => {
// const activeTabGroup = TabStore.getState().activeTabGroup
- const existingTabs = TabStore.findTab(
- tab => tab.type === 'welcome'
- )
+ const existingTabs = TabStore.findTab(tab => tab.type === 'welcome')
if (existingTabs.length) {
const existingTab = existingTabs[0]
existingTab.activate()
} else {
TabStore.createTab({
- icon: 'fa fa-info-circle',
+ icon: 'fa fa-smile-o',
type: 'welcome',
- title: 'Welcome',
+ title: 'Welcome'
+ })
+ }
+ },
+ 'file:open_changelog': () => {
+ const existingTabs = TabStore.findTab(tab => tab.type === 'changelog')
+ if (existingTabs.length) {
+ const existingTab = existingTabs[0]
+ existingTab.activate()
+ } else {
+ TabStore.createTab({
+ type: 'changelog',
+ title: 'Changelog'
})
}
},
+ 'file:open_about': () => {
+ Modal.showModal({ type: 'About', position: 'center' })
+ },
+
+ 'file:add_ignore': (c) => {
+ const ignorePath = '/.gitignore'
+ const ignoreExists = FileStore.get(ignorePath)
+
+ const { isDir, path } = c.context
+ const patchTxt = isDir ? `${path}/` : path
+
+ if (ignoreExists) {
+ api.readFile(ignorePath).then((ignoreFile) => {
+ const ignoreContent = ignoreFile.content
+ !ignoreContent.split('\n').some(item => patchTxt.startsWith(item))
+ ? api
+ .writeFile(
+ ignorePath,
+ ignoreFile.content ? `${ignoreFile.content}\n${patchTxt}` : patchTxt
+ )
+ .then((res) => {
+ FileStore.updateFile({
+ path: ignorePath,
+ isSynced: true,
+ lastModified: res.lastModified
+ })
+ notification.success({
+ description: i18n`file.updateIgnoreSuccess`
+ })
+ openFile({ path: ignorePath })
+ })
+ .catch((err) => {
+ notification.error({
+ description: i18n`file.updateIgnoreFailed${{ err: err.msg }}`
+ })
+ })
+ : notification.error({
+ description: i18n`file.updateIgnoreTip${{ path }}`
+ })
+ })
+ } else {
+ api
+ .createFile(ignorePath, patchTxt)
+ .then((res) => {
+ if (res.msg) {
+ throw new Error(res.msg)
+ }
+ })
+ .then(() => api.writeFile(ignorePath, patchTxt))
+ .then(() => {
+ notification.success({
+ description: i18n`file.updateIgnoreSuccess`
+ })
+ openFile({ path: ignorePath })
+ })
+ .catch((err) => {
+ notification.error({
+ description: i18n`file.updateIgnoreFailed${{ err: err.msg }}`
+ })
+
+ })
+ }
+ }
}
export default fileCommands
diff --git a/app/commands/commandBindings/git.js b/app/commands/commandBindings/git.js
index d201c0a7..889076b4 100644
--- a/app/commands/commandBindings/git.js
+++ b/app/commands/commandBindings/git.js
@@ -2,84 +2,82 @@ import store, { dispatch as $d } from '../../store'
import api from '../../backendAPI'
import * as Git from '../../components/Git/actions'
import * as Modal from '../../components/Modal/actions'
+import notification from 'components/Notification'
+import config from 'config'
export default {
+ 'git:remote': () => {
+ Modal.showModal({ type: 'ResetRemote' })
+ },
+ 'git:initialize': () => {
+ api.gitInit().then((data) => {
+ notification.success({
+ description: data.msg
+ })
+ })
+ },
'git:commit': (c) => {
- api.gitStatus().then(({ files, clean }) => {
- $d(Git.updateStatus({ files, isClean: clean }))
- }).then(() =>
- Modal.showModal('GitCommit', 'HelloYo')
- )
+ api
+ .gitStatus()
+ .then(({ files, clean }) => {
+ $d(Git.updateStatus({ files, isClean: clean }))
+ })
+ .then(() => {
+ Modal.showModal('GitCommitView')
+ })
},
'git:pull': c => $d(Git.pull()),
'git:push': c => $d(Git.push()),
- 'git:delete_branch': c => $d(Git.gitDeleteBranch(c).then(
- () => { $d(Git.getBranches()) }
- )),
+ 'git:delete_branch': c =>
+ $d(
+ Git.gitDeleteBranch(c).then(() => {
+ $d(Git.getBranches())
+ })
+ ),
'git:resolve_conflicts': (c) => {
- api.gitStatus().then(({ files, clean }) => {
- files = _.filter(files, file => file.status == 'CONFLICTION')
- $d(Git.updateStatus({ files, isClean: clean }))
- }).then(() =>
- Modal.showModal('GitResolveConflicts')
- )
+ api
+ .gitStatus()
+ .then(({ files, clean }) => {
+ files = _.filter(files, file => file.status == 'CONFLICTION')
+ $d(Git.updateStatus({ files, isClean: clean }))
+ })
+ .then(() => Modal.showModal('GitResolveConflicts'))
},
// 'git:commit_and_push':
'git:checkout_new_branch': (c) => {
$d(Git.getBranches()).then(() =>
- $d(Git.getCurrentBranch()).then(() =>
- Modal.showModal('GitCheckout', c.data)
- )
+ $d(Git.getCurrentBranch()).then(() => Modal.showModal('GitCheckout', c.data))
)
},
'git:new_branch': (c) => {
$d(Git.getBranches()).then(() =>
- $d(Git.getCurrentBranch()).then(() =>
- Modal.showModal('GitNewBranch')
- )
+ $d(Git.getCurrentBranch()).then(() => Modal.showModal('GitNewBranch'))
)
},
'git:tag': (c) => {
- $d(Git.getCurrentBranch()).then(() =>
- $d(Git.getTags())
- .then(() =>
- Modal.showModal('GitTag')
- )
- )
+ $d(Git.getCurrentBranch()).then(() => $d(Git.getTags()).then(() => Modal.showModal('GitTag')))
},
'git:merge': (c) => {
$d(Git.getBranches()).then(() =>
- $d(Git.getCurrentBranch()).then(() =>
- Modal.showModal('GitMerge')
- )
+ $d(Git.getCurrentBranch()).then(() => Modal.showModal('GitMerge'))
)
},
'git:stash': (c) => {
- $d(Git.getCurrentBranch()).then(() =>
- Modal.showModal('GitStash')
- )
+ $d(Git.getCurrentBranch()).then(() => Modal.showModal('GitStash'))
},
'git:unstash': (c) => {
$d(Git.getCurrentBranch()).then(() => {
- $d(Git.getStashList())
- .then(() =>
- Modal.showModal('GitUnstash')
- )
+ $d(Git.getStashList()).then(() => Modal.showModal('GitUnstash'))
})
},
'git:reset_head': (c) => {
- $d(Git.getCurrentBranch()).then(() =>
- Modal.showModal('GitResetHead')
- )
+ $d(Git.getCurrentBranch()).then(() => Modal.showModal('GitResetHead'))
},
'git:rebase:start': (c) => {
$d(Git.getBranches()).then(() => {
- $d(Git.getTags())
- .then(() =>
- Modal.showModal('GitRebaseStart')
- )
+ $d(Git.getTags()).then(() => Modal.showModal('GitRebaseStart'))
})
},
'git:rebase:abort': (c) => {
@@ -93,32 +91,40 @@ export default {
},
'git:history:compare': (c) => {
const focusedNode = c.context.focusedNode
- $d(Git.diffFile({
- path: focusedNode.path,
- newRef: c.context.shortName,
- oldRef: `${c.context.shortName}^`
- }))
+ $d(
+ Git.diffFile({
+ path: focusedNode.path,
+ newRef: c.context.shortName,
+ oldRef: `${c.context.shortName}^`
+ })
+ )
},
'git:history:compare_local': (c) => {
const focusedNode = c.context.focusedNode
if (!focusedNode || focusedNode.isDir) {
- $d(Git.gitCommitDiff({
- rev: c.context.shortName,
- title: 'Show Commit'
- }))
+ $d(
+ Git.gitCommitDiff({
+ rev: c.context.shortName,
+ title: 'Show Commit'
+ })
+ )
} else {
- $d(Git.diffFile({
- path: focusedNode.path,
- newRef: c.context.shortName,
- oldRef: '~~unstaged~~'
- }))
+ $d(
+ Git.diffFile({
+ path: focusedNode.path,
+ newRef: c.context.shortName,
+ oldRef: '~~unstaged~~'
+ })
+ )
}
},
'git:history:all_effected': (c) => {
- $d(Git.gitCommitDiff({
- rev: c.context.shortName,
- title: 'Show Commit',
- oldRef: `${c.context.shortName}^`
- }))
+ $d(
+ Git.gitCommitDiff({
+ rev: c.context.shortName,
+ title: 'Show Commit',
+ oldRef: `${c.context.shortName}^`
+ })
+ )
}
}
diff --git a/app/commands/commandBindings/misc.js b/app/commands/commandBindings/misc.js
index db32cb88..009200e3 100644
--- a/app/commands/commandBindings/misc.js
+++ b/app/commands/commandBindings/misc.js
@@ -3,6 +3,7 @@ import * as Panel from 'components/Panel/actions'
import * as SideBar from 'components/Panel/SideBar/actions'
import terminalState from 'components/Terminal/state'
import * as Terminal from 'components/Terminal/actions'
+import * as searchState from 'commons/Search/state'
const getComponentByName = name => window.refs[name].getWrappedInstance()
export default {
@@ -20,6 +21,12 @@ export default {
'global:show_branches': () => {
getComponentByName('GitBranchWidget').toggleActive(true)
},
+ 'global:show_env': () => {
+ SideBar.toggleSidePanelView('SIDEBAR.RIGHT.env')
+ },
+ 'global:show_search': () => {
+ SideBar.toggleSidePanelView('SIDEBAR.LEFT.find')
+ },
'modal:dismiss': (c) => {
Modal.dismissModal()
},
diff --git a/app/commands/commandBindings/tab.js b/app/commands/commandBindings/tab.js
index 1959bb74..34801d9f 100644
--- a/app/commands/commandBindings/tab.js
+++ b/app/commands/commandBindings/tab.js
@@ -5,15 +5,15 @@ import * as PaneActions from 'components/Pane/actions'
export default {
'tab:close': (c) => {
- Tab.removeTab(c.context.id)
+ Tab.removeTab(c.context)
},
'tab:close_other': (c) => {
- Tab.removeOtherTab(c.context.id)
+ Tab.removeOtherTab(c.context)
},
'tab:close_all': (c) => {
- Tab.removeAllTab(c.context.id)
+ Tab.removeAllTab(c.context)
},
'tab:split_v': (c) => {
@@ -35,4 +35,36 @@ export default {
Tab.moveTabToPane(c.context.id, newPaneId)
)
},
+
+ 'tab:zenmode': () => {
+ const tab = document.querySelector('.tab-content-item.active');
+ const datasetExt = tab.dataset.ext;
+ const ext = datasetExt && datasetExt.toLowerCase();
+ if (['md', 'markdown', 'html'].includes(ext)) {
+ tab.classList.add('zenmode_preview');
+ } else {
+ tab.classList.add('zenmode');
+ }
+ if (tab.requestFullscreen) {
+ tab.requestFullscreen();
+ } else if (tab.webkitRequestFullscreen) {
+ tab.webkitRequestFullscreen();
+ } else if (tab.mozRequestFullScreen) {
+ tab.mozRequestFullScreen();
+ } else if (tab.msRequestFullscreen) {
+ tab.msRequestFullscreen();
+ }
+ }
+}
+
+function exitFullScreen() {
+ const isFull = document.fullscreenElement || document.webkitFullscreenElement || document.mozFullScreenElement;
+ if (!isFull) {
+ const tab = document.querySelector('.tab-content-item.active');
+ tab.classList.remove('zenmode', 'zenmode_preview');
+ }
}
+document.addEventListener('fullscreenchange', () => exitFullScreen());
+document.addEventListener('webkitfullscreenchange', () => exitFullScreen());
+document.addEventListener('mozfullscreenchange', () => exitFullScreen());
+document.addEventListener('msfullscreenchang', () => exitFullScreen());
diff --git a/app/commands/index.js b/app/commands/index.js
index 5c9ca0a3..35fcb845 100644
--- a/app/commands/index.js
+++ b/app/commands/index.js
@@ -1,12 +1,17 @@
import { emitter } from 'utils'
import Keymapper from './lib/keymapper'
-import keymaps from './keymaps'
+import { systemKeymaps, pluginsKeymaps } from './keymaps'
import commandBindings from './commandBindings'
+import { flattenKeyMaps } from './lib/helpers'
import dispatchCommand, { setContext, addCommand } from './dispatchCommand'
import { CommandPalette } from './CommandPalette'
+// import { pluinKeymapsForPlatform } from './pluginsKeymaps'
+export const key = new Keymapper({ dispatchCommand })
+key.loadKeymaps(systemKeymaps)
-const key = new Keymapper({ dispatchCommand })
-key.loadKeymaps(keymaps)
+pluginsKeymaps.forEach((keyConfig) => {
+ key.loadKeymaps(flattenKeyMaps(keyConfig.keymaps))
+})
Object.keys(commandBindings).map((commandType) => {
emitter.on(commandType, commandBindings[commandType])
diff --git a/app/commands/keymaps.js b/app/commands/keymaps.js
index a409d5e1..5ee926d4 100644
--- a/app/commands/keymaps.js
+++ b/app/commands/keymaps.js
@@ -1,67 +1,123 @@
+import i18n from 'utils/createI18n'
+import { observable } from 'mobx'
+import { flattenKeyMaps } from './lib/helpers'
+
// Unavailable shortcuts: shift / ctrl + (q|n|w|t|↹)
const os = (navigator.platform.match(/mac|win|linux/i) || ['other'])[0].toLowerCase()
-export const isMac = (os === 'mac')
+export const isMac = os === 'mac'
-let keymaps
-let modifierKeysMap
-if (isMac) {
- keymaps = {
- 'alt+n': 'file:new_file',
- 'alt+shift+n': 'file:new_folder',
- 'cmd+s': 'file:save',
- 'cmd+ctrl+c': 'git:commit',
- 'esc': 'modal:dismiss',
- 'cmd+shift+p': 'global:command_palette',
- 'cmd+p': 'global:file_palette',
- 'cmd+alt+1': 'editor:split_pane_1',
- 'cmd+alt+shift+1': 'editor:split_pane_1',
- 'cmd+alt+2': 'editor:split_pane_vertical_2',
- 'cmd+alt+shift+2': 'editor:split_pane_horizontal_2',
- 'cmd+alt+3': 'editor:split_pane_vertical_3',
- 'cmd+alt+shift+3': 'editor:split_pane_horizontal_3',
- 'cmd+alt+4': 'editor:split_pane_vertical_4',
- 'cmd+,': 'global:show_settings',
- 'ctrl+g': 'editor:goto',
- 'alt+l': 'edit:toggle_format',
- 'cmd+/': 'edit:toggle_comment',
- }
- modifierKeysMap = {
+export const modifierKeysMap = isMac
+ ? {
ctrl: '⌃',
alt: '⌥',
cmd: '⌘',
- shift: '⇧',
+ shift: '⇧'
}
-} else {
- keymaps = {
- 'alt+n': 'file:new_file',
- 'alt+shift+n': 'file:new_folder',
- 'ctrl+s': 'file:save',
- 'ctrl+alt+c': 'git:commit',
- 'esc': 'modal:dismiss',
- 'ctrl+shift+p': 'global:command_palette',
- 'ctrl+p': 'global:file_palette',
- 'ctrl+alt+1': 'editor:split_pane_1',
- 'ctrl+alt+shift+1': 'editor:split_pane_1',
- 'ctrl+alt+2': 'editor:split_pane_vertical_2',
- 'ctrl+alt+shift+2': 'editor:split_pane_horizontal_2',
- 'ctrl+alt+3': 'editor:split_pane_vertical_3',
- 'ctrl+alt+shift+3': 'editor:split_pane_horizontal_3',
- 'ctrl+alt+4': 'editor:split_pane_vertical_4',
- 'alt+,': 'global:show_settings',
- 'ctrl+g': 'editor:goto',
- 'alt+l': 'edit:toggle_format',
- 'ctrl+/': 'edit:toggle_comment',
- }
- modifierKeysMap = {
+ : {
ctrl: 'Ctrl',
alt: 'Alt',
cmd: 'Cmd',
- shift: 'Shift',
+ shift: 'Shift'
}
-}
-export default keymaps
+const keymapStore = observable({
+ systemKeymaps: [
+ {
+ command: 'file:new_file',
+ mac: 'alt+n',
+ win: 'alt+n',
+ label: i18n`settings.keymap.createFile`
+ },
+ {
+ command: 'file:new_folder',
+ mac: 'alt+shift+n',
+ win: 'alt+shift+n',
+ label: i18n`settings.keymap.createFolder`
+ },
+ {
+ command: 'file:save',
+ mac: 'cmd+s',
+ win: 'ctrl+s',
+ label: i18n`settings.keymap.saveFile`
+ },
+ {
+ command: 'modal:dismiss',
+ mac: 'esc',
+ win: 'esc',
+ label: i18n`settings.keymap.exitModal`
+ },
+ {
+ command: 'git:commit',
+ mac: 'cmd+ctrl+c',
+ win: 'ctrl+alt+c',
+ label: i18n`settings.keymap.gitCommit`
+ },
+ {
+ command: 'global:command_palette',
+ mac: 'cmd+shift+p',
+ win: 'ctrl+shift+p',
+ label: i18n`settings.keymap.commandPalette`
+ },
+ {
+ command: 'global:file_palette',
+ mac: 'cmd+p',
+ win: 'ctrl+p',
+ label: i18n`settings.keymap.filePalette`
+ },
+ {
+ command: 'global:show_settings',
+ mac: 'cmd+,',
+ win: 'alt+,',
+ label: i18n`settings.keymap.showSettings`
+ },
+ {
+ command: 'editor:goto',
+ mac: 'cmd+g',
+ win: 'ctrl+g',
+ label: i18n`file.goto`
+ },
+ {
+ command: 'edit:toggle_format_monaco',
+ mac: 'alt+l',
+ win: 'alt+l',
+ label: i18n`settings.keymap.toggleFormat`
+ },
+ {
+ command: 'edit:toggle_monaco_comment',
+ mac: 'cmd+/',
+ win: 'ctrl+/',
+ label: i18n`settings.keymap.toggleComment`
+ },
+ {
+ command: 'tab:zenmode',
+ mac: 'cmd+f11',
+ win: 'ctrl+f11',
+ label: i18n`settings.keymap.into_zenmode`
+ },
+ {
+ command: 'global:show_search',
+ mac: 'cmd+shift+f',
+ win: 'ctrl+shift+f',
+ label: i18n`settings.keymap.search`
+ }
+ ],
+ pluginsKeymaps: [],
+})
-export {
- modifierKeysMap
+export default keymapStore
+
+export const systemKeymaps = flattenKeyMaps(keymapStore.systemKeymaps)
+
+export const pluginsKeymaps = keymapStore.pluginsKeymaps
+
+export function getFlattenAllKeymaps () {
+ return {
+ ...flattenKeyMaps(keymapStore.systemKeymaps),
+ ...flattenKeyMaps(
+ keymapStore.pluginsKeymaps.map(km => km.keymaps).reduce((pre, cur) => {
+ pre = [...pre, ...cur]
+ return pre
+ }, [])
+ )
+ }
}
diff --git a/app/commands/lib/helpers.js b/app/commands/lib/helpers.js
index 60f2dfd3..b90821a9 100644
--- a/app/commands/lib/helpers.js
+++ b/app/commands/lib/helpers.js
@@ -1,6 +1,9 @@
const keycodes = require('./keycodes')
const MODIFIERS_LIST = ['meta', 'ctrl', 'shift', 'alt']
+const os = (navigator.platform.match(/mac|win|linux/i) || ['other'])[0].toLowerCase()
+export const isMac = (os === 'mac')
+
export function keyEventToKeyCombination (e, combinator) {
// ensure comb always in the order spec by MODIFIERS_LIST
const modString = MODIFIERS_LIST.filter(mod => e[`${mod}Key`]).join(combinator)
@@ -30,3 +33,15 @@ export function normalizeKeys (keys, combinator='+', delimiter=' ') {
})
.join(delimiter)
}
+
+export function flattenKeyMaps (keymaps) {
+ return keymaps.reduce((pre, cur) => {
+ const { mac, win, command } = cur
+ if (isMac) {
+ pre[mac] = command
+ } else {
+ pre[win] = command
+ }
+ return pre
+ }, {})
+}
diff --git a/app/commands/lib/keymapper.js b/app/commands/lib/keymapper.js
index 54967971..5fea6bba 100644
--- a/app/commands/lib/keymapper.js
+++ b/app/commands/lib/keymapper.js
@@ -6,14 +6,27 @@ Mousetrap.prototype.stopCallback = function () { return false }
class Keymapper {
constructor ({ dispatchCommand }) {
this.dispatchCommand = dispatchCommand
+ this.keyStore = []
}
loadKeymaps (keymaps) {
Object.entries(keymaps).map(([keycombo, commandType]) => {
- Mousetrap.bind(normalizeKeys(keycombo), (e) => {
- this.dispatchCommand(commandType)
- e.preventDefault(); e.stopPropagation()
- })
+ if (!this.keyStore.includes(keycombo)) {
+ this.keyStore.push(keycombo)
+ Mousetrap.bind(normalizeKeys(keycombo), (e) => {
+ this.dispatchCommand(commandType)
+ e.preventDefault(); e.stopPropagation()
+ })
+ }
+ })
+ }
+
+ unbindKeymaps (keymaps) {
+ Object.entries(keymaps).map(([keycombo]) => {
+ if (this.keyStore.includes(keycombo)) {
+ this.keyStore = this.keyStore.filter((key) => key !== keycombo)
+ }
+ Mousetrap.unbind(normalizeKeys(keycombo))
})
}
}
diff --git a/app/commands/pluginsKeymaps.js b/app/commands/pluginsKeymaps.js
new file mode 100644
index 00000000..483aa234
--- /dev/null
+++ b/app/commands/pluginsKeymaps.js
@@ -0,0 +1,22 @@
+import { flatten } from 'lodash'
+import { flattenKeyMaps } from './lib/helpers'
+/**
+ * ```typescript
+ * interface IKeyMaps {
+ * command: string;
+ * mac: string;
+ * win: string;
+ * }
+ * interface IPluginKeyMaps {
+ * name: string;
+ * keymaps: Array
;
+ * }
+ * ```
+ */
+
+let pluginsKeymaps = []
+
+const allKeymaps = flatten(pluginsKeymaps.map((km) => km.keymaps))
+export const pluinKeymapsForPlatform = flattenKeyMaps(allKeymaps)
+
+export default pluginsKeymaps
diff --git a/app/commons/File/actions.js b/app/commons/File/actions.js
index 93abe82c..e3052e11 100644
--- a/app/commons/File/actions.js
+++ b/app/commons/File/actions.js
@@ -1,41 +1,107 @@
import flattenDeep from 'lodash/flattenDeep'
import { registerAction } from 'utils/actions'
+import settings from 'settings'
import is from 'utils/is'
-import { action, when } from 'mobx'
import api from 'backendAPI'
+import config from 'config'
+import { showModal } from 'components/Modal/actions'
+import { fetchLanguageServerSetting } from 'backendAPI/languageServerAPI'
+import { findLanguagesByFileList } from 'components/MonacoEditor/utils/findLanguage'
import state, { FileNode } from './state'
export function fetchPath (path) {
- return api.fetchPath(path).then(nodePropsList => Promise.all(nodePropsList.map((nodeProps) => {
- if (nodeProps.isDir && nodeProps.directoriesCount === 1 && nodeProps.filesCount === 0) {
- return fetchPath(nodeProps.path).then(data => [nodeProps].concat(data))
+ return api.fetchPath(path).then(nodePropsList =>
+ Promise.all(
+ nodePropsList.map((nodeProps) => {
+ if (nodeProps.isDir && nodeProps.directoriesCount === 1 && nodeProps.filesCount === 0) {
+ return fetchPath(nodeProps.path).then(data => [nodeProps].concat(data))
+ }
+ return Promise.resolve(nodeProps)
+ })
+ ).then(flattenDeep)
+ )
+}
+
+export const loadNodeData = registerAction('fs:load_node_data', (nodePropsList) => {
+ if (!is.array(nodePropsList)) nodePropsList = [nodePropsList]
+ return nodePropsList.map((nodeProps) => {
+ const curNode = state.entities.get(nodeProps.path)
+ if (curNode) {
+ const curNodeTime = new Date(curNode.lastModified)
+ const newNodeTime = new Date(nodeProps.lastModified)
+ if (newNodeTime.getTime() > curNodeTime.getTime() || !curNodeTime.content) {
+ curNode.update(nodeProps)
+ }
+ return curNode
+ }
+ const newNode = new FileNode(nodeProps)
+ state.entities.set(newNode.path, newNode)
+ return newNode
+ })
+})
+
+function tryIdentificationWorkSpaceType (files) {
+ return new Promise(async (resolve, _) => {
+ const types = findLanguagesByFileList(files)
+ .map(type => ({ srcPath: '/', type }))
+ if (!types || types.length === 0) {
+ Promise.all(
+ files.filter(file => file.isDir)
+ .map(async (task) => {
+ const result = await api.fetchPath(task.path)
+ const subTypes = findLanguagesByFileList(result)
+ .map(type => ({ srcPath: task.path, type }))
+ return Promise.resolve(subTypes)
+ })
+ )
+ .then((langSettings) => {
+ resolve(flattenDeep(langSettings.filter(type => type.length > 0)))
+ })
+ } else {
+ resolve(types)
}
- return Promise.resolve(nodeProps)
- })).then(flattenDeep))
+ })
}
-export const loadNodeData = registerAction('fs:load_node_data',
- (nodePropsList) => {
- if (!is.array(nodePropsList)) nodePropsList = [nodePropsList]
- return nodePropsList.map((nodeProps) => {
- const curNode = state.entities.get(nodeProps.path)
- if (curNode) {
- const curNodeTime = new Date(curNode.lastModified)
- const newNodeTime = new Date(nodeProps.lastModified)
- if (newNodeTime.getTime() > curNodeTime.getTime() || !curNodeTime.content) {
- curNode.update(nodeProps)
- }
- return curNode
+const setLanguageSetting = (data) => {
+ if (data.length > 1) {
+ showModal({ type: 'ProjectTypeSelector', position: 'center', data })
+ } else if (data.length === 1) {
+ const { type, srcPath } = data[0]
+ config.mainLanguage = type
+ settings.languageserver.projectType.value = type
+ settings.languageserver.sourcePath.value = srcPath
+ }
+}
+
+const fetchPackageJsonFile = () => {
+ api.readFile('/package.json')
+ .then(res => {
+ const content = JSON.parse(res.content)
+ if (content && content.codingIdePackage && content.codingIdePackage.type === 'plugin') {
+ config.__PLUGIN_DEV__ = true
}
- const newNode = new FileNode(nodeProps)
- state.entities.set(newNode.path, newNode)
- return newNode
})
- }
-)
+}
export const fetchProjectRoot = registerAction('fs:init', () =>
- fetchPath('/').then(loadNodeData)
+ fetchPath('/').then((data) => {
+ /**
+ * 插件工作空间判断
+ */
+ if (data.find(file => file.path === '/package.json')) {
+ fetchPackageJsonFile()
+ }
+ fetchLanguageServerSetting(config.spaceKey).then((res) => {
+ if (res.code === 0 && res.data) {
+ setLanguageSetting([res.data])
+ } else {
+ tryIdentificationWorkSpaceType(data)
+ .then(setLanguageSetting)
+ }
+ })
+ return loadNodeData(data)
+ })
)
export const removeNode = registerAction('fs:remove_node', (node) => {
@@ -66,5 +132,10 @@ export const syncFile = registerAction('fs:sync', (params) => {
encoding = params.encoding
}
const fileNode = state.entities.get(path)
- if (!fileNode.isDir) return api.readFile(path, encoding).then(loadNodeData).then(files => files[0])
+ if (!!fileNode && !fileNode.isDir) {
+ return api
+ .readFile(path, encoding)
+ .then(loadNodeData)
+ .then(files => files[0])
+ }
})
diff --git a/app/commons/File/state.js b/app/commons/File/state.js
index f5817a59..c6d1fe02 100644
--- a/app/commons/File/state.js
+++ b/app/commons/File/state.js
@@ -1,5 +1,5 @@
import _ from 'lodash'
-import { createTransformer, toJS, extendObservable, observable, computed, action } from 'mobx'
+import { createTransformer, toJS, extendObservable, observable, computed, action, when } from 'mobx'
import config from 'config'
import { syncFile } from './actions'
@@ -22,6 +22,12 @@ const state = observable({
},
})
+// for plugin
+const extState = observable({
+ createdListeners: [],
+ didOpenListeners: [],
+})
+
// state.entities.intercept((change) => {
// console.log(change)
// if (change.type === 'add') {
@@ -43,6 +49,12 @@ class FileNode {
})
}
state.entities.set(this.path, this)
+ // 文件创建钩子
+ if (extState.createdListeners && extState.createdListeners.length > 0) {
+ for (const createdListener of extState.createdListeners) {
+ createdListener(this)
+ }
+ }
}
@action
@@ -57,6 +69,7 @@ class FileNode {
@observable isSynced = true
@observable gitStatus = 'NONE'
@observable size = 0
+ @observable isEditorLoading = false
@observable _name = undefined
@computed
@@ -139,10 +152,18 @@ class FileNode {
state.entities.set(ROOT_PATH, new FileNode({
path: ROOT_PATH,
- name: config.projectName,
+ name: (config.workspaceName === 'default' ? config.projectName : config.workspaceName) || 'Home',
isDir: true,
}))
+when(() => config.workspaceName || config.projectName, () => {
+ state.entities.set(ROOT_PATH, new FileNode({
+ path: ROOT_PATH,
+ name: config.workspaceName === 'default' ? config.projectName : config.workspaceName,
+ isDir: true,
+ }))
+})
+
function hydrate (json) {
const { entities } = json
// hydrate encodings
@@ -155,4 +176,4 @@ function hydrate (json) {
}
export default state
-export { state, FileNode, hydrate }
+export { state, FileNode, hydrate, extState }
diff --git a/app/commons/File/subscribeToFileChange.js b/app/commons/File/subscribeToFileChange.js
index 45e58418..41ab862c 100644
--- a/app/commons/File/subscribeToFileChange.js
+++ b/app/commons/File/subscribeToFileChange.js
@@ -1,6 +1,6 @@
import config from 'config'
import api from 'backendAPI'
-import emitter, { FILE_CHANGE } from 'utils/emitter'
+import emitter, { FILE_CHANGE, OFFLINE_WS_SYSTEM } from 'utils/emitter'
import { autorun } from 'mobx'
import { FsSocketClient } from 'backendAPI/websocketClients'
import store, { getState, dispatch } from 'store'
@@ -59,6 +59,9 @@ export default function subscribeToFileChange () {
client.subscribe(`/topic/ws/${config.spaceKey}/change`, (frame) => {
const data = JSON.parse(frame.body)
const node = data.fileInfo
+ if (node.name.startsWith('.nfs000')) {
+ return
+ }
emitter.emit(FILE_CHANGE, data)
switch (data.changeType) {
case 'create':
@@ -99,5 +102,13 @@ export default function subscribeToFileChange () {
const data = JSON.parse(frame.body)
dispatch(GitActions.updateCurrentBranch({ name: data.branch }))
})
+
+ client.subscribe(`/topic/ws/${config.spaceKey}/system`, (frame) => {
+ const data = frame.body;
+ if (data === 'quit') {
+ api.closeWebsocketClient()
+ emitter.emit(OFFLINE_WS_SYSTEM)
+ }
+ })
})
}
diff --git a/app/commons/Menu/state.js b/app/commons/Menu/state.js
index 9679c743..457f8d13 100644
--- a/app/commons/Menu/state.js
+++ b/app/commons/Menu/state.js
@@ -1,19 +1,18 @@
-import React from 'react'
import { observable, extendShallowObservable } from 'mobx'
-import keyMapConfig, { modifierKeysMap } from 'commands/keymaps'
+import { modifierKeysMap, getFlattenAllKeymaps } from 'commands/keymaps'
-const findKeyByValue = value => Object
- .keys(keyMapConfig)
- .reduce((p, v) => {
- p[keyMapConfig[v]] = v
+function MenuScope (defaultMenuItems = []) {
+ const findKeyByValue = value =>
+ Object.keys(getFlattenAllKeymaps()).reduce((p, v) => {
+ p[getFlattenAllKeymaps()[v]] = v
return p
}, {})[value] || ''
-const withModifierKeys = value => value.split('+')
- .map(e => modifierKeysMap[e] || e.toUpperCase()).join('')
-
-
-function MenuScope (defaultMenuItems=[]) {
+ const withModifierKeys = value =>
+ value
+ .split('+')
+ .map(e => modifierKeysMap[e] || e.toUpperCase())
+ .join('')
class MenuItem {
constructor (opts) {
@@ -28,7 +27,7 @@ function MenuScope (defaultMenuItems=[]) {
return this.items.reduce((acc, item) => {
if (item.key) acc[item.key] = item
}, {})
- },
+ }
})
// case 'key':
// case 'name':
@@ -43,7 +42,7 @@ function MenuScope (defaultMenuItems=[]) {
})
return extendShallowObservable(this, {
get shortcut () {
- return withModifierKeys(findKeyByValue(this.command))
+ return withModifierKeys(findKeyByValue(this.cmd || this.command))
}
})
}
diff --git a/app/commons/Search/action.js b/app/commons/Search/action.js
new file mode 100644
index 00000000..5334b4af
--- /dev/null
+++ b/app/commons/Search/action.js
@@ -0,0 +1,62 @@
+import * as api from 'backendAPI/searchAPI'
+import state from './state'
+
+function searchUp() {
+ if(!state.ws.status) {
+ state.ws.name = spaceKey;
+ api.searchWorkspaceUp();
+ }
+}
+
+function searchDown() {
+ if(state.ws.status) {
+ api.searchWorkspaceDown();
+ }
+}
+
+function searchStatus() {
+ api.searchWorkspaceStatus();
+}
+
+function searchString() {
+ if(state.ws.status) {
+ commonSearch();
+ api.searchString(state.searching, state.searched.randomKey);
+ }
+}
+
+function searchPattern() {
+ if(state.ws.status) {
+ commonSearch();
+ api.searchPattern(state.searching, state.searched.randomKey);
+ }
+}
+
+function commonSearch() {
+ // if(!state.searched.end && !state.ws.first) {
+ // // api.searchInterrupt(state.searched.taskId);
+ // }
+ if(state.searched.taskId != null) {
+ state.searched.former.taskId = state.searched.taskId
+ state.searched.former.results = state.searched.results.splice(0, state.searched.results.length);
+ state.searched.taskId = ''
+ }
+ state.searched.taskId = ''
+ state.searched.pattern = state.searching.isPattern
+ state.searched.message = ''
+ state.searched.end = false
+ state.searched.randomKey = randomForOne()
+}
+
+function searchInterrupt() {
+ if(state.ws.status
+ && !state.searched.end) {
+ api.searchInterrupt(state.searched.taskId);
+ }
+}
+
+function randomForOne() {
+ return Math.random().toString(36)
+}
+
+export { searchUp, searchDown, searchStatus, searchString, searchPattern, searchInterrupt }
\ No newline at end of file
diff --git a/app/commons/Search/state.js b/app/commons/Search/state.js
new file mode 100644
index 00000000..58f1e6b2
--- /dev/null
+++ b/app/commons/Search/state.js
@@ -0,0 +1,38 @@
+import { observable, map } from 'mobx'
+
+export const ws = observable({
+ name: '',
+ status: false,
+ first: true
+})
+
+export const searching = observable({
+ pattern: '',
+ path: '',
+ caseSensitive: false,
+ word: false,
+ isPattern: false,
+ singleFork: false,
+ tip: ''
+})
+
+export const searched = observable({
+ taskId: '',
+ randomKey: '',
+ pattern: false,
+ message: '',
+ results: [],
+ end: false,
+ former: {
+ taskId: '',
+ results: []
+ }
+})
+
+const state = {
+ ws,
+ searching,
+ searched
+}
+
+export default state;
\ No newline at end of file
diff --git a/app/commons/Search/subscribeToSearch.js b/app/commons/Search/subscribeToSearch.js
new file mode 100644
index 00000000..dee08289
--- /dev/null
+++ b/app/commons/Search/subscribeToSearch.js
@@ -0,0 +1,153 @@
+import { SearchSocketClient } from 'backendAPI/websocketClients'
+import { autorun } from 'mobx'
+import state from './state'
+import * as api from 'backendAPI/searchAPI'
+import debounce from 'lodash/debounce'
+
+
+export default function subscribeToSearch() {
+ autorun(() => {
+
+ if (!config.searchSocketConnected) return
+ const client = SearchSocketClient.$$singleton.stompClient
+
+ // workspace up
+ client.subscribe('/user/topic/ws/up', response => {
+ let result = JSON.parse(response.body);
+ editWsStatus(result, 'UP');
+ });
+
+ // workspace down
+ client.subscribe('/user/topic/ws/down', response => {
+ let result = JSON.parse(response.body);
+ editWsStatus(result, 'DOWN');
+ });
+
+ // workspace status
+ client.subscribe('/user/topic/ws/status', response => {
+ let result = JSON.stringify(response.body);
+ if(result) {
+ switch(result) {
+ case 'UP':
+ state.ws.status = true;
+ break
+ case 'DOWN':
+ state.ws.status = false;
+ break
+ case 'NULL':
+ }
+ }
+ });
+
+ // search string
+ client.subscribe('/user/topic/search/string', response => {
+ formatSearch(response, false);
+ });
+
+ // search pattern
+ client.subscribe('/user/topic/search/pattern', response => {
+ formatSearch(response, true);
+ });
+
+ // single result
+ client.subscribe('/user/topic/search/single', response => {
+ let result = JSON.parse(response.body);
+ if(result == null) {
+ return ;
+ }
+ setData(result);
+ });
+
+ // multi result
+ client.subscribe('/user/topic/search/join', response => {
+ let results = JSON.parse(response.body);
+ if(results == null) {
+ return ;
+ }
+ setData(results);
+ });
+
+ // error
+ client.subscribe('/user/topic/search/error', response => {
+ let results = JSON.parse(response.body);
+ if(results == null) {
+ return ;
+ }
+ if(result.randomKey === state.searched.randomKey) {
+ state.searched.message = results.message;
+ }
+ });
+
+ // end result
+ client.subscribe('/user/topic/search/end', response => {
+ end(response)
+ });
+
+ // modify workspace status to up and init workspace files in mem
+ api.searchWorkspaceUp();
+
+ })
+}
+
+// end
+const end = debounce((response) => {
+ let result = JSON.parse(response.body);
+ if(result == null) {
+ return ;
+ }
+ if(result.randomKey === state.searched.randomKey) {
+ state.searched.end = true;
+ }
+ }, 500)
+
+function setData(result) {
+ if(result.randomKey === state.searched.randomKey) {
+ if(result.joinResultMessage) {
+ let {joinResultMessage: searchChunk} = result;
+ for(let chunk of searchChunk) {
+ state.searched.results.push(chunk);
+ }
+ } else if(result.singleResultMessage) {
+ let {singleResultMessage: searchChunk} = result;
+ state.searched.results.push(searchChunk);
+ }
+ }
+}
+
+function editWsStatus(result, wsStatus) {
+ if(result == null) {
+ return ;
+ }
+ if(result.code == 0 || result.code == 2) {
+ switch(wsStatus) {
+ case 'UP':
+ config.searchWsStatus = true;
+ state.ws.status = true;
+ break;
+ case 'DOWN':
+ config.searchWsStatus = false;
+ state.ws.status = false;
+ break;
+ }
+ } else if(result.code == 1) {
+ console.log(result.message);
+ }
+}
+
+function formatSearch(response, isPattern) {
+ let result = JSON.parse(response.body);
+ if(result == null) {
+ return ;
+ }
+ if(result.randomKey && result.randomKey === state.searched.randomKey) {
+ if(result.message) {
+ state.searched.message = result.message
+ state.searched.end = true
+ } else {
+ state.searched.taskId = result.taskId;
+ state.searched.isPattern = isPattern;
+ state.searched.message = '';
+ state.searched.end = false;
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/commons/Tab/TabBar.jsx b/app/commons/Tab/TabBar.jsx
index 70eaea38..969defb9 100644
--- a/app/commons/Tab/TabBar.jsx
+++ b/app/commons/Tab/TabBar.jsx
@@ -1,6 +1,5 @@
import React, { Component } from 'react'
import PropTypes from 'prop-types'
-import cx from 'classnames'
import { observer } from 'mobx-react'
import { dnd } from 'utils'
import { defaultProps } from 'utils/decorators'
@@ -8,7 +7,10 @@ import TabLabel from './TabLabel'
import Menu from 'components/Menu'
import ContextMenu from 'components/ContextMenu'
import i18n from 'utils/createI18n'
-
+import * as SideBar from 'components/Panel/SideBar/actions'
+import config from 'config'
+import * as Panel from 'components/Panel/actions'
+import panelState from 'components/Panel/state'
@defaultProps(props => ({
addTab: () => props.tabGroup.addTab(),
@@ -20,6 +22,8 @@ class TabBar extends Component {
contextMenuItems: PropTypes.array.isRequired,
addTab: PropTypes.func,
closePane: PropTypes.func,
+ fullScreenActiveContent: PropTypes.bool,
+ handleFullScreen: PropTypes.func,
};
constructor (props) {
@@ -37,18 +41,27 @@ class TabBar extends Component {
tabGroup,
addTab,
contextMenuItems,
+ fullScreenActiveContent,
+ handleFullScreen,
} = this.props
const tabBarId = `tab_bar_${tabGroup.id}`
+ const size = panelState.panels.get('PANEL_BOTTOM').size
+
return (
{tabGroup.tabs.map(tab =>
-
+
)}
{dnd.target.id === tabBarId ?
: null}
@@ -57,12 +70,29 @@ class TabBar extends Component {
+
+ {(!config.isPad || tabGroup.id !== 'terminalGroup')
+ && {
+ e.stopPropagation()
+ this.setState({ showDropdownMenu: !this.state.showDropdownMenu })
+ }}
+ >
+
+ {this.renderDropdownMenu(size)}
+
}
+ {tabGroup.id === 'terminalGroup' &&
{ e.stopPropagation(); this.setState({ showDropdownMenu: true }) }}
+ style={{ marginBottom: size ? '4px' : '-6px' }}
+ onClick={e => {
+ e.stopPropagation()
+ !size ? Panel.expandPanel('PANEL_BOTTOM')
+ : Panel.shrinkPanel('PANEL_BOTTOM')
+ }}
>
-
- {this.renderDropdownMenu()}
-
+
+ }
+ 
- )}
-