hqchart 1.1.13709 → 1.1.13717

package/src/jscommon/umychart.js

@@ -35970,6 +35970,303 @@ function ChartMACD()
     }
 }
 
+function ChartClipColorStick()
+{
+    this.newMethod=IChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName="ChartClipColorStick";
+    this.UpColor=g_JSChartResource.UpBarColor;
+    this.DownColor=g_JSChartResource.DownBarColor;
+    this.LineWidth=1;
+    //差值线
+    this.DownDiffColor=g_JSChartResource.DownBarColor;
+    this.UpDiffColor=g_JSChartResource.UpBarColor;
+
+    this.BaseLineColor; //基准线
+
+    this.BaseValue=0;
+    this.Super_GetMaxMin=this.GetMaxMin;    //父类的方法
+
+    this.SetOption=function(option)
+    {
+        if (!option) return;
+
+        if (option.UpColor) this.UpColor=option.UpColor;
+        if (option.DownColor) this.DownColor=option.DownColor;
+        if (option.DownDiffColor) this.DownDiffColor=option.DownDiffColor;
+        if (option.UpDiffColor) this.UpDiffColor=option.UpDiffColor;
+        if (option.BaseLineColor) this.BaseLineColor=option.BaseLineColor;
+        if (IFrameSplitOperator.IsNumber(option.BaseValue)) this.BaseValue=option.BaseValue;
+    }
+
+    this.Draw=function()
+    {
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
+
+        if (this.NotSupportMessage)
+        {
+            this.DrawNotSupportmessage();
+            return;
+        }
+
+        this.Canvas.save();
+        var dataWidth=this.ChartFrame.DataWidth;
+        var lineWidth=this.LineWidth*GetDevicePixelRatio();
+        if (this.LineWidth==50) lineWidth=dataWidth;
+        else if (lineWidth>dataWidth) lineWidth=dataWidth;
+        
+        if (IFrameSplitOperator.IsNumber(this.BaseValue) && this.BaseValue!=0)
+        {
+            this.DrawBaseLine();
+
+            if (this.BaseValue>0)  this.DrawBars(lineWidth, true);
+            else this.DrawBars(lineWidth, false);
+        }
+        else
+        {
+            //上下分开画
+            this.DrawBars(lineWidth, true);
+            this.DrawBars(lineWidth, false);
+        }
+
+
+        this.Canvas.restore();
+    }
+
+    this.DrawBars=function(lineWidth, bUpBar)
+    {
+        var isMinute=this.IsMinuteFrame();
+        var dataWidth=this.ChartFrame.DataWidth;
+        var distanceWidth=this.ChartFrame.DistanceWidth;
+        var xPointCount=this.ChartFrame.XPointCount;
+        var isHSCreen=this.ChartFrame.IsHScreen===true;
+
+        if (isHSCreen)
+        {
+            var border=this.ChartBorder.GetHScreenBorder();
+            var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+            var chartright=border.BottomEx;
+            var lockRect=this.GetLockRect();
+            if (lockRect) chartright=lockRect.Top;
+        }
+        else
+        {
+            var border=this.ChartBorder.GetBorder();
+            var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+
+            var chartright=border.RightEx;
+            var lockRect=this.GetLockRect();
+            if (lockRect) chartright=lockRect.Left;
+        }
+
+        var yBottom=this.ChartFrame.GetYFromData(this.BaseValue);
+        var aryBar=[], aryDiffBar=[];
+        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
+        {
+            var value=this.Data.Data[i];
+            if (value==null) continue;
+            if (bUpBar)
+            {
+                if (value<0) continue;
+            }
+            else
+            {
+                if (value>=0) continue;
+            }
+
+            if (isMinute)
+            {
+                var x=this.ChartFrame.GetXFromIndex(j);
+            }
+            else
+            {
+                var left=xOffset;
+                var right=xOffset+dataWidth;
+                if (right>chartright) break;
+                var x=left+(right-left)/2;
+            }
+
+            if (x>chartright) break;
+
+            var bDiffBar=false;
+            var diffValue=null;
+            if (this.BaseValue>0)
+            {
+                if (value<this.BaseValue)
+                {
+                    bDiffBar=true;
+                    diffValue=this.BaseValue-(this.BaseValue-value);
+                }
+            }
+            else if (this.BaseValue<0)
+            {
+                if (value>this.BaseValue)
+                {
+                    bDiffBar=true;
+                    diffValue=this.BaseValue+(value-this.BaseValue)
+                }
+            }
+            
+            if (!bDiffBar)
+            {
+                var y=this.ChartFrame.GetYFromData(value);
+                aryBar.push({X:x, Y:y});
+            }
+            else
+            {
+                var y=this.ChartFrame.GetYFromData(diffValue);
+                aryDiffBar.push({X:x, Y:y});
+            }
+        }
+
+        this.Canvas.lineWidth=lineWidth;
+        if (bUpBar) this.Canvas.strokeStyle=this.UpColor;
+        else this.Canvas.strokeStyle=this.DownColor;
+
+        this.DrawStick(aryBar,lineWidth,yBottom);
+
+        if (this.BaseValue>0)
+        {
+            this.Canvas.strokeStyle=this.UpDiffColor;
+            this.DrawStick(aryDiffBar,lineWidth,yBottom);
+        }
+        else if (this.BaseValue<0)
+        {
+            this.Canvas.strokeStyle=this.DownDiffColor;
+            this.DrawStick(aryDiffBar,lineWidth,yBottom);
+        }
+
+    }
+
+    this.DrawStick=function(aryData, lineWidth, yBottom)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryData)) return;
+
+        var isHSCreen=this.ChartFrame.IsHScreen===true;
+        var drawCount=0;
+        this.Canvas.beginPath();
+        for(var i=0; i<aryData.length; ++i)
+        {
+            var item=aryData[i];
+            var y=item.Y;
+            var xFix=ToFixedPoint2(lineWidth, item.X); //毛边修正
+
+            if (isHSCreen)
+            {
+                this.Canvas.moveTo(yBottom,ToFixedPoint(x));
+                this.Canvas.lineTo(y,ToFixedPoint(x));
+            }
+            else
+            {
+                this.Canvas.moveTo(xFix,yBottom);
+                this.Canvas.lineTo(xFix,y);
+            }
+            
+            ++drawCount;
+        }
+
+        if (drawCount>0) this.Canvas.stroke();
+    }
+
+    this.DrawBaseLine=function()
+    {
+        if (!IFrameSplitOperator.IsNumber(this.BaseValue) || this.BaseValue==0) return;
+        if (!this.BaseLineColor) return;
+
+        var isHSCreen=this.ChartFrame.IsHScreen===true;
+        var border=this.ChartFrame.GetBorder();
+        var y=this.ChartFrame.GetYFromData(this.BaseValue);
+
+        this.Canvas.strokeStyle=this.BaseLineColor;
+        this.Canvas.lineWidth=1*GetDevicePixelRatio();
+
+        if (isHSCreen)
+        {
+
+        }
+        else
+        {
+            var yFix=ToFixedPoint(y);
+            this.Canvas.beginPath();
+            this.Canvas.moveTo(border.Left,yFix);
+            this.Canvas.lineTo(border.Right,yFix);
+            this.Canvas.stroke();
+        }
+    }
+
+    this.GetMaxMin=function()
+    {
+        if (!IFrameSplitOperator.IsNumber(this.BaseValue) || this.BaseValue==0)
+            return this.Super_GetMaxMin();
+        
+        var xPointCount=this.ChartFrame.XPointCount;
+        var start=this.Data.DataOffset;
+        if (this.ChartFrame.GlobalOption && this.ChartFrame.GlobalOption.IsValueFullRange)
+        {
+            start=0;
+            xPointCount=this.Data.Data.length;
+        }
+        
+        var range={ Min:null, Max:null }, maxDiffValue=null;   //基准值的差值
+        if(!this.Data || !this.Data.Data) return range;
+
+        if (this.BaseValue>0) range.Min=this.BaseValue;
+        else range.Max=this.BaseValue;
+
+        for(var i=start,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
+        {
+            var value=this.Data.Data[i];
+            if (value==null || isNaN(value)) continue;
+
+            if (this.BaseValue>0)
+            {
+                if (value<0) continue;
+
+                if (value<this.BaseValue)
+                {
+                    var diffValue=this.BaseValue-value;
+                    if (maxDiffValue==null || maxDiffValue<diffValue) maxDiffValue=diffValue;
+                    continue;
+                }
+            }
+            else
+            {
+                if (value>0) continue;
+
+                if (value>this.BaseValue) 
+                {
+                    var diffValue=value-this.BaseValue;
+                    if (maxDiffValue==null || maxDiffValue<diffValue) maxDiffValue=diffValue;
+                    continue;
+                }
+            }
+
+            if (range.Max==null) range.Max=value;
+            if (range.Min==null) range.Min=value;
+
+            if (range.Max<value) range.Max=value;
+            if (range.Min>value) range.Min=value;
+        }
+
+        if (this.BaseValue>0)
+        {
+            if (IFrameSplitOperator.IsNumber(maxDiffValue) && IFrameSplitOperator.IsNumber(range.Min))
+                range.Min-=maxDiffValue;
+        }
+        else
+        {
+            if (IFrameSplitOperator.IsNumber(maxDiffValue) && IFrameSplitOperator.IsNumber(range.Max))
+                range.Max+=maxDiffValue;
+        }
+
+        return range;
+    }
+}
+
 //柱子
 function ChartBar()
 {

package/src/jscommon/umychart.keyboard.js

@@ -247,7 +247,8 @@ function JSKeyboardChartContainer(uielement)
     this.NetworkFilter;                                 //数据回调接口
     this.Data={ XOffset:0, YOffset:0, Data:[] };        //股票列表
     this.MapSymbol=new Map();
-    this.SourceData={ Data:[] }                                //码表数据 Data:[ { Symbol:, Spell, Name:, Color:}] 
+    this.SourceData={ Data:[] }               //码表数据 Data:[ { Symbol:, Spell, Name:, Color: TypeName:, TypeID } ] 
+    this.FunctionKeyData=[];                  //功能键 { Priority:, Data:[ { Symbol:, Spell, Name:, Color:, TypeName:, TypeID } ] 
 
     //事件回调
     this.mapEvent=new Map();   //通知外部调用 key:JSCHART_EVENT_ID value:{Callback:回调,}
@@ -274,10 +275,44 @@ function JSKeyboardChartContainer(uielement)
         if (option && option.Redraw==true) this.Draw();
     }
 
