hqchart 1.1.15138 → 1.1.15147

package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js

@@ -6571,6 +6571,13 @@ JSChart.SetStyle=function(option)
     if (option) g_JSChartResource.SetStyle(option);
 }
 
+
+//CSS风格
+JSChart.SetCSSStyle=function(styleID)
+{
+    document.documentElement.setAttribute('hqchart_style', styleID);
+}
+
 //value { EN:'', CH:'' }
 JSChart.SetTextResource=function(key,value)
 {
@@ -82003,30 +82010,6 @@ function JSChartResource()
         }
     };
 
-    //指标搜索
-    this.DialogSearchIndex=
-    {
-        BGColor:'rgb(250,250,250)',         //背景色
-        BorderColor:'rgb(20,20,20)',        //边框颜色
-        TitleColor:'rgb(250,250,250)',       //标题颜色
-        TitleBGColor:"rgb(200, 66, 69)",    //标题背景颜色
-
-        IndexNameColor:"rgb(0,0,0)",             //数值名称
-        GroupNameColor:"rgb(0,0,0)",
-        InputTextColor:"rgb(0,0,0)"
-    };
-
-    this.DialogModifyIndexParam=
-    {
-        BGColor:'rgb(250,250,250)',         //背景色
-        BorderColor:'rgb(20,20,20)',        //边框颜色
-        TitleColor:'rgb(250,250,250)',       //标题颜色
-        TitleBGColor:"rgb(200, 66, 69)",    //标题背景颜色
-
-        ParamNameColor:"rgb(0,0,0)",             //数值名称
-        InputTextColor:"rgb(0,0,0)"
-    };
-
     //弹幕
     this.Barrage= {
         Font:16*GetDevicePixelRatio() +'px 微软雅黑',   //字体
@@ -83251,20 +83234,6 @@ function JSChartResource()
             }
         }
 
-        if (style.DialogSearchIndex)
-        {
-            var item=style.DialogSearchIndex;
-
-            if (item.BGColor) this.DialogSearchIndex.BGColor=item.BGColor;
-            if (item.BorderColor) this.DialogSearchIndex.BorderColor=item.BorderColor;
-            if (item.TitleColor) this.DialogSearchIndex.TitleColor=item.TitleColor;
-            if (item.TitleBGColor) this.DialogSearchIndex.TitleBGColor=item.TitleBGColor;
-            
-            if (item.IndexNameColor) this.DialogSearchIndex.IndexNameColor=item.IndexNameColor;
-            if (item.GroupNameColor) this.DialogSearchIndex.GroupNameColor=item.GroupNameColor;
-            if (item.InputTextColor) this.DialogSearchIndex.InputTextColor=item.InputTextColor;
-        }
-
         if (style.MinuteInfo)
         {
             var item=style.MinuteInfo;
@@ -137131,17 +137100,6 @@ function GetBlackStyle()
             PositionColor:"rgb(255,0,255)"            //持仓
         },
 
-        DialogSearchIndex:
-        {
-            BGColor:'rgb(20,20,20)',            //背景色
-            BorderColor:'rgb(170,170,170)',     //边框颜色
-            TitleColor:'rgb(230,230,230)',       //标题颜色
-
-            IndexNameColor:"rgb(210,210,210)",       
-            GroupNameColor:"rgb(210,210,210)",      
-            InputTextColor:"rgb(210,210,210)", 
-        },
-
         DialogPopKeyboard:
         {
             BGColor:'rgb(20,20,20)',            //背景色
@@ -153775,7 +153733,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15137";
+var HQCHART_VERSION="1.1.15146";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.15137";
+var HQCHART_VERSION="1.1.15146";
 
 function PrintHQChartVersion()
 {

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

@@ -6615,6 +6615,13 @@ JSChart.SetStyle=function(option)
     if (option) g_JSChartResource.SetStyle(option);
 }
 
+
+//CSS风格
+JSChart.SetCSSStyle=function(styleID)
+{
+    document.documentElement.setAttribute('hqchart_style', styleID);
+}
+
 //value { EN:'', CH:'' }
 JSChart.SetTextResource=function(key,value)
 {
@@ -82047,30 +82054,6 @@ function JSChartResource()
         }
     };
 
