Browse Source

[Fix][ui] Fix version control release process definition editable

pull/3/MERGE
Yichao Yang 4 years ago
parent
commit
4387c8a3ee
  1. 3
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
  2. 33
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue

3
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue

@ -790,7 +790,8 @@
props: { props: {
processDefinition: { processDefinition: {
id: self.urlParam.id, id: self.urlParam.id,
version: self.$store.state.dag.version version: self.$store.state.dag.version,
state: self.releaseState
}, },
processDefinitionVersions: processDefinitionVersions, processDefinitionVersions: processDefinitionVersions,
total: total, total: total,

33
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue

@ -67,8 +67,12 @@
width="90"> width="90">
<p>{{$t('Confirm Switch To This Version?')}}</p> <p>{{$t('Confirm Switch To This Version?')}}</p>
<div style="text-align: right; margin: 0;padding-top: 4px;"> <div style="text-align: right; margin: 0;padding-top: 4px;">
<x-button type="text" size="xsmall" shape="circle" @click="_closeSwitchVersion($index)">{{$t('Cancel')}}</x-button> <x-button type="text" size="xsmall" shape="circle" @click="_closeSwitchVersion($index)">
<x-button type="primary" size="xsmall" shape="circle" @click="_mVersionSwitchProcessDefinitionVersion(item)">{{$t('Confirm')}}</x-button> {{$t('Cancel')}}
</x-button>
<x-button type="primary" size="xsmall" shape="circle"
@click="_mVersionSwitchProcessDefinitionVersion(item)">{{$t('Confirm')}}
</x-button>
</div> </div>
<template slot="reference"> <template slot="reference">
<x-button <x-button
@ -76,7 +80,7 @@
type="primary" type="primary"
shape="circle" shape="circle"
size="xsmall" size="xsmall"
:disabled="item.version === processDefinition.version" :disabled="item.version === processDefinition.version || 'ONLINE' === processDefinition.state"
data-toggle="tooltip" data-toggle="tooltip"
:title="$t('Switch To This Version')"> :title="$t('Switch To This Version')">
</x-button> </x-button>
@ -88,8 +92,11 @@
width="90"> width="90">
<p>{{$t('Delete?')}}</p> <p>{{$t('Delete?')}}</p>
<div style="text-align: right; margin: 0;padding-top: 4px;"> <div style="text-align: right; margin: 0;padding-top: 4px;">
<x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('Cancel')}}</x-button> <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('Cancel')}}
<x-button type="primary" size="xsmall" shape="circle" @click="_mVersionDeleteProcessDefinitionVersion(item,$index)">{{$t('Confirm')}}</x-button> </x-button>
<x-button type="primary" size="xsmall" shape="circle"
@click="_mVersionDeleteProcessDefinitionVersion(item,$index)">{{$t('Confirm')}}
</x-button>
</div> </div>
<template slot="reference"> <template slot="reference">
<x-button <x-button
@ -97,7 +104,7 @@
type="error" type="error"
shape="circle" shape="circle"
size="xsmall" size="xsmall"
:disabled="item.version === processDefinition.version" :disabled="item.version === processDefinition.version || 'ONLINE' === processDefinition.state"
data-toggle="tooltip" data-toggle="tooltip"
:title="$t('delete')"> :title="$t('delete')">
</x-button> </x-button>
@ -115,7 +122,8 @@
<div v-if="processDefinitionVersions.length > 0"> <div v-if="processDefinitionVersions.length > 0">
<div class="bottom-box"> <div class="bottom-box">
<x-button type="text" @click="_close()"> {{$t('Cancel')}}</x-button> <x-button type="text" @click="_close()"> {{$t('Cancel')}}</x-button>
<x-page :current="pageNo" :total="total" @on-change="_mVersionGetProcessDefinitionVersionsPage" small><!----></x-page> <x-page :current="pageNo" :total="total" @on-change="_mVersionGetProcessDefinitionVersionsPage" small>
<!----></x-page>
</div> </div>
</div> </div>
@ -211,8 +219,10 @@
}) })
} }
}, },
created () {}, created () {
mounted () {}, },
mounted () {
},
components: { mNoData } components: { mNoData }
} }
</script> </script>
@ -221,10 +231,12 @@
.container { .container {
width: 500px; width: 500px;
position: relative; position: relative;
.title-box { .title-box {
height: 61px; height: 61px;
border-bottom: 1px solid #DCDEDC; border-bottom: 1px solid #DCDEDC;
position: relative; position: relative;
.name { .name {
position: absolute; position: absolute;
left: 24px; left: 24px;
@ -232,6 +244,7 @@
font-size: 16px; font-size: 16px;
} }
} }
.bottom-box { .bottom-box {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
@ -242,10 +255,12 @@
line-height: 60px; line-height: 60px;
border-top: 1px solid #DCDEDC; border-top: 1px solid #DCDEDC;
background: #fff; background: #fff;
.ans-page { .ans-page {
display: inline-block; display: inline-block;
} }
} }
.table-box { .table-box {
overflow-y: scroll; overflow-y: scroll;
height: calc(100vh - 61px); height: calc(100vh - 61px);

Loading…
Cancel
Save