+    this.SearchFunctionKeyData=function(strSearch)
+    {
+        if (strSearch.length<=0) return null;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.FunctionKeyData)) return null;
+
+        var aryData=[];
+        for(var i=0; i<this.FunctionKeyData.length; ++i)
+        {
+            var groupData=this.FunctionKeyData[i];
+            if (!groupData) continue;
+            if (!IFrameSplitOperator.IsNonEmptyArray(groupData.Data)) continue;
+
+            var aryExactQuery=[];   //精确查询
+            var aryFuzzyQuery=[];   //模糊查询
+            var aryEqualQuery=[];   //相等
+
+            for(var j=0;j<groupData.Data.length;++j)
+            {
+                var item=groupData.Data[j];
+                if (this.SearchSymbol(item, strSearch, aryExactQuery, aryFuzzyQuery,aryEqualQuery)) continue;
+            }
+
+            if (IFrameSplitOperator.IsNonEmptyArray(aryEqualQuery)) aryData.push(...aryEqualQuery); 
+            if (IFrameSplitOperator.IsNonEmptyArray(aryExactQuery)) aryData.push(...aryExactQuery); 
+            if (IFrameSplitOperator.IsNonEmptyArray(aryFuzzyQuery)) aryData.push(...aryFuzzyQuery); 
+        }
+
+        if (aryData.length>0) return aryData;
+        
+        return null;
+    }
+
     this.Search=function(strText)
     {
         var aryExactQuery=[];   //精确查询
         var aryFuzzyQuery=[];   //模糊查询
+        var aryEqualQuery=[];   //相等
+        var aryFuncKeyQuery=null;
         this.MapSymbol.clear();
         this.Data.Data=[];
         this.Data.XOffset=0;
@@ -286,17 +321,21 @@ function JSKeyboardChartContainer(uielement)
         var strSearch=strText.trim();
         if (strSearch.length>0)
         {
+            aryFuncKeyQuery=this.SearchFunctionKeyData(strSearch);
+           
             for(var i=0;i<this.SourceData.Data.length;++i)
             {
                 var item=this.SourceData.Data[i];
-                if (this.SearchSymbol(item, strSearch, aryExactQuery, aryFuzzyQuery)) continue;
+                if (this.SearchSymbol(item, strSearch, aryExactQuery, aryFuzzyQuery, aryEqualQuery)) continue;
                 else if (this.SearchSpell(item, strSearch, aryExactQuery, aryFuzzyQuery)) continue;
             }
         }
-        
-        if (IFrameSplitOperator.IsNonEmptyArray(aryExactQuery) || IFrameSplitOperator.IsNonEmptyArray(aryFuzzyQuery))
-            this.Data.Data=aryExactQuery.concat(aryFuzzyQuery);
 
+        if (IFrameSplitOperator.IsNonEmptyArray(aryFuncKeyQuery)) this.Data.Data.push(...aryFuncKeyQuery);
+        if (IFrameSplitOperator.IsNonEmptyArray(aryEqualQuery))  this.Data.Data.push(...aryEqualQuery);
+        if (IFrameSplitOperator.IsNonEmptyArray(aryExactQuery))  this.Data.Data.push(...aryExactQuery);
+        if (IFrameSplitOperator.IsNonEmptyArray(aryFuzzyQuery))  this.Data.Data.push(...aryFuzzyQuery);
+           
         this.ChartPaint[0].SelectedRow=0;
         this.ChartPaint[0].SizeChange=true;
 
@@ -305,12 +344,13 @@ function JSKeyboardChartContainer(uielement)
         this.Draw();
     }
 
