@guihz/trading-vue-editor-tes 0.1.17 → 0.1.18

package/lib/assets/{scriptsRunWorker-CWAx2DV5.js → scriptsRunWorker-BQFRfD9L.js}

@@ -42898,7 +42898,7 @@ ${z}`), z;
     _closeOrders(e, t, r, i, s, o, a, c) {
       const p = this._getUnCloseOrders();
       if (this._options.close_entries_rule !== "ANY") {
-        const b = this._historyOrder.filter((M) => !M.isPartClose && (M.realQty || 0) < (M.original_qty || 0) && (!c || c !== M.direction));
+        const b = this._notCloseHistoryOrders.filter((M) => !M.isPartClose && !M.isTiggerClose && (!c || c !== M.direction));
         for (const M of b)
           M.realQty = M.original_qty, M.isTiggerClose = !0;
       }
@@ -43027,7 +43027,7 @@ ${z}`), z;
     }
     _ordersHandle(e) {
       let t = this._orders.filter((a) => a.isMarketPriceLimit || a.isMarketPriceStop);
-      if (this._options.close_entries_rule !== "ANY" && (t = this._historyOrder.filter((c) => (c.isMarketPriceLimit || c.isMarketPriceStop) && !c.isPartClose).concat(t)), !t.length)
+      if (this._options.close_entries_rule !== "ANY" && (t = this._notCloseHistoryOrders.filter((c) => (c.isMarketPriceLimit || c.isMarketPriceStop) && !c.isPartClose).concat(t)), !t.length)
         return;
       const { open: r, close: i } = this.calcOnOrderFillsData.data || this._variables, s = e || this._variables._isRealTimeBar ? i : r, o = this._getUnCloseOrders();
       for (const a of t) {
@@ -43226,7 +43226,7 @@ ${z}`), z;
     _getHisOrderSurplusQty(e, t) {
       let r = 0;
       if (this._options.close_entries_rule !== "ANY") {
-        const i = this._historyOrder.filter((s) => (s.direction !== e || e === "all") && !s.isPartClose && (s.realQty || 0) < (s.original_qty || 0));
+        const i = this._notCloseHistoryOrders.filter((s) => (s.direction !== e || e === "all") && !s.isPartClose && !s.isTiggerClose);
         for (const s of i) {
           const { realQty: o = 0, original_qty: a = 0 } = s, c = a - o;
           if (s.realQty = o + (t >= c ? c : t), s.isTiggerClose = a <= s.realQty, r += c, t -= c, t <= 0)
@@ -43239,7 +43239,7 @@ ${z}`), z;
       const { close_entries_rule: t = "FIFO" } = this._options;
       let r = [];
       if (t === "FIFO") {
-        const i = this._historyOrder.filter((s) => s.id === e && (s.realQty || 0) < (s.original_qty || 0) && !s.isPartClose);
+        const i = this._notCloseHistoryOrders.filter((s) => s.id === e && !s.isTiggerClose && !s.isPartClose);
         r = this._orders.filter((s) => s.id === e && (s.realQty || 0) < (s.original_qty || 0)), r = i.concat(r);
       } else
         r = this._orders.filter((i) => i.id === e && !i.close_qty);
@@ -43294,8 +43294,8 @@ ${z}`), z;
       return e;
     }
     _getUnCloseOrders() {
-      const e = this._notCloseHistoryOrders.filter((r) => !r.isTiggerClose), t = this._historyOrder.filter((r) => !r.isPartClose && !r.isTiggerClose);
-      return this._notCloseHistoryOrders = e, e.push(...t), e.push(...this._orders.filter((r) => !r.isTiggerClose)), e;
+      const e = this._notCloseHistoryOrders.filter((t) => !t.isTiggerClose);
+      return this._notCloseHistoryOrders = [...e], e.push(...this._orders.filter((t) => !t.isTiggerClose)), e;
     }
     _exit(e, t) {
       if (!e.hasOwnProperty("profit") && !e.hasOwnProperty("loss") && !e.hasOwnProperty("stop") && !e.hasOwnProperty("limit") && (!e.hasOwnProperty("trail_offset") || !e.hasOwnProperty("trail_price") && !e.hasOwnProperty("trail_points"))) {
@@ -43516,7 +43516,7 @@ ${z}`), z;
         profit_percent: O / A * 100,
         max_profit_percent: d / A * 100,
         trading_loss_percent: _ / A * 100
