hqchart 1.1.12955 → 1.1.12968

package/package.json

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

package/src/jscommon/umychart.index.data.js

@@ -120,17 +120,15 @@ function JSIndexScript()
             ['CJL2', this.CJL],  //期货持仓量
             ['ASI', this.ASI],['DC', this.DC],['DEMA', this.DEMA],["VWAP", this.VWAP],
 
+            //指南针
+            ["ZNZ_CBAND", this.ZNZ_CBAND],["ZNZ_RPY2",this.ZNZ_RPY2],["ZNZ_RPY1", this.ZNZ_RPY1],
+
             ['飞龙四式', this.Dragon4_Main],['飞龙四式-附图', this.Dragon4_Fig],
             ['资金分析', this.FundsAnalysis],['融资占比',this.MarginProportion],['负面新闻', this.NewsNegative],
             ['涨跌趋势', this.UpDownAnalyze],['北上资金', this.HK2SHSZ],['股东人数', this.ShareHolder],
 
             ["两融余额", this.Margin2],["两融余额2", this.Margin3],
-
-            ['Zealink-资金吸筹', this.Zealink_Index1], ['Zealink-牛熊区间', this.Zealink_Index2],['Zealink-持仓信号', this.Zealink_Index3],
-            ['Zealink-增减持',this.Zealink_Index4],['Zealink-大宗交易', this.Zealink_Index5], ['Zealink-信托持股', this.Zealink_Index6],
-            ['Zealink-官网新闻', this.Zealink_Index7], ['Zealink-高管要闻', this.Zealink_Index8],['Zealink-股权质押', this.Zealink_Index9],
-            ['Zealink-操盘BS点', this.Zealink_Index10],['Zealink-操盘BS点2', this.Zealink_Index11],
-            
+  
             //外包指标
             ['放心股-操盘BS点',this.FXG_BSPoint],
             ['放心股-涨停多空线',this.FXG_INDEX],
@@ -182,6 +180,7 @@ JSIndexScript.ModifyAttribute=function(indexInfo, attribute)
     if (attribute.Lock) indexInfo.Lock=attribute.Lock;
     if (IFrameSplitOperator.IsNumber(attribute.YSplitType)) indexInfo.YSplitType=attribute.YSplitType;
     if (IFrameSplitOperator.IsBool(attribute.IsShowIndexTitle)) indexInfo.IsShowIndexTitle=attribute.IsShowIndexTitle;
+    if (IFrameSplitOperator.IsNumber(attribute.KLineType)) indexInfo.KLineType=attribute.KLineType;
 
     if (attribute.YAxis)
     {
@@ -3269,359 +3268,6 @@ EXITLONG: (CROSS(HSL,5) OR CROSS(K,80));'
     return data;
 }
 