-    //指标搜索
-    this.DialogSearchIndex=
-    {
-        BGColor:'rgb(250,250,250)',         //背景色
-        BorderColor:'rgb(20,20,20)',        //边框颜色
-        TitleColor:'rgb(250,250,250)',       //标题颜色
-        TitleBGColor:"rgb(200, 66, 69)",    //标题背景颜色
-
-        IndexNameColor:"rgb(0,0,0)",             //数值名称
-        GroupNameColor:"rgb(0,0,0)",
-        InputTextColor:"rgb(0,0,0)"
-    };
-
-    this.DialogModifyIndexParam=
-    {
-        BGColor:'rgb(250,250,250)',         //背景色
-        BorderColor:'rgb(20,20,20)',        //边框颜色
-        TitleColor:'rgb(250,250,250)',       //标题颜色
-        TitleBGColor:"rgb(200, 66, 69)",    //标题背景颜色
-
-        ParamNameColor:"rgb(0,0,0)",             //数值名称
-        InputTextColor:"rgb(0,0,0)"
-    };
-
     //弹幕
     this.Barrage= {
         Font:16*GetDevicePixelRatio() +'px 微软雅黑',   //字体
@@ -83295,20 +83278,6 @@ function JSChartResource()
             }
         }
 
-        if (style.DialogSearchIndex)
-        {
-            var item=style.DialogSearchIndex;
-
-            if (item.BGColor) this.DialogSearchIndex.BGColor=item.BGColor;
-            if (item.BorderColor) this.DialogSearchIndex.BorderColor=item.BorderColor;
-            if (item.TitleColor) this.DialogSearchIndex.TitleColor=item.TitleColor;
-            if (item.TitleBGColor) this.DialogSearchIndex.TitleBGColor=item.TitleBGColor;
-            
-            if (item.IndexNameColor) this.DialogSearchIndex.IndexNameColor=item.IndexNameColor;
-            if (item.GroupNameColor) this.DialogSearchIndex.GroupNameColor=item.GroupNameColor;
-            if (item.InputTextColor) this.DialogSearchIndex.InputTextColor=item.InputTextColor;
-        }
-
         if (style.MinuteInfo)
         {
             var item=style.MinuteInfo;
@@ -137175,17 +137144,6 @@ function GetBlackStyle()
             PositionColor:"rgb(255,0,255)"            //持仓
         },
 
