diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index 8d08876c..8f9fcbaa 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -72,7 +72,8 @@
>
{{ (scope.row.finishRate != null ? scope.row.finishRate : 0) + "%" }}
-
+
{{item.name}}
+
@@ -81,20 +82,6 @@
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
-
@@ -269,6 +256,7 @@
}
},//end data
methods: {
+ ...util,
selectVisible(row,visible){
if(visible==true){
this.$refs.table.setCurrentRow(row);
@@ -597,12 +585,13 @@
}).catch( err => this.load.del=false );
});
},
-
+ unselectRow(){
+ this.editForm=null;
+ this.$emit('row-click',null)
+ this.$refs.table.setCurrentRow();
+ },
rowClick: function(row, event, column){
- if(this.editForm && row.menuId===this.editForm.menuId){
- this.editForm=null;
- this.$emit('row-click',null)
- this.$refs.table.setCurrentRow();
+ if(this.editForm && row.menuId===this.editForm.menuId){
return;
}
this.editForm=row
@@ -877,26 +866,7 @@
}
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
})
- },
- formaterByDicts(row,property,cellValue){
- var property=property
- var dict=null;
- if(property=='source'){
- dict=this.dicts['demandSource']
- }else if(property=='dlvl'){
- dict=this.dicts['demandLvl']
- }else if(property=='dtype'){
- dict=this.dicts['demandType']
- }else if(property=='priority'){
- dict=this.dicts['priority']
- }
- if(!dict){
- return cellValue;
- }else{
- var item=dict.find(i=>i.id==cellValue)
- return item?item.name:cellValue;
- }
- },
+ },
doBatchDelXmIterationMenu(){
if(!this.filters.iteration||!this.filters.iteration.id){
@@ -1016,66 +986,7 @@
}else{
return "";
}
- },
-
- formatterPriorityDicts(cellValue){
- if(!cellValue && cellValue!=='0'){
- return []
- }
- var key="priority";
- if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0 ){
- return [{id:cellValue,name:cellValue,className:'primary'}];
- }
- var list=this.dicts[key].filter(i=>i.id==cellValue)
- if(list.length>0){
- var data= {...list[0],className:'primary'}
- if(data.id=='0'){
- data.className='danger'
- }else if(data.id=='1'){
- data.className='warning'
- }else if(data.id=='2'){
- data.className='success'
- }else if(data.id=='3'){
- data.className='primary'
- }else if(data.id=='4'){
- data.className='info'
- }else{
- data.className='primary'
- }
- return [data];
- }else{
- return [{id:cellValue,name:cellValue,className:'primary'}]
- }
-
- },
- formatterMenuStatusDicts: function(cellValue){
- if(!cellValue && cellValue!=='0'){
- return []
- }
- var key="menuStatus";
- if(this.dicts[key]==undefined || this.dicts[key]==null || this.dicts[key].length==0 ){
- return [{id:cellValue,name:cellValue,className:'primary'}];
- }
- var list=this.dicts[key].filter(i=>i.id==cellValue)
- if(list.length>0){
- var data= {...list[0],className:'primary'}
- if(data.id=='0'){
- data.className='primary'
- }else if(data.id=='1'){
- data.className='warning'
- }else if(data.id=='2'){
- data.className='success'
- }else if(data.id=='3'){
- data.className='info'
- } else{
- data.className='danger'
- }
- return [data];
- }else{
- return [{id:cellValue,name:cellValue,className:'primary'}]
- }
-
- },
+ },
onEditSomeFields(params){
Object.assign(this.editForm,params)
},
diff --git a/src/views/xm/core/xmMenu/XmMenuBox.vue b/src/views/xm/core/xmMenu/XmMenuBox.vue
index 1a882964..abbadad4 100644
--- a/src/views/xm/core/xmMenu/XmMenuBox.vue
+++ b/src/views/xm/core/xmMenu/XmMenuBox.vue
@@ -1,5 +1,5 @@
-
+
@@ -55,6 +55,5 @@
-
\ No newline at end of file