hqchart 1.1.14804 → 1.1.14809

package/src/jscommon/umychart.vue/umychart.vue.js

@@ -6924,6 +6924,8 @@ var JSCHART_EVENT_ID=
     ON_CLICK_CROSSCURSOR_BOTTOM:170,            //十字光标底部文字点击     
 
     ON_CLICK_CHART_CELL:171,                    //点击图形单元
+
+    GET_DEFAULT_INDEX_PARAM:172,                //获取指标默认参数
 }
 
 var JSCHART_OPERATOR_ID=
@@ -57325,6 +57327,24 @@ IFrameSplitOperator.FormatDateTimeString=function(value,isShowDate,isShowTime)
     return result;
 }
 
+IFrameSplitOperator.FormatDateTimeStringV2=function(datetime, format, languageID)
+{
+    if (!datetime) return null;
+
+    switch(format)
+    {
+        case "YYYY-MM-DD":
+            return `${datetime.getFullYear()}-${IFrameSplitOperator.NumberToString(datetime.getMonth()+1)}-${IFrameSplitOperator.NumberToString(datetime.getDate())}`;
+            
+        case "HH:MM:SS":
+            return `${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}:${IFrameSplitOperator.NumberToString(datetime.getSeconds())}`;
+        case "HH:MM":
+            return `${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}`;
+        default:
+            return null;
+    }
+}
+
 //字段颜色格式化
 IFrameSplitOperator.FormatValueColor = function (value, value2) 
 {
@@ -137787,7 +137807,7 @@ function JSReportChartContainer(uielement)
         //32=收盘价线 33=K线  35=时间 36=日期字段 38=持仓量 39=结算价 40=昨结算价 41=开仓量 42=平仓量
         //43=1m涨速% 44=3m涨速% 45=5m涨速% 46=10m涨速%  47=15m涨速%
         //80=整行背景色
-        //101-199=数值型  201-299=字符型 301-350=进度条 351-400=按钮
+        //101-199=数值型  201-299=字符型 301-350=进度条 351-400=按钮 401-499=日期时间
 
         if (IFrameSplitOperator.IsString(item[1])) stock.Name=item[1];
         if (IFrameSplitOperator.IsNumber(item[2])) stock.YClose=item[2];
@@ -137933,7 +137953,18 @@ function JSReportChartContainer(uielement)
         if (IFrameSplitOperator.IsObject(item[358])) stock.ReserveButton8=item[358];
         if (IFrameSplitOperator.IsObject(item[359])) stock.ReserveButton9=item[359];
         if (IFrameSplitOperator.IsObject(item[360])) stock.ReserveButton10=item[360];
-        
+
+        //10个日期时间类型 401-499 { Value:Date, BGColor }
+        if (IFrameSplitOperator.IsObject(item[401])) stock.ReserveDateTime1=item[401];
+        if (IFrameSplitOperator.IsObject(item[402])) stock.ReserveDateTime2=item[402];
+        if (IFrameSplitOperator.IsObject(item[403])) stock.ReserveDateTime3=item[403];
+        if (IFrameSplitOperator.IsObject(item[404])) stock.ReserveDateTime4=item[404];
+        if (IFrameSplitOperator.IsObject(item[405])) stock.ReserveDateTime5=item[405];
+        if (IFrameSplitOperator.IsObject(item[406])) stock.ReserveDateTime6=item[406];
+        if (IFrameSplitOperator.IsObject(item[407])) stock.ReserveDateTime7=item[407];
+        if (IFrameSplitOperator.IsObject(item[408])) stock.ReserveDateTime8=item[408];
+        if (IFrameSplitOperator.IsObject(item[409])) stock.ReserveDateTime9=item[409];
+        if (IFrameSplitOperator.IsObject(item[410])) stock.ReserveDateTime10=item[410];
     }
 
 
@@ -140780,6 +140811,18 @@ var REPORT_COLUMN_ID=
     RESERVE_BUTTON9_ID:459,    //ReserveButton9:
     RESERVE_BUTTON10_ID:460,   //ReserveButton10:
 
