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

update

上级 41bfdb4e
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
../../@MACRO/LANG_FUN.ftl ../../@MACRO/LANG_FUN.ftl
</#ibizinclude> </#ibizinclude>
<template> <template>
<gantt-elastic :class="ganttClass" :tasks="tasks" :options="getOptions(this.locale)" :dynamic-style="dynamicStyle" @taskList-item-click="taskClick"> <gantt-elastic :class="ganttClass" :tasks="tasks" :options="getOptions(this.locale)" :dynamic-style="dynamicStyle" @taskList-item-dblclick="taskClick">
</gantt-elastic> </gantt-elastic>
</template> </template>
<#assign import_block> <#assign import_block>
...@@ -97,6 +97,7 @@ GanttElastic, ...@@ -97,6 +97,7 @@ GanttElastic,
{ {
label: '名称', label: '名称',
value: 'label', value: 'label',
expander: true,
width: 150 width: 150
} }
] ]
...@@ -309,13 +310,6 @@ GanttElastic, ...@@ -309,13 +310,6 @@ GanttElastic,
</#list> </#list>
</#if> </#if>
} }
// 导航栏中不需要打开视图,只要抛出选中数据
if(this.isSelectFirstDefault){
_context.itemType = itemType;
this.selections = [_context];
this.$emit("selectionchange",[_context]);
return;
}
// 根据打开模式打开视图 // 根据打开模式打开视图
if (Object.is(view.placement, 'INDEXVIEWTAB') || Object.is(view.placement, '')) { if (Object.is(view.placement, 'INDEXVIEWTAB') || Object.is(view.placement, '')) {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, this.context, view.deResParameters, view.parameters, [JSON.parse(JSON.stringify(_context))] , JSON.parse(JSON.stringify(this.viewparams))); const routePath = this.$viewTool.buildUpRoutePath(this.$route, this.context, view.deResParameters, view.parameters, [JSON.parse(JSON.stringify(_context))] , JSON.parse(JSON.stringify(this.viewparams)));
...@@ -323,7 +317,7 @@ GanttElastic, ...@@ -323,7 +317,7 @@ GanttElastic,
} else { } else {
let container: Subject<any> = new Subject(); let container: Subject<any> = new Subject();
if (Object.is(view.placement, 'POPOVER')) { if (Object.is(view.placement, 'POPOVER')) {
container = this.$apppopover.openPop(isOriginData ? $event2 : $event.jsEvent, view,JSON.parse(JSON.stringify(_context)), JSON.parse(JSON.stringify(this.viewparams))); container = this.$apppopover.openPop(event, view,JSON.parse(JSON.stringify(_context)), JSON.parse(JSON.stringify(this.viewparams)));
} else if (Object.is(view.placement, 'POPUPMODAL')) { } else if (Object.is(view.placement, 'POPUPMODAL')) {
container = this.$appmodal.openModal(view, JSON.parse(JSON.stringify(_context)), JSON.parse(JSON.stringify(this.viewparams))); container = this.$appmodal.openModal(view, JSON.parse(JSON.stringify(_context)), JSON.parse(JSON.stringify(this.viewparams)));
} else if (view.placement.startsWith('DRAWER')) { } else if (view.placement.startsWith('DRAWER')) {
...@@ -333,7 +327,7 @@ GanttElastic, ...@@ -333,7 +327,7 @@ GanttElastic,
if (!result || !Object.is(result.ret, 'OK')) { if (!result || !Object.is(result.ret, 'OK')) {
return; return;
} }
_this.refresh(); this.refresh();
}); });
} }
} }
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册