mirror of
https://github.com/freqtrade/frequi.git
synced 2024-11-10 10:21:55 +00:00
parent
5736654062
commit
7b97e8a565
|
@ -97,6 +97,20 @@ export const useBotStore = defineStore('wrapper', {
|
||||||
});
|
});
|
||||||
return result;
|
return result;
|
||||||
},
|
},
|
||||||
|
allClosedTradesSelectedBots: (state): Trade[] => {
|
||||||
|
const result: Trade[] = [];
|
||||||
|
Object.entries(state.botStores).forEach(([, botStore]) => {
|
||||||
|
if (botStore.isSelected) {
|
||||||
|
result.push(...botStore.trades);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
return result.sort((a, b) =>
|
||||||
|
// Sort by close timestamp, then by tradeid
|
||||||
|
b.close_timestamp && a.close_timestamp
|
||||||
|
? b.close_timestamp - a.close_timestamp
|
||||||
|
: b.trade_id - a.trade_id,
|
||||||
|
);
|
||||||
|
},
|
||||||
allTradesSelectedBots: (state): ClosedTrade[] => {
|
allTradesSelectedBots: (state): ClosedTrade[] => {
|
||||||
const result: ClosedTrade[] = [];
|
const result: ClosedTrade[] = [];
|
||||||
Object.entries(state.botStores).forEach(([, botStore]) => {
|
Object.entries(state.botStores).forEach(([, botStore]) => {
|
||||||
|
|
|
@ -14,6 +14,7 @@ export enum DashboardLayout {
|
||||||
botComparison = 'g-botComparison',
|
botComparison = 'g-botComparison',
|
||||||
allOpenTrades = 'g-allOpenTrades',
|
allOpenTrades = 'g-allOpenTrades',
|
||||||
cumChartChart = 'g-cumChartChart',
|
cumChartChart = 'g-cumChartChart',
|
||||||
|
allClosedTrades = 'g-allClosedTrades',
|
||||||
tradesLogChart = 'g-TradesLogChart',
|
tradesLogChart = 'g-TradesLogChart',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -40,7 +41,8 @@ const DEFAULT_DASHBOARD_LAYOUT: GridItemData[] = [
|
||||||
{ i: DashboardLayout.dailyChart, x: 8, y: 0, w: 4, h: 6 },
|
{ i: DashboardLayout.dailyChart, x: 8, y: 0, w: 4, h: 6 },
|
||||||
{ i: DashboardLayout.allOpenTrades, x: 0, y: 6, w: 8, h: 6 },
|
{ i: DashboardLayout.allOpenTrades, x: 0, y: 6, w: 8, h: 6 },
|
||||||
{ i: DashboardLayout.cumChartChart, x: 8, y: 6, w: 4, h: 6 },
|
{ i: DashboardLayout.cumChartChart, x: 8, y: 6, w: 4, h: 6 },
|
||||||
{ i: DashboardLayout.tradesLogChart, x: 0, y: 12, w: 12, h: 4 },
|
{ i: DashboardLayout.allClosedTrades, x: 0, y: 12, w: 8, h: 6 },
|
||||||
|
{ i: DashboardLayout.tradesLogChart, x: 0, y: 18, w: 12, h: 4 },
|
||||||
];
|
];
|
||||||
|
|
||||||
const DEFAULT_DASHBOARD_LAYOUT_SM: GridItemData[] = [
|
const DEFAULT_DASHBOARD_LAYOUT_SM: GridItemData[] = [
|
||||||
|
@ -49,6 +51,7 @@ const DEFAULT_DASHBOARD_LAYOUT_SM: GridItemData[] = [
|
||||||
{ i: DashboardLayout.dailyChart, x: 0, y: 14, w: 12, h: 6 },
|
{ i: DashboardLayout.dailyChart, x: 0, y: 14, w: 12, h: 6 },
|
||||||
{ i: DashboardLayout.cumChartChart, x: 0, y: 20, w: 12, h: 6 },
|
{ i: DashboardLayout.cumChartChart, x: 0, y: 20, w: 12, h: 6 },
|
||||||
{ i: DashboardLayout.tradesLogChart, x: 0, y: 26, w: 12, h: 4 },
|
{ i: DashboardLayout.tradesLogChart, x: 0, y: 26, w: 12, h: 4 },
|
||||||
|
{ i: DashboardLayout.allClosedTrades, x: 0, y: 30, w: 12, h: 8 },
|
||||||
];
|
];
|
||||||
|
|
||||||
const STORE_LAYOUTS = 'ftLayoutSettings';
|
const STORE_LAYOUTS = 'ftLayoutSettings';
|
||||||
|
|
|
@ -57,11 +57,7 @@
|
||||||
drag-allow-from=".drag-header"
|
drag-allow-from=".drag-header"
|
||||||
>
|
>
|
||||||
<DraggableContainer header="Open Trades">
|
<DraggableContainer header="Open Trades">
|
||||||
<trade-list
|
<trade-list active-trades :trades="botStore.allOpenTradesSelectedBots" multi-bot-view />
|
||||||
:active-trades="true"
|
|
||||||
:trades="botStore.allOpenTradesSelectedBots"
|
|
||||||
multi-bot-view
|
|
||||||
/>
|
|
||||||
</DraggableContainer>
|
</DraggableContainer>
|
||||||
</GridItem>
|
</GridItem>
|
||||||
<GridItem
|
<GridItem
|
||||||
|
@ -78,6 +74,25 @@
|
||||||
<CumProfitChart :trades="botStore.allTradesSelectedBots" :show-title="false" />
|
<CumProfitChart :trades="botStore.allTradesSelectedBots" :show-title="false" />
|
||||||
</DraggableContainer>
|
</DraggableContainer>
|
||||||
</GridItem>
|
</GridItem>
|
||||||
|
<GridItem
|
||||||
|
:i="gridLayoutAllClosedTrades.i"
|
||||||
|
:x="gridLayoutAllClosedTrades.x"
|
||||||
|
:y="gridLayoutAllClosedTrades.y"
|
||||||
|
:w="gridLayoutAllClosedTrades.w"
|
||||||
|
:h="gridLayoutAllClosedTrades.h"
|
||||||
|
:min-w="3"
|
||||||
|
:min-h="4"
|
||||||
|
drag-allow-from=".drag-header"
|
||||||
|
>
|
||||||
|
<DraggableContainer header="Closed Trades">
|
||||||
|
<trade-list
|
||||||
|
:active-trades="false"
|
||||||
|
show-filter
|
||||||
|
:trades="botStore.allClosedTradesSelectedBots"
|
||||||
|
multi-bot-view
|
||||||
|
/>
|
||||||
|
</DraggableContainer>
|
||||||
|
</GridItem>
|
||||||
<GridItem
|
<GridItem
|
||||||
:i="gridLayoutTradesLogChart.i"
|
:i="gridLayoutTradesLogChart.i"
|
||||||
:x="gridLayoutTradesLogChart.x"
|
:x="gridLayoutTradesLogChart.x"
|
||||||
|
@ -166,6 +181,9 @@ export default defineComponent({
|
||||||
const gridLayoutAllOpenTrades = computed((): GridItemData => {
|
const gridLayoutAllOpenTrades = computed((): GridItemData => {
|
||||||
return findGridLayout(gridLayout.value, DashboardLayout.allOpenTrades);
|
return findGridLayout(gridLayout.value, DashboardLayout.allOpenTrades);
|
||||||
});
|
});
|
||||||
|
const gridLayoutAllClosedTrades = computed((): GridItemData => {
|
||||||
|
return findGridLayout(gridLayout.value, DashboardLayout.allClosedTrades);
|
||||||
|
});
|
||||||
|
|
||||||
const gridLayoutCumChart = computed((): GridItemData => {
|
const gridLayoutCumChart = computed((): GridItemData => {
|
||||||
return findGridLayout(gridLayout.value, DashboardLayout.cumChartChart);
|
return findGridLayout(gridLayout.value, DashboardLayout.cumChartChart);
|
||||||
|
@ -198,6 +216,7 @@ export default defineComponent({
|
||||||
gridLayoutDaily,
|
gridLayoutDaily,
|
||||||
gridLayoutBotComparison,
|
gridLayoutBotComparison,
|
||||||
gridLayoutAllOpenTrades,
|
gridLayoutAllOpenTrades,
|
||||||
|
gridLayoutAllClosedTrades,
|
||||||
gridLayoutCumChart,
|
gridLayoutCumChart,
|
||||||
gridLayoutTradesLogChart,
|
gridLayoutTradesLogChart,
|
||||||
responsiveGridLayouts,
|
responsiveGridLayouts,
|
||||||
|
|
|
@ -85,7 +85,7 @@
|
||||||
drag-allow-from=".card-header"
|
drag-allow-from=".card-header"
|
||||||
>
|
>
|
||||||
<DraggableContainer header="Closed Trades">
|
<DraggableContainer header="Closed Trades">
|
||||||
<TradeList
|
<trade-list
|
||||||
class="trade-history"
|
class="trade-history"
|
||||||
:trades="botStore.activeBot.closedTrades"
|
:trades="botStore.activeBot.closedTrades"
|
||||||
title="Trade history"
|
title="Trade history"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user