-        DialogSearchIndex:
-        {
-            BGColor:'rgb(20,20,20)',            //背景色
-            BorderColor:'rgb(170,170,170)',     //边框颜色
-            TitleColor:'rgb(230,230,230)',       //标题颜色
-
-            IndexNameColor:"rgb(210,210,210)",       
-            GroupNameColor:"rgb(210,210,210)",      
-            InputTextColor:"rgb(210,210,210)", 
-        },
-
         DialogPopKeyboard:
         {
             BGColor:'rgb(20,20,20)',            //背景色
@@ -158234,7 +158192,7 @@ function JSDialogModifyDraw()
 
         var spanDom=document.createElement("span");
         spanDom.className="hqchart_drawtool icon-tuodong";
-        spanDom.classList.add("UMyChart_DrawTool_Span");
+        spanDom.classList.add("UMyChart_Draw_Modify_Dialog_Drag_Span");
         drgDiv.appendChild(spanDom);
 
         for(var i=0;i<this.AryButton.length;++i)
@@ -158260,7 +158218,7 @@ function JSDialogModifyDraw()
 
         var spanDom=document.createElement("span");
         spanDom.className=item.ClassName;
-        spanDom.classList.add("UMyChart_DrawTool_Span");
+        spanDom.classList.add("UMyChart_Draw_Modify_Dialog_Button_Span");
         divItem.appendChild(spanDom);
        
 
@@ -158289,7 +158247,6 @@ function JSDialogModifyDraw()
                 break;
             case JS_DRAWTOOL_MENU_ID.CMD_LOCK_DRAW_CHART_ID:
                 this.LockButton=data;
-                this.LockButton.Span.style['color']="rgb(220,220,220)";
                 break;
             case JS_DRAWTOOL_MENU_ID.CMD_ZOOM_FONT_ID:
                 this.FontZoomButton=data;
@@ -158494,7 +158451,23 @@ function JSDialogModifyDraw()
         if (!this.ChartPicture || !this.HQChart) return;
         this.ChartPicture.EnableMove=!this.ChartPicture.EnableMove;
 
-        if (this.LockButton) this.LockButton.Span.style['color']=this.ChartPicture.EnableMove?"rgb(220,220,220)":"rgb(0,0,0)";
+        return this.UpdateLockButtonStyle();
+    }
+
+    this.UpdateLockButtonStyle=function()
+    {
+        if (!this.LockButton) return;
+
+        if (this.ChartPicture.EnableMove)
+        {
+            this.LockButton.Span.classList.remove("UMyChart_Draw_Modify_Dialog_Button_Span");
+            this.LockButton.Span.classList.add("UMyChart_Draw_Modify_Dialog_Unlock_Button_Span");
+        }
+        else
+        {
+            this.LockButton.Span.classList.remove("UMyChart_Draw_Modify_Dialog_Unlock_Button_Span");
+            this.LockButton.Span.classList.add("UMyChart_Draw_Modify_Dialog_Button_Span");
+        }
     }
 
     this.ModifyBorderColor=function()
@@ -158679,8 +158652,7 @@ function JSDialogModifyDraw()
 
         if (this.LockButton) 
         {
-            var item=this.LockButton;
-            item.Span.style['color']=this.ChartPicture.EnableMove?"rgb(220,220,220)":"rgb(0,0,0)";
+           this.UpdateLockButtonStyle();
         }
 
         if (this.FontZoomButton)
@@ -164266,14 +164238,6 @@ function JSDialogSearchIndex()
     //{ WindowIndex:窗口索引, OpType:1=切换主图指标 2=添加叠加指标 3=新增指标窗口,  Title: };  
     this.OpData=null;        
 
-    this.TitleColor=g_JSChartResource.DialogSearchIndex.TitleColor;
-    this.TitleBGColor=g_JSChartResource.DialogSearchIndex.TitleBGColor;
-    this.BGColor=g_JSChartResource.DialogSearchIndex.BGColor;
-    this.BorderColor=g_JSChartResource.DialogSearchIndex.BorderColor;
-    this.IndexNameColor=g_JSChartResource.DialogSearchIndex.IndexNameColor;
-    this.GroupNameColor=g_JSChartResource.DialogSearchIndex.GroupNameColor;
-    this.InputTextColor=g_JSChartResource.DialogSearchIndex.InputTextColor;
-
     this.MaxRowCount=30;    //行
     this.ColCount=3;        //列
     this.MaxGroupCount=20;  //分类最多个数
@@ -164640,15 +164604,7 @@ function JSDialogSearchIndex()
 
     this.UpdateStyle=function()
     {
-        if (!this.DivDialog) return;
-
-        if (this.BGColor) this.DivDialog.style['background-color']=this.BGColor;
-        if (this.BorderColor) this.DivDialog.style['border-color']=this.BorderColor;
-
-        if (this.TitleBGColor) this.TitleBox.DivTitle.style['background-color']=this.TitleBGColor;
-        if (this.TitleColor) this.TitleBox.DivName.style['color']=this.TitleColor;
-
-        if (this.InputTextColor) this.InputDom.style['color']=this.InputTextColor;
+       
     };
 
     this.ChangeGroup=function(groupID)