-
-JSIndexScript.prototype.Zealink_Index1 = function () 
-{
-    let data =
-    {
-        Name: '资金吸筹', Description: '资金吸筹', IsMainIndex: false,
-        Args: [],
-        Script: //脚本
-'VAR1:=REF((LOW+OPEN+CLOSE+HIGH)/4,1);  \n\
-VAR2:= SMA(ABS(LOW - VAR1), 13, 1) / SMA(MAX(LOW - VAR1, 0), 10, 1);\n\
-VAR3:= EMA(VAR2, 10);\n\
-VAR4:= LLV(LOW, 33);\n\
-VAR5:= EMA(IF(LOW <= VAR4, VAR3, 0), 3) * 0.2;\n\
-主力进场: IF(VAR5 > REF(VAR5, 1), VAR5,0), COLORRED, NODRAW;\n\
-洗盘: IF(VAR5 < REF(VAR5, 1),  VAR5,0), COLORYELLOW, NODRAW;\n\
-STICKLINE(VAR5> REF(VAR5, 1),0, VAR5, 20, 0), COLORRED;\n\
-STICKLINE(VAR5 < REF(VAR5, 1), 0, VAR5, 20, 0), COLORYELLOW;'
-    };
-
-    return data;
-}
-
-JSIndexScript.prototype.Zealink_Index2 = function () 
-{
-    let data =
-    {
-        Name: '牛熊区间', Description: '牛熊区间', IsMainIndex: false,YSpecificMaxMin:{Max:100,Min:1,Count:4},YSplitScale:[1,50,100],
-        Args: [],
-        Script: //脚本
-'短高H:=(20*H+19*REF(H,1)+18*REF(H,2)+17*REF(H,3)+16*REF(H,4)+15*REF(H,5)+14*REF(H,6)\n\
-+ 13 * REF(H, 7) + 12 * REF(H, 8) + 11 * REF(H, 9) + 10 * REF(H, 10) + 9 * REF(H, 11) + 8 * REF(H, 12)\n\
-+ 7 * REF(H, 13) + 6 * REF(H, 14) + 5 * REF(H, 15) + 4 * REF(H, 16) + 3 * REF(H, 17) + 2 * REF(H, 18) +\n\
-REF(H, 20))/ 210, COLORBLUE, LINETHICK1;\n\
-短低L:= (20 * L + 19 * REF(L, 1) + 18 * REF(L, 2) + 17 * REF(L, 3) + 16 * REF(L, 4) + 15 * REF(L, 5) + 14 * REF(L, 6)\n\
-+ 13 * REF(L, 7) + 12 * REF(L, 8) + 11 * REF(L, 9) + 10 * REF(L, 10) + 9 * REF(L, 11) + 8 * REF(L, 12)\n\
-+ 7 * REF(L, 13) + 6 * REF(L, 14) + 5 * REF(L, 15) + 4 * REF(L, 16) + 3 * REF(L, 17) + 2 * REF(L, 18) +\n\
-REF(L, 20)) / 210, COLORBLUE, LINETHICK1;\n\
-D90H:= EMA(短高H, 90), COLORRED, LINETHICK1;\n\
-D90L:= EMA(短低L, 90), COLORRED, LINETHICK1;\n\
-D90差:= D90H - D90L;\n\
-D90顶:= D90H + D90差 * 2, COLORRED, LINETHICK1;\n\
-D90底:= D90L - D90差 * 2, COLORRED, LINETHICK1;\n\
-高0:= (EMA(EMA(H, 25), 25) - EMA(EMA(L, 25), 25)) * 1 + EMA(EMA(H, 25), 25), LINETHICK1, COLORWHITE;\n\
-低0:= EMA(EMA(L, 25), 25) - (EMA(EMA(H, 25), 25) - EMA(EMA(L, 25), 25)) * 1, LINETHICK1, COLORWHITE;\n\
-多头定位:= 低0 >= D90底 AND 高0 >= D90顶;\n\
-空头定位:= 高0 <= D90顶 AND 低0 <= D90底;\n\
-震荡定位:= 低0 >= D90底 AND 高0 <= D90顶;\n\
-牛市: IF(多头定位 == 1, 100, 1), COLORRED, NODRAW;\n\
-熊市: IF(空头定位 == 1, 100, 1), COLORGREEN, NODRAW;\n\
-震荡: IF(震荡定位 == 1, 100, 1), COLORGRAY, NODRAW;\n\
-STICKLINE(多头定位 == 1, 100, 1, 100, 0), COLORRED;\n\
-STICKLINE(空头定位 == 1, 100, 1, 100, 0), COLORGREEN;\n\
-STICKLINE(震荡定位 == 1, 100, 1, 100, 0), COLORGRAY;'
-    };
-
-    return data;
-}
-
-JSIndexScript.prototype.Zealink_Index3 = function () 
-{
-    let data =
-    {
-        Name: '持仓信号', Description: '持仓信号', IsMainIndex: true,
-        Args: [],
-        Script: //脚本
-'买线:=EMA(C,2);\n\
-卖线:=EMA(SLOPE(C,30)*5+C,20); \n\
-BU:=CROSS(买线,卖线);\n\
-SEL:=CROSS(卖线,买线);\n\
-\n\
-STICKLINE(买线>=卖线 AND CLOSE>OPEN,LOW,HIGH,0,1),COLORRED;\n\
-STICKLINE(买线>=卖线 AND CLOSE<OPEN,LOW,HIGH,0,1),COLORRED;\n\
-STICKLINE(买线>=卖线 AND CLOSE>OPEN,CLOSE,OPEN,50,1),COLORRED;\n\
-STICKLINE(买线>=卖线 AND CLOSE<OPEN,CLOSE,OPEN,50,0),COLORRED;\n\
-STICKLINE(买线<卖线 AND CLOSE<OPEN,LOW,HIGH,0,1),COLORGREEN;\n\
-STICKLINE(买线<卖线 AND CLOSE>OPEN,LOW,HIGH,0,1),COLORGREEN;\n\
-STICKLINE(买线<卖线 AND CLOSE<OPEN,CLOSE,OPEN,50,0),COLORGREEN;\n\
-STICKLINE(买线<卖线 AND CLOSE>OPEN,CLOSE,OPEN,50,1),COLORGREEN;\n\
-\n\
-HHJSJDA:=(3*CLOSE+OPEN+LOW+HIGH)/6;\n\
-HHJSJDB:(19*HHJSJDA+19*REF(HHJSJDA,1)+18*REF(HHJSJDA,2)+17*REF(HHJSJDA,3)+16*REF(HHJSJDA,4)+15*REF(HHJSJDA,5)+14*REF(HHJSJDA,6)\n\
-+13*REF(HHJSJDA,7)+12*REF(HHJSJDA,8)+11*REF(HHJSJDA,9)+10*REF(HHJSJDA,10)+9*REF(HHJSJDA,11)+8*REF(HHJSJDA,12)+7*REF(HHJSJDA,13)+6*REF(HHJSJDA,14)+5*REF(HHJSJDA,15)+4*REF(HHJSJDA,16)+3*REF(HHJSJDA,17)+2*REF\n\
-(HHJSJDA,20)+REF(HHJSJDA,19))/210,COLORYELLOW;\n\
-HHJSJDC:MA(HHJSJDB,5),COLORRED;\n\
-\n\
-SVAR11:=HHV(HIGH,34);\n\
-SVAR14:=CLOSE-REF(CLOSE,1);\n\
-SVAR15:=MAX(SVAR14,0);\n\
-SVAR16:=ABS(SVAR14);\n\
-SVAR17:=SMA(SVAR15,7,1)/SMA(SVAR16,7,1)*100;\n\
-SVAR18:=SMA(SVAR15,13,1)/SMA(SVAR16,13,1)*100;\n\
-SVAR19:=BARSCOUNT(CLOSE);\n\
-SVAR20:=SMA(MAX(SVAR14,0),6,1)/SMA(ABS(SVAR14),6,1)*100;\n\
-SVAR21:=(-200)*(HHV(HIGH,60)-CLOSE)/(HHV(HIGH,60)-LLV(LOW,60))+100;\n\
-SVAR1A:=(CLOSE-LLV(LOW,15))/(HHV(HIGH,15)-LLV(LOW,15))*100;\n\
-SVAR1B:=SMA((SMA(SVAR1A,4,1)-50)*2,3,1);\n\
-SVAR1C:=(INDEXC-LLV(INDEXL,14))/(HHV(INDEXH,14)-LLV(INDEXL,14))*100;\n\
-SVAR1D:=SMA(SVAR1C,4,1);\n\
-SVAR1E:=SMA(SVAR1D,3,1);\n\
-SVAR1F:=(HHV(HIGH,30)-CLOSE)/CLOSE*100;\n\
-SVAR22:=SVAR20<=25 AND SVAR21<-95 AND SVAR1F>20 AND SVAR1B<-30 AND SVAR1E<30 AND SVAR11-CLOSE>=-0.25 AND SVAR17<22 AND SVAR18<28 AND SVAR19>50;\n\
-BUY3:=CROSS(SVAR22,0.5) AND COUNT(SVAR22==1,10)==1;\n\
-\n\
-SVARF:=LOW*0.9;\n\
-SVAR10X:=100-3*SMA((OPEN-LLV(LOW,75))/(HHV(HIGH,75)-LLV(LOW,75))*100,20,1)+2*SMA(SMA((OPEN-LLV(LOW,75))/(HHV(HIGH,75)-LLV(LOW,75))*100,20,1),15,1);\n\
-SVAR11X:=SVARF<REF(SVAR10X,1) AND VOL>REF(VOL,1) AND CLOSE>REF(CLOSE,1);\n\
-BUY2:=SVAR11X AND COUNT(SVAR11X,30)==1;\n\
-\n\
-VAR1:=(CLOSE+HIGH+LOW+OPEN)/4;\n\
-VAR2:=SUMBARS(VOL,CAPITAL);\n\
-VAR3:=HHV(VAR1,VAR2);\n\
-VAR4:=LLV(VAR1,VAR2);\n\
-VAR5:=(2*VAR1-VAR4-REF(VAR4,1))/(VAR3-VAR4);\n\
-VAR6:=(VAR1-VAR4)/(VAR3-VAR4);\n\
-VAR7:=IF(VAR1<=VAR4,VAR5*60,VAR6*60);\n\
-VAR8:=600*(EMA(CLOSE,3)-EMA(LOW,30))/EMA(LOW,30);\n\
-VAR9:=EMA(VAR8,7);\n\
-VARC:=HHV(HIGH,9)-LLV(LOW,9);\n\
-VARD:=HHV(HIGH,9)-CLOSE;\n\
-VARE:=CLOSE-LLV(LOW,9);\n\
-VARF:=VARD/VARC*100-70;\n\
-VAR10:=(CLOSE-LLV(LOW,60))/(HHV(HIGH,60)-LLV(LOW,60))*100;\n\
-VAR11:=(2*CLOSE+HIGH+LOW)/4;\n\
-VAR12:=SMA(VARE/VARC*100,3,1);\n\
-VAR13:=LLV(LOW,34);\n\
-VAR14:=SMA(VAR12,3,1)-SMA(VARF,9,1);\n\
-VAR15:=IF(VAR14>100,VAR14-100,0);\n\
-VAR16:=HHV(HIGH,34);\n\
-VAR17:=EMA((VAR11-VAR13)/(VAR16-VAR13)*100,8);\n\
-VAR18:=EMA(VAR17,5);\n\
-BUY:=STICKLINE(VAR17-VAR18>0,VAR17,VAR18,8,1),COLORRED;\n\
-SELL:=STICKLINE(VAR17-VAR18<0,VAR17,VAR18,8,1),COLORGREEN;\n\
-BUY1:=VAR17>VAR18 AND REF(VAR17,1)<REF(VAR18,1);\n\
-SELL1:=VAR17<VAR18 AND REF(VAR17,1)>REF(VAR18,1);\n\
-\n\
-短高H:=(20*H+19*REF(H,1)+18*REF(H,2)+17*REF(H,3)+16*REF(H,4)+15*REF(H,5)+14*REF(H,6)\n\
-+13*REF(H,7)+12*REF(H,8)+11*REF(H,9)+10*REF(H,10)+9*REF(H,11)+8*REF(H,12)\n\
-+7*REF(H,13)+6*REF(H,14)+5*REF(H,15)+4*REF(H,16)+3*REF(H,17)+2*REF(H,18)+\n\
-REF(H,20))/210,COLORBLUE,LINETHICK1;\n\
-短低L:=(20*L+19*REF(L,1)+18*REF(L,2)+17*REF(L,3)+16*REF(L,4)+15*REF(L,5)+14*REF(L,6)\n\
-+13*REF(L,7)+12*REF(L,8)+11*REF(L,9)+10*REF(L,10)+9*REF(L,11)+8*REF(L,12)\n\
-+7*REF(L,13)+6*REF(L,14)+5*REF(L,15)+4*REF(L,16)+3*REF(L,17)+2*REF(L,18)+\n\
-REF(L,20))/210,COLORBLUE,LINETHICK1;\n\
-D90H:=EMA(短高H,90),COLORRED,LINETHICK1;\n\
-D90L:=EMA(短低L,90),COLORRED,LINETHICK1;\n\
-D90差:=D90H-D90L;\n\
-D90顶:=D90H+D90差*2,COLORRED,LINETHICK1;\n\
-D90底:=D90L-D90差*2,COLORRED,LINETHICK1;\n\
-高0:=(EMA(EMA(H,25),25)-EMA(EMA(L,25),25))*1+EMA(EMA(H,25),25),LINETHICK1,COLORWHITE;\n\
-低0:=EMA(EMA(L,25),25)-(EMA(EMA(H,25),25)-EMA(EMA(L,25),25))*1,LINETHICK1,COLORWHITE;\n\
-多头定位:=低0>=D90底 AND 高0>=D90顶;\n\
-空头定位:=高0<=D90顶 AND 低0<=D90底;\n\
-震荡定位:=低0>=D90底 AND 高0<=D90顶;\n\
-\n\
-牛市:=多头定位==1;\n\
-熊市:=空头定位==1;\n\
-震荡:=震荡定位==1;\n\
-\n\
-非牛市:=熊市 OR 震荡;\n\
-非熊市:=牛市 OR 震荡;\n\
-\n\
-BUY11:=BUY1 AND 非熊市;\n\
-SELL11:=SELL1 AND 震荡定位==0;\n\
-\n\
-BUY111:=BUY11 AND COUNT(BUY11,10)<2;\n\
-BUY0:=BUY111 AND COUNT(BUY111,21)==1;\n\
-SELL111:=SELL11 AND COUNT(SELL11,10)<2;\n\
-SELL0:=SELL111 AND COUNT(SELL111,10)==1;\n\
-\n\
-XK1:=EMA(100*(CLOSE-LLV(LOW,34))/(HHV(HIGH,34)-LLV(LOW,34)),3)/4;\n\
-上穿:=REF(XK1,1)<5 AND XK1>=5;\n\
-BUY4:=上穿 AND COUNT(XK1<2,12)<1;\n\
-\n\
-SELL2:=REF(XK1,1)<=22.5 AND XK1>22.5 AND COUNT(REF(XK1,1)>=22.5 AND XK1<22.5,5)>0;\n\
-SELL3:=REF(XK1,1)>=21.5 AND XK1<21.5 AND COUNT(REF(XK1,1)>=22.5 AND XK1<22.5,12)>1;\n\
-SELL4:=SELL2 OR SELL3 AND COUNT((SELL2 OR SELL3)==1,5)==1;\n\
-\n\
-SUPERDRAWTEXT(BUY0,L,"机会",2,10),COLORRED;\n\
-SUPERDRAWTEXT(SELL0,H,"风险",1,10),COLORGREEN;\n\
-SUPERDRAWTEXT(BUY2,L,"机会",2,10),COLORRED;\n\
-SUPERDRAWTEXT(BUY4,L,"机会",2,10),COLORRED;\n\
-SUPERDRAWTEXT(SELL4,H,"风险",1,10),COLORGREEN;'
-    };
-
-    return data;
-}
-
-JSIndexScript.prototype.Zealink_Index4 = function () 
-{
-    let data =
-    {
-        Name: '股东实际增减持', Description: '股东实际增减持', IsMainIndex: false, FloatPrecision:0,
-        Args: [],
-        Script: //脚本
-'增持:NEWS(4),NODRAW,COLORRED;\n\
-减持:NEWS(5),NODRAW,COLORGREEN;\n\
-STICKLINE(增持>0,0,增持,1,0),COLORRED;\n\
-STICKLINE(减持<0,0,减持,1,0),COLORGREEN;'
-    };
-
-    return data;
-}
-
-JSIndexScript.prototype.Zealink_Index5 = function () 
-{
-    let data =
-    {
-        Name: '大宗交易', Description: '大宗交易', IsMainIndex: false, FloatPrecision: 0,
-        Args: [],
-        Script: //脚本
-            '交易次数:NEWS(7);'
-    };
-
-    return data;
-}
-
-JSIndexScript.prototype.Zealink_Index6 = function () 
-{
-    let data =
-    {
-        Name: '信托持股', Description: '信托持股', IsMainIndex: false, FloatPrecision: 0,
-        Args: [],
-        Script: //脚本
-            '家数:NEWS(6);'
-    };
-
-    return data;
-}
-
-JSIndexScript.prototype.Zealink_Index7 = function () 
-{
-    let data =
-    {
-        Name: '官网新闻', Description: '官网新闻', IsMainIndex: false, FloatPrecision: 0,
-        Args: [],
-        Script: //脚本
-            '个数:NEWS(8);'
-    };
-
-    return data;
-}
-
-JSIndexScript.prototype.Zealink_Index8 = function () 
-{
-    let data =
-    {
-        Name: '高管要闻', Description: '高管要闻', IsMainIndex: false, FloatPrecision: 0,
-        Args: [],
-        Script: //脚本
-            '个数:NEWS(9);'
-    };
-
-    return data;
-}
-
-JSIndexScript.prototype.Zealink_Index9 = function () 
-{
-    let data =
-    {
-        Name: '股权质押', Description: '股权质押', IsMainIndex: false, FloatPrecision: 0,
-        Args: [],
-        Script: //脚本
-            '次数:NEWS(10);'
-    };
-
-    return data;
-}
-
-JSIndexScript.prototype.Zealink_Index10 = function () 
-{
-    let data =
-    {
-        Name: '操盘BS点', Description: '操盘BS点', IsMainIndex: true, FloatPrecision: 0,
-        Args: [],
-        Script: //脚本
-"JJ:=(CLOSE+HIGH+LOW)/3; \n\
-A:=EMA(JJ,10); \n\
-B:=REF(A,1);\n\
-M1:=EMA(CLOSE,3);\n\
-M2:=EMA(CLOSE,8); \n\
-M3:=EMA(M2,13); \n\
-M4:=EMA(M2,55); \n\
-B1:=A>B AND REF(A,1)<REF(B,1);\n\
-S1:=A<B AND REF(A,1)>REF(B,1);\n\
-INDEXCLOSE:INDEXC,EXDATA;\n\
-INDEXOPEN:INDEXO,EXDATA;\n\
-DRAWICON(REF(B1,1),L*0.97,13);\n\
-DRAWICON(REF(S1,1),H*1.03,14);"
-    };
-
-    return data;
-}
-
-JSIndexScript.prototype.Zealink_Index11 = function () 
-{
-    let data =
-    {
-        Name: '操盘BS点', Description: '操盘BS点', IsMainIndex: true, FloatPrecision: 0,
-        Args: [],
-        Script: //脚本
-"JJ:=(CLOSE+HIGH+LOW)/3;\n\
-A:=EMA(JJ,10);\n\
-B:=REF(A,1);\n\
-M1:=EMA(CLOSE,3);\n\
-M2:=EMA(CLOSE,8); \n\
-M3:=EMA(M2,13);\n\
-M4:=EMA(M2,55);\n\
-持股区域:=STICKLINE(A>B,A,B,2,0),COLORYELLOW; \n\
-持币区域:=STICKLINE(A<B,A,B,2,0),COLORBLUE;\n\
-\n\
-VR1:=(C+O+REF(C,1))/3;\n\
-VR3:=HHV(VR1,21);\n\
-VR4:=LLV(VR1,21);\n\
-VR5:=(2*VR1-VR4-REF(VR4,1))/(VR3-VR4);\n\
-VR6:=(VR1-VR4)/(VR3-VR4);\n\
-VR7:=IF(VR1<=VR4,VR5*60,VR6*60);\n\
-VR8:=600*(EMA(C,3)-EMA(L,30))/EMA(L,30);\n\
-VR9:=EMA(VR8,7);\n\
-VRA:=(WINNER(120*C/100)-WINNER(100*C/100))*100;\n\
-VRB:=(-100)*(WINNER(120*C/100)-WINNER(100*C/100))+5;\n\
-VRC:=HHV(H,9)-LLV(L,9);\n\
-VRD:=HHV(H,9)-C;\n\
-VRE:=C-LLV(L,9);\n\
-VRF:=VRD/VRC*100-70;\n\
-VR10:=(C-LLV(L,60))/(HHV(H,60)-LLV(L,60))*100;\n\
-VR11:=(2*C+H+L)/4;\n\
-VR12:=SMA(VRE/VRC*100,3,1);\n\
-VR13:=LLV(L,34);\n\
-VR14:=SMA(VR12,3,1)-SMA(VRF,9,1);\n\
-VR15:=IF(VR14>100,VR14-100,0);\n\
-VR16:=HHV(H,34);\n\
-VR17:=EMA((VR11-VR13)/(VR16-VR13)*100,8);\n\
-VR18:=EMA(VR17,5);\n\
-\n\
-B1:=A>B AND REF(A,1)<REF(B,1);\n\
-S1:=A<B AND REF(A,1)>REF(B,1);\n\
-\n\
-B9:=BARSLAST(REF(B1,1) AND (REF(VR17>VR18,1) OR MIN(VR17,VR18)>REF(MAX(VR17,VR18),1)));\n\
-S9:=BARSLAST(REF(S1,1) AND (REF(VR17<VR18,1) OR MAX(VR17,VR18)<REF(MIN(VR17,VR18),1)));\n\
-\n\
-DRAWICON(REF(B1,1) AND (REF(VR17>VR18,1) OR MIN(VR17,VR18)>REF(MAX(VR17,VR18),1)) AND REF(B9,2)>=S9,L*0.97,13);\n\
-DRAWICON(REF(S1,1) AND (REF(VR17<VR18,1) OR MAX(VR17,VR18)<REF(MIN(VR17,VR18),1)) AND REF(S9,1)>=B9,H*1.03,14);\n\
-\n\
-DRAWKLINE_IF(VR17>VR18,HIGH,CLOSE,LOW,OPEN),COLORRED;\n\
-DRAWKLINE_IF(VR17<VR18,HIGH,CLOSE,LOW,OPEN),COLORBLUE;\n\
-\n\
-INDEXCLOSE:INDEXC,EXDATA;		//取指数的收盘价 回测的时候计算BATE系数用 "
-    };
-
-    return data;
-}
-
-
 JSIndexScript.prototype.HeikinAshi=function()
 {
     let data =
@@ -4164,6 +3810,58 @@ ADX:SMA(ABS(MDI-PDI)/(MDI+PDI)*100,N,1),COLORYELLOW,LINETHICK2;
 }
 
 
