fix: dotted solid edge style bug
This commit is contained in:
Cindy Chang
@@ -1,22 +1,29 @@
|
||||
<template>
|
||||
<!-- Sidebar: Switch data type -->
|
||||
<div class="flex flex-col justify-between py-4 w-14 h-screen-main absolute bottom-0 left-0 z-10" :class="sidebarLeftValue? 'bg-neutral-50':''">
|
||||
<div class="flex flex-col justify-between py-4 w-14 h-screen-main absolute bottom-0 left-0 z-10"
|
||||
:class="sidebarLeftValue ? 'bg-neutral-50' : ''">
|
||||
<ul class="space-y-4 flex flex-col justify-center items-center">
|
||||
<li class="inline-flex items-center justify-center border border-neutral-500 rounded-full w-9 h-9 cursor-pointer bg-neutral-50 drop-shadow
|
||||
hover:border-primary" @click="sidebarView = !sidebarView" :class="{'border-primary': sidebarView}" v-tooltip="tooltip.sidebarView">
|
||||
<span class="material-symbols-outlined !text-2xl hover:text-primary p-1.5" :class="[sidebarView ? 'text-primary' : 'text-neutral-500']">
|
||||
hover:border-primary" @click="sidebarView = !sidebarView" :class="{ 'border-primary': sidebarView }"
|
||||
v-tooltip="tooltip.sidebarView">
|
||||
<span class="material-symbols-outlined !text-2xl hover:text-primary p-1.5"
|
||||
:class="[sidebarView ? 'text-primary' : 'text-neutral-500']">
|
||||
track_changes
|
||||
</span>
|
||||
</li>
|
||||
<li class="inline-flex items-center justify-center border border-neutral-500 rounded-full w-9 h-9 cursor-pointer bg-neutral-50 drop-shadow
|
||||
hover:border-primary" @click="sidebarFilter = !sidebarFilter" :class="{'border-primary': sidebarFilter}" v-tooltip="tooltip.sidebarFilter">
|
||||
<span class="material-symbols-outlined !text-2xl hover:text-primary p-1.5" :class="[sidebarFilter ? 'text-primary' : 'text-neutral-500']" id="iconFilter">
|
||||
hover:border-primary" @click="sidebarFilter = !sidebarFilter" :class="{ 'border-primary': sidebarFilter }"
|
||||
v-tooltip="tooltip.sidebarFilter">
|
||||
<span class="material-symbols-outlined !text-2xl hover:text-primary p-1.5"
|
||||
:class="[sidebarFilter ? 'text-primary' : 'text-neutral-500']" id="iconFilter">
|
||||
tornado
|
||||
</span>
|
||||
</li>
|
||||
<li class="inline-flex items-center justify-center border border-neutral-500 rounded-full w-9 h-9 cursor-pointer bg-neutral-50
|
||||
drop-shadow hover:border-primary" @click="sidebarTraces = !sidebarTraces" :class="{'border-primary': sidebarTraces}" v-tooltip="tooltip.sidebarTraces">
|
||||
<span class="material-symbols-outlined !text-2xl hover:text-primary p-1.5" :class="[sidebarTraces ? 'text-primary' : 'text-neutral-500']">
|
||||
drop-shadow hover:border-primary" @click="sidebarTraces = !sidebarTraces"
|
||||
:class="{ 'border-primary': sidebarTraces }" v-tooltip="tooltip.sidebarTraces">
|
||||
<span class="material-symbols-outlined !text-2xl hover:text-primary p-1.5"
|
||||
:class="[sidebarTraces ? 'text-primary' : 'text-neutral-500']">
|
||||
rebase
|
||||
</span>
|
||||
</li>
|
||||
@@ -33,7 +40,7 @@
|
||||
<ul class="flex flex-col justify-center items-center">
|
||||
<li class="inline-flex items-center justify-center border border-neutral-500 rounded-full w-9 h-9 cursor-pointer
|
||||
bg-neutral-50 drop-shadow hover:border-primary" @click="sidebarState = !sidebarState"
|
||||
:class="{'border-primary': sidebarState}" id="iconState" v-tooltip.left="tooltip.sidebarState">
|
||||
:class="{ 'border-primary': sidebarState }" id="iconState" v-tooltip.left="tooltip.sidebarState">
|
||||
<span class="material-symbols-outlined !text-2xl text-neutral-500 hover:text-primary p-1.5"
|
||||
:class="[sidebarState ? 'text-primary' : 'text-neutral-500']">
|
||||
info
|
||||
@@ -43,13 +50,14 @@
|
||||
</div>
|
||||
|
||||
<!-- Sidebar Model -->
|
||||
<SidebarView v-model:visible="sidebarView" @switch-map-type="switchMapType" @switch-curve-styles="switchCurveStyles" @switch-rank="switchRank"
|
||||
@switch-data-layer-type="switchDataLayerType" ></SidebarView>
|
||||
<SidebarView v-model:visible="sidebarView" @switch-map-type="switchMapType" @switch-curve-styles="switchCurveStyles"
|
||||
@switch-rank="switchRank" @switch-data-layer-type="switchDataLayerType"></SidebarView>
|
||||
<SidebarState v-model:visible="sidebarState" :insights="insights" :stats="stats"></SidebarState>
|
||||
<SidebarTraces v-model:visible="sidebarTraces" :cases="cases" @switch-Trace-Id="switchTraceId" ref="tracesView"></SidebarTraces>
|
||||
<SidebarTraces v-model:visible="sidebarTraces" :cases="cases" @switch-Trace-Id="switchTraceId" ref="tracesView">
|
||||
</SidebarTraces>
|
||||
<SidebarFilter v-model:visible="sidebarFilter" :filterTasks="filterTasks" :filterStartToEnd="filterStartToEnd"
|
||||
:filterEndToStart="filterEndToStart" :filterTimeframe="filterTimeframe" :filterTrace="filterTrace"
|
||||
@submit-all="createCy(mapType)" @switch-Trace-Id="switchTraceId" ref="sidevarFilterRef"></SidebarFilter>
|
||||
@submit-all="createCy(mapType)" @switch-Trace-Id="switchTraceId" ref="sidevarFilterRef"></SidebarFilter>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
@@ -113,14 +121,15 @@ export default {
|
||||
});
|
||||
|
||||
|
||||
return { isLoading, processMap, bpmn, stats, insights, traceId, traces, baseTraces,
|
||||
return {
|
||||
isLoading, processMap, bpmn, stats, insights, traceId, traces, baseTraces,
|
||||
baseTraceId, filterTasks, filterStartToEnd, filterEndToStart, filterTimeframe,
|
||||
filterTrace, logId, baseLogId, createFilterId, temporaryData, isRuleData,
|
||||
ruleData, allMapDataStore, cases, postRuleData,
|
||||
setCurrentGraphId,
|
||||
};
|
||||
},
|
||||
props:['type', 'checkType', 'checkId', 'checkFileId'], // 來自 router 的 props
|
||||
props: ['type', 'checkType', 'checkId', 'checkFileId'], // 來自 router 的 props
|
||||
components: {
|
||||
SidebarView,
|
||||
SidebarState,
|
||||
@@ -142,7 +151,7 @@ export default {
|
||||
edges: [],
|
||||
},
|
||||
cytoscapeGraph: null,
|
||||
curveStyle:'unbundled-bezier', // unbundled-bezier | taxi
|
||||
curveStyle: 'unbundled-bezier', // unbundled-bezier | taxi
|
||||
mapType: 'processMap', // processMap | bpmn
|
||||
mapPathStore: MapPathStore(),
|
||||
dataLayerType: 'freq', // freq | duration
|
||||
@@ -154,6 +163,8 @@ export default {
|
||||
sidebarTraces: false, // SideBar: Traces
|
||||
sidebarFilter: false, // SideBar: Filter
|
||||
infiniteFirstCases: null,
|
||||
startNodeId: -1,
|
||||
endNodeId: -1,
|
||||
tooltip: {
|
||||
sidebarView: {
|
||||
value: 'Visualization Setting',
|
||||
@@ -186,37 +197,37 @@ export default {
|
||||
}
|
||||
}
|
||||
},
|
||||
computed:{
|
||||
sidebarLeftValue: function() {
|
||||
computed: {
|
||||
sidebarLeftValue: function () {
|
||||
let result = this.sidebarView === true || this.sidebarTraces === true || this.sidebarFilter === true;
|
||||
return result;
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
sidebarView: function(newValue) {
|
||||
if(newValue) {
|
||||
sidebarView: function (newValue) {
|
||||
if (newValue) {
|
||||
this.sidebarFilter = false;
|
||||
this.sidebarTraces = false;
|
||||
}
|
||||
},
|
||||
sidebarFilter: function(newValue) {
|
||||
if(newValue) {
|
||||
sidebarFilter: function (newValue) {
|
||||
if (newValue) {
|
||||
this.sidebarView = false;
|
||||
this.sidebarState = false;
|
||||
this.sidebarTraces = false;
|
||||
this.sidebarState = false;
|
||||
}
|
||||
},
|
||||
sidebarTraces: function(newValue) {
|
||||
if(newValue) {
|
||||
sidebarTraces: function (newValue) {
|
||||
if (newValue) {
|
||||
this.sidebarView = false;
|
||||
this.sidebarState = false;
|
||||
this.sidebarFilter = false;
|
||||
this.sidebarState = false;
|
||||
}
|
||||
},
|
||||
sidebarState: function(newValue) {
|
||||
if(newValue) {
|
||||
sidebarState: function (newValue) {
|
||||
if (newValue) {
|
||||
this.sidebarFilter = false;
|
||||
this.sidebarTraces = false;
|
||||
}
|
||||
@@ -252,7 +263,7 @@ export default {
|
||||
* @param {string} type freq | duration
|
||||
* @param {string} option 下拉選單中的選項
|
||||
*/
|
||||
async switchDataLayerType(type, option){
|
||||
async switchDataLayerType(type, option) {
|
||||
this.dataLayerType = type;
|
||||
this.dataLayerOption = option;
|
||||
this.createCy(this.mapType);
|
||||
@@ -262,7 +273,7 @@ export default {
|
||||
* @param {event} e input 傳入的事件
|
||||
*/
|
||||
async switchTraceId(e) {
|
||||
if(e.id == this.traceId) return;
|
||||
if (e.id == this.traceId) return;
|
||||
// 超過 1000 筆要 loading 畫面
|
||||
this.isLoading = true; // 都要 loading 畫面
|
||||
this.traceId = e.id;
|
||||
@@ -274,9 +285,9 @@ export default {
|
||||
* 將 element nodes 資料彙整
|
||||
* @param {object} type 'processMapData' | 'bpmnData'，可傳入以上任一。
|
||||
*/
|
||||
setNodesData(mapData) {
|
||||
let mapType = this.mapType;
|
||||
const logFreq = {
|
||||
setNodesData(mapData) {
|
||||
let mapType = this.mapType;
|
||||
const logFreq = {
|
||||
"total": "",
|
||||
"rel_freq": "",
|
||||
"average": "",
|
||||
@@ -308,64 +319,70 @@ export default {
|
||||
// add type of 'bpmn gateway' node
|
||||
case 'gateway':
|
||||
mapData.nodes.push({
|
||||
data:{
|
||||
id:node.id,
|
||||
type:node.type,
|
||||
label:gateway[node.gateway_type],
|
||||
height:60,
|
||||
width:60,
|
||||
backgroundColor:'#FFF',
|
||||
bordercolor:'#003366',
|
||||
shape:"diamond",
|
||||
freq:logFreq,
|
||||
duration:logDuration,
|
||||
data: {
|
||||
id: node.id,
|
||||
type: node.type,
|
||||
label: gateway[node.gateway_type],
|
||||
height: 60,
|
||||
width: 60,
|
||||
backgroundColor: '#FFF',
|
||||
bordercolor: '#003366',
|
||||
shape: "diamond",
|
||||
freq: logFreq,
|
||||
duration: logDuration,
|
||||
}
|
||||
})
|
||||
break;
|
||||
// add type of 'event' node
|
||||
case 'event':
|
||||
if(node.event_type === 'start') mapData.startId = node.id;
|
||||
else if(node.event_type === 'end') mapData.endId = node.id;
|
||||
if (node.event_type === 'start') {
|
||||
mapData.startId = node.id;
|
||||
this.startNodeId = node.id;
|
||||
}
|
||||
else if (node.event_type === 'end') {
|
||||
mapData.endId = node.id;
|
||||
this.endNodeId = node.id;
|
||||
}
|
||||
|
||||
mapData.nodes.push({
|
||||
data:{
|
||||
id:node.id,
|
||||
type:node.type,
|
||||
label:node.event_type,
|
||||
data: {
|
||||
id: node.id,
|
||||
type: node.type,
|
||||
label: node.event_type,
|
||||
height: 48,
|
||||
width: 48,
|
||||
backgroundColor:'#FFFFFF',
|
||||
bordercolor:'#0F172A',
|
||||
backgroundColor: '#FFFFFF',
|
||||
bordercolor: '#0F172A',
|
||||
textColor: '#FF3366',
|
||||
shape:"ellipse",
|
||||
freq:logFreq,
|
||||
duration:logDuration,
|
||||
shape: "ellipse",
|
||||
freq: logFreq,
|
||||
duration: logDuration,
|
||||
}
|
||||
});
|
||||
break;
|
||||
// add type of 'activity' node
|
||||
default:
|
||||
mapData.nodes.push({
|
||||
data:{
|
||||
id:node.id,
|
||||
type:node.type,
|
||||
label:node.label,
|
||||
height: 48,
|
||||
width: 216,
|
||||
textColor: '#0F172A',
|
||||
backgroundColor:'rgba(0, 0, 0, 0)',
|
||||
borderradius: 999,
|
||||
shape:"round-rectangle",
|
||||
freq:node.freq,
|
||||
duration:node.duration,
|
||||
backgroundOpacity: 0,
|
||||
borderOpacity: 0,
|
||||
}
|
||||
})
|
||||
data: {
|
||||
id: node.id,
|
||||
type: node.type,
|
||||
label: node.label,
|
||||
height: 48,
|
||||
width: 216,
|
||||
textColor: '#0F172A',
|
||||
backgroundColor: 'rgba(0, 0, 0, 0)',
|
||||
borderradius: 999,
|
||||
shape: "round-rectangle",
|
||||
freq: node.freq,
|
||||
duration: node.duration,
|
||||
backgroundOpacity: 0,
|
||||
borderOpacity: 0,
|
||||
}
|
||||
})
|
||||
break;
|
||||
}
|
||||
});
|
||||
},
|
||||
},
|
||||
/**
|
||||
* 將 element edges 資料彙整
|
||||
* @param {object} type 'processMapData' | 'bpmnData'，可傳入以上任一。
|
||||
@@ -387,28 +404,29 @@ export default {
|
||||
this[mapType].edges.map(edge => {
|
||||
mapData.edges.push({
|
||||
data: {
|
||||
source:edge.tail,
|
||||
target:edge.head,
|
||||
freq:edge.freq,
|
||||
duration:edge.duration === null ? logDuration : edge.duration,
|
||||
style:'dotted',
|
||||
lineWidth:1,
|
||||
source: edge.tail,
|
||||
target: edge.head,
|
||||
freq: edge.freq,
|
||||
duration: edge.duration === null ? logDuration : edge.duration,
|
||||
// Don't know why but tail is related to start and head is related to end
|
||||
edgeStyle: edge.tail === this.startNodeId || edge.head === this.endNodeId ? 'dotted' : 'solid',
|
||||
lineWidth: 1,
|
||||
},
|
||||
});
|
||||
});
|
||||
},
|
||||
},
|
||||
/**
|
||||
* create cytoscape's map
|
||||
* @param {string} type this.mapType 'processMap' | 'bpmn'，可傳入以上任一。
|
||||
*/
|
||||
async createCy(type) {
|
||||
let graphId = document.getElementById('cy');
|
||||
let mapData = type === 'processMap'? this.processMapData: this.bpmnData;
|
||||
let mapData = type === 'processMap' ? this.processMapData : this.bpmnData;
|
||||
|
||||
if(this[type].vertices.length !== 0){
|
||||
if (this[type].vertices.length !== 0) {
|
||||
this.setNodesData(mapData);
|
||||
this.setEdgesData(mapData);
|
||||
this.setActivityBgImage(mapData);
|
||||
this.setActivityBgImage(mapData);
|
||||
this.cytoscapeGraph = await cytoscapeMap(mapData, this.dataLayerType, this.dataLayerOption, this.curveStyle, this.rank, graphId);
|
||||
const processOrBPMN = this.mapType === 'processMap' ? 'process' : 'bpmn';
|
||||
const curveType = this.curveStyle === 'taxi' ? 'elbow' : 'curved';
|
||||
@@ -429,24 +447,24 @@ export default {
|
||||
activityNodeArray.map(node => nodeOptionArr.push(node.data[this.dataLayerType][this.dataLayerOption]));
|
||||
// 將node的option值從小到大排序(映對色階淺到深)
|
||||
nodeOptionArr = nodeOptionArr.sort((a, b) => a - b);
|
||||
for(let i = 0; i < ImgCapsules.length; i++) {
|
||||
for (let i = 0; i < ImgCapsules.length; i++) {
|
||||
const startIdx = i * groupSize;
|
||||
const endIdx = (i === ImgCapsules.length - 1) ? activityNodeArray.length : startIdx + groupSize;
|
||||
leveledGroups.push(nodeOptionArr.slice(startIdx, endIdx));
|
||||
}
|
||||
for(let level = 0; level < leveledGroups.length; level++) {
|
||||
for (let level = 0; level < leveledGroups.length; level++) {
|
||||
leveledGroups[level].map(option => {
|
||||
// 考慮可能有名次一樣的情形
|
||||
const curNodes = activityNodeArray.filter(activityNode => activityNode.data[this.dataLayerType][this.dataLayerOption] === option);
|
||||
curNodes.map(curNode => {
|
||||
curNode.data = {
|
||||
curNode.data = {
|
||||
...curNode.data,
|
||||
nodeImageUrl: ImgCapsules[level],
|
||||
level,
|
||||
};
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
async created() {
|
||||
@@ -459,7 +477,7 @@ export default {
|
||||
// Log 檔前往 Map Log 頁, Filter 檔前往 Map Filter 頁
|
||||
switch (routeParams.type) {
|
||||
case 'log':
|
||||
if(!isCheckPage) {
|
||||
if (!isCheckPage) {
|
||||
this.logId = await routeParams.fileId;
|
||||
this.baseLogId = await routeParams.fileId;
|
||||
} else {
|
||||
@@ -468,7 +486,7 @@ export default {
|
||||
}
|
||||
break;
|
||||
case 'filter':
|
||||
if(!isCheckPage) {
|
||||
if (!isCheckPage) {
|
||||
this.createFilterId = await routeParams.fileId;
|
||||
} else {
|
||||
this.createFilterId = await file.parent.id;
|
||||
@@ -482,7 +500,7 @@ export default {
|
||||
// 取得 logId 後才 call api
|
||||
await this.allMapDataStore.getAllMapData();
|
||||
await this.allMapDataStore.getAllTrace();
|
||||
|
||||
|
||||
// log、filter 檔切換過程中， trace id 不同，將初始 trace id 設定為該檔案的 trace 幣一筆資料的 id。
|
||||
this.traceId = await this.traces[0]?.id;
|
||||
this.baseTraceId = await this.baseTraces[0]?.id;
|
||||
|
||||
Reference in New Issue
Block a user