+
+    //预留日期时间类型 10个 501-599
+    RESERVE_DATETIME1_ID:501,   //ReserveDateTime1;
+    RESERVE_DATETIME2_ID:502,
+    RESERVE_DATETIME3_ID:503,
+    RESERVE_DATETIME4_ID:504,
+    RESERVE_DATETIME5_ID:505,
+    RESERVE_DATETIME6_ID:506,
+    RESERVE_DATETIME7_ID:507,
+    RESERVE_DATETIME8_ID:508,
+    RESERVE_DATETIME9_ID:509,
+    RESERVE_DATETIME10_ID:510,
 }
 
 
@@ -140876,6 +140919,17 @@ var MAP_COLUMN_FIELD=new Map([
     [REPORT_COLUMN_ID.RESERVE_BUTTON8_ID,"ReserveButton8"],
     [REPORT_COLUMN_ID.RESERVE_BUTTON9_ID,"ReserveButton9"],
     [REPORT_COLUMN_ID.RESERVE_BUTTON10_ID,"ReserveButton10"],
+
+    [REPORT_COLUMN_ID.RESERVE_DATETIME1_ID,"ReserveDateTime1"],
+    [REPORT_COLUMN_ID.RESERVE_DATETIME2_ID,"ReserveDateTime2"],
+    [REPORT_COLUMN_ID.RESERVE_DATETIME3_ID,"ReserveDateTime3"],
+    [REPORT_COLUMN_ID.RESERVE_DATETIME4_ID,"ReserveDateTime4"],
+    [REPORT_COLUMN_ID.RESERVE_DATETIME5_ID,"ReserveDateTime5"],
+    [REPORT_COLUMN_ID.RESERVE_DATETIME6_ID,"ReserveDateTime6"],
+    [REPORT_COLUMN_ID.RESERVE_DATETIME7_ID,"ReserveDateTime7"],
+    [REPORT_COLUMN_ID.RESERVE_DATETIME8_ID,"ReserveDateTime8"],
+    [REPORT_COLUMN_ID.RESERVE_DATETIME9_ID,"ReserveDateTime9"],
+    [REPORT_COLUMN_ID.RESERVE_DATETIME10_ID,"ReserveDateTime10"],
 ]);
 
 function ChartReport()
@@ -141273,6 +141327,10 @@ function ChartReport()
             if (item.Format) colItem.Format=item.Format;    //数据格式化设置{ Type:1=原始 2=千分位分割 3=万亿转换, ExFloatPrecision:万亿转换以后的小数位数 }
             if (item.StringFormat) colItem.StringFormat=item.StringFormat;      //"{0}%" 输出增加固定字符
         }