+JSIndexScript.prototype.ZNZ_CBAND = function() 
+{
+    let data =
+    {
+        Name: 'ZNZ_CBAND', Description: '优化成本布林带宽', IsMainIndex: false,
+        Args: [{ Name: 'N', Value: 20 }],
+        Script: //脚本
+`A:=AMOUNT/(100*VOL);
+BBI1:=MA(A,N);
+UPR0:=BBI1+STD(A,N);
+DWN0:=BBI1-STD(A,N);
+UPR1:=BBI1+1.7*STD(A,N);
+DWN1:=BBI1-1.7*STD(A,N);
+优化成本布林带宽:100*1.7*STD(A,N);`
+    };
+
+    return data;
+}
+
+JSIndexScript.prototype.ZNZ_RPY2 = function() 
+{
+    let data =
+    {
+        Name: 'ZNZ_RPY2', Description: '两年相对价位', IsMainIndex: false,
+        Script: //脚本
+`A:=REF(HHV(CLOSE,480),1);
+B:=REF(LLV(CLOSE,480),1);
+100*(CLOSE-B)/(A-B);`
+    };
+
+    return data;
+}
+
+JSIndexScript.prototype.ZNZ_RPY1 = function() 
+{
+    let data =
+    {
+        Name: 'ZNZ_RPY1', Description: '年相对价位', IsMainIndex: false,
+        Args: [{ Name: 'N', Value: 240 }],
+        Script: //脚本
+`A:=REF(HHV(CLOSE,N),1);
+B:=REF(LLV(CLOSE,N),1);
+100*(CLOSE-B)/(A-B);`
+    };
+
+    return data;
+}
+
+
+
+
+
 JSIndexScript.prototype.TEST = function () 
 {
     let data =

package/src/jscommon/umychart.js

@@ -2728,6 +2728,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.Tooltip.id=Guid();
     uielement.parentNode.appendChild(this.Tooltip);
     this.IsShowTooltip=true;    //是否显示K线tooltip
+    this.TooltipCache={ Type:null, IsShow:false, X:null, Y:null, Data:null, InnerHTML:null };  //缓存tooltip数据
 
     //区间选择
     this.SelectRect=document.createElement("div");
@@ -6483,6 +6484,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         var pixelTatio = GetDevicePixelRatio(); //获取设备的分辨率
         var xMove=15/pixelTatio;    //顶部坐标偏移位置
+
+        this.TooltipCache.Type=toolTip.Type;
+        this.TooltipCache.Data=null;
+        this.TooltipCache.X=x;
+        this.TooltipCache.Y=y;
+
         if (toolTip.Type===0) //K线信息
         {
             var scrollPos=GetScrollPosition();
@@ -6517,6 +6524,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             this.Tooltip.className='jschart-tooltip';
             this.Tooltip.innerHTML=format.Text;
             this.Tooltip.style.display = "block";
+
+            this.TooltipCache.IsShow=true;
+            this.TooltipCache.Data={ Date:toolTip.Data.Date, Time:toolTip.Data.Time };
+            this.TooltipCache.InnerHTML=format.Text;
         }
         else if (toolTip.Type===1)   //信息地雷提示信息
         {
@@ -6671,13 +6682,44 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             this.Tooltip.style.top = (top +xMove)+ "px";
             this.Tooltip.style.width = width+"px";
             this.Tooltip.style.height =null;
-            this.Tooltip.innerHTML=format.Text;;
+            this.Tooltip.innerHTML=format.Text;
             this.Tooltip.style.display = "block";
         }
     }
 