@@ -164683,7 +164639,6 @@ function JSDialogSearchIndex()
             cell.Span.innerText=item.Group.Name;
             cell.Span.dataset.groupid=item.Group.ID;
             cell.Span.dataset.groupname=item.Group.Name;
-            cell.Span.style.color=this.GroupNameColor;
 
             if (cell.Div.style.display=="none") cell.Div.style.display="";
         }
@@ -164709,7 +164664,6 @@ function JSDialogSearchIndex()
                 {
                     var indexItem=data.AryIndex[index];
                     cell.Span.innerText=indexItem.Name;
-                    cell.Span.style.color=this.IndexNameColor;
                     if (cell.Td.style.display=="none") cell.Td.style.display="";
                     cell.IndexItem=indexItem;
                     ++index;
@@ -164798,17 +164752,7 @@ function JSDialogSearchIndex()
     //配色修改
     this.ReloadResource=function(option)
     {
-        this.TitleColor=g_JSChartResource.DialogSearchIndex.TitleColor;
-        this.TitleBGColor=g_JSChartResource.DialogSearchIndex.TitleBGColor;
-        this.BGColor=g_JSChartResource.DialogSearchIndex.BGColor;
-        this.BorderColor=g_JSChartResource.DialogSearchIndex.BorderColor;
-        this.IndexNameColor=g_JSChartResource.DialogSearchIndex.IndexNameColor;
-        this.GroupNameColor=g_JSChartResource.DialogSearchIndex.GroupNameColor;
-        this.InputTextColor=g_JSChartResource.DialogSearchIndex.InputTextColor;
-
-        if (!this.DivDialog) return;
-
-        this.UpdateStyle();
+        
     }
 
 }
@@ -165119,13 +165063,6 @@ function JSDialogModifyIndexParam()
     this.TitleBox=null; //{ DivTitle, DivName, DivName }
     this.Style=0;       //样式 预留
 
-    this.TitleColor=g_JSChartResource.DialogModifyIndexParam.TitleColor;
-    this.TitleBGColor=g_JSChartResource.DialogModifyIndexParam.TitleBGColor;
-    this.BGColor=g_JSChartResource.DialogModifyIndexParam.BGColor;
-    this.BorderColor=g_JSChartResource.DialogModifyIndexParam.BorderColor;
-    this.ParamNameColor=g_JSChartResource.DialogModifyIndexParam.ParamNameColor;
-    this.InputTextColor=g_JSChartResource.DialogModifyIndexParam.InputTextColor;
-
     this.MaxRowCount=30;    //行
 
     this.HQChart=null;
@@ -165383,13 +165320,7 @@ function JSDialogModifyIndexParam()
 
     this.UpdateStyle=function()
     {
-        if (!this.DivDialog) return;
-
-        if (this.BGColor) this.DivDialog.style['background-color']=this.BGColor;
-        if (this.BorderColor) this.DivDialog.style['border-color']=this.BorderColor;
-
-        if (this.TitleBGColor) this.TitleBox.DivTitle.style['background-color']=this.TitleBGColor;
-        if (this.TitleColor) this.TitleBox.DivName.style['color']=this.TitleColor;
+       
     };
 
     this.UpdateParamTable=function(aryText)
@@ -165400,10 +165331,9 @@ function JSDialogModifyIndexParam()
             var item=aryText[index];
             var row=this.AryData[index];
             row.SpanName.innerText=`${item.Name}: `;
-            row.SpanName.style.color=this.ParamNameColor;
+           
 
             row.Input.value=item.Value;
-            row.Input.style.color=this.InputTextColor;
             row.Input.dataset.paramid=item.Index;
 
             if (row.Tr.style.display=="none") row.Tr.style.display="";
@@ -165804,7 +165734,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15137";
+var HQCHART_VERSION="1.1.15146";
 
 function PrintHQChartVersion()
 {