Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
deeplearning
DolphinScheduler
提交
7a483736
DolphinScheduler
项目概览
deeplearning
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
24
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
7a483736
编写于
5月 07, 2020
作者:
X
xingchun-chen
提交者:
GitHub
5月 07, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'dev' into dev
上级
97d09e1d
b5dbe94f
变更
62
展开全部
隐藏空白更改
内联
并排
Showing
62 changed file
with
1065 addition
and
1058 deletion
+1065
-1058
.github/workflows/ci_frontend.yml
.github/workflows/ci_frontend.yml
+1
-0
.github/workflows/ci_ut.yml
.github/workflows/ci_ut.yml
+2
-1
dolphinscheduler-ui/.eslintrc
dolphinscheduler-ui/.eslintrc
+0
-6
dolphinscheduler-ui/.eslintrc.yml
dolphinscheduler-ui/.eslintrc.yml
+34
-0
dolphinscheduler-ui/package.json
dolphinscheduler-ui/package.json
+8
-0
dolphinscheduler-ui/src/js/conf/home/index.js
dolphinscheduler-ui/src/js/conf/home/index.js
+5
-5
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
...scheduler-ui/src/js/conf/home/pages/dag/_source/config.js
+30
-32
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js
...hinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js
+151
-152
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/commcon.js
...home/pages/dag/_source/formModel/tasks/_source/commcon.js
+7
-7
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/index.js
...ui/src/js/conf/home/pages/dag/_source/jumpAffirm/index.js
+3
-3
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/downChart.js
...ui/src/js/conf/home/pages/dag/_source/plugIn/downChart.js
+11
-11
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/dragZoom.js
...-ui/src/js/conf/home/pages/dag/_source/plugIn/dragZoom.js
+1
-2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
...rc/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
+70
-86
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
...uler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
+16
-16
dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js
...f/home/pages/monitor/pages/servers/_source/gaugeOption.js
+13
-13
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/common.js
...pages/projects/pages/_source/instanceConditions/common.js
+1
-1
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
...ges/projects/pages/definition/pages/list/_source/list.vue
+3
-1
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/util.js
...ages/projects/pages/definition/pages/list/_source/util.js
+4
-4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/tree.js
...ages/projects/pages/definition/pages/tree/_source/tree.js
+11
-12
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/util.js
...ages/projects/pages/definition/pages/tree/_source/util.js
+3
-3
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/chartConfig.js
...nf/home/pages/projects/pages/index/_source/chartConfig.js
+4
-5
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/_source/gantt.js
...ages/projects/pages/instance/pages/gantt/_source/gantt.js
+16
-17
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js
...nf/home/pages/resource/pages/file/pages/_source/common.js
+1
-1
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/utils.js
.../pages/resource/pages/file/pages/details/_source/utils.js
+0
-1
dolphinscheduler-ui/src/js/conf/home/router/index.js
dolphinscheduler-ui/src/js/conf/home/router/index.js
+8
-8
dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
+36
-36
dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js
dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js
+18
-18
dolphinscheduler-ui/src/js/conf/home/store/dag/state.js
dolphinscheduler-ui/src/js/conf/home/store/dag/state.js
+2
-2
dolphinscheduler-ui/src/js/conf/home/store/datasource/actions.js
...scheduler-ui/src/js/conf/home/store/datasource/actions.js
+9
-9
dolphinscheduler-ui/src/js/conf/home/store/monitor/actions.js
...hinscheduler-ui/src/js/conf/home/store/monitor/actions.js
+4
-4
dolphinscheduler-ui/src/js/conf/home/store/projects/actions.js
...inscheduler-ui/src/js/conf/home/store/projects/actions.js
+9
-9
dolphinscheduler-ui/src/js/conf/home/store/resource/actions.js
...inscheduler-ui/src/js/conf/home/store/resource/actions.js
+15
-15
dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
...inscheduler-ui/src/js/conf/home/store/security/actions.js
+38
-38
dolphinscheduler-ui/src/js/conf/home/store/security/state.js
dolphinscheduler-ui/src/js/conf/home/store/security/state.js
+1
-1
dolphinscheduler-ui/src/js/conf/home/store/user/actions.js
dolphinscheduler-ui/src/js/conf/home/store/user/actions.js
+7
-7
dolphinscheduler-ui/src/js/conf/login/index.js
dolphinscheduler-ui/src/js/conf/login/index.js
+2
-2
dolphinscheduler-ui/src/js/module/ana-charts/common.js
dolphinscheduler-ui/src/js/module/ana-charts/common.js
+2
-2
dolphinscheduler-ui/src/js/module/ana-charts/index.js
dolphinscheduler-ui/src/js/module/ana-charts/index.js
+1
-1
dolphinscheduler-ui/src/js/module/ana-charts/packages/bar/index.js
...heduler-ui/src/js/module/ana-charts/packages/bar/index.js
+3
-3
dolphinscheduler-ui/src/js/module/ana-charts/packages/funnel/index.js
...uler-ui/src/js/module/ana-charts/packages/funnel/index.js
+2
-2
dolphinscheduler-ui/src/js/module/ana-charts/packages/line/index.js
...eduler-ui/src/js/module/ana-charts/packages/line/index.js
+2
-2
dolphinscheduler-ui/src/js/module/ana-charts/packages/pie/index.js
...heduler-ui/src/js/module/ana-charts/packages/pie/index.js
+5
-5
dolphinscheduler-ui/src/js/module/ana-charts/packages/radar/index.js
...duler-ui/src/js/module/ana-charts/packages/radar/index.js
+1
-1
dolphinscheduler-ui/src/js/module/ana-charts/packages/scatter/index.js
...ler-ui/src/js/module/ana-charts/packages/scatter/index.js
+1
-1
dolphinscheduler-ui/src/js/module/axios/querystring.js
dolphinscheduler-ui/src/js/module/axios/querystring.js
+32
-32
dolphinscheduler-ui/src/js/module/components/crontab/source/_source/i18n/index.js
...js/module/components/crontab/source/_source/i18n/index.js
+0
-1
dolphinscheduler-ui/src/js/module/components/crontab/source/_source/i18n/locale/en_US.js
...le/components/crontab/source/_source/i18n/locale/en_US.js
+43
-43
dolphinscheduler-ui/src/js/module/components/crontab/source/_source/i18n/locale/zh_CN.js
...le/components/crontab/source/_source/i18n/locale/zh_CN.js
+43
-43
dolphinscheduler-ui/src/js/module/components/crontab/source/util/index.js
...-ui/src/js/module/components/crontab/source/util/index.js
+12
-14
dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
...ui/src/js/module/components/secondaryMenu/_source/menu.js
+2
-2
dolphinscheduler-ui/src/js/module/download/index.js
dolphinscheduler-ui/src/js/module/download/index.js
+4
-4
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+175
-174
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+175
-174
dolphinscheduler-ui/src/js/module/io/index.js
dolphinscheduler-ui/src/js/module/io/index.js
+5
-6
dolphinscheduler-ui/src/js/module/mixin/disabledState.js
dolphinscheduler-ui/src/js/module/mixin/disabledState.js
+1
-2
dolphinscheduler-ui/src/js/module/mixin/listUrlParamHandle.js
...hinscheduler-ui/src/js/module/mixin/listUrlParamHandle.js
+3
-3
dolphinscheduler-ui/src/js/module/permissions/index.js
dolphinscheduler-ui/src/js/module/permissions/index.js
+2
-2
dolphinscheduler-ui/src/js/module/util/index.js
dolphinscheduler-ui/src/js/module/util/index.js
+1
-3
dolphinscheduler-ui/src/js/module/util/routerUtil.js
dolphinscheduler-ui/src/js/module/util/routerUtil.js
+0
-3
dolphinscheduler-ui/src/js/module/util/util.js
dolphinscheduler-ui/src/js/module/util/util.js
+4
-5
dolphinscheduler-ui/src/lib/external/config.js
dolphinscheduler-ui/src/lib/external/config.js
+1
-1
dolphinscheduler-ui/src/lib/external/email.js
dolphinscheduler-ui/src/lib/external/email.js
+1
-1
未找到文件。
.github/workflows/ci_frontend.yml
浏览文件 @
7a483736
...
@@ -50,6 +50,7 @@ jobs:
...
@@ -50,6 +50,7 @@ jobs:
cd dolphinscheduler-ui
cd dolphinscheduler-ui
npm install node-sass --unsafe-perm
npm install node-sass --unsafe-perm
npm install
npm install
npm run lint
npm run build
npm run build
License-check
:
License-check
:
...
...
.github/workflows/ci_ut.yml
浏览文件 @
7a483736
...
@@ -75,6 +75,7 @@ jobs:
...
@@ -75,6 +75,7 @@ jobs:
-Dsonar.core.codeCoveragePlugin=jacoco
-Dsonar.core.codeCoveragePlugin=jacoco
-Dsonar.projectKey=apache-dolphinscheduler
-Dsonar.projectKey=apache-dolphinscheduler
-Dsonar.login=e4058004bc6be89decf558ac819aa1ecbee57682
-Dsonar.login=e4058004bc6be89decf558ac819aa1ecbee57682
-Dsonar.exclusions=dolphinscheduler-ui/src/**/i18n/locale/*.js
env
:
env
:
GITHUB_TOKEN
:
${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN
:
${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN
:
${{ secrets.SONAR_TOKEN }}
SONAR_TOKEN
:
${{ secrets.SONAR_TOKEN }}
...
@@ -83,4 +84,4 @@ jobs:
...
@@ -83,4 +84,4 @@ jobs:
mkdir -p ${LOG_DIR}
mkdir -p ${LOG_DIR}
cd ${DOCKER_DIR}
cd ${DOCKER_DIR}
docker-compose logs db > ${LOG_DIR}/db.txt
docker-compose logs db > ${LOG_DIR}/db.txt
continue-on-error
:
true
continue-on-error
:
true
\ No newline at end of file
dolphinscheduler-ui/.eslintrc
已删除
100644 → 0
浏览文件 @
97d09e1d
globals:
$: true
expect: true
rules:
"no-new": "off"
"no-labels": [2, {"allowLoop": true}]
dolphinscheduler-ui/.eslintrc.yml
0 → 100644
浏览文件 @
7a483736
#
# 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.
#
env
:
browser
:
true
es6
:
true
jquery
:
true
extends
:
-
'
plugin:vue/essential'
-
standard
globals
:
Atomics
:
readonly
SharedArrayBuffer
:
readonly
PUBLIC_PATH
:
readonly
parserOptions
:
ecmaVersion
:
2018
sourceType
:
module
plugins
:
-
vue
rules
:
{}
dolphinscheduler-ui/package.json
浏览文件 @
7a483736
...
@@ -8,6 +8,7 @@
...
@@ -8,6 +8,7 @@
"dev"
:
"cross-env NODE_ENV=development webpack-dev-server --config ./build/webpack.config.dev.js"
,
"dev"
:
"cross-env NODE_ENV=development webpack-dev-server --config ./build/webpack.config.dev.js"
,
"clean"
:
"rimraf dist"
,
"clean"
:
"rimraf dist"
,
"start"
:
"npm run dev"
,
"start"
:
"npm run dev"
,
"lint"
:
"eslint ./src --fix"
,
"build:release"
:
"npm run clean && cross-env NODE_ENV=production PUBLIC_PATH=/dolphinscheduler/ui webpack --config ./build/webpack.config.release.js"
"build:release"
:
"npm run clean && cross-env NODE_ENV=production PUBLIC_PATH=/dolphinscheduler/ui webpack --config ./build/webpack.config.release.js"
},
},
"dependencies"
:
{
"dependencies"
:
{
...
@@ -50,6 +51,13 @@
...
@@ -50,6 +51,13 @@
"css-loader"
:
"^0.28.8"
,
"css-loader"
:
"^0.28.8"
,
"cssnano"
:
"4.1.10"
,
"cssnano"
:
"4.1.10"
,
"env-parse"
:
"^1.0.5"
,
"env-parse"
:
"^1.0.5"
,
"eslint"
:
"^6.8.0"
,
"eslint-config-standard"
:
"^14.1.1"
,
"eslint-plugin-import"
:
"^2.20.2"
,
"eslint-plugin-node"
:
"^11.1.0"
,
"eslint-plugin-promise"
:
"^4.2.1"
,
"eslint-plugin-standard"
:
"^4.0.1"
,
"eslint-plugin-vue"
:
"^6.2.2"
,
"file-loader"
:
"^5.0.2"
,
"file-loader"
:
"^5.0.2"
,
"globby"
:
"^8.0.1"
,
"globby"
:
"^8.0.1"
,
"html-loader"
:
"^0.5.5"
,
"html-loader"
:
"^0.5.5"
,
...
...
dolphinscheduler-ui/src/js/conf/home/index.js
浏览文件 @
7a483736
...
@@ -31,15 +31,15 @@ import Permissions from '@/module/permissions'
...
@@ -31,15 +31,15 @@ import Permissions from '@/module/permissions'
import
'
ans-ui/lib/ans-ui.min.css
'
import
'
ans-ui/lib/ans-ui.min.css
'
import
ans
from
'
ans-ui/lib/ans-ui.min
'
import
ans
from
'
ans-ui/lib/ans-ui.min
'
import
en_US
from
'
ans-ui/lib/locale/en
'
// eslint-disable-line
import
en_US
from
'
ans-ui/lib/locale/en
'
// eslint-disable-line
import
'
normalize.css/normalize.css
'
import
'
normalize.css/normalize.css
'
import
'
sass/conf/home/index.scss
'
import
'
sass/conf/home/index.scss
'
import
'
bootstrap/dist/css/bootstrap.min.css
'
import
'
bootstrap/dist/css/bootstrap.min.css
'
import
'
bootstrap/dist/js/bootstrap.min.js
'
import
'
bootstrap/dist/js/bootstrap.min.js
'
import
'
canvg/dist/browser/canvg.min.js
'
import
'
canvg/dist/browser/canvg.min.js
'
// Component internationalization
// Component internationalization
le
t
useOpt
=
i18n
.
globalScope
.
LOCALE
===
'
en_US
'
?
{
locale
:
en_US
}
:
{}
cons
t
useOpt
=
i18n
.
globalScope
.
LOCALE
===
'
en_US
'
?
{
locale
:
en_US
}
:
{}
// Vue.use(ans)
// Vue.use(ans)
Vue
.
use
(
ans
,
useOpt
)
Vue
.
use
(
ans
,
useOpt
)
...
@@ -74,7 +74,7 @@ Permissions.request().then(res => {
...
@@ -74,7 +74,7 @@ Permissions.request().then(res => {
methods
:
{
methods
:
{
initApp
()
{
initApp
()
{
$
(
'
.global-loading
'
).
hide
()
$
(
'
.global-loading
'
).
hide
()
le
t
bootstrapTooltip
=
$
.
fn
.
tooltip
.
noConflict
()
cons
t
bootstrapTooltip
=
$
.
fn
.
tooltip
.
noConflict
()
$
.
fn
.
tooltip
=
bootstrapTooltip
$
.
fn
.
tooltip
=
bootstrapTooltip
$
(
'
body
'
).
tooltip
({
$
(
'
body
'
).
tooltip
({
selector
:
'
[data-toggle="tooltip"]
'
,
selector
:
'
[data-toggle="tooltip"]
'
,
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
浏览文件 @
7a483736
...
@@ -16,7 +16,6 @@
...
@@ -16,7 +16,6 @@
*/
*/
import
i18n
from
'
@/module/i18n
'
import
i18n
from
'
@/module/i18n
'
import
Permissions
from
'
@/module/permissions
'
/**
/**
* Operation bar config
* Operation bar config
...
@@ -26,7 +25,7 @@ import Permissions from '@/module/permissions'
...
@@ -26,7 +25,7 @@ import Permissions from '@/module/permissions'
* @desc tooltip
* @desc tooltip
*/
*/
const
toolOper
=
(
dagThis
)
=>
{
const
toolOper
=
(
dagThis
)
=>
{
let
disabled
=
!!
dagThis
.
$store
.
state
.
dag
.
isDetails
// Permissions.getAuth() === false ? false : !dagThis.$store.state.dag.isDetails
const
disabled
=
!!
dagThis
.
$store
.
state
.
dag
.
isDetails
// Permissions.getAuth() === false ? false : !dagThis.$store.state.dag.isDetails
return
[
return
[
{
{
code
:
'
pointer
'
,
code
:
'
pointer
'
,
...
@@ -67,7 +66,7 @@ const toolOper = (dagThis) => {
...
@@ -67,7 +66,7 @@ const toolOper = (dagThis) => {
* @desc tooltip
* @desc tooltip
* @code Backend definition identifier
* @code Backend definition identifier
*/
*/
le
t
publishStatus
=
[
cons
t
publishStatus
=
[
{
{
id
:
0
,
id
:
0
,
desc
:
`
${
i18n
.
$t
(
'
Unpublished
'
)}
`
,
desc
:
`
${
i18n
.
$t
(
'
Unpublished
'
)}
`
,
...
@@ -90,7 +89,7 @@ let publishStatus = [
...
@@ -90,7 +89,7 @@ let publishStatus = [
* @desc tooltip
* @desc tooltip
* @code identifier
* @code identifier
*/
*/
le
t
runningType
=
[
cons
t
runningType
=
[
{
{
desc
:
`
${
i18n
.
$t
(
'
Start Process
'
)}
`
,
desc
:
`
${
i18n
.
$t
(
'
Start Process
'
)}
`
,
code
:
'
START_PROCESS
'
code
:
'
START_PROCESS
'
...
@@ -146,85 +145,85 @@ let runningType = [
...
@@ -146,85 +145,85 @@ let runningType = [
* @icoUnicode iconfont
* @icoUnicode iconfont
* @isSpin is loading (Need to execute the code block to write if judgment)
* @isSpin is loading (Need to execute the code block to write if judgment)
*/
*/
le
t
tasksState
=
{
cons
t
tasksState
=
{
'
SUBMITTED_SUCCESS
'
:
{
SUBMITTED_SUCCESS
:
{
id
:
0
,
id
:
0
,
desc
:
`
${
i18n
.
$t
(
'
Submitted successfully
'
)}
`
,
desc
:
`
${
i18n
.
$t
(
'
Submitted successfully
'
)}
`
,
color
:
'
#A9A9A9
'
,
color
:
'
#A9A9A9
'
,
icoUnicode
:
'
ans-icon-dot-circle
'
,
icoUnicode
:
'
ans-icon-dot-circle
'
,
isSpin
:
false
isSpin
:
false
},
},
'
RUNNING_EXEUTION
'
:
{
RUNNING_EXEUTION
:
{
id
:
1
,
id
:
1
,
desc
:
`
${
i18n
.
$t
(
'
Executing
'
)}
`
,
desc
:
`
${
i18n
.
$t
(
'
Executing
'
)}
`
,
color
:
'
#0097e0
'
,
color
:
'
#0097e0
'
,
icoUnicode
:
'
ans-icon-gear
'
,
icoUnicode
:
'
ans-icon-gear
'
,
isSpin
:
true
isSpin
:
true
},
},
'
READY_PAUSE
'
:
{
READY_PAUSE
:
{
id
:
2
,
id
:
2
,
desc
:
`
${
i18n
.
$t
(
'
Ready to pause
'
)}
`
,
desc
:
`
${
i18n
.
$t
(
'
Ready to pause
'
)}
`
,
color
:
'
#07b1a3
'
,
color
:
'
#07b1a3
'
,
icoUnicode
:
'
ans-icon-pause-solid
'
,
icoUnicode
:
'
ans-icon-pause-solid
'
,
isSpin
:
false
isSpin
:
false
},
},
'
PAUSE
'
:
{
PAUSE
:
{
id
:
3
,
id
:
3
,
desc
:
`
${
i18n
.
$t
(
'
Pause
'
)}
`
,
desc
:
`
${
i18n
.
$t
(
'
Pause
'
)}
`
,
color
:
'
#057c72
'
,
color
:
'
#057c72
'
,
icoUnicode
:
'
ans-icon-pause
'
,
icoUnicode
:
'
ans-icon-pause
'
,
isSpin
:
false
isSpin
:
false
},
},
'
READY_STOP
'
:
{
READY_STOP
:
{
id
:
4
,
id
:
4
,
desc
:
`
${
i18n
.
$t
(
'
Ready to stop
'
)}
`
,
desc
:
`
${
i18n
.
$t
(
'
Ready to stop
'
)}
`
,
color
:
'
#FE0402
'
,
color
:
'
#FE0402
'
,
icoUnicode
:
'
ans-icon-coin
'
,
icoUnicode
:
'
ans-icon-coin
'
,
isSpin
:
false
isSpin
:
false
},
},
'
STOP
'
:
{
STOP
:
{
id
:
5
,
id
:
5
,
desc
:
`
${
i18n
.
$t
(
'
Stop
'
)}
`
,
desc
:
`
${
i18n
.
$t
(
'
Stop
'
)}
`
,
color
:
'
#e90101
'
,
color
:
'
#e90101
'
,
icoUnicode
:
'
ans-icon-stop
'
,
icoUnicode
:
'
ans-icon-stop
'
,
isSpin
:
false
isSpin
:
false
},
},
'
FAILURE
'
:
{
FAILURE
:
{
id
:
6
,
id
:
6
,
desc
:
`
${
i18n
.
$t
(
'
failed
'
)}
`
,
desc
:
`
${
i18n
.
$t
(
'
failed
'
)}
`
,
color
:
'
#000000
'
,
color
:
'
#000000
'
,
icoUnicode
:
'
ans-icon-fail-empty
'
,
icoUnicode
:
'
ans-icon-fail-empty
'
,
isSpin
:
false
isSpin
:
false
},
},
'
SUCCESS
'
:
{
SUCCESS
:
{
id
:
7
,
id
:
7
,
desc
:
`
${
i18n
.
$t
(
'
success
'
)}
`
,
desc
:
`
${
i18n
.
$t
(
'
success
'
)}
`
,
color
:
'
#33cc00
'
,
color
:
'
#33cc00
'
,
icoUnicode
:
'
ans-icon-success-empty
'
,
icoUnicode
:
'
ans-icon-success-empty
'
,
isSpin
:
false
isSpin
:
false
},
},
'
NEED_FAULT_TOLERANCE
'
:
{
NEED_FAULT_TOLERANCE
:
{
id
:
8
,
id
:
8
,
desc
:
`
${
i18n
.
$t
(
'
Need fault tolerance
'
)}
`
,
desc
:
`
${
i18n
.
$t
(
'
Need fault tolerance
'
)}
`
,
color
:
'
#FF8C00
'
,
color
:
'
#FF8C00
'
,
icoUnicode
:
'
ans-icon-pen
'
,
icoUnicode
:
'
ans-icon-pen
'
,
isSpin
:
false
isSpin
:
false
},
},
'
KILL
'
:
{
KILL
:
{
id
:
9
,
id
:
9
,
desc
:
`
${
i18n
.
$t
(
'
kill
'
)}
`
,
desc
:
`
${
i18n
.
$t
(
'
kill
'
)}
`
,
color
:
'
#a70202
'
,
color
:
'
#a70202
'
,
icoUnicode
:
'
ans-icon-minus-circle-empty
'
,
icoUnicode
:
'
ans-icon-minus-circle-empty
'
,
isSpin
:
false
isSpin
:
false
},
},
'
WAITTING_THREAD
'
:
{
WAITTING_THREAD
:
{
id
:
10
,
id
:
10
,
desc
:
`
${
i18n
.
$t
(
'
Waiting for thread
'
)}
`
,
desc
:
`
${
i18n
.
$t
(
'
Waiting for thread
'
)}
`
,
color
:
'
#912eed
'
,
color
:
'
#912eed
'
,
icoUnicode
:
'
ans-icon-sand-clock
'
,
icoUnicode
:
'
ans-icon-sand-clock
'
,
isSpin
:
false
isSpin
:
false
},
},
'
WAITTING_DEPEND
'
:
{
WAITTING_DEPEND
:
{
id
:
11
,
id
:
11
,
desc
:
`
${
i18n
.
$t
(
'
Waiting for dependence
'
)}
`
,
desc
:
`
${
i18n
.
$t
(
'
Waiting for dependence
'
)}
`
,
color
:
'
#5101be
'
,
color
:
'
#5101be
'
,
...
@@ -239,62 +238,61 @@ let tasksState = {
...
@@ -239,62 +238,61 @@ let tasksState = {
* @desc tooltip
* @desc tooltip
* @color color (tree and gantt)
* @color color (tree and gantt)
*/
*/
le
t
tasksType
=
{
cons
t
tasksType
=
{
'
SHELL
'
:
{
SHELL
:
{
desc
:
'
SHELL
'
,
desc
:
'
SHELL
'
,
color
:
'
#646464
'
color
:
'
#646464
'
},
},
'
SUB_PROCESS
'
:
{
SUB_PROCESS
:
{
desc
:
'
SUB_PROCESS
'
,
desc
:
'
SUB_PROCESS
'
,
color
:
'
#0097e0
'
color
:
'
#0097e0
'
},
},
'
PROCEDURE
'
:
{
PROCEDURE
:
{
desc
:
'
PROCEDURE
'
,
desc
:
'
PROCEDURE
'
,
color
:
'
#525CCD
'
color
:
'
#525CCD
'
},
},
'
SQL
'
:
{
SQL
:
{
desc
:
'
SQL
'
,
desc
:
'
SQL
'
,
color
:
'
#7A98A1
'
color
:
'
#7A98A1
'
},
},
'
SPARK
'
:
{
SPARK
:
{
desc
:
'
SPARK
'
,
desc
:
'
SPARK
'
,
color
:
'
#E46F13
'
color
:
'
#E46F13
'
},
},
'
FLINK
'
:
{
FLINK
:
{
desc
:
'
FLINK
'
,
desc
:
'
FLINK
'
,
color
:
'
#E46F13
'
color
:
'
#E46F13
'
},
},
'
MR
'
:
{
MR
:
{
desc
:
'
MapReduce
'
,
desc
:
'
MapReduce
'
,
color
:
'
#A0A5CC
'
color
:
'
#A0A5CC
'
},
},
'
PYTHON
'
:
{
PYTHON
:
{
desc
:
'
PYTHON
'
,
desc
:
'
PYTHON
'
,
color
:
'
#FED52D
'
color
:
'
#FED52D
'
},
},
'
DEPENDENT
'
:
{
DEPENDENT
:
{
desc
:
'
DEPENDENT
'
,
desc
:
'
DEPENDENT
'
,
color
:
'
#2FBFD8
'
color
:
'
#2FBFD8
'
},
},
'
HTTP
'
:
{
HTTP
:
{
desc
:
'
HTTP
'
,
desc
:
'
HTTP
'
,
color
:
'
#E46F13
'
color
:
'
#E46F13
'
},
},
'
DATAX
'
:
{
DATAX
:
{
desc
:
'
DataX
'
,
desc
:
'
DataX
'
,
color
:
'
#1fc747
'
color
:
'
#1fc747
'
},
},
'
SQOOP
'
:
{
SQOOP
:
{
desc
:
'
SQOOP
'
,
desc
:
'
SQOOP
'
,
color
:
'
#E46F13
'
color
:
'
#E46F13
'
},
},
'
CONDITIONS
'
:
{
CONDITIONS
:
{
desc
:
'
CONDITIONS
'
,
desc
:
'
CONDITIONS
'
,
color
:
'
#E46F13
'
color
:
'
#E46F13
'
}
}
}
}
export
{
export
{
toolOper
,
toolOper
,
publishStatus
,
publishStatus
,
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js
浏览文件 @
7a483736
...
@@ -24,7 +24,7 @@ import store from '@/conf/home/store'
...
@@ -24,7 +24,7 @@ import store from '@/conf/home/store'
/**
/**
* Prototype method
* Prototype method
*/
*/
le
t
Dag
=
function
()
{
cons
t
Dag
=
function
()
{
this
.
dag
=
{}
this
.
dag
=
{}
this
.
instance
=
{}
this
.
instance
=
{}
}
}
...
@@ -49,7 +49,7 @@ Dag.prototype.setConfig = function (o) {
...
@@ -49,7 +49,7 @@ Dag.prototype.setConfig = function (o) {
* create dag
* create dag
*/
*/
Dag
.
prototype
.
create
=
function
()
{
Dag
.
prototype
.
create
=
function
()
{
le
t
self
=
this
cons
t
self
=
this
jsPlumb
.
ready
(()
=>
{
jsPlumb
.
ready
(()
=>
{
JSP
.
init
({
JSP
.
init
({
dag
:
this
.
dag
,
dag
:
this
.
dag
,
...
@@ -98,36 +98,35 @@ Dag.prototype.toolbarEvent = function ({ item, code, is }) {
...
@@ -98,36 +98,35 @@ Dag.prototype.toolbarEvent = function ({ item, code, is }) {
* Echo data display
* Echo data display
*/
*/
Dag
.
prototype
.
backfill
=
function
(
arg
)
{
Dag
.
prototype
.
backfill
=
function
(
arg
)
{
if
(
arg
)
{
if
(
arg
)
{
let
locationsValue
=
store
.
state
.
dag
.
locations
let
locationsValue
=
store
.
state
.
dag
.
locations
le
t
locationsValue1
=
store
.
state
.
dag
.
locations
cons
t
locationsValue1
=
store
.
state
.
dag
.
locations
le
t
locationsValue2
=
store
.
state
.
dag
.
locations
cons
t
locationsValue2
=
store
.
state
.
dag
.
locations
le
t
arr
=
[]
cons
t
arr
=
[]
for
(
le
t
i
in
locationsValue1
)
{
for
(
cons
t
i
in
locationsValue1
)
{
let
objs
=
new
Object
();
const
objs
=
{}
objs
.
id
=
i
objs
.
id
=
i
arr
.
push
(
Object
.
assign
(
objs
,
locationsValue1
[
i
]));
//
Attributes
arr
.
push
(
Object
.
assign
(
objs
,
locationsValue1
[
i
]))
//
Attributes
}
}
le
t
tmp
=
[]
cons
t
tmp
=
[]
for
(
le
t
i
in
locationsValue2
)
{
for
(
cons
t
i
in
locationsValue2
)
{
if
(
locationsValue2
[
i
].
targetarr
!=
''
&&
locationsValue2
[
i
].
targetarr
.
split
(
'
,
'
).
length
>
1
)
{
if
(
locationsValue2
[
i
].
targetarr
!==
''
&&
locationsValue2
[
i
].
targetarr
.
split
(
'
,
'
).
length
>
1
)
{
tmp
.
push
(
locationsValue2
[
i
])
tmp
.
push
(
locationsValue2
[
i
])
}
}
}
}
function
copy
(
array
)
{
const
copy
=
function
(
array
)
{
le
t
newArray
=
[]
cons
t
newArray
=
[]
for
(
le
t
item
of
array
)
{
for
(
cons
t
item
of
array
)
{
newArray
.
push
(
item
)
;
newArray
.
push
(
item
)
}
}
return
newArray
;
return
newArray
}
}
const
newArr
=
copy
(
arr
)
let
newArr
=
copy
(
arr
)
const
getNewArr
=
function
()
{
function
getNewArr
()
{
for
(
let
i
=
0
;
i
<
newArr
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
newArr
.
length
;
i
++
)
{
if
(
newArr
[
i
].
targetarr
!==
''
&&
newArr
[
i
].
targetarr
.
split
(
'
,
'
).
length
>
1
)
{
if
(
newArr
[
i
].
targetarr
!=
''
&&
newArr
[
i
].
targetarr
.
split
(
'
,
'
).
length
>
1
)
{
newArr
[
i
].
targetarr
=
newArr
[
i
].
targetarr
.
split
(
'
,
'
).
shift
()
newArr
[
i
].
targetarr
=
newArr
[
i
].
targetarr
.
split
(
'
,
'
).
shift
()
}
}
}
}
...
@@ -141,154 +140,154 @@ Dag.prototype.backfill = function (arg) {
...
@@ -141,154 +140,154 @@ Dag.prototype.backfill = function (arg) {
* @param {String} idStr id key name
* @param {String} idStr id key name
* @param {String} childrenStr children key name
* @param {String} childrenStr children key name
*/
*/
function
fommat
({
arrayList
,
pidStr
=
'
targetarr
'
,
idStr
=
'
id
'
,
childrenStr
=
'
children
'
})
{
const
fommat
=
function
({
arrayList
,
pidStr
=
'
targetarr
'
,
idStr
=
'
id
'
,
childrenStr
=
'
children
'
})
{
let
listOjb
=
{};
// Used to store objects of the form {key: obj}
const
listOjb
=
{}
// Used to store objects of the form {key: obj}
let
treeList
=
[];
// An array to store the final tree structure data
const
treeList
=
[]
// An array to store the final tree structure data
// Transform the data into {key: obj} format, which is convenient for the following data processing
// Transform the data into {key: obj} format, which is convenient for the following data processing
for
(
let
i
=
0
;
i
<
arrayList
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
arrayList
.
length
;
i
++
)
{
listOjb
[
arrayList
[
i
][
idStr
]]
=
arrayList
[
i
]
listOjb
[
arrayList
[
i
][
idStr
]]
=
arrayList
[
i
]
}
// Format data based on pid
for
(
let
j
=
0
;
j
<
arrayList
.
length
;
j
++
)
{
// Determine if the parent exists
// let haveParent = arrayList[j].targetarr.split(',').length>1?listOjb[arrayList[j].targetarr.split(',')[0]]:listOjb[arrayList[j][pidStr]]
let
haveParent
=
listOjb
[
arrayList
[
j
][
pidStr
]]
if
(
haveParent
)
{
// If there is no parent children field, create a children field
!
haveParent
[
childrenStr
]
&&
(
haveParent
[
childrenStr
]
=
[])
// Insert child in parent
haveParent
[
childrenStr
].
push
(
arrayList
[
j
])
}
else
{
// If there is no parent, insert directly into the outermost layer
treeList
.
push
(
arrayList
[
j
])
}
}
return
treeList
}
}
let
datas
=
fommat
({
arrayList
:
newArr
,
pidStr
:
'
targetarr
'
})
// Format data based on pid
// Count the number of leaf nodes
for
(
let
j
=
0
;
j
<
arrayList
.
length
;
j
++
)
{
function
getLeafCountTree
(
json
)
{
// Determine if the parent exists
if
(
!
json
.
children
)
{
// let haveParent = arrayList[j].targetarr.split(',').length>1?listOjb[arrayList[j].targetarr.split(',')[0]]:listOjb[arrayList[j][pidStr]]
json
.
colspan
=
1
;
const
haveParent
=
listOjb
[
arrayList
[
j
][
pidStr
]]
return
1
;
if
(
haveParent
)
{
// If there is no parent children field, create a children field
!
haveParent
[
childrenStr
]
&&
(
haveParent
[
childrenStr
]
=
[])
// Insert child in parent
haveParent
[
childrenStr
].
push
(
arrayList
[
j
])
}
else
{
}
else
{
let
leafCount
=
0
;
// If there is no parent, insert directly into the outermost layer
for
(
let
i
=
0
;
i
<
json
.
children
.
length
;
i
++
){
treeList
.
push
(
arrayList
[
j
])
leafCount
=
leafCount
+
getLeafCountTree
(
json
.
children
[
i
]);
}
json
.
colspan
=
leafCount
;
return
leafCount
;
}
}
}
}
// Number of tree node levels
return
treeList
let
countTree
=
getLeafCountTree
(
datas
[
0
])
}
function
getMaxFloor
(
treeData
)
{
const
datas
=
fommat
({
arrayList
:
newArr
,
pidStr
:
'
targetarr
'
})
let
max
=
0
// Count the number of leaf nodes
function
each
(
data
,
floor
)
{
const
getLeafCountTree
=
function
(
json
)
{
data
.
forEach
(
e
=>
{
if
(
!
json
.
children
)
{
e
.
floor
=
floor
json
.
colspan
=
1
e
.
x
=
floor
*
170
return
1
if
(
floor
>
max
)
{
}
else
{
max
=
floor
let
leafCount
=
0
}
for
(
let
i
=
0
;
i
<
json
.
children
.
length
;
i
++
)
{
if
(
e
.
children
)
{
leafCount
=
leafCount
+
getLeafCountTree
(
json
.
children
[
i
])
each
(
e
.
children
,
floor
+
1
)
}
})
}
each
(
treeData
,
1
)
return
max
}
}
getMaxFloor
(
datas
)
json
.
colspan
=
leafCount
// The last child of each node
return
leafCount
let
lastchildren
=
[];
}
forxh
(
datas
);
}
function
forxh
(
list
)
{
// Number of tree node levels
for
(
let
i
=
0
;
i
<
list
.
length
;
i
++
)
{
const
countTree
=
getLeafCountTree
(
datas
[
0
])
let
chlist
=
list
[
i
];
const
getMaxFloor
=
function
(
treeData
)
{
if
(
chlist
.
children
)
{
let
max
=
0
forxh
(
chlist
.
children
);
function
each
(
data
,
floor
)
{
}
else
{
data
.
forEach
(
e
=>
{
lastchildren
.
push
(
chlist
);
e
.
floor
=
floor
}
e
.
x
=
floor
*
170
if
(
floor
>
max
)
{
max
=
floor
}
}
}
if
(
e
.
children
)
{
// Get all parent nodes above the leaf node
each
(
e
.
children
,
floor
+
1
)
function
treeFindPath
(
tree
,
func
,
path
,
n
)
{
if
(
!
tree
)
return
[]
for
(
const
data
of
tree
)
{
path
.
push
(
data
.
name
)
if
(
func
(
data
))
return
path
if
(
data
.
children
)
{
const
findChildren
=
treeFindPath
(
data
.
children
,
func
,
path
,
n
)
if
(
findChildren
.
length
)
return
findChildren
}
path
.
pop
()
}
}
return
[]
})
}
}
function
toLine
(
data
){
each
(
treeData
,
1
)
return
data
.
reduce
((
arrData
,
{
id
,
name
,
targetarr
,
x
,
y
,
children
=
[]})
=>
return
max
arrData
.
concat
([{
id
,
name
,
targetarr
,
x
,
y
}],
toLine
(
children
)),
[])
}
getMaxFloor
(
datas
)
// The last child of each node
let
lastchildren
=
[]
const
forxh
=
function
(
list
)
{
for
(
let
i
=
0
;
i
<
list
.
length
;
i
++
)
{
const
chlist
=
list
[
i
]
if
(
chlist
.
children
)
{
forxh
(
chlist
.
children
)
}
else
{
lastchildren
.
push
(
chlist
)
}
}
let
listarr
=
toLine
(
datas
);
}
let
listarrs
=
toLine
(
datas
)
}
let
dataObject
=
{}
forxh
(
datas
)
for
(
let
i
=
0
;
i
<
listarrs
.
length
;
i
++
)
{
// Get all parent nodes above the leaf node
delete
(
listarrs
[
i
].
id
)
const
treeFindPath
=
function
(
tree
,
func
,
path
,
n
)
{
if
(
!
tree
)
return
[]
for
(
const
data
of
tree
)
{
path
.
push
(
data
.
name
)
if
(
func
(
data
))
return
path
if
(
data
.
children
)
{
const
findChildren
=
treeFindPath
(
data
.
children
,
func
,
path
,
n
)
if
(
findChildren
.
length
)
return
findChildren
}
}
path
.
pop
()
}
return
[]
}
const
toLine
=
function
(
data
)
{
return
data
.
reduce
((
arrData
,
{
id
,
name
,
targetarr
,
x
,
y
,
children
=
[]
})
=>
arrData
.
concat
([{
id
,
name
,
targetarr
,
x
,
y
}],
toLine
(
children
)),
[])
}
const
listarr
=
toLine
(
datas
)
const
listarrs
=
toLine
(
datas
)
const
dataObject
=
{}
for
(
let
i
=
0
;
i
<
listarrs
.
length
;
i
++
)
{
delete
(
listarrs
[
i
].
id
)
}
for
(
let
a
=
0
;
a
<
listarr
.
length
;
a
++
)
{
for
(
let
a
=
0
;
a
<
listarr
.
length
;
a
++
)
{
dataObject
[
listarr
[
a
].
id
]
=
listarrs
[
a
]
dataObject
[
listarr
[
a
].
id
]
=
listarrs
[
a
]
}
}
// Comparison function
// Comparison function
function
createComparisonFunction
(
propertyName
)
{
const
createComparisonFunction
=
function
(
propertyName
)
{
return
function
(
object1
,
object2
)
{
return
function
(
object1
,
object2
)
{
let
value1
=
object1
[
propertyName
];
const
value1
=
object1
[
propertyName
]
let
value2
=
object2
[
propertyName
];
const
value2
=
object2
[
propertyName
]
if
(
value1
<
value2
)
{
if
(
value1
<
value2
)
{
return
-
1
;
return
-
1
}
else
if
(
value1
>
value2
)
{
}
else
if
(
value1
>
value2
)
{
return
1
;
return
1
}
else
{
}
else
{
return
0
;
return
0
}
};
}
}
}
}
lastchildren
=
lastchildren
.
sort
(
createComparisonFunction
(
'
x
'
))
lastchildren
=
lastchildren
.
sort
(
createComparisonFunction
(
'
x
'
))
// Coordinate value of each leaf node
// Coordinate value of each leaf node
for
(
let
a
=
0
;
a
<
lastchildren
.
length
;
a
++
)
{
for
(
let
a
=
0
;
a
<
lastchildren
.
length
;
a
++
)
{
dataObject
[
lastchildren
[
a
].
id
].
y
=
(
a
+
1
)
*
120
dataObject
[
lastchildren
[
a
].
id
].
y
=
(
a
+
1
)
*
120
}
}
for
(
let
i
=
0
;
i
<
lastchildren
.
length
;
i
++
)
{
for
(
let
i
=
0
;
i
<
lastchildren
.
length
;
i
++
)
{
let
node
=
treeFindPath
(
datas
,
data
=>
data
.
targetarr
===
lastchildren
[
i
].
targetarr
,[],
i
+
1
)
const
node
=
treeFindPath
(
datas
,
data
=>
data
.
targetarr
===
lastchildren
[
i
].
targetarr
,
[],
i
+
1
)
for
(
let
j
=
0
;
j
<
node
.
length
;
j
++
)
{
for
(
let
j
=
0
;
j
<
node
.
length
;
j
++
)
{
for
(
let
k
=
0
;
k
<
listarrs
.
length
;
k
++
)
{
for
(
let
k
=
0
;
k
<
listarrs
.
length
;
k
++
)
{
if
(
node
[
j
]
==
listarrs
[
k
].
name
)
{
if
(
node
[
j
]
===
listarrs
[
k
].
name
)
{
listarrs
[
k
].
y
=
(
i
+
1
)
*
120
listarrs
[
k
].
y
=
(
i
+
1
)
*
120
}
}
}
}
for
(
let
i
=
0
;
i
<
tmp
.
length
;
i
++
)
{
for
(
let
objs
in
dataObject
)
{
if
(
tmp
[
i
].
name
==
dataObject
[
objs
].
name
)
{
dataObject
[
objs
].
targetarr
=
tmp
[
i
].
targetarr
}
}
}
}
}
for
(
let
a
=
0
;
a
<
lastchildren
.
length
;
a
++
)
{
}
dataObject
[
lastchildren
[
a
].
id
].
y
=
(
a
+
1
)
*
120
}
}
for
(
let
i
=
0
;
i
<
tmp
.
length
;
i
++
)
{
if
(
countTree
>
1
)
{
for
(
const
objs
in
dataObject
)
{
dataObject
[
Object
.
keys
(
locationsValue1
)[
0
]].
y
=
(
countTree
/
2
)
*
120
+
50
if
(
tmp
[
i
].
name
===
dataObject
[
objs
].
name
)
{
dataObject
[
objs
].
targetarr
=
tmp
[
i
].
targetarr
}
}
}
}
for
(
let
a
=
0
;
a
<
lastchildren
.
length
;
a
++
)
{
dataObject
[
lastchildren
[
a
].
id
].
y
=
(
a
+
1
)
*
120
}
if
(
countTree
>
1
)
{
dataObject
[
Object
.
keys
(
locationsValue1
)[
0
]].
y
=
(
countTree
/
2
)
*
120
+
50
}
locationsValue
=
dataObject
locationsValue
=
dataObject
le
t
self
=
this
cons
t
self
=
this
jsPlumb
.
ready
(()
=>
{
jsPlumb
.
ready
(()
=>
{
JSP
.
init
({
JSP
.
init
({
dag
:
this
.
dag
,
dag
:
this
.
dag
,
...
@@ -310,7 +309,7 @@ Dag.prototype.backfill = function (arg) {
...
@@ -310,7 +309,7 @@ Dag.prototype.backfill = function (arg) {
})
})
})
})
}
else
{
}
else
{
le
t
self
=
this
cons
t
self
=
this
jsPlumb
.
ready
(()
=>
{
jsPlumb
.
ready
(()
=>
{
JSP
.
init
({
JSP
.
init
({
dag
:
this
.
dag
,
dag
:
this
.
dag
,
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/commcon.js
浏览文件 @
7a483736
...
@@ -43,7 +43,7 @@ const cycleList = [
...
@@ -43,7 +43,7 @@ const cycleList = [
* cycle value
* cycle value
*/
*/
const
dateValueList
=
{
const
dateValueList
=
{
'
hour
'
:
[
hour
:
[
{
{
value
:
'
last1Hour
'
,
value
:
'
last1Hour
'
,
label
:
`
${
i18n
.
$t
(
'
Last1Hour
'
)}
`
label
:
`
${
i18n
.
$t
(
'
Last1Hour
'
)}
`
...
@@ -57,7 +57,7 @@ const dateValueList = {
...
@@ -57,7 +57,7 @@ const dateValueList = {
label
:
`
${
i18n
.
$t
(
'
Last3Hours
'
)}
`
label
:
`
${
i18n
.
$t
(
'
Last3Hours
'
)}
`
}
}
],
],
'
day
'
:
[
day
:
[
{
{
value
:
'
today
'
,
value
:
'
today
'
,
label
:
`
${
i18n
.
$t
(
'
today
'
)}
`
label
:
`
${
i18n
.
$t
(
'
today
'
)}
`
...
@@ -79,7 +79,7 @@ const dateValueList = {
...
@@ -79,7 +79,7 @@ const dateValueList = {
label
:
`
${
i18n
.
$t
(
'
Last7Days
'
)}
`
label
:
`
${
i18n
.
$t
(
'
Last7Days
'
)}
`
}
}
],
],
'
week
'
:
[
week
:
[
{
{
value
:
'
thisWeek
'
,
value
:
'
thisWeek
'
,
label
:
`
${
i18n
.
$t
(
'
ThisWeek
'
)}
`
label
:
`
${
i18n
.
$t
(
'
ThisWeek
'
)}
`
...
@@ -117,7 +117,7 @@ const dateValueList = {
...
@@ -117,7 +117,7 @@ const dateValueList = {
label
:
`
${
i18n
.
$t
(
'
LastSunday
'
)}
`
label
:
`
${
i18n
.
$t
(
'
LastSunday
'
)}
`
}
}
],
],
'
month
'
:
[
month
:
[
{
{
value
:
'
thisMonth
'
,
value
:
'
thisMonth
'
,
label
:
`
${
i18n
.
$t
(
'
ThisMonth
'
)}
`
label
:
`
${
i18n
.
$t
(
'
ThisMonth
'
)}
`
...
@@ -221,15 +221,15 @@ const sqlTypeList = [
...
@@ -221,15 +221,15 @@ const sqlTypeList = [
const
positionList
=
[
const
positionList
=
[
{
{
id
:
'
PARAMETER
'
,
id
:
'
PARAMETER
'
,
code
:
"
Parameter
"
code
:
'
Parameter
'
},
},
{
{
id
:
'
BODY
'
,
id
:
'
BODY
'
,
code
:
"
Body
"
code
:
'
Body
'
},
},
{
{
id
:
'
HEADERS
'
,
id
:
'
HEADERS
'
,
code
:
"
Headers
"
code
:
'
Headers
'
}
}
]
]
const
nodeStatusList
=
[
const
nodeStatusList
=
[
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/index.js
浏览文件 @
7a483736
...
@@ -21,7 +21,7 @@ import store from '@/conf/home/store'
...
@@ -21,7 +21,7 @@ import store from '@/conf/home/store'
import
router
from
'
@/conf/home/router
'
import
router
from
'
@/conf/home/router
'
import
{
uuid
,
findComponentDownward
}
from
'
@/module/util/
'
import
{
uuid
,
findComponentDownward
}
from
'
@/module/util/
'
le
t
Affirm
=
{}
cons
t
Affirm
=
{}
let
$root
=
{}
let
$root
=
{}
let
$routerType
=
''
let
$routerType
=
''
let
$isPop
=
true
let
$isPop
=
true
...
@@ -59,7 +59,7 @@ Affirm.paramVerification = (name) => {
...
@@ -59,7 +59,7 @@ Affirm.paramVerification = (name) => {
if
(
!
$isPop
)
{
if
(
!
$isPop
)
{
return
true
return
true
}
}
le
t
dagStore
=
store
.
state
.
dag
cons
t
dagStore
=
store
.
state
.
dag
let
flag
=
false
let
flag
=
false
if
(
$routerType
===
'
definition-create
'
)
{
if
(
$routerType
===
'
definition-create
'
)
{
// No nodes jump out directly
// No nodes jump out directly
...
@@ -100,7 +100,7 @@ Affirm.isPop = (fn) => {
...
@@ -100,7 +100,7 @@ Affirm.isPop = (fn) => {
Vue
.
$modal
.
destroy
()
Vue
.
$modal
.
destroy
()
})
})
},
},
close
()
{
close
()
{
fn
()
fn
()
Vue
.
$modal
.
destroy
()
Vue
.
$modal
.
destroy
()
}
}
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/downChart.js
浏览文件 @
7a483736
...
@@ -21,7 +21,7 @@ import { tasksAll } from './util'
...
@@ -21,7 +21,7 @@ import { tasksAll } from './util'
import
html2canvas
from
'
html2canvas
'
import
html2canvas
from
'
html2canvas
'
import
{
findComponentDownward
}
from
'
@/module/util/
'
import
{
findComponentDownward
}
from
'
@/module/util/
'
le
t
DownChart
=
function
()
{
cons
t
DownChart
=
function
()
{
this
.
dag
=
{}
this
.
dag
=
{}
}
}
...
@@ -31,10 +31,10 @@ let DownChart = function () {
...
@@ -31,10 +31,10 @@ let DownChart = function () {
DownChart
.
prototype
.
maxVal
=
function
()
{
DownChart
.
prototype
.
maxVal
=
function
()
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
// All nodes
// All nodes
le
t
tasksAllList
=
tasksAll
()
cons
t
tasksAllList
=
tasksAll
()
le
t
dom
=
$
(
'
.dag-container
'
)
cons
t
dom
=
$
(
'
.dag-container
'
)
le
t
y
=
parseInt
(
_
.
maxBy
(
tasksAllList
,
'
y
'
).
y
+
60
)
cons
t
y
=
parseInt
(
_
.
maxBy
(
tasksAllList
,
'
y
'
).
y
+
60
)
le
t
x
=
parseInt
(
_
.
maxBy
(
tasksAllList
,
'
x
'
).
x
+
100
)
cons
t
x
=
parseInt
(
_
.
maxBy
(
tasksAllList
,
'
x
'
).
x
+
100
)
resolve
({
resolve
({
width
:
(
x
>
600
?
x
:
dom
.
width
())
+
100
,
width
:
(
x
>
600
?
x
:
dom
.
width
())
+
100
,
...
@@ -60,9 +60,9 @@ DownChart.prototype.download = function ({ dagThis }) {
...
@@ -60,9 +60,9 @@ DownChart.prototype.download = function ({ dagThis }) {
// svg handle
// svg handle
const
nodesToRecover
=
[]
const
nodesToRecover
=
[]
const
nodesToRemove
=
[]
const
nodesToRemove
=
[]
le
t
parentNode
=
node
.
parentNode
cons
t
parentNode
=
node
.
parentNode
le
t
svg
=
node
.
outerHTML
.
trim
()
cons
t
svg
=
node
.
outerHTML
.
trim
()
le
t
canvas
=
document
.
createElement
(
'
canvas
'
)
cons
t
canvas
=
document
.
createElement
(
'
canvas
'
)
canvg
(
canvas
,
svg
)
canvg
(
canvas
,
svg
)
if
(
node
.
style
.
position
)
{
if
(
node
.
style
.
position
)
{
canvas
.
style
.
position
+=
node
.
style
.
position
canvas
.
style
.
position
+=
node
.
style
.
position
...
@@ -102,10 +102,10 @@ DownChart.prototype.download = function ({ dagThis }) {
...
@@ -102,10 +102,10 @@ DownChart.prototype.download = function ({ dagThis }) {
heigth
:
height
,
heigth
:
height
,
useCORS
:
true
// Enable cross-domain configuration
useCORS
:
true
// Enable cross-domain configuration
}).
then
((
canvas
)
=>
{
}).
then
((
canvas
)
=>
{
le
t
name
=
`
${
this
.
dag
.
name
}
.png`
cons
t
name
=
`
${
this
.
dag
.
name
}
.png`
le
t
url
=
canvas
.
toDataURL
(
'
image/png
'
,
1
)
cons
t
url
=
canvas
.
toDataURL
(
'
image/png
'
,
1
)
setTimeout
(()
=>
{
setTimeout
(()
=>
{
le
t
triggerDownload
=
$
(
'
<a>
'
).
attr
(
'
href
'
,
url
).
attr
(
'
download
'
,
name
).
appendTo
(
'
body
'
)
cons
t
triggerDownload
=
$
(
'
<a>
'
).
attr
(
'
href
'
,
url
).
attr
(
'
download
'
,
name
).
appendTo
(
'
body
'
)
triggerDownload
[
0
].
click
()
triggerDownload
[
0
].
click
()
triggerDownload
.
remove
()
triggerDownload
.
remove
()
},
100
)
},
100
)
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/dragZoom.js
浏览文件 @
7a483736
...
@@ -23,7 +23,7 @@ const DragZoom = function () {
...
@@ -23,7 +23,7 @@ const DragZoom = function () {
}
}
DragZoom
.
prototype
.
init
=
function
()
{
DragZoom
.
prototype
.
init
=
function
()
{
le
t
$canvas
=
$
(
'
#canvas
'
)
cons
t
$canvas
=
$
(
'
#canvas
'
)
this
.
element
=
d3
.
select
(
'
#canvas
'
)
this
.
element
=
d3
.
select
(
'
#canvas
'
)
this
.
zoom
=
d3
.
behavior
.
zoom
()
this
.
zoom
=
d3
.
behavior
.
zoom
()
.
scaleExtent
([
0.5
,
2
])
.
scaleExtent
([
0.5
,
2
])
...
@@ -35,5 +35,4 @@ DragZoom.prototype.init = function () {
...
@@ -35,5 +35,4 @@ DragZoom.prototype.init = function () {
this
.
element
.
call
(
this
.
zoom
).
on
(
'
dblclick.zoom
'
,
null
)
this
.
element
.
call
(
this
.
zoom
).
on
(
'
dblclick.zoom
'
,
null
)
}
}
export
default
new
DragZoom
()
export
default
new
DragZoom
()
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
浏览文件 @
7a483736
...
@@ -24,7 +24,6 @@ import { jsPlumb } from 'jsplumb'
...
@@ -24,7 +24,6 @@ import { jsPlumb } from 'jsplumb'
import
DragZoom
from
'
./dragZoom
'
import
DragZoom
from
'
./dragZoom
'
import
store
from
'
@/conf/home/store
'
import
store
from
'
@/conf/home/store
'
import
router
from
'
@/conf/home/router
'
import
router
from
'
@/conf/home/router
'
import
Permissions
from
'
@/module/permissions
'
import
{
uuid
,
findComponentDownward
}
from
'
@/module/util/
'
import
{
uuid
,
findComponentDownward
}
from
'
@/module/util/
'
import
{
import
{
...
@@ -32,10 +31,11 @@ import {
...
@@ -32,10 +31,11 @@ import {
rtTasksTpl
,
rtTasksTpl
,
setSvgColor
,
setSvgColor
,
saveTargetarr
,
saveTargetarr
,
rtTargetarrArr
}
from
'
./util
'
rtTargetarrArr
}
from
'
./util
'
import
mStart
from
'
@/conf/home/pages/projects/pages/definition/pages/list/_source/start
'
import
mStart
from
'
@/conf/home/pages/projects/pages/definition/pages/list/_source/start
'
le
t
JSP
=
function
()
{
cons
t
JSP
=
function
()
{
this
.
dag
=
{}
this
.
dag
=
{}
this
.
selectedElement
=
{}
this
.
selectedElement
=
{}
...
@@ -75,7 +75,7 @@ JSP.prototype.init = function ({ dag, instance, options }) {
...
@@ -75,7 +75,7 @@ JSP.prototype.init = function ({ dag, instance, options }) {
this
.
setConfig
({
this
.
setConfig
({
isDrag
:
!
store
.
state
.
dag
.
isDetails
,
isDrag
:
!
store
.
state
.
dag
.
isDetails
,
isAttachment
:
false
,
isAttachment
:
false
,
isNewNodes
:
!
store
.
state
.
dag
.
isDetails
,
//
Permissions.getAuth() === false ? false : !store.state.dag.isDetails,
isNewNodes
:
!
store
.
state
.
dag
.
isDetails
,
//
Permissions.getAuth() === false ? false : !store.state.dag.isDetails,
isDblclick
:
true
,
isDblclick
:
true
,
isContextmenu
:
true
,
isContextmenu
:
true
,
isClick
:
false
isClick
:
false
...
@@ -105,7 +105,7 @@ JSP.prototype.setConfig = function (o) {
...
@@ -105,7 +105,7 @@ JSP.prototype.setConfig = function (o) {
* Node binding event
* Node binding event
*/
*/
JSP
.
prototype
.
tasksEvent
=
function
(
selfId
)
{
JSP
.
prototype
.
tasksEvent
=
function
(
selfId
)
{
le
t
tasks
=
$
(
`#
${
selfId
}
`
)
cons
t
tasks
=
$
(
`#
${
selfId
}
`
)
// Bind right event
// Bind right event
tasks
.
on
(
'
contextmenu
'
,
e
=>
{
tasks
.
on
(
'
contextmenu
'
,
e
=>
{
this
.
tasksContextmenu
(
e
)
this
.
tasksContextmenu
(
e
)
...
@@ -129,7 +129,7 @@ JSP.prototype.tasksEvent = function (selfId) {
...
@@ -129,7 +129,7 @@ JSP.prototype.tasksEvent = function (selfId) {
JSP
.
prototype
.
draggable
=
function
()
{
JSP
.
prototype
.
draggable
=
function
()
{
if
(
this
.
config
.
isNewNodes
)
{
if
(
this
.
config
.
isNewNodes
)
{
let
selfId
let
selfId
le
t
self
=
this
cons
t
self
=
this
$
(
'
.toolbar-btn .roundedRect
'
).
draggable
({
$
(
'
.toolbar-btn .roundedRect
'
).
draggable
({
scope
:
'
plant
'
,
scope
:
'
plant
'
,
helper
:
'
clone
'
,
helper
:
'
clone
'
,
...
@@ -146,7 +146,7 @@ JSP.prototype.draggable = function () {
...
@@ -146,7 +146,7 @@ JSP.prototype.draggable = function () {
drop
:
function
(
ev
,
ui
)
{
drop
:
function
(
ev
,
ui
)
{
let
id
=
'
tasks-
'
+
Math
.
ceil
(
Math
.
random
()
*
100000
)
// eslint-disable-line
let
id
=
'
tasks-
'
+
Math
.
ceil
(
Math
.
random
()
*
100000
)
// eslint-disable-line
// Get mouse coordinates
// Get mouse coordinates
le
t
left
=
parseInt
(
ui
.
offset
.
left
-
$
(
this
).
offset
().
left
)
cons
t
left
=
parseInt
(
ui
.
offset
.
left
-
$
(
this
).
offset
().
left
)
let
top
=
parseInt
(
ui
.
offset
.
top
-
$
(
this
).
offset
().
top
)
-
10
let
top
=
parseInt
(
ui
.
offset
.
top
-
$
(
this
).
offset
().
top
)
-
10
if
(
top
<
25
)
{
if
(
top
<
25
)
{
top
=
25
top
=
25
...
@@ -162,7 +162,7 @@ JSP.prototype.draggable = function () {
...
@@ -162,7 +162,7 @@ JSP.prototype.draggable = function () {
}))
}))
// Get the generated node
// Get the generated node
le
t
thisDom
=
jsPlumb
.
getSelector
(
'
.statemachine-demo .w
'
)
cons
t
thisDom
=
jsPlumb
.
getSelector
(
'
.statemachine-demo .w
'
)
// Generating a connection node
// Generating a connection node
self
.
JspInstance
.
batch
(()
=>
{
self
.
JspInstance
.
batch
(()
=>
{
...
@@ -193,13 +193,13 @@ JSP.prototype.jsonHandle = function ({ largeJson, locations }) {
...
@@ -193,13 +193,13 @@ JSP.prototype.jsonHandle = function ({ largeJson, locations }) {
$
(
'
#canvas
'
).
append
(
rtTasksTpl
({
$
(
'
#canvas
'
).
append
(
rtTasksTpl
({
id
:
v
.
id
,
id
:
v
.
id
,
name
:
v
.
name
,
name
:
v
.
name
,
x
:
locations
[
v
.
id
]
[
'
x
'
]
,
x
:
locations
[
v
.
id
]
.
x
,
y
:
locations
[
v
.
id
]
[
'
y
'
]
,
y
:
locations
[
v
.
id
]
.
y
,
targetarr
:
locations
[
v
.
id
]
[
'
targetarr
'
]
,
targetarr
:
locations
[
v
.
id
]
.
targetarr
,
isAttachment
:
this
.
config
.
isAttachment
,
isAttachment
:
this
.
config
.
isAttachment
,
taskType
:
v
.
type
,
taskType
:
v
.
type
,
runFlag
:
v
.
runFlag
,
runFlag
:
v
.
runFlag
,
nodenumber
:
locations
[
v
.
id
]
[
'
nodenumber
'
],
nodenumber
:
locations
[
v
.
id
]
.
nodenumber
}))
}))
// contextmenu event
// contextmenu event
...
@@ -263,29 +263,29 @@ JSP.prototype.initNode = function (el) {
...
@@ -263,29 +263,29 @@ JSP.prototype.initNode = function (el) {
*/
*/
JSP
.
prototype
.
tasksContextmenu
=
function
(
event
)
{
JSP
.
prototype
.
tasksContextmenu
=
function
(
event
)
{
if
(
this
.
config
.
isContextmenu
)
{
if
(
this
.
config
.
isContextmenu
)
{
le
t
routerName
=
router
.
history
.
current
.
name
cons
t
routerName
=
router
.
history
.
current
.
name
// state
// state
le
t
isOne
=
routerName
===
'
projects-definition-details
'
&&
this
.
dag
.
releaseState
!==
'
NOT_RELEASE
'
cons
t
isOne
=
routerName
===
'
projects-definition-details
'
&&
this
.
dag
.
releaseState
!==
'
NOT_RELEASE
'
// hide
// hide
le
t
isTwo
=
store
.
state
.
dag
.
isDetails
cons
t
isTwo
=
store
.
state
.
dag
.
isDetails
le
t
html
=
[
cons
t
html
=
[
`<a href="javascript:" id="startRunning" class="
${
isOne
?
''
:
'
disbled
'
}
"><em class="ans-icon-play"></em><span>
${
i18n
.
$t
(
'
Start
'
)}
</span></a>`
,
`<a href="javascript:" id="startRunning" class="
${
isOne
?
''
:
'
disbled
'
}
"><em class="ans-icon-play"></em><span>
${
i18n
.
$t
(
'
Start
'
)}
</span></a>`
,
`<a href="javascript:" id="editNodes" class="
${
isTwo
?
'
disbled
'
:
''
}
"><em class="ans-icon-edit"></em><span>
${
i18n
.
$t
(
'
Edit
'
)}
</span></a>`
,
`<a href="javascript:" id="editNodes" class="
${
isTwo
?
'
disbled
'
:
''
}
"><em class="ans-icon-edit"></em><span>
${
i18n
.
$t
(
'
Edit
'
)}
</span></a>`
,
`<a href="javascript:" id="copyNodes" class="
${
isTwo
?
'
disbled
'
:
''
}
"><em class="ans-icon-copy"></em><span>
${
i18n
.
$t
(
'
Copy
'
)}
</span></a>`
,
`<a href="javascript:" id="copyNodes" class="
${
isTwo
?
'
disbled
'
:
''
}
"><em class="ans-icon-copy"></em><span>
${
i18n
.
$t
(
'
Copy
'
)}
</span></a>`
,
`<a href="javascript:" id="removeNodes" class="
${
isTwo
?
'
disbled
'
:
''
}
"><em class="ans-icon-trash"></em><span>
${
i18n
.
$t
(
'
Delete
'
)}
</span></a>`
`<a href="javascript:" id="removeNodes" class="
${
isTwo
?
'
disbled
'
:
''
}
"><em class="ans-icon-trash"></em><span>
${
i18n
.
$t
(
'
Delete
'
)}
</span></a>`
]
]
le
t
operationHtml
=
()
=>
{
cons
t
operationHtml
=
()
=>
{
return
html
.
splice
(
'
,
'
)
return
html
.
splice
(
'
,
'
)
}
}
le
t
e
=
event
cons
t
e
=
event
le
t
$id
=
e
.
currentTarget
.
id
cons
t
$id
=
e
.
currentTarget
.
id
le
t
$contextmenu
=
$
(
'
#contextmenu
'
)
cons
t
$contextmenu
=
$
(
'
#contextmenu
'
)
le
t
$name
=
$
(
`#
${
$id
}
`
).
find
(
'
.name-p
'
).
text
()
cons
t
$name
=
$
(
`#
${
$id
}
`
).
find
(
'
.name-p
'
).
text
()
le
t
$left
=
e
.
pageX
+
document
.
body
.
scrollLeft
-
5
cons
t
$left
=
e
.
pageX
+
document
.
body
.
scrollLeft
-
5
le
t
$top
=
e
.
pageY
+
document
.
body
.
scrollTop
-
5
cons
t
$top
=
e
.
pageY
+
document
.
body
.
scrollTop
-
5
$contextmenu
.
css
({
$contextmenu
.
css
({
left
:
$left
,
left
:
$left
,
top
:
$top
,
top
:
$top
,
...
@@ -297,10 +297,10 @@ JSP.prototype.tasksContextmenu = function (event) {
...
@@ -297,10 +297,10 @@ JSP.prototype.tasksContextmenu = function (event) {
if
(
isOne
)
{
if
(
isOne
)
{
// start run
// start run
$
(
'
#startRunning
'
).
on
(
'
click
'
,
()
=>
{
$
(
'
#startRunning
'
).
on
(
'
click
'
,
()
=>
{
le
t
name
=
store
.
state
.
dag
.
name
cons
t
name
=
store
.
state
.
dag
.
name
le
t
id
=
router
.
history
.
current
.
params
.
id
cons
t
id
=
router
.
history
.
current
.
params
.
id
store
.
dispatch
(
'
dag/getStartCheck
'
,
{
processDefinitionId
:
id
}).
then
(
res
=>
{
store
.
dispatch
(
'
dag/getStartCheck
'
,
{
processDefinitionId
:
id
}).
then
(
res
=>
{
le
t
modal
=
Vue
.
$modal
.
dialog
({
cons
t
modal
=
Vue
.
$modal
.
dialog
({
closable
:
false
,
closable
:
false
,
showMask
:
true
,
showMask
:
true
,
escClose
:
true
,
escClose
:
true
,
...
@@ -332,9 +332,9 @@ JSP.prototype.tasksContextmenu = function (event) {
...
@@ -332,9 +332,9 @@ JSP.prototype.tasksContextmenu = function (event) {
})
})
})
})
}
}
if
(
!
isTwo
)
{
if
(
!
isTwo
)
{
// edit node
// edit node
$
(
`#editNodes`
).
click
(
ev
=>
{
$
(
'
#editNodes
'
).
click
(
ev
=>
{
findComponentDownward
(
this
.
dag
.
$root
,
'
dag-chart
'
).
_createNodes
({
findComponentDownward
(
this
.
dag
.
$root
,
'
dag-chart
'
).
_createNodes
({
id
:
$id
,
id
:
$id
,
type
:
$
(
`#
${
$id
}
`
).
attr
(
'
data-tasks-type
'
)
type
:
$
(
`#
${
$id
}
`
).
attr
(
'
data-tasks-type
'
)
...
@@ -359,7 +359,7 @@ JSP.prototype.tasksContextmenu = function (event) {
...
@@ -359,7 +359,7 @@ JSP.prototype.tasksContextmenu = function (event) {
JSP
.
prototype
.
tasksDblclick
=
function
(
e
)
{
JSP
.
prototype
.
tasksDblclick
=
function
(
e
)
{
// Untie event
// Untie event
if
(
this
.
config
.
isDblclick
)
{
if
(
this
.
config
.
isDblclick
)
{
le
t
id
=
$
(
e
.
currentTarget
.
offsetParent
).
attr
(
'
id
'
)
cons
t
id
=
$
(
e
.
currentTarget
.
offsetParent
).
attr
(
'
id
'
)
findComponentDownward
(
this
.
dag
.
$root
,
'
dag-chart
'
).
_createNodes
({
findComponentDownward
(
this
.
dag
.
$root
,
'
dag-chart
'
).
_createNodes
({
id
:
id
,
id
:
id
,
...
@@ -373,10 +373,10 @@ JSP.prototype.tasksDblclick = function (e) {
...
@@ -373,10 +373,10 @@ JSP.prototype.tasksDblclick = function (e) {
*/
*/
JSP
.
prototype
.
tasksClick
=
function
(
e
)
{
JSP
.
prototype
.
tasksClick
=
function
(
e
)
{
let
$id
let
$id
le
t
self
=
this
cons
t
self
=
this
let
$body
=
$
(
`body`
)
const
$body
=
$
(
'
body
'
)
if
(
this
.
config
.
isClick
)
{
if
(
this
.
config
.
isClick
)
{
le
t
$connect
=
this
.
selectedElement
.
connect
cons
t
$connect
=
this
.
selectedElement
.
connect
$
(
'
.w
'
).
removeClass
(
'
jtk-tasks-active
'
)
$
(
'
.w
'
).
removeClass
(
'
jtk-tasks-active
'
)
$
(
e
.
currentTarget
).
addClass
(
'
jtk-tasks-active
'
)
$
(
e
.
currentTarget
).
addClass
(
'
jtk-tasks-active
'
)
if
(
$connect
)
{
if
(
$connect
)
{
...
@@ -406,7 +406,7 @@ JSP.prototype.tasksClick = function (e) {
...
@@ -406,7 +406,7 @@ JSP.prototype.tasksClick = function (e) {
* paste
* paste
*/
*/
JSP
.
prototype
.
removePaste
=
function
()
{
JSP
.
prototype
.
removePaste
=
function
()
{
let
$body
=
$
(
`body`
)
const
$body
=
$
(
'
body
'
)
// Unbind copy and paste events
// Unbind copy and paste events
$body
.
unbind
(
'
copy
'
).
unbind
(
'
paste
'
)
$body
.
unbind
(
'
copy
'
).
unbind
(
'
paste
'
)
// Remove selected node parameters
// Remove selected node parameters
...
@@ -421,7 +421,7 @@ JSP.prototype.removePaste = function () {
...
@@ -421,7 +421,7 @@ JSP.prototype.removePaste = function () {
JSP
.
prototype
.
connectClick
=
function
(
e
)
{
JSP
.
prototype
.
connectClick
=
function
(
e
)
{
// Set svg color
// Set svg color
setSvgColor
(
e
,
'
#0097e0
'
)
setSvgColor
(
e
,
'
#0097e0
'
)
le
t
$id
=
this
.
selectedElement
.
id
cons
t
$id
=
this
.
selectedElement
.
id
if
(
$id
)
{
if
(
$id
)
{
$
(
`#
${
$id
}
`
).
removeClass
(
'
jtk-tasks-active
'
)
$
(
`#
${
$id
}
`
).
removeClass
(
'
jtk-tasks-active
'
)
this
.
selectedElement
.
id
=
null
this
.
selectedElement
.
id
=
null
...
@@ -434,24 +434,10 @@ JSP.prototype.connectClick = function (e) {
...
@@ -434,24 +434,10 @@ JSP.prototype.connectClick = function (e) {
* @param {Pointer}
* @param {Pointer}
*/
*/
JSP
.
prototype
.
handleEventPointer
=
function
(
is
)
{
JSP
.
prototype
.
handleEventPointer
=
function
(
is
)
{
let
wDom
=
$
(
'
.w
'
)
this
.
setConfig
({
this
.
setConfig
({
isClick
:
is
,
isClick
:
is
,
isAttachment
:
false
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')
// })
// }
// })
// }
}
}
/**
/**
...
@@ -459,7 +445,7 @@ JSP.prototype.handleEventPointer = function (is) {
...
@@ -459,7 +445,7 @@ JSP.prototype.handleEventPointer = function (is) {
* @param {Line}
* @param {Line}
*/
*/
JSP
.
prototype
.
handleEventLine
=
function
(
is
)
{
JSP
.
prototype
.
handleEventLine
=
function
(
is
)
{
le
t
wDom
=
$
(
'
.w
'
)
cons
t
wDom
=
$
(
'
.w
'
)
this
.
setConfig
({
this
.
setConfig
({
isAttachment
:
is
isAttachment
:
is
})
})
...
@@ -471,8 +457,8 @@ JSP.prototype.handleEventLine = function (is) {
...
@@ -471,8 +457,8 @@ JSP.prototype.handleEventLine = function (is) {
* @param {Remove}
* @param {Remove}
*/
*/
JSP
.
prototype
.
handleEventRemove
=
function
()
{
JSP
.
prototype
.
handleEventRemove
=
function
()
{
le
t
$id
=
this
.
selectedElement
.
id
||
null
cons
t
$id
=
this
.
selectedElement
.
id
||
null
le
t
$connect
=
this
.
selectedElement
.
connect
||
null
cons
t
$connect
=
this
.
selectedElement
.
connect
||
null
if
(
$id
)
{
if
(
$id
)
{
this
.
removeNodes
(
this
.
selectedElement
.
id
)
this
.
removeNodes
(
this
.
selectedElement
.
id
)
}
else
{
}
else
{
...
@@ -489,9 +475,9 @@ JSP.prototype.handleEventRemove = function () {
...
@@ -489,9 +475,9 @@ JSP.prototype.handleEventRemove = function () {
JSP
.
prototype
.
removeNodes
=
function
(
$id
)
{
JSP
.
prototype
.
removeNodes
=
function
(
$id
)
{
// Delete node processing(data-targetarr)
// Delete node processing(data-targetarr)
_
.
map
(
tasksAll
(),
v
=>
{
_
.
map
(
tasksAll
(),
v
=>
{
le
t
targetarr
=
v
.
targetarr
.
split
(
'
,
'
)
cons
t
targetarr
=
v
.
targetarr
.
split
(
'
,
'
)
if
(
targetarr
.
length
)
{
if
(
targetarr
.
length
)
{
le
t
newArr
=
_
.
filter
(
targetarr
,
v1
=>
v1
!==
$id
)
cons
t
newArr
=
_
.
filter
(
targetarr
,
v1
=>
v1
!==
$id
)
$
(
`#
${
v
.
id
}
`
).
attr
(
'
data-targetarr
'
,
newArr
.
toString
())
$
(
`#
${
v
.
id
}
`
).
attr
(
'
data-targetarr
'
,
newArr
.
toString
())
}
}
})
})
...
@@ -502,7 +488,7 @@ JSP.prototype.removeNodes = function ($id) {
...
@@ -502,7 +488,7 @@ JSP.prototype.removeNodes = function ($id) {
$
(
`#
${
$id
}
`
).
remove
()
$
(
`#
${
$id
}
`
).
remove
()
// callback onRemoveNodes event
// callback onRemoveNodes event
this
.
options
&&
this
.
options
.
onRemoveNodes
&&
this
.
options
.
onRemoveNodes
(
$id
)
this
.
options
&&
this
.
options
.
onRemoveNodes
&&
this
.
options
.
onRemoveNodes
(
$id
)
}
}
/**
/**
...
@@ -513,15 +499,15 @@ JSP.prototype.removeConnect = function ($connect) {
...
@@ -513,15 +499,15 @@ JSP.prototype.removeConnect = function ($connect) {
return
return
}
}
// Remove connections and remove node and node dependencies
// Remove connections and remove node and node dependencies
le
t
targetId
=
$connect
.
targetId
cons
t
targetId
=
$connect
.
targetId
le
t
sourceId
=
$connect
.
sourceId
cons
t
sourceId
=
$connect
.
sourceId
let
targetarr
=
rtTargetarrArr
(
targetId
)
let
targetarr
=
rtTargetarrArr
(
targetId
)
if
(
targetarr
.
length
)
{
if
(
targetarr
.
length
)
{
targetarr
=
_
.
filter
(
targetarr
,
v
=>
v
!==
sourceId
)
targetarr
=
_
.
filter
(
targetarr
,
v
=>
v
!==
sourceId
)
$
(
`#
${
targetId
}
`
).
attr
(
'
data-targetarr
'
,
targetarr
.
toString
())
$
(
`#
${
targetId
}
`
).
attr
(
'
data-targetarr
'
,
targetarr
.
toString
())
}
}
if
(
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-tasks-type
'
)
==
'
CONDITIONS
'
)
{
if
(
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-tasks-type
'
)
===
'
CONDITIONS
'
)
{
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-nodenumber
'
,
Number
(
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-nodenumber
'
))
-
1
)
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-nodenumber
'
,
Number
(
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-nodenumber
'
))
-
1
)
}
}
this
.
JspInstance
.
deleteConnection
(
$connect
)
this
.
JspInstance
.
deleteConnection
(
$connect
)
...
@@ -533,24 +519,24 @@ JSP.prototype.removeConnect = function ($connect) {
...
@@ -533,24 +519,24 @@ JSP.prototype.removeConnect = function ($connect) {
*/
*/
JSP
.
prototype
.
copyNodes
=
function
(
$id
)
{
JSP
.
prototype
.
copyNodes
=
function
(
$id
)
{
let
newNodeInfo
=
_
.
cloneDeep
(
_
.
find
(
store
.
state
.
dag
.
tasks
,
v
=>
v
.
id
===
$id
))
let
newNodeInfo
=
_
.
cloneDeep
(
_
.
find
(
store
.
state
.
dag
.
tasks
,
v
=>
v
.
id
===
$id
))
le
t
newNodePors
=
store
.
state
.
dag
.
locations
[
$id
]
cons
t
newNodePors
=
store
.
state
.
dag
.
locations
[
$id
]
// Unstored nodes do not allow replication
// Unstored nodes do not allow replication
if
(
!
newNodePors
)
{
if
(
!
newNodePors
)
{
return
return
}
}
// Generate random id
// Generate random id
le
t
newUuId
=
`
${
uuid
()
+
uuid
()}
`
cons
t
newUuId
=
`
${
uuid
()
+
uuid
()}
`
le
t
id
=
newNodeInfo
.
id
.
length
>
8
?
newNodeInfo
.
id
.
substr
(
0
,
7
)
:
newNodeInfo
.
id
cons
t
id
=
newNodeInfo
.
id
.
length
>
8
?
newNodeInfo
.
id
.
substr
(
0
,
7
)
:
newNodeInfo
.
id
le
t
name
=
newNodeInfo
.
name
.
length
>
8
?
newNodeInfo
.
name
.
substr
(
0
,
7
)
:
newNodeInfo
.
name
cons
t
name
=
newNodeInfo
.
name
.
length
>
8
?
newNodeInfo
.
name
.
substr
(
0
,
7
)
:
newNodeInfo
.
name
// new id
// new id
le
t
newId
=
`
${
id
||
''
}
-
${
newUuId
}
`
cons
t
newId
=
`
${
id
||
''
}
-
${
newUuId
}
`
// new name
// new name
le
t
newName
=
`
${
name
||
''
}
-
${
newUuId
}
`
cons
t
newName
=
`
${
name
||
''
}
-
${
newUuId
}
`
// coordinate x
// coordinate x
le
t
newX
=
newNodePors
.
x
+
100
cons
t
newX
=
newNodePors
.
x
+
100
// coordinate y
// coordinate y
le
t
newY
=
newNodePors
.
y
+
40
cons
t
newY
=
newNodePors
.
y
+
40
// Generate template node
// Generate template node
$
(
'
#canvas
'
).
append
(
rtTasksTpl
({
$
(
'
#canvas
'
).
append
(
rtTasksTpl
({
...
@@ -563,7 +549,7 @@ JSP.prototype.copyNodes = function ($id) {
...
@@ -563,7 +549,7 @@ JSP.prototype.copyNodes = function ($id) {
}))
}))
// Get the generated node
// Get the generated node
le
t
thisDom
=
jsPlumb
.
getSelector
(
'
.statemachine-demo .w
'
)
cons
t
thisDom
=
jsPlumb
.
getSelector
(
'
.statemachine-demo .w
'
)
// Copy node information
// Copy node information
newNodeInfo
=
Object
.
assign
(
newNodeInfo
,
{
newNodeInfo
=
Object
.
assign
(
newNodeInfo
,
{
...
@@ -604,7 +590,7 @@ JSP.prototype.handleEventScreen = function ({ item, is }) {
...
@@ -604,7 +590,7 @@ JSP.prototype.handleEventScreen = function ({ item, is }) {
item
.
icon
=
'
ans-icon-max
'
item
.
icon
=
'
ans-icon-max
'
screenOpen
=
false
screenOpen
=
false
}
}
le
t
$mainLayoutModel
=
$
(
'
.main-layout-model
'
)
cons
t
$mainLayoutModel
=
$
(
'
.main-layout-model
'
)
if
(
screenOpen
)
{
if
(
screenOpen
)
{
$mainLayoutModel
.
addClass
(
'
dag-screen
'
)
$mainLayoutModel
.
addClass
(
'
dag-screen
'
)
}
else
{
}
else
{
...
@@ -619,21 +605,21 @@ JSP.prototype.handleEventScreen = function ({ item, is }) {
...
@@ -619,21 +605,21 @@ JSP.prototype.handleEventScreen = function ({ item, is }) {
*/
*/
JSP
.
prototype
.
saveStore
=
function
()
{
JSP
.
prototype
.
saveStore
=
function
()
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
le
t
connects
=
[]
cons
t
connects
=
[]
le
t
locations
=
{}
cons
t
locations
=
{}
le
t
tasks
=
[]
cons
t
tasks
=
[]
le
t
is
=
(
id
)
=>
{
cons
t
is
=
(
id
)
=>
{
return
!!
_
.
filter
(
tasksAll
(),
v
=>
v
.
id
===
id
).
length
return
!!
_
.
filter
(
tasksAll
(),
v
=>
v
.
id
===
id
).
length
}
}
// task
// task
_
.
map
(
_
.
cloneDeep
(
store
.
state
.
dag
.
tasks
),
v
=>
{
_
.
map
(
_
.
cloneDeep
(
store
.
state
.
dag
.
tasks
),
v
=>
{
if
(
is
(
v
.
id
))
{
if
(
is
(
v
.
id
))
{
le
t
preTasks
=
[]
cons
t
preTasks
=
[]
le
t
id
=
$
(
`#
${
v
.
id
}
`
)
cons
t
id
=
$
(
`#
${
v
.
id
}
`
)
le
t
tar
=
id
.
attr
(
'
data-targetarr
'
)
cons
t
tar
=
id
.
attr
(
'
data-targetarr
'
)
le
t
idDep
=
tar
?
id
.
attr
(
'
data-targetarr
'
).
split
(
'
,
'
)
:
[]
cons
t
idDep
=
tar
?
id
.
attr
(
'
data-targetarr
'
).
split
(
'
,
'
)
:
[]
if
(
idDep
.
length
)
{
if
(
idDep
.
length
)
{
_
.
map
(
idDep
,
v1
=>
{
_
.
map
(
idDep
,
v1
=>
{
preTasks
.
push
(
$
(
`#
${
v1
}
`
).
find
(
'
.name-p
'
).
text
())
preTasks
.
push
(
$
(
`#
${
v1
}
`
).
find
(
'
.name-p
'
).
text
())
...
@@ -655,12 +641,11 @@ JSP.prototype.saveStore = function () {
...
@@ -655,12 +641,11 @@ JSP.prototype.saveStore = function () {
_
.
map
(
this
.
JspInstance
.
getConnections
(),
v
=>
{
_
.
map
(
this
.
JspInstance
.
getConnections
(),
v
=>
{
connects
.
push
({
connects
.
push
({
'
endPointSourceId
'
:
v
.
sourceId
,
endPointSourceId
:
v
.
sourceId
,
'
endPointTargetId
'
:
v
.
targetId
endPointTargetId
:
v
.
targetId
})
})
})
})
_
.
map
(
tasksAll
(),
v
=>
{
_
.
map
(
tasksAll
(),
v
=>
{
locations
[
v
.
id
]
=
{
locations
[
v
.
id
]
=
{
name
:
v
.
name
,
name
:
v
.
name
,
...
@@ -671,7 +656,6 @@ JSP.prototype.saveStore = function () {
...
@@ -671,7 +656,6 @@ JSP.prototype.saveStore = function () {
}
}
})
})
// Storage node
// Storage node
store
.
commit
(
'
dag/setTasks
'
,
tasks
)
store
.
commit
(
'
dag/setTasks
'
,
tasks
)
// Store coordinate information
// Store coordinate information
...
@@ -692,14 +676,14 @@ JSP.prototype.saveStore = function () {
...
@@ -692,14 +676,14 @@ JSP.prototype.saveStore = function () {
JSP
.
prototype
.
handleEvent
=
function
()
{
JSP
.
prototype
.
handleEvent
=
function
()
{
this
.
JspInstance
.
bind
(
'
beforeDrop
'
,
function
(
info
)
{
this
.
JspInstance
.
bind
(
'
beforeDrop
'
,
function
(
info
)
{
let
sourceId
=
info
[
'
sourceId
'
]
// 出
const
sourceId
=
info
.
sourceId
// 出
let
targetId
=
info
[
'
targetId
'
]
// 入
const
targetId
=
info
.
targetId
// 入
/**
/**
* Recursive search for nodes
* Recursive search for nodes
*/
*/
let
recursiveVal
let
recursiveVal
const
recursiveTargetarr
=
(
arr
,
targetId
)
=>
{
const
recursiveTargetarr
=
(
arr
,
targetId
)
=>
{
for
(
le
t
i
in
arr
)
{
for
(
cons
t
i
in
arr
)
{
if
(
arr
[
i
]
===
targetId
)
{
if
(
arr
[
i
]
===
targetId
)
{
recursiveVal
=
targetId
recursiveVal
=
targetId
}
else
{
}
else
{
...
@@ -719,10 +703,10 @@ JSP.prototype.handleEvent = function () {
...
@@ -719,10 +703,10 @@ JSP.prototype.handleEvent = function () {
return
false
return
false
}
}
if
(
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-tasks-type
'
)
==
'
CONDITIONS
'
&&
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-nodenumber
'
)
==
2
)
{
if
(
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-tasks-type
'
)
===
'
CONDITIONS
'
&&
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-nodenumber
'
)
===
2
)
{
return
false
return
false
}
else
{
}
else
{
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-nodenumber
'
,
Number
(
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-nodenumber
'
))
+
1
)
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-nodenumber
'
,
Number
(
$
(
`#
${
sourceId
}
`
).
attr
(
'
data-nodenumber
'
))
+
1
)
}
}
// Storage node dependency information
// Storage node dependency information
...
@@ -744,7 +728,7 @@ JSP.prototype.jspBackfill = function ({ connects, locations, largeJson }) {
...
@@ -744,7 +728,7 @@ JSP.prototype.jspBackfill = function ({ connects, locations, largeJson }) {
locations
:
locations
locations
:
locations
})
})
le
t
wNodes
=
jsPlumb
.
getSelector
(
'
.statemachine-demo .w
'
)
cons
t
wNodes
=
jsPlumb
.
getSelector
(
'
.statemachine-demo .w
'
)
// Backfill line
// Backfill line
this
.
JspInstance
.
batch
(()
=>
{
this
.
JspInstance
.
batch
(()
=>
{
...
...
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
浏览文件 @
7a483736
...
@@ -23,7 +23,7 @@ import store from '@/conf/home/store'
...
@@ -23,7 +23,7 @@ import store from '@/conf/home/store'
* Node, to array
* Node, to array
*/
*/
const
rtTargetarrArr
=
(
id
)
=>
{
const
rtTargetarrArr
=
(
id
)
=>
{
le
t
ids
=
$
(
`#
${
id
}
`
).
attr
(
'
data-targetarr
'
)
cons
t
ids
=
$
(
`#
${
id
}
`
).
attr
(
'
data-targetarr
'
)
return
ids
?
ids
.
split
(
'
,
'
)
:
[]
return
ids
?
ids
.
split
(
'
,
'
)
:
[]
}
}
...
@@ -31,8 +31,8 @@ const rtTargetarrArr = (id) => {
...
@@ -31,8 +31,8 @@ const rtTargetarrArr = (id) => {
* Store node id to targetarr
* Store node id to targetarr
*/
*/
const
saveTargetarr
=
(
valId
,
domId
)
=>
{
const
saveTargetarr
=
(
valId
,
domId
)
=>
{
le
t
$target
=
$
(
`#
${
domId
}
`
)
cons
t
$target
=
$
(
`#
${
domId
}
`
)
le
t
targetStr
=
$target
.
attr
(
'
data-targetarr
'
)
?
$target
.
attr
(
'
data-targetarr
'
)
+
`,
${
valId
}
`
:
`
${
valId
}
`
cons
t
targetStr
=
$target
.
attr
(
'
data-targetarr
'
)
?
$target
.
attr
(
'
data-targetarr
'
)
+
`,
${
valId
}
`
:
`
${
valId
}
`
$target
.
attr
(
'
data-targetarr
'
,
targetStr
)
$target
.
attr
(
'
data-targetarr
'
,
targetStr
)
}
}
...
@@ -44,20 +44,20 @@ const rtBantpl = () => {
...
@@ -44,20 +44,20 @@ const rtBantpl = () => {
* return node html
* return node html
*/
*/
const
rtTasksTpl
=
({
id
,
name
,
x
,
y
,
targetarr
,
isAttachment
,
taskType
,
runFlag
,
nodenumber
})
=>
{
const
rtTasksTpl
=
({
id
,
name
,
x
,
y
,
targetarr
,
isAttachment
,
taskType
,
runFlag
,
nodenumber
})
=>
{
let
tpl
=
``
let
tpl
=
''
tpl
+=
`<div class="w jtk-draggable jtk-droppable jtk-endpoint-anchor jtk-connected
${
isAttachment
?
'
jtk-ep
'
:
''
}
" data-targetarr="
${
targetarr
||
''
}
" data-nodenumber="
${
nodenumber
||
0
}
" data-tasks-type="
${
taskType
}
" id="
${
id
}
" style="left:
${
x
}
px; top:
${
y
}
px;">`
tpl
+=
`<div class="w jtk-draggable jtk-droppable jtk-endpoint-anchor jtk-connected
${
isAttachment
?
'
jtk-ep
'
:
''
}
" data-targetarr="
${
targetarr
||
''
}
" data-nodenumber="
${
nodenumber
||
0
}
" data-tasks-type="
${
taskType
}
" id="
${
id
}
" style="left:
${
x
}
px; top:
${
y
}
px;">`
tpl
+=
`<div>`
tpl
+=
'
<div>
'
tpl
+=
`<div class="state-p"></div>`
tpl
+=
'
<div class="state-p"></div>
'
tpl
+=
`<div class="icos icos-
${
taskType
}
"></div>`
tpl
+=
`<div class="icos icos-
${
taskType
}
"></div>`
tpl
+=
`<span class="name-p">
${
name
}
</span>`
tpl
+=
`<span class="name-p">
${
name
}
</span>`
tpl
+=
`</div>`
tpl
+=
'
</div>
'
tpl
+=
`<div class="ep"></div>`
tpl
+=
'
<div class="ep"></div>
'
tpl
+=
`<div class="ban-p">`
tpl
+=
'
<div class="ban-p">
'
if
(
runFlag
===
'
FORBIDDEN
'
)
{
if
(
runFlag
===
'
FORBIDDEN
'
)
{
tpl
+=
rtBantpl
()
tpl
+=
rtBantpl
()
}
}
tpl
+=
`</div>`
tpl
+=
'
</div>
'
tpl
+=
`</div>`
tpl
+=
'
</div>
'
return
tpl
return
tpl
}
}
...
@@ -66,9 +66,9 @@ const rtTasksTpl = ({ id, name, x, y, targetarr, isAttachment, taskType, runFlag
...
@@ -66,9 +66,9 @@ const rtTasksTpl = ({ id, name, x, y, targetarr, isAttachment, taskType, runFlag
* Get all tasks nodes
* Get all tasks nodes
*/
*/
const
tasksAll
=
()
=>
{
const
tasksAll
=
()
=>
{
le
t
a
=
[]
cons
t
a
=
[]
$
(
'
#canvas .w
'
).
each
(
function
(
idx
,
elem
)
{
$
(
'
#canvas .w
'
).
each
(
function
(
idx
,
elem
)
{
le
t
e
=
$
(
elem
)
cons
t
e
=
$
(
elem
)
a
.
push
({
a
.
push
({
id
:
e
.
attr
(
'
id
'
),
id
:
e
.
attr
(
'
id
'
),
name
:
e
.
find
(
'
.name-p
'
).
text
(),
name
:
e
.
find
(
'
.name-p
'
).
text
(),
...
@@ -117,10 +117,10 @@ const setSvgColor = (e, color) => {
...
@@ -117,10 +117,10 @@ const setSvgColor = (e, color) => {
* Get all node ids
* Get all node ids
*/
*/
const
allNodesId
=
()
=>
{
const
allNodesId
=
()
=>
{
le
t
idArr
=
[]
cons
t
idArr
=
[]
$
(
'
.w
'
).
each
((
i
,
o
)
=>
{
$
(
'
.w
'
).
each
((
i
,
o
)
=>
{
le
t
$obj
=
$
(
o
)
cons
t
$obj
=
$
(
o
)
le
t
$span
=
$obj
.
find
(
'
.name-p
'
).
text
()
cons
t
$span
=
$obj
.
find
(
'
.name-p
'
).
text
()
if
(
$span
)
{
if
(
$span
)
{
idArr
.
push
({
idArr
.
push
({
id
:
$obj
.
attr
(
'
id
'
),
id
:
$obj
.
attr
(
'
id
'
),
...
...
dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/gaugeOption.js
浏览文件 @
7a483736
...
@@ -30,21 +30,21 @@ export default function (value) {
...
@@ -30,21 +30,21 @@ export default function (value) {
color
:
[
color
:
[
[
0.5
,
new
echarts
.
graphic
.
LinearGradient
(
0
,
0
,
1
,
0
,
[{
// eslint-disable-line
[
0.5
,
new
echarts
.
graphic
.
LinearGradient
(
0
,
0
,
1
,
0
,
[{
// eslint-disable-line
offset
:
1
,
offset
:
1
,
color
:
'
#1CAD52
'
// 50% Color in place
color
:
'
#1CAD52
'
// 50% Color in place
},
{
},
{
offset
:
0.8
,
offset
:
0.8
,
color
:
'
#1CAD52
'
// 40% Color in place
color
:
'
#1CAD52
'
// 40% Color in place
}],
false
)
],
// 100% Color in place
}],
false
)],
// 100% Color in place
[
0.7
,
new
echarts
.
graphic
.
LinearGradient
(
0
,
0
,
1
,
0
,
[{
// eslint-disable-line
[
0.7
,
new
echarts
.
graphic
.
LinearGradient
(
0
,
0
,
1
,
0
,
[{
// eslint-disable-line
offset
:
1
,
offset
:
1
,
color
:
'
#FFC539
'
// 70% Color in place
color
:
'
#FFC539
'
// 70% Color in place
},
{
},
{
offset
:
0.8
,
offset
:
0.8
,
color
:
'
#FEEC49
'
// 66% Color in place
color
:
'
#FEEC49
'
// 66% Color in place
},
{
},
{
offset
:
0
,
offset
:
0
,
color
:
'
#C7DD6B
'
// 50% Color in place
color
:
'
#C7DD6B
'
// 50% Color in place
}],
false
)
],
}],
false
)],
[
0.9
,
new
echarts
.
graphic
.
LinearGradient
(
0
,
0
,
0
,
1
,
[{
// eslint-disable-line
[
0.9
,
new
echarts
.
graphic
.
LinearGradient
(
0
,
0
,
0
,
1
,
[{
// eslint-disable-line
offset
:
1
,
offset
:
1
,
color
:
'
#E75F25
'
// 90% Color in place
color
:
'
#E75F25
'
// 90% Color in place
...
@@ -54,14 +54,14 @@ export default function (value) {
...
@@ -54,14 +54,14 @@ export default function (value) {
},
{
},
{
offset
:
0
,
offset
:
0
,
color
:
'
#FFC539
'
// 70% Color in place
color
:
'
#FFC539
'
// 70% Color in place
}],
false
)
],
}],
false
)],
[
1
,
new
echarts
.
graphic
.
LinearGradient
(
0
,
0
,
0
,
1
,
[
{
// eslint-disable-line
[
1
,
new
echarts
.
graphic
.
LinearGradient
(
0
,
0
,
0
,
1
,
[
{
// eslint-disable-line
offset
:
0.2
,
offset
:
0.2
,
color
:
'
#E75F25
'
// 92% Color in place
color
:
'
#E75F25
'
// 92% Color in place
},
{
},
{
offset
:
0
,
offset
:
0
,
color
:
'
#D9452C
'
// 90% Color in place
color
:
'
#D9452C
'
// 90% Color in place
}],
false
)
]
}],
false
)]
],
],
width
:
10
width
:
10
}
}
...
@@ -92,10 +92,10 @@ export default function (value) {
...
@@ -92,10 +92,10 @@ export default function (value) {
show
:
true
,
show
:
true
,
lineStyle
:
{
// Property linestyle controls line style
lineStyle
:
{
// Property linestyle controls line style
color
:
[
// Dial Color
color
:
[
// Dial Color
[
0.5
,
'
#20AE51
'
],
// 0-50%Color in place
[
0.5
,
'
#20AE51
'
],
// 0-50%Color in place
[
0.7
,
'
#FFED44
'
],
// 51%-70%Color in place
[
0.7
,
'
#FFED44
'
],
// 51%-70%Color in place
[
0.9
,
'
#FF9618
'
],
// 70%-90%Color in place
[
0.9
,
'
#FF9618
'
],
// 70%-90%Color in place
[
1
,
'
#DA462C
'
]
// 90%-100%Color in place
[
1
,
'
#DA462C
'
]
// 90%-100%Color in place
],
],
width
:
30
// Dial width
width
:
30
// Dial width
}
}
...
...
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/_source/instanceConditions/common.js
浏览文件 @
7a483736
...
@@ -20,7 +20,7 @@ import i18n from '@/module/i18n'
...
@@ -20,7 +20,7 @@ import i18n from '@/module/i18n'
/**
/**
* State code table
* State code table
*/
*/
le
t
stateType
=
[
cons
t
stateType
=
[
{
{
code
:
''
,
code
:
''
,
label
:
`
${
i18n
.
$t
(
'
none
'
)}
`
label
:
`
${
i18n
.
$t
(
'
none
'
)}
`
...
...
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
浏览文件 @
7a483736
...
@@ -92,7 +92,7 @@
...
@@ -92,7 +92,7 @@
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Timing')"
@
click=
"_timing(item)"
:disabled=
"item.releaseState !== 'ONLINE' || item.scheduleReleaseState !== null"
icon=
"ans-icon-timer"
>
<!--
{{
$t
(
'
定时
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Timing')"
@
click=
"_timing(item)"
:disabled=
"item.releaseState !== 'ONLINE' || item.scheduleReleaseState !== null"
icon=
"ans-icon-timer"
>
<!--
{{
$t
(
'
定时
'
)
}}
-->
</x-button>
<x-button
type=
"warning"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('online')"
@
click=
"_poponline(item)"
v-if=
"item.releaseState === 'OFFLINE'"
icon=
"ans-icon-upward"
>
<!--
{{
$t
(
'
下线
'
)
}}
-->
</x-button>
<x-button
type=
"warning"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('online')"
@
click=
"_poponline(item)"
v-if=
"item.releaseState === 'OFFLINE'"
icon=
"ans-icon-upward"
>
<!--
{{
$t
(
'
下线
'
)
}}
-->
</x-button>
<x-button
type=
"error"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('offline')"
@
click=
"_downline(item)"
v-if=
"item.releaseState === 'ONLINE'"
icon=
"ans-icon-downward"
>
<!--
{{
$t
(
'
上线
'
)
}}
-->
</x-button>
<x-button
type=
"error"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('offline')"
@
click=
"_downline(item)"
v-if=
"item.releaseState === 'ONLINE'"
icon=
"ans-icon-downward"
>
<!--
{{
$t
(
'
上线
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Copy')"
@
click=
"_copyProcess(item)"
:disabled=
"item.releaseState === 'ONLINE'"
icon=
"ans-icon-copy"
>
<!--
{{
$t
(
'
复制
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Copy
Workflow
')"
@
click=
"_copyProcess(item)"
:disabled=
"item.releaseState === 'ONLINE'"
icon=
"ans-icon-copy"
>
<!--
{{
$t
(
'
复制
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Cron Manage')"
@
click=
"_timingManage(item)"
:disabled=
"item.releaseState !== 'ONLINE'"
icon=
"ans-icon-datetime"
>
<!--
{{
$t
(
'
定时管理
'
)
}}
-->
</x-button>
<x-button
type=
"info"
shape=
"circle"
size=
"xsmall"
data-toggle=
"tooltip"
:title=
"$t('Cron Manage')"
@
click=
"_timingManage(item)"
:disabled=
"item.releaseState !== 'ONLINE'"
icon=
"ans-icon-datetime"
>
<!--
{{
$t
(
'
定时管理
'
)
}}
-->
</x-button>
<x-poptip
<x-poptip
:ref=
"'poptip-delete-' + $index"
:ref=
"'poptip-delete-' + $index"
...
@@ -166,6 +166,7 @@
...
@@ -166,6 +166,7 @@
},
},
methods
:
{
methods
:
{
...
mapActions
(
'
dag
'
,
[
'
editProcessState
'
,
'
getStartCheck
'
,
'
getReceiver
'
,
'
deleteDefinition
'
,
'
batchDeleteDefinition
'
,
'
exportDefinition
'
,
'
copyProcess
'
]),
...
mapActions
(
'
dag
'
,
[
'
editProcessState
'
,
'
getStartCheck
'
,
'
getReceiver
'
,
'
deleteDefinition
'
,
'
batchDeleteDefinition
'
,
'
exportDefinition
'
,
'
copyProcess
'
]),
...
mapActions
(
'
security
'
,
[
'
getWorkerGroupsAll
'
]),
_rtPublishStatus
(
code
)
{
_rtPublishStatus
(
code
)
{
return
_
.
filter
(
publishStatus
,
v
=>
v
.
code
===
code
)[
0
].
desc
return
_
.
filter
(
publishStatus
,
v
=>
v
.
code
===
code
)[
0
].
desc
},
},
...
@@ -176,6 +177,7 @@
...
@@ -176,6 +177,7 @@
* Start
* Start
*/
*/
_start
(
item
)
{
_start
(
item
)
{
this
.
getWorkerGroupsAll
()
this
.
getStartCheck
({
processDefinitionId
:
item
.
id
}).
then
(
res
=>
{
this
.
getStartCheck
({
processDefinitionId
:
item
.
id
}).
then
(
res
=>
{
let
self
=
this
let
self
=
this
let
modal
=
this
.
$modal
.
dialog
({
let
modal
=
this
.
$modal
.
dialog
({
...
...
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/util.js
浏览文件 @
7a483736
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
import
i18n
from
'
@/module/i18n
'
import
i18n
from
'
@/module/i18n
'
le
t
warningTypeList
=
[
cons
t
warningTypeList
=
[
{
{
id
:
'
NONE
'
,
id
:
'
NONE
'
,
code
:
`
${
i18n
.
$t
(
'
none_1
'
)}
`
code
:
`
${
i18n
.
$t
(
'
none_1
'
)}
`
...
@@ -42,9 +42,9 @@ const isEmial = (val) => {
...
@@ -42,9 +42,9 @@ const isEmial = (val) => {
}
}
const
fuzzyQuery
=
(
list
,
keyWord
)
=>
{
const
fuzzyQuery
=
(
list
,
keyWord
)
=>
{
le
t
len
=
list
.
length
cons
t
len
=
list
.
length
le
t
arr
=
[]
cons
t
arr
=
[]
le
t
reg
=
new
RegExp
(
keyWord
)
cons
t
reg
=
new
RegExp
(
keyWord
)
for
(
let
i
=
0
;
i
<
len
;
i
++
)
{
for
(
let
i
=
0
;
i
<
len
;
i
++
)
{
if
(
list
[
i
].
match
(
reg
))
{
if
(
list
[
i
].
match
(
reg
))
{
arr
.
push
(
list
[
i
])
arr
.
push
(
list
[
i
])
...
...
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/tree.js
浏览文件 @
7a483736
...
@@ -21,7 +21,7 @@ import { tasksType, tasksState } from '@/conf/home/pages/dag/_source/config'
...
@@ -21,7 +21,7 @@ import { tasksType, tasksState } from '@/conf/home/pages/dag/_source/config'
let
self
=
this
let
self
=
this
le
t
Tree
=
function
()
{
cons
t
Tree
=
function
()
{
self
=
this
self
=
this
this
.
selfTree
=
{}
this
.
selfTree
=
{}
this
.
tree
=
function
()
{}
this
.
tree
=
function
()
{}
...
@@ -57,7 +57,7 @@ Tree.prototype.init = function ({ data, limit, selfTree }) {
...
@@ -57,7 +57,7 @@ Tree.prototype.init = function ({ data, limit, selfTree }) {
this
.
duration
=
400
this
.
duration
=
400
this
.
i
=
0
this
.
i
=
0
this
.
tree
=
d3
.
layout
.
tree
().
nodeSize
([
0
,
46
])
this
.
tree
=
d3
.
layout
.
tree
().
nodeSize
([
0
,
46
])
le
t
tasks
=
this
.
tree
.
nodes
(
data
)
cons
t
tasks
=
this
.
tree
.
nodes
(
data
)
this
.
diagonal
=
d3
.
svg
this
.
diagonal
=
d3
.
svg
.
diagonal
()
.
diagonal
()
...
@@ -142,9 +142,9 @@ Tree.prototype.treeToggles = function (clicked_d) { // eslint-disable-line
...
@@ -142,9 +142,9 @@ Tree.prototype.treeToggles = function (clicked_d) { // eslint-disable-line
*/
*/
Tree
.
prototype
.
treeUpdate
=
function
(
source
)
{
Tree
.
prototype
.
treeUpdate
=
function
(
source
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
le
t
tasks
=
this
.
tree
.
nodes
(
this
.
root
)
cons
t
tasks
=
this
.
tree
.
nodes
(
this
.
root
)
le
t
height
=
Math
.
max
(
500
,
tasks
.
length
*
this
.
config
.
barHeight
+
this
.
config
.
margin
.
top
+
this
.
config
.
margin
.
bottom
)
cons
t
height
=
Math
.
max
(
500
,
tasks
.
length
*
this
.
config
.
barHeight
+
this
.
config
.
margin
.
top
+
this
.
config
.
margin
.
bottom
)
le
t
width
=
(
this
.
config
.
nodesMax
*
70
)
+
(
this
.
squareNum
*
(
this
.
config
.
squareSize
+
this
.
config
.
squarePading
))
+
this
.
config
.
margin
.
left
+
this
.
config
.
margin
.
right
+
50
cons
t
width
=
(
this
.
config
.
nodesMax
*
70
)
+
(
this
.
squareNum
*
(
this
.
config
.
squareSize
+
this
.
config
.
squarePading
))
+
this
.
config
.
margin
.
left
+
this
.
config
.
margin
.
right
+
50
d3
.
select
(
'
svg
'
)
d3
.
select
(
'
svg
'
)
.
transition
()
.
transition
()
...
@@ -156,12 +156,12 @@ Tree.prototype.treeUpdate = function (source) {
...
@@ -156,12 +156,12 @@ Tree.prototype.treeUpdate = function (source) {
n
.
x
=
i
*
this
.
config
.
barHeight
n
.
x
=
i
*
this
.
config
.
barHeight
})
})
le
t
task
=
this
.
svg
.
selectAll
(
'
g.node
'
)
cons
t
task
=
this
.
svg
.
selectAll
(
'
g.node
'
)
.
data
(
tasks
,
(
d
)
=>
{
.
data
(
tasks
,
(
d
)
=>
{
return
d
.
id
||
(
d
.
id
=
++
this
.
i
)
return
d
.
id
||
(
d
.
id
=
++
this
.
i
)
})
})
le
t
nodeEnter
=
task
.
enter
()
cons
t
nodeEnter
=
task
.
enter
()
.
append
(
'
g
'
)
.
append
(
'
g
'
)
.
attr
(
'
class
'
,
this
.
nodesClass
)
.
attr
(
'
class
'
,
this
.
nodesClass
)
.
attr
(
'
transform
'
,
()
=>
'
translate(
'
+
source
.
y0
+
'
,
'
+
source
.
x0
+
'
)
'
)
.
attr
(
'
transform
'
,
()
=>
'
translate(
'
+
source
.
y0
+
'
,
'
+
source
.
x0
+
'
)
'
)
...
@@ -201,7 +201,7 @@ Tree.prototype.treeUpdate = function (source) {
...
@@ -201,7 +201,7 @@ Tree.prototype.treeUpdate = function (source) {
}
}
})
})
.
attr
(
'
class
'
,
'
state
'
)
.
attr
(
'
class
'
,
'
state
'
)
.
style
(
'
fill
'
,
d
=>
d
.
state
&&
tasksState
[
d
.
state
].
color
||
'
#ffffff
'
)
.
style
(
'
fill
'
,
d
=>
(
d
.
state
&&
tasksState
[
d
.
state
].
color
)
||
'
#ffffff
'
)
.
attr
(
'
data-toggle
'
,
'
tooltip
'
)
.
attr
(
'
data-toggle
'
,
'
tooltip
'
)
.
attr
(
'
rx
'
,
d
=>
d
.
type
?
0
:
12
)
.
attr
(
'
rx
'
,
d
=>
d
.
type
?
0
:
12
)
.
attr
(
'
ry
'
,
d
=>
d
.
type
?
0
:
12
)
.
attr
(
'
ry
'
,
d
=>
d
.
type
?
0
:
12
)
...
@@ -231,7 +231,6 @@ Tree.prototype.treeUpdate = function (source) {
...
@@ -231,7 +231,6 @@ Tree.prototype.treeUpdate = function (source) {
.
attr
(
'
transform
'
,
d
=>
'
translate(
'
+
d
.
y
+
'
,
'
+
d
.
x
+
'
)
'
)
.
attr
(
'
transform
'
,
d
=>
'
translate(
'
+
d
.
y
+
'
,
'
+
d
.
x
+
'
)
'
)
.
style
(
'
opacity
'
,
1
)
.
style
(
'
opacity
'
,
1
)
// Convert the exit node to the new location of the parent node。
// Convert the exit node to the new location of the parent node。
task
.
exit
().
transition
()
task
.
exit
().
transition
()
.
duration
(
this
.
duration
)
.
duration
(
this
.
duration
)
...
@@ -240,14 +239,14 @@ Tree.prototype.treeUpdate = function (source) {
...
@@ -240,14 +239,14 @@ Tree.prototype.treeUpdate = function (source) {
.
remove
()
.
remove
()
// Update link
// Update link
le
t
link
=
this
.
svg
.
selectAll
(
'
path.link
'
)
cons
t
link
=
this
.
svg
.
selectAll
(
'
path.link
'
)
.
data
(
this
.
tree
.
links
(
tasks
),
d
=>
d
.
target
.
id
)
.
data
(
this
.
tree
.
links
(
tasks
),
d
=>
d
.
target
.
id
)
// Enter any new links in the previous location of the parent node。
// Enter any new links in the previous location of the parent node。
link
.
enter
().
insert
(
'
path
'
,
'
g
'
)
link
.
enter
().
insert
(
'
path
'
,
'
g
'
)
.
attr
(
'
class
'
,
'
link
'
)
.
attr
(
'
class
'
,
'
link
'
)
.
attr
(
'
d
'
,
(
d
)
=>
{
.
attr
(
'
d
'
,
(
d
)
=>
{
le
t
o
=
{
x
:
source
.
x0
,
y
:
source
.
y0
}
cons
t
o
=
{
x
:
source
.
x0
,
y
:
source
.
y0
}
return
this
.
diagonal
({
source
:
o
,
target
:
o
})
return
this
.
diagonal
({
source
:
o
,
target
:
o
})
})
})
.
transition
()
.
transition
()
...
@@ -263,7 +262,7 @@ Tree.prototype.treeUpdate = function (source) {
...
@@ -263,7 +262,7 @@ Tree.prototype.treeUpdate = function (source) {
link
.
exit
().
transition
()
link
.
exit
().
transition
()
.
duration
(
this
.
duration
)
.
duration
(
this
.
duration
)
.
attr
(
'
d
'
,
(
d
)
=>
{
.
attr
(
'
d
'
,
(
d
)
=>
{
le
t
o
=
{
x
:
source
.
x
,
y
:
source
.
y
}
cons
t
o
=
{
x
:
source
.
x
,
y
:
source
.
y
}
return
this
.
diagonal
({
source
:
o
,
target
:
o
})
return
this
.
diagonal
({
source
:
o
,
target
:
o
})
})
})
.
remove
()
.
remove
()
...
...
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/_source/util.js
浏览文件 @
7a483736
...
@@ -22,7 +22,7 @@ import { tasksState } from '@/conf/home/pages/dag/_source/config'
...
@@ -22,7 +22,7 @@ import { tasksState } from '@/conf/home/pages/dag/_source/config'
* Node prompt dom
* Node prompt dom
*/
*/
const
rtInstancesTooltip
=
(
data
)
=>
{
const
rtInstancesTooltip
=
(
data
)
=>
{
let
str
=
`<div style="text-align: left;word-break:break-all">`
let
str
=
'
<div style="text-align: left;word-break:break-all">
'
str
+=
`id :
${
data
.
id
}
</br>`
str
+=
`id :
${
data
.
id
}
</br>`
str
+=
`host :
${
data
.
host
}
</br>`
str
+=
`host :
${
data
.
host
}
</br>`
str
+=
`name :
${
data
.
name
}
</br>`
str
+=
`name :
${
data
.
name
}
</br>`
...
@@ -33,7 +33,7 @@ const rtInstancesTooltip = (data) => {
...
@@ -33,7 +33,7 @@ const rtInstancesTooltip = (data) => {
str
+=
`startTime :
${
data
.
startTime
?
formatDate
(
data
.
startTime
)
:
'
-
'
}
</br>`
str
+=
`startTime :
${
data
.
startTime
?
formatDate
(
data
.
startTime
)
:
'
-
'
}
</br>`
str
+=
`endTime :
${
data
.
endTime
?
formatDate
(
data
.
endTime
)
:
'
-
'
}
</br>`
str
+=
`endTime :
${
data
.
endTime
?
formatDate
(
data
.
endTime
)
:
'
-
'
}
</br>`
str
+=
`duration :
${
data
.
duration
}
</br>`
str
+=
`duration :
${
data
.
duration
}
</br>`
str
+=
`</div>`
str
+=
'
</div>
'
return
str
return
str
}
}
...
@@ -42,7 +42,7 @@ const rtInstancesTooltip = (data) => {
...
@@ -42,7 +42,7 @@ const rtInstancesTooltip = (data) => {
* Easy to calculate the width dynamically
* Easy to calculate the width dynamically
*/
*/
const
rtCountMethod
=
list
=>
{
const
rtCountMethod
=
list
=>
{
le
t
arr
=
[]
cons
t
arr
=
[]
function
count
(
list
,
t
)
{
function
count
(
list
,
t
)
{
let
toggle
=
false
let
toggle
=
false
list
.
forEach
(
v
=>
{
list
.
forEach
(
v
=>
{
...
...
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/chartConfig.js
浏览文件 @
7a483736
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
import
_
from
'
lodash
'
import
_
from
'
lodash
'
import
{
tasksState
}
from
'
@/conf/home/pages/dag/_source/config
'
import
{
tasksState
}
from
'
@/conf/home/pages/dag/_source/config
'
le
t
pie
=
{
cons
t
pie
=
{
series
:
[
series
:
[
{
{
type
:
'
pie
'
,
type
:
'
pie
'
,
...
@@ -37,7 +37,7 @@ let pie = {
...
@@ -37,7 +37,7 @@ let pie = {
]
]
}
}
le
t
bar
=
{
cons
t
bar
=
{
title
:
{
title
:
{
text
:
''
text
:
''
},
},
...
@@ -56,7 +56,7 @@ let bar = {
...
@@ -56,7 +56,7 @@ let bar = {
},
},
tooltip
:
{
tooltip
:
{
formatter
(
v
)
{
formatter
(
v
)
{
le
t
val
=
v
[
0
].
name
.
split
(
'
,
'
)
cons
t
val
=
v
[
0
].
name
.
split
(
'
,
'
)
return
`
${
val
[
0
]}
(
${
v
[
0
].
value
}
)`
return
`
${
val
[
0
]}
(
${
v
[
0
].
value
}
)`
}
}
},
},
...
@@ -66,7 +66,7 @@ let bar = {
...
@@ -66,7 +66,7 @@ let bar = {
}]
}]
}
}
le
t
simple
=
{
cons
t
simple
=
{
xAxis
:
{
xAxis
:
{
splitLine
:
{
splitLine
:
{
show
:
false
show
:
false
...
@@ -93,7 +93,6 @@ let simple = {
...
@@ -93,7 +93,6 @@ let simple = {
},
},
color
:
[
'
#D5050B
'
,
'
#0398E1
'
]
color
:
[
'
#D5050B
'
,
'
#0398E1
'
]
}
}
export
{
pie
,
bar
,
simple
}
export
{
pie
,
bar
,
simple
}
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/_source/gantt.js
浏览文件 @
7a483736
...
@@ -19,13 +19,13 @@ import * as d3 from 'd3'
...
@@ -19,13 +19,13 @@ import * as d3 from 'd3'
import
{
formatDate
}
from
'
@/module/filter/filter
'
import
{
formatDate
}
from
'
@/module/filter/filter
'
import
{
tasksState
}
from
'
@/conf/home/pages/dag/_source/config
'
import
{
tasksState
}
from
'
@/conf/home/pages/dag/_source/config
'
le
t
Gantt
=
function
()
{
cons
t
Gantt
=
function
()
{
this
.
el
=
''
this
.
el
=
''
this
.
tasks
=
[]
this
.
tasks
=
[]
this
.
width
=
null
this
.
width
=
null
this
.
height
=
null
this
.
height
=
null
this
.
taskNames
=
[]
this
.
taskNames
=
[]
this
.
tickFormat
=
`%H:%M:%S`
this
.
tickFormat
=
'
%H:%M:%S
'
this
.
margin
=
{
this
.
margin
=
{
top
:
10
,
top
:
10
,
right
:
40
,
right
:
40
,
...
@@ -41,20 +41,20 @@ Gantt.prototype.init = function ({ el, tasks }) {
...
@@ -41,20 +41,20 @@ Gantt.prototype.init = function ({ el, tasks }) {
this
.
tasks
=
tasks
this
.
tasks
=
tasks
this
.
taskNames
=
_
.
map
(
_
.
cloneDeep
(
tasks
),
v
=>
v
.
taskName
)
this
.
taskNames
=
_
.
map
(
_
.
cloneDeep
(
tasks
),
v
=>
v
.
taskName
)
this
.
taskNames
=
this
.
taskNames
.
reduce
(
function
(
prev
,
cur
)
{
this
.
taskNames
=
this
.
taskNames
.
reduce
(
function
(
prev
,
cur
)
{
prev
.
indexOf
(
cur
)
===
-
1
&&
prev
.
push
(
cur
)
;
prev
.
indexOf
(
cur
)
===
-
1
&&
prev
.
push
(
cur
)
return
prev
;
return
prev
},[])
},
[])
this
.
height
=
parseInt
(
this
.
taskNames
.
length
*
30
)
this
.
height
=
parseInt
(
this
.
taskNames
.
length
*
30
)
this
.
width
=
$
(
this
.
el
).
width
()
-
this
.
margin
.
right
-
this
.
margin
.
left
-
5
this
.
width
=
$
(
this
.
el
).
width
()
-
this
.
margin
.
right
-
this
.
margin
.
left
-
5
this
.
x
=
d3
.
time
.
scale
()
this
.
x
=
d3
.
time
.
scale
()
.
domain
([
this
.
startTimeXAxis
,
this
.
endTimeXAxis
])
.
domain
([
this
.
startTimeXAxis
,
this
.
endTimeXAxis
])
.
range
([
0
,
this
.
width
])
.
range
([
0
,
this
.
width
])
.
clamp
(
true
)
.
clamp
(
true
)
this
.
y
=
d3
.
scale
.
ordinal
()
this
.
y
=
d3
.
scale
.
ordinal
()
.
domain
(
this
.
taskNames
)
.
domain
(
this
.
taskNames
)
.
rangeRoundBands
([
0
,
this
.
height
-
this
.
margin
.
top
-
this
.
margin
.
bottom
],
0.1
)
.
rangeRoundBands
([
0
,
this
.
height
-
this
.
margin
.
top
-
this
.
margin
.
bottom
],
0.1
)
this
.
xAxis
=
d3
.
svg
.
axis
()
this
.
xAxis
=
d3
.
svg
.
axis
()
.
scale
(
this
.
x
)
.
scale
(
this
.
x
)
...
@@ -97,13 +97,13 @@ Gantt.prototype.compXAxisTimes = function () {
...
@@ -97,13 +97,13 @@ Gantt.prototype.compXAxisTimes = function () {
*/
*/
Gantt
.
prototype
.
initializeXAxis
=
function
()
{
Gantt
.
prototype
.
initializeXAxis
=
function
()
{
this
.
x
=
d3
.
time
.
scale
()
this
.
x
=
d3
.
time
.
scale
()
.
domain
([
this
.
startTimeXAxis
,
this
.
endTimeXAxis
])
.
domain
([
this
.
startTimeXAxis
,
this
.
endTimeXAxis
])
.
range
([
0
,
this
.
width
])
.
range
([
0
,
this
.
width
])
.
clamp
(
true
)
.
clamp
(
true
)
this
.
y
=
d3
.
scale
.
ordinal
()
this
.
y
=
d3
.
scale
.
ordinal
()
.
domain
(
this
.
taskNames
)
.
domain
(
this
.
taskNames
)
.
rangeRoundBands
([
0
,
this
.
height
-
this
.
margin
.
top
-
this
.
margin
.
bottom
],
0.1
)
.
rangeRoundBands
([
0
,
this
.
height
-
this
.
margin
.
top
-
this
.
margin
.
bottom
],
0.1
)
this
.
xAxis
=
d3
.
svg
.
axis
()
this
.
xAxis
=
d3
.
svg
.
axis
()
.
scale
(
this
.
x
)
.
scale
(
this
.
x
)
...
@@ -151,9 +151,9 @@ Gantt.prototype.drawChart = function () {
...
@@ -151,9 +151,9 @@ Gantt.prototype.drawChart = function () {
.
attr
(
'
transform
'
,
'
translate(0,
'
+
(
this
.
height
-
this
.
margin
.
top
-
this
.
margin
.
bottom
)
+
'
)
'
)
.
attr
(
'
transform
'
,
'
translate(0,
'
+
(
this
.
height
-
this
.
margin
.
top
-
this
.
margin
.
bottom
)
+
'
)
'
)
.
transition
()
.
transition
()
.
call
(
this
.
xAxis
)
.
call
(
this
.
xAxis
)
.
selectAll
(
"
text
"
)
.
selectAll
(
'
text
'
)
.
attr
(
"
transform
"
,
`rotate(-
${
this
.
width
/
(
$
(
'
.tick
'
).
length
-
1
)
>
50
?
0
:
Math
.
acos
(
this
.
width
/
(
$
(
'
.tick
'
).
length
-
1
)
/
50
)
*
57
}
)`
)
.
attr
(
'
transform
'
,
`rotate(-
${
this
.
width
/
(
$
(
'
.tick
'
).
length
-
1
)
>
50
?
0
:
Math
.
acos
(
this
.
width
/
(
$
(
'
.tick
'
).
length
-
1
)
/
50
)
*
57
}
)`
)
.
style
(
"
text-anchor
"
,
`
${
this
.
width
/
(
$
(
'
.tick
'
).
length
-
1
)
>
50
?
'
middle
'
:
'
end
'
}
`
)
.
style
(
'
text-anchor
'
,
`
${
this
.
width
/
(
$
(
'
.tick
'
).
length
-
1
)
>
50
?
'
middle
'
:
'
end
'
}
`
)
svg
.
append
(
'
g
'
)
svg
.
append
(
'
g
'
)
.
attr
(
'
class
'
,
'
y axis
'
)
.
attr
(
'
class
'
,
'
y axis
'
)
...
@@ -169,15 +169,14 @@ Gantt.prototype.drawChart = function () {
...
@@ -169,15 +169,14 @@ Gantt.prototype.drawChart = function () {
* Tip prompt
* Tip prompt
*/
*/
Gantt
.
prototype
.
tip
=
function
(
d
)
{
Gantt
.
prototype
.
tip
=
function
(
d
)
{
let
str
=
`<div style="text-align: left;word-break:break-all">`
let
str
=
'
<div style="text-align: left;word-break:break-all">
'
str
+=
`taskName :
${
d
.
taskName
}
</br>`
str
+=
`taskName :
${
d
.
taskName
}
</br>`
str
+=
`status :
${
tasksState
[
d
.
status
].
desc
}
(
${
d
.
status
}
)</br>`
str
+=
`status :
${
tasksState
[
d
.
status
].
desc
}
(
${
d
.
status
}
)</br>`
str
+=
`startTime :
${
formatDate
(
d
.
isoStart
)}
</br>`
str
+=
`startTime :
${
formatDate
(
d
.
isoStart
)}
</br>`
str
+=
`endTime :
${
formatDate
(
d
.
isoEnd
)}
</br>`
str
+=
`endTime :
${
formatDate
(
d
.
isoEnd
)}
</br>`
str
+=
`duration :
${
d
.
duration
}
</br>`
str
+=
`duration :
${
d
.
duration
}
</br>`
str
+=
`</div>`
str
+=
'
</div>
'
return
str
return
str
}
}
export
default
new
Gantt
()
export
default
new
Gantt
()
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/_source/common.js
浏览文件 @
7a483736
...
@@ -18,6 +18,6 @@
...
@@ -18,6 +18,6 @@
/**
/**
* Create file type
* Create file type
*/
*/
le
t
filtTypeArr
=
[
'
txt
'
,
'
log
'
,
'
sh
'
,
'
conf
'
,
'
cfg
'
,
'
py
'
,
'
java
'
,
'
sql
'
,
'
xml
'
,
'
hql
'
,
'
properties
'
]
cons
t
filtTypeArr
=
[
'
txt
'
,
'
log
'
,
'
sh
'
,
'
conf
'
,
'
cfg
'
,
'
py
'
,
'
java
'
,
'
sql
'
,
'
xml
'
,
'
hql
'
,
'
properties
'
]
export
{
filtTypeArr
}
export
{
filtTypeArr
}
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/_source/utils.js
浏览文件 @
7a483736
...
@@ -32,7 +32,6 @@ const handlerSuffix = {
...
@@ -32,7 +32,6 @@ const handlerSuffix = {
'
.properties
'
:
'
textile
'
'
.properties
'
:
'
textile
'
}
}
export
{
export
{
handlerSuffix
handlerSuffix
}
}
dolphinscheduler-ui/src/js/conf/home/router/index.js
浏览文件 @
7a483736
...
@@ -426,7 +426,7 @@ const router = new Router({
...
@@ -426,7 +426,7 @@ const router = new Router({
name
:
'
monitor
'
,
name
:
'
monitor
'
,
component
:
resolve
=>
require
([
'
../pages/monitor/index
'
],
resolve
),
component
:
resolve
=>
require
([
'
../pages/monitor/index
'
],
resolve
),
meta
:
{
meta
:
{
title
:
`monitor`
title
:
'
monitor
'
},
},
redirect
:
{
redirect
:
{
name
:
'
servers-master
'
name
:
'
servers-master
'
...
@@ -453,7 +453,7 @@ const router = new Router({
...
@@ -453,7 +453,7 @@ const router = new Router({
name
:
'
servers-alert
'
,
name
:
'
servers-alert
'
,
component
:
resolve
=>
require
([
'
../pages/monitor/pages/servers/alert
'
],
resolve
),
component
:
resolve
=>
require
([
'
../pages/monitor/pages/servers/alert
'
],
resolve
),
meta
:
{
meta
:
{
title
:
`Alert`
title
:
'
Alert
'
}
}
},
},
{
{
...
@@ -461,7 +461,7 @@ const router = new Router({
...
@@ -461,7 +461,7 @@ const router = new Router({
name
:
'
servers-rpcserver
'
,
name
:
'
servers-rpcserver
'
,
component
:
resolve
=>
require
([
'
../pages/monitor/pages/servers/rpcserver
'
],
resolve
),
component
:
resolve
=>
require
([
'
../pages/monitor/pages/servers/rpcserver
'
],
resolve
),
meta
:
{
meta
:
{
title
:
`Rpcserver`
title
:
'
Rpcserver
'
}
}
},
},
{
{
...
@@ -469,7 +469,7 @@ const router = new Router({
...
@@ -469,7 +469,7 @@ const router = new Router({
name
:
'
servers-zookeeper
'
,
name
:
'
servers-zookeeper
'
,
component
:
resolve
=>
require
([
'
../pages/monitor/pages/servers/zookeeper
'
],
resolve
),
component
:
resolve
=>
require
([
'
../pages/monitor/pages/servers/zookeeper
'
],
resolve
),
meta
:
{
meta
:
{
title
:
`Zookeeper`
title
:
'
Zookeeper
'
}
}
},
},
{
{
...
@@ -477,7 +477,7 @@ const router = new Router({
...
@@ -477,7 +477,7 @@ const router = new Router({
name
:
'
servers-apiserver
'
,
name
:
'
servers-apiserver
'
,
component
:
resolve
=>
require
([
'
../pages/monitor/pages/servers/apiserver
'
],
resolve
),
component
:
resolve
=>
require
([
'
../pages/monitor/pages/servers/apiserver
'
],
resolve
),
meta
:
{
meta
:
{
title
:
`Apiserver`
title
:
'
Apiserver
'
}
}
},
},
{
{
...
@@ -485,7 +485,7 @@ const router = new Router({
...
@@ -485,7 +485,7 @@ const router = new Router({
name
:
'
servers-db
'
,
name
:
'
servers-db
'
,
component
:
resolve
=>
require
([
'
../pages/monitor/pages/servers/db
'
],
resolve
),
component
:
resolve
=>
require
([
'
../pages/monitor/pages/servers/db
'
],
resolve
),
meta
:
{
meta
:
{
title
:
`DB`
title
:
'
DB
'
}
}
},
},
{
{
...
@@ -493,7 +493,7 @@ const router = new Router({
...
@@ -493,7 +493,7 @@ const router = new Router({
name
:
'
statistics
'
,
name
:
'
statistics
'
,
component
:
resolve
=>
require
([
'
../pages/monitor/pages/servers/statistics
'
],
resolve
),
component
:
resolve
=>
require
([
'
../pages/monitor/pages/servers/statistics
'
],
resolve
),
meta
:
{
meta
:
{
title
:
`statistics`
title
:
'
statistics
'
}
}
}
}
]
]
...
@@ -502,7 +502,7 @@ const router = new Router({
...
@@ -502,7 +502,7 @@ const router = new Router({
})
})
router
.
beforeEach
((
to
,
from
,
next
)
=>
{
router
.
beforeEach
((
to
,
from
,
next
)
=>
{
le
t
$body
=
$
(
'
body
'
)
cons
t
$body
=
$
(
'
body
'
)
$body
.
find
(
'
.tooltip.fade.top.in
'
).
remove
()
$body
.
find
(
'
.tooltip.fade.top.in
'
).
remove
()
if
(
to
.
meta
.
title
)
{
if
(
to
.
meta
.
title
)
{
document
.
title
=
`
${
to
.
meta
.
title
}
- DolphinScheduler`
document
.
title
=
`
${
to
.
meta
.
title
}
- DolphinScheduler`
...
...
dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
浏览文件 @
7a483736
...
@@ -28,7 +28,7 @@ export default {
...
@@ -28,7 +28,7 @@ export default {
io
.
get
(
`projects/
${
state
.
projectName
}
/instance/task-list-by-process-id`
,
{
io
.
get
(
`projects/
${
state
.
projectName
}
/instance/task-list-by-process-id`
,
{
processInstanceId
:
payload
processInstanceId
:
payload
},
res
=>
{
},
res
=>
{
le
t
arr
=
_
.
map
(
res
.
data
.
taskList
,
v
=>
{
cons
t
arr
=
_
.
map
(
res
.
data
.
taskList
,
v
=>
{
return
_
.
cloneDeep
(
_
.
assign
(
tasksState
[
v
.
state
],
{
return
_
.
cloneDeep
(
_
.
assign
(
tasksState
[
v
.
state
],
{
name
:
v
.
name
,
name
:
v
.
name
,
stateId
:
v
.
id
,
stateId
:
v
.
id
,
...
@@ -108,7 +108,7 @@ export default {
...
@@ -108,7 +108,7 @@ export default {
// locations
// locations
state
.
locations
=
JSON
.
parse
(
res
.
data
.
locations
)
state
.
locations
=
JSON
.
parse
(
res
.
data
.
locations
)
// Process definition
// Process definition
le
t
processDefinitionJson
=
JSON
.
parse
(
res
.
data
.
processDefinitionJson
)
cons
t
processDefinitionJson
=
JSON
.
parse
(
res
.
data
.
processDefinitionJson
)
// tasks info
// tasks info
state
.
tasks
=
processDefinitionJson
.
tasks
state
.
tasks
=
processDefinitionJson
.
tasks
// tasks cache
// tasks cache
...
@@ -129,7 +129,7 @@ export default {
...
@@ -129,7 +129,7 @@ export default {
})
})
},
},
/**
/**
* Get process definition DAG diagram details
* Get process definition DAG diagram details
*/
*/
copyProcess
({
state
},
payload
)
{
copyProcess
({
state
},
payload
)
{
...
@@ -161,7 +161,7 @@ export default {
...
@@ -161,7 +161,7 @@ export default {
// locations
// locations
state
.
locations
=
JSON
.
parse
(
res
.
data
.
locations
)
state
.
locations
=
JSON
.
parse
(
res
.
data
.
locations
)
// process instance
// process instance
le
t
processInstanceJson
=
JSON
.
parse
(
res
.
data
.
processInstanceJson
)
cons
t
processInstanceJson
=
JSON
.
parse
(
res
.
data
.
processInstanceJson
)
// tasks info
// tasks info
state
.
tasks
=
processInstanceJson
.
tasks
state
.
tasks
=
processInstanceJson
.
tasks
// tasks cache
// tasks cache
...
@@ -176,7 +176,7 @@ export default {
...
@@ -176,7 +176,7 @@ export default {
state
.
tenantId
=
processInstanceJson
.
tenantId
state
.
tenantId
=
processInstanceJson
.
tenantId
//startup parameters
//
startup parameters
state
.
startup
=
_
.
assign
(
state
.
startup
,
_
.
pick
(
res
.
data
,
[
'
commandType
'
,
'
failureStrategy
'
,
'
processInstancePriority
'
,
'
workerGroup
'
,
'
warningType
'
,
'
warningGroupId
'
,
'
receivers
'
,
'
receiversCc
'
]))
state
.
startup
=
_
.
assign
(
state
.
startup
,
_
.
pick
(
res
.
data
,
[
'
commandType
'
,
'
failureStrategy
'
,
'
processInstancePriority
'
,
'
workerGroup
'
,
'
warningType
'
,
'
warningGroupId
'
,
'
receivers
'
,
'
receiversCc
'
]))
state
.
startup
.
commandParam
=
JSON
.
parse
(
res
.
data
.
commandParam
)
state
.
startup
.
commandParam
=
JSON
.
parse
(
res
.
data
.
commandParam
)
...
@@ -191,7 +191,7 @@ export default {
...
@@ -191,7 +191,7 @@ export default {
*/
*/
saveDAGchart
({
state
},
payload
)
{
saveDAGchart
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
le
t
data
=
{
cons
t
data
=
{
globalParams
:
state
.
globalParams
,
globalParams
:
state
.
globalParams
,
tasks
:
state
.
tasks
,
tasks
:
state
.
tasks
,
tenantId
:
state
.
tenantId
,
tenantId
:
state
.
tenantId
,
...
@@ -215,7 +215,7 @@ export default {
...
@@ -215,7 +215,7 @@ export default {
*/
*/
updateDefinition
({
state
},
payload
)
{
updateDefinition
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
le
t
data
=
{
cons
t
data
=
{
globalParams
:
state
.
globalParams
,
globalParams
:
state
.
globalParams
,
tasks
:
state
.
tasks
,
tasks
:
state
.
tasks
,
tenantId
:
state
.
tenantId
,
tenantId
:
state
.
tenantId
,
...
@@ -240,7 +240,7 @@ export default {
...
@@ -240,7 +240,7 @@ export default {
*/
*/
updateInstance
({
state
},
payload
)
{
updateInstance
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
le
t
data
=
{
cons
t
data
=
{
globalParams
:
state
.
globalParams
,
globalParams
:
state
.
globalParams
,
tasks
:
state
.
tasks
,
tasks
:
state
.
tasks
,
tenantId
:
state
.
tenantId
,
tenantId
:
state
.
tenantId
,
...
@@ -294,16 +294,16 @@ export default {
...
@@ -294,16 +294,16 @@ export default {
getProjectList
({
state
},
payload
)
{
getProjectList
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
if
(
state
.
projectListS
.
length
)
{
if
(
state
.
projectListS
.
length
)
{
resolve
()
resolve
()
return
return
}
}
io
.
get
(
`projects/query-project-list`
,
payload
,
res
=>
{
io
.
get
(
'
projects/query-project-list
'
,
payload
,
res
=>
{
state
.
projectListS
=
res
.
data
state
.
projectListS
=
res
.
data
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
res
=>
{
}).
catch
(
res
=>
{
reject
(
res
)
reject
(
res
)
})
})
})
})
},
},
/**
/**
* Get a list of process definitions by project id
* Get a list of process definitions by project id
...
@@ -312,17 +312,17 @@ export default {
...
@@ -312,17 +312,17 @@ export default {
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`projects/
${
state
.
projectName
}
/process/queryProcessDefinitionAllByProjectId`
,
payload
,
res
=>
{
io
.
get
(
`projects/
${
state
.
projectName
}
/process/queryProcessDefinitionAllByProjectId`
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
res
=>
{
}).
catch
(
res
=>
{
reject
(
res
)
reject
(
res
)
})
})
})
})
},
},
/**
/**
* get datasource
* get datasource
*/
*/
getDatasourceList
({
state
},
payload
)
{
getDatasourceList
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`datasources/list`
,
{
io
.
get
(
'
datasources/list
'
,
{
type
:
payload
type
:
payload
},
res
=>
{
},
res
=>
{
resolve
(
res
)
resolve
(
res
)
...
@@ -340,7 +340,7 @@ export default {
...
@@ -340,7 +340,7 @@ export default {
resolve
()
resolve
()
return
return
}
}
io
.
get
(
`resources/list`
,
{
io
.
get
(
'
resources/list
'
,
{
type
:
'
FILE
'
type
:
'
FILE
'
},
res
=>
{
},
res
=>
{
state
.
resourcesListS
=
res
.
data
state
.
resourcesListS
=
res
.
data
...
@@ -359,7 +359,7 @@ export default {
...
@@ -359,7 +359,7 @@ export default {
resolve
()
resolve
()
return
return
}
}
io
.
get
(
`resources/list/jar`
,
{
io
.
get
(
'
resources/list/jar
'
,
{
type
:
'
FILE
'
type
:
'
FILE
'
},
res
=>
{
},
res
=>
{
state
.
resourcesListJar
=
res
.
data
state
.
resourcesListJar
=
res
.
data
...
@@ -387,7 +387,7 @@ export default {
...
@@ -387,7 +387,7 @@ export default {
*/
*/
getNotifyGroupList
({
state
},
payload
)
{
getNotifyGroupList
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`alert-group/list`
,
res
=>
{
io
.
get
(
'
alert-group/list
'
,
res
=>
{
state
.
notifyGroupListS
=
_
.
map
(
res
.
data
,
v
=>
{
state
.
notifyGroupListS
=
_
.
map
(
res
.
data
,
v
=>
{
return
{
return
{
id
:
v
.
id
,
id
:
v
.
id
,
...
@@ -469,7 +469,7 @@ export default {
...
@@ -469,7 +469,7 @@ export default {
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`projects/
${
state
.
projectName
}
/schedule/preview`
,
payload
,
res
=>
{
io
.
post
(
`projects/
${
state
.
projectName
}
/schedule/preview`
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
//alert(res.data)
//
alert(res.data)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
})
})
...
@@ -579,11 +579,11 @@ export default {
...
@@ -579,11 +579,11 @@ export default {
if
(
!
data
)
{
if
(
!
data
)
{
return
return
}
}
le
t
blob
=
new
Blob
([
data
])
cons
t
blob
=
new
Blob
([
data
])
le
t
fileName
=
`
${
fileNameS
}
.json`
cons
t
fileName
=
`
${
fileNameS
}
.json`
if
(
'
download
'
in
document
.
createElement
(
'
a
'
))
{
// 不是IE浏览器
if
(
'
download
'
in
document
.
createElement
(
'
a
'
))
{
// 不是IE浏览器
le
t
url
=
window
.
URL
.
createObjectURL
(
blob
)
cons
t
url
=
window
.
URL
.
createObjectURL
(
blob
)
le
t
link
=
document
.
createElement
(
'
a
'
)
cons
t
link
=
document
.
createElement
(
'
a
'
)
link
.
style
.
display
=
'
none
'
link
.
style
.
display
=
'
none
'
link
.
href
=
url
link
.
href
=
url
link
.
setAttribute
(
'
download
'
,
fileName
)
link
.
setAttribute
(
'
download
'
,
fileName
)
...
@@ -596,7 +596,7 @@ export default {
...
@@ -596,7 +596,7 @@ export default {
}
}
}
}
io
.
get
(
`projects/
${
state
.
projectName
}
/process/export`
,{
processDefinitionIds
:
payload
.
processDefinitionIds
},
res
=>
{
io
.
get
(
`projects/
${
state
.
projectName
}
/process/export`
,
{
processDefinitionIds
:
payload
.
processDefinitionIds
},
res
=>
{
downloadBlob
(
res
,
payload
.
fileName
)
downloadBlob
(
res
,
payload
.
fileName
)
},
e
=>
{
},
e
=>
{
...
@@ -622,7 +622,7 @@ export default {
...
@@ -622,7 +622,7 @@ export default {
*/
*/
getUdfList
({
state
},
payload
)
{
getUdfList
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`resources/udf-func/list`
,
payload
,
res
=>
{
io
.
get
(
'
resources/udf-func/list
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -646,7 +646,7 @@ export default {
...
@@ -646,7 +646,7 @@ export default {
*/
*/
getTaskRecordList
({
state
},
payload
)
{
getTaskRecordList
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`projects/task-record/list-paging`
,
payload
,
res
=>
{
io
.
get
(
'
projects/task-record/list-paging
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -658,7 +658,7 @@ export default {
...
@@ -658,7 +658,7 @@ export default {
*/
*/
getHistoryTaskRecordList
({
state
},
payload
)
{
getHistoryTaskRecordList
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`projects/task-record/history-list-paging`
,
payload
,
res
=>
{
io
.
get
(
'
projects/task-record/history-list-paging
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -725,7 +725,7 @@ export default {
...
@@ -725,7 +725,7 @@ export default {
/**
/**
* remove timing
* remove timing
*/
*/
deleteTiming
({
state
},
payload
)
{
deleteTiming
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`projects/
${
state
.
projectName
}
/schedule/delete`
,
payload
,
res
=>
{
io
.
get
(
`projects/
${
state
.
projectName
}
/schedule/delete`
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
...
@@ -736,11 +736,11 @@ export default {
...
@@ -736,11 +736,11 @@ export default {
},
},
getResourceId
({
state
},
payload
)
{
getResourceId
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`resources/queryResource`
,
payload
,
res
=>
{
io
.
get
(
'
resources/queryResource
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
})
})
})
})
}
,
}
}
}
dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js
浏览文件 @
7a483736
...
@@ -100,27 +100,27 @@ export default {
...
@@ -100,27 +100,27 @@ export default {
*/
*/
resetParams
(
state
,
payload
)
{
resetParams
(
state
,
payload
)
{
$
(
'
#canvas
'
).
html
(
''
)
$
(
'
#canvas
'
).
html
(
''
)
state
.
globalParams
=
payload
&&
payload
.
globalParams
||
[]
state
.
globalParams
=
(
payload
&&
payload
.
globalParams
)
||
[]
state
.
tasks
=
payload
&&
payload
.
tasks
||
[]
state
.
tasks
=
(
payload
&&
payload
.
tasks
)
||
[]
state
.
name
=
payload
&&
payload
.
name
||
''
state
.
name
=
(
payload
&&
payload
.
name
)
||
''
state
.
description
=
payload
&&
payload
.
description
||
''
state
.
description
=
(
payload
&&
payload
.
description
)
||
''
state
.
timeout
=
payload
&&
payload
.
timeout
||
0
state
.
timeout
=
(
payload
&&
payload
.
timeout
)
||
0
state
.
tenantId
=
payload
&&
payload
.
tenantId
||
-
1
state
.
tenantId
=
(
payload
&&
payload
.
tenantId
)
||
-
1
state
.
processListS
=
payload
&&
payload
.
processListS
||
[]
state
.
processListS
=
(
payload
&&
payload
.
processListS
)
||
[]
state
.
resourcesListS
=
payload
&&
payload
.
resourcesListS
||
[]
state
.
resourcesListS
=
(
payload
&&
payload
.
resourcesListS
)
||
[]
state
.
resourcesListJar
=
payload
&&
payload
.
resourcesListJar
||
[]
state
.
resourcesListJar
=
(
payload
&&
payload
.
resourcesListJar
)
||
[]
state
.
projectListS
=
payload
&&
payload
.
projectListS
||
[]
state
.
projectListS
=
(
payload
&&
payload
.
projectListS
)
||
[]
state
.
isDetails
=
payload
&&
payload
.
isDetails
||
false
state
.
isDetails
=
(
payload
&&
payload
.
isDetails
)
||
false
state
.
runFlag
=
payload
&&
payload
.
runFlag
||
''
state
.
runFlag
=
(
payload
&&
payload
.
runFlag
)
||
''
state
.
locations
=
payload
&&
payload
.
locations
||
{}
state
.
locations
=
(
payload
&&
payload
.
locations
)
||
{}
state
.
connects
=
payload
&&
payload
.
connects
||
[]
state
.
connects
=
(
payload
&&
payload
.
connects
)
||
[]
},
},
/**
/**
* add task
* add task
* object {}
* object {}
*/
*/
addTasks
(
state
,
payload
)
{
addTasks
(
state
,
payload
)
{
le
t
i
=
_
.
findIndex
(
state
.
tasks
,
v
=>
v
.
id
===
payload
.
id
)
cons
t
i
=
_
.
findIndex
(
state
.
tasks
,
v
=>
v
.
id
===
payload
.
id
)
if
(
i
!==
-
1
)
{
if
(
i
!==
-
1
)
{
state
.
tasks
[
i
]
=
Object
.
assign
(
state
.
tasks
[
i
],
{},
payload
)
state
.
tasks
[
i
]
=
Object
.
assign
(
state
.
tasks
[
i
],
{},
payload
)
}
else
{
}
else
{
...
@@ -129,9 +129,9 @@ export default {
...
@@ -129,9 +129,9 @@ export default {
if
(
state
.
cacheTasks
[
payload
.
id
])
{
if
(
state
.
cacheTasks
[
payload
.
id
])
{
state
.
cacheTasks
[
payload
.
id
]
=
Object
.
assign
(
state
.
cacheTasks
[
payload
.
id
],
{},
payload
)
state
.
cacheTasks
[
payload
.
id
]
=
Object
.
assign
(
state
.
cacheTasks
[
payload
.
id
],
{},
payload
)
}
else
{
}
else
{
state
.
cacheTasks
[
payload
.
id
]
=
payload
;
state
.
cacheTasks
[
payload
.
id
]
=
payload
}
}
le
t
dom
=
$
(
`#
${
payload
.
id
}
`
)
cons
t
dom
=
$
(
`#
${
payload
.
id
}
`
)
state
.
locations
[
payload
.
id
]
=
_
.
assign
(
state
.
locations
[
payload
.
id
],
{
state
.
locations
[
payload
.
id
]
=
_
.
assign
(
state
.
locations
[
payload
.
id
],
{
name
:
dom
.
find
(
'
.name-p
'
).
text
(),
name
:
dom
.
find
(
'
.name-p
'
).
text
(),
targetarr
:
dom
.
attr
(
'
data-targetarr
'
),
targetarr
:
dom
.
attr
(
'
data-targetarr
'
),
...
@@ -149,7 +149,7 @@ export default {
...
@@ -149,7 +149,7 @@ export default {
if
(
state
.
cacheTasks
[
payload
.
id
])
{
if
(
state
.
cacheTasks
[
payload
.
id
])
{
state
.
cacheTasks
[
payload
.
id
]
=
Object
.
assign
(
state
.
cacheTasks
[
payload
.
id
],
{},
payload
)
state
.
cacheTasks
[
payload
.
id
]
=
Object
.
assign
(
state
.
cacheTasks
[
payload
.
id
],
{},
payload
)
}
else
{
}
else
{
state
.
cacheTasks
[
payload
.
id
]
=
payload
;
state
.
cacheTasks
[
payload
.
id
]
=
payload
}
}
}
}
}
}
dolphinscheduler-ui/src/js/conf/home/store/dag/state.js
浏览文件 @
7a483736
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
import
localStore
from
'
@/module/util/localStorage
'
import
localStore
from
'
@/module/util/localStorage
'
// Get the name of the item currently clicked
// Get the name of the item currently clicked
le
t
projectName
=
localStore
.
getItem
(
'
projectName
'
)
cons
t
projectName
=
localStore
.
getItem
(
'
projectName
'
)
export
default
{
export
default
{
// name
// name
...
@@ -34,7 +34,7 @@ export default {
...
@@ -34,7 +34,7 @@ export default {
// Timeout alarm
// Timeout alarm
timeout
:
0
,
timeout
:
0
,
// tenant id
// tenant id
tenantId
:
-
1
,
tenantId
:
-
1
,
// Node location information
// Node location information
locations
:
{},
locations
:
{},
// Node-to-node connection
// Node-to-node connection
...
...
dolphinscheduler-ui/src/js/conf/home/store/datasource/actions.js
浏览文件 @
7a483736
...
@@ -27,7 +27,7 @@ export default {
...
@@ -27,7 +27,7 @@ export default {
*/
*/
createDatasources
({
state
},
payload
)
{
createDatasources
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`datasources/create`
,
payload
,
res
=>
{
io
.
post
(
'
datasources/create
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -40,7 +40,7 @@ export default {
...
@@ -40,7 +40,7 @@ export default {
*/
*/
connectDatasources
({
state
},
payload
)
{
connectDatasources
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`datasources/connect`
,
payload
,
res
=>
{
io
.
post
(
'
datasources/connect
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -53,7 +53,7 @@ export default {
...
@@ -53,7 +53,7 @@ export default {
*/
*/
getDatasourcesList
({
state
},
payload
)
{
getDatasourcesList
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`datasources/list`
,
payload
,
res
=>
{
io
.
get
(
'
datasources/list
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -68,7 +68,7 @@ export default {
...
@@ -68,7 +68,7 @@ export default {
*/
*/
getDatasourcesListP
({
state
},
payload
)
{
getDatasourcesListP
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`datasources/list-paging`
,
payload
,
res
=>
{
io
.
get
(
'
datasources/list-paging
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -80,7 +80,7 @@ export default {
...
@@ -80,7 +80,7 @@ export default {
*/
*/
deleteDatasource
({
state
},
payload
)
{
deleteDatasource
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`datasources/delete`
,
payload
,
res
=>
{
io
.
get
(
'
datasources/delete
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -92,7 +92,7 @@ export default {
...
@@ -92,7 +92,7 @@ export default {
*/
*/
updateDatasource
({
state
},
payload
)
{
updateDatasource
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`datasources/update`
,
payload
,
res
=>
{
io
.
post
(
'
datasources/update
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -101,7 +101,7 @@ export default {
...
@@ -101,7 +101,7 @@ export default {
},
},
getEditDatasource
({
state
},
payload
)
{
getEditDatasource
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`datasources/update-ui`
,
payload
,
res
=>
{
io
.
post
(
'
datasources/update-ui
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -110,7 +110,7 @@ export default {
...
@@ -110,7 +110,7 @@ export default {
},
},
verifyName
({
state
},
payload
)
{
verifyName
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`datasources/verify-name`
,
payload
,
res
=>
{
io
.
get
(
'
datasources/verify-name
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -119,7 +119,7 @@ export default {
...
@@ -119,7 +119,7 @@ export default {
},
},
getKerberosStartupState
({
state
},
payload
)
{
getKerberosStartupState
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`datasources/kerberos-startup-state`
,
payload
,
res
=>
{
io
.
get
(
'
datasources/kerberos-startup-state
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
...
dolphinscheduler-ui/src/js/conf/home/store/monitor/actions.js
浏览文件 @
7a483736
...
@@ -20,7 +20,7 @@ import io from '@/module/io'
...
@@ -20,7 +20,7 @@ import io from '@/module/io'
export
default
{
export
default
{
getMasterData
({
state
},
payload
)
{
getMasterData
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`monitor/master/list`
,
payload
,
res
=>
{
io
.
get
(
'
monitor/master/list
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -29,7 +29,7 @@ export default {
...
@@ -29,7 +29,7 @@ export default {
},
},
getWorkerData
({
state
},
payload
)
{
getWorkerData
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`monitor/worker/list`
,
payload
,
res
=>
{
io
.
get
(
'
monitor/worker/list
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -38,7 +38,7 @@ export default {
...
@@ -38,7 +38,7 @@ export default {
},
},
getDatabaseData
({
state
},
payload
)
{
getDatabaseData
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`monitor/database`
,
payload
,
res
=>
{
io
.
get
(
'
monitor/database
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -47,7 +47,7 @@ export default {
...
@@ -47,7 +47,7 @@ export default {
},
},
getZookeeperData
({
state
},
payload
)
{
getZookeeperData
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`monitor/zookeeper/list`
,
payload
,
res
=>
{
io
.
get
(
'
monitor/zookeeper/list
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
...
dolphinscheduler-ui/src/js/conf/home/store/projects/actions.js
浏览文件 @
7a483736
...
@@ -23,7 +23,7 @@ export default {
...
@@ -23,7 +23,7 @@ export default {
*/
*/
getProjectsList
({
state
},
payload
)
{
getProjectsList
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`projects/list-paging`
,
payload
,
res
=>
{
io
.
get
(
'
projects/list-paging
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -35,7 +35,7 @@ export default {
...
@@ -35,7 +35,7 @@ export default {
*/
*/
createProjects
({
state
},
payload
)
{
createProjects
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`projects/create`
,
payload
,
res
=>
{
io
.
post
(
'
projects/create
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -47,7 +47,7 @@ export default {
...
@@ -47,7 +47,7 @@ export default {
*/
*/
deleteProjects
({
state
},
payload
)
{
deleteProjects
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`projects/delete`
,
payload
,
res
=>
{
io
.
get
(
'
projects/delete
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -59,7 +59,7 @@ export default {
...
@@ -59,7 +59,7 @@ export default {
*/
*/
updateProjects
({
state
},
payload
)
{
updateProjects
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`projects/update`
,
payload
,
res
=>
{
io
.
post
(
'
projects/update
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -71,7 +71,7 @@ export default {
...
@@ -71,7 +71,7 @@ export default {
*/
*/
getTaskCtatusCount
({
state
},
payload
)
{
getTaskCtatusCount
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`projects/analysis/task-state-count`
,
payload
,
res
=>
{
io
.
get
(
'
projects/analysis/task-state-count
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -83,7 +83,7 @@ export default {
...
@@ -83,7 +83,7 @@ export default {
*/
*/
getCommandStateCount
({
state
},
payload
)
{
getCommandStateCount
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`projects/analysis/command-state-count`
,
payload
,
res
=>
{
io
.
get
(
'
projects/analysis/command-state-count
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -95,7 +95,7 @@ export default {
...
@@ -95,7 +95,7 @@ export default {
*/
*/
getQueueCount
({
state
},
payload
)
{
getQueueCount
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`projects/analysis/queue-count`
,
payload
,
res
=>
{
io
.
get
(
'
projects/analysis/queue-count
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -107,7 +107,7 @@ export default {
...
@@ -107,7 +107,7 @@ export default {
*/
*/
getProcessStateCount
({
state
},
payload
)
{
getProcessStateCount
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`projects/analysis/process-state-count`
,
payload
,
res
=>
{
io
.
get
(
'
projects/analysis/process-state-count
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -119,7 +119,7 @@ export default {
...
@@ -119,7 +119,7 @@ export default {
*/
*/
getDefineUserCount
({
state
},
payload
)
{
getDefineUserCount
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`projects/analysis/define-user-count`
,
payload
,
res
=>
{
io
.
get
(
'
projects/analysis/define-user-count
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
...
dolphinscheduler-ui/src/js/conf/home/store/resource/actions.js
浏览文件 @
7a483736
...
@@ -23,7 +23,7 @@ export default {
...
@@ -23,7 +23,7 @@ export default {
*/
*/
getResourcesListP
({
state
},
payload
)
{
getResourcesListP
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`resources/list-paging`
,
payload
,
res
=>
{
io
.
get
(
'
resources/list-paging
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -32,7 +32,7 @@ export default {
...
@@ -32,7 +32,7 @@ export default {
},
},
getResourceId
({
state
},
payload
)
{
getResourceId
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`resources/queryResource`
,
payload
,
res
=>
{
io
.
get
(
'
resources/queryResource
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -41,7 +41,7 @@ export default {
...
@@ -41,7 +41,7 @@ export default {
},
},
getResourcesList
({
state
},
payload
)
{
getResourcesList
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`resources/list`
,
payload
,
res
=>
{
io
.
get
(
'
resources/list
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
res
=>
{
}).
catch
(
res
=>
{
reject
(
res
)
reject
(
res
)
...
@@ -53,7 +53,7 @@ export default {
...
@@ -53,7 +53,7 @@ export default {
*/
*/
deleteResource
({
state
},
payload
)
{
deleteResource
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`resources/delete`
,
payload
,
res
=>
{
io
.
get
(
'
resources/delete
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -65,7 +65,7 @@ export default {
...
@@ -65,7 +65,7 @@ export default {
*/
*/
resourceVerifyName
({
state
},
payload
)
{
resourceVerifyName
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`resources/verify-name`
,
payload
,
res
=>
{
io
.
get
(
'
resources/verify-name
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -77,7 +77,7 @@ export default {
...
@@ -77,7 +77,7 @@ export default {
*/
*/
getViewResources
({
state
},
payload
)
{
getViewResources
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`resources/view`
,
payload
,
res
=>
{
io
.
get
(
'
resources/view
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -89,7 +89,7 @@ export default {
...
@@ -89,7 +89,7 @@ export default {
*/
*/
createUdfFunc
({
state
},
payload
)
{
createUdfFunc
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`resources/udf-func/create`
,
payload
,
res
=>
{
io
.
post
(
'
resources/udf-func/create
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -101,7 +101,7 @@ export default {
...
@@ -101,7 +101,7 @@ export default {
*/
*/
updateUdfFunc
({
state
},
payload
)
{
updateUdfFunc
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`resources/udf-func/update`
,
payload
,
res
=>
{
io
.
post
(
'
resources/udf-func/update
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -113,7 +113,7 @@ export default {
...
@@ -113,7 +113,7 @@ export default {
*/
*/
verifyUdfFuncName
({
state
},
payload
)
{
verifyUdfFuncName
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`resources/udf-func/verify-name`
,
payload
,
res
=>
{
io
.
get
(
'
resources/udf-func/verify-name
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -126,7 +126,7 @@ export default {
...
@@ -126,7 +126,7 @@ export default {
*/
*/
deleteUdf
({
state
},
payload
)
{
deleteUdf
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`resources/udf-func/delete`
,
payload
,
res
=>
{
io
.
get
(
'
resources/udf-func/delete
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -138,7 +138,7 @@ export default {
...
@@ -138,7 +138,7 @@ export default {
*/
*/
getUdfFuncListP
({
state
},
payload
)
{
getUdfFuncListP
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`resources/udf-func/list-paging`
,
payload
,
res
=>
{
io
.
get
(
'
resources/udf-func/list-paging
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -150,7 +150,7 @@ export default {
...
@@ -150,7 +150,7 @@ export default {
*/
*/
updateContent
({
state
},
payload
)
{
updateContent
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`resources/update-content`
,
payload
,
res
=>
{
io
.
post
(
'
resources/update-content
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -162,7 +162,7 @@ export default {
...
@@ -162,7 +162,7 @@ export default {
*/
*/
createResourceFile
({
state
},
payload
)
{
createResourceFile
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`resources/online-create`
,
payload
,
res
=>
{
io
.
post
(
'
resources/online-create
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -174,7 +174,7 @@ export default {
...
@@ -174,7 +174,7 @@ export default {
*/
*/
createResourceFolder
({
state
},
payload
)
{
createResourceFolder
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`resources/directory/create`
,
payload
,
res
=>
{
io
.
post
(
'
resources/directory/create
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -186,7 +186,7 @@ export default {
...
@@ -186,7 +186,7 @@ export default {
*/
*/
resourceRename
({
state
},
payload
)
{
resourceRename
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`resources/update`
,
payload
,
res
=>
{
io
.
post
(
'
resources/update
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
...
dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
浏览文件 @
7a483736
...
@@ -25,7 +25,7 @@ export default {
...
@@ -25,7 +25,7 @@ export default {
* @param tenant/verifyTenantCode
* @param tenant/verifyTenantCode
*/
*/
verifyName
({
state
},
payload
)
{
verifyName
({
state
},
payload
)
{
le
t
o
=
{
cons
t
o
=
{
user
:
{
user
:
{
param
:
{
param
:
{
userName
:
payload
.
userName
userName
:
payload
.
userName
...
@@ -47,7 +47,7 @@ export default {
...
@@ -47,7 +47,7 @@ export default {
}
}
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
o
[
payload
.
type
]
[
'
api
'
],
o
[
payload
.
type
][
'
param
'
]
,
res
=>
{
io
.
get
(
o
[
payload
.
type
]
.
api
,
o
[
payload
.
type
].
param
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -64,7 +64,7 @@ export default {
...
@@ -64,7 +64,7 @@ export default {
*/
*/
createUser
({
state
},
payload
)
{
createUser
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`users/create`
,
payload
,
res
=>
{
io
.
post
(
'
users/create
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -77,7 +77,7 @@ export default {
...
@@ -77,7 +77,7 @@ export default {
*/
*/
verifyUserName
({
state
},
payload
)
{
verifyUserName
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`users/verify-user-name`
,
payload
,
res
=>
{
io
.
post
(
'
users/verify-user-name
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -92,7 +92,7 @@ export default {
...
@@ -92,7 +92,7 @@ export default {
*/
*/
getUsersListP
({
state
},
payload
)
{
getUsersListP
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`users/list-paging`
,
payload
,
res
=>
{
io
.
get
(
'
users/list-paging
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -104,7 +104,7 @@ export default {
...
@@ -104,7 +104,7 @@ export default {
*/
*/
getUsersList
({
state
},
payload
)
{
getUsersList
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`users/list`
,
payload
,
res
=>
{
io
.
get
(
'
users/list
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -116,7 +116,7 @@ export default {
...
@@ -116,7 +116,7 @@ export default {
*/
*/
getUsersAll
({
state
},
payload
)
{
getUsersAll
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`users/list-all`
,
payload
,
res
=>
{
io
.
get
(
'
users/list-all
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -134,7 +134,7 @@ export default {
...
@@ -134,7 +134,7 @@ export default {
*/
*/
updateUser
({
state
},
payload
)
{
updateUser
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`users/update`
,
payload
,
res
=>
{
io
.
post
(
'
users/update
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -147,7 +147,7 @@ export default {
...
@@ -147,7 +147,7 @@ export default {
*/
*/
deleteUser
({
state
},
payload
)
{
deleteUser
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`users/delete`
,
payload
,
res
=>
{
io
.
post
(
'
users/delete
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -158,12 +158,12 @@ export default {
...
@@ -158,12 +158,12 @@ export default {
* Obtain authorized and unauthorized items
* Obtain authorized and unauthorized items
*/
*/
getAuthList
({
state
},
payload
)
{
getAuthList
({
state
},
payload
)
{
le
t
o
=
{
cons
t
o
=
{
type
:
payload
.
type
,
type
:
payload
.
type
,
category
:
payload
.
category
category
:
payload
.
category
}
}
le
t
param
=
{}
cons
t
param
=
{}
// Manage user
// Manage user
if
(
o
.
type
===
'
user
'
)
{
if
(
o
.
type
===
'
user
'
)
{
param
.
alertgroupId
=
payload
.
id
param
.
alertgroupId
=
payload
.
id
...
@@ -197,12 +197,12 @@ export default {
...
@@ -197,12 +197,12 @@ export default {
},
},
getResourceList
({
state
},
payload
)
{
getResourceList
({
state
},
payload
)
{
le
t
o
=
{
cons
t
o
=
{
type
:
payload
.
type
,
type
:
payload
.
type
,
category
:
payload
.
category
category
:
payload
.
category
}
}
le
t
param
=
{}
cons
t
param
=
{}
// Manage user
// Manage user
if
(
o
.
type
===
'
user
'
)
{
if
(
o
.
type
===
'
user
'
)
{
param
.
alertgroupId
=
payload
.
id
param
.
alertgroupId
=
payload
.
id
...
@@ -254,7 +254,7 @@ export default {
...
@@ -254,7 +254,7 @@ export default {
*/
*/
getUsersDetails
({
state
},
payload
)
{
getUsersDetails
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`users/select-by-id`
,
payload
,
res
=>
{
io
.
post
(
'
users/select-by-id
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -266,7 +266,7 @@ export default {
...
@@ -266,7 +266,7 @@ export default {
*/
*/
getTenantListP
({
state
},
payload
)
{
getTenantListP
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`tenant/list-paging`
,
payload
,
res
=>
{
io
.
get
(
'
tenant/list-paging
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -278,8 +278,8 @@ export default {
...
@@ -278,8 +278,8 @@ export default {
*/
*/
getTenantList
({
state
},
payload
)
{
getTenantList
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`tenant/list`
,
payload
,
res
=>
{
io
.
get
(
'
tenant/list
'
,
payload
,
res
=>
{
let
list
=
res
.
data
const
list
=
res
.
data
list
.
unshift
({
list
.
unshift
({
id
:
-
1
,
id
:
-
1
,
tenantName
:
'
Default
'
tenantName
:
'
Default
'
...
@@ -296,7 +296,7 @@ export default {
...
@@ -296,7 +296,7 @@ export default {
*/
*/
getQueueList
({
state
},
payload
)
{
getQueueList
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`queue/list`
,
payload
,
res
=>
{
io
.
get
(
'
queue/list
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -308,7 +308,7 @@ export default {
...
@@ -308,7 +308,7 @@ export default {
*/
*/
createQueue
({
state
},
payload
)
{
createQueue
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`tenant/create`
,
payload
,
res
=>
{
io
.
post
(
'
tenant/create
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -320,7 +320,7 @@ export default {
...
@@ -320,7 +320,7 @@ export default {
*/
*/
updateQueue
({
state
},
payload
)
{
updateQueue
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`tenant/update`
,
payload
,
res
=>
{
io
.
post
(
'
tenant/update
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -332,7 +332,7 @@ export default {
...
@@ -332,7 +332,7 @@ export default {
*/
*/
deleteQueue
({
state
},
payload
)
{
deleteQueue
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`tenant/delete`
,
payload
,
res
=>
{
io
.
post
(
'
tenant/delete
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -344,7 +344,7 @@ export default {
...
@@ -344,7 +344,7 @@ export default {
*/
*/
getAlertgroupP
({
state
},
payload
)
{
getAlertgroupP
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`alert-group/list-paging`
,
payload
,
res
=>
{
io
.
get
(
'
alert-group/list-paging
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -356,7 +356,7 @@ export default {
...
@@ -356,7 +356,7 @@ export default {
*/
*/
getAlertgroup
({
state
},
payload
)
{
getAlertgroup
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`alert-group/list`
,
payload
,
res
=>
{
io
.
get
(
'
alert-group/list
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -368,7 +368,7 @@ export default {
...
@@ -368,7 +368,7 @@ export default {
*/
*/
createAlertgrou
({
state
},
payload
)
{
createAlertgrou
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`alert-group/create`
,
payload
,
res
=>
{
io
.
post
(
'
alert-group/create
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -380,7 +380,7 @@ export default {
...
@@ -380,7 +380,7 @@ export default {
*/
*/
updateAlertgrou
({
state
},
payload
)
{
updateAlertgrou
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`alert-group/update`
,
payload
,
res
=>
{
io
.
post
(
'
alert-group/update
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -392,7 +392,7 @@ export default {
...
@@ -392,7 +392,7 @@ export default {
*/
*/
deleteAlertgrou
({
state
},
payload
)
{
deleteAlertgrou
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`alert-group/delete`
,
payload
,
res
=>
{
io
.
post
(
'
alert-group/delete
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -404,7 +404,7 @@ export default {
...
@@ -404,7 +404,7 @@ export default {
*/
*/
getProcessMasterList
({
state
},
payload
)
{
getProcessMasterList
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`process/master/list`
,
payload
,
res
=>
{
io
.
get
(
'
process/master/list
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -416,7 +416,7 @@ export default {
...
@@ -416,7 +416,7 @@ export default {
*/
*/
getProcessWorkerList
({
state
},
payload
)
{
getProcessWorkerList
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`process/worker/list`
,
payload
,
res
=>
{
io
.
get
(
'
process/worker/list
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -428,7 +428,7 @@ export default {
...
@@ -428,7 +428,7 @@ export default {
*/
*/
getQueueListP
({
state
},
payload
)
{
getQueueListP
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`queue/list-paging`
,
payload
,
res
=>
{
io
.
get
(
'
queue/list-paging
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -440,7 +440,7 @@ export default {
...
@@ -440,7 +440,7 @@ export default {
*/
*/
createQueueQ
({
state
},
payload
)
{
createQueueQ
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`queue/create`
,
payload
,
res
=>
{
io
.
post
(
'
queue/create
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -452,7 +452,7 @@ export default {
...
@@ -452,7 +452,7 @@ export default {
*/
*/
updateQueueQ
({
state
},
payload
)
{
updateQueueQ
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`queue/update`
,
payload
,
res
=>
{
io
.
post
(
'
queue/update
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -464,7 +464,7 @@ export default {
...
@@ -464,7 +464,7 @@ export default {
*/
*/
verifyQueueQ
({
state
},
payload
)
{
verifyQueueQ
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`queue/verify-queue`
,
payload
,
res
=>
{
io
.
post
(
'
queue/verify-queue
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -476,7 +476,7 @@ export default {
...
@@ -476,7 +476,7 @@ export default {
*/
*/
getWorkerGroups
({
state
},
payload
)
{
getWorkerGroups
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`worker-group/list-paging`
,
payload
,
res
=>
{
io
.
get
(
'
worker-group/list-paging
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -488,10 +488,10 @@ export default {
...
@@ -488,10 +488,10 @@ export default {
*/
*/
getWorkerGroupsAll
({
state
},
payload
)
{
getWorkerGroupsAll
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`worker-group/all-groups`
,
payload
,
res
=>
{
io
.
get
(
'
worker-group/all-groups
'
,
payload
,
res
=>
{
let
list
=
res
.
data
let
list
=
res
.
data
if
(
list
.
length
>
0
)
{
if
(
list
.
length
>
0
)
{
list
=
list
.
map
(
item
=>
{
list
=
list
.
map
(
item
=>
{
return
{
return
{
id
:
item
,
id
:
item
,
name
:
item
name
:
item
...
@@ -512,7 +512,7 @@ export default {
...
@@ -512,7 +512,7 @@ export default {
},
},
saveWorkerGroups
({
state
},
payload
)
{
saveWorkerGroups
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`worker-group/save`
,
payload
,
res
=>
{
io
.
post
(
'
worker-group/save
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -521,7 +521,7 @@ export default {
...
@@ -521,7 +521,7 @@ export default {
},
},
deleteWorkerGroups
({
state
},
payload
)
{
deleteWorkerGroups
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`worker-group/delete-by-id`
,
payload
,
res
=>
{
io
.
get
(
'
worker-group/delete-by-id
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
...
dolphinscheduler-ui/src/js/conf/home/store/security/state.js
浏览文件 @
7a483736
...
@@ -16,5 +16,5 @@
...
@@ -16,5 +16,5 @@
*/
*/
export
default
{
export
default
{
workerGroupsListAll
:
[],
workerGroupsListAll
:
[],
tenantAllList
:
[]
tenantAllList
:
[]
}
}
dolphinscheduler-ui/src/js/conf/home/store/user/actions.js
浏览文件 @
7a483736
...
@@ -23,7 +23,7 @@ export default {
...
@@ -23,7 +23,7 @@ export default {
*/
*/
getUserInfo
({
state
},
payload
)
{
getUserInfo
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`users/get-user-info`
,
payload
,
res
=>
{
io
.
get
(
'
users/get-user-info
'
,
payload
,
res
=>
{
state
.
userInfo
=
res
.
data
state
.
userInfo
=
res
.
data
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
...
@@ -35,7 +35,7 @@ export default {
...
@@ -35,7 +35,7 @@ export default {
* sign out
* sign out
*/
*/
signOut
()
{
signOut
()
{
io
.
post
(
`signOut`
,
res
=>
{
io
.
post
(
'
signOut
'
,
res
=>
{
setTimeout
(()
=>
{
setTimeout
(()
=>
{
window
.
location
.
href
=
`
${
PUBLIC_PATH
}
/view/login/index.html`
window
.
location
.
href
=
`
${
PUBLIC_PATH
}
/view/login/index.html`
},
100
)
},
100
)
...
@@ -52,7 +52,7 @@ export default {
...
@@ -52,7 +52,7 @@ export default {
*/
*/
getTokenListP
({
state
},
payload
)
{
getTokenListP
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
get
(
`access-token/list-paging`
,
payload
,
res
=>
{
io
.
get
(
'
access-token/list-paging
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -68,7 +68,7 @@ export default {
...
@@ -68,7 +68,7 @@ export default {
*/
*/
createToken
({
state
},
payload
)
{
createToken
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`access-token/create`
,
payload
,
res
=>
{
io
.
post
(
'
access-token/create
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -84,7 +84,7 @@ export default {
...
@@ -84,7 +84,7 @@ export default {
*/
*/
updateToken
({
state
},
payload
)
{
updateToken
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`access-token/update`
,
payload
,
res
=>
{
io
.
post
(
'
access-token/update
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -99,7 +99,7 @@ export default {
...
@@ -99,7 +99,7 @@ export default {
*/
*/
generateToken
({
state
},
payload
)
{
generateToken
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`access-token/generate`
,
payload
,
res
=>
{
io
.
post
(
'
access-token/generate
'
,
payload
,
res
=>
{
resolve
(
res
.
data
)
resolve
(
res
.
data
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
@@ -113,7 +113,7 @@ export default {
...
@@ -113,7 +113,7 @@ export default {
*/
*/
deleteToken
({
state
},
payload
)
{
deleteToken
({
state
},
payload
)
{
return
new
Promise
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
io
.
post
(
`access-token/delete`
,
payload
,
res
=>
{
io
.
post
(
'
access-token/delete
'
,
payload
,
res
=>
{
resolve
(
res
)
resolve
(
res
)
}).
catch
(
e
=>
{
}).
catch
(
e
=>
{
reject
(
e
)
reject
(
e
)
...
...
dolphinscheduler-ui/src/js/conf/login/index.js
浏览文件 @
7a483736
...
@@ -25,7 +25,7 @@ import 'ans-ui/lib/ans-ui.min.css'
...
@@ -25,7 +25,7 @@ import 'ans-ui/lib/ans-ui.min.css'
import
ans
from
'
ans-ui/lib/ans-ui.min
'
import
ans
from
'
ans-ui/lib/ans-ui.min
'
import
'
sass/conf/login/index.scss
'
import
'
sass/conf/login/index.scss
'
import
'
bootstrap/dist/js/bootstrap.min.js
'
import
'
bootstrap/dist/js/bootstrap.min.js
'
Vue
.
use
(
ans
)
Vue
.
use
(
ans
)
...
@@ -41,7 +41,7 @@ new Vue({
...
@@ -41,7 +41,7 @@ new Vue({
},
},
methods
:
{
methods
:
{
initApp
()
{
initApp
()
{
le
t
bootstrapTooltip
=
$
.
fn
.
tooltip
.
noConflict
()
cons
t
bootstrapTooltip
=
$
.
fn
.
tooltip
.
noConflict
()
$
.
fn
.
tooltip
=
bootstrapTooltip
$
.
fn
.
tooltip
=
bootstrapTooltip
$
(
'
body
'
).
tooltip
({
$
(
'
body
'
).
tooltip
({
selector
:
'
[data-toggle="tooltip"]
'
,
selector
:
'
[data-toggle="tooltip"]
'
,
...
...
dolphinscheduler-ui/src/js/module/ana-charts/common.js
浏览文件 @
7a483736
...
@@ -52,7 +52,7 @@ function getChartContainers (el) {
...
@@ -52,7 +52,7 @@ function getChartContainers (el) {
throw
new
Error
(
'
No corresponding DOM object found!
'
)
throw
new
Error
(
'
No corresponding DOM object found!
'
)
}
}
let
list
let
list
if
(
HTMLElement
.
prototype
.
isPrototypeOf
(
el
))
{
if
(
Object
.
prototype
.
isPrototypeOf
.
call
(
HTMLElement
.
prototype
,
el
))
{
list
=
new
Array
(
el
)
list
=
new
Array
(
el
)
}
else
{
}
else
{
list
=
Array
.
from
(
el
)
list
=
Array
.
from
(
el
)
...
@@ -70,7 +70,7 @@ function getChartContainers (el) {
...
@@ -70,7 +70,7 @@ function getChartContainers (el) {
*/
*/
export
const
checkKeyInModel
=
(
model
,
...
params
)
=>
{
export
const
checkKeyInModel
=
(
model
,
...
params
)
=>
{
for
(
const
key
of
params
)
{
for
(
const
key
of
params
)
{
if
(
!
model
.
hasOwnProperty
(
key
))
{
if
(
!
Object
.
prototype
.
hasOwnProperty
.
call
(
model
,
key
))
{
throw
new
Error
(
'
Data format error! The specified property was not found:
'
+
key
)
throw
new
Error
(
'
Data format error! The specified property was not found:
'
+
key
)
}
}
}
}
...
...
dolphinscheduler-ui/src/js/module/ana-charts/index.js
浏览文件 @
7a483736
...
@@ -55,7 +55,7 @@ const Chart = {
...
@@ -55,7 +55,7 @@ const Chart = {
// Corresponding methods for injection of different components
// Corresponding methods for injection of different components
for
(
const
key
in
components
)
{
for
(
const
key
in
components
)
{
if
(
components
.
hasOwnProperty
(
key
))
{
if
(
Object
.
prototype
.
hasOwnProperty
.
call
(
components
,
key
))
{
Chart
[
key
.
toLowerCase
()]
=
(
el
,
data
,
options
)
=>
{
Chart
[
key
.
toLowerCase
()]
=
(
el
,
data
,
options
)
=>
{
return
init
(
components
[
key
],
el
,
data
,
options
)
return
init
(
components
[
key
],
el
,
data
,
options
)
}
}
...
...
dolphinscheduler-ui/src/js/module/ana-charts/packages/bar/index.js
浏览文件 @
7a483736
...
@@ -242,7 +242,7 @@ export default class Bar extends Base {
...
@@ -242,7 +242,7 @@ export default class Bar extends Base {
}
=
this
.
settings
}
=
this
.
settings
const
valueAxis
=
{
type
:
'
value
'
}
const
valueAxis
=
{
type
:
'
value
'
}
let
yAxisModel
=
reverseAxis
?
xAxis
:
valueAxis
let
yAxisModel
=
reverseAxis
?
xAxis
:
valueAxis
le
t
xAxisModel
=
reverseAxis
?
valueAxis
:
xAxis
cons
t
xAxisModel
=
reverseAxis
?
valueAxis
:
xAxis
// Use custom Y-axis overlay
// Use custom Y-axis overlay
if
(
yAxis
)
{
if
(
yAxis
)
{
yAxisModel
=
yAxis
yAxisModel
=
yAxis
...
@@ -267,7 +267,7 @@ export default class Bar extends Base {
...
@@ -267,7 +267,7 @@ export default class Bar extends Base {
// time axis
// time axis
if
(
timelineOptions
)
{
if
(
timelineOptions
)
{
le
t
opts
=
{
cons
t
opts
=
{
baseOption
:
{
baseOption
:
{
timeline
:
timelineOptions
.
timeline
,
timeline
:
timelineOptions
.
timeline
,
tooltip
:
{
tooltip
:
{
...
@@ -296,7 +296,7 @@ export default class Bar extends Base {
...
@@ -296,7 +296,7 @@ export default class Bar extends Base {
// When the simple chart title is empty, the chart is vertically centered
// When the simple chart title is empty, the chart is vertically centered
const
top
=
!
title
&&
this
.
simple
?
'
3%
'
:
60
const
top
=
!
title
&&
this
.
simple
?
'
3%
'
:
60
le
t
opts
=
{
cons
t
opts
=
{
title
:
{
title
:
{
text
:
title
text
:
title
},
},
...
...
dolphinscheduler-ui/src/js/module/ana-charts/packages/funnel/index.js
浏览文件 @
7a483736
...
@@ -118,10 +118,10 @@ export default class Funnel extends Base {
...
@@ -118,10 +118,10 @@ export default class Funnel extends Base {
* Drawing charts
* Drawing charts
*/
*/
apply
()
{
apply
()
{
le
t
{
title
,
series
,
legendData
}
=
this
.
options
cons
t
{
title
,
series
,
legendData
}
=
this
.
options
// Injection configuration to series
// Injection configuration to series
le
t
{
insertSeries
}
=
this
.
settings
cons
t
{
insertSeries
}
=
this
.
settings
let
_series
=
series
let
_series
=
series
if
(
insertSeries
&&
insertSeries
.
length
&&
series
.
length
)
{
if
(
insertSeries
&&
insertSeries
.
length
&&
series
.
length
)
{
_series
=
this
.
injectDataIntoSeries
(
insertSeries
,
_series
)
_series
=
this
.
injectDataIntoSeries
(
insertSeries
,
_series
)
...
...
dolphinscheduler-ui/src/js/module/ana-charts/packages/line/index.js
浏览文件 @
7a483736
...
@@ -162,7 +162,7 @@ export default class Line extends Base {
...
@@ -162,7 +162,7 @@ export default class Line extends Base {
}
=
this
.
settings
}
=
this
.
settings
const
valueAxis
=
{
type
:
'
value
'
}
const
valueAxis
=
{
type
:
'
value
'
}
let
yAxisModel
=
reverseAxis
?
xAxis
:
valueAxis
let
yAxisModel
=
reverseAxis
?
xAxis
:
valueAxis
le
t
xAxisModel
=
reverseAxis
?
valueAxis
:
xAxis
cons
t
xAxisModel
=
reverseAxis
?
valueAxis
:
xAxis
// Use custom Y-axis overlay
// Use custom Y-axis overlay
if
(
yAxis
)
{
if
(
yAxis
)
{
yAxisModel
=
yAxis
yAxisModel
=
yAxis
...
@@ -175,7 +175,7 @@ export default class Line extends Base {
...
@@ -175,7 +175,7 @@ export default class Line extends Base {
_series
=
this
.
injectDataIntoSeries
(
insertSeries
,
_series
)
_series
=
this
.
injectDataIntoSeries
(
insertSeries
,
_series
)
}
}
le
t
opts
=
{
cons
t
opts
=
{
title
:
{
title
:
{
text
:
title
text
:
title
},
},
...
...
dolphinscheduler-ui/src/js/module/ana-charts/packages/pie/index.js
浏览文件 @
7a483736
...
@@ -60,8 +60,8 @@ export default class Pie extends Base {
...
@@ -60,8 +60,8 @@ export default class Pie extends Base {
checkKeyInModel
(
data
[
0
],
textKey
,
dataKey
)
checkKeyInModel
(
data
[
0
],
textKey
,
dataKey
)
const
legendData
=
[]
const
legendData
=
[]
le
t
radius
=
ring
?
[
'
50%
'
,
'
70%
'
]
:
'
60%
'
cons
t
radius
=
ring
?
[
'
50%
'
,
'
70%
'
]
:
'
60%
'
le
t
center
=
title
?
[
'
50%
'
,
'
60%
'
]
:
[
'
50%
'
,
'
50%
'
]
cons
t
center
=
title
?
[
'
50%
'
,
'
60%
'
]
:
[
'
50%
'
,
'
50%
'
]
const
series
=
[{
const
series
=
[{
radius
:
radius
,
radius
:
radius
,
center
:
center
,
center
:
center
,
...
@@ -88,16 +88,16 @@ export default class Pie extends Base {
...
@@ -88,16 +88,16 @@ export default class Pie extends Base {
* Drawing charts
* Drawing charts
*/
*/
apply
()
{
apply
()
{
le
t
{
title
,
series
,
legendData
}
=
this
.
options
cons
t
{
title
,
series
,
legendData
}
=
this
.
options
// Injection configuration to series
// Injection configuration to series
le
t
{
insertSeries
}
=
this
.
settings
cons
t
{
insertSeries
}
=
this
.
settings
let
_series
=
series
let
_series
=
series
if
(
insertSeries
&&
insertSeries
.
length
&&
series
.
length
)
{
if
(
insertSeries
&&
insertSeries
.
length
&&
series
.
length
)
{
_series
=
this
.
injectDataIntoSeries
(
insertSeries
,
_series
)
_series
=
this
.
injectDataIntoSeries
(
insertSeries
,
_series
)
}
}
le
t
opts
=
{
cons
t
opts
=
{
title
:
{
title
:
{
text
:
title
,
text
:
title
,
x
:
'
center
'
x
:
'
center
'
...
...
dolphinscheduler-ui/src/js/module/ana-charts/packages/radar/index.js
浏览文件 @
7a483736
...
@@ -87,7 +87,7 @@ export default class Radar extends Base {
...
@@ -87,7 +87,7 @@ export default class Radar extends Base {
targetSeries
.
_raw
.
push
(
data
[
i
])
targetSeries
.
_raw
.
push
(
data
[
i
])
// index
// index
le
t
targetIndicator
=
indicator
.
find
(
i
=>
i
.
name
===
textItem
)
cons
t
targetIndicator
=
indicator
.
find
(
i
=>
i
.
name
===
textItem
)
if
(
!
targetIndicator
)
{
if
(
!
targetIndicator
)
{
indicator
.
push
({
name
:
textItem
})
indicator
.
push
({
name
:
textItem
})
}
}
...
...
dolphinscheduler-ui/src/js/module/ana-charts/packages/scatter/index.js
浏览文件 @
7a483736
...
@@ -120,7 +120,7 @@ export default class Scatter extends Base {
...
@@ -120,7 +120,7 @@ export default class Scatter extends Base {
apply
()
{
apply
()
{
const
{
title
,
series
,
legendData
=
[]
}
=
this
.
options
const
{
title
,
series
,
legendData
=
[]
}
=
this
.
options
le
t
{
cons
t
{
// Custom X axis
// Custom X axis
xAxis
,
xAxis
,
// Custom Y axis
// Custom Y axis
...
...
dolphinscheduler-ui/src/js/module/axios/querystring.js
浏览文件 @
7a483736
...
@@ -16,45 +16,45 @@
...
@@ -16,45 +16,45 @@
*/
*/
/* istanbul ignore next */
/* istanbul ignore next */
var
param
=
function
(
a
)
{
var
param
=
function
(
a
)
{
var
s
=
[]
,
var
s
=
[]
rbracket
=
/
\[\]
$/
,
var
rbracket
=
/
\[\]
$/
isArray
=
function
(
obj
)
{
var
isArray
=
function
(
obj
)
{
return
Object
.
prototype
.
toString
.
call
(
obj
)
===
'
[object Array]
'
return
Object
.
prototype
.
toString
.
call
(
obj
)
===
'
[object Array]
'
},
}
add
=
function
(
k
,
v
)
{
var
add
=
function
(
k
,
v
)
{
v
=
typeof
v
===
'
function
'
?
v
()
:
v
===
null
?
''
:
v
===
undefined
?
''
:
v
v
=
typeof
v
===
'
function
'
?
v
()
:
v
===
null
?
''
:
v
===
undefined
?
''
:
v
s
[
s
.
length
]
=
encodeURIComponent
(
k
)
+
'
=
'
+
encodeURIComponent
(
v
)
s
[
s
.
length
]
=
encodeURIComponent
(
k
)
+
'
=
'
+
encodeURIComponent
(
v
)
},
}
buildParams
=
function
(
prefix
,
obj
)
{
var
buildParams
=
function
(
prefix
,
obj
)
{
var
i
,
len
,
key
var
i
,
len
,
key
if
(
prefix
)
{
if
(
prefix
)
{
if
(
isArray
(
obj
))
{
if
(
isArray
(
obj
))
{
for
(
i
=
0
,
len
=
obj
.
length
;
i
<
len
;
i
++
)
{
if
(
rbracket
.
test
(
prefix
))
{
add
(
prefix
,
obj
[
i
])
}
else
{
buildParams
(
prefix
+
'
[
'
+
(
typeof
obj
[
i
]
===
'
object
'
?
i
:
''
)
+
'
]
'
,
obj
[
i
])
}
}
}
else
if
(
obj
&&
String
(
obj
)
===
'
[object Object]
'
)
{
for
(
key
in
obj
)
{
buildParams
(
prefix
+
'
[
'
+
key
+
'
]
'
,
obj
[
key
])
}
}
else
{
add
(
prefix
,
obj
)
}
}
else
if
(
isArray
(
obj
))
{
for
(
i
=
0
,
len
=
obj
.
length
;
i
<
len
;
i
++
)
{
for
(
i
=
0
,
len
=
obj
.
length
;
i
<
len
;
i
++
)
{
add
(
obj
[
i
].
name
,
obj
[
i
].
value
)
if
(
rbracket
.
test
(
prefix
))
{
add
(
prefix
,
obj
[
i
])
}
else
{
buildParams
(
prefix
+
'
[
'
+
(
typeof
obj
[
i
]
===
'
object
'
?
i
:
''
)
+
'
]
'
,
obj
[
i
])
}
}
}
}
else
{
}
else
if
(
obj
&&
String
(
obj
)
===
'
[object Object]
'
)
{
for
(
key
in
obj
)
{
for
(
key
in
obj
)
{
buildParams
(
key
,
obj
[
key
])
buildParams
(
prefix
+
'
[
'
+
key
+
'
]
'
,
obj
[
key
])
}
}
}
else
{
add
(
prefix
,
obj
)
}
}
else
if
(
isArray
(
obj
))
{
for
(
i
=
0
,
len
=
obj
.
length
;
i
<
len
;
i
++
)
{
add
(
obj
[
i
].
name
,
obj
[
i
].
value
)
}
}
else
{
for
(
key
in
obj
)
{
buildParams
(
key
,
obj
[
key
])
}
}
return
s
}
}
return
s
}
return
buildParams
(
''
,
a
).
join
(
'
&
'
).
replace
(
/%20/g
,
'
+
'
)
return
buildParams
(
''
,
a
).
join
(
'
&
'
).
replace
(
/%20/g
,
'
+
'
)
}
}
...
...
dolphinscheduler-ui/src/js/module/components/crontab/source/_source/i18n/index.js
浏览文件 @
7a483736
...
@@ -25,4 +25,3 @@ export default {
...
@@ -25,4 +25,3 @@ export default {
}
}
}
}
}
}
dolphinscheduler-ui/src/js/module/components/crontab/source/_source/i18n/locale/en_US.js
浏览文件 @
7a483736
...
@@ -15,62 +15,62 @@
...
@@ -15,62 +15,62 @@
* limitations under the License.
* limitations under the License.
*/
*/
export
default
{
export
default
{
'
秒
'
:
'
second
'
,
秒
:
'
second
'
,
'
分
'
:
'
minute
'
,
分
:
'
minute
'
,
'
时
'
:
'
hour
'
,
时
:
'
hour
'
,
'
天
'
:
'
day
'
,
天
:
'
day
'
,
'
月
'
:
'
month
'
,
月
:
'
month
'
,
'
年
'
:
'
year
'
,
年
:
'
year
'
,
'
星期一
'
:
'
Monday
'
,
星期一
:
'
Monday
'
,
'
星期二
'
:
'
Tuesday
'
,
星期二
:
'
Tuesday
'
,
'
星期三
'
:
'
Wednesday
'
,
星期三
:
'
Wednesday
'
,
'
星期四
'
:
'
Thursday
'
,
星期四
:
'
Thursday
'
,
'
星期五
'
:
'
Friday
'
,
星期五
:
'
Friday
'
,
'
星期六
'
:
'
Saturday
'
,
星期六
:
'
Saturday
'
,
'
星期天
'
:
'
Sunday
'
,
星期天
:
'
Sunday
'
,
'
每一秒钟
'
:
'
Every second
'
,
每一秒钟
:
'
Every second
'
,
'
每隔
'
:
'
Every
'
,
每隔
:
'
Every
'
,
'
秒执行 从
'
:
'
second carried out
'
,
'
秒执行 从
'
:
'
second carried out
'
,
'
秒开始
'
:
'
Start
'
,
秒开始
:
'
Start
'
,
'
具体秒数(可多选)
'
:
'
Specific second(multiple)
'
,
'
具体秒数(可多选)
'
:
'
Specific second(multiple)
'
,
'
请选择具体秒数
'
:
'
Please enter a specific second
'
,
请选择具体秒数
:
'
Please enter a specific second
'
,
'
周期从
'
:
'
Cycle from
'
,
周期从
:
'
Cycle from
'
,
'
到
'
:
'
to
'
,
到
:
'
to
'
,
'
每一分钟
'
:
'
Every minute
'
,
每一分钟
:
'
Every minute
'
,
'
分执行 从
'
:
'
minute carried out
'
,
'
分执行 从
'
:
'
minute carried out
'
,
'
分开始
'
:
'
Start
'
,
分开始
:
'
Start
'
,
'
具体分钟数(可多选)
'
:
'
Specific minute(multiple)
'
,
'
具体分钟数(可多选)
'
:
'
Specific minute(multiple)
'
,
'
请选择具体分钟数
'
:
'
Please enter a specific minute
'
,
请选择具体分钟数
:
'
Please enter a specific minute
'
,
'
每一小时
'
:
'
Every hour
'
,
每一小时
:
'
Every hour
'
,
'
小时执行 从
'
:
'
hour carried out
'
,
'
小时执行 从
'
:
'
hour carried out
'
,
'
小时开始
'
:
'
Start
'
,
小时开始
:
'
Start
'
,
'
具体小时数(可多选)
'
:
'
Specific hour(multiple)
'
,
'
具体小时数(可多选)
'
:
'
Specific hour(multiple)
'
,
'
请选择具体小时数
'
:
'
Please enter a hour
'
,
请选择具体小时数
:
'
Please enter a hour
'
,
'
每一天
'
:
'
Every day
'
,
每一天
:
'
Every day
'
,
'
周执行 从
'
:
'
week carried out
'
,
'
周执行 从
'
:
'
week carried out
'
,
'
开始
'
:
'
Start
'
,
开始
:
'
Start
'
,
'
天执行 从
'
:
'
day carried out
'
,
'
天执行 从
'
:
'
day carried out
'
,
'
天开始
'
:
'
Start
'
,
天开始
:
'
Start
'
,
'
具体星期几(可多选)
'
:
'
Specific day of the week(multiple)
'
,
'
具体星期几(可多选)
'
:
'
Specific day of the week(multiple)
'
,
'
请选择具体周几
'
:
'
Please enter a week
'
,
请选择具体周几
:
'
Please enter a week
'
,
'
具体天数(可多选)
'
:
'
Specific days(multiple)
'
,
'
具体天数(可多选)
'
:
'
Specific days(multiple)
'
,
'
请选择具体天数
'
:
'
Please enter a days
'
,
请选择具体天数
:
'
Please enter a days
'
,
'
在这个月的最后一天
'
:
'
On the last day of the month
'
,
在这个月的最后一天
:
'
On the last day of the month
'
,
'
在这个月的最后一个工作日
'
:
'
On the last working day of the month
'
,
在这个月的最后一个工作日
:
'
On the last working day of the month
'
,
'
在这个月的最后一个
'
:
'
At the last of this month
'
,
在这个月的最后一个
:
'
At the last of this month
'
,
'
在本月底前
'
:
'
Before the end of this month
'
,
在本月底前
:
'
Before the end of this month
'
,
'
最近的工作日(周一至周五)至本月
'
:
'
The most recent business day (Monday to Friday) to this month
'
,
'
最近的工作日(周一至周五)至本月
'
:
'
The most recent business day (Monday to Friday) to this month
'
,
'
在这个月的第
'
:
'
In this months
'
,
在这个月的第
:
'
In this months
'
,
'
每一月
'
:
'
Every month
'
,
每一月
:
'
Every month
'
,
'
月执行 从
'
:
'
month carried out
'
,
'
月执行 从
'
:
'
month carried out
'
,
'
月开始
'
:
'
Start
'
,
月开始
:
'
Start
'
,
'
具体月数(可多选)
'
:
'
Specific months(multiple)
'
,
'
具体月数(可多选)
'
:
'
Specific months(multiple)
'
,
'
请选择具体月数
'
:
'
Please enter a months
'
,
请选择具体月数
:
'
Please enter a months
'
,
'
每一年
'
:
'
Every year
'
,
每一年
:
'
Every year
'
,
'
年执行 从
'
:
'
year carried out
'
,
'
年执行 从
'
:
'
year carried out
'
,
'
年开始
'
:
'
Start
'
,
年开始
:
'
Start
'
,
'
具体年数(可多选)
'
:
'
Specific year(multiple)
'
,
'
具体年数(可多选)
'
:
'
Specific year(multiple)
'
,
'
请选择具体年数
'
:
'
Please enter a year
'
,
请选择具体年数
:
'
Please enter a year
'
,
'
小时
'
:
'
hour
'
,
小时
:
'
hour
'
,
'
日
'
:
'
day
'
日
:
'
day
'
}
}
dolphinscheduler-ui/src/js/module/components/crontab/source/_source/i18n/locale/zh_CN.js
浏览文件 @
7a483736
...
@@ -15,62 +15,62 @@
...
@@ -15,62 +15,62 @@
* limitations under the License.
* limitations under the License.
*/
*/
export
default
{
export
default
{
'
秒
'
:
'
秒
'
,
秒
:
'
秒
'
,
'
分
'
:
'
分
'
,
分
:
'
分
'
,
'
时
'
:
'
时
'
,
时
:
'
时
'
,
'
天
'
:
'
天
'
,
天
:
'
天
'
,
'
月
'
:
'
月
'
,
月
:
'
月
'
,
'
年
'
:
'
年
'
,
年
:
'
年
'
,
'
星期一
'
:
'
星期一
'
,
星期一
:
'
星期一
'
,
'
星期二
'
:
'
星期二
'
,
星期二
:
'
星期二
'
,
'
星期三
'
:
'
星期三
'
,
星期三
:
'
星期三
'
,
'
星期四
'
:
'
星期四
'
,
星期四
:
'
星期四
'
,
'
星期五
'
:
'
星期五
'
,
星期五
:
'
星期五
'
,
'
星期六
'
:
'
星期六
'
,
星期六
:
'
星期六
'
,
'
星期天
'
:
'
星期天
'
,
星期天
:
'
星期天
'
,
'
每一秒钟
'
:
'
每一秒钟
'
,
每一秒钟
:
'
每一秒钟
'
,
'
每隔
'
:
'
每隔
'
,
每隔
:
'
每隔
'
,
'
秒执行 从
'
:
'
秒执行 从
'
,
'
秒执行 从
'
:
'
秒执行 从
'
,
'
秒开始
'
:
'
秒开始
'
,
秒开始
:
'
秒开始
'
,
'
具体秒数(可多选)
'
:
'
具体秒数(可多选)
'
,
'
具体秒数(可多选)
'
:
'
具体秒数(可多选)
'
,
'
请选择具体秒数
'
:
'
请选择具体秒数
'
,
请选择具体秒数
:
'
请选择具体秒数
'
,
'
周期从
'
:
'
周期从
'
,
周期从
:
'
周期从
'
,
'
到
'
:
'
到
'
,
到
:
'
到
'
,
'
每一分钟
'
:
'
每一分钟
'
,
每一分钟
:
'
每一分钟
'
,
'
分执行 从
'
:
'
分执行 从
'
,
'
分执行 从
'
:
'
分执行 从
'
,
'
分开始
'
:
'
分开始
'
,
分开始
:
'
分开始
'
,
'
具体分钟数(可多选)
'
:
'
具体分钟数(可多选)
'
,
'
具体分钟数(可多选)
'
:
'
具体分钟数(可多选)
'
,
'
请选择具体分钟数
'
:
'
请选择具体分钟数
'
,
请选择具体分钟数
:
'
请选择具体分钟数
'
,
'
每一小时
'
:
'
每一小时
'
,
每一小时
:
'
每一小时
'
,
'
小时执行 从
'
:
'
小时执行 从
'
,
'
小时执行 从
'
:
'
小时执行 从
'
,
'
小时开始
'
:
'
小时开始
'
,
小时开始
:
'
小时开始
'
,
'
具体小时数(可多选)
'
:
'
具体小时数(可多选)
'
,
'
具体小时数(可多选)
'
:
'
具体小时数(可多选)
'
,
'
请选择具体小时数
'
:
'
请选择具体小时数
'
,
请选择具体小时数
:
'
请选择具体小时数
'
,
'
每一天
'
:
'
每一天
'
,
每一天
:
'
每一天
'
,
'
周执行 从
'
:
'
周执行 从
'
,
'
周执行 从
'
:
'
周执行 从
'
,
'
开始
'
:
'
开始
'
,
开始
:
'
开始
'
,
'
天执行 从
'
:
'
天执行 从
'
,
'
天执行 从
'
:
'
天执行 从
'
,
'
天开始
'
:
'
天开始
'
,
天开始
:
'
天开始
'
,
'
具体星期几(可多选)
'
:
'
具体星期几(可多选)
'
,
'
具体星期几(可多选)
'
:
'
具体星期几(可多选)
'
,
'
请选择具体周几
'
:
'
请选择具体周几
'
,
请选择具体周几
:
'
请选择具体周几
'
,
'
具体天数(可多选)
'
:
'
具体天数(可多选)
'
,
'
具体天数(可多选)
'
:
'
具体天数(可多选)
'
,
'
请选择具体天数
'
:
'
请选择具体天数
'
,
请选择具体天数
:
'
请选择具体天数
'
,
'
在这个月的最后一天
'
:
'
在这个月的最后一天
'
,
在这个月的最后一天
:
'
在这个月的最后一天
'
,
'
在这个月的最后一个工作日
'
:
'
在这个月的最后一个工作日
'
,
在这个月的最后一个工作日
:
'
在这个月的最后一个工作日
'
,
'
在这个月的最后一个
'
:
'
在这个月的最后一个
'
,
在这个月的最后一个
:
'
在这个月的最后一个
'
,
'
在本月底前
'
:
'
在本月底前
'
,
在本月底前
:
'
在本月底前
'
,
'
最近的工作日(周一至周五)至本月
'
:
'
最近的工作日(周一至周五)至本月
'
,
'
最近的工作日(周一至周五)至本月
'
:
'
最近的工作日(周一至周五)至本月
'
,
'
在这个月的第
'
:
'
在这个月的第
'
,
在这个月的第
:
'
在这个月的第
'
,
'
每一月
'
:
'
每一月
'
,
每一月
:
'
每一月
'
,
'
月执行 从
'
:
'
月执行 从
'
,
'
月执行 从
'
:
'
月执行 从
'
,
'
月开始
'
:
'
月开始
'
,
月开始
:
'
月开始
'
,
'
具体月数(可多选)
'
:
'
具体月数(可多选)
'
,
'
具体月数(可多选)
'
:
'
具体月数(可多选)
'
,
'
请选择具体月数
'
:
'
请选择具体月数
'
,
请选择具体月数
:
'
请选择具体月数
'
,
'
每一年
'
:
'
每一年
'
,
每一年
:
'
每一年
'
,
'
年执行 从
'
:
'
年执行 从
'
,
'
年执行 从
'
:
'
年执行 从
'
,
'
年开始
'
:
'
年开始
'
,
年开始
:
'
年开始
'
,
'
具体年数(可多选)
'
:
'
具体年数(可多选)
'
,
'
具体年数(可多选)
'
:
'
具体年数(可多选)
'
,
'
请选择具体年数
'
:
'
请选择具体年数
'
,
请选择具体年数
:
'
请选择具体年数
'
,
'
小时
'
:
'
小时
'
,
小时
:
'
小时
'
,
'
日
'
:
'
日
'
日
:
'
日
'
}
}
dolphinscheduler-ui/src/js/module/components/crontab/source/util/index.js
浏览文件 @
7a483736
...
@@ -23,37 +23,37 @@ import _ from 'lodash'
...
@@ -23,37 +23,37 @@ import _ from 'lodash'
* @param end End value
* @param end End value
*/
*/
const
range
=
(
start
,
end
)
=>
{
const
range
=
(
start
,
end
)
=>
{
le
t
length
=
end
-
start
+
1
cons
t
length
=
end
-
start
+
1
let
step
=
start
-
1
let
step
=
start
-
1
return
Array
.
apply
(
null
,
{
length
:
length
}).
map
(
function
(
v
,
i
)
{
step
++
;
return
step
})
return
Array
.
apply
(
null
,
{
length
:
length
}).
map
(
function
(
v
,
i
)
{
step
++
;
return
step
})
}
}
le
t
selectList
=
{
cons
t
selectList
=
{
'
60
'
:
_
.
map
(
range
(
0
,
59
),
v
=>
{
60
:
_
.
map
(
range
(
0
,
59
),
v
=>
{
return
{
return
{
value
:
v
+
''
,
value
:
v
+
''
,
label
:
v
+
''
label
:
v
+
''
}
}
}),
}),
'
24
'
:
_
.
map
(
range
(
0
,
23
),
v
=>
{
24
:
_
.
map
(
range
(
0
,
23
),
v
=>
{
return
{
return
{
value
:
v
+
''
,
value
:
v
+
''
,
label
:
v
+
''
label
:
v
+
''
}
}
}),
}),
'
12
'
:
_
.
map
(
range
(
0
,
12
),
v
=>
{
12
:
_
.
map
(
range
(
0
,
12
),
v
=>
{
return
{
return
{
value
:
v
+
''
,
value
:
v
+
''
,
label
:
v
+
''
label
:
v
+
''
}
}
}),
}),
'
year
'
:
_
.
map
(
range
(
2018
,
2030
),
v
=>
{
year
:
_
.
map
(
range
(
2018
,
2030
),
v
=>
{
return
{
return
{
value
:
v
+
''
,
value
:
v
+
''
,
label
:
v
+
''
label
:
v
+
''
}
}
}),
}),
'
week
'
:
[
week
:
[
{
{
value
:
1
,
value
:
1
,
label
:
'
星期天
'
label
:
'
星期天
'
...
@@ -83,7 +83,7 @@ let selectList = {
...
@@ -83,7 +83,7 @@ let selectList = {
label
:
'
星期六
'
label
:
'
星期六
'
}
}
],
],
'
specificWeek
'
:
[
specificWeek
:
[
{
{
value
:
'
SUN
'
,
value
:
'
SUN
'
,
label
:
'
SUN
'
label
:
'
SUN
'
...
@@ -113,13 +113,13 @@ let selectList = {
...
@@ -113,13 +113,13 @@ let selectList = {
label
:
'
SAT
'
label
:
'
SAT
'
}
}
],
],
'
day
'
:
_
.
map
(
range
(
1
,
31
),
v
=>
{
day
:
_
.
map
(
range
(
1
,
31
),
v
=>
{
return
{
return
{
value
:
v
+
''
,
value
:
v
+
''
,
label
:
v
+
''
label
:
v
+
''
}
}
}),
}),
'
lastWeeks
'
:
[
lastWeeks
:
[
{
{
value
:
'
1L
'
,
value
:
'
1L
'
,
label
:
'
星期天
'
label
:
'
星期天
'
...
@@ -161,8 +161,8 @@ const isStr = (str, v) => {
...
@@ -161,8 +161,8 @@ const isStr = (str, v) => {
const
isWeek
=
(
str
)
=>
{
const
isWeek
=
(
str
)
=>
{
let
flag
=
false
let
flag
=
false
le
t
data
=
str
.
split
(
'
,
'
)
cons
t
data
=
str
.
split
(
'
,
'
)
le
t
isSpecificWeek
=
(
key
)
=>
{
cons
t
isSpecificWeek
=
(
key
)
=>
{
return
_
.
findIndex
(
selectList
.
specificWeek
,
v
=>
v
.
value
===
key
)
!==
-
1
return
_
.
findIndex
(
selectList
.
specificWeek
,
v
=>
v
.
value
===
key
)
!==
-
1
}
}
_
.
map
(
data
,
v
=>
{
_
.
map
(
data
,
v
=>
{
...
@@ -173,7 +173,6 @@ const isWeek = (str) => {
...
@@ -173,7 +173,6 @@ const isWeek = (str) => {
return
flag
return
flag
}
}
/**
/**
* template
* template
*
*
...
@@ -206,7 +205,6 @@ const template = (string, ...args) => {
...
@@ -206,7 +205,6 @@ const template = (string, ...args) => {
})
})
}
}
export
{
export
{
selectList
,
selectList
,
isStr
,
isStr
,
...
...
dolphinscheduler-ui/src/js/module/components/secondaryMenu/_source/menu.js
浏览文件 @
7a483736
...
@@ -19,7 +19,7 @@ import i18n from '@/module/i18n'
...
@@ -19,7 +19,7 @@ import i18n from '@/module/i18n'
import
config
from
'
~/external/config
'
import
config
from
'
~/external/config
'
import
Permissions
from
'
@/module/permissions
'
import
Permissions
from
'
@/module/permissions
'
le
t
menu
=
{
cons
t
menu
=
{
projects
:
[
projects
:
[
{
{
name
:
`
${
i18n
.
$t
(
'
Project Home
'
)}
`
,
name
:
`
${
i18n
.
$t
(
'
Project Home
'
)}
`
,
...
@@ -225,7 +225,7 @@ let menu = {
...
@@ -225,7 +225,7 @@ let menu = {
icon
:
'
ans-icon-menu
'
,
icon
:
'
ans-icon-menu
'
,
children
:
[
children
:
[
{
{
name
:
"
Statistics
"
,
name
:
'
Statistics
'
,
path
:
'
statistics
'
,
path
:
'
statistics
'
,
id
:
0
,
id
:
0
,
disabled
:
true
disabled
:
true
...
...
dolphinscheduler-ui/src/js/module/download/index.js
浏览文件 @
7a483736
...
@@ -19,8 +19,8 @@ import i18n from '@/module/i18n'
...
@@ -19,8 +19,8 @@ import i18n from '@/module/i18n'
/**
/**
* download file
* download file
*/
*/
le
t
downloadFile
=
(
$url
,
$obj
)
=>
{
cons
t
downloadFile
=
(
$url
,
$obj
)
=>
{
le
t
param
=
{
cons
t
param
=
{
url
:
$url
,
url
:
$url
,
obj
:
$obj
obj
:
$obj
}
}
...
@@ -30,9 +30,9 @@ let downloadFile = ($url, $obj) => {
...
@@ -30,9 +30,9 @@ let downloadFile = ($url, $obj) => {
return
return
}
}
le
t
generatorInput
=
function
(
obj
)
{
cons
t
generatorInput
=
function
(
obj
)
{
let
result
=
''
let
result
=
''
le
t
keyArr
=
Object
.
keys
(
obj
)
cons
t
keyArr
=
Object
.
keys
(
obj
)
keyArr
.
forEach
(
function
(
key
)
{
keyArr
.
forEach
(
function
(
key
)
{
result
+=
"
<input type='hidden' name = '
"
+
key
+
"
' value='
"
+
obj
[
key
]
+
"
'>
"
result
+=
"
<input type='hidden' name = '
"
+
key
+
"
' value='
"
+
obj
[
key
]
+
"
'>
"
})
})
...
...
dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
浏览文件 @
7a483736
此差异已折叠。
点击以展开。
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
浏览文件 @
7a483736
此差异已折叠。
点击以展开。
dolphinscheduler-ui/src/js/module/io/index.js
浏览文件 @
7a483736
...
@@ -18,7 +18,6 @@
...
@@ -18,7 +18,6 @@
import
io
from
'
@/module/axios/index
'
import
io
from
'
@/module/axios/index
'
import
cookies
from
'
js-cookie
'
import
cookies
from
'
js-cookie
'
const
apiPrefix
=
'
/dolphinscheduler
'
const
apiPrefix
=
'
/dolphinscheduler
'
const
reSlashPrefix
=
/^
\/
+/
const
reSlashPrefix
=
/^
\/
+/
...
@@ -73,13 +72,13 @@ io.interceptors.response.use(
...
@@ -73,13 +72,13 @@ io.interceptors.response.use(
// Global request interceptor registion
// Global request interceptor registion
io
.
interceptors
.
request
.
use
(
io
.
interceptors
.
request
.
use
(
config
=>
{
config
=>
{
le
t
sIdCookie
=
cookies
.
get
(
'
sessionId
'
)
cons
t
sIdCookie
=
cookies
.
get
(
'
sessionId
'
)
let
sessionId
=
sessionStorage
.
getItem
(
"
sessionId
"
)
const
sessionId
=
sessionStorage
.
getItem
(
'
sessionId
'
)
let
requstUrl
=
config
.
url
.
substring
(
config
.
url
.
lastIndexOf
(
"
/
"
)
+
1
)
const
requstUrl
=
config
.
url
.
substring
(
config
.
url
.
lastIndexOf
(
'
/
'
)
+
1
)
if
(
sIdCookie
!==
null
&&
requstUrl
!==
'
login
'
&&
sIdCookie
!=
sessionId
)
{
if
(
sIdCookie
!==
null
&&
requstUrl
!==
'
login
'
&&
sIdCookie
!==
sessionId
)
{
window
.
location
.
href
=
`
${
PUBLIC_PATH
}
/view/login/index.html`
window
.
location
.
href
=
`
${
PUBLIC_PATH
}
/view/login/index.html`
}
else
{
}
else
{
le
t
{
method
}
=
config
cons
t
{
method
}
=
config
if
(
method
===
'
get
'
)
{
if
(
method
===
'
get
'
)
{
config
.
params
=
Object
.
assign
({},
config
.
params
,
{
config
.
params
=
Object
.
assign
({},
config
.
params
,
{
_t
:
Math
.
random
()
_t
:
Math
.
random
()
...
...
dolphinscheduler-ui/src/js/module/mixin/disabledState.js
浏览文件 @
7a483736
...
@@ -17,7 +17,6 @@
...
@@ -17,7 +17,6 @@
import
store
from
'
@/conf/home/store
'
import
store
from
'
@/conf/home/store
'
import
router
from
'
@/conf/home/router
'
import
router
from
'
@/conf/home/router
'
import
Permissions
from
'
@/module/permissions
'
export
default
{
export
default
{
data
()
{
data
()
{
...
@@ -28,7 +27,7 @@ export default {
...
@@ -28,7 +27,7 @@ export default {
}
}
},
},
created
()
{
created
()
{
this
.
isDetails
=
this
.
store
.
state
.
dag
.
isDetails
// Permissions.getAuth() ? this.store.state.dag.isDetails : true
this
.
isDetails
=
this
.
store
.
state
.
dag
.
isDetails
// Permissions.getAuth() ? this.store.state.dag.isDetails : true
},
},
computed
:
{
computed
:
{
_isDetails
()
{
_isDetails
()
{
...
...
dolphinscheduler-ui/src/js/module/mixin/listUrlParamHandle.js
浏览文件 @
7a483736
...
@@ -23,7 +23,7 @@ import { setUrlParams } from '@/module/util/routerUtil'
...
@@ -23,7 +23,7 @@ import { setUrlParams } from '@/module/util/routerUtil'
export
default
{
export
default
{
watch
:
{
watch
:
{
// watch pageNo
// watch pageNo
'
searchParams
'
:
{
searchParams
:
{
deep
:
true
,
deep
:
true
,
handler
()
{
handler
()
{
setUrlParams
(
this
.
searchParams
)
setUrlParams
(
this
.
searchParams
)
...
@@ -48,8 +48,8 @@ export default {
...
@@ -48,8 +48,8 @@ export default {
_debounceGET
:
_
.
debounce
(
function
(
flag
)
{
_debounceGET
:
_
.
debounce
(
function
(
flag
)
{
this
.
_getList
(
flag
)
this
.
_getList
(
flag
)
},
100
,
{
},
100
,
{
'
leading
'
:
false
,
leading
:
false
,
'
trailing
'
:
true
trailing
:
true
})
})
}
}
}
}
dolphinscheduler-ui/src/js/module/permissions/index.js
浏览文件 @
7a483736
...
@@ -19,7 +19,7 @@ import _ from 'lodash'
...
@@ -19,7 +19,7 @@ import _ from 'lodash'
import
Vue
from
'
vue
'
import
Vue
from
'
vue
'
import
store
from
'
@/conf/home/store
'
import
store
from
'
@/conf/home/store
'
le
t
Permissions
=
function
()
{
cons
t
Permissions
=
function
()
{
this
.
isAuth
=
true
this
.
isAuth
=
true
}
}
...
@@ -44,7 +44,7 @@ Permissions.prototype = {
...
@@ -44,7 +44,7 @@ Permissions.prototype = {
if
(
$
(
el
).
prop
(
'
tagName
'
)
===
'
BUTTON
'
)
{
if
(
$
(
el
).
prop
(
'
tagName
'
)
===
'
BUTTON
'
)
{
$
(
el
).
attr
(
'
disabled
'
,
true
)
$
(
el
).
attr
(
'
disabled
'
,
true
)
}
else
{
}
else
{
setTimeout
(
function
(){
el
.
parentNode
.
removeChild
(
el
)},
100
)
setTimeout
(
function
()
{
el
.
parentNode
.
removeChild
(
el
)
},
100
)
}
}
}
}
}
}
...
...
dolphinscheduler-ui/src/js/module/util/index.js
浏览文件 @
7a483736
...
@@ -51,7 +51,7 @@ export function findComponentDownward (context, componentName) {
...
@@ -51,7 +51,7 @@ export function findComponentDownward (context, componentName) {
* uuid('v-ani-%{s}-translate') // -> v-ani-xxx
* uuid('v-ani-%{s}-translate') // -> v-ani-xxx
*/
*/
export
function
uuid
(
prefix
)
{
export
function
uuid
(
prefix
)
{
le
t
id
=
Math
.
floor
(
Math
.
random
()
*
10000
).
toString
(
36
)
cons
t
id
=
Math
.
floor
(
Math
.
random
()
*
10000
).
toString
(
36
)
return
prefix
?
(
return
prefix
?
(
~
prefix
.
indexOf
(
'
%{s}
'
)
?
(
~
prefix
.
indexOf
(
'
%{s}
'
)
?
(
prefix
.
replace
(
/%
\{
s
\}
/g
,
id
)
prefix
.
replace
(
/%
\{
s
\}
/g
,
id
)
...
@@ -59,7 +59,6 @@ export function uuid (prefix) {
...
@@ -59,7 +59,6 @@ export function uuid (prefix) {
)
:
id
)
:
id
}
}
/**
/**
* template
* template
*
*
...
@@ -92,4 +91,3 @@ export function template (string, ...args) {
...
@@ -92,4 +91,3 @@ export function template (string, ...args) {
}
}
})
})
}
}
dolphinscheduler-ui/src/js/module/util/routerUtil.js
浏览文件 @
7a483736
...
@@ -15,9 +15,6 @@
...
@@ -15,9 +15,6 @@
* limitations under the License.
* limitations under the License.
*/
*/
import
merge
from
'
webpack-merge
'
import
router
from
'
@/conf/home/router
'
export
function
setUrlParams
(
o
)
{
export
function
setUrlParams
(
o
)
{
// router.push({
// router.push({
// query: merge(router.history.current.query, o)
// query: merge(router.history.current.query, o)
...
...
dolphinscheduler-ui/src/js/module/util/util.js
浏览文件 @
7a483736
...
@@ -20,9 +20,9 @@
...
@@ -20,9 +20,9 @@
*/
*/
const
bytesToSize
=
(
bytes
)
=>
{
const
bytesToSize
=
(
bytes
)
=>
{
if
(
bytes
===
0
)
return
'
0 B
'
if
(
bytes
===
0
)
return
'
0 B
'
let
k
=
1024
,
// or 1024
const
k
=
1024
// or 1024
sizes
=
[
'
B
'
,
'
KB
'
,
'
MB
'
,
'
GB
'
,
'
TB
'
,
'
PB
'
,
'
EB
'
,
'
ZB
'
,
'
YB
'
],
const
sizes
=
[
'
B
'
,
'
KB
'
,
'
MB
'
,
'
GB
'
,
'
TB
'
,
'
PB
'
,
'
EB
'
,
'
ZB
'
,
'
YB
'
]
i
=
Math
.
floor
(
Math
.
log
(
bytes
)
/
Math
.
log
(
k
))
const
i
=
Math
.
floor
(
Math
.
log
(
bytes
)
/
Math
.
log
(
k
))
return
parseInt
((
bytes
/
Math
.
pow
(
k
,
i
)).
toPrecision
(
3
))
+
'
'
+
sizes
[
i
]
return
parseInt
((
bytes
/
Math
.
pow
(
k
,
i
)).
toPrecision
(
3
))
+
'
'
+
sizes
[
i
]
}
}
...
@@ -33,7 +33,7 @@ const bytesToSize = (bytes) => {
...
@@ -33,7 +33,7 @@ const bytesToSize = (bytes) => {
const
isJson
=
(
str
)
=>
{
const
isJson
=
(
str
)
=>
{
if
(
typeof
str
===
'
string
'
)
{
if
(
typeof
str
===
'
string
'
)
{
try
{
try
{
le
t
obj
=
JSON
.
parse
(
str
)
cons
t
obj
=
JSON
.
parse
(
str
)
if
(
typeof
obj
===
'
object
'
&&
obj
)
{
if
(
typeof
obj
===
'
object
'
&&
obj
)
{
return
true
return
true
}
else
{
}
else
{
...
@@ -69,7 +69,6 @@ const syntaxHighlight = (json) => {
...
@@ -69,7 +69,6 @@ const syntaxHighlight = (json) => {
})
})
}
}
export
{
export
{
bytesToSize
,
bytesToSize
,
isJson
,
isJson
,
...
...
dolphinscheduler-ui/src/lib/external/config.js
浏览文件 @
7a483736
...
@@ -19,5 +19,5 @@
...
@@ -19,5 +19,5 @@
*/
*/
export
default
{
export
default
{
// task record switch
// task record switch
recordSwitch
:
false
recordSwitch
:
false
}
}
dolphinscheduler-ui/src/lib/external/email.js
浏览文件 @
7a483736
...
@@ -14,4 +14,4 @@
...
@@ -14,4 +14,4 @@
* See the License for the specific language governing permissions and
* See the License for the specific language governing permissions and
* limitations under the License.
* limitations under the License.
*/
*/
export
default
[
"
test@analysys.com.cn
"
]
export
default
[
'
test@analysys.com.cn
'
]
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录