+    this.UpdateDOMTooltip=function(toolTipType, data)
+    {
+        if (!this.TooltipCache.IsShow) return ;
+        if (this.TooltipCache.Type!=toolTipType) return;
+        if (!this.TooltipCache.Data) return;
+
+        if (this.TooltipCache.Type===0)
+        {
+            if (!data || !IFrameSplitOperator.IsNonEmptyArray(data.Data)) return;
+            var lastItem=data.Data[data.Data.length-1];
+            if (lastItem.Date!=this.TooltipCache.Data.Date) return;
+            if (IFrameSplitOperator.IsNumber(lastItem.Time) && lastItem.Time!=this.TooltipCache.Data.Time) return;
+            var klinePaint=this.ChartPaint[0];
+
+            var format=g_DivTooltipDataForamt.Create('HistoryDataStringFormat');
+            format.Value={ Data:lastItem, ChartPaint:klinePaint, Type:this.TooltipCache.Type };
+            format.Symbol=this.Symbol;
+            format.LanguageID=this.LanguageID;
+            format.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+            if (!format.Operator()) return;
+            if (format.Text==this.TooltipCache.InnerHTML) return;
+            this.Tooltip.innerHTML=format.Text;
+            this.TooltipCache.InnerHTML=format.Text;
+        }
+    }
+
     this.HideTooltip=function()
     {
+        this.TooltipCache.IsShow=false;
+        this.TooltipCache.Type=null;
+        this.TooltipCache.InnerHTML=null;
+        this.TooltipCache.Data=null;
+
         if (this.Tooltip.style.display!="none") this.Tooltip.style.display = "none";
     }
 