-    this.SearchSymbol=function(item, strText, aryExactQuery, aryFuzzyQuery)
+    this.SearchSymbol=function(item, strText, aryExactQuery, aryFuzzyQuery, aryEqualQuery)
     {
         var find=item.Symbol.indexOf(strText);
         if (find<0) return false;
 
-        if (find==0) aryExactQuery.push(item.Symbol);
+        if (item.Symbol==strText) aryEqualQuery.push(item.Symbol);
+        else if (find==0) aryExactQuery.push(item.Symbol);
         else aryFuzzyQuery.push(item.Symbol);
 
         this.MapSymbol.set(item.Symbol, item);
@@ -335,8 +375,21 @@ function JSKeyboardChartContainer(uielement)
 
     this.SetSymbolData=function(arySymbol)
     {
-        this.SourceData.Data=arySymbol;
-        
+        this.SourceData.Data=[];
+        for(var i=0;i<arySymbol.length;++i)
+        {
+            var item=arySymbol[i];
+            if (IFrameSplitOperator.IsNumber(item.Priority))
+            {
+                if (!this.FunctionKeyData[item.Priority]) this.FunctionKeyData[item.Priority]={ Priority:item.Priority, Data:[] };
+                this.FunctionKeyData[item.Priority].Data.push(item);
+            }
+            else
+            {
+                this.SourceData.Data.push(item);
+            }
+        }
+
         /*
         //测试
         this.MapSymbol.clear();
@@ -609,11 +662,13 @@ function JSKeyboardChartContainer(uielement)
         if (!chart) return false;
 
         var data=chart.GetSelectedSymbol();
+        var selItem=this.MapSymbol.get(data.Symbol);
+        if (!selItem) return false;
 
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYBOARD_SELECTED)
         if (event && event.Callback)
         {
-            event.Callback(event, { Data:data }, this);
+            event.Callback(event, { Data:data, RowData:selItem }, this);
         }
     }
 
@@ -1223,6 +1278,38 @@ function ChartSymbolList()
     this.SetColumn=function(aryColumn)
     {
         if (!IFrameSplitOperator.IsNonEmptyArray(aryColumn)) return;
+
+        this.Column=[];
+        for(var i=0;i<aryColumn.length;++i)
+        {
+            var item=aryColumn[i];
+            var colItem=this.GetDefaultColunm(item.Type);
+            if (!colItem) continue;
+
+            if (item.Title) colItem.Title=item.Title;
+            if (item.TextAlign) colItem.TextAlign=item.TextAlign;
+            if (item.MaxText) colItem.MaxText=item.MaxText;
+
+            this.Column.push(colItem);
+        }
+    }
+
+    this.GetDefaultColunm=function(id)
+    {
+        var DEFAULT_COLUMN=
+        [
+            { Type:KEYBOARD_COLUMN_ID.SHORT_SYMBOL_ID, Title:"代码", TextAlign:"left", Width:null, MaxText:"888888" },
+            { Type:KEYBOARD_COLUMN_ID.NAME_ID, Title:"名称", TextAlign:"left", Width:null, MaxText:"擎擎擎擎擎擎" },
+            { Type:KEYBOARD_COLUMN_ID.TYPE_NAME_ID, Title:"类型", TextAlign:"right", Width:null, MaxText:"擎擎擎擎" },
+        ];
+
+        for(var i=0;i<DEFAULT_COLUMN.length;++i)
+        {
+            var item=DEFAULT_COLUMN[i];
+            if (item.Type==id) return item;
+        }
+
+        return null;
     }
 
     this.Draw=function()

package/src/jscommon/umychart.resource/css/tools.css

@@ -1553,8 +1553,8 @@ input[type="color"] {
 .jchart_pop_keyboard_dailog
 {
     position: absolute;
-    width: 230px; 
-    height:360px;
+    width: 300px; 
+    height:440px;
     left: 1px;
     top: 1px;
     z-index: 999;

package/src/jscommon/umychart.testdata.js

@@ -1027,7 +1027,7 @@ HQData.Keyboard_RequestSymbolList=function(data, callback)
         var shortSymbol=item[0];
         shortSymbol=shortSymbol.replace(".sh", "");
         shortSymbol=shortSymbol.replace(".sz", "");
-        var symbolItem={ Symbol:item[0], Name:item[1], ShortSymbol:shortSymbol, Spell:item[3], Type:item[2] };
+        var symbolItem={ Symbol:item[0], Name:item[1], ShortSymbol:shortSymbol, Spell:item[3], Type:item[2], Data:{ Symbol:item[0], Type:0 }  };
         if (symbolItem.Type=="EQA") 
         {
             symbolItem.TypeName="股票";
@@ -1041,6 +1041,15 @@ HQData.Keyboard_RequestSymbolList=function(data, callback)
         arySymbol.push(symbolItem);
     }
 
+    arySymbol.push( { Symbol:"01", Name:"分时成交明细", TypeName:"功能键", Priority:1, Color:"rgb(220,20,60)" , Data:{ PageName:"分时成交明细", Type:2 }} );
+    arySymbol.push( { Symbol:"02", Name:"分价表", TypeName:"功能键", Priority:1, Color:"rgb(220,20,60)" ,Data:{ PageName:"分价表", Type:2 }} );
+    arySymbol.push( { Symbol:"06", Name:"自选股", TypeName:"功能键", Priority:1 , Color:"rgb(220,20,60)", Data:{ PageName:"自选股", Type:2 }} );
+
+    arySymbol.push( { Symbol:"MACD", Name:"平滑异同平均线", TypeName:"指标", Priority:2 , Color:"rgb(0,0,255)", Data:{ Index:"MACD", Type:1 }} );
+    arySymbol.push( { Symbol:"RSI", Name:"相对强弱指标", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)",Data:{ Index:"RSI", Type:1 }}  );
+    arySymbol.push( { Symbol:"MA", Name:"均线", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"MA", Type:1 } } );
+    arySymbol.push( { Symbol:"BOLL", Name:"布林线", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"BOLL", Type:1 } } );
+    
     callback(arySymbol);
 }