@guihz/trading-vue-editor-tes 0.1.6 → 0.1.8

package/lib/assets/{parserTccWorker-DurfrCeu.js → parserTccWorker-CrprNqMy.js}

@@ -75822,7 +75822,8 @@ ${this._prefixNameVar}.setCacheData("m${O}_" + ${m}, ${q})
     }
     _getMapType(e) {
       const t = /\w+<(\w+),\s*([\w\d.]+)>/.exec(e);
-      return t?.[1] && t?.[2] && [t?.[1], t?.[2]];
+      if (t)
+        return t?.[1] && t?.[2] ? [t?.[1], t?.[2]] : void 0;
     }
     _isMatrixType(e) {
       return /^matrix<[\w\d.]+>$/.test(e);
@@ -76732,18 +76733,21 @@ ${this._prefixNameVar}.setCacheData("m${O}_" + ${m}, ${q})
     _forInNameHandle(e, t) {
       if (this._pushBlockRanges(t), e.names.length) {
         let [r, i] = e.names;
-        const o = e.array.type;
+        const o = e.array.type, c = this._isMapType(o);
+        let b = `${D.SERIES} ${D.INT}`, O;
+        if (c) {
+          const m = this._getMapType(o) || [];
+          b = m[0] ? `${D.SERIES} ${m[0]}` : D.UNDETERMINED, O = m[1] ? `${D.SERIES} ${m[1]}` : D.UNDETERMINED;
+        }
         i ? this._variablesHandle({
-          nameList: { name: r, isForVar: !0, type: `${D.SERIES} ${D.INT}` },
+          nameList: { name: r, isForVar: !0, type: b },
           value: {
-            type: `${D.SERIES} ${D.INT}`
+            type: b
           }
-        }, t) : i = r;
-        const c = o === D.UNDETERMINED ? o : this._isMatrixType(o) ? `${this._getArrayType(o)}[]` : this._typeAddSeries(this._getArrayType(o));
-        this._variablesHandle({
-          nameList: { name: i, isForVar: !0, type: c },
+        }, t) : i = r, O = o === D.UNDETERMINED ? o : c ? O : this._isMatrixType(o) ? `${this._getArrayType(o)}[]` : this._typeAddSeries(this._getArrayType(o)), this._variablesHandle({
+          nameList: { name: i, isForVar: !0, type: O },
           value: {
-            type: c
+            type: O
           }
         }, t);
       }

package/lib/assets/{scriptsRunWorker-RM2NRIoU.js → scriptsRunWorker-DwpQi_P7.js}

@@ -20608,7 +20608,7 @@ ${l}`), l;
       e[t] = (r, i) => ws.create(r, X2(n, i, { method: t }));
     return e.create = (t) => fp(X2(t)), e.extend = (t) => (typeof t == "function" && (t = t(n ?? {})), fp(X2(n, t))), e.stop = td, e;
   }, Xw = fp(), Sw = Xw.create({
-    timeout: 3e4,
+    timeout: 6e4,
     prefixUrl: "https://data.tradingvue.com/",
     retry: 0
     // 请求出错时 不自动重试 默认会自动重试2次
@@ -32283,6 +32283,9 @@ ${fd}`);
     strformat({ formatString: e = "" }, t, r) {
       return this._strFormat(e, t, r);
     }
+    _parseObjectStr(e) {
+      return typeof e == "object" ? e === null ? "null" : e?.isArray ? `[${e._value.toString()}]` : e.toString() : e !== void 0 ? e : "";
+    }
     _strFormat(e, t, r) {
       return e.replace(/{[^{}]+}/g, (i) => {
         if (!i)
@@ -32292,7 +32295,7 @@ ${fd}`);
           return i;
         const a = t[s];
         if (o.length === 1)
-          return typeof a == "number" ? r ? this._intlFormat.format(a) : Number(a.toFixed(this._precision)) : a === void 0 ? "" : a;
+          return typeof a == "number" ? r ? this._intlFormat.format(a) : Number(a.toFixed(this._precision)) : this._parseObjectStr(a);
         if (o.length === 2) {
           const c = o[1].trim();
           return c === "number" ? r ? this._intlFormat.format(a) : Number(a.toFixed(this._precision)) : c === "date" ? c0(a).format("LL") : i;

package/lib/components/editor/v5/parseScript/buildInFuncNamespace/string.d.ts

@@ -47,6 +47,7 @@ export default class BuildInStr {
     private _formatOthers;
     private _formatNumber;
     strformat({ formatString }: IStrArgs, args: any[], isFormat?: boolean): string;
+    private _parseObjectStr;
     private _strFormat;
 }
 export {};

package/lib/components/editor/v5/parseScript/visitorUtils.d.ts

@@ -21,7 +21,7 @@ export declare class ParserUtils extends TccScriptParserVisitor<any> {
     protected _removePrefix(type?: string): string;
     protected _getPrefix(type: string): string;
     protected _getArrayType(name: string): string | undefined;
-    protected _getMapType(name: string): "" | string[] | undefined;
+    protected _getMapType(name: string): string[] | undefined;
     protected _isMatrixType(type: string): boolean;
     protected _isArrayType(type: string): boolean;
     protected _isMapType(type: string): boolean;

package/lib/{index-S1gW0Mpf.js → index-DLIhM_y0.js}

@@ -59902,7 +59902,7 @@ function y(s, a) {
   return s.forEach((r) => {
     r.title = a;
     const i = r.originalName || r.name;
-    i !== "for...in" && (e.has(i) ? e.get(i)?.push(r) : (t.push(i), e.set(i, [r])));
+    e.has(i) ? e.get(i)?.push(r) : (t.push(i), e.set(i, [r]));
   }), { mapObj: e, keys: t };
 }
 const { keyList: l, keyMapList: w } = d();

package/lib/{monarchTokens-CMDv_iys.js → monarchTokens-D-73EVQs.js}

@@ -1,4 +1,4 @@
-import { KEY_LIST as l } from "./index-S1gW0Mpf.js";
+import { KEY_LIST as l } from "./index-DLIhM_y0.js";
 const d = "tccScript", g = {
   // builtinFunctions: /strategy\.closedtrades\.max_drawdown_percent|strategy\.opentrades\.max_drawdown_percent|strategy\.risk\.max_intraday_filled_orders|strategy\.closedtrades\.max_runup_percent|array\.percentile_linear_interpolation|strategy\.closedtrades\.entry_bar_index|strategy\.opentrades\.max_runup_percent|strategy\.closedtrades\.exit_bar_index|strategy\.closedtrades\.profit_percent|strategy\.closedtrades\.entry_comment|strategy\.opentrades\.entry_bar_index|strategy\.closedtrades\.exit_comment|strategy\.closedtrades\.max_drawdown|strategy\.opentrades\.profit_percent|ta\.percentile_linear_interpolation|strategy\.closedtrades\.entry_price|strategy\.opentrades\.entry_comment|strategy\.closedtrades\.commission|strategy\.closedtrades\.entry_time|strategy\.closedtrades\.exit_price|strategy\.opentrades\.max_drawdown|strategy\.risk\.max_cons_loss_days|strategy\.closedtrades\.exit_time|strategy\.closedtrades\.max_runup|strategy\.opentrades\.entry_price|strategy\.risk\.max_intraday_loss|strategy\.risk\.max_position_size|table\.cell_set_text_font_family|strategy\.closedtrades\.entry_id|strategy\.opentrades\.commission|strategy\.opentrades\.entry_time|array\.binary_search_rightmost|array\.percentile_nearest_rank|strategy\.closedtrades\.exit_id|strategy\.opentrades\.max_runup|array\.binary_search_leftmost|strategy\.closedtrades\.profit|strategy\.opentrades\.entry_id|strategy\.risk\.allow_entry_in|strategy\.convert_to_account|box\.set_bottom_right_point|label\.set_text_font_family|strategy\.closedtrades\.size|strategy\.convert_to_symbol|strategy\.default_entry_qty|strategy\.opentrades\.profit|strategy\.risk\.max_drawdown|ta\.percentile_nearest_rank|table\.cell_set_text_halign|table\.cell_set_text_valign|request\.security_lower_tf|table\.cell_set_text_color|box\.set_text_font_family|strategy\.opentrades\.size|table\.cell_set_text_size|matrix\.is_antisymmetric|box\.set_top_left_point|chart\.point\.from_index|matrix\.is_antidiagonal|table\.cell_set_bgcolor|table\.cell_set_tooltip|table\.set_border_color|table\.set_border_width|timeframe\.from_seconds|chart\.point\.from_time|line\.set_second_point|math\.round_to_mintick|matrix\.elements_count|request\.currency_rate|ta\.pivot_point_levels|table\.cell_set_height|table\.set_frame_color|table\.set_frame_width|box\.set_border_color|box\.set_border_style|box\.set_border_width|line\.set_first_point|matrix\.is_stochastic|matrix\.is_triangular|table\.cell_set_width|timeframe\.in_seconds|array\.binary_search|box\.set_rightbottom|box\.set_text_halign|box\.set_text_valign|color\.from_gradient|label\.set_textalign|label\.set_textcolor|matrix\.eigenvectors|matrix\.is_symmetric|matrix\.swap_columns|strategy\.cancel_all|table\.cell_set_text|array\.new_linefill|array\.sort_indices|box\.set_text_color|linefill\.get_line1|linefill\.get_line2|linefill\.set_color|matrix\.eigenvalues|matrix\.is_diagonal|matrix\.is_identity|strategy\.close_all|table\.set_position|ticker\.pointfigure|array\.lastindexof|array\.percentrank|array\.standardize|box\.set_text_size|box\.set_text_wrap|label\.set_tooltip|matrix\.remove_col|matrix\.remove_row|request\.dividends|request\.financial|table\.merge_cells|table\.set_bgcolor|ticker\.heikinashi|array\.covariance|array\.new_string|chart\.point\.copy|matrix\.is_binary|matrix\.is_square|matrix\.submatrix|matrix\.swap_rows|matrix\.transpose|request\.earnings|request\.economic|request\.security|ticker\.linebreak|timeframe\.change|array\.new_color|array\.new_float|array\.new_label|array\.new_table|box\.set_bgcolor|box\.set_lefttop|chart\.point\.new|chart\.point\.now|input\.text_area|input\.timeframe|label\.set_color|label\.set_point|label\.set_style|line\.set_extend|linefill\.delete|polyline\.delete|str\.format_time|str\.replace_all|strategy\.cancel|ticker\.standard|alertcondition|array\.includes|array\.new_bool|array\.new_line|array\.variance|box\.get_bottom|box\.set_bottom|box\.set_extend|label\.get_text|label\.set_size|label\.set_text|label\.set_xloc|label\.set_yloc|line\.get_price|line\.set_color|line\.set_style|line\.set_width|math\.todegrees|math\.toradians|matrix\.add_col|matrix\.add_row|matrix\.columns|matrix\.is_zero|matrix\.reshape|matrix\.reverse|request\.quandl|request\.splits|str\.startswith|strategy\.close|strategy\.entry|strategy\.order|syminfo\.prefix|syminfo\.ticker|ta\.correlation|ta\.highestbars|ta\.percentrank|ticker\.inherit|array\.indexof|array\.new_box|array\.new_int|array\.reverse|array\.unshift|box\.get_right|box\.set_right|input\.session|line\.set_xloc|matrix\.concat|matrix\.median|max_bars_back|runtime\.error|str\.substring|strategy\.exit|ta\.crossunder|ta\.lowestbars|ta\.supertrend|ticker\.modify|array\.concat|array\.insert|array\.median|array\.remove|box\.get_left|box\.set_left|box\.set_text|input\.source|input\.string|input\.symbol|label\.delete|label\.set_xy|line\.set_xy1|line\.set_xy2|linefill\.new|map\.contains|matrix\.trace|polyline\.new|request\.seed|str\.contains|str\.endswith|str\.tonumber|str\.tostring|ta\.barssince|ta\.crossover|ta\.pivothigh|ta\.valuewhen|table\.delete|ticker\.renko|array\.clear|array\.every|array\.first|array\.range|array\.shift|array\.slice|array\.stdev|box\.get_top|box\.set_top|input\.color|input\.float|input\.price|label\.get_x|label\.get_y|label\.set_x|label\.set_y|line\.delete|line\.get_x1|line\.get_x2|line\.get_y1|line\.get_y2|line\.set_x1|line\.set_x2|line\.set_y1|line\.set_y2|log\.warning|map\.put_all|math\.random|matrix\.copy|matrix\.diff|matrix\.fill|matrix\.kron|matrix\.mode|matrix\.mult|matrix\.pinv|matrix\.rank|matrix\.rows|matrix\.sort|str\.replace|ta\.pivotlow|ta\.variance|table\.clear|ticker\.kagi|array\.copy|array\.fill|array\.from|array\.join|array\.last|array\.mode|array\.push|array\.size|array\.some|array\.sort|box\.delete|dayofmonth|input\.bool|input\.time|label\.copy|map\.remove|map\.values|math\.floor|math\.log10|math\.round|matrix\.avg|matrix\.col|matrix\.det|matrix\.get|matrix\.inv|matrix\.max|matrix\.min|matrix\.new|matrix\.pow|matrix\.row|matrix\.set|matrix\.sum|plotcandle|str\.format|str\.length|ta\.falling|ta\.highest|table\.cell|ticker\.new|time_close|weekofyear|array\.abs|array\.avg|array\.get|array\.max|array\.min|array\.new|array\.pop|array\.set|array\.sum|color\.new|color\.rgb|dayofweek|indicator|input\.int|label\.new|line\.copy|log\.error|map\.clear|math\.acos|math\.asin|math\.atan|input\.enum|math\.ceil|math\.sign|math\.sqrt|plotarrow|plotshape|str\.lower|str\.match|str\.split|str\.upper|ta\.change|ta\.linreg|ta\.lowest|ta\.median|ta\.rising|table\.new|timestamp|barcolor|box\.copy|line\.new|linefill|log\.info|map\.copy|map\.keys|map\.size|math\.abs|math\.avg|math\.cos|math\.exp|math\.log|math\.max|math\.min|math\.pow|math\.sin|math\.sum|math\.tan|plotchar|strategy|ta\.cross|ta\.range|ta\.stdev|ta\.stoch|bgcolor|box\.new|color\.b|color\.g|color\.r|color\.t|library|map\.get|map\.new|map\.put|plotbar|str\.pos|ta\.alma|ta\.macd|ta\.mode|ta\.swma|ta\.vwap|ta\.vwma|fixnan|minute|second|string|ta\.atr|ta\.bbw|ta\.cci|ta\.cmo|ta\.cog|ta\.cum|ta\.dev|ta\.dmi|ta\.ema|ta\.hma|ta\.kcw|ta\.max|ta\.mfi|ta\.min|ta\.mom|ta\.rma|ta\.roc|ta\.rsi|ta\.sar|ta\.sma|ta\.tsi|ta\.wma|ta\.wpr|alert|color|float|hline|input|label|month|ta\.bb|ta\.kc|ta\.tr|table|bool|fill|hour|line|plot|time|year|box|int|na|nz/,
   builtinFunctions: new RegExp(a(l.functions)),