@@ -8773,6 +8815,65 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
         }
     }
+
+    //获取当前的显示的指标 包含叠加指标
+    this.GetIndexInfo=function()
+    {
+        var aryIndex=[];
+        for(var i=0, j=0; i<this.WindowIndex.length; ++i)
+        {
+            var item=this.WindowIndex[i];
+            if (!item) continue;
+            
+            var info={ Name:item.Name, WindowIndex:i, IsOverlay:false };
+            if (item.ID) info.ID=item.ID;
+            if (IFrameSplitOperator.IsNonEmptyArray(item.Arguments)) //参数
+            {
+                info.Args=[];
+                for(j=0;j<item.Arguments.length;++j)
+                {
+                    var argItem=item.Arguments[j];
+                    info.Args.push( { Name:argItem.Name, Value:argItem.Value} );
+                }
+            }
+
+            aryIndex.push(info);
+        }
+
+        this.GetOverlayIndexInfo(aryIndex); //叠加指标
+
+        return aryIndex;
+    }
+
+    //叠加指标
+    this.GetOverlayIndexInfo=function(aryIndex)
+    {
+        for(var i=0, j=0, k=0; i<this.Frame.SubFrame.length; ++i)
+        {
+            var item=this.Frame.SubFrame[i];
+            if (!IFrameSplitOperator.IsNonEmptyArray(item.OverlayIndex)) continue;
+
+            for(j=0; j<item.OverlayIndex.length; ++j)
+            {
+                var overlayItem=item.OverlayIndex[j];
+                if (!overlayItem.Script) continue;
+                var indexData=overlayItem.Script;
+                var info={ Name:indexData.Name, ID:indexData.ID, WindowIndex:i, IsOverlay:true, Identify:overlayItem.Identify };
+
+                if (IFrameSplitOperator.IsNonEmptyArray(indexData.Arguments)) //参数
+                {
+                    info.Args=[];
+                    for(k=0;k<indexData.Arguments.length;++k)
+                    {
+                        var argItem=indexData.Arguments[k];
+                        info.Args.push( { Name:argItem.Name, Value:argItem.Value} );
+                    }
+                }
+
+                aryIndex.push(info);
+            }
+        }
+    }
 }
 
 function GetDevicePixelRatio()
