This is an automated email from the ASF dual-hosted git repository.
lgcareer pushed a commit to branch dev-resource-tree
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev-resource-tree by this push:
new 865c95f Resource tree bug fix (#2040)
865c95f is described below
commit 865c95feb818d8f7bd80fed58be119750e575718
Author: break60 <[email protected]>
AuthorDate: Fri Feb 28 17:58:55 2020 +0800
Resource tree bug fix (#2040)
* File management list modification
* Shell task resources and authorization resources
* Spark task resource changes
* UDF resource tree and change DAG style
* Breadcrumb development
* Breadcrumb development
* Resource tree bug fix
---
.../home/pages/dag/_source/plugIn/jsPlumbHandle.js | 31 +++++++++++-----------
.../js/conf/home/pages/dag/_source/plugIn/util.js | 2 +-
.../resource/pages/file/pages/details/index.vue | 2 +-
.../pages/file/pages/subdirectory/_source/list.vue | 1 +
.../pages/file/pages/subdirectory/index.vue | 2 +-
.../pages/udf/pages/createUdfFolder/index.vue | 2 +-
.../pages/udf/pages/subUdfDirectory/index.vue | 2 +-
.../src/js/conf/home/router/index.js | 4 +--
.../src/js/module/i18n/locale/zh_CN.js | 2 +-
9 files changed, 25 insertions(+), 23 deletions(-)
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
index bcc05f1..77ff8ea 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
@@ -374,7 +374,7 @@ JSP.prototype.tasksClick = function (e) {
$('.w').removeClass('jtk-tasks-active')
$(e.currentTarget).addClass('jtk-tasks-active')
if ($connect) {
- setSvgColor($connect, '#555')
+ setSvgColor($connect, '#2d8cf0')
this.selectedElement.connect = null
}
this.selectedElement.id = $(e.currentTarget).attr('id')
@@ -428,24 +428,25 @@ JSP.prototype.connectClick = function (e) {
* @param {Pointer}
*/
JSP.prototype.handleEventPointer = function (is) {
+ console.log(is)
let wDom = $('.w')
this.setConfig({
isClick: is,
isAttachment: false
})
- wDom.removeClass('jtk-ep')
- if (!is) {
- wDom.removeClass('jtk-tasks-active')
- this.selectedElement = {}
- _.map($('#canvas svg'), v => {
- if ($(v).attr('class')) {
- _.map($(v).find('path'), v1 => {
- $(v1).attr('fill', '#555')
- $(v1).attr('stroke', '#555')
- })
- }
- })
- }
+ // wDom.removeClass('jtk-ep')
+ // if (!is) {
+ // wDom.removeClass('jtk-tasks-active')
+ // this.selectedElement = {}
+ // _.map($('#canvas svg'), v => {
+ // if ($(v).attr('class')) {
+ // _.map($(v).find('path'), v1 => {
+ // $(v1).attr('fill', '#2d8cf0')
+ // $(v1).attr('stroke', '#2d8cf0')
+ // })
+ // }
+ // })
+ // }
}
/**
@@ -746,7 +747,7 @@ JSP.prototype.jspBackfill = function ({ connects,
locations, largeJson }) {
source: sourceId,
target: targetId,
type: 'basic',
- paintStyle: { strokeWidth: 2, stroke: '#555' }
+ paintStyle: { strokeWidth: 2, stroke: '#2d8cf0' }
})
})
})
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
index c10dfda..9dbc3ef 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
@@ -99,7 +99,7 @@ const setSvgColor = (e, color) => {
// Traverse clear all colors
$('.jtk-connector').each((i, o) => {
_.map($(o)[0].childNodes, v => {
- $(v).attr('fill', '#555').attr('stroke', '#555').attr('stroke-width', 2)
+ $(v).attr('fill', '#2d8cf0').attr('stroke',
'#2d8cf0').attr('stroke-width', 2)
})
})
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
index e961d8b..6875cd4 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
@@ -21,7 +21,7 @@
<h2>
<span>{{name}}</span>
<div class="down">
- <em class="ans-icon-download" data-container="body"
data-toggle="tooltip" :title="$t('Download Details')"
@click="_downloadFile"></em>
+ <em class="ans-icon-download" style="font-size:20px"
data-container="body" data-toggle="tooltip" :title="$t('Download Details')"
@click="_downloadFile"></em>
<em>{{size}}</em>
</div>
</h2>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
index c851e48..f5e801a 100755
---
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
@@ -95,6 +95,7 @@
size="xsmall"
data-toggle="tooltip"
:title="$t('Download')"
+ :disabled="item.directory? true: false"
@click="_downloadFile(item)"
icon="ans-icon-download">
</x-button>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
index d694548..77d6881 100755
---
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
@@ -24,7 +24,7 @@
<x-button type="ghost" @click="() => $router.push({path:
`/resource/file/subFile/${searchParams.id}`})">{{$t('Create File')}}</x-button>
<x-button type="ghost" @click="_uploading">{{$t('Upload
Files')}}</x-button>
<span class="bread">(</span>
- <a class="bread" @click="() => $router.push({path:
`/resource/file`})">全部文件</a>
+ <a class="bread" @click="() => $router.push({path:
`/resource/file`})">{{$t('File Manage')}}</a>
<a class="bread" v-for="(item,$index) in breadList" :key="$index"
@click="_ckOperation($index)">{{'>'+item}}</a>
<span class="bread">)</span>
</x-button-group>
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/createUdfFolder/index.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/createUdfFolder/index.vue
index fe7e077..c707ce8 100755
---
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/createUdfFolder/index.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/createUdfFolder/index.vue
@@ -91,7 +91,7 @@
this.$message.success(res.msg)
setTimeout(() => {
this.spinnerLoading = false
- this.$router.push({ path: `/resource/udf/resource`})
+ this.$router.push({ path: `/resource/udf`})
}, 800)
}).catch(e => {
this.$message.error(e.msg || '')
diff --git
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue
index e943549..a97fc87 100644
---
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue
+++
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/subUdfDirectory/index.vue
@@ -23,7 +23,7 @@
<x-button type="ghost" @click="() => $router.push({name:
'resource-udf-subCreateUdfFolder'})">{{$t('Create folder')}}</x-button>
<x-button type="ghost" size="small"
@click="_uploading">{{$t('Upload UDF Resources')}}</x-button>
<span class="bread">(</span>
- <a class="bread" @click="() => $router.push({path:
`/resource/udf`})">全部文件</a>
+ <a class="bread" @click="() => $router.push({path:
`/resource/udf`})">{{$t('Resource manage')}}</a>
<a class="bread" v-for="(item,$index) in breadList" :key="$index"
@click="_ckOperation($index)">{{'>'+item}}</a>
<span class="bread">)</span>
</x-button-group>
diff --git a/dolphinscheduler-ui/src/js/conf/home/router/index.js
b/dolphinscheduler-ui/src/js/conf/home/router/index.js
index 8151f72..8a18965 100644
--- a/dolphinscheduler-ui/src/js/conf/home/router/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/router/index.js
@@ -247,7 +247,7 @@ const router = new Router({
name: 'resource-file-subdirectory',
component: resolve =>
require(['../pages/resource/pages/file/pages/subdirectory/index'], resolve),
meta: {
- title: `${i18n.$t('File Subdirectory')}`
+ title: `${i18n.$t('File Manage')}`
}
},
{
@@ -279,7 +279,7 @@ const router = new Router({
name: 'resource-udf-subUdfDirectory',
component: resolve =>
require(['../pages/resource/pages/udf/pages/subUdfDirectory/index'], resolve),
meta: {
- title: `${i18n.$t('File Subdirectory')}`
+ title: `${i18n.$t('UDF Resources')}`
}
},
{
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 97325fd..70c4ffd 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -526,7 +526,7 @@ export default {
'0 means unlimited by byte': 'KB，0代表不限制',
'0 means unlimited by count': '0代表不限制',
'Modify User': '修改用户',
- 'Whether directory' : '是否目录',
+ 'Whether directory' : '是否文件夹',
'Yes': '是',
'No': '否'
}
