ver 6196

30e25c8b · jones · fdb46a6b · 30e25c8b · 30e25c8b · 30e25c8b
7 changed file
--- a/umychart_python/umychart_webtemplate.py
+++ b/umychart_python/umychart_webtemplate.py
@@ -6,14 +6,14 @@ HTML_PART1="""<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'ht
 <meta name='viewport' content='width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no' />
 <title>HQChart-Py可视化</title>  
    <!-- 加载资源 -->
-    <link rel='stylesheet' href='hqchart/content/css/tools.css' />
+    <link rel='stylesheet' href='hqchart/umychart.resource/css/tools.css' />
    <link rel='stylesheet' href='hqchart/umychart.resource/font/iconfont.css' />
 </head>  
 <body>
    <div id='kline' style='width: 900px;height:400px;position: relative;'></div>

-    <script src='hqchart/content/js/jquery.min.js'></script>
-    <script src='hqchart/content/js/webfont.js'></script>
+    <script src='hqchart/umychart.resource/js/jquery.min.js'></script>
+    <script src='hqchart/umychart.resource/js/webfont.js'></script>
    <script src='hqchart/umychart.js'></script>             <!-- K线图形 -->
    <script src='hqchart/umychart.complier.js'></script>    <!-- 麦语言解析执行器 -->
    <script src='hqchart/umychart.index.data.js'></script>  <!-- 基础指标库 -->

--- a/vuehqchart/src/jscommon/umychart.complier.js
+++ b/vuehqchart/src/jscommon/umychart.complier.js
@@ -9217,6 +9217,7 @@ function LocalJsonDataIndex(name,args,option)
    {
        outVar=jsonData.OutVar;
        date=jsonData.Date;
+        time=jsonData.Time;

        result=[];

@@ -9229,11 +9230,15 @@ function LocalJsonDataIndex(name,args,option)
            {
                var indexItem=new SingleData(); //单列指标数据
                indexItem.Date=date[j];
+                if (time && j<time.length) indexItem.Time=time[j];
                indexItem.Value=item.Data[j];
                indexData.push(indexItem);
            }

-            var aryFittingData=hisData.GetFittingData(indexData); //数据和主图K线拟合
+            if (hisData.Period<4)
+                var aryFittingData=hisData.GetFittingData(indexData); //数据和主图K线拟合
+            else
+                var aryFittingData=hisData.GetMinuteFittingData(indexData); //数据和主图K线拟合
            var bindData=new ChartData();
            bindData.Data=aryFittingData;
            outVarItem.Data=bindData.GetValue();

--- a/vuehqchart/src/jscommon/umychart.js
+++ b/vuehqchart/src/jscommon/umychart.js
@@ -4276,6 +4276,7 @@ function MinuteData()
 function SingleData()
 {
    this.Date;  //日期
+    this.Time;  //时间
    this.Value; //数据  (可以是一个数组)
 }

@@ -4869,6 +4870,53 @@ function ChartData()
        return result;
    }

+    //  分钟数据拟合
+    this.GetMinuteFittingData=function(overlayData)
+    {
+        var result=[];
+        for(var i=0,j=0;i<this.Data.length;)
+        {
+            var date=this.Data[i].Date;
+            var time=this.Data[i].Time;
+
+            if (j>=overlayData.length)
+            {
+                result[i]=null;
+                ++i;
+                continue;;
+            }
+
+            var overlayDate=overlayData[j].Date;
+            var overlayTime=overlayData[j].Time;
+            const overlayItem=overlayData[j];
+
+            if (overlayDate==date && overlayTime==time)
+            {
+                var item=new SingleData();
+                item.Date=overlayItem.Date;
+                item.Time=overlayItem.Time;
+                item.Value=overlayItem.Value;
+                result[i]=item;
+                ++j;
+                ++i;
+            }
+            else if (overlayDate<date || (overlayDate==date && overlayTime<time))
+            {
+                ++j;
+            }
+            else
+            {
+                var item=new SingleData();
+                item.Date=date;
+                item.Time=time;
+                result[i]=item;
+                ++i;
+            }
+        }
+
+        return result;
+    }
+

    //把财报数据拟合到主图数据,返回 SingleData 数组
    this.GetFittingFinanceData=function(financeData)

--- a/webhqchart.demo/jscommon/umychart.complier.js
+++ b/webhqchart.demo/jscommon/umychart.complier.js
@@ -9217,6 +9217,7 @@ function LocalJsonDataIndex(name,args,option)
    {
        outVar=jsonData.OutVar;
        date=jsonData.Date;
+        time=jsonData.Time;

        result=[];

@@ -9229,11 +9230,15 @@ function LocalJsonDataIndex(name,args,option)
            {
                var indexItem=new SingleData(); //单列指标数据
                indexItem.Date=date[j];
+                if (time && j<time.length) indexItem.Time=time[j];
                indexItem.Value=item.Data[j];
                indexData.push(indexItem);
            }

-            var aryFittingData=hisData.GetFittingData(indexData); //数据和主图K线拟合
+            if (hisData.Period<4)
+                var aryFittingData=hisData.GetFittingData(indexData); //数据和主图K线拟合
+            else
+                var aryFittingData=hisData.GetMinuteFittingData(indexData); //数据和主图K线拟合
            var bindData=new ChartData();
            bindData.Data=aryFittingData;
            outVarItem.Data=bindData.GetValue();

--- a/webhqchart.demo/jscommon/umychart.js
+++ b/webhqchart.demo/jscommon/umychart.js
@@ -4276,6 +4276,7 @@ function MinuteData()
 function SingleData()
 {
    this.Date;  //日期
+    this.Time;  //时间
    this.Value; //数据  (可以是一个数组)
 }

@@ -4869,6 +4870,53 @@ function ChartData()
        return result;
    }

+    //  分钟数据拟合
+    this.GetMinuteFittingData=function(overlayData)
+    {
+        var result=[];
+        for(var i=0,j=0;i<this.Data.length;)
+        {
+            var date=this.Data[i].Date;
+            var time=this.Data[i].Time;
+
+            if (j>=overlayData.length)
+            {
+                result[i]=null;
+                ++i;
+                continue;;
+            }
+
+            var overlayDate=overlayData[j].Date;
+            var overlayTime=overlayData[j].Time;
+            const overlayItem=overlayData[j];
+
+            if (overlayDate==date && overlayTime==time)
+            {
+                var item=new SingleData();
+                item.Date=overlayItem.Date;
+                item.Time=overlayItem.Time;
+                item.Value=overlayItem.Value;
+                result[i]=item;
+                ++j;
+                ++i;
+            }
+            else if (overlayDate<date || (overlayDate==date && overlayTime<time))
+            {
+                ++j;
+            }
+            else
+            {
+                var item=new SingleData();
+                item.Date=date;
+                item.Time=time;
+                result[i]=item;
+                ++i;
+            }
+        }
+
+        return result;
+    }
+

    //把财报数据拟合到主图数据,返回 SingleData 数组
    this.GetFittingFinanceData=function(financeData)

--- a/webhqchart/umychart.complier.js
+++ b/webhqchart/umychart.complier.js
@@ -9217,6 +9217,7 @@ function LocalJsonDataIndex(name,args,option)
    {
        outVar=jsonData.OutVar;
        date=jsonData.Date;
+        time=jsonData.Time;

        result=[];

@@ -9229,11 +9230,15 @@ function LocalJsonDataIndex(name,args,option)
            {
                var indexItem=new SingleData(); //单列指标数据
                indexItem.Date=date[j];
+                if (time && j<time.length) indexItem.Time=time[j];
                indexItem.Value=item.Data[j];
                indexData.push(indexItem);
            }

-            var aryFittingData=hisData.GetFittingData(indexData); //数据和主图K线拟合
+            if (hisData.Period<4)
+                var aryFittingData=hisData.GetFittingData(indexData); //数据和主图K线拟合
+            else
+                var aryFittingData=hisData.GetMinuteFittingData(indexData); //数据和主图K线拟合
            var bindData=new ChartData();
            bindData.Data=aryFittingData;
            outVarItem.Data=bindData.GetValue();

--- a/webhqchart/umychart.js
+++ b/webhqchart/umychart.js
@@ -4276,6 +4276,7 @@ function MinuteData()
 function SingleData()
 {
    this.Date;  //日期
+    this.Time;  //时间
    this.Value; //数据  (可以是一个数组)
 }

@@ -4869,6 +4870,53 @@ function ChartData()
        return result;
    }

+    //  分钟数据拟合
+    this.GetMinuteFittingData=function(overlayData)
+    {
+        var result=[];
+        for(var i=0,j=0;i<this.Data.length;)
+        {
+            var date=this.Data[i].Date;
+            var time=this.Data[i].Time;
+
+            if (j>=overlayData.length)
+            {
+                result[i]=null;
+                ++i;
+                continue;;
+            }
+
+            var overlayDate=overlayData[j].Date;
+            var overlayTime=overlayData[j].Time;
+            const overlayItem=overlayData[j];
+
+            if (overlayDate==date && overlayTime==time)
+            {
+                var item=new SingleData();
+                item.Date=overlayItem.Date;
+                item.Time=overlayItem.Time;
+                item.Value=overlayItem.Value;
+                result[i]=item;
+                ++j;
+                ++i;
+            }
+            else if (overlayDate<date || (overlayDate==date && overlayTime<time))
+            {
+                ++j;
+            }
+            else
+            {
+                var item=new SingleData();
+                item.Date=date;
+                item.Time=time;
+                result[i]=item;
+                ++i;
+            }
+        }
+
+        return result;
+    }
+

    //把财报数据拟合到主图数据,返回 SingleData 数组
    this.GetFittingFinanceData=function(financeData)