hqchart 1.1.13550 → 1.1.13558

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.13550",
+  "version": "1.1.13558",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.deal.js

@@ -1008,6 +1008,10 @@ function ChartDealList()
                 if (!IFrameSplitOperator.IsNumber(item.DataIndex)) continue;
                 colItem.DataIndex=item.DataIndex;   //柱子数据所在原始数据索引列
             }
+            else if (item.Type==DEAL_COLUMN_ID.TIME_ID)
+            {
+                if (IFrameSplitOperator.IsString(item.Foramt)) colItem.Foramt=item.Foramt;  //设置时间格式
+            }
 
             this.Column.push(colItem);
         }

package/src/jscommon/umychart.js

@@ -2599,6 +2599,7 @@ var JSCHART_EVENT_ID=
     ON_CLICK_TREPORT_ROW:127,                 //左键点击点击T型报价列表
 
     ON_DRAW_REPORT_ROW_BG:140,              //报价列表整行背景
+    ON_CLICK_REPORT_CHECKBOX:141,           //报价列表checkbox
 
 
     ON_CHANGE_INDEX:150,        //切换指标
@@ -50888,8 +50889,9 @@ function HQPriceStringFormat()
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_CORSSCURSOR_Y_TEXT);
             if (event)
             {
-                var data={ Value:this.Value, FrameID:this.FrameID };
+                var data={ Value:this.Value, FrameID:this.FrameID, PreventDefault:false };
                 event.Callback(event,data,this);
+                if (data.PreventDefault==true) return false;
             }
         }
 
@@ -50964,8 +50966,10 @@ function HQDateStringFormat()
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_CORSSCURSOR_X_TEXT);
             if (event)
             {
-                var data={ Item:currentData, Period:this.Data.Period, Date:currentData.Date, Time:currentData.Time,Index:this.Data.DataOffset+index };
+                var data={ Item:currentData, Period:this.Data.Period, Date:currentData.Date, Time:currentData.Time,Index:this.Data.DataOffset+index, PreventDefault:false };
                 event.Callback(event,data,this);
+
+                if (data.PreventDefault==true) return false;
             }
         }
 
@@ -51104,8 +51108,10 @@ function HQMinuteTimeStringFormat()
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_CORSSCURSOR_X_TEXT);
             if (event)
             {
-                var data={ Time:time, Index:showIndex };
+                var data={ Time:time, Index:showIndex, PreventDefault:false };
                 event.Callback(event,data,this);
+
+                if (data.PreventDefault==true) return false;
             }
         }
 
@@ -67239,6 +67245,15 @@ function JSChartResource()
             BorderColor:'rgba(180,180,180,0.9)',
             BGColor:"rgba(234,239,248,0.9)",
             BarWidth:{ Size:12 }
+        },
+
+        CheckBox:
+        {
+            Family:"iconfont", Size:15,
+            Checked:{ Color:"rgb(33,148,240)", Symbol:"\ue6b3", DisableColor:"rgb(112,128,144)" },
+            Unchecked:{ Color:"rgb(33,148,240)", Symbol:"\ue6b4", DisableColor:"rgb(112,128,144)" },
+
+            Margin:{ Left:5, Right:5, Bottom:2, Top:4 },
         }
     },
 
@@ -68254,6 +68269,33 @@ function JSChartResource()
             if (subItem.BorderColor) dest.VScrollbar.BorderColor=subItem.BorderColor;
             if (subItem.BGColor) dest.VScrollbar.BGColor=subItem.BGColor;
         }
+
+        if (item.CheckBox)
+        {
+            var subItem=item.CheckBox;
+            if (subItem.Family) dest.CheckBox.Family=subItem.Family;
+            if (IFrameSplitOperator.IsNumber(subItem.Size)) dest.CheckBox.Size=subItem.Size;
+
+            if (subItem.Checked)
+            {
+                var child=subItem.Checked;
+                if (child.Color) dest.CheckBox.Checked.Color=child.Color;
+                if (child.Symbol) dest.CheckBox.Checked.Symbol=child.Symbol;
+                if (child.DisableColor) dest.CheckBox.Checked.DisableColor=child.DisableColor;
+            }
+
+            if (subItem.Unchecked)
+            {
+                var child=subItem.Unchecked;
+                if (child.Color) dest.CheckBox.Unchecked.Color=child.Color;
+                if (child.Symbol) dest.CheckBox.Unchecked.Symbol=child.Symbol;
+                if (child.DisableColor) dest.CheckBox.Unchecked.DisableColor=child.DisableColor;
+
+               
+            }
+
+            CopyMarginConfig(dest.CheckBox.Margin, subItem.Margin);
+        }
         
     }