提交 5c89722d 编写于 作者: JunZai's avatar JunZai

update

上级 5cf66ee3
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
${ctrl.render.code} ${ctrl.render.code}
<#else> <#else>
<template v-for="(group, index) of groups"> <template v-for="(group, index) of groups">
<draggable :key="group + index" :list="group.items" group="${ctrl.name}" class="dataview-group-content" style="<#if ctrl.getGroupWidth() gt 0>width: ${ctrl.getGroupWidth()?c}px;<#else>flex-grow: 1;</#if>" @change="onDragChange($event, group.name)"> <#if ctrl.groupRender??>
<#if ctrl.groupRender??> ${ctrl.groupRender.code}
${ctrl.groupRender.code} <#else>
<#else> <div :key="group + index" class="dataview-group-content" style="width: 280px;">
<div slot="header" class="dataview-group-header<#if ctrl.getGroupPSSysCss()??> ${ctrl.getGroupPSSysCss().getCssName()}</#if>"> <div class="dataview-group-header<#if ctrl.getGroupPSSysCss()??> ${ctrl.getGroupPSSysCss().getCssName()}</#if>" style="<#if ctrl.getGroupWidth() gt 0>width: ${ctrl.getGroupWidth()?c}px;<#else>flex-grow: 1;</#if>">
{{ getGroupText(group.name) }} {{ getGroupText(group.name) }}
<#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;">
...@@ -34,18 +34,20 @@ ...@@ -34,18 +34,20 @@
</Poptip> </Poptip>
</#if> </#if>
</div> </div>
<div v-for="(item, i) in group.items" :key="i" :class="{'dataview-group-item': true, 'is-select': item.isselected}" @click="handleClick(item)"> <draggable :list="group.items" group="${ctrl.name}" class="dataview-group-items" @change="onDragChange($event, group.name)">
<#if ctrl.getItemPSLayoutPanel()??> <div v-for="(item, i) in group.items" :key="i" :class="{'dataview-group-item': true, 'is-select': item.isselected}" @click="handleClick(item)">
<#assign panel = ctrl.getItemPSLayoutPanel()> <#if ctrl.getItemPSLayoutPanel()??>
<layout_${panel.getName()} name='${panel.name}' :inputData="item"></layout_${panel.getName()}> <#assign panel = ctrl.getItemPSLayoutPanel()>
<#elseif ctrl.itemRender??> <layout_${panel.getName()} name='${panel.name}' :inputData="item"></layout_${panel.getName()}>
${ctrl.itemRender.code} <#elseif ctrl.itemRender??>
<#else> ${ctrl.itemRender.code}
{{ item.srfmajortext }} <#else>
</#if> {{ item.srfmajortext }}
</div> </#if>
</#if> </div>
</draggable> </draggable>
</div>
</#if>
</template> </template>
</#if> </#if>
</div> </div>
......
...@@ -6,6 +6,9 @@ ...@@ -6,6 +6,9 @@
border: 1px solid #ddd; border: 1px solid #ddd;
border-left: 0; border-left: 0;
flex-shrink: 0; flex-shrink: 0;
height: 100%;
display: flex;
flex-direction: column;
.dataview-group-header { .dataview-group-header {
height: 36px; height: 36px;
line-height: 36px; line-height: 36px;
...@@ -17,14 +20,18 @@ ...@@ -17,14 +20,18 @@
} }
} }
} }
.dataview-group-item { .dataview-group-items {
margin: 8px 8px 0 8px; flex-grow: 1;
border: 1px solid #ddd; overflow: auto;
padding: 8px; .dataview-group-item {
overflow: hidden; margin: 8px 8px 0 8px;
} border: 1px solid #ddd;
.dataview-group-item.is-select { padding: 8px;
border-color: #108cee; overflow: hidden;
}
.dataview-group-item.is-select {
border-color: #108cee;
}
} }
} }
.dataview-group-content:nth-child(1) { .dataview-group-content:nth-child(1) {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册