+        else if (this.IsReserveDateTime(item.Type))
+        {
+            if (item.DateTimeFormat) colItem.DateTimeFormat=item.DateTimeFormat;    //日期格式化
+        }
         else if (item.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
         {
             if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) return null;
@@ -141516,6 +141574,18 @@ function ChartReport()
             { Type:REPORT_COLUMN_ID.RESERVE_BUTTON8_ID, Title:"按钮8", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() },
             { Type:REPORT_COLUMN_ID.RESERVE_BUTTON9_ID, Title:"按钮9", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() },
             { Type:REPORT_COLUMN_ID.RESERVE_BUTTON10_ID, Title:"按钮10", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() },
+
+
+            { Type:REPORT_COLUMN_ID.RESERVE_DATETIME1_ID, Title:"日期1", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
+            { Type:REPORT_COLUMN_ID.RESERVE_DATETIME2_ID, Title:"日期2", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
+            { Type:REPORT_COLUMN_ID.RESERVE_DATETIME3_ID, Title:"日期3", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
+            { Type:REPORT_COLUMN_ID.RESERVE_DATETIME4_ID, Title:"日期4", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
+            { Type:REPORT_COLUMN_ID.RESERVE_DATETIME5_ID, Title:"日期5", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
+            { Type:REPORT_COLUMN_ID.RESERVE_DATETIME6_ID, Title:"日期6", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
+            { Type:REPORT_COLUMN_ID.RESERVE_DATETIME7_ID, Title:"日期7", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
+            { Type:REPORT_COLUMN_ID.RESERVE_DATETIME8_ID, Title:"日期8", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
+            { Type:REPORT_COLUMN_ID.RESERVE_DATETIME9_ID, Title:"日期9", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
+            { Type:REPORT_COLUMN_ID.RESERVE_DATETIME10_ID, Title:"日期10", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99", DateTimeFormat:"YYYY-MM-DD" },
             
         ];
 
@@ -142810,6 +142880,11 @@ function ChartReport()
             this.FormatReserveString(column, stock, drawInfo);
             this.FormatDrawInfoEvent(stock, data, column, drawInfo);
         }
+        else if (this.IsReserveDateTime(column.Type))
+        {
+            this.FormatReserveDateTime(column, stock, drawInfo);
+            this.FormatDrawInfoEvent(stock, data, column, drawInfo);
+        }
         else if (this.IsReserveProgressBarColumn(column.Type))
         {
             this.FormatReserveProgressBar(column, stock, drawInfo);
@@ -142979,6 +143054,18 @@ function ChartReport()
         return ARARY_TYPE.includes(value);
     }
 
+    this.IsReserveDateTime=function(value)
+    {
+        var ARARY_TYPE=
+        [
+            REPORT_COLUMN_ID.RESERVE_DATETIME1_ID,REPORT_COLUMN_ID.RESERVE_DATETIME2_ID,REPORT_COLUMN_ID.RESERVE_DATETIME3_ID,REPORT_COLUMN_ID.RESERVE_DATETIME4_ID,
+            REPORT_COLUMN_ID.RESERVE_DATETIME5_ID,REPORT_COLUMN_ID.RESERVE_DATETIME6_ID,REPORT_COLUMN_ID.RESERVE_DATETIME7_ID,REPORT_COLUMN_ID.RESERVE_DATETIME8_ID,
+            REPORT_COLUMN_ID.RESERVE_DATETIME9_ID,REPORT_COLUMN_ID.RESERVE_DATETIME10_ID
+        ];
+        
+        return ARARY_TYPE.includes(value);
+    }
+
    
 
     this.DrawCustomText=function(drawInfo, column, left, top, cellWidth)
@@ -143411,6 +143498,21 @@ function ChartReport()
         }
     }
 
+    this.FormatReserveDateTime=function(column, data, drawInfo)
+    {
+        if (column.DefaultText) drawInfo.Text=column.DefaultText;
+
+        var fieldName=MAP_COLUMN_FIELD.get(column.Type);
+        if (!data || !fieldName) return;
+
+        var item=data[fieldName];
+        if (!IFrameSplitOperator.IsObject(item)) return;
+        
+        if (item.DateTime) drawInfo.Text=IFrameSplitOperator.FormatDateTimeStringV2(item.DateTime,column.DateTimeFormat);
+        if (item.TextColor) drawInfo.TextColor=item.TextColor;
+        if (item.BGColor) drawInfo.BGColor=item.BGColor;
+    }
+
     this.FormatReserveProgressBar=function(column, data, drawInfo)
     {
         var fieldName=MAP_COLUMN_FIELD.get(column.Type);
@@ -159674,7 +159776,8 @@ function JSDialogModifyIndexParam()
 
     this.AryData=[];
     this.IndexData=null;    //指标数据 { WindowsIndex:, Type:1=主图 2=叠加, Identify, IndexScript: }
-    this.Arguments=[];           //参数备份
+    this.Arguments=[];      //默认参数
+    this.EnableRestoreParam=true;   //是否允许“恢复默认"
 
     this.RestoreFocusDelay=800;
 
@@ -159685,6 +159788,7 @@ function JSDialogModifyIndexParam()
         {
             if (IFrameSplitOperator.IsNumber(option.Style)) this.Style=option.Style;
             if (IFrameSplitOperator.IsNumber(option.MaxRowCount)) this.MaxRowCount=option.MaxRowCount;
+            if (IFrameSplitOperator.IsBool(option.EnableRestoreParam)) this.EnableRestoreParam=option.EnableRestoreParam;
         }
     }
 
@@ -159725,7 +159829,7 @@ function JSDialogModifyIndexParam()
 
     this.OnClickColseButton=function(e)
     {
-        this.RestoreParam();    //还原参数
+        //this.RestoreParam();    //还原参数
         this.Close(e);
     }
 
@@ -159756,7 +159860,8 @@ function JSDialogModifyIndexParam()
     this.SetIndexData=function(data)
     {
         this.IndexData=data;
-        this.BackupParam();
+        this.GetDefaultParam();
+        //this.BackupParam();
     }
 
     this.OnMouseDownTitle=function(e)
@@ -159834,31 +159939,6 @@ function JSDialogModifyIndexParam()
         table.className="UMyChart_ModifyIndexParam_Table";
         divTable.appendChild(table);
 
-        /*
-        var thead=document.createElement("thead");
-        table.appendChild(thead);
-
-        var trDom=document.createElement("tr");
-        trDom.className='UMyChart_ModifyIndexParam_head_Tr';
-        thead.appendChild(trDom);
-
-        var thDom=document.createElement("th");
-        thDom.className="UMyChart_ModifyIndexParam_Th"; 
-        thDom.innerText="变量";
-        trDom.appendChild(thDom);
-
-        var thDom=document.createElement("th");
-        thDom.className="UMyChart_ModifyIndexParam_Th"; 
-        thDom.innerText="数值";
-        trDom.appendChild(thDom);
-
-        var thDom=document.createElement("th");
-        thDom.className="UMyChart_ModifyIndexParam_Th"; 
-        thDom.innerText="说明";
-        trDom.appendChild(thDom);
-        */
-
-
         var tbody=document.createElement("tbody");
         tbody.className="UMyChart_ModifyIndexParam_Tbody";
         table.appendChild(tbody);
@@ -159875,17 +159955,29 @@ function JSDialogModifyIndexParam()
         divButton.className='UMyChart_ModifyIndexParam_Button_Div';
         divFrame.appendChild(divButton);
 
-        var btnRestore=document.createElement("button");
-        //btnRestore.className="UMyChart_ModifyIndexParam_button";
-        btnRestore.innerText="恢复默认";
-        btnRestore.addEventListener("mousedown", (e)=>{ this.OnClickRestoreButton(e); });
-        divButton.appendChild(btnRestore);
+        if (this.EnableRestoreParam)
+        {
+            var btnRestore=document.createElement("button");
+            //btnRestore.className="UMyChart_ModifyIndexParam_button";
+            btnRestore.innerText="恢复默认";
+            btnRestore.addEventListener("mousedown", (e)=>{ this.OnClickRestoreButton(e); });
+            divButton.appendChild(btnRestore);
+        }
+        
 
+        /*
         var btnOk=document.createElement("button");
         //btnOk.className="UMyChart_ModifyIndexParam_button";
         btnOk.innerText="确认";
         btnOk.addEventListener("mousedown", (e)=>{ this.OnClickOkButton(e); })
         divButton.appendChild(btnOk);
+        */
+
+        var btnOk=document.createElement("button");
+        //btnOk.className="UMyChart_ModifyIndexParam_button";
+        btnOk.innerText="关闭";
+        btnOk.addEventListener("mousedown", (e)=>{ this.Close(e); })
+        divButton.appendChild(btnOk);
         
         document.body.appendChild(divDom);
 
@@ -160027,6 +160119,41 @@ function JSDialogModifyIndexParam()
         }
     }
 
+    this.GetDefaultParam=function()
+    {
+        this.Arguments=[];
+        if (!this.IndexData || !this.IndexData.IndexScript) return;
+        var indexScript=this.IndexData.IndexScript;
+
+        var args=[];
+        if (indexScript.ID)
+        {
+            var scriptData = new JSIndexScript();
+            var indexInfo = scriptData.Get(indexScript.ID);
+            if (indexInfo) args=indexInfo.Args;
+        }
+        
+        var event=this.HQChart.GetEventCallback(JSCHART_EVENT_ID.GET_DEFAULT_INDEX_PARAM);
+        if (event && event.Callback)
+        {
+            var sendData={ IndexData:this.IndexData, Args:args.slice(), PreventDefault:false };
+            event.Callback(event, sendData, this);
+
+            if (sendData.PreventDefault) return;
+
+            args=sendData.Args;
+        }
+
+        if (IFrameSplitOperator.IsNonEmptyArray(args))
+        {
+            for(var i=0;i<args.length;++i)
+            {
+                var item=args[i];
+                this.Arguments.push({Name:item.Name, Value:item.Value, Index:i});
+            }
+        }
+    }
+
     this.OnParamMouseUp=function(e)
     {
         var input=e.target;
@@ -160193,7 +160320,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14803";
+var HQCHART_VERSION="1.1.14807";
 
 function PrintHQChartVersion()
 {