Merge pull request #478 from chunqiuyiyu/dashboard-dev-search

Dashboard dev search

Author: 春秋一语

.babelrc

@@ -12,6 +12,7 @@
       "moduleName": "@babel/runtime"
     }],
     "@babel/plugin-syntax-export-default-from",
+    "@babel/plugin-syntax-dynamic-import",
     ["@babel/plugin-proposal-decorators", { "legacy": true }],
     ["@babel/plugin-proposal-class-properties", { "loose": true }]
   ],

.travis.yml

@@ -1,7 +1,7 @@
 dist: trusty
 language: node_js
 node_js:
-- '7'
+- '10.14.1'
 
 cache: yarn
 

app/changelog.html

@@ -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 {
@@ -23,6 +24,9 @@ export default {
   'global:show_env': () => {
     SideBar.toggleSidePanelView('SIDEBAR.RIGHT.env')
   },
+  'global:show_search': () => {
+    SideBar.toggleSidePanelView('SIDEBAR.LEFT.find')
+  },
   'modal:dismiss': (c) => {
     Modal.dismissModal()
   },

app/commands/commandBindings/misc.js

@@ -93,6 +93,12 @@ const keymapStore = observable({
       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: [],

app/commands/keymaps.js

@@ -2,8 +2,6 @@ import flattenDeep from 'lodash/flattenDeep'
 import { registerAction } from 'utils/actions'
 import settings from 'settings'
 import is from 'utils/is'
-import { capitalize } from 'lodash'
-import { action, when } from 'mobx'
 import api from 'backendAPI'
 import config from 'config'
 import { showModal } from 'components/Modal/actions'
@@ -70,8 +68,8 @@ const setLanguageSetting = (data) => {
     showModal({ type: 'ProjectTypeSelector', position: 'center', data })
   } else if (data.length === 1) {
     const { type, srcPath } = data[0]
-    config.mainLanguage = capitalize(type)
-    settings.languageserver.projectType.value = capitalize(type)
+    config.mainLanguage = type
+    settings.languageserver.projectType.value = type
     settings.languageserver.sourcePath.value = srcPath
   }
 }
@@ -96,7 +94,7 @@ export const fetchProjectRoot = registerAction('fs:init', () =>
     }
     fetchLanguageServerSetting(config.spaceKey).then((res) => {
       if (res.code === 0 && res.data) {
-        setLanguageSetting(res.data.default)
+        setLanguageSetting([res.data])
       } else {
         tryIdentificationWorkSpaceType(data)
           .then(setLanguageSetting)

app/commons/File/actions.js

@@ -1,18 +1,18 @@
-import { observable } from 'mobx'
+import { observable, map } from 'mobx'
 
 export const ws = observable({
   name: '',
   status: false,
   first: true
 })
 
-export const searching = observable({
+export const searching = map({
   pattern: '',
   path: '',
   caseSensitive: false,
   word: false,
   isPattern: false,
-  singleFork: false
+  singleFork: false,
 })
 
 export const searched = observable({

app/commons/Search/state.js

@@ -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'

app/commons/Tab/TabBar.jsx

@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import { observer } from 'mobx-react'
-import * as monaco from 'monaco-editor'
+ 
 import config from 'config'
 import cx from 'classnames'
 import modeInfos from 'components/Editor/components/CodeEditor/addons/mode/modeInfos'

app/components/Editor/components/EditorWidgets/ModeWidget.jsx

@@ -81,10 +81,11 @@ class Editor {
     // })
 
     autorun(() => {
-      if (this.tab && this.tab.isActive && this.tab.editor && this.tab.editor.cm) {
+      const tab = this.tab;
+      if (tab && tab.isActive && tab.editor && tab.editor.cm) {
         setTimeout(() => {
-          this.tab.editor.cm.refresh();
-          this.tab.editor.cm.focus();
+          tab.editor.cm.refresh();
+          tab.editor.cm.focus();
         }, 0);
       }
     })