-      }), this._maxDrawdownVerifyIndex = this._variables.bar_index + (o ? 1 : 0), this._risk.intradayOrders += 1, this._historyOrder.push(e), this._historyOrderLen += 1, this._historyOrder.length >= 1e3 && (this._historyOrdersShard.push(this._historyOrder), this._notCloseHistoryOrders.push(...this._historyOrder.filter((v) => !v.isTiggerClose && !v.isPartClose)), this._historyOrder = []), this._variables.strategy.updateHistoryOrder(e), !t && this._calcOrderFillsHandle(p, M, z);
+      }), this._maxDrawdownVerifyIndex = this._variables.bar_index + (o ? 1 : 0), this._risk.intradayOrders += 1, this._historyOrder.push(e), this._historyOrderLen += 1, !e.isPartClose && (!e.isTiggerClose || e.isMarketPriceLimit || e.isMarketPriceStop) && this._notCloseHistoryOrders.push(e), this._historyOrder.length >= 1e3 && (this._historyOrdersShard.push(this._historyOrder), this._historyOrder = []), this._variables.strategy.updateHistoryOrder(e), !t && this._calcOrderFillsHandle(p, M, z);
     }
     _getCommission(e, t) {
       const { commission_value: r = 0, commission_type: i } = this._options, s = e * t;
@@ -43709,7 +43709,7 @@ ${z}`), z;
           });
       }
       const s = this._hlines.size ? [...this._hlines.values()] : void 0, o = this._fills.size ? this._getDataFromBarindex(e, [...this._fills.values()]) : void 0, a = this.log.logs.length ? this.log.logs : void 0;
-      this.log.clearLogs(), this._options.scriptType === "strategy" && Object.assign(this._options, { orders: this.strategy.orders, historyOrders: this.strategy.historyOrders });
+      this.log.clearLogs(), this._options.scriptType === "strategy" && Object.assign(this._options, { orders: this.strategy.orders, historyOrders: this.strategy.historyOrders, strategySummary: this._variables.strategy.summaryData });
       const c = this._getDataFromBarindex(e, [...this._plots.values()]), p = this._plotbars.size > 0 ? this._getDataFromBarindex(e, [...this._plotbars.values()]) : void 0, b = this._plotarrows.size > 0 ? this._getDataFromBarindex(e, [...this._plotarrows.values()]) : void 0, M = this._plotcandles.size > 0 ? this._getDataFromBarindex(e, [...this._plotcandles.values()]) : void 0, l = this._plotchars.size > 0 ? this._getDataFromBarindex(e, [...this._plotchars.values()]) : void 0, z = this._plotshapes.size > 0 ? this._getDataFromBarindex(e, [...this._plotshapes.values()]) : void 0, O = this._getDrawDeletes(e), d = this._getDrawsFromBarindex(e), _ = this._variables.chart.isUseBgColor;
       return Object.assign({}, this._options, { plots: c, plotarrows: b, plotcandles: M, plotchars: l, plotbars: p, draws: d, drawDeletes: O, alerts: t, colors: i, hlines: s, fills: o, logs: a, plotshapes: z, isUseBgColor: _ });
     }

package/lib/trading-vue-editor.es.packages.js

@@ -9160,7 +9160,7 @@ function mr(i, n, r) {
 function E1() {
   return new Array(4).fill(0).map(() => Math.floor(Math.random() * Number.MAX_SAFE_INTEGER).toString(16)).join("-");
 }
-const kf = new Worker(new URL("" + new URL("assets/scriptsRunWorker-CWAx2DV5.js", import.meta.url).href, import.meta.url), { type: "module", name: "Run MineScript Server" });
+const kf = new Worker(new URL("" + new URL("assets/scriptsRunWorker-BQFRfD9L.js", import.meta.url).href, import.meta.url), { type: "module", name: "Run MineScript Server" });
 kf.onerror = (i) => {
   console.error(i);
 };