+
{{$t('message.linkis.jobId')}}
@@ -44,12 +44,13 @@
class="datepicker"
:options="shortcutOpt"
v-model="searchBar.shortcut"
- type="daterange"
+ type="datetimerange"
placement="bottom-start"
- format="yyyy-MM-dd"
+ format="yyyy-MM-dd HH:mm"
:placeholder="$t('message.linkis.formItems.date.placeholder')"
- style="width: 160px"
+ style="width: 250px"
:editable="false"
+ @on-change="onDatePickerChange"
/>
@@ -61,6 +62,15 @@
style="width:80px;"
/>
+
+ {{$t('message.linkis.formItems.runType.label')}}
+
{{$t('message.linkis.formItems.engine.label')}}
@@ -86,13 +96,20 @@
style="width:150px;"
/>
+
+
{{ $t('message.linkis.search') }}
{{ isAdminModel ? $t('message.linkis.generalView') : $t('message.linkis.manageView') }}
+ >{{ isAdminModel ? $t('message.linkis.generalView') : (isDeptAdmin && !isLogAdmin && !isHistoryAdmin ? $t('message.linkis.deptManageView') : $t('message.linkis.manageView')) }}
{{ showAdvance ? $t('message.linkis.hideAdvancedSearch') : $t('message.linkis.showAdvancedSearch') }}
+
+ {{$t('message.linkis.tableSetting')}}
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+ {{ $t('message.linkis.downloadLog') }}
+
@@ -149,6 +191,7 @@ import storage from '@/common/helper/storage'
import table from '@/components/virtualTable'
import mixin from '@/common/service/mixin'
import api from '@/common/service/api'
+import axios from 'axios'
export default {
name: 'GlobalHistory',
components: {
@@ -160,13 +203,15 @@ export default {
return {
list: [],
column: [],
+ visibleColumns: [],
getEngineTypes: [],
isLoading: false,
showAdvance: false,
pageSetting: {
total: 0,
pageSize: 50,
- current: 1
+ current: 1,
+ sizeOpts: [25, 50, 100]
},
searchBar: {
id: null,
@@ -174,10 +219,22 @@ export default {
creator: '',
engine: 'all',
status: '',
- shortcut: [today, today]
+ shortcut: [new Date(today.setHours(0, 0, 0, 0)), new Date(today.setHours(23, 59, 59, 0))],
},
inputType: 'number',
shortcutOpt: {
+ disabledDate(date) {
+ if (!date) {
+ return false;
+ }
+
+ const now = new Date();
+ const ninetyDaysAgo = new Date(now);
+ ninetyDaysAgo.setDate(now.getDate() - 90);
+ ninetyDaysAgo.setHours(0, 0, 0, 0);
+
+ return date.valueOf() < ninetyDaysAgo.valueOf() || date.valueOf() > now.valueOf();
+ },
shortcuts: [
{
text: this.$t('message.linkis.shortcuts.week'),
@@ -278,23 +335,55 @@ export default {
],
isLogAdmin: false,
isHistoryAdmin: false,
+ isDeptAdmin: false,
isAdminModel: false,
- moduleHeight: 300
+ moduleHeight: 300,
+ lastChooseDate: ['', ''],
+ curDateTime: ['', ''],
+ downloading: false
}
},
async created() {
// Get whether it is a historical administrator(获取是否是历史管理员权限)
- await api.fetch('/jobhistory/governanceStationAdmin', 'get').then(res => {
- this.isLogAdmin = res.admin
- this.isHistoryAdmin = res.historyAdmin
- })
- await api.fetch('/configuration/engineType', 'get').then(res => {
- this.getEngineTypes = ['all', ...res.engineType]
- })
+ try {
+ await api.fetch('/jobhistory/governanceStationAdmin', 'get').then(res => {
+ this.isLogAdmin = res.admin
+ this.isHistoryAdmin = res.historyAdmin
+ this.isDeptAdmin = res.deptAdmin
+ })
+ await api.fetch('/configuration/engineType', 'get').then(res => {
+ this.getEngineTypes = ['all', ...res.engineType]
+ })
+ } catch(err) {
+ window.console.warn(err);
+ }
+
},
mounted() {
+ if(sessionStorage.getItem('last-page-columns')) {
+ this.visibleColumns = JSON.parse(sessionStorage.getItem('last-page-columns'))
+ } else {
+ this.visibleColumns = this.getColumns().filter(
+ (item) => {
+ return [
+ 'checked',
+ 'control',
+ 'taskID',
+ 'source',
+ 'executionCode',
+ 'status',
+ 'costTime',
+ 'failedReason',
+ 'requestApplicationName',
+ 'createdTime',
+ 'isReuse',
+ ].includes(item.key)
+ }
+ ).map(item => item.title);
+ this.visibleColumns.push(this.$t('message.linkis.tableColumns.user'));
+ }
+
this.init()
- this.moduleHeight = this.$parent.$el.clientHeight - 220
// Monitor window changes and get browser width and height(监听窗口变化，获取浏览器宽高)
window.addEventListener('resize', this.getHeight)
},
@@ -310,17 +399,96 @@ export default {
sessionStorage.removeItem('last-searchbar-status');
sessionStorage.removeItem('last-pageSetting-status');
sessionStorage.removeItem('last-searchbar-advance');
+ sessionStorage.removeItem('last-page-columns');
}
next();
},
activated() {
this.init()
},
+ computed: {
+ filteredColumns() {
+ return this.column.filter(item => this.visibleColumns.includes(item.title));
+ }
+ },
methods: {
+ async download() {
+ try {
+
+ if(this.downloading) return;
+ if(this.pageSetting.total >= 10000) {
+ this.$Modal.confirm({
+ title: this.$t('message.linkis.countinueDownload'),
+ content: this.$t('message.linkis.exceed10000'),
+ onOk: async () => {
+ try {
+ const params = this.getParams();
+ params.pageNow = 1;
+ params.pageSize = 10000;
+ this.downloading = true;
+ const res = await axios({
+ url: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/jobhistory/download-job-list`,
+ method: 'get',
+ responseType: 'blob',
+ params,
+ headers: {
+ 'Content-Language': localStorage.getItem('locale') || 'zh-CN'
+ }
+ })
+
+ let blob = res.data
+ let url = window.URL.createObjectURL(blob);
+ let l = document.createElement('a')
+ l.href = url;
+ l.download = 'ResultOfJobHistory';
+ document.body.appendChild(l);
+ l.click()
+ window.URL.revokeObjectURL(url)
+ this.downloading = false
+ this.$Message.success(this.$t('message.linkis.downloadSucceed'))
+ } catch (err) {
+ window.console.warn(err)
+ this.downloading = false;
+ }
+
+ }
+ })
+ } else {
+ this.downloading = true
+ const params = this.getParams();
+ params.pageNow = 1;
+ params.pageSize = 10000;
+ const res = await axios({
+ url: process.env.VUE_APP_MN_CONFIG_PREFIX || `http://${window.location.host}/api/rest_j/v1/jobhistory/download-job-list`,
+ method: 'get',
+ responseType: 'blob',
+ params,
+ headers: {
+ 'Content-Language': localStorage.getItem('locale') || 'zh-CN'
+ }
+ })
+ let blob = res.data
+ let url = window.URL.createObjectURL(blob);
+ let l = document.createElement('a')
+ l.href = url;
+ l.download = 'ResultOfJobHistory';
+ document.body.appendChild(l);
+ l.click()
+ window.URL.revokeObjectURL(url)
+ this.downloading = false
+ this.$Message.success(this.$t('message.linkis.downloadSucceed'))
+ }
+
+ } catch(err) {
+ this.downloading = false
+ }
+
+
+ },
getHeight() {
- this.moduleHeight = this.$parent.$el.clientHeight - 228
+ this.moduleHeight = this.$parent.$el.clientHeight - this.$refs.searchBar.offsetHeight - 210;
if(this.showAdvance) {
- this.moduleHeight -= 42
+ this.moduleHeight -= 10
}
},
clickAdvance() {
@@ -338,18 +506,20 @@ export default {
lastSearch.shortcut = [new Date(lastSearch.shortcut[0]), new Date(lastSearch.shortcut[1])]
} else {
const today = new Date(new Date().toLocaleDateString())
- lastSearch.shortcut = [today, today]
+ lastSearch.shortcut = [new Date(today.setHours(0, 0, 0, 0)), new Date(today.setHours(23, 59, 59, 0))]
}
this.searchBar = lastSearch
}
- if (lastPage) {
- this.pageSetting = lastPage
- }
- if (isAdminModel) {
- this.switchAdmin()
- } else {
- this.search()
- }
+ this.$nextTick(()=> {
+ if (lastPage) {
+ this.pageSetting = lastPage
+ }
+ if (isAdminModel) {
+ this.switchAdmin(true)
+ } else {
+ this.search(true)
+ }
+ })
storage.remove('last-pageSetting-status')
},
convertTimes(runningTime) {
@@ -401,6 +571,7 @@ export default {
storage.set('last-searchbar-status', this.searchBar)
storage.set('last-pageSetting-status', this.pageSetting)
storage.set('last-searchbar-advance', this.showAdvance)
+ storage.set('last-page-columns', this.visibleColumns)
// Jump to view the history details page(跳转查看历史详情页面)
this.$router.push({
path: '/console/viewHistory',
@@ -409,20 +580,23 @@ export default {
},
getParams(page) {
- const startDate = this.searchBar.shortcut[0] ? new Date(this.searchBar.shortcut[0].setHours(0, 0, 0, 0)) : this.searchBar.shortcut[0]
- const endDate = this.searchBar.shortcut[1] ? new Date(this.searchBar.shortcut[1].setHours(23, 59, 59, 0)): this.searchBar.shortcut[1]
+ const startDate = this.searchBar.shortcut[0] ? new Date(this.searchBar.shortcut[0].setSeconds(0)) : this.searchBar.shortcut[0]
+ const endDate = this.searchBar.shortcut[1] ? new Date(this.searchBar.shortcut[1].setSeconds(59)): this.searchBar.shortcut[1]
const params = {
taskID: this.searchBar.id,
+ runType: this.searchBar.runType,
creator: this.searchBar.creator,
executeApplicationName: this.searchBar.engine,
status: this.searchBar.status,
startDate: startDate && startDate.getTime(),
endDate: endDate && endDate.getTime(),
+ engineInstance: this.searchBar.engineInstance,
pageNow: page || this.pageSetting.current,
pageSize: this.pageSetting.pageSize,
proxyUser: this.searchBar.proxyUser,
- isAdminView: this.isAdminModel,
- instance: this.searchBar.instance?.replace(/ /g, '') || ''
+ isAdminView: this.isAdminModel && (storage.get('isLogAdmin') || storage.get('isLogHistoryAdmin')),
+ instance: this.searchBar.instance?.replace(/ /g, '') || '',
+ isDeptView: this.isAdminModel && storage.get('isLogDeptAdmin') && !storage.get('isLogAdmin') && !storage.get('isLogHistoryAdmin')
}
if (!this.isAdminModel) {
delete params.proxyUser
@@ -435,6 +609,8 @@ export default {
delete params.endDate
delete params.proxyUser
delete params.instance
+ delete params.engineInstance
+ delete params.runType
} else {
let { engine, status, shortcut } = this.searchBar
if (engine === 'all') {
@@ -462,17 +638,33 @@ export default {
.then(rst => {
this.isLoading = false
this.list = this.getList(rst.tasks)
- this.pageSetting.current = page
- this.pageSetting.total = rst.totalPage
+ // this.pageSetting.current = page
+ const maxPage = Math.ceil(rst.totalPage / this.pageSetting.pageSize);
+ if(maxPage < page) {
+ this.pageSetting.current = maxPage;
+ } else {
+ this.pageSetting.current = page;
+ }
+ this.pageSetting.total = rst.totalPage;
})
.catch(() => {
this.isLoading = false
this.list = []
})
},
- search() {
+ // page size change(页容量变化)
+ changePageSize(pageSize) {
+ this.pageSetting.pageSize = pageSize
+ if(this.pageSetting.current === 1) this.search()
+ this.pageSetting.current = 1
+ },
+ search(isInit = false) {
this.isLoading = true
+ if(!isInit) {
+ this.pageSetting.current = 1;
+ }
const params = this.getParams()
+
this.column = this.getColumns()
api
.fetch('/jobhistory/list', params, 'get')
@@ -510,6 +702,15 @@ export default {
runType: item.runType,
instance: item.instance,
engineInstance: item.engineInstance,
+ isReuse: item.isReuse === null
+ ? ''
+ : item.isReuse
+ ? this.$t('message.linkis.yes')
+ : this.$t('message.linkis.no'),
+ requestSpendTime: item.requestSpendTime,
+ requestStartTime: item.requestStartTime,
+ requestEndTime: item.requestEndTime,
+ metrics: item.metrics
}
})
}
@@ -518,7 +719,12 @@ export default {
disabled:
['Submitted', 'Inited', 'Scheduled', 'Running'].indexOf(item.status) === -1,
failedReason: getFailedReason(item),
- source: item.sourceTailor
+ source: item.sourceTailor,
+ isReuse: item.isReuse === null
+ ? ''
+ : item.isReuse
+ ? this.$t('message.linkis.yes')
+ : this.$t('message.linkis.no'),
})
})
},
@@ -606,13 +812,56 @@ export default {
}
},
{
- title: this.$t('message.linkis.tableColumns.requestApplicationName') + ' / ' + this.$t('message.linkis.tableColumns.executeApplicationName'),
+ title: this.$t('message.linkis.tableColumns.isReuse'),
+ key: 'isReuse',
+ align: 'center',
+ width: 100,
+ // renderType: 'tooltip',
+ },
+ {
+ title: this.$t('message.linkis.tableColumns.requestStartTime'),
+ key: 'requestStartTime',
+ align: 'center',
+ width: 150,
+ // overflow to show(溢出以...显示)
+ renderType: 'formatTime'
+ // renderType: 'tooltip',
+ },
+ {
+ title: this.$t('message.linkis.tableColumns.requestEndTime'),
+ key: 'requestEndTime',
+ align: 'center',
+ width: 150,
+ renderType: 'formatTime'
+ // renderType: 'tooltip',
+ },
+ {
+ title: this.$t('message.linkis.tableColumns.requestSpendTime'),
+ key: 'requestSpendTime',
+ align: 'center',
+ width: 100,
+ // overflow to show(溢出以...显示)
+ renderType: 'convertTime'
+ // renderType: 'tooltip',
+ },
+ {
+ title: this.$t('message.linkis.tableColumns.metrix'),
+ key: 'metrics',
+ align: 'center',
+ width: 300,
+ // overflow to show(溢出以...显示)
+ ellipsis: true
+ // renderType: 'tooltip',
+ },
+ {
+ title: this.$t('message.linkis.tableColumns.requestApplicationName') + ' / ' + this.$t('message.linkis.tableColumns.runType') + ' / ' + this.$t('message.linkis.tableColumns.executeApplicationName'),
key: 'requestApplicationName',
align: 'center',
width: 130,
- renderType: 'concat',
+ renderType: 'multiConcat',
renderParams: {
- concatKey: 'executeApplicationName'
+ concatKey1: 'runType',
+ concatKey2: 'executeApplicationName'
}
},
@@ -646,14 +895,15 @@ export default {
shortcut: ''
}
},
- switchAdmin() {
+ switchAdmin(isInit = false) {
if (!this.isLoading) {
if (this.isAdminModel) {
this.searchBar.id = null
this.searchBar.proxyUser = ''
+
}
this.isAdminModel = !this.isAdminModel
- this.search()
+ this.search(isInit)
}
},
linkTo(params) {
@@ -715,12 +965,43 @@ export default {
Promise.all(p).then(()=> {
this.$Message.success(this.$t('message.linkis.udf.success'));
- this.search()
+ this.search(false)
})
}
})
- }
+ },
+ // 改造日期选择器选择日期时默认时间段为00:00-23:59
+ onDatePickerChange(date) {
+ // 兼容重复修改时间段00:00-00:00的情况
+ const isLastChooseDefault = (this.lastChooseDate[0].slice(-5) === '00:00'&& this.lastChooseDate[1].slice(-5) === '00:00')
+ && (date[0].slice(-5) === '00:00'&& date[1].slice(-5) === '00:00')
+ && (this.lastChooseDate[0].slice(0, 10) === date[0].slice(0, 10) && this.lastChooseDate[1].slice(0, 10) === date[1].slice(0, 10))
+
+ // 是否手动改动日期为00:00-00:00，条件：更改过日期 && （ 上次时间为00:00-(xx:xx) || (上次时间为（xx:xx)-00:00)）
+ const isChooseDefault = (date[0].slice(-5) === '00:00'&& date[1].slice(-5) === '00:00')
+ &&
+ (
+ (this.lastChooseDate[0].slice(-5) === '00:00'
+ && ((this.lastChooseDate[1].slice(-5, -3) === '00' && this.lastChooseDate[1].slice(-2) !== '00') || (this.lastChooseDate[1].slice(-5, -3) !== '00' && this.lastChooseDate[1].slice(-2) === '00')))
+ || (this.lastChooseDate[1].slice(-5) === '00:00'
+ && ((this.lastChooseDate[0].slice(-5, -3) === '00' && this.lastChooseDate[0].slice(-2) !== '00') || (this.lastChooseDate[0].slice(-5, -3) !== '00' && this.lastChooseDate[0].slice(-2) === '00'))))
+
+ if(isLastChooseDefault || isChooseDefault) {
+ this.lastChooseDate = JSON.parse(JSON.stringify(date))
+ return
+ }
+ // 修改日期默认为00:00-23:59
+ if(date[0].slice(-5) === '00:00'&& date[1].slice(-5) === '00:00') {
+ this.searchBar.shortcut = [new Date(new Date(date[0]).setHours(0, 0, 0, 0)), new Date(new Date(date[1]).setHours(23, 59, 59, 0))]
+ this.curDateTime = JSON.parse(JSON.stringify([date[0].split(' ')[0]+' 00:00', date[1].split(' ')[0] + ' 23:59']))
+ } else {
+ this.curDateTime = JSON.parse(JSON.stringify(date))
+ }
+ this.lastChooseDate = JSON.parse(JSON.stringify(this.curDateTime))
+ },
}
}
-
+
diff --git a/linkis-web/src/apps/linkis/module/globalHistoryManagement/log.vue b/linkis-web/src/apps/linkis/module/globalHistoryManagement/log.vue
new file mode 100644
index 0000000000..ff8bd5c54a
--- /dev/null
+++ b/linkis-web/src/apps/linkis/module/globalHistoryManagement/log.vue
@@ -0,0 +1,165 @@
+
+
+
+
+
+
+
+
diff --git a/linkis-web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue b/linkis-web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue
index 67556e127e..fc1574e1b6 100644
--- a/linkis-web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue
+++ b/linkis-web/src/apps/linkis/module/globalHistoryManagement/viewHistory.vue
@@ -1,3 +1,4 @@
+
+
-
-
+
+
+
+ {{foldFlag ? $t('message.linkis.unfold') : $t('message.linkis.fold')}}
{{$t('message.linkis.back')}}
+
diff --git a/linkis-web/src/apps/linkis/module/header/index.vue b/linkis-web/src/apps/linkis/module/header/index.vue
index 7af5a55c57..1486ee110b 100644
--- a/linkis-web/src/apps/linkis/module/header/index.vue
+++ b/linkis-web/src/apps/linkis/module/header/index.vue
@@ -99,13 +99,13 @@ export default {
linkTo(type) {
let url = "";
if (type === "book") {
- url = `https://linkis.apache.org/`;
+ url = `https://github.com/WeBankFinTech/DataSphereStudio/blob/master/docs/zh_CN/ch3/DSS_User_Manual.md`;
} else if (type === "github") {
- url = `https://linkis.apache.org/`;
+ url = `https://github.com/WeBankFinTech/DataSphereStudio`;
} else if (type === "freedback") {
- url = "https://linkis.apache.org/";
+ url = "https://wj.qq.com/s2/4943071/c037/ ";
if (localStorage.getItem("locale") === "en") {
- url = "https://linkis.apache.org/";
+ url = "https://wj.qq.com/s2/4943706/5a8b";
}
}
util.windowOpen(url);
diff --git a/linkis-web/src/apps/linkis/module/header/userMenu.vue b/linkis-web/src/apps/linkis/module/header/userMenu.vue
index 7e93ee0e6f..15606b4efa 100644
--- a/linkis-web/src/apps/linkis/module/header/userMenu.vue
+++ b/linkis-web/src/apps/linkis/module/header/userMenu.vue
@@ -124,8 +124,10 @@ export default {
// Chinese to English(中文切换英文)
if (localStorage.getItem('locale') === 'zh-CN') {
localStorage.setItem('locale', 'en');
+ localStorage.setItem('fes_locale', 'en-US');
} else {
localStorage.setItem('locale', 'zh-CN');
+ localStorage.setItem('fes_locale', 'zh-CN');
}
window.location.reload();
}
diff --git a/linkis-web/src/apps/linkis/module/ipListManagement/index.vue b/linkis-web/src/apps/linkis/module/ipListManagement/index.vue
index 2c833f6697..9ef476d9ff 100644
--- a/linkis-web/src/apps/linkis/module/ipListManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/ipListManagement/index.vue
@@ -431,7 +431,7 @@ export default {
}
},
created() {
- this.userName = storage.get('userName') || storage.get('baseInfo', 'local').username || '';
+ this.userName = storage.get('userName') || storage.get('baseInfo', 'local')?.username || '';
this.init();
}
diff --git a/linkis-web/src/apps/linkis/module/microServiceManagement/index.scss b/linkis-web/src/apps/linkis/module/microServiceManagement/index.scss
index 663e993b23..47b5362217 100644
--- a/linkis-web/src/apps/linkis/module/microServiceManagement/index.scss
+++ b/linkis-web/src/apps/linkis/module/microServiceManagement/index.scss
@@ -59,13 +59,13 @@
}
.microService {
height: 100%;
- /deep/ .ivu-tag {
+ ::v-deep .ivu-tag {
max-width: 140px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
- /deep/ .ivu-tooltip-inner {
+ ::v-deep .ivu-tooltip-inner {
max-width: 100%;
}
}
\ No newline at end of file
diff --git a/linkis-web/src/apps/linkis/module/microServiceManagement/index.vue b/linkis-web/src/apps/linkis/module/microServiceManagement/index.vue
index 74addbbc56..f9d4b8a2a1 100644
--- a/linkis-web/src/apps/linkis/module/microServiceManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/microServiceManagement/index.vue
@@ -34,7 +34,7 @@
{{
- $t("message.linkis.tableColumns.engineType")
+ $t("message.linkis.tableColumns.serveType")
}}
{{
diff --git a/linkis-web/src/apps/linkis/module/pythonModule/index.js b/linkis-web/src/apps/linkis/module/pythonModule/index.js
new file mode 100644
index 0000000000..126a73fa17
--- /dev/null
+++ b/linkis-web/src/apps/linkis/module/pythonModule/index.js
@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+export default {
+ name: 'pythonModule',
+ events: [],
+ component: () => import('./index.vue'),
+};
\ No newline at end of file
diff --git a/linkis-web/src/apps/linkis/module/resourceManagement/index.scss b/linkis-web/src/apps/linkis/module/resourceManagement/index.scss
index b45cfa80db..732b2a29d4 100644
--- a/linkis-web/src/apps/linkis/module/resourceManagement/index.scss
+++ b/linkis-web/src/apps/linkis/module/resourceManagement/index.scss
@@ -45,7 +45,7 @@ td.table-name-column {
cursor: pointer;
}
}
-/deep/.table-project-column {
+::v-deep .table-project-column {
text-align: center;
.ivu-table-cell {
display: inline-block;
@@ -78,7 +78,7 @@ td.table-project-column {
padding-right: 10px;
}
}
-/deep/.addTagClass {
+::v-deep .addTagClass {
position: relative;
z-index: 99;
}
@@ -110,7 +110,7 @@ td.table-name-column {
cursor: pointer;
}
}
-/deep/.table-project-column {
+::v-deep .table-project-column {
text-align: center;
.ivu-table-cell {
display: inline-block;
@@ -124,20 +124,20 @@ td.table-project-column {
text-align: center;
padding: 10px 0;
}
-/deep/.addTagClass {
+::v-deep .addTagClass {
position: relative;
z-index: 99;
}
.ecm, .ecmEngine {
height: 100%;
overflow: hidden;
- /deep/ .ivu-tag {
+ ::v-deep .ivu-tag {
max-width: 140px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
- /deep/ .ivu-tooltip-inner {
+ ::v-deep .ivu-tooltip-inner {
max-width: 100%;
}
}
diff --git a/linkis-web/src/apps/linkis/module/resourceManagement/index.vue b/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
index 5fc070bdbd..ab6aeea90d 100644
--- a/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/resourceManagement/index.vue
@@ -143,25 +143,25 @@
- {{`${calcCompanyAdmin(row, 'usedResource', 'cores')},${calcCompanyAdmin(row, 'usedResource', 'memory')},${calcCompanyAdmin(row, 'usedResource', 'instance')}`}}
+ {{`${calcCompanyAdmin(row, 'usedResource', 'cores')},${calcCompanyAdmin(row, 'usedResource', 'memory')},${calcCompanyAdmin(row, 'usedResource', 'instances')}`}}
- {{`${calcCompanyAdmin(row, 'lockedResource', 'cores')},${calcCompanyAdmin(row, 'lockedResource', 'memory')},${calcCompanyAdmin(row, 'lockedResource', 'instance')}`}}
+ {{`${calcCompanyAdmin(row, 'lockedResource', 'cores')},${calcCompanyAdmin(row, 'lockedResource', 'memory')},${calcCompanyAdmin(row, 'lockedResource', 'instances')}`}}
- {{`${calcCompanyAdmin(row, 'maxResource', 'cores')},${calcCompanyAdmin(row, 'maxResource', 'memory')},${calcCompanyAdmin(row, 'maxResource', 'instance')}`}}
+ {{`${calcCompanyAdmin(row, 'maxResource', 'cores')},${calcCompanyAdmin(row, 'maxResource', 'memory')},${calcCompanyAdmin(row, 'maxResource', 'instances')}`}}
- {{`${calcCompanyAdmin(row, 'leftResource', 'cores')},${calcCompanyAdmin(row, 'leftResource', 'memory')},${calcCompanyAdmin(row, 'leftResource', 'instance')}`}}
+ {{`${calcCompanyAdmin(row, 'leftResource', 'cores')},${calcCompanyAdmin(row, 'leftResource', 'memory')},${calcCompanyAdmin(row, 'leftResource', 'instances')}`}}
- {{`${calcCompanyAdmin(row, 'usedResource', 'cores', true)},${calcCompanyAdmin(row, 'usedResource', 'memory', true)},${calcCompanyAdmin(row, 'usedResource', 'instance', true)}`}}
+ {{`${calcCompanyAdmin(row, 'usedResource', 'cores', true)},${calcCompanyAdmin(row, 'usedResource', 'memory', true)},${calcCompanyAdmin(row, 'usedResource', 'instances', true)}`}}
- {{`${calcCompanyAdmin(row, 'maxResource', 'cores', true)},${calcCompanyAdmin(row, 'maxResource', 'memory', true)},${calcCompanyAdmin(row, 'maxResource', 'instance', true)}`}}
+ {{`${calcCompanyAdmin(row, 'maxResource', 'cores', true)},${calcCompanyAdmin(row, 'maxResource', 'memory', true)},${calcCompanyAdmin(row, 'maxResource', 'instances', true)}`}}
- {{`${calcCompanyAdmin(row, 'leftResource', 'cores', true)},${calcCompanyAdmin(row, 'leftResource', 'memory', true)},${calcCompanyAdmin(row, 'leftResource', 'instance', true)}`}}
+ {{`${calcCompanyAdmin(row, 'leftResource', 'cores', true)},${calcCompanyAdmin(row, 'leftResource', 'memory', true)},${calcCompanyAdmin(row, 'leftResource', 'instances', true)}`}}
diff --git a/linkis-web/src/apps/linkis/module/resourceManagement/log.vue b/linkis-web/src/apps/linkis/module/resourceManagement/log.vue
index 837cfe94dc..5d583d9afb 100644
--- a/linkis-web/src/apps/linkis/module/resourceManagement/log.vue
+++ b/linkis-web/src/apps/linkis/module/resourceManagement/log.vue
@@ -27,7 +27,7 @@
{{$t('message.linkis.download')}}
{{$t('message.linkis.back')}}
-
+
{
const {emInstance, instance, logPath } = this.param;
// eslint-disable-next-line no-unused-vars
-
+
const url = `/api/rest_j/v1/engineconnManager/downloadEngineLog?emInstance=${emInstance}&instance=${instance}&logDirSuffix=${encodeURIComponent(logPath)}&logType=${this.tabName}`;
const downloadLink = document.createElement('a');
@@ -116,7 +116,7 @@ export default {
document.body.removeChild(downloadLink);
}
})
-
+
},
async getLogs(fromLine, param) {
if (param) {
@@ -137,7 +137,7 @@ export default {
}
}
let res = await api.fetch('/linkisManager/openEngineLog', params, 'post') || {};
- this.param.logPath = res.result.logPath.split('/').slice(0, -1).join('/');
+ this.param.logPath = res.result?.logPath?.split('/').slice(0, -1).join('/');
if (res && res.result) {
if (res.result.rows < 1000) { // the last page(最后一页)
this.page.totalSize = this.page.pageNow * 1000
diff --git a/linkis-web/src/apps/linkis/module/setting/setting.vue b/linkis-web/src/apps/linkis/module/setting/setting.vue
index 7e6ea424d5..b3bb9330a9 100644
--- a/linkis-web/src/apps/linkis/module/setting/setting.vue
+++ b/linkis-web/src/apps/linkis/module/setting/setting.vue
@@ -398,8 +398,40 @@ export default {
cb(true);
}, 200);
},
+ preCheckConfig() {
+ try {
+ this.fullTree.forEach((item) => {
+ if (item.settings) {
+ item.settings.forEach((s) => {
+ if (
+ s.key === "spark.conf" && s.configValue
+ ) {
+ const kvList = s.configValue.split(';').map(kv => kv.replace(/^\s+|\s+$/g,''));
+ kvList.forEach((kv) => {
+ if(kv && !/^[\w.-]+=[\w.-]+$/.test(kv)) {
+ this.unValidMsg = {key: s.key, msg: s.description}
+ throw new Error('invalid')
+ }
+ });
+ const formattedKvString = kvList.join(';\n');
+ s.configValue = formattedKvString.trim();
+ }
+ });
+ }
+ });
+ return true;
+ } catch(err) {
+ window.console.warn(err);
+ this.isAdvancedShow = true;
+ return false;
+ }
+ },
save() {
this.loading = true;
+ if(!this.preCheckConfig()) {
+ this.loading = false;
+ return;
+ }
this.checkValid();
api
.fetch("/configuration/saveFullTree", {
@@ -411,6 +443,20 @@ export default {
this.getAppVariable(this.activeMenu);
this.unValidMsg = {};
this.$Message.success(this.$t("message.linkis.save"));
+ this.$Modal.confirm({
+ title: this.$t('message.linkis.setting.killEngineTitle'),
+ content: this.$t('message.linkis.setting.killEngine'),
+ onOk: async () => {
+ try {
+ api.fetch("/linkisManager/rm/killEngineByCreatorEngineType", {
+ creator: this.currentTabName,
+ engineType: this.subCategory[this.currentTabName] ? this.subCategory[this.currentTabName].categoryName : null
+ })
+ } catch (err) {
+ window.console.warn(err)
+ }
+ }
+ })
})
.catch((err) => {
this.loading = false;
@@ -747,7 +793,7 @@ export default {
font-size: 14px;
}
.tabs {
- /deep/.ivu-tabs-bar {
+ ::v-deep .ivu-tabs-bar {
&::before {
content: '';
display: block;
@@ -756,7 +802,7 @@ export default {
float: left;
}
}
- /deep/.ivu-tabs-tab:not(:last-of-type) {
+ ::v-deep .ivu-tabs-tab:not(:last-of-type) {
position: relative;
&::after {
content: '';
diff --git a/linkis-web/src/apps/linkis/module/statisticsDashboard/statisticsDashboard.vue b/linkis-web/src/apps/linkis/module/statisticsDashboard/statisticsDashboard.vue
index 2600cbf868..751b80a080 100644
--- a/linkis-web/src/apps/linkis/module/statisticsDashboard/statisticsDashboard.vue
+++ b/linkis-web/src/apps/linkis/module/statisticsDashboard/statisticsDashboard.vue
@@ -434,7 +434,7 @@ export default {
top: 0;
right: 20px;
}
-/deep/ .table-div {
+::v-deep .table-div {
height: 100% !important;
}
diff --git a/linkis-web/src/apps/linkis/module/tenantTagManagement/index.vue b/linkis-web/src/apps/linkis/module/tenantTagManagement/index.vue
index 4818e09b7a..740d0b4457 100644
--- a/linkis-web/src/apps/linkis/module/tenantTagManagement/index.vue
+++ b/linkis-web/src/apps/linkis/module/tenantTagManagement/index.vue
@@ -103,6 +103,12 @@
+
+
+ {{$t('message.linkis.ipListManagement.yes')}}
+ {{$t('message.linkis.ipListManagement.no')}}
+
+
{{ $t('message.linkis.tenantTagManagement.yourTagMapping') }}
@@ -118,6 +124,7 @@
\ No newline at end of file
diff --git a/linkis-web/src/components/consoleComponent/toolbar.vue b/linkis-web/src/components/consoleComponent/toolbar.vue
index bcdff0af06..bbbe640c51 100644
--- a/linkis-web/src/components/consoleComponent/toolbar.vue
+++ b/linkis-web/src/components/consoleComponent/toolbar.vue
@@ -67,7 +67,7 @@