diff --git a/dolphinscheduler-ui/.babelrc b/dolphinscheduler-ui/.babelrc
index aeb5ba2059..5fe8580fed 100644
--- a/dolphinscheduler-ui/.babelrc
+++ b/dolphinscheduler-ui/.babelrc
@@ -5,7 +5,15 @@
"debug": false,
"useBuiltIns": true,
"targets": {
- "browsers": [ "ie > 8", "last 2 version", "safari >= 9" ]
+ "browsers": [
+ "> 1%",
+ "last 2 versions",
+ "ie >= 9",
+ "edge >= 12",
+ "firefox >= 28",
+ "chrome >= 29",
+ "opera >= 17"
+ ]
},
"production": {
"plugins": ["transform-remove-console"]
diff --git a/dolphinscheduler-ui/.eslintignore b/dolphinscheduler-ui/.eslintignore
new file mode 100644
index 0000000000..cd1b8213b3
--- /dev/null
+++ b/dolphinscheduler-ui/.eslintignore
@@ -0,0 +1,7 @@
+/_test_/
+/build/
+/dist/
+/node/
+/node_modules/
+/target/
+/*.js
diff --git a/dolphinscheduler-ui/.eslintrc.yml b/dolphinscheduler-ui/.eslintrc.yml
index 8d4020f7c4..64c83e6ac0 100644
--- a/dolphinscheduler-ui/.eslintrc.yml
+++ b/dolphinscheduler-ui/.eslintrc.yml
@@ -26,9 +26,19 @@ globals:
Atomics: readonly
SharedArrayBuffer: readonly
PUBLIC_PATH: readonly
+ $t: readonly
parserOptions:
ecmaVersion: 2018
sourceType: module
plugins:
- vue
-rules: {}
+rules:
+ vue/script-indent: ['error', 2, { 'baseIndent': 1, 'switchCase': 1 }]
+ prefer-promise-reject-errors: 'off'
+ no-prototype-builtins: 'off'
+ no-mixed-operators: 'off'
+ no-extend-native: 'off'
+ prefer-const: 'off'
+ no-var: 'error'
+overrides:
+ - { 'files': ['*.vue'], 'rules': { 'indent': 'off' }}
diff --git a/dolphinscheduler-ui/build/config.js b/dolphinscheduler-ui/build/config.js
index 11bbec550f..1186066e7f 100644
--- a/dolphinscheduler-ui/build/config.js
+++ b/dolphinscheduler-ui/build/config.js
@@ -47,7 +47,7 @@ const jsEntry = (() => {
parts.shift()
let modules = parts.join('/')
let entry = moduleName(modules)
- obj[entry] = val
+ obj[entry] = ['babel-polyfill', val]
})
return obj
})()
@@ -125,6 +125,16 @@ const baseConfig = {
},
module: {
rules: [
+ {
+ test: /\.(js|vue)$/,
+ loader: 'eslint-loader',
+ enforce: 'pre',
+ include: [resolve('src')],
+ options: {
+ formatter: require('eslint-friendly-formatter'),
+ emitWarning: true
+ }
+ },
{
test: /\.vue$/,
loader: 'vue-loader',
diff --git a/dolphinscheduler-ui/build/webpack.config.dev.js b/dolphinscheduler-ui/build/webpack.config.dev.js
index d443bf8366..ea250330ad 100644
--- a/dolphinscheduler-ui/build/webpack.config.dev.js
+++ b/dolphinscheduler-ui/build/webpack.config.dev.js
@@ -19,6 +19,8 @@ const merge = require('webpack-merge')
const { assetsDir, baseConfig } = require('./config')
const MiniCssExtractPlugin = require('mini-css-extract-plugin')
const ProgressPlugin = require('progress-bar-webpack-plugin')
+const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin')
+const portfinder = require('portfinder')
const getEnv = require('env-parse').getEnv
const config = merge.smart(baseConfig, {
@@ -33,6 +35,7 @@ const config = merge.smart(baseConfig, {
port: getEnv('DEV_PORT', 8888),
host: getEnv('DEV_HOST', 'localhost'),
noInfo: false,
+ overlay: { warnings: false, errors: true },
historyApiFallback: true,
disableHostCheck: true,
proxy: {
@@ -42,12 +45,12 @@ const config = merge.smart(baseConfig, {
changeOrigin: true
}
},
- progress: false,
- quiet: false,
+ progress: true,
+ quiet: true,
stats: {
colors: true
},
- clientLogLevel: 'none'
+ clientLogLevel: 'warning'
},
plugins: [
new ProgressPlugin(),
@@ -57,4 +60,36 @@ const config = merge.smart(baseConfig, {
mode: 'development'
})
-module.exports = config
+module.exports = new Promise((resolve, reject) => {
+ portfinder.basePort = process.env.PORT || config.devServer.port
+ portfinder.getPort((err, port) => {
+ if (err) {
+ reject(err)
+ } else {
+ // publish the new Port, necessary for e2e tests
+ process.env.PORT = port
+ // add port to devServer config
+ config.devServer.port = port
+ // Add FriendlyErrorsPlugin
+ config.plugins.push(new FriendlyErrorsPlugin({
+ compilationSuccessInfo: {
+ messages: [`Your application is running here: http://${config.devServer.host}:${port}`],
+ },
+ onErrors: () => {
+ const notifier = require('node-notifier')
+ return (severity, errors) => {
+ if (severity !== 'error') return
+ const error = errors[0]
+ const filename = error.file && error.file.split('!').pop()
+ notifier.notify({
+ title: packageConfig.name,
+ message: severity + ': ' + error.name,
+ subtitle: filename || ''
+ })
+ }
+ }
+ }))
+ resolve(config)
+ }
+ })
+})
diff --git a/dolphinscheduler-ui/build/webpack.config.prod.js b/dolphinscheduler-ui/build/webpack.config.prod.js
index 4bb90d54d1..1024ac6724 100644
--- a/dolphinscheduler-ui/build/webpack.config.prod.js
+++ b/dolphinscheduler-ui/build/webpack.config.prod.js
@@ -51,12 +51,7 @@ const config = merge.smart(baseConfig, {
minimizer: [
new TerserPlugin({
terserOptions: {
- compress: {
- warnings: false,
- drop_console: true,
- drop_debugger: true,
- pure_funcs: ['console.log']
- }
+ compress: {}
},
cache: true,
parallel: true,
diff --git a/dolphinscheduler-ui/package.json b/dolphinscheduler-ui/package.json
index af0ac54b0c..609dd1043a 100644
--- a/dolphinscheduler-ui/package.json
+++ b/dolphinscheduler-ui/package.json
@@ -8,13 +8,12 @@
"dev": "cross-env NODE_ENV=development webpack-dev-server --config ./build/webpack.config.dev.js",
"clean": "rimraf dist",
"start": "npm run dev",
- "lint": "eslint ./src --fix",
+ "lint": "eslint --ext .js,.vue ./src",
+ "lint:fix": "eslint --ext .js,.vue --fix ./src",
"build:release": "npm run clean && cross-env NODE_ENV=production PUBLIC_PATH=/dolphinscheduler/ui webpack --config ./build/webpack.config.release.js"
},
"dependencies": {
- "@form-create/element-ui": "^1.0.18",
"@riophae/vue-treeselect": "^0.4.0",
- "ans-ui": "1.1.9",
"axios": "^0.16.2",
"bootstrap": "3.3.7",
"canvg": "1.5.1",
@@ -25,6 +24,7 @@
"dayjs": "^1.7.8",
"echarts": "4.1.0",
"element-ui": "2.13.2",
+ "font-awesome": "^4.7.0",
"html2canvas": "^0.5.0-beta4",
"jquery": "3.3.1",
"jquery-ui": "^1.12.1",
@@ -33,7 +33,7 @@
"lodash": "^4.17.11",
"normalize.css": "^8.0.1",
"vue": "^2.5.17",
- "vue-router": "^2.7.0",
+ "vue-router": "^3.0.0",
"vuex": "^3.0.0",
"vuex-router-sync": "^5.0.0"
},
@@ -48,6 +48,7 @@
"babel-plugin-transform-object-rest-spread": "^6.26.0",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-plugin-transform-vue-jsx": "^3.5.0",
+ "babel-polyfill": "^6.26.0",
"babel-preset-env": "^1.6.1",
"copy-webpack-plugin": "^4.5.2",
"cross-env": "^5.2.0",
@@ -56,17 +57,23 @@
"env-parse": "^1.0.5",
"eslint": "^6.8.0",
"eslint-config-standard": "^14.1.1",
+ "eslint-friendly-formatter": "^4.0.1",
+ "eslint-loader": "^4.0.2",
"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",
+ "eslint-plugin-vue": "^7.2.0",
"file-loader": "^5.0.2",
+ "friendly-errors-webpack-plugin": "^1.7.0",
"globby": "^8.0.1",
"html-loader": "^0.5.5",
"html-webpack-plugin": "^3.2.0",
"mini-css-extract-plugin": "^0.8.2",
+ "node-notifier": "^8.0.0",
"node-sass": "^4.14.1",
+ "pack": "^2.2.0",
+ "portfinder": "^1.0.28",
"postcss-loader": "^3.0.0",
"progress-bar-webpack-plugin": "^1.12.1",
"rimraf": "^2.6.2",
@@ -80,5 +87,14 @@
"webpack-cli": "^3.3.10",
"webpack-dev-server": "^3.9.0",
"webpack-merge": "^4.2.2"
- }
+ },
+ "browserslist": [
+ "> 1%",
+ "last 2 versions",
+ "ie >= 9",
+ "edge >= 12",
+ "firefox >= 28",
+ "chrome >= 29",
+ "opera >= 17"
+ ]
}
diff --git a/dolphinscheduler-ui/pom.xml b/dolphinscheduler-ui/pom.xml
index 13644bad91..1263502cc3 100644
--- a/dolphinscheduler-ui/pom.xml
+++ b/dolphinscheduler-ui/pom.xml
@@ -20,7 +20,7 @@
dolphinscheduler
org.apache.dolphinscheduler
- 1.3.2-SNAPSHOT
+ 1.3.4-SNAPSHOT
4.0.0
@@ -203,5 +203,4 @@
-
-
+
\ No newline at end of file
diff --git a/dolphinscheduler-ui/src/components/Counter.vue b/dolphinscheduler-ui/src/components/Counter.vue
index 6fafb5a54e..74dbfcd8de 100644
--- a/dolphinscheduler-ui/src/components/Counter.vue
+++ b/dolphinscheduler-ui/src/components/Counter.vue
@@ -24,30 +24,30 @@
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/components/Message.vue b/dolphinscheduler-ui/src/components/Message.vue
index 95f5236b6e..aba5ea6a56 100644
--- a/dolphinscheduler-ui/src/components/Message.vue
+++ b/dolphinscheduler-ui/src/components/Message.vue
@@ -19,10 +19,10 @@
\ No newline at end of file
+ export default {
+ name: 'message',
+ props: [
+ 'msg'
+ ]
+ }
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/App.vue b/dolphinscheduler-ui/src/js/conf/home/App.vue
index 97110e580c..2d7a5f3328 100644
--- a/dolphinscheduler-ui/src/js/conf/home/App.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/App.vue
@@ -17,15 +17,36 @@
-
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/index.js b/dolphinscheduler-ui/src/js/conf/home/index.js
index 381e2030b7..8db055a36a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/index.js
@@ -17,6 +17,7 @@
// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
+import 'babel-polyfill'
import Vue from 'vue'
import ElementUI from 'element-ui'
import locale from 'element-ui/lib/locale/lang/en'
@@ -28,29 +29,23 @@ import i18n from '@/module/i18n'
import { sync } from 'vuex-router-sync'
import Chart from '@/module/ana-charts'
import '@/module/filter/formatDate'
+import '@/module/filter/filterNull'
import themeData from '@/module/echarts/themeData.json'
import Permissions from '@/module/permissions'
-import 'ans-ui/lib/ans-ui.min.css'
-import ans from 'ans-ui/lib/ans-ui.min'
-import en_US from 'ans-ui/lib/locale/en' // eslint-disable-line
import 'sass/conf/home/index.scss'
import 'bootstrap/dist/css/bootstrap.min.css'
import 'bootstrap/dist/js/bootstrap.min.js'
import 'canvg/dist/browser/canvg.min.js'
-
-import formCreate, {maker} from '@form-create/element-ui'
+import 'font-awesome/css/font-awesome.min.css'
// Component internationalization
-const useOpt = i18n.globalScope.LOCALE === 'en_US' ? { locale: en_US } : {}
+const useOpt = i18n.globalScope.LOCALE === 'en_US' ? { locale: locale } : {}
i18n.globalScope.LOCALE === 'en_US' ? Vue.use(ElementUI, { locale }) : Vue.use(ElementUI)
-
// Vue.use(ans)
-Vue.use(ans, useOpt)
-
-Vue.use(formCreate, {maker})
+Vue.use(useOpt)
sync(store, router)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
index 18fbd94341..566896a2ff 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/config.js
@@ -29,31 +29,31 @@ const toolOper = (dagThis) => {
return [
{
code: 'pointer',
- icon: 'ans-icon-pointer',
+ icon: 'el-icon-thumb',
disable: disabled,
desc: `${i18n.$t('Drag Nodes and Selected Items')}`
},
{
code: 'line',
- icon: 'ans-icon-slash',
+ icon: 'el-icon-top-right',
disable: disabled,
desc: `${i18n.$t('Select Line Connection')}`
},
{
code: 'remove',
- icon: 'ans-icon-trash',
+ icon: 'el-icon-delete',
disable: disabled,
desc: `${i18n.$t('Delete selected lines or nodes')}`
},
{
code: 'download',
- icon: 'ans-icon-download',
+ icon: 'el-icon-download',
disable: !dagThis.type,
desc: `${i18n.$t('Download')}`
},
{
code: 'screen',
- icon: 'ans-icon-max',
+ icon: 'el-icon-full-screen',
disable: false,
desc: `${i18n.$t('Full Screen')}`
}
@@ -150,98 +150,98 @@ const tasksState = {
id: 0,
desc: `${i18n.$t('Submitted successfully')}`,
color: '#A9A9A9',
- icoUnicode: 'ans-icon-dot-circle',
+ icoUnicode: 'fa fa-dot-circle-o',
isSpin: false
},
RUNNING_EXECUTION: {
id: 1,
desc: `${i18n.$t('Executing')}`,
color: '#0097e0',
- icoUnicode: 'ans-icon-gear',
+ icoUnicode: 'el-icon-s-tools',
isSpin: true
},
READY_PAUSE: {
id: 2,
desc: `${i18n.$t('Ready to pause')}`,
color: '#07b1a3',
- icoUnicode: 'ans-icon-pause-solid',
+ icoUnicode: 'fa-pause-circle',
isSpin: false
},
PAUSE: {
id: 3,
desc: `${i18n.$t('Pause')}`,
color: '#057c72',
- icoUnicode: 'ans-icon-pause',
+ icoUnicode: 'el-icon-video-pause',
isSpin: false
},
READY_STOP: {
id: 4,
desc: `${i18n.$t('Ready to stop')}`,
color: '#FE0402',
- icoUnicode: 'ans-icon-coin',
+ icoUnicode: 'fa-stop-circle-o',
isSpin: false
},
STOP: {
id: 5,
desc: `${i18n.$t('Stop')}`,
color: '#e90101',
- icoUnicode: 'ans-icon-stop',
+ icoUnicode: 'fa-stop-circle',
isSpin: false
},
FAILURE: {
id: 6,
desc: `${i18n.$t('failed')}`,
color: '#000000',
- icoUnicode: 'ans-icon-fail-empty',
+ icoUnicode: 'el-icon-circle-close',
isSpin: false
},
SUCCESS: {
id: 7,
desc: `${i18n.$t('success')}`,
color: '#33cc00',
- icoUnicode: 'ans-icon-success-empty',
+ icoUnicode: 'el-icon-circle-check',
isSpin: false
},
NEED_FAULT_TOLERANCE: {
id: 8,
desc: `${i18n.$t('Need fault tolerance')}`,
color: '#FF8C00',
- icoUnicode: 'ans-icon-pen',
+ icoUnicode: 'el-icon-edit',
isSpin: false
},
KILL: {
id: 9,
desc: `${i18n.$t('kill')}`,
color: '#a70202',
- icoUnicode: 'ans-icon-minus-circle-empty',
+ icoUnicode: 'el-icon-remove-outline',
isSpin: false
},
WAITTING_THREAD: {
id: 10,
desc: `${i18n.$t('Waiting for thread')}`,
color: '#912eed',
- icoUnicode: 'ans-icon-sand-clock',
+ icoUnicode: 'fa-hourglass-end',
isSpin: false
},
WAITTING_DEPEND: {
id: 11,
desc: `${i18n.$t('Waiting for dependence')}`,
color: '#5101be',
- icoUnicode: 'ans-icon-dependence',
+ icoUnicode: 'fa-window-restore',
isSpin: false
},
DELAY_EXECUTION: {
id: 12,
desc: `${i18n.$t('Delay execution')}`,
color: '#5102ce',
- icoUnicode: 'ans-icon-coin',
+ icoUnicode: 'fa-stop-circle-o',
isSpin: false
},
FORCED_SUCCESS: {
id: 13,
desc: `${i18n.$t('Forced success')}`,
color: '#5102ce',
- icoUnicode: 'ans-icon-success-solid',
+ icoUnicode: 'el-icon-success',
isSpin: false
}
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js
index d7f2f78a0c..e98cda22fd 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js
@@ -15,14 +15,13 @@
* limitations under the License.
*/
import Vue from 'vue'
-let v = new Vue()
import _ from 'lodash'
import i18n from '@/module/i18n'
import { jsPlumb } from 'jsplumb'
import JSP from './plugIn/jsPlumbHandle'
import DownChart from './plugIn/downChart'
import store from '@/conf/home/store'
-import dagre from "dagre"
+import dagre from 'dagre'
/**
* Prototype method
@@ -53,7 +52,9 @@ Dag.prototype.setConfig = function (o) {
*/
Dag.prototype.create = function () {
const self = this
- jsPlumb.ready(() => {
+ const plumbIns = jsPlumb.getInstance()
+ plumbIns.reset()
+ plumbIns.ready(() => {
JSP.init({
dag: this.dag,
instance: this.instance,
@@ -76,7 +77,7 @@ Dag.prototype.create = function () {
* Action event on the right side of the toolbar
*/
Dag.prototype.toolbarEvent = function ({ item, code, is }) {
- let self = this
+ const self = this
switch (code) {
case 'pointer':
JSP.handleEventPointer(is)
@@ -91,21 +92,15 @@ Dag.prototype.toolbarEvent = function ({ item, code, is }) {
JSP.handleEventScreen({ item, is })
break
case 'download':
- v.$modal.dialog({
- width: 350,
- closable: false,
- showMask: true,
- maskClosable: true,
- title: i18n.$t('Download'),
- content: i18n.$t('Please confirm whether the workflow has been saved before downloading'),
- ok: {
- handle (e) {
- DownChart.download({
- dagThis: self.dag
- })
- }
- },
- cancel: {}
+ Vue.prototype.$confirm(`${i18n.$t('Please confirm whether the workflow has been saved before downloading')}`, `${i18n.$t('Download')}`, {
+ confirmButtonText: `${i18n.$t('Confirm')}`,
+ cancelButtonText: `${i18n.$t('Cancel')}`,
+ type: 'warning'
+ }).then(() => {
+ DownChart.download({
+ dagThis: self.dag
+ })
+ }).catch(() => {
})
break
}
@@ -128,17 +123,19 @@ Dag.prototype.backfill = function (arg) {
for (const i in store.state.dag.connects) {
const connect = store.state.dag.connects[i]
- g.setEdge(connect['endPointSourceId'], connect['endPointTargetId'])
+ g.setEdge(connect.endPointSourceId, connect.endPointTargetId)
}
dagre.layout(g)
const dataObject = {}
g.nodes().forEach(function (v) {
const node = g.node(v)
+ const location = store.state.dag.locations[node.label]
const obj = {}
- obj.name = node.label
+ obj.name = location.name
obj.x = node.x + marginX
obj.y = node.y
+ obj.targetarr = location.targetarr
dataObject[node.label] = obj
})
jsPlumb.ready(() => {
@@ -162,7 +159,9 @@ Dag.prototype.backfill = function (arg) {
})
})
} else {
- jsPlumb.ready(() => {
+ const plumbIns = jsPlumb.getInstance()
+ plumbIns.reset()
+ plumbIns.ready(() => {
JSP.init({
dag: this.dag,
instance: this.instance,
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
index 88f2d11c8f..41a44bc17a 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
@@ -207,7 +207,6 @@
.operation {
overflow: hidden;
display: inline-block;
- margin-right: 10px;
a {
float: left;
width: 28px;
@@ -277,8 +276,9 @@ svg path:hover {
background: #fff;
border-radius: 3px;
box-shadow: 0 2px 4px 1px rgba(0, 0, 0, 0.1);
- padding: 4px 0;
+ padding: 4px 4px;
visibility:hidden;
+ z-index: 10000;
a {
height: 30px;
line-height: 28px;
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
index 1880adc51b..a61d289d3d 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@@ -34,31 +34,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -158,6 +202,7 @@
import { findComponentDownward } from '@/module/util/'
import disabledState from '@/module/mixin/disabledState'
import { mapActions, mapState, mapMutations } from 'vuex'
+ import mStart from '../../projects/pages/definition/pages/list/_source/start'
import mVersions from '../../projects/pages/definition/pages/list/_source/versions'
let eventModel
@@ -179,7 +224,39 @@
isLoading: false,
taskId: null,
arg: false,
-
+ versionData: {
+ processDefinition: {
+ id: null,
+ version: '',
+ state: ''
+ },
+ processDefinitionVersions: [],
+ total: null,
+ pageNo: null,
+ pageSize: null
+ },
+ drawer: false,
+ nodeData: {
+ id: null,
+ taskType: '',
+ self: {},
+ preNode: [],
+ rearList: [],
+ instanceId: null
+ },
+ nodeDrawer: false,
+ lineData: {
+ id: null,
+ sourceId: '',
+ targetId: ''
+ },
+ lineDrawer: false,
+ udpDrawer: false,
+ dialogVisible: false,
+ startDialog: false,
+ startData: {},
+ startNodeList: '',
+ sourceType: ''
}
},
mixins: [disabledState],
@@ -190,43 +267,54 @@
methods: {
...mapActions('dag', ['saveDAGchart', 'updateInstance', 'updateDefinition', 'getTaskState', 'switchProcessDefinitionVersion', 'getProcessDefinitionVersionsPage', 'deleteProcessDefinitionVersion']),
...mapMutations('dag', ['addTasks', 'cacheTasks', 'resetParams', 'setIsEditDag', 'setName', 'addConnects']),
-
+ startRunning (item, startNodeList, sourceType) {
+ this.startData = item
+ this.startNodeList = startNodeList
+ this.sourceType = sourceType
+ this.startDialog = true
+ },
+ onUpdateStart () {
+ this.startDialog = false
+ },
+ closeStart () {
+ this.startDialog = false
+ },
// DAG automatic layout
- dagAutomaticLayout() {
- if(this.store.state.dag.isEditDag) {
+ dagAutomaticLayout () {
+ if (this.store.state.dag.isEditDag) {
this.$message.warning(`${i18n.$t('Please save the DAG before formatting')}`)
return false
}
$('#canvas').html('')
- // Destroy round robin
+ // Destroy round robin
Dag.init({
- dag: this,
- instance: jsPlumb.getInstance({
- Endpoint: [
- 'Dot', { radius: 1, cssClass: 'dot-style' }
- ],
- Connector: 'Bezier',
- PaintStyle: { lineWidth: 2, stroke: '#456' }, // Connection style
- ConnectionOverlays: [
- [
- 'Arrow',
- {
- location: 1,
- id: 'arrow',
- length: 12,
- foldback: 0.8
- }
+ dag: this,
+ instance: jsPlumb.getInstance({
+ Endpoint: [
+ 'Dot', { radius: 1, cssClass: 'dot-style' }
],
- ['Label', {
+ Connector: 'Bezier',
+ PaintStyle: { lineWidth: 2, stroke: '#456' }, // Connection style
+ ConnectionOverlays: [
+ [
+ 'Arrow',
+ {
+ location: 1,
+ id: 'arrow',
+ length: 12,
+ foldback: 0.8
+ }
+ ],
+ ['Label', {
location: 0.5,
id: 'label'
- }]
- ],
- Container: 'canvas',
- ConnectionsDetachable: true
+ }]
+ ],
+ Container: 'canvas',
+ ConnectionsDetachable: true
+ })
})
- })
if (this.tasks.length) {
Dag.backfill(true)
if (this.type === 'instance') {
@@ -255,8 +343,8 @@
/**
* copy name
*/
- _copyName(){
- let clipboard = new Clipboard(`.copy-name`)
+ _copyName () {
+ let clipboard = new Clipboard('.copy-name')
clipboard.on('success', e => {
this.$message.success(`${i18n.$t('Copy success')}`)
// Free memory
@@ -294,8 +382,8 @@
let dom = $(`#${v2.id}`)
let state = dom.find('.state-p')
let depState = ''
- taskList.forEach(item=>{
- if(item.name==v1.name) {
+ taskList.forEach(item => {
+ if (item.name === v1.name) {
depState = item.state
}
})
@@ -371,7 +459,7 @@
this.spinnerLoading = true
// Storage store
Dag.saveStore().then(res => {
- if(this._verifConditions(res.tasks)) {
+ if (this._verifConditions(res.tasks)) {
if (this.urlParam.id) {
/**
* Edit
@@ -379,7 +467,12 @@
* @param saveEditDAGChart => Process definition editing
*/
this[this.type === 'instance' ? 'updateInstance' : 'updateDefinition'](this.urlParam.id).then(res => {
- this.$message.success(res.msg)
+ // this.$message.success(res.msg)
+ this.$message({
+ message: res.msg,
+ type: 'success',
+ offset: 80
+ })
this.spinnerLoading = false
// Jump process definition
if (this.type === 'instance') {
@@ -415,57 +508,36 @@
})
})
},
- _closeDAG(){
+ _closeDAG () {
let $name = this.$route.name
- if($name && $name.indexOf("definition") != -1){
- this.$router.push({ name: 'projects-definition-list'})
- }else{
- this.$router.push({ name: 'projects-instance-list'})
+ if ($name && $name.indexOf('definition') !== -1) {
+ this.$router.push({ name: 'projects-definition-list' })
+ } else {
+ this.$router.push({ name: 'projects-instance-list' })
}
},
_verifConditions (value) {
let tasks = value
let bool = true
- tasks.map(v=>{
- if(v.type == 'CONDITIONS' && (v.conditionResult.successNode[0] =='' || v.conditionResult.successNode[0] == null || v.conditionResult.failedNode[0] =='' || v.conditionResult.failedNode[0] == null)) {
+ tasks.map(v => {
+ if (v.type === 'CONDITIONS' && (v.conditionResult.successNode[0] === '' || v.conditionResult.successNode[0] === null || v.conditionResult.failedNode[0] === '' || v.conditionResult.failedNode[0] === null)) {
bool = false
return false
}
})
- if(!bool) {
+ if (!bool) {
this.$message.warning(`${i18n.$t('Successful branch flow and failed branch flow are required')}`)
this.spinnerLoading = false
return false
}
return true
},
- /**
- * Global parameter
- * @param Promise
- */
- _udpTopFloorPop () {
- return new Promise((resolve, reject) => {
- let modal = this.$modal.dialog({
- closable: false,
- showMask: true,
- escClose: true,
- className: 'v-modal-custom',
- transitionName: 'opacityp',
- render (h) {
- return h(mUdp, {
- on: {
- onUdp () {
- modal.remove()
- resolve()
- },
- close () {
- modal.remove()
- }
- }
- })
- }
- })
- })
+ onUdpDialog () {
+ this._save()
+ this.dialogVisible = false
+ },
+ closeDialog () {
+ this.dialogVisible = false
},
/**
* Save chart
@@ -476,11 +548,7 @@
this.$message.warning(`${i18n.$t('Failed to create node to save')}`)
return
}
-
- // Global parameters (optional)
- this._udpTopFloorPop().then(() => {
- return this._save()
- })
+ this.dialogVisible = true
},
/**
* Return to the previous child node
@@ -531,63 +599,75 @@
* View variables
*/
_toggleView () {
- findComponentDownward(this.$root, `assist-dag-index`)._toggleView()
+ findComponentDownward(this.$root, 'assist-dag-index')._toggleView()
},
/**
* Starting parameters
*/
_toggleParam () {
- findComponentDownward(this.$root, `starting-params-dag-index`)._toggleParam()
+ findComponentDownward(this.$root, 'starting-params-dag-index')._toggleParam()
},
+ addLineInfo ({ item, fromThis }) {
+ this.addConnects(item)
+ this.lineDrawer = false
+ },
+ cancel ({ fromThis }) {
+ this.lineDrawer = false
+ },
+
/**
* Create a node popup layer
* @param Object id
*/
- _createLineLabel({id, sourceId, targetId}) {
- // $('#jsPlumb_2_50').text('111')
- let self = this
- self.$modal.destroy()
- const removeNodesEvent = (fromThis) => {
- // Manually destroy events inside the component
- fromThis.$destroy()
- // Close the popup
- eventModel.remove()
- }
- eventModel = this.$drawer({
- className: 'dagMask',
- render (h) {
- return h(mFormLineModel,{
- on: {
- addLineInfo ({ item, fromThis }) {
- self.addConnects(item)
- setTimeout(() => {
- removeNodesEvent(fromThis)
- }, 100)
- },
- cancel ({fromThis}) {
- removeNodesEvent(fromThis)
- }
- },
- props: {
- id: id,
- sourceId: sourceId,
- targetId: targetId
- }
- })
+ _createLineLabel ({ id, sourceId, targetId }) {
+ this.lineData.id = id
+ this.lineData.sourceId = sourceId
+ this.lineData.targetId = targetId
+ this.lineDrawer = true
+ },
+
+ seeHistory (taskName) {
+ this.nodeData.self.$router.push({
+ name: 'task-instance',
+ query: {
+ processInstanceId: this.nodeData.self.$route.params.id,
+ taskName: taskName
}
})
},
+
+ addTaskInfo ({ item, fromThis }) {
+ this.addTasks(item)
+ this.nodeDrawer = false
+ },
+
+ cacheTaskInfo ({ item, fromThis }) {
+ this.cacheTasks(item)
+ },
+
+ close ({ item, flag, fromThis }) {
+ this.addTasks(item)
+ // Edit status does not allow deletion of nodes
+ if (flag) {
+ jsPlumb.remove(this.nodeData.id)
+ }
+ this.nodeDrawer = false
+ },
+ onSubProcess ({ subProcessId, fromThis }) {
+ this._subProcessHandle(subProcessId)
+ },
+
_createNodes ({ id, type }) {
let self = this
let preNode = []
let rearNode = []
let rearList = []
- $('div[data-targetarr*="' + id + '"]').each(function(){
- rearNode.push($(this).attr("id"))
+ $('div[data-targetarr*="' + id + '"]').each(function () {
+ rearNode.push($(this).attr('id'))
})
- if (rearNode.length>0) {
+ if (rearNode.length > 0) {
rearNode.forEach(v => {
let rearobj = {}
rearobj.value = $(`#${v}`).find('.name-p').text()
@@ -609,78 +689,96 @@
} else {
preNode = []
}
- if (eventModel) {
- // Close the popup
- eventModel.remove()
- }
-
- const removeNodesEvent = (fromThis) => {
- // Manually destroy events inside the component
- fromThis.$destroy()
- // Close the popup
- eventModel.remove()
- }
this.taskId = id
type = type || self.dagBarId
- eventModel = this.$drawer({
- closable: false,
- direction: 'right',
- escClose: true,
- className: 'dagMask',
- render: h => h(mFormModel, {
- on: {
- addTaskInfo ({ item, fromThis }) {
- self.addTasks(item)
- setTimeout(() => {
- removeNodesEvent(fromThis)
- }, 100)
- },
- /**
- * Cache the item
- * @param item
- * @param fromThis
- */
- cacheTaskInfo({item, fromThis}) {
- self.cacheTasks(item)
- },
- close ({ item,flag, fromThis }) {
- self.addTasks(item)
- // Edit status does not allow deletion of nodes
- if (flag) {
- jsPlumb.remove(id)
- }
+ this.nodeData.id = id
+ this.nodeData.taskType = type
+ this.nodeData.self = self
+ this.nodeData.preNode = preNode
+ this.nodeData.rearList = rearList
+ this.nodeData.instanceId = this.$route.params.id
- removeNodesEvent(fromThis)
- },
- onSubProcess ({ subProcessId, fromThis }) {
- removeNodesEvent(fromThis)
- self._subProcessHandle(subProcessId)
- }
- },
- props: {
- id: id,
- taskType: type,
- self: self,
- preNode: preNode,
- rearList: rearList,
- instanceId: this.$route.params.id
- }
- })
- })
+ this.nodeDrawer = true
},
removeEventModelById ($id) {
- if(eventModel && this.taskId == $id){
+ if (eventModel && this.taskId === $id) {
eventModel.remove()
}
},
+ /**
+ * switch version in process definition version list
+ *
+ * @param version the version user want to change
+ * @param processDefinitionId the process definition id
+ * @param fromThis fromThis
+ */
+ mVersionSwitchProcessDefinitionVersion ({ version, processDefinitionId, fromThis }) {
+ this.$store.state.dag.isSwitchVersion = true
+ this.switchProcessDefinitionVersion({
+ version: version,
+ processDefinitionId: processDefinitionId
+ }).then(res => {
+ this.$message.success($t('Switch Version Successfully'))
+ this.$router.push({ path: `/projects/definition/list/${processDefinitionId}?_t=${new Date().getTime()}` })
+ }).catch(e => {
+ this.$store.state.dag.isSwitchVersion = false
+ this.$message.error(e.msg || '')
+ })
+ },
+
+ /**
+ * Paging event of process definition versions
+ *
+ * @param pageNo page number
+ * @param pageSize page size
+ * @param processDefinitionId the process definition id of page version
+ * @param fromThis fromThis
+ */
+ mVersionGetProcessDefinitionVersionsPage ({ pageNo, pageSize, processDefinitionId, fromThis }) {
+ this.getProcessDefinitionVersionsPage({
+ pageNo: pageNo,
+ pageSize: pageSize,
+ processDefinitionId: processDefinitionId
+ }).then(res => {
+ this.versionData.processDefinitionVersions = res.data.lists
+ this.versionData.total = res.data.totalCount
+ this.versionData.pageSize = res.data.pageSize
+ this.versionData.pageNo = res.data.currentPage
+ }).catch(e => {
+ this.$message.error(e.msg || '')
+ })
+ },
+
+ /**
+ * delete one version of process definition
+ *
+ * @param version the version need to delete
+ * @param processDefinitionId the process definition id user want to delete
+ * @param fromThis fromThis
+ */
+ mVersionDeleteProcessDefinitionVersion ({ version, processDefinitionId, fromThis }) {
+ this.deleteProcessDefinitionVersion({
+ version: version,
+ processDefinitionId: processDefinitionId
+ }).then(res => {
+ this.$message.success(res.msg || '')
+ this.mVersionGetProcessDefinitionVersionsPage({
+ pageNo: 1,
+ pageSize: 10,
+ processDefinitionId: processDefinitionId,
+ fromThis: fromThis
+ })
+ }).catch(e => {
+ this.$message.error(e.msg || '')
+ })
+ },
/**
* query the process definition pagination version
*/
_version (item) {
- let self = this
this.getProcessDefinitionVersionsPage({
pageNo: 1,
pageSize: 10,
@@ -690,127 +788,27 @@
let total = res.data.totalCount
let pageSize = res.data.pageSize
let pageNo = res.data.currentPage
- if (this.versionsModel) {
- this.versionsModel.remove()
- }
- this.versionsModel = this.$drawer({
- direction: 'right',
- closable: true,
- showMask: true,
- escClose: true,
- render (h) {
- return h(mVersions, {
- on: {
- /**
- * switch version in process definition version list
- *
- * @param version the version user want to change
- * @param processDefinitionId the process definition id
- * @param fromThis fromThis
- */
- mVersionSwitchProcessDefinitionVersion ({ version, processDefinitionId, fromThis }) {
-
- self.$store.state.dag.isSwitchVersion = true
-
- self.switchProcessDefinitionVersion({
- version: version,
- processDefinitionId: processDefinitionId
- }).then(res => {
- self.$message.success($t('Switch Version Successfully'))
- setTimeout(() => {
- fromThis.$destroy()
- self.versionsModel.remove()
- }, 0)
- self.$router.push({ path: `/projects/definition/list/${processDefinitionId}?_t=${new Date().getTime()}` })
- }).catch(e => {
- self.$store.state.dag.isSwitchVersion = false
- self.$message.error(e.msg || '')
- })
- },
-
- /**
- * Paging event of process definition versions
- *
- * @param pageNo page number
- * @param pageSize page size
- * @param processDefinitionId the process definition id of page version
- * @param fromThis fromThis
- */
- mVersionGetProcessDefinitionVersionsPage ({ pageNo, pageSize, processDefinitionId, fromThis }) {
- self.getProcessDefinitionVersionsPage({
- pageNo: pageNo,
- pageSize: pageSize,
- processDefinitionId: processDefinitionId
- }).then(res => {
- fromThis.processDefinitionVersions = res.data.lists
- fromThis.total = res.data.totalCount
- fromThis.pageSize = res.data.pageSize
- fromThis.pageNo = res.data.currentPage
- }).catch(e => {
- self.$message.error(e.msg || '')
- })
- },
-
- /**
- * delete one version of process definition
- *
- * @param version the version need to delete
- * @param processDefinitionId the process definition id user want to delete
- * @param fromThis fromThis
- */
- mVersionDeleteProcessDefinitionVersion ({ version, processDefinitionId, fromThis }) {
- self.deleteProcessDefinitionVersion({
- version: version,
- processDefinitionId: processDefinitionId
- }).then(res => {
- self.$message.success(res.msg || '')
- fromThis.$emit('mVersionGetProcessDefinitionVersionsPage', {
- pageNo: 1,
- pageSize: 10,
- processDefinitionId: processDefinitionId,
- fromThis: fromThis
- })
- }).catch(e => {
- self.$message.error(e.msg || '')
- })
- },
-
- /**
- * remove this drawer
- *
- * @param fromThis
- */
- close ({ fromThis }) {
- setTimeout(() => {
- fromThis.$destroy()
- self.versionsModel.remove()
- }, 0)
- }
- },
- props: {
- processDefinition: {
- id: self.urlParam.id,
- version: self.$store.state.dag.version,
- state: self.releaseState
- },
- processDefinitionVersions: processDefinitionVersions,
- total: total,
- pageNo: pageNo,
- pageSize: pageSize
- }
- })
- }
- })
+ this.versionData.processDefinition.id = this.urlParam.id
+ this.versionData.processDefinition.version = this.$store.state.dag.version
+ this.versionData.processDefinition.state = this.releaseState
+ this.versionData.processDefinitionVersions = processDefinitionVersions
+ this.versionData.total = total
+ this.versionData.pageNo = pageNo
+ this.versionData.pageSize = pageSize
+ this.drawer = true
}).catch(e => {
this.$message.error(e.msg || '')
})
+ },
+
+ closeVersion () {
+ this.drawer = false
}
},
watch: {
- 'tasks': {
+ tasks: {
deep: true,
handler (o) {
-
// Edit state does not allow deletion of node a...
this.setIsEditDag(true)
}
@@ -843,8 +841,8 @@
}
],
['Label', {
- location: 0.5,
- id: 'label'
+ location: 0.5,
+ id: 'label'
}]
],
Container: 'canvas',
@@ -869,10 +867,13 @@
computed: {
...mapState('dag', ['tasks', 'locations', 'connects', 'isEditDag', 'name'])
},
- components: {}
+ components: { mVersions, mFormModel, mFormLineModel, mUdp, mStart }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/dependentTimeout.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/dependentTimeout.vue
index 2b2ed78ccc..8d8f13cfee 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/dependentTimeout.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/dependentTimeout.vue
@@ -23,7 +23,7 @@
@@ -35,7 +35,7 @@
@@ -46,22 +46,22 @@
{{$t('Timeout period')}}
-
+
{{$t('Minute')}}
-
+
{{$t('Check interval')}}
-
+
{{$t('Minute')}}
-
+
{{$t('Timeout strategy')}}
-
- {{$t('Timeout failure')}}
-
+
+ {{$t('Timeout failure')}}
+
@@ -73,7 +73,7 @@
@@ -84,17 +84,17 @@
{{$t('Timeout period')}}
-
+
{{$t('Minute')}}
-
+
{{$t('Timeout strategy')}}
-
- {{$t('Timeout alarm')}}
- {{$t('Timeout failure')}}
-
+
+ {{$t('Timeout alarm')}}
+ {{$t('Timeout failure')}}
+
@@ -143,21 +143,21 @@
if (p === 2 || p === 0) {
this.waitCompleteTimeout.strategy = is ? ['WARN'] : []
this.waitCompleteTimeout.interval = is ? 30 : null
- }
+ }
},
_verification () {
// Verification timeout policy
- if (this.enable
- && (this.waitCompleteTimeout.enable && !this.waitCompleteTimeout.strategy.length)
- || (this.waitStartTimeout.enable && !this.waitStartTimeout.strategy.length)) {
+ if (this.enable &&
+ (this.waitCompleteTimeout.enable && !this.waitCompleteTimeout.strategy.length) ||
+ (this.waitStartTimeout.enable && !this.waitStartTimeout.strategy.length)) {
this.$message.warning(`${this.$t('Timeout strategy must be selected')}`)
return false
}
// Verify timeout duration Non 0 positive integer
const reg = /^[1-9]\d*$/
- if (this.enable
- && (this.waitCompleteTimeout.enable && !reg.test(this.waitCompleteTimeout.interval))
- || (this.waitStartTimeout.enable && (!reg.test(this.waitStartTimeout.interval || !reg.test(this.waitStartTimeout.checkInterval))))) {
+ if (this.enable &&
+ (this.waitCompleteTimeout.enable && !reg.test(this.waitCompleteTimeout.interval)) ||
+ (this.waitStartTimeout.enable && (!reg.test(this.waitStartTimeout.interval || !reg.test(this.waitStartTimeout.checkInterval))))) {
this.$message.warning(`${this.$t('Timeout must be a positive integer')}`)
return false
}
@@ -175,16 +175,16 @@
},
waitCompleteTimeout: {
strategy: (() => {
- // Handling checkout sequence
- let strategy = this.waitCompleteTimeout.strategy
- if (strategy.length === 2 && strategy[0] === 'FAILED') {
- return [strategy[1], strategy[0]].join(',')
- } else {
- return strategy.join(',')
- }
- })(),
- interval: parseInt(this.waitCompleteTimeout.interval),
- enable: this.waitCompleteTimeout.enable
+ // Handling checkout sequence
+ let strategy = this.waitCompleteTimeout.strategy
+ if (strategy.length === 2 && strategy[0] === 'FAILED') {
+ return [strategy[1], strategy[0]].join(',')
+ } else {
+ return strategy.join(',')
+ }
+ })(),
+ interval: parseInt(this.waitCompleteTimeout.interval),
+ enable: this.waitCompleteTimeout.enable
}
})
return true
@@ -215,4 +215,4 @@
},
components: {}
}
-
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue
index 1d3902c83b..160db6e320 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/selectInput.vue
@@ -15,33 +15,34 @@
* limitations under the License.
*/
-
-
+
-
-
-
-
+
+
+
+
-
-
+
+
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue
index 0dcab3e901..2fece25675 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/timeoutAlarm.vue
@@ -23,7 +23,7 @@
@@ -35,10 +35,10 @@
-
- {{$t('Timeout alarm')}}
- {{$t('Timeout failure')}}
-
+
+ {{$t('Timeout alarm')}}
+ {{$t('Timeout failure')}}
+
@@ -49,9 +49,9 @@
-
+
{{$t('Minute')}}
-
+
@@ -127,4 +127,4 @@
},
components: {}
}
-
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue
index 8efe5c2860..de2b2c73c2 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/_source/workerGroups.vue
@@ -15,18 +15,19 @@
* limitations under the License.
*/
-
-
-
-
+
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
index 7874b53885..502adc767f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/log.vue
@@ -29,16 +29,16 @@
{{$t('View log')}}
@@ -48,7 +48,7 @@
- {{$t('Close')}}
+ {{$t('Close')}}
@@ -67,7 +67,7 @@
*/
const handerTextareaSize = (isH = 0) => {
$('body').find('.tooltip.fade.top.in').remove()
- return $('.textarea-ft').css({ 'height': `${$('.content-log-box').height() - isH}px` })
+ return $('.textarea-ft').css({ height: `${$('.content-log-box').height() - isH}px` })
}
let content = ''
@@ -89,7 +89,7 @@
props: {
item: {
type: Object,
- default: {}
+ default: Object
},
source: {
type: String,
@@ -118,8 +118,8 @@
},
_ckLog () {
this.isLog = true
+
this.store.dispatch('dag/getLog', this._rtParam).then(res => {
- this.$message.destroy()
if (!res.data) {
this.isData = false
setTimeout(() => {
@@ -138,7 +138,6 @@
}, 800)
}
}).catch(e => {
- this.$message.destroy()
this.$message.error(e.msg || '')
})
},
@@ -169,7 +168,7 @@
* Download log
*/
_downloadLog () {
- downloadFile('/dolphinscheduler/log/download-log', {
+ downloadFile('/log/download-log', {
taskInstanceId: this.stateId || this.logId
})
},
@@ -180,8 +179,8 @@
this.loadingIndex = this.loadingIndex - 1
this._ckLog()
}, 1000, {
- 'leading': false,
- 'trailing': true
+ leading: false,
+ trailing: true
}),
/**
* down
@@ -190,8 +189,8 @@
this.loadingIndex = this.loadingIndex + 1
this._ckLog()
}, 1000, {
- 'leading': false,
- 'trailing': true
+ leading: false,
+ trailing: true
}),
/**
* Monitor scroll bar
@@ -203,11 +202,7 @@
// Listen for scrollbar events
if (($this.scrollTop() + $this.height()) === $this.height()) {
if (self.loadingIndex > 0) {
- self.$message.loading({
- content: `${i18n.$t('Loading Log...')}`,
- duration: 0,
- closable: false
- })
+ self.$message.info(`${i18n.$t('Loading Log...')}`)
self._onUp()
}
}
@@ -215,11 +210,7 @@
if ($this.get(0).scrollHeight === ($this.height() + $this.scrollTop())) {
// No data is not requested
if (self.isData) {
- self.$message.loading({
- content: `${i18n.$t('Loading Log...')}`,
- duration: 0,
- closable: false
- })
+ self.$message.info(`${i18n.$t('Loading Log...')}`)
self._onDown()
}
}
@@ -240,11 +231,7 @@
created () {
// Source is a task instance
if (this.source === 'list') {
- this.$message.loading({
- content: `${i18n.$t('Loading Log...')}`,
- duration: 0,
- closable: false
- })
+ this.$message.info(`${i18n.$t('Loading Log...')}`)
this._ckLog()
}
},
@@ -301,27 +288,30 @@
top: 12px;
a{
color: #0097e0;
- font-size: 12px;
margin-left: 10px;
- i {
+ em {
+ font-size: 17px;
+ font-weight: 400;
+ text-decoration: none !important;
vertical-align: middle;
}
}
.clock {
- >i {
+ >em {
font-size: 20px;
vertical-align: middle;
transform: scale(1);
}
}
.refresh-log {
- >i {
+ >em {
+ text-decoration: none;
font-size: 20px;
vertical-align: middle;
transform: scale(1);
}
&.active {
- >i {
+ >em {
-webkit-transition-property: -webkit-transform;
-webkit-transition-duration: 1s;
-moz-transition-property: -moz-transform;
@@ -368,5 +358,16 @@
}
}
}
-
+ @-webkit-keyframes rotateloading{from{-webkit-transform: rotate(0deg)}
+ to{-webkit-transform: rotate(360deg)}
+ }
+ @-moz-keyframes rotateloading{from{-moz-transform: rotate(0deg)}
+ to{-moz-transform: rotate(359deg)}
+ }
+ @-o-keyframes rotateloading{from{-o-transform: rotate(0deg)}
+ to{-o-transform: rotate(359deg)}
+ }
+ @keyframes rotateloading{from{transform: rotate(0deg)}
+ to{transform: rotate(359deg)}
+ }
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/datasource.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/datasource.vue
index 05e248f518..0a3f17b059 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/datasource.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/datasource.vue
@@ -17,28 +17,30 @@
@@ -101,7 +103,7 @@
/**
* Brush type
*/
- _handleTypeChanged ({ value }) {
+ _handleTypeChanged (value) {
this.type = value
this._getDatasourceData().then(res => {
this.datasource = this.datasourceList.length && this.datasourceList[0].id || ''
@@ -126,7 +128,7 @@
this.$emit('on-dsData', {
type: this.type,
datasource: val
- });
+ })
}
},
created () {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
index abec923af5..abadc2c36b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/dependItemList.vue
@@ -17,39 +17,39 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
+
@@ -74,7 +74,7 @@
props: {
dependItemList: Array,
index: Number,
- dependTaskList:Array
+ dependTaskList: Array
},
model: {
prop: 'dependItemList',
@@ -109,7 +109,6 @@
* remove task
*/
_remove (i) {
- this.dependTaskList[this.index].dependItemList.splice(i,1)
this._removeTip()
if (!this.dependItemList.length || this.dependItemList.length === 0) {
this.$emit('on-delete-all', {
@@ -174,20 +173,20 @@
/**
* change process get dependItemList
*/
- _onChangeProjectId ({ value }) {
+ _onChangeProjectId (value) {
this._getProcessByProjectId(value).then(definitionList => {
- /*this.$set(this.dependItemList, this.itemIndex, this._dlOldParams(value, definitionList, item))*/
+ /* this.$set(this.dependItemList, this.itemIndex, this._dlOldParams(value, definitionList, item)) */
let definitionId = definitionList[0].value
this._getDependItemList(definitionId).then(depTasksList => {
let item = this.dependItemList[this.itemIndex]
// init set depTasks All
item.depTasks = 'ALL'
// set dependItemList item data
- this.$set(this.dependItemList, this.itemIndex, this._cpOldParams(value,definitionId, definitionList,depTasksList, item))
+ this.$set(this.dependItemList, this.itemIndex, this._cpOldParams(value, definitionId, definitionList, depTasksList, item))
})
})
},
- _onChangeDefinitionId ({ value }) {
+ _onChangeDefinitionId (value) {
// get depItem list data
this._getDependItemList(value).then(depTasksList => {
let item = this.dependItemList[this.itemIndex]
@@ -197,7 +196,7 @@
this.$set(this.dependItemList, this.itemIndex, this._rtOldParams(value, item.definitionList, depTasksList, item))
})
},
- _onChangeCycle ({ value }) {
+ _onChangeCycle (value) {
let list = _.cloneDeep(dateValueList[value])
this.$set(this.dependItemList[this.itemIndex], 'dateValue', list[0].value)
this.$set(this.dependItemList[this.itemIndex], 'dateValueList', list)
@@ -212,7 +211,7 @@
depTasksList: depTasksList,
cycle: 'day',
dateValue: 'today',
- dateValueList: _.cloneDeep(dateValueList['day']),
+ dateValueList: _.cloneDeep(dateValueList.day),
state: ''
}
},
@@ -231,7 +230,7 @@
}
},
- _cpOldParams (value,definitionId, definitionList,depTasksList, item) {
+ _cpOldParams (value, definitionId, definitionList, depTasksList, item) {
return {
projectId: value,
definitionList: definitionList,
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue
index de5f781132..6b95d23827 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/httpParams.vue
@@ -20,50 +20,51 @@
v-for="(item,$index) in httpParamsList"
:key="item.id"
@click="_getIndex($index)">
-
-
-
+
-
-
-
-
+
+
-
+
-
+
-
+
-
+
@@ -82,7 +83,7 @@
// Current execution index
httpParamsIndex: null,
// 参数位置的下拉框
- positionList:positionList
+ positionList: positionList
}
},
mixins: [disabledState],
@@ -141,7 +142,7 @@
if (!v.prop) {
flag = false
}
- if(v.value === ''){
+ if (v.value === '') {
this.$message.warning(`${i18n.$t('value is empty')}`)
return false
}
@@ -172,7 +173,7 @@
}
})
if (!flag) {
- this.$message.warning(`${i18n.$t('value is empty')}`)
+ this.$message.warning(`${i18n.$t('value is empty')}`)
return false
}
this.$emit('on-http-params', _.cloneDeep(this.httpParamsList))
@@ -190,7 +191,7 @@
},
computed: {
inputStyle () {
- return "width:30%"
+ return 'width:30%'
}
},
mounted () {
@@ -201,35 +202,41 @@
-
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/jsonBox.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/jsonBox.vue
new file mode 100644
index 0000000000..04375e616a
--- /dev/null
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/jsonBox.vue
@@ -0,0 +1,116 @@
+/*
+ * 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.
+ */
+
+
+
+
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/list4Box.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/list4Box.vue
new file mode 100644
index 0000000000..f4d3f767a4
--- /dev/null
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/list4Box.vue
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+
+
+
+
+
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/listBox.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/listBox.vue
index 237d66f667..351e55d100 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/listBox.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/listBox.vue
@@ -40,7 +40,6 @@
}
}
}
-
.v-checkbox-wrapper {
&.v-checkbox-wrapper-disabled {
color: #999 ;
@@ -58,5 +57,4 @@
}
}
}
-
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue
index 0bbbb661f4..c001a20176 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/localParams.vue
@@ -20,64 +20,68 @@
v-for="(item,$index) in localParamsList"
:key="item.id"
@click="_getIndex($index)">
-
-
+
-
-
-
-
-
+
+
-
-
-
+
+
-
-
+
-
+
-
+
-
+
@@ -193,7 +197,7 @@
},
computed: {
inputStyle () {
- return `width:${this.hide ? 160 : 262}px`
+ return `width:${this.hide ? 160 : 252}px`
}
},
mounted () {
@@ -208,31 +212,33 @@
margin-bottom: 6px;
.lt-add {
padding-left: 4px;
+ line-height: 32px;
a {
- .iconfont {
- font-size: 18px;
+ .iconfont, [class^="el-icon"] {
+ font-size: 17px;
vertical-align: middle;
- margin-bottom: -2px;
display: inline-block;
+ margin-top: 0;
}
}
}
}
.add {
+ line-height: 32px;
a {
color: #000;
- .iconfont {
- font-size: 16px;
+ .iconfont, [class^="el-icon"] {
+ font-size: 18px;
vertical-align: middle;
display: inline-block;
- margin-top: -5px;
+ margin-top: 0;
}
}
}
- .add-dp{
+ .add-dp {
a {
color: #0097e0;
- .iconfont {
+ .iconfont, [class^="el-icon"] {
font-size: 18px;
vertical-align: middle;
display: inline-block;
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
index fe9b28b779..0650386d5c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/_source/nodeStatus.vue
@@ -17,27 +17,27 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
-
+
-
+
@@ -45,7 +45,7 @@
-
\ No newline at end of file
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
index 79d127a108..978142891e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/dependent.vue
@@ -23,8 +23,8 @@
-
-
+
+
@@ -40,7 +40,7 @@
@click="!isDetails && _setRelation($index)">
{{el.relation === 'AND' ? $t('and') : $t('or')}}
-
{
- if(item.dependItemList.length === 0){
- this.dependTaskList.splice(i,1)
+ this.dependTaskList[this.index].dependItemList.splice(i, 1)
+ this.dependTaskList.map((item, i) => {
+ if (item.dependItemList.length === 0) {
+ this.dependTaskList.splice(i, 1)
}
})
// this._deleteDep(i)
@@ -107,7 +108,7 @@
_setGlobalRelation () {
this.relation = this.relation === 'AND' ? 'OR' : 'AND'
},
- getDependTaskList(i){
+ getDependTaskList (i) {
// console.log('getDependTaskList',i)
},
_setRelation (i) {
@@ -147,7 +148,9 @@
this.dependTaskList = _.cloneDeep(o.dependence.dependTaskList) || []
let defaultState = this.isDetails ? 'WAITING' : ''
// Process instance return status display matches by key
- _.map(this.dependTaskList, v => _.map(v.dependItemList, v1 => v1.state = dependentResult[`${v1.definitionId}-${v1.depTasks}-${v1.cycle}-${v1.dateValue}`] || defaultState))
+ _.map(this.dependTaskList, v => _.map(v.dependItemList, v1 => {
+ v1.state = dependentResult[`${v1.definitionId}-${v1.depTasks}-${v1.cycle}-${v1.dateValue}`] || defaultState
+ }))
}
},
mounted () {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
index 87d9146fa8..1fe8ca9137 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue
@@ -19,30 +19,31 @@
{{$t('Program Type')}}
-
-
-
-
+
+
{{$t('Main class')}}
-
-
+
+
@@ -56,103 +57,109 @@
{{$t('Deploy Mode')}}
-
-
-
-
+
+
+
+
-
+
{{$t('Flink Version')}}
-
-
-
-
+
+
-
-
-
{{$t('jobManagerMemory')}}
-
-
-
-
-
{{$t('taskManagerMemory')}}
-
-
-
-
+
+ {{$t('App Name')}}
+
+
+
-
-
{{$t('slot')}}
-
-
-
-
-
- {{$t('taskManager')}}
-
-
-
-
-
+
+
+ {{$t('JobManager Memory')}}
+
+
+
-
+ {{$t('TaskManager Memory')}}
+
+
+
+
+
+
+ {{$t('Slot Number')}}
+
+
+
+
+ {{$t('TaskManager Number')}}
+
+
+
+
+
{{$t('Command-line parameters')}}
-
-
+ :placeholder="$t('Please enter Command-line parameters')">
+
{{$t('Other parameters')}}
-
-
+
@@ -167,10 +174,10 @@
{{$t('Custom Parameters')}}
+ ref="refLocalParams"
+ @on-local-params="_onLocalParams"
+ :udp-list="localParams"
+ :hide="false">
@@ -181,7 +188,7 @@
import i18n from '@/module/i18n'
import mLocalParams from './_source/localParams'
import mListBox from './_source/listBox'
- import mResources from './_source/resources'
+ import mList4Box from './_source/list4Box'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import disabledState from '@/module/mixin/disabledState'
@@ -214,6 +221,8 @@
jobManagerMemory: '1G',
// taskManager Memory
taskManagerMemory: '2G',
+ // Flink Job Name
+ appName: '',
// Command line argument
mainArgs: '',
// Other parameters
@@ -223,17 +232,17 @@
// Program type(List)
programTypeList: [{ code: 'JAVA' }, { code: 'SCALA' }, { code: 'PYTHON' }],
- flinkVersion:'<1.10',
+ flinkVersion: '<1.10',
// Flink Versions(List)
flinkVersionList: [{ code: '<1.10' }, { code: '>=1.10' }],
- normalizer(node) {
+ normalizer (node) {
return {
label: node.name
}
},
allNoResources: [],
- noRes: [],
+ noRes: []
}
},
props: {
@@ -244,10 +253,10 @@
/**
* getResourceId
*/
- marjarId(name) {
- this.store.dispatch('dag/getResourceId',{
+ marjarId (name) {
+ this.store.dispatch('dag/getResourceId', {
type: 'FILE',
- fullName: '/'+name
+ fullName: '/' + name
}).then(res => {
this.mainJar = res.id
}).catch(e => {
@@ -281,14 +290,13 @@
return false
}
-
if (!this.mainJar) {
this.$message.warning(`${i18n.$t('Please enter main jar package')}`)
return false
}
if (!this.jobManagerMemory) {
- this.$message.warning(`${i18n.$t('Please enter jobManager memory')}`)
+ this.$message.warning(`${i18n.$t('Please enter JobManager memory')}`)
return false
}
@@ -298,7 +306,7 @@
}
if (!this.taskManagerMemory) {
- this.$message.warning(`${i18n.$t('Please enter the taskManager memory')}`)
+ this.$message.warning(`${i18n.$t('Please enter TaskManager memory')}`)
return false
}
@@ -308,7 +316,7 @@
}
// noRes
- if (this.noRes.length>0) {
+ if (this.noRes.length > 0) {
this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
return false
}
@@ -326,7 +334,7 @@
},
deployMode: this.deployMode,
resourceList: _.map(this.resourceList, v => {
- return {id: v}
+ return { id: v }
}),
localParams: this.localParams,
flinkVersion: this.flinkVersion,
@@ -334,61 +342,62 @@
taskManager: this.taskManager,
jobManagerMemory: this.jobManagerMemory,
taskManagerMemory: this.taskManagerMemory,
+ appName: this.appName,
mainArgs: this.mainArgs,
others: this.others,
programType: this.programType
})
return true
},
- diGuiTree(item) { // Recursive convenience tree structure
+ diGuiTree (item) { // Recursive convenience tree structure
item.forEach(item => {
- item.children === '' || item.children === undefined || item.children === null || item.children.length === 0?
- this.operationTree(item) : this.diGuiTree(item.children);
+ item.children === '' || item.children === undefined || item.children === null || item.children.length === 0
+ ? this.operationTree(item) : this.diGuiTree(item.children)
})
},
- operationTree(item) {
- if(item.dirctory) {
- item.isDisabled =true
+ operationTree (item) {
+ if (item.dirctory) {
+ item.isDisabled = true
}
delete item.children
},
- searchTree(element, id) {
+ searchTree (element, id) {
// 根据id查找节点
- if (element.id == id) {
- return element;
- } else if (element.children != null) {
- var i;
- var result = null;
- for (i = 0; result == null && i < element.children.length; i++) {
- result = this.searchTree(element.children[i], id);
+ if (element.id === id) {
+ return element
+ } else if (element.children !== null) {
+ let i
+ let result = null
+ for (i = 0; result === null && i < element.children.length; i++) {
+ result = this.searchTree(element.children[i], id)
}
- return result;
+ return result
}
- return null;
+ return null
},
- dataProcess(backResource) {
+ dataProcess (backResource) {
let isResourceId = []
let resourceIdArr = []
- if(this.resourceList.length>0) {
- this.resourceList.forEach(v=>{
- this.mainJarList.forEach(v1=>{
- if(this.searchTree(v1,v)) {
- isResourceId.push(this.searchTree(v1,v))
+ if (this.resourceList.length > 0) {
+ this.resourceList.forEach(v => {
+ this.mainJarList.forEach(v1 => {
+ if (this.searchTree(v1, v)) {
+ isResourceId.push(this.searchTree(v1, v))
}
})
})
- resourceIdArr = isResourceId.map(item=>{
+ resourceIdArr = isResourceId.map(item => {
return item.id
})
- Array.prototype.diff = function(a) {
- return this.filter(function(i) {return a.indexOf(i) < 0;});
- };
- let diffSet = this.resourceList.diff(resourceIdArr);
+ Array.prototype.diff = function (a) {
+ return this.filter(function (i) { return a.indexOf(i) < 0 })
+ }
+ let diffSet = this.resourceList.diff(resourceIdArr)
let optionsCmp = []
- if(diffSet.length>0) {
- diffSet.forEach(item=>{
- backResource.forEach(item1=>{
- if(item==item1.id || item==item1.res) {
+ if (diffSet.length > 0) {
+ diffSet.forEach(item => {
+ backResource.forEach(item1 => {
+ if (item === item1.id || item === item1.res) {
optionsCmp.push(item1)
}
})
@@ -397,22 +406,22 @@
let noResources = [{
id: -1,
name: $t('Unauthorized or deleted resources'),
- fullName: '/'+$t('Unauthorized or deleted resources'),
+ fullName: '/' + $t('Unauthorized or deleted resources'),
children: []
}]
- if(optionsCmp.length>0) {
+ if (optionsCmp.length > 0) {
this.allNoResources = optionsCmp
- optionsCmp = optionsCmp.map(item=>{
- return {id: item.id,name: item.name,fullName: item.res}
+ optionsCmp = optionsCmp.map(item => {
+ return { id: item.id, name: item.name, fullName: item.res }
})
- optionsCmp.forEach(item=>{
+ optionsCmp.forEach(item => {
item.isNew = true
})
noResources[0].children = optionsCmp
this.mainJarList = this.mainJarList.concat(noResources)
}
}
- },
+ }
},
watch: {
// Listening type
@@ -421,49 +430,55 @@
this.mainClass = ''
}
},
- //Watch the cacheParams
+ // Watch the cacheParams
cacheParams (val) {
- this.$emit('on-cache-params', val);
- }
- },
- computed: {
- cacheParams () {
- let isResourceId = []
- let resourceIdArr = []
- if(this.resourceList.length>0) {
- this.resourceList.forEach(v=>{
- this.mainJarList.forEach(v1=>{
- if(this.searchTree(v1,v)) {
- isResourceId.push(this.searchTree(v1,v))
- }
- })
- })
- resourceIdArr = isResourceId.map(item=>{
- return {id: item.id,name: item.name,res: item.fullName}
- })
- }
+ this.$emit('on-cache-params', val)
+ },
+ resourceIdArr (arr) {
let result = []
- resourceIdArr.forEach(item=>{
- this.allNoResources.forEach(item1=>{
- if(item.id==item1.id) {
+ arr.forEach(item => {
+ this.allNoResources.forEach(item1 => {
+ if (item.id === item1.id) {
// resultBool = true
- result.push(item1)
+ result.push(item1)
}
})
})
this.noRes = result
+ }
+ },
+ computed: {
+ resourceIdArr () {
+ let isResourceId = []
+ let resourceIdArr = []
+ if (this.resourceList.length > 0) {
+ this.resourceList.forEach(v => {
+ this.mainJarList.forEach(v1 => {
+ if (this.searchTree(v1, v)) {
+ isResourceId.push(this.searchTree(v1, v))
+ }
+ })
+ })
+ resourceIdArr = isResourceId.map(item => {
+ return { id: item.id, name: item.name, res: item.fullName }
+ })
+ }
+ return resourceIdArr
+ },
+ cacheParams () {
return {
mainClass: this.mainClass,
mainJar: {
id: this.mainJar
},
deployMode: this.deployMode,
- resourceList: resourceIdArr,
+ resourceList: this.resourceIdArr,
localParams: this.localParams,
slot: this.slot,
taskManager: this.taskManager,
jobManagerMemory: this.jobManagerMemory,
taskManagerMemory: this.taskManagerMemory,
+ appName: this.appName,
mainArgs: this.mainArgs,
others: this.others,
programType: this.programType
@@ -471,104 +486,68 @@
}
},
created () {
- let item = this.store.state.dag.resourcesListS
- let items = this.store.state.dag.resourcesListJar
- this.diGuiTree(item)
- this.diGuiTree(items)
- this.mainJarList = item
- this.mainJarLists = items
- let o = this.backfillItem
- // Non-null objects represent backfill
- if (!_.isEmpty(o)) {
- this.mainClass = o.params.mainClass || ''
- if(o.params.mainJar.res) {
- this.marjarId(o.params.mainJar.res)
- } else if(o.params.mainJar.res=='') {
- this.mainJar = ''
- } else {
- this.mainJar = o.params.mainJar.id || ''
- }
- this.deployMode = o.params.deployMode || ''
- this.flinkVersion = o.params.flinkVersion || '<1.10'
- this.slot = o.params.slot || 1
- this.taskManager = o.params.taskManager || '2'
- this.jobManagerMemory = o.params.jobManagerMemory || '1G'
- this.taskManagerMemory = o.params.taskManagerMemory || '2G'
-
-
- this.mainArgs = o.params.mainArgs || ''
- this.others = o.params.others
- this.programType = o.params.programType || 'SCALA'
-
- // backfill resourceList
- let backResource = o.params.resourceList || []
- let resourceList = o.params.resourceList || []
- if (resourceList.length) {
- _.map(resourceList, v => {
- if(!v.id) {
- this.store.dispatch('dag/getResourceId',{
- type: 'FILE',
- fullName: '/'+v.res
- }).then(res => {
- this.resourceList.push(res.id)
- this.dataProcess(backResource)
- }).catch(e => {
- this.resourceList.push(v.res)
- this.dataProcess(backResource)
- })
- } else {
- this.resourceList.push(v.id)
- this.dataProcess(backResource)
- }
- })
- this.cacheResourceList = resourceList
- }
-
- // backfill localParams
- let localParams = o.params.localParams || []
- if (localParams.length) {
- this.localParams = localParams
- }
+ let item = this.store.state.dag.resourcesListS
+ let items = this.store.state.dag.resourcesListJar
+ this.diGuiTree(item)
+ this.diGuiTree(items)
+ this.mainJarList = item
+ this.mainJarLists = items
+ let o = this.backfillItem
+ // Non-null objects represent backfill
+ if (!_.isEmpty(o)) {
+ this.mainClass = o.params.mainClass || ''
+ if (o.params.mainJar.res) {
+ this.marjarId(o.params.mainJar.res)
+ } else if (o.params.mainJar.res === '') {
+ this.mainJar = ''
+ } else {
+ this.mainJar = o.params.mainJar.id || ''
}
+ this.deployMode = o.params.deployMode || ''
+ this.flinkVersion = o.params.flinkVersion || '<1.10'
+ this.slot = o.params.slot || 1
+ this.taskManager = o.params.taskManager || '2'
+ this.jobManagerMemory = o.params.jobManagerMemory || '1G'
+ this.taskManagerMemory = o.params.taskManagerMemory || '2G'
+ this.appName = o.params.appName || ''
+ this.mainArgs = o.params.mainArgs || ''
+ this.others = o.params.others
+ this.programType = o.params.programType || 'SCALA'
+
+ // backfill resourceList
+ let backResource = o.params.resourceList || []
+ let resourceList = o.params.resourceList || []
+ if (resourceList.length) {
+ _.map(resourceList, v => {
+ if (!v.id) {
+ this.store.dispatch('dag/getResourceId', {
+ type: 'FILE',
+ fullName: '/' + v.res
+ }).then(res => {
+ this.resourceList.push(res.id)
+ this.dataProcess(backResource)
+ }).catch(e => {
+ this.resourceList.push(v.res)
+ this.dataProcess(backResource)
+ })
+ } else {
+ this.resourceList.push(v.id)
+ this.dataProcess(backResource)
+ }
+ })
+ this.cacheResourceList = resourceList
+ }
+
+ // backfill localParams
+ let localParams = o.params.localParams || []
+ if (localParams.length) {
+ this.localParams = localParams
+ }
+ }
},
mounted () {
},
- components: { mLocalParams, mListBox, mResources, Treeselect }
+ components: { mLocalParams, mListBox, mList4Box, Treeselect }
}
-
-
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/http.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/http.vue
index 425cb2eb35..bbd5e535ea 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/http.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/http.vue
@@ -19,30 +19,32 @@
{{$t('Http Url')}}
-
-
+
{{$t('Http Method')}}
-
-
-
-
+
+
@@ -59,43 +61,40 @@
{{$t('Http Check Condition')}}
-
-
-
-
+
+
{{$t('Http Condition')}}
-
-
+ :placeholder="$t('Please Enter Http Condition')">
+
-
{{$t('Timeout Settings')}}
@@ -107,12 +106,12 @@
-
+
{{$t('ms')}}
{{$t('Socket Timeout')}}
-
+
{{$t('ms')}}
@@ -144,8 +143,8 @@
data () {
return {
timeoutSettings: false,
- connectTimeout : 60000 ,
- socketTimeout : 60000 ,
+ connectTimeout: 60000,
+ socketTimeout: 60000,
url: '',
condition: '',
@@ -154,7 +153,7 @@
httpMethod: 'GET',
httpMethodList: [{ code: 'GET' }, { code: 'POST' }, { code: 'HEAD' }, { code: 'PUT' }, { code: 'DELETE' }],
httpCheckCondition: 'STATUS_CODE_DEFAULT',
- httpCheckConditionList: cookies.get('language') == 'en_US'? [{ code: 'STATUS_CODE_DEFAULT',value:'Default response code 200' }, { code: 'STATUS_CODE_CUSTOM',value:'Custom response code' }, { code: 'BODY_CONTAINS',value:'Content includes' }, { code: 'BODY_NOT_CONTAINS',value:'Content does not contain' }]:[{ code: 'STATUS_CODE_DEFAULT',value:'默认响应码200' }, { code: 'STATUS_CODE_CUSTOM',value:'自定义响应码' }, { code: 'BODY_CONTAINS',value:'内容包含' }, { code: 'BODY_NOT_CONTAINS',value:'内容不包含' }]
+ httpCheckConditionList: cookies.get('language') === 'en_US' ? [{ code: 'STATUS_CODE_DEFAULT', value: 'Default response code 200' }, { code: 'STATUS_CODE_CUSTOM', value: 'Custom response code' }, { code: 'BODY_CONTAINS', value: 'Content includes' }, { code: 'BODY_NOT_CONTAINS', value: 'Content does not contain' }] : [{ code: 'STATUS_CODE_DEFAULT', value: '默认响应码200' }, { code: 'STATUS_CODE_CUSTOM', value: '自定义响应码' }, { code: 'BODY_CONTAINS', value: '内容包含' }, { code: 'BODY_NOT_CONTAINS', value: '内容不包含' }]
}
},
props: {
@@ -205,8 +204,8 @@
httpMethod: this.httpMethod,
httpCheckCondition: this.httpCheckCondition,
condition: this.condition,
- connectTimeout : this.connectTimeout ,
- socketTimeout : this.socketTimeout
+ connectTimeout: this.connectTimeout,
+ socketTimeout: this.socketTimeout
})
return true
}
@@ -220,8 +219,8 @@
httpMethod: this.httpMethod,
httpCheckCondition: this.httpCheckCondition,
condition: this.condition,
- connectTimeout : this.connectTimeout ,
- socketTimeout : this.socketTimeout
+ connectTimeout: this.connectTimeout,
+ socketTimeout: this.socketTimeout
}
}
},
@@ -231,32 +230,32 @@
* @param val
*/
cacheParams (val) {
- this.$emit('on-cache-params', val);
+ this.$emit('on-cache-params', val)
}
},
created () {
- let o = this.backfillItem
- // Non-null objects represent backfill
- if (!_.isEmpty(o)) {
- this.url = o.params.url || ''
- this.httpMethod = o.params.httpMethod || 'GET'
- this.httpCheckCondition = o.params.httpCheckCondition || 'DEFAULT'
- this.condition = o.params.condition || ''
- this.connectTimeout = o.params.connectTimeout
- this.socketTimeout = o.params.socketTimeout
- if(this.connectTimeout != 60000 || this.socketTimeout != 60000 ){
- this.timeoutSettings = true
- }
- // backfill localParams
- let localParams = o.params.localParams || []
- if (localParams.length) {
- this.localParams = localParams
- }
- let httpParams = o.params.httpParams || []
- if (httpParams.length) {
- this.httpParams = httpParams
- }
+ let o = this.backfillItem
+ // Non-null objects represent backfill
+ if (!_.isEmpty(o)) {
+ this.url = o.params.url || ''
+ this.httpMethod = o.params.httpMethod || 'GET'
+ this.httpCheckCondition = o.params.httpCheckCondition || 'DEFAULT'
+ this.condition = o.params.condition || ''
+ this.connectTimeout = o.params.connectTimeout
+ this.socketTimeout = o.params.socketTimeout
+ if (this.connectTimeout !== 60000 || this.socketTimeout !== 60000) {
+ this.timeoutSettings = true
}
+ // backfill localParams
+ let localParams = o.params.localParams || []
+ if (localParams.length) {
+ this.localParams = localParams
+ }
+ let httpParams = o.params.httpParams || []
+ if (httpParams.length) {
+ this.httpParams = httpParams
+ }
+ }
},
mounted () {
},
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
index a53501d2b5..356eefd65a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue
@@ -19,26 +19,26 @@
{{$t('Program Type')}}
-
-
+
-
-
+
+
{{$t('Main class')}}
-
-
+ :placeholder="$t('Please enter main class')">
+
@@ -52,27 +52,27 @@
{{$t('Command-line parameters')}}
-
-
+ :placeholder="$t('Please enter Command-line parameters')">
+
{{$t('Other parameters')}}
-
-
+ :placeholder="$t('Please enter other parameters')">
+
@@ -100,7 +100,6 @@
import _ from 'lodash'
import i18n from '@/module/i18n'
import mListBox from './_source/listBox'
- import mResources from './_source/resources'
import mLocalParams from './_source/localParams'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
@@ -131,7 +130,7 @@
programType: 'JAVA',
// Program type(List)
programTypeList: [{ code: 'JAVA' }, { code: 'PYTHON' }],
- normalizer(node) {
+ normalizer (node) {
return {
label: node.name
}
@@ -148,10 +147,10 @@
/**
* getResourceId
*/
- marjarId(name) {
- this.store.dispatch('dag/getResourceId',{
+ marjarId (name) {
+ this.store.dispatch('dag/getResourceId', {
type: 'FILE',
- fullName: '/'+name
+ fullName: '/' + name
}).then(res => {
this.mainJar = res.id
}).catch(e => {
@@ -176,55 +175,55 @@
_onCacheResourcesData (a) {
this.cacheResourceList = a
},
- diGuiTree(item) { // Recursive convenience tree structure
+ diGuiTree (item) { // Recursive convenience tree structure
item.forEach(item => {
- item.children === '' || item.children === undefined || item.children === null || item.children.length === 0?
- this.operationTree(item) : this.diGuiTree(item.children);
+ item.children === '' || item.children === undefined || item.children === null || item.children.length === 0
+ ? this.operationTree(item) : this.diGuiTree(item.children)
})
},
- operationTree(item) {
- if(item.dirctory) {
- item.isDisabled =true
+ operationTree (item) {
+ if (item.dirctory) {
+ item.isDisabled = true
}
delete item.children
},
- searchTree(element, id) {
+ searchTree (element, id) {
// 根据id查找节点
- if (element.id == id) {
- return element;
- } else if (element.children != null) {
- var i;
- var result = null;
- for (i = 0; result == null && i < element.children.length; i++) {
- result = this.searchTree(element.children[i], id);
+ if (element.id === id) {
+ return element
+ } else if (element.children !== null) {
+ let i
+ let result = null
+ for (i = 0; result === null && i < element.children.length; i++) {
+ result = this.searchTree(element.children[i], id)
}
- return result;
+ return result
}
- return null;
+ return null
},
- dataProcess(backResource) {
+ dataProcess (backResource) {
let isResourceId = []
let resourceIdArr = []
- if(this.resourceList.length>0) {
- this.resourceList.forEach(v=>{
- this.mainJarList.forEach(v1=>{
- if(this.searchTree(v1,v)) {
- isResourceId.push(this.searchTree(v1,v))
+ if (this.resourceList.length > 0) {
+ this.resourceList.forEach(v => {
+ this.mainJarList.forEach(v1 => {
+ if (this.searchTree(v1, v)) {
+ isResourceId.push(this.searchTree(v1, v))
}
})
})
- resourceIdArr = isResourceId.map(item=>{
+ resourceIdArr = isResourceId.map(item => {
return item.id
})
- Array.prototype.diff = function(a) {
- return this.filter(function(i) {return a.indexOf(i) < 0;});
- };
- let diffSet = this.resourceList.diff(resourceIdArr);
+ Array.prototype.diff = function (a) {
+ return this.filter(function (i) { return a.indexOf(i) < 0 })
+ }
+ let diffSet = this.resourceList.diff(resourceIdArr)
let optionsCmp = []
- if(diffSet.length>0) {
- diffSet.forEach(item=>{
- backResource.forEach(item1=>{
- if(item==item1.id || item==item1.res) {
+ if (diffSet.length > 0) {
+ diffSet.forEach(item => {
+ backResource.forEach(item1 => {
+ if (item === item1.id || item === item1.res) {
optionsCmp.push(item1)
}
})
@@ -233,15 +232,15 @@
let noResources = [{
id: -1,
name: $t('Unauthorized or deleted resources'),
- fullName: '/'+$t('Unauthorized or deleted resources'),
+ fullName: '/' + $t('Unauthorized or deleted resources'),
children: []
}]
- if(optionsCmp.length>0) {
+ if (optionsCmp.length > 0) {
this.allNoResources = optionsCmp
- optionsCmp = optionsCmp.map(item=>{
- return {id: item.id,name: item.name,fullName: item.res}
+ optionsCmp = optionsCmp.map(item => {
+ return { id: item.id, name: item.name, fullName: item.res }
})
- optionsCmp.forEach(item=>{
+ optionsCmp.forEach(item => {
item.isNew = true
})
noResources[0].children = optionsCmp
@@ -264,7 +263,7 @@
}
// noRes
- if (this.noRes.length>0) {
+ if (this.noRes.length > 0) {
this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
return false
}
@@ -280,7 +279,7 @@
id: this.mainJar
},
resourceList: _.map(this.resourceList, v => {
- return {id: v}
+ return { id: v }
}),
localParams: this.localParams,
mainArgs: this.mainArgs,
@@ -288,8 +287,8 @@
programType: this.programType
})
return true
- },
-
+ }
+
},
watch: {
/**
@@ -300,43 +299,48 @@
this.mainClass = ''
}
},
- //Watch the cacheParams
+ // Watch the cacheParams
cacheParams (val) {
- this.$emit('on-cache-params', val);
- }
- },
- computed: {
- cacheParams () {
- let isResourceId = []
- let resourceIdArr = []
- if(this.resourceList.length>0) {
- this.resourceList.forEach(v=>{
- this.mainJarList.forEach(v1=>{
- if(this.searchTree(v1,v)) {
- isResourceId.push(this.searchTree(v1,v))
- }
- })
- })
- resourceIdArr = isResourceId.map(item=>{
- return {id: item.id,name: item.name,res: item.fullName}
- })
- }
+ this.$emit('on-cache-params', val)
+ },
+ resourceIdArr (arr) {
let result = []
- resourceIdArr.forEach(item=>{
- this.allNoResources.forEach(item1=>{
- if(item.id==item1.id) {
+ arr.forEach(item => {
+ this.allNoResources.forEach(item1 => {
+ if (item.id === item1.id) {
// resultBool = true
- result.push(item1)
+ result.push(item1)
}
})
})
this.noRes = result
+ }
+ },
+ computed: {
+ resourceIdArr () {
+ let isResourceId = []
+ let resourceIdArr = []
+ if (this.resourceList.length > 0) {
+ this.resourceList.forEach(v => {
+ this.mainJarList.forEach(v1 => {
+ if (this.searchTree(v1, v)) {
+ isResourceId.push(this.searchTree(v1, v))
+ }
+ })
+ })
+ resourceIdArr = isResourceId.map(item => {
+ return { id: item.id, name: item.name, res: item.fullName }
+ })
+ }
+ return resourceIdArr
+ },
+ cacheParams () {
return {
mainClass: this.mainClass,
mainJar: {
id: this.mainJar
},
- resourceList: resourceIdArr,
+ resourceList: this.resourceIdArr,
localParams: this.localParams,
mainArgs: this.mainArgs,
others: this.others,
@@ -345,94 +349,62 @@
}
},
created () {
- let item = this.store.state.dag.resourcesListS
- let items = this.store.state.dag.resourcesListJar
- this.diGuiTree(item)
- this.diGuiTree(items)
- this.mainJarList = item
- this.mainJarLists = items
- let o = this.backfillItem
+ let item = this.store.state.dag.resourcesListS
+ let items = this.store.state.dag.resourcesListJar
+ this.diGuiTree(item)
+ this.diGuiTree(items)
+ this.mainJarList = item
+ this.mainJarLists = items
+ let o = this.backfillItem
- // Non-null objects represent backfill
- if (!_.isEmpty(o)) {
- this.mainClass = o.params.mainClass || ''
- if(o.params.mainJar.res) {
- this.marjarId(o.params.mainJar.res)
- } else if(o.params.mainJar.res=='') {
- this.mainJar = ''
- } else {
- this.mainJar = o.params.mainJar.id || ''
- }
- this.mainArgs = o.params.mainArgs || ''
- this.others = o.params.others
- this.programType = o.params.programType || 'JAVA'
-
- // backfill resourceList
- let resourceList = o.params.resourceList || []
- if (resourceList.length) {
- _.map(resourceList, v => {
- if(!v.id) {
- this.store.dispatch('dag/getResourceId',{
- type: 'FILE',
- fullName: '/'+v.res
- }).then(res => {
- this.resourceList.push(res.id)
- this.dataProcess(backResource)
- }).catch(e => {
- this.resourceList.push(v.res)
- this.dataProcess(backResource)
- })
- } else {
- this.resourceList.push(v.id)
- this.dataProcess(backResource)
- }
- })
- this.cacheResourceList = resourceList
- }
-
- // backfill localParams
- let backResource = o.params.resourceList || []
- let localParams = o.params.localParams || []
- if (localParams.length) {
- this.localParams = localParams
- }
+ // Non-null objects represent backfill
+ if (!_.isEmpty(o)) {
+ this.mainClass = o.params.mainClass || ''
+ if (o.params.mainJar.res) {
+ this.marjarId(o.params.mainJar.res)
+ } else if (o.params.mainJar.res === '') {
+ this.mainJar = ''
+ } else {
+ this.mainJar = o.params.mainJar.id || ''
}
+ this.mainArgs = o.params.mainArgs || ''
+ this.others = o.params.others
+ this.programType = o.params.programType || 'JAVA'
+
+ // backfill resourceList
+ let resourceList = o.params.resourceList || []
+ if (resourceList.length) {
+ _.map(resourceList, v => {
+ if (!v.id) {
+ this.store.dispatch('dag/getResourceId', {
+ type: 'FILE',
+ fullName: '/' + v.res
+ }).then(res => {
+ this.resourceList.push(res.id)
+ this.dataProcess(backResource)
+ }).catch(e => {
+ this.resourceList.push(v.res)
+ this.dataProcess(backResource)
+ })
+ } else {
+ this.resourceList.push(v.id)
+ this.dataProcess(backResource)
+ }
+ })
+ this.cacheResourceList = resourceList
+ }
+
+ // backfill localParams
+ let backResource = o.params.resourceList || []
+ let localParams = o.params.localParams || []
+ if (localParams.length) {
+ this.localParams = localParams
+ }
+ }
},
mounted () {
},
- components: { mLocalParams, mListBox, mResources, Treeselect }
+ components: { mLocalParams, mListBox, Treeselect }
}
-
-
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pre_tasks.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pre_tasks.vue
index adf889e958..c922f98943 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pre_tasks.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/pre_tasks.vue
@@ -22,21 +22,22 @@
@@ -52,15 +53,15 @@
},
data () {
return {
- preTasksSelectorId: '_preTasksSelectorId', // Refresh target vue-component by changing id
+ preTasksSelectorId: '_preTasksSelectorId', // Refresh target vue-component by changing id
preTasks: [],
- preTasksOld: [],
+ preTasksOld: []
}
},
mounted () {
- this.preTasks = this.backfillItem['preTasks'] || this.preTasks
+ this.preTasks = this.backfillItem.preTasks || this.preTasks
this.preTasksOld = this.preTasks
-
+
// Refresh target vue-component by changing id
this.$nextTick(() => {
this.preTasksSelectorId = 'preTasksSelectorId'
@@ -68,7 +69,7 @@
},
computed: {
preTaskList: function () {
- let currentTaskId = this.backfillItem['id'] || this.id
+ let currentTaskId = this.backfillItem.id || this.id
let cacheTasks = Object.assign({}, this.store.state.dag.tasks)
let keys = Object.keys(cacheTasks)
for (let i = 0; i < keys.length; i++) {
@@ -91,7 +92,7 @@
// preTaskIds used to delete connection
preTasksToDelete: function () {
return this.preTasksOld.filter(taskId => this.preTasks.indexOf(taskId) === -1)
- },
+ }
},
methods: {
// Pass data to parent-level to process dag
@@ -99,7 +100,7 @@
this.$emit('on-pre-tasks', {
preTasks: this.preTasks,
preTasksToAdd: this.preTasksToAdd,
- preTasksToDelete: this.preTasksToDelete,
+ preTasksToDelete: this.preTasksToDelete
})
return true
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue
index e84f37d7a9..790977dd5b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/procedure.vue
@@ -30,13 +30,13 @@
{{$t('methods')}}
-
-
+
+
@@ -122,9 +122,9 @@
}
},
watch: {
- //Watch the cacheParams
+ // Watch the cacheParams
cacheParams (val) {
- this.$emit('on-cache-params', val);
+ this.$emit('on-cache-params', val)
}
},
computed: {
@@ -162,6 +162,3 @@
components: { mListBox, mDatasource, mLocalParams }
}
-
-
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
index c6c2a22a62..8c1eee0608 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue
@@ -23,7 +23,7 @@
-
+
@@ -34,12 +34,6 @@
{{ node.raw.fullName }}
-
@@ -54,6 +48,12 @@
+
+
+
-
\ No newline at end of file
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
index da94162989..55b9aca071 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue
@@ -26,7 +26,7 @@
style="opacity: 0">
-
+
@@ -39,17 +39,6 @@
-
{{$t('Custom Parameters')}}
@@ -61,6 +50,12 @@
+
+
+
-
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
index 0948c9735f..efeb7e9e36 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue
@@ -19,45 +19,47 @@
{{$t('Program Type')}}
-
-
-
-
+
+
{{$t('Spark Version')}}
-
-
-
-
+
+
{{$t('Main class')}}
-
-
+
+
@@ -71,99 +73,93 @@
{{$t('Deploy Mode')}}
-
-
-
-
-
+
+
+
+
+
-
-
-
{{$t('Driver core number')}}
-
-
-
-
-
{{$t('Driver memory use')}}
-
-
-
-
+
+ {{$t('Driver cores')}}
+
+
+
-
-
{{$t('Number of Executors')}}
-
-
-
-
-
{{$t('Executor memory')}}
-
-
-
-
+
{{$t('Driver memory')}}
+
+
+
-
-
{{$t('Executor core number')}}
-
-
-
-
+
+
+ {{$t('Executor Number')}}
+
+
+
-
+
{{$t('Executor memory')}}
+
+
+
+
+
+
+ {{$t('Executor cores')}}
+
+
+
+
+
{{$t('Command-line parameters')}}
-
-
+
+
{{$t('Other parameters')}}
-
-
+
+
@@ -174,17 +170,6 @@
-
{{$t('Custom Parameters')}}
@@ -203,7 +188,7 @@
import i18n from '@/module/i18n'
import mLocalParams from './_source/localParams'
import mListBox from './_source/listBox'
- import mResources from './_source/resources'
+ import mList4Box from './_source/list4Box'
import Treeselect from '@riophae/vue-treeselect'
import '@riophae/vue-treeselect/dist/vue-treeselect.css'
import disabledState from '@/module/mixin/disabledState'
@@ -250,7 +235,7 @@
sparkVersion: 'SPARK2',
// Spark version(LIst)
sparkVersionList: [{ code: 'SPARK2' }, { code: 'SPARK1' }],
- normalizer(node) {
+ normalizer (node) {
return {
label: node.name
}
@@ -267,10 +252,10 @@
/**
* getResourceId
*/
- marjarId(name) {
- this.store.dispatch('dag/getResourceId',{
+ marjarId (name) {
+ this.store.dispatch('dag/getResourceId', {
type: 'FILE',
- fullName: '/'+name
+ fullName: '/' + name
}).then(res => {
this.mainJar = res.id
}).catch(e => {
@@ -295,55 +280,55 @@
_onCacheResourcesData (a) {
this.cacheResourceList = a
},
- diGuiTree(item) { // Recursive convenience tree structure
+ diGuiTree (item) { // Recursive convenience tree structure
item.forEach(item => {
- item.children === '' || item.children === undefined || item.children === null || item.children.length === 0?
- this.operationTree(item) : this.diGuiTree(item.children);
+ item.children === '' || item.children === undefined || item.children === null || item.children.length === 0
+ ? this.operationTree(item) : this.diGuiTree(item.children)
})
},
- operationTree(item) {
- if(item.dirctory) {
- item.isDisabled =true
+ operationTree (item) {
+ if (item.dirctory) {
+ item.isDisabled = true
}
delete item.children
},
- searchTree(element, id) {
+ searchTree (element, id) {
// 根据id查找节点
- if (element.id == id) {
- return element;
- } else if (element.children != null) {
- var i;
- var result = null;
- for (i = 0; result == null && i < element.children.length; i++) {
- result = this.searchTree(element.children[i], id);
+ if (element.id === id) {
+ return element
+ } else if (element.children !== null) {
+ let i
+ let result = null
+ for (i = 0; result === null && i < element.children.length; i++) {
+ result = this.searchTree(element.children[i], id)
}
- return result;
+ return result
}
- return null;
+ return null
},
- dataProcess(backResource) {
+ dataProcess (backResource) {
let isResourceId = []
let resourceIdArr = []
- if(this.resourceList.length>0) {
- this.resourceList.forEach(v=>{
- this.mainJarList.forEach(v1=>{
- if(this.searchTree(v1,v)) {
- isResourceId.push(this.searchTree(v1,v))
+ if (this.resourceList.length > 0) {
+ this.resourceList.forEach(v => {
+ this.mainJarList.forEach(v1 => {
+ if (this.searchTree(v1, v)) {
+ isResourceId.push(this.searchTree(v1, v))
}
})
})
- resourceIdArr = isResourceId.map(item=>{
+ resourceIdArr = isResourceId.map(item => {
return item.id
})
- Array.prototype.diff = function(a) {
- return this.filter(function(i) {return a.indexOf(i) < 0;});
- };
- let diffSet = this.resourceList.diff(resourceIdArr);
+ Array.prototype.diff = function (a) {
+ return this.filter(function (i) { return a.indexOf(i) < 0 })
+ }
+ let diffSet = this.resourceList.diff(resourceIdArr)
let optionsCmp = []
- if(diffSet.length>0) {
- diffSet.forEach(item=>{
- backResource.forEach(item1=>{
- if(item==item1.id || item==item1.res) {
+ if (diffSet.length > 0) {
+ diffSet.forEach(item => {
+ backResource.forEach(item1 => {
+ if (item === item1.id || item === item1.res) {
optionsCmp.push(item1)
}
})
@@ -352,15 +337,15 @@
let noResources = [{
id: -1,
name: $t('Unauthorized or deleted resources'),
- fullName: '/'+$t('Unauthorized or deleted resources'),
+ fullName: '/' + $t('Unauthorized or deleted resources'),
children: []
}]
- if(optionsCmp.length>0) {
+ if (optionsCmp.length > 0) {
this.allNoResources = optionsCmp
- optionsCmp = optionsCmp.map(item=>{
- return {id: item.id,name: item.name,fullName: item.res}
+ optionsCmp = optionsCmp.map(item => {
+ return { id: item.id, name: item.name, fullName: item.res }
})
- optionsCmp.forEach(item=>{
+ optionsCmp.forEach(item => {
item.isNew = true
})
noResources[0].children = optionsCmp
@@ -383,28 +368,28 @@
}
if (!this.numExecutors) {
- this.$message.warning(`${i18n.$t('Please enter the number of Executor')}`)
+ this.$message.warning(`${i18n.$t('Please enter Executor number')}`)
return false
}
// noRes
- if (this.noRes.length>0) {
+ if (this.noRes.length > 0) {
this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`)
return false
}
if (!Number.isInteger(parseInt(this.numExecutors))) {
- this.$message.warning(`${i18n.$t('The number of Executors should be a positive integer')}`)
+ this.$message.warning(`${i18n.$t('The Executor Number should be a positive integer')}`)
return false
}
if (!this.executorMemory) {
- this.$message.warning(`${i18n.$t('Please enter the Executor memory')}`)
+ this.$message.warning(`${i18n.$t('Please enter Executor memory')}`)
return false
}
if (!this.executorMemory) {
- this.$message.warning(`${i18n.$t('Please enter the Executor memory')}`)
+ this.$message.warning(`${i18n.$t('Please enter Executor memory')}`)
return false
}
@@ -414,7 +399,7 @@
}
if (!this.executorCores) {
- this.$message.warning(`${i18n.$t('Please enter ExecutorPlease enter Executor core number')}`)
+ this.$message.warning(`${i18n.$t('Please enter Executor cores')}`)
return false
}
@@ -427,7 +412,7 @@
return false
}
// Process resourcelist
- let dataProcessing= _.map(this.resourceList, v => {
+ let dataProcessing = _.map(this.resourceList, v => {
return {
id: v
}
@@ -462,44 +447,49 @@
this.mainClass = ''
}
},
- //Watch the cacheParams
+ // Watch the cacheParams
cacheParams (val) {
this.$emit('on-cache-params', val)
- }
- },
- computed: {
- cacheParams () {
- let isResourceId = []
- let resourceIdArr = []
- if(this.resourceList.length>0) {
- this.resourceList.forEach(v=>{
- this.mainJarList.forEach(v1=>{
- if(this.searchTree(v1,v)) {
- isResourceId.push(this.searchTree(v1,v))
- }
- })
- })
- resourceIdArr = isResourceId.map(item=>{
- return {id: item.id,name: item.name,res: item.fullName}
- })
- }
+ },
+ resourceIdArr (arr) {
let result = []
- resourceIdArr.forEach(item=>{
- this.allNoResources.forEach(item1=>{
- if(item.id==item1.id) {
+ arr.forEach(item => {
+ this.allNoResources.forEach(item1 => {
+ if (item.id === item1.id) {
// resultBool = true
- result.push(item1)
+ result.push(item1)
}
})
})
this.noRes = result
+ }
+ },
+ computed: {
+ resourceIdArr () {
+ let isResourceId = []
+ let resourceIdArr = []
+ if (this.resourceList.length > 0) {
+ this.resourceList.forEach(v => {
+ this.mainJarList.forEach(v1 => {
+ if (this.searchTree(v1, v)) {
+ isResourceId.push(this.searchTree(v1, v))
+ }
+ })
+ })
+ resourceIdArr = isResourceId.map(item => {
+ return { id: item.id, name: item.name, res: item.fullName }
+ })
+ }
+ return resourceIdArr
+ },
+ cacheParams () {
return {
mainClass: this.mainClass,
mainJar: {
id: this.mainJar
},
deployMode: this.deployMode,
- resourceList: resourceIdArr,
+ resourceList: this.resourceIdArr,
localParams: this.localParams,
driverCores: this.driverCores,
driverMemory: this.driverMemory,
@@ -514,104 +504,69 @@
}
},
created () {
- let item = this.store.state.dag.resourcesListS
- let items = this.store.state.dag.resourcesListJar
- this.diGuiTree(item)
- this.diGuiTree(items)
- this.mainJarList = item
- this.mainJarLists = items
- let o = this.backfillItem
+ let item = this.store.state.dag.resourcesListS
+ let items = this.store.state.dag.resourcesListJar
+ this.diGuiTree(item)
+ this.diGuiTree(items)
+ this.mainJarList = item
+ this.mainJarLists = items
+ let o = this.backfillItem
- // Non-null objects represent backfill
- if (!_.isEmpty(o)) {
- this.mainClass = o.params.mainClass || ''
- if(o.params.mainJar.res) {
- this.marjarId(o.params.mainJar.res)
- } else if(o.params.mainJar.res=='') {
- this.mainJar = ''
- } else {
- this.mainJar = o.params.mainJar.id || ''
- }
- this.deployMode = o.params.deployMode || ''
- this.driverCores = o.params.driverCores || 1
- this.driverMemory = o.params.driverMemory || '512M'
- this.numExecutors = o.params.numExecutors || 2
- this.executorMemory = o.params.executorMemory || '2G'
- this.executorCores = o.params.executorCores || 2
- this.mainArgs = o.params.mainArgs || ''
- this.others = o.params.others
- this.programType = o.params.programType || 'SCALA'
- this.sparkVersion = o.params.sparkVersion || 'SPARK2'
-
- // backfill resourceList
- let backResource = o.params.resourceList || []
- let resourceList = o.params.resourceList || []
- if (resourceList.length) {
- _.map(resourceList, v => {
- if(!v.id) {
- this.store.dispatch('dag/getResourceId',{
- type: 'FILE',
- fullName: '/'+v.res
- }).then(res => {
- this.resourceList.push(res.id)
- this.dataProcess(backResource)
- }).catch(e => {
- this.resourceList.push(v.res)
- this.dataProcess(backResource)
- })
- } else {
- this.resourceList.push(v.id)
- this.dataProcess(backResource)
- }
- })
- this.cacheResourceList = resourceList
- }
-
- // backfill localParams
- let localParams = o.params.localParams || []
- if (localParams.length) {
- this.localParams = localParams
- }
+ // Non-null objects represent backfill
+ if (!_.isEmpty(o)) {
+ this.mainClass = o.params.mainClass || ''
+ if (o.params.mainJar.res) {
+ this.marjarId(o.params.mainJar.res)
+ } else if (o.params.mainJar.res === '') {
+ this.mainJar = ''
+ } else {
+ this.mainJar = o.params.mainJar.id || ''
}
+ this.deployMode = o.params.deployMode || ''
+ this.driverCores = o.params.driverCores || 1
+ this.driverMemory = o.params.driverMemory || '512M'
+ this.numExecutors = o.params.numExecutors || 2
+ this.executorMemory = o.params.executorMemory || '2G'
+ this.executorCores = o.params.executorCores || 2
+ this.mainArgs = o.params.mainArgs || ''
+ this.others = o.params.others
+ this.programType = o.params.programType || 'SCALA'
+ this.sparkVersion = o.params.sparkVersion || 'SPARK2'
+
+ // backfill resourceList
+ let backResource = o.params.resourceList || []
+ let resourceList = o.params.resourceList || []
+ if (resourceList.length) {
+ _.map(resourceList, v => {
+ if (!v.id) {
+ this.store.dispatch('dag/getResourceId', {
+ type: 'FILE',
+ fullName: '/' + v.res
+ }).then(res => {
+ this.resourceList.push(res.id)
+ this.dataProcess(backResource)
+ }).catch(e => {
+ this.resourceList.push(v.res)
+ this.dataProcess(backResource)
+ })
+ } else {
+ this.resourceList.push(v.id)
+ this.dataProcess(backResource)
+ }
+ })
+ this.cacheResourceList = resourceList
+ }
+
+ // backfill localParams
+ let localParams = o.params.localParams || []
+ if (localParams.length) {
+ this.localParams = localParams
+ }
+ }
},
mounted () {
},
- components: { mLocalParams, mListBox, mResources, Treeselect }
+ components: { mLocalParams, mListBox, mList4Box, Treeselect }
}
-
-
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
index 8e892ab247..7e3ae465c8 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue
@@ -35,51 +35,49 @@
:sql-type="sqlType">
-
* {{$t('Title')}}
-
-
+ :placeholder="$t('Please enter the title of email')">
+
-
- * {{$t('AlertGroup')}}
+ * {{$t('Recipient')}}
-
-
+
+
+
+
+ {{$t('Cc')}}
+
+
{{$t('SQL Parameter')}}
-
-
+ :placeholder="$t('Please enter format') + ' key1=value1;key2=value2...'">
+
@@ -92,7 +90,7 @@
style="opacity: 0;">
-
+
@@ -138,6 +136,12 @@
+
+
+
-
-
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
index c852f7f75f..7647e67ab4 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue
@@ -20,23 +20,14 @@
{{$t('Custom Job')}}
-
-
+
{{$t('Custom Script')}}
@@ -44,29 +35,25 @@
{{$t('Sqoop Job Name')}}
-
-
+
{{$t('Direct')}}
-
-
+
-
-
+
+
@@ -100,18 +87,19 @@
{{$t('Type')}}
-
-
+
-
-
+
+
@@ -134,10 +122,10 @@
{{$t('ModelType')}}
-
- {{$t('Form')}}
- SQL
-
+
+ {{$t('Form')}}
+ SQL
+
@@ -146,34 +134,36 @@
{{$t('Table')}}
-
-
+
{{$t('ColumnType')}}
-
- {{$t('All Columns')}}
- {{$t('Some Columns')}}
-
+
+ {{$t('All Columns')}}
+ {{$t('Some Columns')}}
+
{{$t('Column')}}
-
-
+
@@ -184,45 +174,49 @@
{{$t('Database')}}
-
-
+
{{$t('Table')}}
-
-
+
{{$t('Hive partition Keys')}}
-
-
+
{{$t('Hive partition Values')}}
-
-
+
@@ -231,12 +225,13 @@
{{$t('Export Dir')}}
-
-
+
@@ -251,7 +246,7 @@
style="opacity: 0;">
-
+
@@ -290,91 +285,97 @@
{{$t('Type')}}
-
-
-
-
+
+
{{$t('Database')}}
-
-
+
{{$t('Table')}}
-
-
+
{{$t('CreateHiveTable')}}
-
+
{{$t('DropDelimiter')}}
-
+
{{$t('OverWriteSrc')}}
-
+
{{$t('ReplaceDelimiter')}}
-
-
+
{{$t('Hive partition Keys')}}
-
-
+
{{$t('Hive partition Values')}}
-
-
+
@@ -382,62 +383,65 @@
{{$t('Target Dir')}}
-
-
+
{{$t('DeleteTargetDir')}}
-
+
{{$t('CompressionCodec')}}
-
- snappy
- lzo
- gzip
- no
-
+
+ snappy
+ lzo
+ gzip
+ no
+
{{$t('FileType')}}
-
- avro
- sequence
- text
- parquet
-
+
+ avro
+ sequence
+ text
+ parquet
+
{{$t('FieldsTerminated')}}
-
-
+
{{$t('LinesTerminated')}}
-
-
+
@@ -458,71 +462,76 @@
{{$t('Table')}}
-
-
+
{{$t('Column')}}
-
-
+
{{$t('FieldsTerminated')}}
-
-
+
{{$t('LinesTerminated')}}
-
-
+
{{$t('IsUpdate')}}
-
+
{{$t('UpdateKey')}}
-
-
+
{{$t('UpdateMode')}}
-
- {{$t('OnlyUpdate')}}
- {{$t('AllowInsert')}}
-
+
+ {{$t('OnlyUpdate')}}
+ {{$t('AllowInsert')}}
+
@@ -530,13 +539,13 @@
{{$t('Concurrency')}}
-
-
-
+
@@ -551,6 +560,12 @@
+
+
+
-
-
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue
index e96d409c2c..23fe4ceb42 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sub_process.vue
@@ -22,19 +22,20 @@
-
-
-
-
+ @change="_handleWdiChanged">
+
+
+
@@ -77,7 +78,7 @@
* The selected process defines the upper component name padding
*/
_handleWdiChanged (o) {
- this.$emit('on-set-process-name', this._handleName(o.value))
+ this.$emit('on-set-process-name', this._handleName(o))
},
/**
* Return the name according to the process definition id
@@ -96,7 +97,7 @@
created () {
let processListS = _.cloneDeep(this.store.state.dag.processListS)
let id = null
- if(this.router.history.current.name==='projects-instance-details') {
+ if (this.router.history.current.name === 'projects-instance-details') {
id = this.router.history.current.query.id || null
} else {
id = this.router.history.current.params.id || null
@@ -118,7 +119,7 @@
this.wdiCurr = o.params.processDefinitionId
} else {
if (this.processDefinitionList.length) {
- this.wdiCurr = this.processDefinitionList[0]['id']
+ this.wdiCurr = this.processDefinitionList[0].id
this.$emit('on-set-process-name', this._handleName(this.wdiCurr))
}
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/waterdrop.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/waterdrop.vue
index f67ec6dde8..bdf2e337e7 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/waterdrop.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/waterdrop.vue
@@ -17,58 +17,56 @@
-
-
-
{{$t('Deploy Mode')}}
-
-
-
-
-
-
-
-
{{$t('Queue')}}
-
-
-
-
+
+ {{$t('Deploy Mode')}}
+
+
+
+
+
+
-
+
-
-
-
{{$t('Master')}}
-
-
-
+ {{$t('Master')}}
+
+
+
-
-
-
-
-
-
-
+
+
+
-
+
+
+
+ {{$t('Queue')}}
+
+
+
+
+
{{$t('Resources')}}
@@ -92,12 +90,11 @@
+
-
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/index.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/index.js
index c1f77f6876..9f55265e33 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/jumpAffirm/index.js
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
import Vue from 'vue'
-import mAffirm from './jumpAffirm'
import store from '@/conf/home/store'
+import i18n from '@/module/i18n'
import router from '@/conf/home/router'
import { uuid, findComponentDownward } from '@/module/util/'
@@ -81,34 +80,18 @@ Affirm.paramVerification = (name) => {
* Pop-up judgment
*/
Affirm.isPop = (fn) => {
- Vue.$modal.dialog({
- closable: false,
- showMask: true,
- escClose: true,
- className: 'v-modal-custom',
- transitionName: 'opacityp',
- render (h) {
- return h(mAffirm, {
- on: {
- ok () {
- // save
- findComponentDownward($root, 'dag-chart')._save('affirm').then(() => {
- fn()
- Vue.$modal.destroy()
- }).catch(() => {
- fn()
- Vue.$modal.destroy()
- })
- },
- close () {
- fn()
- Vue.$modal.destroy()
- }
- },
- props: {
- }
- })
- }
+ Vue.prototype.$confirm(`${i18n.$t('Whether to save the DAG graph')}`, '', {
+ confirmButtonText: `${i18n.$t('Save')}`,
+ cancelButtonText: `${i18n.$t('Cancel')}`,
+ type: 'warning'
+ }).then(() => {
+ findComponentDownward($root, 'dag-chart')._save('affirm').then(() => {
+ fn()
+ }).catch(() => {
+ fn()
+ })
+ }).catch(() => {
+ fn()
})
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
index 03c3d2dcbf..0037af68b6 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js
@@ -17,7 +17,6 @@
import 'jquery-ui/ui/widgets/draggable'
import 'jquery-ui/ui/widgets/droppable'
import 'jquery-ui/ui/widgets/resizable'
-import Vue from 'vue'
import _ from 'lodash'
import i18n from '@/module/i18n'
import { jsPlumb } from 'jsplumb'
@@ -34,7 +33,6 @@ import {
rtTargetarrArr,
computeScale
} from './util'
-import mStart from '@/conf/home/pages/projects/pages/definition/pages/list/_source/start'
import multiDrag from './multiDrag'
const JSP = function () {
@@ -88,7 +86,7 @@ JSP.prototype.init = function ({ dag, instance, options }) {
if (this.config.isClick) {
this.connectClick(e)
} else {
- findComponentDownward(this.dag.$root, 'dag-chart')._createLineLabel({id: e._jsPlumb.overlays.label.canvas.id, sourceId: e.sourceId, targetId: e.targetId})
+ findComponentDownward(this.dag.$root, 'dag-chart')._createLineLabel({ id: e._jsPlumb.overlays.label.canvas.id, sourceId: e.sourceId, targetId: e.targetId })
}
})
@@ -208,8 +206,8 @@ JSP.prototype.jsonHandle = function ({ largeJson, locations }) {
taskType: v.type,
runFlag: v.runFlag,
nodenumber: locations[v.id].nodenumber,
- successNode: v.conditionResult === undefined? '' : v.conditionResult.successNode[0],
- failedNode: v.conditionResult === undefined? '' : v.conditionResult.failedNode[0]
+ successNode: v.conditionResult === undefined ? '' : v.conditionResult.successNode[0],
+ failedNode: v.conditionResult === undefined ? '' : v.conditionResult.failedNode[0]
}))
// contextmenu event
@@ -280,10 +278,10 @@ JSP.prototype.tasksContextmenu = function (event) {
const isTwo = store.state.dag.isDetails
const html = [
- `
${i18n.$t('Start')} `,
- `
${i18n.$t('Edit')} `,
- `
${i18n.$t('Copy')} `,
- `
${i18n.$t('Delete')} `
+ `
${i18n.$t('Start')} `,
+ `
${i18n.$t('Edit')} `,
+ `
${i18n.$t('Copy')} `,
+ `
${i18n.$t('Delete')} `
]
const operationHtml = () => {
@@ -310,35 +308,7 @@ JSP.prototype.tasksContextmenu = function (event) {
const name = store.state.dag.name
const id = router.history.current.params.id
store.dispatch('dag/getStartCheck', { processDefinitionId: id }).then(res => {
- const modal = Vue.$modal.dialog({
- closable: false,
- showMask: true,
- escClose: true,
- className: 'v-modal-custom',
- transitionName: 'opacityp',
- render (h) {
- return h(mStart, {
- on: {
- onUpdate () {
- modal.remove()
- },
- close () {
- modal.remove()
- }
- },
- props: {
- item: {
- id: id,
- name: name
- },
- startNodeList: $name,
- sourceType: 'contextmenu'
- }
- })
- }
- })
- }).catch(e => {
- Vue.$message.error(e.msg || '')
+ this.dag.startRunning({ id: id, name: name }, $name, 'contextmenu')
})
})
}
@@ -370,7 +340,6 @@ JSP.prototype.tasksDblclick = function (e) {
// Untie event
if (this.config.isDblclick) {
const id = $(e.currentTarget.offsetParent).attr('id')
-
findComponentDownward(this.dag.$root, 'dag-chart')._createNodes({
id: id,
type: $(`#${id}`).attr('data-tasks-type')
@@ -499,7 +468,7 @@ JSP.prototype.removeNodes = function ($id) {
// callback onRemoveNodes event
this.options && this.options.onRemoveNodes && this.options.onRemoveNodes($id)
- let connects = []
+ const connects = []
_.map(this.JspInstance.getConnections(), v => {
connects.push({
endPointSourceId: v.sourceId,
@@ -604,10 +573,10 @@ JSP.prototype.copyNodes = function ($id) {
JSP.prototype.handleEventScreen = function ({ item, is }) {
let screenOpen = true
if (is) {
- item.icon = 'ans-icon-min'
+ item.icon = 'el-icon-minus'
screenOpen = true
} else {
- item.icon = 'ans-icon-max'
+ item.icon = 'el-icon-full-screen'
screenOpen = false
}
const $mainLayoutModel = $('.main-layout-model')
@@ -658,7 +627,7 @@ JSP.prototype.saveStore = function () {
tasks.push(tasksParam)
}
})
- if(store.state.dag.connects.length ===this.JspInstance.getConnections().length) {
+ if (store.state.dag.connects.length === this.JspInstance.getConnections().length) {
_.map(store.state.dag.connects, u => {
connects.push({
endPointSourceId: u.endPointSourceId,
@@ -666,7 +635,7 @@ JSP.prototype.saveStore = function () {
label: u.label
})
})
- } else if(store.state.dag.connects.length>0 && store.state.dag.connects.length < this.JspInstance.getConnections().length) {
+ } else if (store.state.dag.connects.length > 0 && store.state.dag.connects.length < this.JspInstance.getConnections().length) {
_.map(this.JspInstance.getConnections(), v => {
connects.push({
endPointSourceId: v.sourceId,
@@ -676,12 +645,12 @@ JSP.prototype.saveStore = function () {
})
_.map(store.state.dag.connects, u => {
_.map(connects, v => {
- if(u.label && u.endPointSourceId === v.endPointSourceId && u.endPointTargetId===v.endPointTargetId) {
+ if (u.label && u.endPointSourceId === v.endPointSourceId && u.endPointTargetId === v.endPointTargetId) {
v.label = u.label
}
})
})
- } else if(store.state.dag.connects.length===0) {
+ } else if (store.state.dag.connects.length === 0) {
_.map(this.JspInstance.getConnections(), v => {
connects.push({
endPointSourceId: v.sourceId,
@@ -690,7 +659,7 @@ JSP.prototype.saveStore = function () {
})
})
}
-
+
_.map(tasksAll(), v => {
locations[v.id] = {
name: v.name,
@@ -783,7 +752,7 @@ JSP.prototype.jspBackfill = function ({ connects, locations, largeJson }) {
_.map(connects, v => {
let sourceId = v.endPointSourceId.split('-')
let targetId = v.endPointTargetId.split('-')
- let labels = v.label
+ const labels = v.label
if (sourceId.length === 4 && targetId.length === 4) {
sourceId = `${sourceId[0]}-${sourceId[1]}-${sourceId[2]}`
targetId = `${targetId[0]}-${targetId[1]}-${targetId[2]}`
@@ -791,24 +760,24 @@ JSP.prototype.jspBackfill = function ({ connects, locations, largeJson }) {
sourceId = v.endPointSourceId
targetId = v.endPointTargetId
}
-
- if($(`#${sourceId}`).attr('data-tasks-type') === 'CONDITIONS' && $(`#${sourceId}`).attr('data-successnode') === $(`#${targetId}`).find('.name-p').text()) {
+
+ if ($(`#${sourceId}`).attr('data-tasks-type') === 'CONDITIONS' && $(`#${sourceId}`).attr('data-successnode') === $(`#${targetId}`).find('.name-p').text()) {
this.JspInstance.connect({
source: sourceId,
target: targetId,
type: 'basic',
paintStyle: { strokeWidth: 2, stroke: '#4caf50' },
- HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3},
- overlays:[["Label", { label: labels} ]]
+ HoverPaintStyle: { stroke: '#ccc', strokeWidth: 3 },
+ overlays: [['Label', { label: labels }]]
})
- } else if($(`#${sourceId}`).attr('data-tasks-type') === 'CONDITIONS' && $(`#${sourceId}`).attr('data-failednode') === $(`#${targetId}`).find('.name-p').text()) {
+ } else if ($(`#${sourceId}`).attr('data-tasks-type') === 'CONDITIONS' && $(`#${sourceId}`).attr('data-failednode') === $(`#${targetId}`).find('.name-p').text()) {
this.JspInstance.connect({
source: sourceId,
target: targetId,
type: 'basic',
paintStyle: { strokeWidth: 2, stroke: '#252d39' },
- HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3},
- overlays:[["Label", { label: labels} ]]
+ HoverPaintStyle: { stroke: '#ccc', strokeWidth: 3 },
+ overlays: [['Label', { label: labels }]]
})
} else {
this.JspInstance.connect({
@@ -816,8 +785,8 @@ JSP.prototype.jspBackfill = function ({ connects, locations, largeJson }) {
target: targetId,
type: 'basic',
paintStyle: { strokeWidth: 2, stroke: '#2d8cf0' },
- HoverPaintStyle: {stroke: '#ccc', strokeWidth: 3},
- overlays:[["Label", { label: labels} ]]
+ HoverPaintStyle: { stroke: '#ccc', strokeWidth: 3 },
+ overlays: [['Label', { label: labels }]]
})
}
})
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
index f5aacf294f..176f852e83 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js
@@ -37,7 +37,7 @@ const saveTargetarr = (valId, domId) => {
}
const rtBantpl = () => {
- return `
`
+ return `
`
}
/**
@@ -100,13 +100,13 @@ const setSvgColor = (e, color) => {
// Traverse clear all colors
$('.jtk-connector').each((i, o) => {
_.map($(o)[0].childNodes, v => {
- if($(v).attr('fill') ==='#ccc') {
+ if ($(v).attr('fill') === '#ccc') {
$(v).attr('fill', '#2d8cf0')
}
- if($(v).attr('fill') ==='#4caf50') {
- $(v).attr('fill','#4caf50').attr('stroke', '#4caf50').attr('stroke-width', 2)
+ if ($(v).attr('fill') === '#4caf50') {
+ $(v).attr('fill', '#4caf50').attr('stroke', '#4caf50').attr('stroke-width', 2)
$(v).prev().attr('stroke', '#4caf50').attr('stroke-width', 2)
- } else if($(v).attr('fill') ==='#252d39') {
+ } else if ($(v).attr('fill') === '#252d39') {
$(v).attr('stroke', '#252d39').attr('stroke-width', 2)
$(v).prev().attr('stroke', '#252d39').attr('stroke-width', 2)
} else {
@@ -117,7 +117,7 @@ const setSvgColor = (e, color) => {
// Add color to the selection
_.map($(e.canvas)[0].childNodes, (v, i) => {
- if($(v).attr('fill') ==='#2d8cf0') {
+ if ($(v).attr('fill') === '#2d8cf0') {
$(v).attr('fill', '#ccc')
}
$(v).attr('stroke', '#ccc')
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue
index 516f03bc2f..9520386b8d 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/startingParam/index.vue
@@ -18,7 +18,7 @@
-
{{$t('Startup parameter')}}
+
{{$t('Startup parameter')}}
{{$t('Startup type')}}: {{_rtRunningType(startupParam.commandType)}}
{{$t('Complement range')}}: {{startupParam.commandParam.complementStartDate}}-{{startupParam.commandParam.complementEndDate}} -
@@ -35,10 +35,11 @@
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/index.vue
index 33be9e096f..9f6ed83d4a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/index.vue
@@ -37,7 +37,7 @@
}
},
watch: {
- '$route': {
+ $route: {
deep: true,
handler () {
this.isActive = false
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue
index 7209c4daff..23e4bdca05 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/variable/variablesView.vue
@@ -18,23 +18,23 @@
-
{{$t('Global parameters')}}
+
{{$t('Global parameters')}}
-
{{item.prop}} = {{item.value}}
-
+
-
{{$t('Local parameters')}}
+
{{$t('Local parameters')}}
@@ -43,7 +43,7 @@
Task({{$index}}):{{key}}
-
+
@@ -54,7 +54,7 @@
{{k}} = {{e}}
-
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue
index b1d7a7b1e2..d9acb38453 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/definitionDetails.vue
@@ -41,8 +41,8 @@
props: {},
methods: {
...mapMutations('dag', ['resetParams', 'setIsDetails']),
- ...mapActions('dag', ['getProcessList','getProjectList', 'getResourcesList', 'getProcessDetails','getResourcesListJar']),
- ...mapActions('security', ['getTenantList','getWorkerGroupsAll']),
+ ...mapActions('dag', ['getProcessList', 'getProjectList', 'getResourcesList', 'getProcessDetails', 'getResourcesListJar']),
+ ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll']),
/**
* init
*/
@@ -89,7 +89,7 @@
},
watch: {
// Listening for routing changes
- '$route': {
+ $route: {
deep: true,
handler () {
this.init()
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue
index eedf741b6e..d232e2dd86 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/index.vue
@@ -40,8 +40,8 @@
props: {},
methods: {
...mapMutations('dag', ['resetParams']),
- ...mapActions('dag', ['getProcessList','getProjectList', 'getResourcesList','getResourcesListJar','getResourcesListJar']),
- ...mapActions('security', ['getTenantList','getWorkerGroupsAll']),
+ ...mapActions('dag', ['getProcessList', 'getProjectList', 'getResourcesList', 'getResourcesListJar', 'getResourcesListJar']),
+ ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll']),
/**
* init
*/
@@ -74,7 +74,7 @@
}
},
watch: {
- '$route': {
+ $route: {
deep: true,
handler () {
this.init()
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
index daa30d7c44..0727d12eed 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/instanceDetails.vue
@@ -43,8 +43,8 @@
props: {},
methods: {
...mapMutations('dag', ['setIsDetails', 'resetParams']),
- ...mapActions('dag', ['getProcessList','getProjectList', 'getResourcesList', 'getInstancedetail','getResourcesListJar']),
- ...mapActions('security', ['getTenantList','getWorkerGroupsAll']),
+ ...mapActions('dag', ['getProcessList', 'getProjectList', 'getResourcesList', 'getInstancedetail', 'getResourcesListJar']),
+ ...mapActions('security', ['getTenantList', 'getWorkerGroupsAll']),
/**
* init
*/
@@ -101,7 +101,7 @@
}
},
watch: {
- '$route': {
+ $route: {
deep: true,
handler () {
this.init()
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
index adf4753f4f..b329831269 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue
@@ -16,147 +16,143 @@
*/
@@ -542,5 +533,4 @@
}
}
-
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
index a496fe8991..cc1cc6a3e1 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue
@@ -17,97 +17,51 @@
-
-
-
- {{$t('#')}}
-
-
- {{$t('Datasource Name')}}
-
-
- {{$t('Datasource Type')}}
-
-
- {{$t('Datasource Parameter')}}
-
-
- {{$t('Description')}}
-
-
- {{$t('Create Time')}}
-
-
- {{$t('Update Time')}}
-
-
- {{$t('Operation')}}
-
-
-
-
- {{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}
-
-
-
- {{item.name}}
-
-
-
- {{item.type}}
-
-
-
-
- {{$t('Click to view')}}
-
+
+
+
+
+
+
+
+
+
+ {{$t('Click to view')}}
+
-
-
- {{item.note}}
- -
-
-
- {{item.createTime | formatDate}}
- -
-
-
- {{item.updateTime | formatDate}}
- -
-
-
-
-
-
- {{$t('Delete?')}}
-
- {{$t('Cancel')}}
- {{$t('Confirm')}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{scope.row.createTime | formatDate}}
+
+
+
+
+ {{scope.row.updateTime | formatDate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -134,17 +88,10 @@
},
methods: {
...mapActions('datasource', ['deleteDatasource']),
- /**
- * Close delete popup layer
- */
- _closeDelete (i) {
- this.$refs[`poptip-delete-${i}`][0].doClose()
- },
/**
* Delete current line
*/
_delete (item, i) {
- this.$refs[`poptip-delete-${i}`][0].doClose()
this.deleteDatasource({
id: item.id
}).then(res => {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
index e8435589ad..04683ebe4e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/index.vue
@@ -19,7 +19,14 @@
- {{$t('Create Datasource')}}
+ {{$t('Create Datasource')}}
+
+
+
@@ -27,7 +34,16 @@
-
+
+
@@ -66,7 +82,10 @@
pageNo: 1,
// Search value
searchVal: ''
- }
+
+ },
+ dialogVisible: false,
+ item: {}
}
},
mixins: [listUrlParamHandle],
@@ -77,30 +96,15 @@
* create data source
*/
_create (item) {
- let self = this
- let modal = this.$modal.dialog({
- closable: false,
- showMask: true,
- escClose: true,
- className: 'v-modal-custom',
- transitionName: 'opacityp',
- render (h) {
- return h(mCreateDataSource, {
- on: {
- onUpdate () {
- self._debounceGET('false')
- modal.remove()
- },
- close () {
- modal.remove()
- }
- },
- props: {
- item: item
- }
- })
- }
- })
+ this.item = item
+ this.dialogVisible = true
+ },
+ onUpdate () {
+ this._debounceGET('false')
+ this.dialogVisible = false
+ },
+ close () {
+ this.dialogVisible = false
},
/**
* page
@@ -124,8 +128,8 @@
_getList (flag) {
this.isLoading = !flag
this.getDatasourcesListP(this.searchParams).then(res => {
- if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
- this.searchParams.pageNo = this.searchParams.pageNo -1
+ if (this.searchParams.pageNo > 1 && res.totalList.length === 0) {
+ this.searchParams.pageNo = this.searchParams.pageNo - 1
} else {
this.datasourcesList = []
this.datasourcesList = res.totalList
@@ -138,7 +142,7 @@
},
_onUpdate () {
this._debounceGET('false')
- },
+ }
},
watch: {
// router
@@ -151,6 +155,6 @@
},
mounted () {
},
- components: { mList, mConditions, mSpin, mListConstruction, mNoData }
+ components: { mList, mConditions, mSpin, mListConstruction, mNoData, mCreateDataSource }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/home/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/home/index.vue
index 2c8e188ad8..71cff27092 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/home/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/home/index.vue
@@ -19,13 +19,12 @@
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/index.vue
index 6a02b09b33..60af1187f7 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/index.vue
@@ -25,9 +25,9 @@
import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
export default {
name: 'monitor-index',
- mounted() {
- this.$modal.destroy()
+ mounted () {
+
},
components: { mSecondaryMenu }
}
-
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperDirectories.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperDirectories.vue
index 1201cb55b4..ca4f6ad728 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperDirectories.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperDirectories.vue
@@ -21,25 +21,10 @@
-
-
-
-
- #
-
-
- {{$t('zkDirectory')}}
-
-
-
-
- {{$index + 1}}
-
-
- {{item.zkDirectory}}
-
-
-
+
+
+
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue
index de187dddc8..df987908f9 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue
@@ -17,103 +17,38 @@
-
-
-
- {{$t('#')}}
-
-
- {{$t('host')}}
-
-
- {{$t('Number of connections')}}
-
-
- watches {{$t('Number')}}
-
-
- {{$t('Sent')}}
-
-
- {{$t('Received')}}
-
-
- leader/follower
-
-
- {{$t('Min latency')}}
-
-
- {{$t('Avg latency')}}
-
-
- {{$t('Max latency')}}
-
-
- {{$t('Node count')}}
-
-
- {{$t('Query time')}}
-
-
- {{$t('Node self-test status')}}
-
-
-
-
- {{$index + 1}}
-
-
-
- {{item.hostname}}
-
-
- {{item.connections}}
-
- {{item.watches}}
-
-
- {{item.sent}}
-
-
- {{item.received}}
-
- {{item.mode}}
-
- {{item.minLatency}}
-
-
- {{item.avgLatency}}
-
-
- {{item.maxLatency}}
-
-
- {{item.nodeCount}}
-
-
- {{item.date | formatDate}}
- -
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{scope.row.date | formatDate}}
+
+
+
+
-
-
+
+
-
-
-
+
+
+
-
-
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/db.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/db.vue
index 873cd4a1e8..fa55ba548c 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/db.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/db.vue
@@ -30,8 +30,8 @@
-
-
+
+
{{$t('Health status')}}
@@ -59,19 +59,6 @@
{{$t('Threads connections')}}
-
@@ -92,41 +79,39 @@
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
index 8182dac639..40ff14b53d 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/pages/servers/master.vue
@@ -68,7 +68,6 @@
import _ from 'lodash'
import { mapActions } from 'vuex'
import mGauge from './_source/gauge'
- import mList from './_source/zookeeperList'
import mSpin from '@/module/components/spin/spin'
import mNoData from '@/module/components/noData/noData'
import themeData from '@/module/echarts/themeData.json'
@@ -95,7 +94,7 @@
this.getMasterData().then(res => {
this.masterList = _.map(res, (v, i) => {
return _.assign(v, {
- id: v.host + "_" + v.id,
+ id: v.host + '_' + v.id,
resInfo: JSON.parse(v.resInfo)
})
})
@@ -104,7 +103,7 @@
this.isLoading = false
})
},
- components: { mList, mListConstruction, mSpin, mNoData, mGauge }
+ components: { mListConstruction, mSpin, mNoData, mGauge }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue
index fcc3410080..9f09880a8f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue
@@ -21,103 +21,69 @@
{{$t('Version Info')}}
-
-
-
-
-
- {{$t('Version')}}
-
-
- {{$t('Description')}}
-
-
- {{$t('Create Time')}}
-
-
- {{$t('Operation')}}
-
-
-
-
-
- {{item.version}} {{$t('Current Version')}}
- {{item.version}}
+
+
+
+
+
+
+ {{scope.row.version}} {{$t('Current Version')}}
+ {{scope.row.version}}
-
-
-
- {{item.description}}
- -
-
-
- {{item.createTime}}
- -
-
-
-
- {{$t('Confirm Switch To This Version?')}}
-
-
- {{$t('Cancel')}}
-
- {{$t('Confirm')}}
-
-
-
-
-
-
-
-
- {{$t('Delete?')}}
-
- {{$t('Cancel')}}
-
- {{$t('Confirm')}}
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{scope.row.createTime | formatDate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
- {{$t('Cancel')}}
-
-
+
+
+ {{$t('Cancel')}}
@@ -144,11 +110,7 @@
}
},
props: {
- processDefinition: Object,
- processDefinitionVersions: Array,
- total: Number,
- pageNo: Number,
- pageSize: Number
+ versionData: Object
},
methods: {
/**
@@ -157,7 +119,7 @@
_mVersionSwitchProcessDefinitionVersion (item) {
this.$emit('mVersionSwitchProcessDefinitionVersion', {
version: item.version,
- processDefinitionId: this.processDefinition.id,
+ processDefinitionId: this.versionData.processDefinition.id,
fromThis: this
})
},
@@ -168,7 +130,7 @@
_mVersionDeleteProcessDefinitionVersion (item) {
this.$emit('mVersionDeleteProcessDefinitionVersion', {
version: item.version,
- processDefinitionId: this.processDefinition.id,
+ processDefinitionId: this.versionData.processDefinition.id,
fromThis: this
})
},
@@ -180,33 +142,16 @@
this.$emit('mVersionGetProcessDefinitionVersionsPage', {
pageNo: val,
pageSize: this.pageSize,
- processDefinitionId: this.processDefinition.id,
+ processDefinitionId: this.versionData.processDefinition.id,
fromThis: this
})
},
-
- /**
- * Close the switch version layer
- */
- _closeSwitchVersion (i) {
- this.$refs[`poptip-switch-version-${i}`][0].doClose()
- },
-
- /**
- * Close the delete layer
- */
- _closeDelete (i) {
- this.$refs[`poptip-delete-${i}`][0].doClose()
- },
-
/**
* Close and destroy component and component internal events
*/
_close () {
// flag Whether to delete a node this.$destroy()
- this.$emit('close', {
- fromThis: this
- })
+ this.$emit('closeVersion')
}
},
created () {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
index eb5d3352df..4a993a9a14 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
@@ -20,8 +20,8 @@
- this.$router.push({name: 'definition-create'})">{{$t('Create process')}}
- {{$t('Import process')}}
+ this.$router.push({name: 'definition-create'})">{{$t('Create process')}}
+ {{$t('Import process')}}
@@ -29,7 +29,16 @@
-
+
+
@@ -49,7 +58,6 @@
import mNoData from '@/module/components/noData/noData'
import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
import mConditions from '@/module/components/conditions/conditions'
- import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
import mListConstruction from '@/module/components/listConstruction/listConstruction'
import { findComponentDownward } from '@/module/util/'
@@ -100,15 +108,15 @@
* get data list
*/
_getList (flag) {
- if(sessionStorage.getItem('isLeft')==0) {
+ if (sessionStorage.getItem('isLeft') === 0) {
this.isLeft = false
} else {
this.isLeft = true
}
this.isLoading = !flag
this.getProcessListP(this.searchParams).then(res => {
- if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
- this.searchParams.pageNo = this.searchParams.pageNo -1
+ if (this.searchParams.pageNo > 1 && res.totalList.length === 0) {
+ this.searchParams.pageNo = this.searchParams.pageNo - 1
} else {
this.processListP = []
this.processListP = res.totalList
@@ -137,13 +145,13 @@
created () {
localStore.removeItem('subProcessId')
},
- mounted() {
- this.$modal.destroy()
+ mounted () {
+
},
beforeDestroy () {
- sessionStorage.setItem('isLeft',1)
+ sessionStorage.setItem('isLeft', 1)
},
- components: { mList, mConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
+ components: { mList, mConditions, mSpin, mListConstruction, mNoData }
}
@@ -176,4 +184,4 @@
}
}
}
-
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue
index 4bc102dc24..99455f8f8f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/tree/index.vue
@@ -16,26 +16,31 @@
*/
+
+
+
+
+
-
-
+
-
-
-
+
+
+ size="small"
+ icon="el-icon-d-arrow-left">
{{$t('Return_1')}}
-
+
@@ -77,7 +82,6 @@
import mSpin from '@/module/components/spin/spin'
import mNoData from '@/module/components/noData/noData'
import { tasksType, tasksState } from '@/conf/home/pages/dag/_source/config'
- import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
import mListConstruction from '@/module/components/listConstruction/listConstruction'
export default {
@@ -101,6 +105,9 @@
props: {},
methods: {
...mapActions('dag', ['getViewTree']),
+ _close () {
+ this.$router.go(-1)
+ },
/**
* get tree data
*/
@@ -181,7 +188,7 @@
this.$router.push({ path: `/projects/definition/tree/${subProcessId}`, query: { subProcessIds: subProcessIds.join(',') } })
},
_onChangeSelect (o) {
- this.limit = o.value
+ this.limit = o
this._getViewTree()
}
},
@@ -195,7 +202,7 @@
},
mounted () {
},
- components: { mSpin, mSecondaryMenu, mListConstruction, mNoData }
+ components: { mSpin, mListConstruction, mNoData }
}
@@ -257,5 +264,4 @@
}
}
-
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue
index 7b0b2c3062..f773edfae1 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue
@@ -22,125 +22,74 @@
-
-
-
- {{$t('#')}}
-
-
- {{$t('Process Name')}}
-
-
- {{$t('Start Time')}}
-
-
- {{$t('End Time')}}
-
-
- {{$t('crontab')}}
-
-
- {{$t('Failure Strategy')}}
-
-
- {{$t('State')}}
-
-
- {{$t('Create Time')}}
-
-
- {{$t('Update Time')}}
-
-
- {{$t('Operation')}}
-
-
-
-
- {{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}
-
-
- {{item.processDefinitionName}}
-
-
- {{item.startTime | formatDate}}
-
-
- {{item.endTime | formatDate}}
-
-
- {{item.crontab}}
-
-
- {{item.failureStrategy}}
-
-
- {{_rtReleaseState(item.releaseState)}}
-
-
- {{item.createTime | formatDate}}
-
-
- {{item.updateTime | formatDate}}
-
-
-
-
-
-
-
-
-
- {{$t('Delete?')}}
-
- {{$t('Cancel')}}
- {{$t('Confirm')}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{scope.row.startTime | formatDate}}
+
+
+
+
+ {{scope.row.endTime | formatDate}}
+
+
+
+
+
+
+ {{_rtReleaseState(scope.row.releaseState)}}
+
+
+
+
+ {{scope.row.createTime | formatDate}}
+
+
+
+
+ {{scope.row.updateTime | formatDate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
@@ -148,6 +97,12 @@
+
+
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue
index 64cbc02dde..0540a32851 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/index.vue
@@ -16,6 +16,11 @@
*/
+
+
+
+
+
@@ -23,10 +28,14 @@
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/commandStateCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/commandStateCount.vue
index f640a1e3c4..ab615e141c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/commandStateCount.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/commandStateCount.vue
@@ -70,7 +70,7 @@
},
watch: {
- 'searchParams': {
+ searchParams: {
deep: true,
immediate: true,
handler (o) {
@@ -91,4 +91,4 @@
computed: {},
components: { mNoData }
}
-
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue
index d509d50cf4..07e734987c 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue
@@ -38,7 +38,7 @@
return {
isSpin: true,
msg: true,
- parameter: {projectId: 0}
+ parameter: { projectId: 0 }
}
},
props: {
@@ -71,9 +71,9 @@
},
created () {
this.isSpin = true
- this.parameter.projectId = this.projectId;
+ this.parameter.projectId = this.projectId
this.getDefineUserCount(this.parameter).then(res => {
- this.msg = res.data.count > 0 ? true : false
+ this.msg = res.data.count > 0
this.defineUserList = []
this._handleDefineUser(res)
this.isSpin = false
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue
index d121034932..277d799fba 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/processStateCount.vue
@@ -19,7 +19,7 @@
@@ -31,7 +31,10 @@
{{$index+1}}
- {{item.value}}
+
+ {{item.value}}
+ {{item.value}}
+
{{item.key}}
@@ -49,15 +52,17 @@
import { mapActions } from 'vuex'
import { pie } from './chartConfig'
import Chart from '@/module/ana-charts'
+ import echarts from 'echarts'
import mNoData from '@/module/components/noData/noData'
- import { stateType } from '@/conf/home/pages/projects/pages/_source/instanceConditions/common'
+ import { stateType } from '@/conf/home/pages/projects/pages/_source/conditions/instance/common'
export default {
name: 'process-state-count',
data () {
return {
isSpin: true,
msg: '',
- processStateList: []
+ processStateList: [],
+ currentName: ''
}
},
props: {
@@ -69,7 +74,7 @@
this.$router.push({
name: 'projects-instance-list',
query: {
- stateType: _.find(stateType, ['label', name])['code'],
+ stateType: _.find(stateType, ['label', name]).code,
startDate: this.searchParams.startDate,
endDate: this.searchParams.endDate
}
@@ -79,7 +84,7 @@
let data = res.data.taskCountDtos
this.processStateList = _.map(data, v => {
return {
- key: _.find(stateType, ['code', v.taskStateType])['label'],
+ key: _.find(stateType, ['code', v.taskStateType]).label,
value: v.count
}
})
@@ -94,7 +99,7 @@
}
},
watch: {
- 'searchParams': {
+ searchParams: {
deep: true,
immediate: true,
handler (o) {
@@ -108,11 +113,15 @@
this.isSpin = false
})
}
+ },
+ '$store.state.projects.sideBar': function () {
+ echarts.init(document.getElementById('process-state-pie')).resize()
}
},
beforeCreate () {
},
created () {
+ this.currentName = this.$router.currentRoute.name
},
beforeMount () {
},
@@ -132,7 +141,4 @@
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue
index 00eef39ea2..5f2dae37ea 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/queueCount.vue
@@ -29,7 +29,7 @@
{{$t('Number')}}
{{$t('State')}}
-
+
{{$index+1}}
{{item.value}}
{{item.key}}
@@ -76,7 +76,7 @@
}
},
watch: {
- 'searchParams': {
+ searchParams: {
deep: true,
immediate: true,
handler (o) {
@@ -98,4 +98,4 @@
},
components: { mNoData }
}
-
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue
deleted file mode 100644
index 3e56c344f7..0000000000
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskCtatusCount.vue
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * 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.
- */
-
-
-
-
-
-
-
-
-
- {{$t('#')}}
- {{$t('Number')}}
- {{$t('State')}}
-
-
- {{$index+1}}
-
-
- {{item.value}}
-
-
- {{item.key}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskStatusCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskStatusCount.vue
index 90ae53f4c9..9fd45418f9 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskStatusCount.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/taskStatusCount.vue
@@ -54,7 +54,7 @@
import { pie } from './chartConfig'
import Chart from '@/module/ana-charts'
import mNoData from '@/module/components/noData/noData'
- import { stateType } from '@/conf/home/pages/projects/pages/_source/instanceConditions/common'
+ import { stateType } from '@/conf/home/pages/projects/pages/_source/conditions/instance/common'
export default {
name: 'task-status-count',
@@ -74,7 +74,7 @@
this.$router.push({
name: 'task-instance',
query: {
- stateType: _.find(stateType, ['label', name])['code'],
+ stateType: _.find(stateType, ['label', name]).code,
startDate: this.searchParams.startDate,
endDate: this.searchParams.endDate
}
@@ -85,7 +85,7 @@
this.taskStatusList = _.map(data, v => {
return {
// CHECK!!
- key: _.find(stateType, ['code', v.taskStateType])['label'],
+ key: _.find(stateType, ['code', v.taskStateType]).label,
value: v.count,
type: 'type'
}
@@ -102,7 +102,7 @@
}
},
watch: {
- 'searchParams': {
+ searchParams: {
deep: true,
immediate: true,
handler (o) {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue
index 7ca6e3a0f6..1fdf8a8561 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/index.vue
@@ -19,15 +19,16 @@
-
-
+
+
@@ -67,12 +68,9 @@
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/index.vue
index 0836a52f1c..b02b297709 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/index.vue
@@ -21,4 +21,4 @@
export default {
name: 'process-instance-index'
}
-
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/details/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/details/index.vue
index 88c88e079f..ac67c25c63 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/details/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/details/index.vue
@@ -18,13 +18,12 @@
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue
index e2e7d9b000..553d981c00 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/gantt/index.vue
@@ -24,7 +24,7 @@
{{$t('Task Status')}}
-
+
{{item.desc}}
@@ -47,8 +47,6 @@
import mSpin from '@/module/components/spin/spin'
import mNoData from '@/module/components/noData/noData'
import { tasksState } from '@/conf/home/pages/dag/_source/config'
- import mConditions from '@/module/components/conditions/conditions'
- import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
import mListConstruction from '@/module/components/listConstruction/listConstruction'
export default {
@@ -111,7 +109,7 @@
destroyed () {
},
computed: {},
- components: { mConditions, mSecondaryMenu, mListConstruction, mSpin, mNoData }
+ components: { mListConstruction, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
index cda59968cb..69d1a4c503 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
@@ -17,289 +17,206 @@
-
-
-
-
-
-
- {{$t('#')}}
-
-
- {{$t('Process Name')}}
-
-
- {{$t('State')}}
-
-
- {{$t('Run Type')}}
-
-
- {{$t('Scheduling Time')}}
-
-
- {{$t('Start Time')}}
-
-
- {{$t('End Time')}}
-
-
- {{$t('Duration')}}s
-
-
- {{$t('Run Times')}}
-
-
- {{$t('fault-tolerant sign')}}
-
-
- {{$t('Executor')}}
-
-
-
-
{{$t('host')}}
+
+
+
+
+
+
+ {{ scope.row.name }}
+
+ {{scope.row.name}}
+
+
+
+
+
+
+
+
+
+
+
+ {{_rtRunningType(scope.row.commandType)}}
+
+
+
+
+ {{scope.row.scheduleTime | formatDate}}
+ -
+
+
+
+
+ {{scope.row.startTime | formatDate}}
+
+
+
+
+ {{scope.row.endTime | formatDate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- {{$t('Operation')}}
-
-
-
-
-
- {{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}
-
-
- {{item.name}}
-
-
-
-
- {{_rtRunningType(item.commandType)}}
-
- {{item.scheduleTime | formatDate}}
- -
-
-
- {{item.startTime | formatDate}}
- -
-
-
- {{item.endTime | formatDate}}
- -
-
- {{item.duration || '-'}}
- {{item.runTimes}}
- {{item.recovery}}
-
- {{item.executorName}}
- -
-
-
- {{item.host}}
- -
-
-
-
-
-
-
-
-
-
- {{$t('Delete?')}}
-
- {{$t('Cancel')}}
- {{$t('Confirm')}}
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
+ size="mini"
+ icon="el-icon-edit-outline"
+ disabled="true"
+ circle>
+
-
- {{item.count}}
-
-
+
+
+ {{scope.row.count}}
+
+
+
+
-
+ size="mini"
+ icon="el-icon-refresh"
+ disabled="true"
+ circle>
+
-
-
- {{item.count}}
-
-
-
+
+
+ {{scope.row.count}}
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+ {{scope.row.count}}
+
+
-
-
- {{item.count}}
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
-
-
+
+
-
-
+
+
-
-
-
+
+
+
-
- {{$t('Delete?')}}
-
- {{$t('Cancel')}}
- {{$t('Confirm')}}
-
-
- {{$t('Delete')}}
-
-
+
+
+ {{$t('Delete')}}
+
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGrid.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGrid.vue
index eb5ced5dd0..fe685ba8eb 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGrid.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGrid.vue
@@ -19,7 +19,7 @@
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGridOption.js b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGridOption.js
index 117a177651..1352e24e1d 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGridOption.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGridOption.js
@@ -14,29 +14,28 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import _ from 'lodash';
+import _ from 'lodash'
import i18n from '@/module/i18n/index.js'
const getCategory = (categoryDic, { workFlowPublishStatus, schedulePublishStatus, id }, sourceWorkFlowId) => {
- if (id === sourceWorkFlowId) return categoryDic['active']
+ if (id === sourceWorkFlowId) return categoryDic.active
switch (true) {
case workFlowPublishStatus === '0':
- return categoryDic['0'];
+ return categoryDic['0']
case workFlowPublishStatus === '1' && schedulePublishStatus === '0':
- return categoryDic['10'];
+ return categoryDic['10']
case workFlowPublishStatus === '1' && schedulePublishStatus === '1':
default:
- return categoryDic['1'];
+ return categoryDic['1']
}
}
export default function (locations, links, sourceWorkFlowId, isShowLabel) {
-
const categoryDic = {
- 'active': { color: '#2D8DF0', category: i18n.$t('KinshipStateActive')},
- '1': { color: '#00C800', category: i18n.$t('KinshipState1')},
- '0': { color: '#999999', category: i18n.$t('KinshipState0')},
- '10': { color: '#FF8F05', category: i18n.$t('KinshipState10')},
+ active: { color: '#2D8DF0', category: i18n.$t('KinshipStateActive') },
+ 1: { color: '#00C800', category: i18n.$t('KinshipState1') },
+ 0: { color: '#999999', category: i18n.$t('KinshipState0') },
+ 10: { color: '#FF8F05', category: i18n.$t('KinshipState10') }
}
const newData = _.map(locations, (item) => {
const { color, category } = getCategory(categoryDic, item, sourceWorkFlowId)
@@ -45,27 +44,27 @@ export default function (locations, links, sourceWorkFlowId, isShowLabel) {
emphasis: {
itemStyle: {
color
- },
+ }
},
category
}
- });
+ })
const categories = [
- { name: categoryDic.active.category},
- { name: categoryDic['1'].category},
- { name: categoryDic['0'].category},
- { name: categoryDic['10'].category},
+ { name: categoryDic.active.category },
+ { name: categoryDic['1'].category },
+ { name: categoryDic['0'].category },
+ { name: categoryDic['10'].category }
]
- let option = {
+ const option = {
tooltip: {
trigger: 'item',
triggerOn: 'mousemove',
backgroundColor: '#2D303A',
padding: [8, 12],
formatter: (params) => {
- if (!params.data.name) return '';
- const { name, scheduleStartTime, scheduleEndTime, crontab, workFlowPublishStatus, schedulePublishStatus } = params.data;
+ if (!params.data.name) return ''
+ const { name, scheduleStartTime, scheduleEndTime, crontab, workFlowPublishStatus, schedulePublishStatus } = params.data
const str = `
工作流名字:${name}
调度开始时间:${scheduleStartTime}
@@ -74,7 +73,7 @@ export default function (locations, links, sourceWorkFlowId, isShowLabel) {
工作流发布状态:${workFlowPublishStatus}
调度发布状态:${schedulePublishStatus}
`
- return str;
+ return str
},
color: '#2D303A',
textStyle: {
@@ -85,16 +84,16 @@ export default function (locations, links, sourceWorkFlowId, isShowLabel) {
lineHeight: 12,
align: 'left',
padding: [4, 4, 4, 4]
- },
+ }
}
- },
+ }
},
color: [categoryDic.active.color, categoryDic['1'].color, categoryDic['0'].color, categoryDic['10'].color],
legend: [{
orient: 'horizontal',
top: 6,
left: 6,
- data: categories,
+ data: categories
}],
series: [{
type: 'graph',
@@ -111,9 +110,9 @@ export default function (locations, links, sourceWorkFlowId, isShowLabel) {
show: isShowLabel,
position: 'inside',
formatter: (params) => {
- if (!params.data.name) return '';
+ if (!params.data.name) return ''
const str = params.data.name.split('_').map(item => `{a|${item}\n}`).join('')
- return str;
+ return str
},
color: '#222222',
textStyle: {
@@ -124,7 +123,7 @@ export default function (locations, links, sourceWorkFlowId, isShowLabel) {
lineHeight: 12,
align: 'left',
padding: [4, 4, 4, 4]
- },
+ }
}
}
},
@@ -139,7 +138,7 @@ export default function (locations, links, sourceWorkFlowId, isShowLabel) {
color: '#999999'
}
}]
- };
+ }
return option
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/index.vue
index 2472a69786..e6e21f71e6 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/index.vue
@@ -18,33 +18,33 @@
-
-
-
-
-
+
+
-
+
+ >
@@ -55,15 +55,11 @@
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
index ad0ff0884e..6813e3a2b3 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
@@ -20,12 +20,22 @@
+
-
+
+
@@ -43,9 +53,8 @@
import mSpin from '@/module/components/spin/spin'
import mNoData from '@/module/components/noData/noData'
import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
- import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
import mListConstruction from '@/module/components/listConstruction/listConstruction'
- import mInstanceConditions from '@/conf/home/pages/projects/pages/_source/instanceConditions'
+ import mInstanceConditions from '@/conf/home/pages/projects/pages/_source/conditions/instance/taskInstance'
export default {
name: 'task-instance-list-index',
@@ -72,7 +81,8 @@
// end date
endDate: '',
// Exectuor Name
- executorName: ''
+ executorName: '',
+ processInstanceName: ''
},
isLeft: true
}
@@ -95,7 +105,7 @@
_page (val) {
this.searchParams.pageNo = val
},
- _pageSize(val) {
+ _pageSize (val) {
this.searchParams.pageSize = val
},
/**
@@ -103,8 +113,8 @@
*/
_getList (flag) {
this.isLoading = !flag
- if(this.searchParams.pageNo == undefined) {
- this.$router.push({ path: `/projects/index` })
+ if (this.searchParams.pageNo === undefined) {
+ this.$router.push({ path: '/projects/index' })
return false
}
this.getTaskInstanceList(this.searchParams).then(res => {
@@ -121,15 +131,15 @@
* @desc Prevent functions from being called multiple times
*/
_debounceGET: _.debounce(function (flag) {
- if(sessionStorage.getItem('isLeft')==0) {
+ if (sessionStorage.getItem('isLeft') === 0) {
this.isLeft = false
} else {
this.isLeft = true
}
this._getList(flag)
}, 100, {
- 'leading': false,
- 'trailing': true
+ leading: false,
+ trailing: true
})
},
watch: {
@@ -145,7 +155,6 @@
created () {
},
mounted () {
- this.$modal.destroy()
// Cycle acquisition status
this.setIntervalP = setInterval(() => {
this._debounceGET('false')
@@ -154,9 +163,9 @@
beforeDestroy () {
// Destruction wheel
clearInterval(this.setIntervalP)
- sessionStorage.setItem('isLeft',1)
+ sessionStorage.setItem('isLeft', 1)
},
- components: { mList, mInstanceConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
+ components: { mList, mInstanceConditions, mSpin, mListConstruction, mNoData }
}
@@ -188,5 +197,10 @@
}
}
}
+ .list-model {
+ .el-dialog__header, .el-dialog__body {
+ padding: 0;
+ }
+ }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue
index b9d8ab566f..71c2569b9b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/timing/index.vue
@@ -28,4 +28,4 @@
name: 'timing-index',
components: { mList, mListConstruction }
}
-
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/index.vue
index 3e0215c754..ce4e3bbc5e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/index.vue
@@ -25,8 +25,7 @@
export default {
name: 'resource-index',
components: { mSecondaryMenu },
- mounted() {
- this.$modal.destroy()
- },
+ mounted () {
+ }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/index.vue
index e47aa57362..2eb4e6b441 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/index.vue
@@ -20,8 +20,7 @@
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
index fac37a46fb..b7b7efce31 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
@@ -21,39 +21,39 @@
* {{$t('File Name')}}
-
-
+ size="small"
+ :placeholder="$t('Please enter name')">
+
* {{$t('File Format')}}
-
-
+
-
-
+
+
{{$t('Description')}}
-
-
+ size="small"
+ :placeholder="$t('Please enter description')">
+
@@ -66,8 +66,8 @@
- {{spinnerLoading ? 'Loading...' : $t('Create')}}
- $router.push({name: 'file'})"> {{$t('Cancel')}}
+ {{spinnerLoading ? 'Loading...' : $t('Create')}}
+ $router.push({name: 'file'})"> {{$t('Cancel')}}
@@ -82,8 +82,6 @@
import { handlerSuffix } from '../details/_source/utils'
import codemirror from '../_source/codemirror'
import mListBoxF from '@/module/components/listBoxF/listBoxF'
- import mSpin from '@/module/components/spin/spin'
- import mConditions from '@/module/components/conditions/conditions'
import mListConstruction from '@/module/components/listConstruction/listConstruction'
let editor
@@ -136,7 +134,7 @@
this.$message.warning(`${i18n.$t('Please enter the resource content')}`)
return false
}
- if (editor.doc.size>3000) {
+ if (editor.doc.size > 3000) {
this.$message.warning(`${i18n.$t('Resource content cannot exceed 3000 lines')}`)
return false
}
@@ -172,7 +170,6 @@
created () {
},
mounted () {
- this.$modal.destroy()
this._handlerEditor()
},
destroyed () {
@@ -180,7 +177,7 @@
editor.off($('.code-create-mirror'), 'keypress', this.keypress)
},
computed: {},
- components: { mListConstruction, mConditions, mSpin, mListBoxF }
+ components: { mListConstruction, mListBoxF }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/createFolder/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/createFolder/index.vue
index be53033642..7253101307 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/createFolder/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/createFolder/index.vue
@@ -21,47 +21,34 @@
* {{$t('Folder Name')}}
-
-
+ size="small"
+ :placeholder="$t('Please enter name')">
+
-
{{$t('Description')}}
-
-
+ size="small"
+ :placeholder="$t('Please enter description')">
+
- {{spinnerLoading ? 'Loading...' : $t('Create')}}
- $router.push({name: 'file'})"> {{$t('Cancel')}}
+ {{spinnerLoading ? 'Loading...' : $t('Create')}}
+ $router.push({name: 'file'})"> {{$t('Cancel')}}
@@ -73,11 +60,7 @@
import i18n from '@/module/i18n'
import { mapActions } from 'vuex'
import { folderList } from '../_source/common'
- import { handlerSuffix } from '../details/_source/utils'
import mListBoxF from '@/module/components/listBoxF/listBoxF'
- import mSpin from '@/module/components/spin/spin'
- import mConditions from '@/module/components/conditions/conditions'
- import localStore from '@/module/util/localStorage'
import mListConstruction from '@/module/components/listConstruction/listConstruction'
export default {
@@ -107,7 +90,7 @@
this.$message.success(res.msg)
setTimeout(() => {
this.spinnerLoading = false
- this.$router.push({ path: `/resource/file`})
+ this.$router.push({ path: '/resource/file' })
}, 800)
}).catch(e => {
this.$message.error(e.msg || '')
@@ -122,18 +105,17 @@
}
return true
- },
+ }
},
watch: {},
created () {
},
mounted () {
- this.$modal.destroy()
},
destroyed () {
},
computed: {},
- components: { mListConstruction, mConditions, mSpin, mListBoxF }
+ components: { mListConstruction, mListBoxF }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/createUdfFolder/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/createUdfFolder/index.vue
index 2511452269..17530815ce 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/createUdfFolder/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/createUdfFolder/index.vue
@@ -21,34 +21,34 @@
* {{$t('Folder Name')}}
-
-
+ size="small"
+ :placeholder="$t('Please enter name')">
+
{{$t('Description')}}
-
-
+ size="small"
+ :placeholder="$t('Please enter description')">
+
- {{spinnerLoading ? 'Loading...' : $t('Create')}}
- $router.push({name: 'resource-udf'})"> {{$t('Cancel')}}
+ {{spinnerLoading ? 'Loading...' : $t('Create')}}
+ $router.push({name: 'resource-udf'})"> {{$t('Cancel')}}
@@ -60,11 +60,7 @@
import i18n from '@/module/i18n'
import { mapActions } from 'vuex'
import { folderList } from '../_source/common'
- import { handlerSuffix } from '../details/_source/utils'
import mListBoxF from '@/module/components/listBoxF/listBoxF'
- import mSpin from '@/module/components/spin/spin'
- import mConditions from '@/module/components/conditions/conditions'
- import localStore from '@/module/util/localStorage'
import mListConstruction from '@/module/components/listConstruction/listConstruction'
export default {
@@ -94,7 +90,7 @@
this.$message.success(res.msg)
setTimeout(() => {
this.spinnerLoading = false
- this.$router.push({ path: `/resource/udf/resource`})
+ this.$router.push({ path: '/resource/udf/resource' })
}, 800)
}).catch(e => {
this.$message.error(e.msg || '')
@@ -107,20 +103,18 @@
this.$message.warning(`${i18n.$t('Please enter resource folder name')}`)
return false
}
-
return true
- },
+ }
},
watch: {},
created () {
},
mounted () {
- this.$modal.destroy()
},
destroyed () {
},
computed: {},
- components: { mListConstruction, mConditions, mSpin, mListBoxF }
+ components: { mListConstruction, mListBoxF }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
index b4ee720d12..e3df62b8cf 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/details/index.vue
@@ -21,8 +21,11 @@
{{name}}
-
+
{{size}}
+
+
+
@@ -80,8 +83,11 @@
_go () {
this.$router.push({ name: 'file' })
},
+ close () {
+ this.$router.go(-1)
+ },
_downloadFile () {
- downloadFile('/dolphinscheduler/resources/download', {
+ downloadFile('/resources/download', {
id: this.$route.params.id
})
},
@@ -124,8 +130,8 @@
this._getViewResources()
}, 1000, {
- 'leading': false,
- 'trailing': true
+ leading: false,
+ trailing: true
}),
/**
* down
@@ -137,8 +143,8 @@
this._getViewResources()
}, 1000, {
- 'leading': false,
- 'trailing': true
+ leading: false,
+ trailing: true
}),
/**
* off handle
@@ -232,7 +238,7 @@
position: absolute;
right: 0;
top: 0;
- >i {
+ >em {
font-size: 20px;
color: #2d8cf0;
cursor: pointer;
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue
index 0290af0988..428d7aaf85 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/edit/index.vue
@@ -27,8 +27,8 @@
- {{$t('Return')}}
- {{spinnerLoading ? 'Loading...' : $t('Save')}}
+ {{$t('Return')}}
+ {{spinnerLoading ? 'Loading...' : $t('Save')}}
@@ -80,8 +80,8 @@
...mapActions('resource', ['getViewResources', 'updateContent']),
ok () {
if (this._validation()) {
- this.spinnerLoading = true
- this.updateContent({
+ this.spinnerLoading = true
+ this.updateContent({
id: this.$route.params.id,
content: editor.getValue()
}).then(res => {
@@ -97,7 +97,7 @@
}
},
_validation () {
- if (editor.doc.size>3000) {
+ if (editor.doc.size > 3000) {
this.$message.warning(`${i18n.$t('Resource content cannot exceed 3000 lines')}`)
return false
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
index 4ccfa2eff3..f85c576614 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
@@ -17,113 +17,71 @@
-
-
-
- {{$t('#')}}
-
-
- {{$t('Name')}}
-
-
- {{$t('Whether directory')}}
-
-
- {{$t('File Name')}}
-
-
- {{$t('Description')}}
-
-
- {{$t('Size')}}
-
-
- {{$t('Update Time')}}
-
-
- {{$t('Operation')}}
-
-
-
-
- {{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}
-
-
-
- {{item.alias}}
-
-
-
- {{item.directory? $t('Yes') : $t('No')}}
-
- {{item.fileName}}
-
- {{item.description}}
- -
-
-
- {{_rtSize(item.size)}}
-
-
- {{item.updateTime | formatDate}}
- -
-
-
-
-
-
-
-
-
-
-
-
- {{$t('Delete?')}}
-
-
{{$t('Cancel')}}
-
{{$t('Confirm')}}
+
+
+
+
+
+ {{ scope.row.alias }}
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{scope.row.directory? $t('Yes') : $t('No')}}
+
+
+
+
+
+ {{scope.row.description | filterNull}}
+
+
+
+
+ {{_rtSize(scope.row.size)}}
+
+
+
+
+ {{scope.row.updateTime | formatDate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue
index 2f18985df0..aa25fa62d2 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue
@@ -15,29 +15,29 @@
* limitations under the License.
*/
-
+
* {{$t('Name')}}
-
-
+ size="small"
+ :placeholder="$t('Please enter name')">
+
{{$t('Description')}}
-
-
+ size="small"
+ :placeholder="$t('Please enter description')">
+
@@ -47,7 +47,6 @@
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
index 5cf343ddda..875ed6b2b6 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
@@ -19,11 +19,11 @@
-
- $router.push({name: 'resource-file-createFolder'})">{{$t('Create folder')}}
- $router.push({name: 'resource-file-create'})">{{$t('Create File')}}
- {{$t('Upload Files')}}
-
+
+ $router.push({name: 'resource-file-createFolder'})">{{$t('Create folder')}}
+ $router.push({name: 'resource-file-create'})">{{$t('Create File')}}
+ {{$t('Upload Files')}}
+
@@ -32,7 +32,16 @@
-
+
+
@@ -92,15 +101,15 @@
this.searchParams.pageSize = val
},
_getList (flag) {
- if(sessionStorage.getItem('isLeft')==0) {
+ if (sessionStorage.getItem('isLeft') === 0) {
this.isLeft = false
} else {
this.isLeft = true
}
this.isLoading = !flag
this.getResourcesListP(this.searchParams).then(res => {
- if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
- this.searchParams.pageNo = this.searchParams.pageNo -1
+ if (this.searchParams.pageNo > 1 && res.totalList.length === 0) {
+ this.searchParams.pageNo = this.searchParams.pageNo - 1
} else {
this.fileResourcesList = res.totalList
this.total = res.total
@@ -115,7 +124,7 @@
this.searchParams.searchVal = ''
this._debounceGET()
},
- _onUpdate () {
+ _onUpdate () {
this._debounceGET()
}
},
@@ -129,10 +138,9 @@
created () {
},
mounted () {
- this.$modal.destroy()
},
beforeDestroy () {
- sessionStorage.setItem('isLeft',1)
+ sessionStorage.setItem('isLeft', 1)
},
components: { mListConstruction, mConditions, mList, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subFile/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subFile/index.vue
index 9894ff96ee..2936aad760 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subFile/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subFile/index.vue
@@ -21,39 +21,40 @@
* {{$t('File Name')}}
-
-
+ size="small"
+ :placeholder="$t('Please enter name')">
+
* {{$t('File Format')}}
-
-
+
-
-
+
+
{{$t('Description')}}
-
-
+
@@ -66,8 +67,8 @@
- {{spinnerLoading ? 'Loading...' : $t('Create')}}
- $router.push({name: 'file'})"> {{$t('Cancel')}}
+ {{spinnerLoading ? 'Loading...' : $t('Create')}}
+ $router.push({name: 'file'})"> {{$t('Cancel')}}
@@ -82,8 +83,6 @@
import { handlerSuffix } from '../details/_source/utils'
import codemirror from '../_source/codemirror'
import mListBoxF from '@/module/components/listBoxF/listBoxF'
- import mSpin from '@/module/components/spin/spin'
- import mConditions from '@/module/components/conditions/conditions'
import localStore from '@/module/util/localStorage'
import mListConstruction from '@/module/components/listConstruction/listConstruction'
@@ -120,7 +119,7 @@
this.$message.success(res.msg)
setTimeout(() => {
this.spinnerLoading = false
- this.$router.push({ path: `/resource/file/subdirectory/${this.$route.params.id}`})
+ this.$router.push({ path: `/resource/file/subdirectory/${this.$route.params.id}` })
}, 800)
}).catch(e => {
this.$message.error(e.msg || '')
@@ -137,7 +136,7 @@
this.$message.warning(`${i18n.$t('Please enter the resource content')}`)
return false
}
- if (editor.doc.size>3000) {
+ if (editor.doc.size > 3000) {
this.$message.warning(`${i18n.$t('Resource content cannot exceed 3000 lines')}`)
return false
}
@@ -173,7 +172,6 @@
created () {
},
mounted () {
- this.$modal.destroy()
this._handlerEditor()
},
destroyed () {
@@ -181,7 +179,7 @@
editor.off($('.code-create-mirror'), 'keypress', this.keypress)
},
computed: {},
- components: { mListConstruction, mConditions, mSpin, mListBoxF }
+ components: { mListConstruction, mListBoxF }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subFileFolder/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subFileFolder/index.vue
index 9f903a127b..2b323b9f89 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subFileFolder/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subFileFolder/index.vue
@@ -21,47 +21,34 @@
* {{$t('Folder Name')}}
-
-
+ size="small"
+ :placeholder="$t('Please enter name')">
+
-
{{$t('Description')}}
-
-
+ size="small"
+ :placeholder="$t('Please enter description')">
+
- {{spinnerLoading ? 'Loading...' : $t('Create')}}
- $router.push({name: 'file'})"> {{$t('Cancel')}}
+ {{spinnerLoading ? 'Loading...' : $t('Create')}}
+ $router.push({name: 'file'})"> {{$t('Cancel')}}
@@ -73,10 +60,7 @@
import i18n from '@/module/i18n'
import { mapActions } from 'vuex'
import { folderList } from '../_source/common'
- import { handlerSuffix } from '../details/_source/utils'
import mListBoxF from '@/module/components/listBoxF/listBoxF'
- import mSpin from '@/module/components/spin/spin'
- import mConditions from '@/module/components/conditions/conditions'
import localStore from '@/module/util/localStorage'
import mListConstruction from '@/module/components/listConstruction/listConstruction'
@@ -107,7 +91,7 @@
this.$message.success(res.msg)
setTimeout(() => {
this.spinnerLoading = false
- this.$router.push({ path: `/resource/file/subdirectory/${this.$route.params.id}`})
+ this.$router.push({ path: `/resource/file/subdirectory/${this.$route.params.id}` })
}, 800)
}).catch(e => {
this.$message.error(e.msg || '')
@@ -122,18 +106,17 @@
}
return true
- },
+ }
},
watch: {},
created () {
},
mounted () {
- this.$modal.destroy()
},
destroyed () {
},
computed: {},
- components: { mListConstruction, mConditions, mSpin, mListBoxF }
+ components: { mListConstruction, mListBoxF }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
index f5e801a205..b51545ef3b 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/list.vue
@@ -17,113 +17,71 @@
-
-
-
- {{$t('#')}}
-
-
- {{$t('Name')}}
-
-
- {{$t('Whether directory')}}
-
-
- {{$t('File Name')}}
-
-
- {{$t('Description')}}
-
-
- {{$t('Size')}}
-
-
- {{$t('Update Time')}}
-
-
- {{$t('Operation')}}
-
-
-
-
- {{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}
-
-
-
- {{item.alias}}
-
-
-
- {{item.directory? $t('Yes') : $t('No')}}
-
- {{item.fileName}}
-
- {{item.description}}
- -
-
-
- {{_rtSize(item.size)}}
-
-
- {{item.updateTime | formatDate}}
- -
-
-
-
-
-
-
-
-
-
-
-
- {{$t('Delete?')}}
-
-
{{$t('Cancel')}}
-
{{$t('Confirm')}}
+
+
+
+
+
+ {{ scope.row.alias }}
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{scope.row.directory? $t('Yes') : $t('No')}}
+
+
+
+
+
+ {{scope.row.description | filterNull}}
+
+
+
+
+ {{_rtSize(scope.row.size)}}
+
+
+
+
+ {{scope.row.updateTime | formatDate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/rename.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/rename.vue
index 6f7dacae89..d649a1551d 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/rename.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/_source/rename.vue
@@ -15,29 +15,29 @@
* limitations under the License.
*/
-
+
* {{$t('Name')}}
-
-
+ size="small"
+ :placeholder="$t('Please enter name')">
+
{{$t('Description')}}
-
-
+ size="small"
+ :placeholder="$t('Please enter description')">
+
@@ -67,12 +67,12 @@
_ok (fn) {
this._verification().then(res => {
if (this.name === this.item.alias) {
- return new Promise((resolve,reject) => {
- this.description === this.item.description ? reject({msg:'内容未修改'}) : resolve()
+ return new Promise((resolve, reject) => {
+ this.description === this.item.description ? reject({ msg: '内容未修改' }) : resolve()
})
- }else{
+ } else {
return this.store.dispatch('resource/resourceVerifyName', {
- fullName: localStore.getItem('currentDir')+'/'+this.name,
+ fullName: localStore.getItem('currentDir') + '/' + this.name,
type: 'FILE'
})
}
@@ -101,8 +101,10 @@
} else {
resolve()
}
-
})
+ },
+ close () {
+ this.$emit('close')
}
},
watch: {},
@@ -117,4 +119,4 @@
},
components: { mPopup, mListBoxF }
}
-
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
index dac5cc0a86..6c19297e6d 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/subdirectory/index.vue
@@ -23,11 +23,11 @@
-
- $router.push({path: `/resource/file/subFileFolder/${searchParams.id}`})">{{$t('Create folder')}}
- $router.push({path: `/resource/file/subFile/${searchParams.id}`})">{{$t('Create File')}}
- {{$t('Upload Files')}}
-
+
+ $router.push({path: `/resource/file/subFileFolder/${searchParams.id}`})">{{$t('Create folder')}}
+ $router.push({path: `/resource/file/subFile/${searchParams.id}`})">{{$t('Create File')}}
+ {{$t('Upload Files')}}
+
@@ -36,7 +36,16 @@
-
+
+
@@ -57,7 +66,6 @@
import mNoData from '@/module/components/noData/noData'
import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
import mConditions from '@/module/components/conditions/conditions'
- import mListConstruction from '@/module/components/listConstruction/listConstruction'
export default {
name: 'resource-list-index-FILE',
@@ -80,12 +88,12 @@
mixins: [listUrlParamHandle],
props: {},
methods: {
- ...mapActions('resource', ['getResourcesListP','getResourceId']),
+ ...mapActions('resource', ['getResourcesListP', 'getResourceId']),
/**
* File Upload
*/
_uploading () {
- findComponentDownward(this.$root, 'roof-nav')._fileChildUpdate('FILE',this.searchParams.id)
+ findComponentDownward(this.$root, 'roof-nav')._fileChildUpdate('FILE', this.searchParams.id)
},
_onConditions (o) {
this.searchParams = _.assign(this.searchParams, o)
@@ -98,15 +106,15 @@
this.searchParams.pageSize = val
},
_getList (flag) {
- if(sessionStorage.getItem('isLeft')==0) {
+ if (sessionStorage.getItem('isLeft') === 0) {
this.isLeft = false
} else {
this.isLeft = true
}
this.isLoading = !flag
this.getResourcesListP(this.searchParams).then(res => {
- if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
- this.searchParams.pageNo = this.searchParams.pageNo -1
+ if (this.searchParams.pageNo > 1 && res.totalList.length === 0) {
+ this.searchParams.pageNo = this.searchParams.pageNo - 1
} else {
this.fileResourcesList = res.totalList
this.total = res.total
@@ -122,20 +130,20 @@
this.searchParams.searchVal = ''
this._debounceGET()
},
- _onUpdate () {
+ _onUpdate () {
this.searchParams.id = this.$route.params.id
this._debounceGET()
},
- _ckOperation(index) {
- let breadName =''
+ _ckOperation (index) {
+ let breadName = ''
this.breadList.forEach((item, i) => {
- if(i<=index) {
- breadName = breadName+'/'+item
+ if (i <= index) {
+ breadName = breadName + '/' + item
}
})
this.transferApi(breadName)
},
- transferApi(api) {
+ transferApi (api) {
this.getResourceId({
type: 'FILE',
fullName: api
@@ -163,12 +171,11 @@
let dir = localStore.getItem('currentDir').split('/')
dir.shift()
this.breadList = dir
- this.$modal.destroy()
},
beforeDestroy () {
- sessionStorage.setItem('isLeft',1)
+ sessionStorage.setItem('isLeft', 1)
},
- components: { mListConstruction, mConditions, mList, mSpin, mNoData }
+ components: { mConditions, mList, mSpin, mNoData }
}
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
index 5991196389..0c5150e45b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue
@@ -17,46 +17,25 @@
-
-
-
- {{$t('#')}}
-
-
- {{$t('Group')}}
-
-
- IPList
-
-
- {{$t('Create Time')}}
-
-
- {{$t('Update Time')}}
-
-
-
-
- {{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}
-
-
-
- {{item.name}}
-
-
-
- {{item.ipList.join(',')}}
-
-
- {{item.createTime | formatDate}}
- -
-
-
- {{item.updateTime | formatDate}}
- -
-
-
-
+
+
+
+
+
+ {{scope.row.ipList.join(',')}}
+
+
+
+
+ {{scope.row.createTime | formatDate}}
+
+
+
+
+ {{scope.row.updateTime | formatDate}}
+
+
+
@@ -77,18 +56,13 @@
},
methods: {
...mapActions('security', ['deleteWorkerGroups']),
- _closeDelete (i) {
- this.$refs[`poptip-delete-${i}`][0].doClose()
- },
_delete (item, i) {
this.deleteWorkerGroups({
id: item.id
}).then(res => {
- this.$refs[`poptip-delete-${i}`][0].doClose()
this.$emit('on-update')
this.$message.success(res.msg)
}).catch(e => {
- this.$refs[`poptip-delete-${i}`][0].doClose()
this.$message.error(e.msg || '')
})
},
@@ -108,6 +82,6 @@
this.list = this.workerGroupList
},
mounted () {},
- components: {},
+ components: {}
}
-
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
index 32bb8620a6..7f8bc6c445 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
@@ -28,7 +28,16 @@
:page-size="searchParams.pageSize">
-
+
+
@@ -44,7 +53,6 @@
import mList from './_source/list'
import store from '@/conf/home/store'
import mSpin from '@/module/components/spin/spin'
- import mCreateWorker from './_source/createWorker'
import mNoData from '@/module/components/noData/noData'
import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
import mConditions from '@/module/components/conditions/conditions'
@@ -88,37 +96,11 @@
_onEdit (item) {
this._create(item)
},
- _create (item) {
- let self = this
- let modal = this.$modal.dialog({
- closable: false,
- showMask: true,
- escClose: true,
- className: 'v-modal-custom',
- transitionName: 'opacityp',
- render (h) {
- return h(mCreateWorker, {
- on: {
- onUpdate () {
- self._debounceGET('false')
- modal.remove()
- },
- close () {
- modal.remove()
- }
- },
- props: {
- item: item
- }
- })
- }
- })
- },
_getList (flag) {
this.isLoading = !flag
this.getWorkerGroups(this.searchParams).then(res => {
- if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
- this.searchParams.pageNo = this.searchParams.pageNo -1
+ if (this.searchParams.pageNo > 1 && res.totalList.length === 0) {
+ this.searchParams.pageNo = this.searchParams.pageNo - 1
} else {
this.workerGroupList = []
this.workerGroupList = res.totalList
@@ -139,7 +121,6 @@
},
created () {},
mounted () {
- this.$modal.destroy()
},
components: { mList, mListConstruction, mConditions, mSpin, mNoData }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/index.vue
index 6ce7036652..8219a5f17f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/index.vue
@@ -25,9 +25,8 @@
import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
export default {
name: 'user-index',
- mounted() {
- this.$modal.destroy()
+ mounted () {
},
components: { mSecondaryMenu }
}
-
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue
index f199527176..0c7467b294 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/_source/info.vue
@@ -43,7 +43,7 @@
{{$t('Tenant')}}
- {{userInfo.tenantName}}
+ {{userInfo.tenantCode}}
@@ -67,7 +67,12 @@
- {{$t('Edit')}}
+ {{$t('Edit')}}
+
+
+
@@ -80,7 +85,10 @@
export default {
name: 'user-info',
data () {
- return {}
+ return {
+ createUserDialog: false,
+ item: {}
+ }
},
props: {},
methods: {
@@ -89,35 +97,21 @@
* edit
*/
_edit () {
- let item = this.userInfo
- let self = this
- let modal = this.$modal.dialog({
- closable: false,
- showMask: true,
- escClose: true,
- className: 'v-modal-custom',
- transitionName: 'opacityp',
- render (h) {
- return h(mCreateUser, {
- on: {
- onUpdate (param) {
- self.setUserInfo({
- userName: param.userName,
- userPassword: param.userPassword,
- email: param.email,
- phone: param.phone
- })
- modal.remove()
- },
- close () {
- }
- },
- props: {
- item: item
- }
- })
- }
+ this.item = this.userInfo
+ this.createUserDialog = true
+ },
+ onUpdate (param) {
+ this.setUserInfo({
+ userName: param.userName,
+ userPassword: param.userPassword,
+ email: param.email,
+ phone: param.phone
})
+ this.createUserDialog = false
+ },
+
+ close () {
+ this.createUserDialog = false
}
},
watch: {},
@@ -128,7 +122,7 @@
computed: {
...mapState('user', ['userInfo'])
},
- components: { mListBoxF }
+ components: { mListBoxF, mCreateUser }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/index.vue
index 7bcc7465c3..69796705fb 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/index.vue
@@ -27,9 +27,8 @@
export default {
name: 'account-index',
- mounted() {
- this.$modal.destroy()
+ mounted () {
},
components: { mListConstruction, mInfo }
}
-
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue
index 132f6d9d24..5c19b5605a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/_source/info.vue
@@ -25,29 +25,31 @@
{{$t('Password')}}
-
-
+
{{$t('Confirm Password')}}
-
-
+
- {{spinnerLoading ? 'Loading...' : $t('Edit')}}
+ {{spinnerLoading ? 'Loading...' : $t('Edit')}}
@@ -105,7 +107,7 @@
* verification
*/
_verification () {
- let regPassword = /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?![`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘’,。、]+$)[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘’,。、0-9A-Za-z]{6,22}$/;
+ let regPassword = /^(?![0-9]+$)(?![a-z]+$)(?![A-Z]+$)(?![`~!@#$%^&*()_\-+=<>?:"{}|,./;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘’,。、]+$)[`~!@#$%^&*()_\-+=<>?:"{}|,./;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘’,。、0-9A-Za-z]{6,22}$/
// password
if (!regPassword.test(this.userPassword)) {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/index.vue
index 4a7c80ec34..2ec45785fc 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/index.vue
@@ -27,9 +27,8 @@
export default {
name: 'password-index',
- mounted() {
- this.$modal.destroy()
+ mounted () {
},
components: { mListConstruction, mInfo }
}
-
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue
index 5cc1ca8d8f..36d8009a6a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/createToken.vue
@@ -19,45 +19,48 @@
ref="popup"
:ok-text="item ? $t('Edit') : $t('Submit')"
:nameText="item ? $t('Edit token') : $t('Create token')"
- @ok="_ok">
+ @ok="_ok"
+ @close="close">
- * {{$t('Failure time')}}
+ * {{$t('Expiration time')}}
-
-
+
+
* {{$t('User')}}
-
-
+
-
-
+
+
Token
-
-
- {{$t('Generate token')}}
+
+ {{$t('Generate token')}}
@@ -84,7 +87,12 @@
token: '',
userIdList: [],
tokenLoading: false,
- auth: !Permissions.getAuth()
+ auth: !Permissions.getAuth(),
+ pickerOptions: {
+ disabledDate (time) {
+ return time.getTime() < Date.now() - 8.64e7 // 当前时间以后可以选择当前时间
+ }
+ }
}
},
props: {
@@ -112,21 +120,21 @@
if (this.item) {
param.id = this.item.id
}
- this.$refs['popup'].spinnerLoading = true
+ this.$refs.popup.spinnerLoading = true
this.store.dispatch(`user/${this.item ? 'updateToken' : 'createToken'}`, param).then(res => {
this.$emit('onUpdate')
this.$message.success(res.msg)
setTimeout(() => {
- this.$refs['popup'].spinnerLoading = false
+ this.$refs.popup.spinnerLoading = false
}, 800)
}).catch(e => {
this.$message.error(e.msg || '')
- this.$refs['popup'].spinnerLoading = false
+ this.$refs.popup.spinnerLoading = false
})
},
_generateToken () {
this.tokenLoading = true
- this.store.dispatch(`user/generateToken`, {
+ this.store.dispatch('user/generateToken', {
userId: this.userId,
expireTime: this.expireTime
}).then(res => {
@@ -142,6 +150,9 @@
},
_onChange () {
this.token = ''
+ },
+ close () {
+ this.$emit('close')
}
},
watch: {},
@@ -156,7 +167,7 @@
}
}
if (this.auth) {
- this.store.dispatch(`security/getUsersAll`).then(res => {
+ this.store.dispatch('security/getUsersAll').then(res => {
this.userIdList = _.map(res, v => _.pick(v, ['id', 'userName']))
d(this.userIdList[0].id)
})
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
index 9507d6dc7f..4f9a37316e 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue
@@ -17,72 +17,45 @@
-
-
-
- {{$t('#')}}
-
-
- {{$t('User')}}
-
-
- Token
-
-
- {{$t('Failure time')}}
-
-
- {{$t('Create Time')}}
-
-
- {{$t('Update Time')}}
-
-
- {{$t('Operation')}}
-
-
-
-
- {{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}
-
-
-
- {{item.userName}}
-
-
- {{item.token}}
-
- {{item.expireTime | formatDate}}
- -
-
-
- {{item.createTime | formatDate}}
- -
-
-
- {{item.updateTime | formatDate}}
- -
-
-
-
-
-
- {{$t('Delete?')}}
-
- {{$t('Cancel')}}
- {{$t('Confirm')}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{scope.row.expireTime | formatDate}}
+
+
+
+
+ {{scope.row.createTime | formatDate}}
+
+
+
+
+ {{scope.row.updateTime | formatDate}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -103,18 +76,13 @@
},
methods: {
...mapActions('user', ['deleteToken']),
- _closeDelete (i) {
- this.$refs[`poptip-delete-${i}`][0].doClose()
- },
_delete (item, i) {
this.deleteToken({
id: item.id
}).then(res => {
- this.$refs[`poptip-delete-${i}`][0].doClose()
this.$emit('on-update')
this.$message.success(res.msg)
}).catch(e => {
- this.$refs[`poptip-delete-${i}`][0].doClose()
this.$message.error(e.msg || '')
})
},
@@ -137,4 +105,4 @@
},
components: { }
}
-
\ No newline at end of file
+
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
index 3398acca13..807a9a76eb 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
@@ -19,22 +19,35 @@
- {{$t('Create token')}}
+ {{$t('Create token')}}
+
+
+
-
-
-
+
+
@@ -53,7 +66,6 @@
import mNoData from '@/module/components/noData/noData'
import listUrlParamHandle from '@/module/mixin/listUrlParamHandle'
import mConditions from '@/module/components/conditions/conditions'
- import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
import mListConstruction from '@/module/components/listConstruction/listConstruction'
export default {
@@ -68,7 +80,8 @@
pageNo: 1,
searchVal: ''
},
- isLeft: true
+ isLeft: true,
+ createTokenDialog: false
}
},
mixins: [listUrlParamHandle],
@@ -95,41 +108,28 @@
this._debounceGET()
},
_create (item) {
- let self = this
- let modal = this.$modal.dialog({
- closable: false,
- showMask: true,
- escClose: true,
- className: 'v-modal-custom',
- transitionName: 'opacityp',
- render (h) {
- return h(mCreateToken, {
- on: {
- onUpdate () {
- self._debounceGET('false')
- modal.remove()
- },
- close () {
- modal.remove()
- }
- },
- props: {
- item: item
- }
- })
- }
- })
+ this.item = item
+ this.createTokenDialog = true
},
+ onUpdate () {
+ this._debounceGET('false')
+ this.createTokenDialog = false
+ },
+
+ close () {
+ this.createTokenDialog = false
+ },
+
_getList (flag) {
- if(sessionStorage.getItem('isLeft')==0) {
+ if (sessionStorage.getItem('isLeft') === 0) {
this.isLeft = false
} else {
this.isLeft = true
}
this.isLoading = !flag
this.getTokenListP(this.searchParams).then(res => {
- if(this.searchParams.pageNo>1 && res.totalList.length == 0) {
- this.searchParams.pageNo = this.searchParams.pageNo -1
+ if (this.searchParams.pageNo > 1 && res.totalList.length === 0) {
+ this.searchParams.pageNo = this.searchParams.pageNo - 1
} else {
this.tokenList = []
this.tokenList = res.totalList
@@ -151,11 +151,10 @@
created () {
},
mounted () {
- this.$modal.destroy()
},
beforeDestroy () {
- sessionStorage.setItem('isLeft',1)
+ sessionStorage.setItem('isLeft', 1)
},
- components: { mSecondaryMenu, mList, mListConstruction, mConditions, mSpin, mNoData }
+ components: { mList, mListConstruction, mConditions, mSpin, mNoData, mCreateToken }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/router/index.js b/dolphinscheduler-ui/src/js/conf/home/router/index.js
index 5f6f20b375..b65586c433 100644
--- a/dolphinscheduler-ui/src/js/conf/home/router/index.js
+++ b/dolphinscheduler-ui/src/js/conf/home/router/index.js
@@ -397,14 +397,6 @@ const router = new Router({
meta: {
title: `${i18n.$t('Token manage')}`
}
- },
- {
- path: '/security/Alarm-plugin-example',
- name: 'Alarm-plugin-example',
- component: resolve => require(['../pages/security/pages/alarmPluginExample/index'], resolve),
- meta: {
- title: `${i18n.$t('Alarm plugin example')}`
- }
}
]
},
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
index b35d07052a..7f895db2b4 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
@@ -21,21 +21,21 @@ import { tasksState } from '@/conf/home/pages/dag/_source/config'
// delete 'definitionList' from tasks
const deleteDefinitionList = (tasks) => {
- const newTasks = [];
+ const newTasks = []
tasks.forEach(item => {
- const newItem = Object.assign({}, item);
- if(newItem.dependence && newItem.dependence.dependTaskList) {
+ const newItem = Object.assign({}, item)
+ if (newItem.dependence && newItem.dependence.dependTaskList) {
newItem.dependence.dependTaskList.forEach(dependTaskItem => {
if (dependTaskItem.dependItemList) {
dependTaskItem.dependItemList.forEach(dependItem => {
- Reflect.deleteProperty(dependItem, 'definitionList');
+ Reflect.deleteProperty(dependItem, 'definitionList')
})
}
})
}
- newTasks.push(newItem);
- });
- return newTasks;
+ newTasks.push(newItem)
+ })
+ return newTasks
}
export default {
@@ -227,7 +227,7 @@ export default {
*/
getAllItems ({ state }, payload) {
return new Promise((resolve, reject) => {
- io.get(`projects/login-user-created-project`, {}, res => {
+ io.get('projects/created-and-authorized-project', {}, res => {
resolve(res)
}).catch(e => {
reject(e)
@@ -689,7 +689,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)
}, e => {
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js b/dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js
index 11395dbc5d..29b13a0cda 100755
--- a/dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js
@@ -140,9 +140,9 @@ export default {
y: parseInt(dom.css('top'), 10)
})
},
- addConnects(state, payload) {
+ addConnects (state, payload) {
state.connects = _.map(state.connects, v => {
- if(v.endPointSourceId===payload.sourceId && v.endPointTargetId===payload.targetId) {
+ if (v.endPointSourceId === payload.sourceId && v.endPointTargetId === payload.targetId) {
v.label = payload.labelName
}
return v
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/kinship/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/kinship/actions.js
index f87a57d17f..dc444462e9 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/kinship/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/kinship/actions.js
@@ -24,18 +24,18 @@ export default {
* Get workFlow DAG
*/
getWorkFlowList ({ state }, payload) {
- const projectId = localStore.getItem('projectId');
+ const projectId = localStore.getItem('projectId')
return new Promise((resolve, reject) => {
- const url = `lineages/${projectId}/list-name`;
+ const url = `lineages/${projectId}/list-name`
io.get(url, {
- searchVal: payload,
+ searchVal: payload
}, res => {
- const workList = [];
+ const workList = []
if (res.data) {
_.map(res.data, (item) => {
workList.push({
id: `${item.workFlowId}`,
- name: item.workFlowName,
+ name: item.workFlowName
})
})
}
@@ -50,14 +50,14 @@ export default {
* Get workFlow DAG
*/
getWorkFlowDAG ({ state }, payload) {
- const projectId = localStore.getItem('projectId');
+ const projectId = localStore.getItem('projectId')
return new Promise((resolve, reject) => {
- const url = `lineages/${projectId}/list-ids`;
+ const url = `lineages/${projectId}/list-ids`
io.get(url, {
- ids: payload,
+ ids: payload
}, res => {
- let locations = [];
- let connects = [];
+ let locations = []
+ let connects = []
if (res.data.workFlowList) {
locations = _.uniqBy(res.data.workFlowList, 'workFlowId').map((item) => ({
id: `${item.workFlowId}`,
@@ -72,10 +72,10 @@ export default {
if (res.data.workFlowRelationList) {
connects = _.map(res.data.workFlowRelationList, (item) => ({
source: `${item.sourceWorkFlowId}`, // should be string, or connects will not show by echarts
- target: `${item.targetWorkFlowId}`, // should be string, or connects will not show by echarts
+ target: `${item.targetWorkFlowId}` // should be string, or connects will not show by echarts
}))
}
- state.sourceWorkFlowId = payload || '';
+ state.sourceWorkFlowId = payload || ''
// locations
state.locations = locations /* JSON.parse(locations) */
// connects
@@ -85,5 +85,5 @@ export default {
reject(res)
})
})
- },
+ }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/projects/mutations.js b/dolphinscheduler-ui/src/js/conf/home/store/projects/mutations.js
index e84c864c3c..ebb80c92b0 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/projects/mutations.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/projects/mutations.js
@@ -16,4 +16,10 @@
*/
export default {
+ /**
+ * set sideBar
+ * */
+ setSideBar (state, payload) {
+ state.sideBar = payload
+ }
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/projects/state.js b/dolphinscheduler-ui/src/js/conf/home/store/projects/state.js
index ddcb8e289d..e5263050dc 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/projects/state.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/projects/state.js
@@ -15,5 +15,5 @@
* limitations under the License.
*/
export default {
-
+ sideBar: 1
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
index d1d23897f3..363dee7e39 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
@@ -282,7 +282,7 @@ export default {
const list = res.data
list.unshift({
id: -1,
- tenantName: 'default'
+ tenantCode: 'default'
})
state.tenantAllList = list
resolve(list)
diff --git a/dolphinscheduler-ui/src/js/conf/login/App.vue b/dolphinscheduler-ui/src/js/conf/login/App.vue
index 8d065920a8..3eaf4d14b4 100644
--- a/dolphinscheduler-ui/src/js/conf/login/App.vue
+++ b/dolphinscheduler-ui/src/js/conf/login/App.vue
@@ -19,18 +19,17 @@
-
+
@@ -84,13 +82,13 @@
this._gLogin().then(res => {
setTimeout(() => {
this.spinnerLoading = false
- sessionStorage.setItem('isLeft',1);
- if (res.data.hasOwnProperty("sessionId")) {
- let sessionId=res.data.sessionId
- sessionStorage.setItem("sessionId", sessionId)
- cookies.set('sessionId', sessionId,{ path: '/' })
+ sessionStorage.setItem('isLeft', 1)
+ if (res.data.hasOwnProperty('sessionId')) {
+ let sessionId = res.data.sessionId
+ sessionStorage.setItem('sessionId', sessionId)
+ cookies.set('sessionId', sessionId, { path: '/' })
}
-
+
if (this.userName === 'admin') {
window.location.href = `${PUBLIC_PATH}/#/security/tenant`
} else {
@@ -120,7 +118,7 @@
},
_gLogin () {
return new Promise((resolve, reject) => {
- io.post(`login`, {
+ io.post('login', {
userName: this.userName,
userPassword: this.userPassword
}, res => {
@@ -170,7 +168,7 @@
margin: 0 auto;
}
}
- .from-model {
+ .form-model {
padding: 30px 20px;
.list {
margin-bottom: 24px;
diff --git a/dolphinscheduler-ui/src/js/conf/login/index.js b/dolphinscheduler-ui/src/js/conf/login/index.js
index 2cb2a8e1d0..652c80f278 100644
--- a/dolphinscheduler-ui/src/js/conf/login/index.js
+++ b/dolphinscheduler-ui/src/js/conf/login/index.js
@@ -18,26 +18,20 @@
// The Vue build version to load with the `import` command
// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
// import $ from 'jquery'
+import 'babel-polyfill'
import Vue from 'vue'
import ElementUI from 'element-ui'
import locale from 'element-ui/lib/locale/lang/en'
import 'element-ui/lib/theme-chalk/index.css'
import App from './App'
import i18n from '@/module/i18n'
-import 'ans-ui/lib/ans-ui.min.css'
-import ans from 'ans-ui/lib/ans-ui.min'
import 'sass/conf/login/index.scss'
import 'bootstrap/dist/js/bootstrap.min.js'
-
-import formCreate, {maker} from '@form-create/element-ui'
+import 'font-awesome/css/font-awesome.min.css'
i18n.globalScope.LOCALE === 'en_US' ? Vue.use(ElementUI, { locale }) : Vue.use(ElementUI)
-Vue.use(ans)
-
-Vue.use(formCreate, {maker})
-
Vue.config.devtools = true
Vue.config.productionTip = true
Vue.config.silent = true
diff --git a/dolphinscheduler-ui/src/js/module/axios/jsonp.js b/dolphinscheduler-ui/src/js/module/axios/jsonp.js
index 0459d61c52..7bc2fe328b 100755
--- a/dolphinscheduler-ui/src/js/module/axios/jsonp.js
+++ b/dolphinscheduler-ui/src/js/module/axios/jsonp.js
@@ -20,7 +20,7 @@ module.exports = jsonp
* Callback index.
*/
-var count = 0
+let count = 0
/**
* Noop function.
@@ -51,19 +51,19 @@ function jsonp (url, opts, fn) {
}
if (!opts) opts = {}
- var prefix = opts.prefix || '__jp'
+ let prefix = opts.prefix || '__jp'
// use the callback name that was passed if one was provided.
// otherwise generate a unique name by incrementing our counter.
- var id = opts.name || (prefix + (count++))
+ let id = opts.name || (prefix + (count++))
- var param = opts.param || 'callback'
- var timeout = opts.timeout != null ? opts.timeout : 60000
- var enc = encodeURIComponent
+ let param = opts.param || 'callback'
+ let timeout = opts.timeout !== null ? opts.timeout : 60000
+ let enc = encodeURIComponent
/* istanbul ignore next */
- var target = document.getElementsByTagName('script')[0] || document.head
- var script
- var timer
+ let target = document.getElementsByTagName('script')[0] || document.head
+ let script
+ let timer
/* istanbul ignore else */
if (timeout) {
timer = setTimeout(
@@ -102,7 +102,7 @@ function jsonp (url, opts, fn) {
url = url.replace('?&', '?')
// debug('jsonp req "%s"', url);
- var handler = ({ type }) => {
+ let handler = ({ type }) => {
/* istanbul ignore else */
if (type === 'error') {
cleanup()
diff --git a/dolphinscheduler-ui/src/js/module/axios/querystring.js b/dolphinscheduler-ui/src/js/module/axios/querystring.js
index 7ac580c4df..87a236d8cb 100755
--- a/dolphinscheduler-ui/src/js/module/axios/querystring.js
+++ b/dolphinscheduler-ui/src/js/module/axios/querystring.js
@@ -15,18 +15,18 @@
* limitations under the License.
*/
/* istanbul ignore next */
-var param = function (a) {
- var s = []
- var rbracket = /\[\]$/
- var isArray = function (obj) {
+let param = function (a) {
+ let s = []
+ let rbracket = /\[\]$/
+ let isArray = function (obj) {
return Object.prototype.toString.call(obj) === '[object Array]'
}
- var add = function (k, v) {
+ let add = function (k, v) {
v = typeof v === 'function' ? v() : v === null ? '' : v === undefined ? '' : v
s[s.length] = encodeURIComponent(k) + '=' + encodeURIComponent(v)
}
- var buildParams = function (prefix, obj) {
- var i, len, key
+ let buildParams = function (prefix, obj) {
+ let i, len, key
if (prefix) {
if (isArray(obj)) {
diff --git a/dolphinscheduler-ui/src/js/module/components/conditions/conditions.vue b/dolphinscheduler-ui/src/js/module/components/conditions/conditions.vue
index d160566af5..cbf731e309 100644
--- a/dolphinscheduler-ui/src/js/module/components/conditions/conditions.vue
+++ b/dolphinscheduler-ui/src/js/module/components/conditions/conditions.vue
@@ -24,16 +24,16 @@
-
+
-
-
+
diff --git a/dolphinscheduler-ui/src/js/module/components/crontab/source/_source/input-number.vue b/dolphinscheduler-ui/src/js/module/components/crontab/source/_source/input-number.vue
index ad13327377..74ea132a8a 100755
--- a/dolphinscheduler-ui/src/js/module/components/crontab/source/_source/input-number.vue
+++ b/dolphinscheduler-ui/src/js/module/components/crontab/source/_source/input-number.vue
@@ -16,9 +16,9 @@
*/
- -
-
- +
+ -
+
+ +
+
+
diff --git a/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileChildUpdate.vue b/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileChildUpdate.vue
index 05d12b15e1..a43da69973 100644
--- a/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileChildUpdate.vue
+++ b/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileChildUpdate.vue
@@ -20,6 +20,7 @@
:ok-text="$t('Upload')"
:nameText="$t('File Upload')"
@ok="_ok"
+ @close="close"
:disabled="progress === 0 ? false : true">