提交 945cf249 编写于 作者: Shine-zwj's avatar Shine-zwj

优化实体看板视图

上级 794343d3
...@@ -11,9 +11,9 @@ ${ctrl.render.code} ...@@ -11,9 +11,9 @@ ${ctrl.render.code}
<#if ctrl.groupRender??> <#if ctrl.groupRender??>
${ctrl.groupRender.code} ${ctrl.groupRender.code}
<#else> <#else>
<div :key="index" class="dataview-group-folading-kanban"> <div :key="index" class="dataview-group-folading-kanban" @click="onClick(group,index)">
<div class="dataview-group-icon"> <div class="unfold-icon">
<Icon :type="group.folding ? 'md-arrow-dropright' : 'md-arrow-dropleft'" size="25" @click="onClick(group,index)"/> <i class="el-icon-s-unfold" :title="$t('app.kanban.unfold')"></i>
</div> </div>
<div class="dataview-group-folding"> <div class="dataview-group-folding">
<span>{{getGroupText(group.value)}}({{group.items.length}})</span> <span>{{getGroupText(group.value)}}({{group.items.length}})</span>
...@@ -21,7 +21,12 @@ ${ctrl.render.code} ...@@ -21,7 +21,12 @@ ${ctrl.render.code}
</div> </div>
<div :key="group + index" class="dataview-group-content dataview-group-kanban" style="<#if ctrl.getGroupWidth() gt 0>width: ${ctrl.getGroupWidth()?c}px;<#else>flex-grow: 1;</#if>"> <div :key="group + index" class="dataview-group-content dataview-group-kanban" style="<#if ctrl.getGroupWidth() gt 0>width: ${ctrl.getGroupWidth()?c}px;<#else>flex-grow: 1;</#if>">
<div class="dataview-group-header<#if ctrl.getGroupPSSysCss()??> ${ctrl.getGroupPSSysCss().getCssName()}</#if>"> <div class="dataview-group-header<#if ctrl.getGroupPSSysCss()??> ${ctrl.getGroupPSSysCss().getCssName()}</#if>">
{{ getGroupText(group.value) }} <div class="fold-icon" @click="onClick(group,index)">
<i class="el-icon-s-fold" :title="$t('app.kanban.fold')"></i>
</div>
<span>
{{ getGroupText(group.value) }}
</span>
<#if ctrl.getGroupPSUIActionGroup()??> <#if ctrl.getGroupPSUIActionGroup()??>
<Poptip trigger="hover" content="content" placement="bottom-end" style="float: right;"> <Poptip trigger="hover" content="content" placement="bottom-end" style="float: right;">
<Icon type="md-more" /> <Icon type="md-more" />
...@@ -627,10 +632,12 @@ draggable, ...@@ -627,10 +632,12 @@ draggable,
}).catch((response: any) => { }).catch((response: any) => {
if (response && response.status && response.data) { if (response && response.status && response.data) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data.message });
this.refresh();
return; return;
} }
if (!response || !response.status || !response.data) { if (!response || !response.status || !response.data) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.sysException') as string) }); this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.sysException') as string) });
this.refresh();
return; return;
} }
}); });
...@@ -768,10 +775,13 @@ draggable, ...@@ -768,10 +775,13 @@ draggable,
public onClick(group: any,index: number){ public onClick(group: any,index: number){
group.folding = !group.folding; group.folding = !group.folding;
let kanban: any = this.$el.getElementsByClassName('dataview-group-kanban')[index]; let kanban: any = this.$el.getElementsByClassName('dataview-group-kanban')[index];
let foldkanban: any = this.$el.getElementsByClassName('dataview-group-folading-kanban')[index];
if(group.folding){ if(group.folding){
kanban.style.display="none"; kanban.style.display="none";
foldkanban.style.display="block";
}else{ }else{
kanban.style.display="block"; kanban.style.display="block";
foldkanban.style.display="none";
} }
this.$forceUpdate(); this.$forceUpdate();
} }
......
...@@ -10,8 +10,10 @@ ...@@ -10,8 +10,10 @@
width: 40px; width: 40px;
background-color: #d8d8d8; background-color: #d8d8d8;
color: #a5a5a5; color: #a5a5a5;
.dataview-group-icon{ display: none;
padding: 6px 0; .unfold-icon {
padding: 3px 0;
font-size: 20px;
} }
.dataview-group-folding{ .dataview-group-folding{
height: calc(100% - 39px); height: calc(100% - 39px);
...@@ -30,8 +32,14 @@ ...@@ -30,8 +32,14 @@
.dataview-group-header { .dataview-group-header {
height: 36px; height: 36px;
line-height: 36px; line-height: 36px;
position: relative;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
padding: 0 8px; padding: 0 8px;
.fold-icon{
font-size: 20px;
color:#a5a5a5;
position: absolute;
}
.group-action { .group-action {
.group-action-item:nth-child(1) + .group-action-item { .group-action-item:nth-child(1) + .group-action-item {
margin-top: 5px; margin-top: 5px;
......
...@@ -190,6 +190,8 @@ function getAppLocale(){ ...@@ -190,6 +190,8 @@ function getAppLocale(){
}, },
delete1: "Confirm to delete ", delete1: "Confirm to delete ",
delete2: "the delete operation will be unrecoverable!", delete2: "the delete operation will be unrecoverable!",
fold: "fold",
unfold: "upfold",
}, },
dashBoard: { dashBoard: {
handleClick: { handleClick: {
......
...@@ -189,6 +189,8 @@ function getAppLocale(){ ...@@ -189,6 +189,8 @@ function getAppLocale(){
}, },
delete1: "确认要删除 ", delete1: "确认要删除 ",
delete2: "删除操作将不可恢复?", delete2: "删除操作将不可恢复?",
fold: "折叠",
unfold: "展开",
}, },
dashBoard: { dashBoard: {
handleClick: { handleClick: {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册