@@ -11955,16 +12056,18 @@ function MinuteFrame()
         if (this.Identify==0 && this.IsShowCloseButton) this.DrawCloseBeforeButton(moveonPoint, mouseStatus);  //盘前集合竞价关闭按钮
 
         if (this.ChartBorder.TitleHeight<5) return;
-        if (this.Identify==0 || this.Identify==1) return;
 
         var aryButton=[];
-        if (this.CloseIndex)  aryButton.push( { ID:JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW, Style:this.CloseWindowButton });
-        if (this.MaxMinWindow) aryButton.push({ ID:JSCHART_BUTTON_ID.MAX_MIN_WINDOW, Style:this.MaxMinWindowButton })
-        if (this.TitleWindow) aryButton.push({ ID:JSCHART_BUTTON_ID.TITLE_WINDOW, Style:this.TitleWindowButton });
-        if (this.ExportData) aryButton.push( {ID:JSCHART_BUTTON_ID.EXPORT_DATA, Style:this.ExportDataButton});
-        if (this.OverlayIndex) aryButton.push( { ID:JSCHART_BUTTON_ID.OVERLAY_INDEX, Style:this.OverlayIndexButton });
-        if (this.ChangeIndex) aryButton.push( { ID:JSCHART_BUTTON_ID.CHANGE_INDEX, Style:this.ChangeIndexButton });
-        if (this.ModifyIndex) aryButton.push( { ID:JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM, Style:this.ModifyIndexParamButton });
+        if (this.Identify!=0 && this.Identify!=1) //价格图和成交量图只有自定义按钮
+        {
+            if (this.CloseIndex)  aryButton.push( { ID:JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW, Style:this.CloseWindowButton });
+            if (this.MaxMinWindow) aryButton.push({ ID:JSCHART_BUTTON_ID.MAX_MIN_WINDOW, Style:this.MaxMinWindowButton })
+            if (this.TitleWindow) aryButton.push({ ID:JSCHART_BUTTON_ID.TITLE_WINDOW, Style:this.TitleWindowButton });
+            if (this.ExportData) aryButton.push( {ID:JSCHART_BUTTON_ID.EXPORT_DATA, Style:this.ExportDataButton});
+            if (this.OverlayIndex) aryButton.push( { ID:JSCHART_BUTTON_ID.OVERLAY_INDEX, Style:this.OverlayIndexButton });
+            if (this.ChangeIndex) aryButton.push( { ID:JSCHART_BUTTON_ID.CHANGE_INDEX, Style:this.ChangeIndexButton });
+            if (this.ModifyIndex) aryButton.push( { ID:JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM, Style:this.ModifyIndexParamButton });
+        }
 
         if (IFrameSplitOperator.IsNonEmptyArray(this.CustomToolbar))
         {
@@ -66809,6 +66912,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.Draw();
 
         this.SendKLineUpdateEvent(bindData);    
+        this.UpdateDOMTooltip(0, bindData);
 
         //叠加指标计算
         this.BindAllOverlayIndexData(bindData, { CheckRunCount:true,SyncExecute:false });     //异步模式叠加指标
@@ -67059,6 +67163,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.Draw();
 
         this.SendKLineUpdateEvent(bindData);
+        this.UpdateDOMTooltip(0, bindData);
 
         //更新叠加指标
         this.BindAllOverlayIndexData(bindData, { CheckRunCount:true,SyncExecute:false });     //异步模式叠加指标
@@ -68559,31 +68664,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.Draw();
     }
 
