{{activeLang.name + $t(' is not installed, do you want to install it?')}}
-
+
{{$t('Install')}}
@@ -86,7 +117,9 @@ export default {
depList: [],
loading: false,
isShowInstalled: false,
- installedDepList: []
+ installedDepList: [],
+ depLoadingDict: {},
+ isLoadingInstallLang: false
}
},
computed: {
@@ -101,6 +134,9 @@ export default {
}
return {}
},
+ activeLangName () {
+ return this.activeLang.executable_name
+ },
computedDepList () {
if (this.isShowInstalled) {
return this.installedDepList
@@ -117,7 +153,19 @@ export default {
dep_name: this.depName
})
this.loading = false
- this.depList = res.data.data.sort((a, b) => a.name > b.name ? 1 : -1)
+ this.depList = res.data.data
+
+ if (this.activeLangName === 'python') {
+ // 排序
+ this.depList = this.depList.sort((a, b) => a.name > b.name ? 1 : -1)
+
+ // 异步获取python附加信息
+ this.depList.map(async dep => {
+ const res = await this.$request.get(`/system/deps/${this.activeLang.executable_name}/${dep.name}/json`)
+ dep.version = res.data.data.version
+ dep.description = res.data.data.description
+ })
+ }
},
async getInstalledDepList () {
this.loading = true
@@ -128,8 +176,7 @@ export default {
this.installedDepList = res.data.data
},
async fetchAllDepList (queryString, callback) {
- const res = await this.$request.get('/system/deps', {
- lang: this.activeLang.executable_name,
+ const res = await this.$request.get(`/system/deps/${this.activeLang.executable_name}`, {
dep_name: queryString
})
callback(res.data.data ? res.data.data.map(d => {
@@ -137,16 +184,101 @@ export default {
}) : [])
},
onSearch () {
- if (!this.isShowInstalled) {
- this.getDepList()
- } else {
- this.getInstalledDepList()
- }
+ this.isShowInstalled = false
+ this.getDepList()
+ this.$st.sendEv('节点详情', '安装', '搜索依赖')
},
onIsShowInstalledChange (val) {
if (val) {
this.getInstalledDepList()
+ } else {
+ this.depName = ''
+ this.depList = []
}
+ this.$st.sendEv('节点详情', '安装', '点击查看已安装')
+ },
+ async onClickInstallDep (dep) {
+ const name = dep.name
+ this.$set(this.depLoadingDict, name, true)
+ const arr = this.$route.path.split('/')
+ const id = arr[arr.length - 1]
+ const data = await this.$request.post(`/nodes/${id}/deps/install`, {
+ lang: this.activeLang.executable_name,
+ dep_name: name
+ })
+ if (!data || data.error) {
+ this.$notify.error({
+ title: this.$t('Installing dependency failed'),
+ message: this.$t('The dependency installation is unsuccessful: ') + name
+ })
+ } else {
+ this.$notify.success({
+ title: this.$t('Installing dependency successful'),
+ message: this.$t('You have successfully installed a dependency: ') + name
+ })
+ dep.installed = true
+ }
+ this.$set(this.depLoadingDict, name, false)
+ this.$st.sendEv('节点详情', '安装', '安装依赖')
+ },
+ async onClickUninstallDep (dep) {
+ const name = dep.name
+ this.$set(this.depLoadingDict, name, true)
+ const arr = this.$route.path.split('/')
+ const id = arr[arr.length - 1]
+ const data = await this.$request.post(`/nodes/${id}/deps/uninstall`, {
+ lang: this.activeLang.executable_name,
+ dep_name: name
+ })
+ if (!data || data.error) {
+ this.$notify.error({
+ title: this.$t('Uninstalling dependency failed'),
+ message: this.$t('The dependency uninstallation is unsuccessful: ') + name
+ })
+ } else {
+ this.$notify.success({
+ title: this.$t('Uninstalling dependency successful'),
+ message: this.$t('You have successfully uninstalled a dependency: ') + name
+ })
+ dep.installed = false
+ }
+ this.$set(this.depLoadingDict, name, false)
+ this.$st.sendEv('节点详情', '安装', '卸载依赖')
+ },
+ getDepLoading (dep) {
+ const name = dep.name
+ if (this.depLoadingDict[name] === undefined) {
+ return false
+ }
+ return this.depLoadingDict[name]
+ },
+ async onClickInstallLang () {
+ this.isLoadingInstallLang = true
+ const res = await this.$request.post(`/nodes/${this.nodeForm._id}/langs/install`, {
+ lang: this.activeLang.executable_name
+ })
+ if (!res || res.error) {
+ this.$notify.error({
+ title: this.$t('Installing language failed'),
+ message: this.$t('The language installation is unsuccessful: ') + this.activeLang.name
+ })
+ } else {
+ this.$notify.success({
+ title: this.$t('Installing language successful'),
+ message: this.$t('You have successfully installed a language: ') + this.activeLang.name
+ })
+ }
+ this.isLoadingInstallLang = false
+ this.$st.sendEv('节点详情', '安装', '安装语言')
+ },
+ onTabChange () {
+ if (this.isShowInstalled) {
+ this.getInstalledDepList()
+ } else {
+ this.depName = ''
+ this.depList = []
+ }
+ this.$st.sendEv('节点详情', '安装', '切换标签')
}
},
async created () {
@@ -160,5 +292,13 @@ export default {
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 7fef483c..b15efd50 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -223,6 +223,8 @@ export default {
'error': '错误',
'Not Found Node': '节点配置错误',
'Not Found Spider': '爬虫配置错误',
+ '[minute] [hour] [day] [month] [day of week]': '[分] [时] [天] [月] [星期几]',
+ 'Enable/Disable': '启用/禁用',
// 网站
'Site': '网站',
@@ -267,6 +269,7 @@ export default {
'Number of CPU': 'CPU数',
'Executables': '执行文件',
'Latest Version': '最新版本',
+ 'Version': '版本',
// 弹出框
'Notification': '提示',
@@ -299,7 +302,26 @@ export default {
'Disclaimer': '免责声明',
'Please search dependencies': '请搜索依赖',
'No Data': '暂无数据',
- 'Show installed': '只看已安装',
+ 'Show installed': '查看已安装',
+ 'Installing dependency successful': '安装依赖成功',
+ 'Installing dependency failed': '安装依赖失败',
+ 'You have successfully installed a dependency: ': '您已成功安装依赖: ',
+ 'The dependency installation is unsuccessful: ': '安装依赖失败: ',
+ 'Uninstalling dependency successful': '卸载依赖成功',
+ 'Uninstalling dependency failed': '卸载依赖失败',
+ 'You have successfully uninstalled a dependency: ': '您已成功卸载依赖: ',
+ 'The dependency uninstallation is unsuccessful: ': '卸载依赖失败: ',
+ 'Installing language successful': '安装语言成功',
+ 'Installing language failed': '安装语言失败',
+ 'You have successfully installed a language: ': '您已成功安装语言: ',
+ 'The language installation is unsuccessful: ': '安装语言失败: ',
+ 'Enabling the schedule successful': '启用定时任务成功',
+ 'Disabling the schedule successful': '禁用定时任务成功',
+ 'Enabling the schedule unsuccessful': '启用定时任务失败',
+ 'Disabling the schedule unsuccessful': '禁用定时任务失败',
+ 'The schedule has been removed': '已删除定时任务',
+ 'The schedule has been added': '已添加定时任务',
+ 'The schedule has been saved': '已保存定时任务',
// 登录
'Sign in': '登录',
@@ -334,5 +356,8 @@ export default {
add_cron: '生成Cron',
// Cron Format: [second] [minute] [hour] [day of month] [month] [day of week]
cron_format: 'Cron 格式: [秒] [分] [小时] [日] [月] [周]'
- }
+ },
+
+ // 其他
+ 'Star crawlab-team/crawlab on GitHub': '在 GitHub 上为 Crawlab 加星吧'
}
diff --git a/frontend/src/store/modules/schedule.js b/frontend/src/store/modules/schedule.js
index e71d5f03..9fde4e84 100644
--- a/frontend/src/store/modules/schedule.js
+++ b/frontend/src/store/modules/schedule.js
@@ -21,7 +21,12 @@ const actions = {
getScheduleList ({ state, commit }) {
request.get('/schedules')
.then(response => {
- commit('SET_SCHEDULE_LIST', response.data.data)
+ commit('SET_SCHEDULE_LIST', response.data.data.map(d => {
+ const arr = d.cron.split(' ')
+ arr.splice(0, 1)
+ d.cron = arr.join(' ')
+ return d
+ }))
})
},
addSchedule ({ state }) {
@@ -33,11 +38,11 @@ const actions = {
removeSchedule ({ state }, id) {
request.delete(`/schedules/${id}`)
},
- stopSchedule ({ state, dispatch }, id) {
- return request.post(`/schedules/${id}/stop`)
+ enableSchedule ({ state, dispatch }, id) {
+ return request.post(`/schedules/${id}/enable`)
},
- runSchedule ({ state, dispatch }, id) {
- return request.post(`/schedules/${id}/run`)
+ disableSchedule ({ state, dispatch }, id) {
+ return request.post(`/schedules/${id}/disable`)
}
}
diff --git a/frontend/src/store/modules/spider.js b/frontend/src/store/modules/spider.js
index 0b669a6d..4632483a 100644
--- a/frontend/src/store/modules/spider.js
+++ b/frontend/src/store/modules/spider.js
@@ -180,6 +180,11 @@ const actions = {
async getTemplateList ({ state, commit }) {
const res = await request.get(`/config_spiders_templates`)
commit('SET_TEMPLATE_LIST', res.data.data)
+ },
+ async getScheduleList ({ state, commit }, payload) {
+ const { id } = payload
+ const res = await request.get(`/spiders/${id}/schedules`)
+ commit('schedule/SET_SCHEDULE_LIST', res.data.data, { root: true })
}
}
diff --git a/frontend/src/views/layout/components/Navbar.vue b/frontend/src/views/layout/components/Navbar.vue
index 52960c21..882fbfa7 100644
--- a/frontend/src/views/layout/components/Navbar.vue
+++ b/frontend/src/views/layout/components/Navbar.vue
@@ -34,6 +34,17 @@
+
+
+
+ Star
+
+