Browse Source

Solve the problem that the pop-up box cannot be closed when the brows… (#1392)

* Solve the problem that the pop-up box cannot be closed when the browser returns

* Change the ans-ui version and API interface name
pull/2/head
break60 5 years ago committed by qiaozhanwei
parent
commit
2170702df0
  1. 2
      dolphinscheduler-ui/package.json
  2. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
  3. 5
      dolphinscheduler-ui/src/js/conf/home/pages/home/index.vue
  4. 3
      dolphinscheduler-ui/src/js/conf/home/pages/monitor/index.vue
  5. 1
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue
  6. 1
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/index.vue
  7. 5
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue
  8. 5
      dolphinscheduler-ui/src/js/conf/home/pages/resource/index.vue
  9. 5
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/index.vue
  10. 1
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
  11. 1
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/index.vue
  12. 1
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/index.vue
  13. 1
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/index.vue
  14. 3
      dolphinscheduler-ui/src/js/conf/home/pages/security/index.vue
  15. 2
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/queue/index.vue
  16. 1
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/index.vue
  17. 3
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/token/index.vue
  18. 1
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
  19. 1
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/index.vue
  20. 1
      dolphinscheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/index.vue
  21. 3
      dolphinscheduler-ui/src/js/conf/home/pages/user/index.vue
  22. 3
      dolphinscheduler-ui/src/js/conf/home/pages/user/pages/account/index.vue
  23. 3
      dolphinscheduler-ui/src/js/conf/home/pages/user/pages/password/index.vue
  24. 1
      dolphinscheduler-ui/src/js/conf/home/pages/user/pages/token/index.vue
  25. 2
      dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js

2
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",

2
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

5
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()
},
}
</script>

3
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 }
}
</script>

1
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/index.vue

@ -124,6 +124,7 @@
localStore.removeItem('subProcessId')
},
mounted() {
this.$modal.destroy()
},
components: { mList, mConditions, mSpin, mListConstruction, mSecondaryMenu, mNoData }
}

1
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')

5
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/index.vue

@ -24,7 +24,7 @@
<m-list :task-instance-list="taskInstanceList" :page-no="searchParams.pageNo" :page-size="searchParams.pageSize">
</m-list>
<div class="page-box">
<x-page :current="parseInt(searchParams.pageNo)" :total="total" show-elevator @on-change="_page"></x-page>
<x-page :current="parseInt(searchParams.pageNo)" :total="total" show-elevator @on-change="_page" show-sizer :page-size-options="[10,30,50]" @on-size-change="_pageSize"></x-page>
</div>
</template>
<template v-if="!taskInstanceList.length">
@ -89,6 +89,9 @@
_page (val) {
this.searchParams.pageNo = val
},
_pageSize(val) {
this.searchParams.pageSize = val
},
/**
* get list data
*/

5
dolphinscheduler-ui/src/js/conf/home/pages/resource/index.vue

@ -24,6 +24,9 @@
import mSecondaryMenu from '@/module/components/secondaryMenu/secondaryMenu'
export default {
name: 'resource-index',
components: { mSecondaryMenu }
components: { mSecondaryMenu },
mounted() {
this.$modal.destroy()
},
}
</script>

5
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/index.vue

@ -19,6 +19,9 @@
</template>
<script>
export default {
name: 'file-manage-index'
name: 'file-manage-index',
mounted() {
this.$modal.destroy()
},
}
</script>

1
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 () {

1
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 }
}

1
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 }
}

1
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 }
}

3
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 }
}
</script>

2
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 }
}

1
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 }
}

3
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 }
}
</script>

1
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 }
}

1
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 }
}

1
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 }
}

3
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 }
}
</script>

3
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 }
}
</script>

3
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 }
}
</script>

1
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 }
}

2
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 => {

Loading…
Cancel
Save