-
-
-
-
-
-
-
diff --git a/frontend/src/components/Kanban/index.vue b/frontend/src/components/Kanban/index.vue
deleted file mode 100644
index dadeb648..00000000
--- a/frontend/src/components/Kanban/index.vue
+++ /dev/null
@@ -1,89 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/LangSelect/index.vue b/frontend/src/components/LangSelect/index.vue
deleted file mode 100644
index fea7ba71..00000000
--- a/frontend/src/components/LangSelect/index.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
- {{ headerText }}
-
-
- {{ element.name }} {{ element.id }}
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/components/MarkdownEditor/defaultOptions.js b/frontend/src/components/MarkdownEditor/defaultOptions.js
deleted file mode 100644
index 303aa13d..00000000
--- a/frontend/src/components/MarkdownEditor/defaultOptions.js
+++ /dev/null
@@ -1,31 +0,0 @@
-// doc: https://nhnent.github.io/tui.editor/api/latest/ToastUIEditor.html#ToastUIEditor
-export default {
- minHeight: '200px',
- previewStyle: 'vertical',
- useCommandShortcut: true,
- useDefaultHTMLSanitizer: true,
- usageStatistics: false,
- hideModeSwitch: false,
- toolbarItems: [
- 'heading',
- 'bold',
- 'italic',
- 'strike',
- 'divider',
- 'hr',
- 'quote',
- 'divider',
- 'ul',
- 'ol',
- 'task',
- 'indent',
- 'outdent',
- 'divider',
- 'table',
- 'image',
- 'link',
- 'divider',
- 'code',
- 'codeblock'
- ]
-}
diff --git a/frontend/src/components/MarkdownEditor/index.vue b/frontend/src/components/MarkdownEditor/index.vue
deleted file mode 100644
index 4a6d8b0f..00000000
--- a/frontend/src/components/MarkdownEditor/index.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
-
diff --git a/frontend/src/components/Overview/NodeOverview.vue b/frontend/src/components/Overview/NodeOverview.vue
index e6412343..65773c74 100644
--- a/frontend/src/components/Overview/NodeOverview.vue
+++ b/frontend/src/components/Overview/NodeOverview.vue
@@ -5,11 +5,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/frontend/src/i18n/index.js b/frontend/src/i18n/index.js
index e5f6618e..6c89075b 100644
--- a/frontend/src/i18n/index.js
+++ b/frontend/src/i18n/index.js
@@ -6,7 +6,7 @@ import zh from './zh'
Vue.use(VueI18n)
const i18n = new VueI18n({
- locale: localStorage.getItem('lang') || 'en',
+ locale: localStorage.getItem('lang') || 'zh',
messages: {
en,
zh
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index fb49de32..fc6d545c 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -30,13 +30,13 @@ export default {
'Latest Tasks': '最近任务',
'Latest Deploys': '最近部署',
- // 状态
- PENDING: '待定',
- STARTED: '已开始',
- SUCCESS: '成功',
- FAILURE: '错误',
- UNAVAILABLE: '未知',
- REVOKED: '已取消',
+ // 任务状态
+ Pending: '待定',
+ Running: '进行中',
+ Finished: '已完成',
+ Error: '错误',
+ NA: '未知',
+ Cancelled: '已取消',
// 操作
Add: '添加',
@@ -72,6 +72,7 @@ export default {
'Node Info': '节点信息',
'Node Name': '节点名称',
'Node IP': '节点IP',
+ 'Node MAC': '节点MAC',
'Node Port': '节点端口',
'Description': '描述',
diff --git a/frontend/src/store/modules/node.js b/frontend/src/store/modules/node.js
index aec4e681..48c01ee5 100644
--- a/frontend/src/store/modules/node.js
+++ b/frontend/src/store/modules/node.js
@@ -27,27 +27,11 @@ const actions = {
getNodeList ({ state, commit }) {
request.get('/nodes', {})
.then(response => {
- commit('SET_NODE_LIST', response.data.items)
- })
- },
- addNode ({ state, dispatch }) {
- request.put('/nodes', {
- name: state.nodeForm.name,
- ip: state.nodeForm.ip,
- port: state.nodeForm.port,
- description: state.nodeForm.description
- })
- .then(() => {
- dispatch('getNodeList')
+ commit('SET_NODE_LIST', response.data.data)
})
},
editNode ({ state, dispatch }) {
- request.post(`/nodes/${state.nodeForm._id}`, {
- name: state.nodeForm.name,
- ip: state.nodeForm.ip,
- port: state.nodeForm.port,
- description: state.nodeForm.description
- })
+ request.post(`/nodes/${state.nodeForm._id}`, state.nodeForm)
.then(() => {
dispatch('getNodeList')
})
@@ -61,23 +45,14 @@ const actions = {
getNodeData ({ state, commit }, id) {
request.get(`/nodes/${id}`)
.then(response => {
- commit('SET_NODE_FORM', response.data)
- })
- },
- getDeployList ({ state, commit }, id) {
- return request.get(`/nodes/${id}/get_deploys`)
- .then(response => {
- commit('deploy/SET_DEPLOY_LIST',
- response.data.items.map(d => d)
- .sort((a, b) => a.finish_ts < b.finish_ts ? 1 : -1),
- { root: true })
+ commit('SET_NODE_FORM', response.data.data)
})
},
getTaskList ({ state, commit }, id) {
- return request.get(`/nodes/${id}/get_tasks`)
+ return request.get(`/nodes/${id}/tasks`)
.then(response => {
commit('task/SET_TASK_LIST',
- response.data.items.map(d => d)
+ response.data.data.map(d => d)
.sort((a, b) => a.create_ts < b.create_ts ? 1 : -1),
{ root: true })
})
diff --git a/frontend/src/store/modules/schedule.js b/frontend/src/store/modules/schedule.js
index 3c322133..44ab7218 100644
--- a/frontend/src/store/modules/schedule.js
+++ b/frontend/src/store/modules/schedule.js
@@ -20,7 +20,7 @@ const actions = {
getScheduleList ({ state, commit }) {
request.get('/schedules')
.then(response => {
- commit('SET_SCHEDULE_LIST', response.data.items)
+ commit('SET_SCHEDULE_LIST', response.data.data)
})
},
addSchedule ({ state }) {
diff --git a/frontend/src/store/modules/spider.js b/frontend/src/store/modules/spider.js
index 25f1260f..1d603e87 100644
--- a/frontend/src/store/modules/spider.js
+++ b/frontend/src/store/modules/spider.js
@@ -76,43 +76,13 @@ const actions = {
if (state.filterSite) {
params.site = state.filterSite
}
- console.log(params)
return request.get('/spiders', params)
.then(response => {
- commit('SET_SPIDER_LIST', response.data.items)
- })
- },
- addSpider ({ state, dispatch }) {
- return request.put('/spiders', {
- name: state.spiderForm.name,
- col: state.spiderForm.col,
- type: 'configurable',
- site: state.spiderForm.site
- })
- .then(() => {
- dispatch('getSpiderList')
+ commit('SET_SPIDER_LIST', response.data.data)
})
},
editSpider ({ state, dispatch }) {
- return request.post(`/spiders/${state.spiderForm._id}`, {
- name: state.spiderForm.name,
- src: state.spiderForm.src,
- cmd: state.spiderForm.cmd,
- type: state.spiderForm.type,
- lang: state.spiderForm.lang,
- col: state.spiderForm.col,
- site: state.spiderForm.site,
- // configurable spider
- crawl_type: state.spiderForm.crawl_type,
- start_url: state.spiderForm.start_url,
- url_pattern: state.spiderForm.url_pattern,
- item_selector: state.spiderForm.item_selector,
- item_selector_type: state.spiderForm.item_selector_type,
- pagination_selector: state.spiderForm.pagination_selector,
- pagination_selector_type: state.spiderForm.pagination_selector_type,
- obey_robots_txt: state.spiderForm.obey_robots_txt,
- item_threshold: state.spiderForm.item_threshold
- })
+ return request.post(`/spiders/${state.spiderForm._id}`, state.spiderForm)
.then(() => {
dispatch('getSpiderList')
})
@@ -123,60 +93,24 @@ const actions = {
dispatch('getSpiderList')
})
},
- updateSpiderEnvs ({ state }) {
- return request.post(`/spiders/${state.spiderForm._id}/update_envs`, {
- envs: JSON.stringify(state.spiderForm.envs)
- })
- },
- updateSpiderFields ({ state }) {
- return request.post(`/spiders/${state.spiderForm._id}/update_fields`, {
- fields: JSON.stringify(state.spiderForm.fields)
- })
- },
- updateSpiderDetailFields ({ state }) {
- return request.post(`/spiders/${state.spiderForm._id}/update_detail_fields`, {
- detail_fields: JSON.stringify(state.spiderForm.detail_fields)
- })
- },
getSpiderData ({ state, commit }, id) {
return request.get(`/spiders/${id}`)
.then(response => {
- let data = response.data
- data.cron_enabled = !!data.cron_enabled
+ let data = response.data.data
commit('SET_SPIDER_FORM', data)
})
},
- deploySpider ({ state, dispatch }, id) {
- return request.post(`/spiders/${id}/deploy`)
- .then(response => {
- console.log(response.data)
- })
- .then(response => {
- dispatch('getSpiderData', id)
- dispatch('getSpiderList')
- })
- },
crawlSpider ({ state, dispatch }, id) {
- return request.post(`/spiders/${id}/on_crawl`)
- .then(response => {
- console.log(response.data)
- })
- },
- getDeployList ({ state, commit }, id) {
- return request.get(`/spiders/${id}/get_deploys`)
- .then(response => {
- commit('deploy/SET_DEPLOY_LIST',
- response.data.items.map(d => {
- return d
- }).sort((a, b) => a.finish_ts < b.finish_ts ? 1 : -1),
- { root: true })
- })
+ return request.put(`/tasks`, {
+ spider_id: id
+ // TODO: node_id
+ })
},
getTaskList ({ state, commit }, id) {
- return request.get(`/spiders/${id}/get_tasks`)
+ return request.get(`/spiders/${id}/tasks`)
.then(response => {
commit('task/SET_TASK_LIST',
- response.data.items.map(d => {
+ response.data.data.map(d => {
return d
}).sort((a, b) => a.create_ts < b.create_ts ? 1 : -1),
{ root: true })
@@ -185,15 +119,6 @@ const actions = {
importGithub ({ state }) {
const url = state.importForm.url
return request.post('/spiders/import/github', { url })
- .then(response => {
- console.log(response)
- })
- },
- deployAll () {
- return request.post('/spiders/manage/deploy_all')
- .then(response => {
- console.log(response)
- })
},
getSpiderStats ({ state, commit }) {
return request.get('/stats/get_spider_stats?spider_id=' + state.spiderForm._id)
diff --git a/frontend/src/store/modules/task.js b/frontend/src/store/modules/task.js
index 906f9f69..d0520087 100644
--- a/frontend/src/store/modules/task.js
+++ b/frontend/src/store/modules/task.js
@@ -15,14 +15,28 @@ const state = {
spider_id: ''
},
// pagination
- pageNum: 0,
+ pageNum: 1,
pageSize: 10,
// results
resultsPageNum: 1,
resultsPageSize: 10
}
-const getters = {}
+const getters = {
+ taskResultsColumns (state) {
+ if (!state.taskResultsData.length) {
+ return []
+ }
+ const keys = []
+ const item = state.taskResultsData[0]
+ for (const key in item) {
+ if (item.hasOwnProperty(key)) {
+ keys.push(key)
+ }
+ }
+ return keys
+ }
+}
const mutations = {
SET_TASK_FORM (state, value) {
@@ -64,8 +78,9 @@ const actions = {
getTaskData ({ state, dispatch, commit }, id) {
return request.get(`/tasks/${id}`)
.then(response => {
- let data = response.data
+ let data = response.data.data
commit('SET_TASK_FORM', data)
+ console.log(data)
dispatch('spider/getSpiderData', data.spider_id, { root: true })
dispatch('node/getNodeData', data.node_id, { root: true })
})
@@ -74,14 +89,12 @@ const actions = {
return request.get('/tasks', {
page_num: state.pageNum,
page_size: state.pageSize,
- filter: {
- node_id: state.filter.node_id || undefined,
- spider_id: state.filter.spider_id || undefined
- }
+ node_id: state.filter.node_id || undefined,
+ spider_id: state.filter.spider_id || undefined
})
.then(response => {
- commit('SET_TASK_LIST', response.data.items)
- commit('SET_TASK_LIST_TOTAL_COUNT', response.data.total_count)
+ commit('SET_TASK_LIST', response.data.data || [])
+ commit('SET_TASK_LIST_TOTAL_COUNT', response.data.total)
})
},
deleteTask ({ state, dispatch }, id) {
@@ -97,21 +110,20 @@ const actions = {
})
},
getTaskLog ({ state, commit }, id) {
- return request.get(`/tasks/${id}/get_log`)
+ return request.get(`/tasks/${id}/log`)
.then(response => {
- commit('SET_TASK_LOG', response.data.log)
+ commit('SET_TASK_LOG', response.data.data)
})
},
getTaskResults ({ state, commit }, id) {
- return request.get(`/tasks/${id}/get_results`, {
+ return request.get(`/tasks/${id}/results`, {
page_num: state.resultsPageNum,
page_size: state.resultsPageSize
})
.then(response => {
- commit('SET_TASK_RESULTS_DATA', response.data.items)
- commit('SET_TASK_RESULTS_COLUMNS', response.data.fields)
- commit('SET_TASK_RESULTS_COLUMNS', response.data.fields)
- commit('SET_TASK_RESULTS_TOTAL_COUNT', response.data.total_count)
+ commit('SET_TASK_RESULTS_DATA', response.data.data)
+ // commit('SET_TASK_RESULTS_COLUMNS', response.data.fields)
+ commit('SET_TASK_RESULTS_TOTAL_COUNT', response.data.total)
})
}
}
diff --git a/frontend/src/views/node/NodeDetail.vue b/frontend/src/views/node/NodeDetail.vue
index 7de7a677..527da581 100644
--- a/frontend/src/views/node/NodeDetail.vue
+++ b/frontend/src/views/node/NodeDetail.vue
@@ -57,9 +57,6 @@ export default {
// get node basic info
this.$store.dispatch('node/getNodeData', this.$route.params.id)
- // get node deploy list
- this.$store.dispatch('node/getDeployList', this.$route.params.id)
-
// get node task list
this.$store.dispatch('node/getTaskList', this.$route.params.id)
}
diff --git a/frontend/src/views/node/NodeList.vue b/frontend/src/views/node/NodeList.vue
index be916f44..33d8a67f 100644
--- a/frontend/src/views/node/NodeList.vue
+++ b/frontend/src/views/node/NodeList.vue
@@ -41,7 +41,7 @@
:property="col.name"
:label="$t(col.label)"
:sortable="col.sortable"
- align="center"
+ :align="col.align || 'left'"
:width="col.width">
@@ -50,9 +50,6 @@
将文件拖到此处，或点击上传
-
-
-
- ![]()
-
-
-
-
-
-
- {{$t('Deploy All')}}
-
{{$t('Import Spiders')}}
@@ -173,6 +170,15 @@