diff --git a/dolphinscheduler-ui/package.json b/dolphinscheduler-ui/package.json index fe907e38dd..2aeda8b841 100644 --- a/dolphinscheduler-ui/package.json +++ b/dolphinscheduler-ui/package.json @@ -14,7 +14,7 @@ "build:combined": "npm run clean && cross-env NODE_ENV=production PUBLIC_PATH=/dolphinscheduler/ui webpack --config ./build/webpack.config.combined.js" }, "dependencies": { - "ans-ui": "1.1.3", + "ans-ui": "1.1.4", "axios": "^0.16.2", "jquery": "1.12.4", "vue": "^2.5.17", diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue index 9707449e8b..976e97ede6 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue @@ -282,7 +282,7 @@ * Click external to close the current component */ _handleClose () { - this.close() + // this.close() }, /** * Jump to task instance 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 6d5af6a57a..2c8e188ad8 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/home/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/home/index.vue @@ -23,6 +23,9 @@ import mProjectHome from '@/conf/home/pages/projects/pages/index' import mListConstruction from '@/module/components/listConstruction/listConstruction' export default { name: 'home', - components: { mProjectHome, mListConstruction } + components: { mProjectHome, mListConstruction }, + mounted() { + this.$modal.destroy() + }, } 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 57db3eed25..6a02b09b33 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/monitor/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/monitor/index.vue @@ -25,6 +25,9 @@ import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu' export default { name: 'monitor-index', + mounted() { + this.$modal.destroy() + }, components: { mSecondaryMenu } } \ No newline at end of file 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 8c3d3f1789..84e59d5d2d 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 @@ -123,7 +123,8 @@ created () { localStore.removeItem('subProcessId') }, - mounted () { + mounted() { + this.$modal.destroy() }, components: { mList, mConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue index e68a1d1328..22c6656698 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue @@ -163,6 +163,7 @@ } }, mounted () { + this.$modal.destroy() // Cycle acquisition status this.setIntervalP = setInterval(() => { this._debounceGET('false') 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 b40d235b54..f966d868f6 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 @@ -24,7 +24,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 ba57778e67..c5651adf7c 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 @@ -163,6 +163,7 @@ created () { }, mounted () { + this.$modal.destroy() this._handlerEditor() }, destroyed () { 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 faf9f95901..b48427666f 100644 --- 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 @@ -111,6 +111,7 @@ created () { }, mounted () { + this.$modal.destroy() }, components: { mListConstruction, mConditions, mList, mSpin, mNoData } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue index 2f8a36e824..13d1a8309e 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue @@ -127,6 +127,7 @@ created () { }, mounted () { + this.$modal.destroy() }, components: { mListConstruction, mConditions, mList, mSpin, mCreateUdf, mNoData } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue index 25caf6e483..19c4367eff 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue @@ -109,6 +109,7 @@ created () { }, mounted () { + this.$modal.destroy() }, components: { mListConstruction, mConditions, mList, mSpin, mNoData } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/index.vue index e16787d3da..adc2d24e56 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/index.vue @@ -24,6 +24,9 @@ import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu' export default { name: 'security-index', + mounted() { + this.$modal.destroy() + }, components: { mSecondaryMenu } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue index 44a1145fc2..5acb0b264d 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue @@ -134,7 +134,7 @@ created () { }, mounted () { - + this.$modal.destroy() }, components: { mList, mListConstruction, mConditions, mSpin, mNoData } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue index 536472957b..322ae4837c 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue @@ -134,6 +134,7 @@ created () { }, mounted () { + this.$modal.destroy() }, components: { mList, mListConstruction, mConditions, mSpin, mNoData } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/token/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/token/index.vue index 7f43fd16ad..2b9da2f02e 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/token/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/token/index.vue @@ -21,6 +21,9 @@ import mToken from '@/conf/home/pages/user/pages/token' export default { name: 'token-index', + mounted() { + this.$modal.destroy() + }, components: { mToken } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue index 4aec9642ff..22fdec9b43 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue @@ -132,6 +132,7 @@ created () { }, mounted () { + this.$modal.destroy() }, components: { mList, mListConstruction, mConditions, mSpin, mNoData } } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue index 5a90ba95fe..c85cdd1514 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue @@ -134,6 +134,7 @@ created () { }, mounted () { + this.$modal.destroy() }, components: { mList, mListConstruction, mConditions, mSpin, mNoData } } 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 3cd6752952..9b640650a7 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 @@ -133,6 +133,7 @@ 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 fce413a3a2..6ce7036652 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/user/index.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/user/index.vue @@ -25,6 +25,9 @@ import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu' export default { name: 'user-index', + mounted() { + this.$modal.destroy() + }, components: { mSecondaryMenu } } \ No newline at end of file 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 6fc48e5c48..7bcc7465c3 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,6 +27,9 @@ export default { name: 'account-index', + mounted() { + this.$modal.destroy() + }, components: { mListConstruction, mInfo } } \ No newline at end of file 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 c9bb5829c7..4a7c80ec34 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,6 +27,9 @@ export default { name: 'password-index', + mounted() { + this.$modal.destroy() + }, components: { mListConstruction, mInfo } } \ 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 644abdb560..dba0c950d5 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 @@ -133,6 +133,7 @@ created () { }, mounted () { + this.$modal.destroy() }, components: { mSecondaryMenu, mList, mListConstruction, mConditions, mSpin, mNoData } } 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 b854dc8ade..7ef6193d65 100644 --- a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js +++ b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js @@ -270,7 +270,7 @@ export default { resolve() return } - io.get(`projects/query-project-list`, payload, res => { + io.get(`projects/queryAllProjectList`, payload, res => { state.projectListS = res.data resolve(res.data) }).catch(res => {