-    //获取当前的显示的指标
-    this.GetIndexInfo=function()
-    {
-        var aryIndex=[];
-        for(var i in this.WindowIndex)
-        {
-            var item=this.WindowIndex[i];
-            var info={Name:item.Name};
-            if (item.ID) info.ID=item.ID;
-            if (item.Arguments) //参数
-            {
-                info.Args=[];
-                for(var i in item.Arguments)
-                {
-                    var argItem=item.Arguments[i];
-                    info.Args.push( {Name:argItem.Name, Value:argItem.Value} );
-                }
-            }
-
-            aryIndex.push(info);
-        }
-
-        return aryIndex;
-    }
-
     this.CreateExtendChart=function(name, option)   //创建扩展图形
     {
         var chart;
@@ -76228,21 +76308,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.WindowIndex[windowIndex].Create(this,windowIndex);
     }
 
-    //获取当前的显示的指标
-    this.GetIndexInfo=function()
-    {
-        var aryIndex=[];
-        for(var i in this.WindowIndex)
-        {
-            var item=this.WindowIndex[i];
-            var info={Name:item.Name};
-            if (item.ID) info.ID=item.ID;
-            aryIndex.push(info);
-        }
-
-        return aryIndex;
-    }
-
     this.OnTouchFinished=function()
     {
         if (this.CorssCursorTouchEnd===true)    //手势离开十字光标消失