ver 7445

7442 增加区间选择事件通知 7440 数字货币增加分时图demo
wuhahahei · Nov 19, 2019 · 2e6d173 · 2e6d173
1 parent 8c2fdf7
commit 2e6d173
Show file tree

Hide file tree

Showing 10 changed files with 320 additions and 146 deletions.
diff --git a/umychart_uniapp_h5/umychart.uniapp.h5.js b/umychart_uniapp_h5/umychart.uniapp.h5.js
@@ -4566,6 +4566,7 @@ var JSCHART_EVENT_ID=
     RECV_STOP_AUTOUPDATE:10,    //停止自动更新
     ON_CONTEXT_MENU:11,         //右键菜单事件
     ON_TITLE_DRAW:12,           //标题信息绘制事件
+    ON_SELECT_RECT:13           //区间选择事件通知
 }
 
 var JSCHART_OPERATOR_ID=
@@ -4903,6 +4904,18 @@ function JSChartContainer(uielement)
 
                 if (this.JSChartContainer.GetSelectRectData(selectData))
                 {
+                    var event=this.JSChartContainer.GetEventCallback(JSCHART_EVENT_ID.ON_SELECT_RECT);
+                    if (event && event.Callback)
+                    {
+                        var data=
+                        { 
+                            X:drag.LastMove.X-uielement.getBoundingClientRect().left,
+                            Y:drag.LastMove.Y-uielement.getBoundingClientRect().top,
+                            SelectData:selectData,                      //区间选择的数据 
+                        };
+                        event.Callback(event,data,this.JSChartContainer);
+                    }
+
                     if (this.JSChartContainer.SelectRectRightMenu)
                     {
                         e.data=

diff --git a/vue.demo/bitdemo/package-lock.json b/vue.demo/bitdemo/package-lock.json
diff --git a/vue.demo/bitdemo/package.json b/vue.demo/bitdemo/package.json
@@ -41,7 +41,7 @@
     "babel-preset-vue-app": "^1.2.0",
     "css-loader": "^0.27.0",
     "file-loader": "^0.10.1",
-    "hqchart": "^1.1.7426",
+    "hqchart": "^1.1.7439",
     "html-webpack-plugin": "^2.24.1",
     "node-sass": "^4.12.0",
     "postcss-loader": "^1.3.3",

diff --git a/vue.demo/bitdemo/src/pages/stockHq/App.vue b/vue.demo/bitdemo/src/pages/stockHq/App.vue
@@ -1,6 +1,7 @@
 <template>
     <div id="app" ref='app' style="height:100%">
-        <stockHq DefaultPairName="ETH/BTC" DefaultName="以太币" DefaultfloatPrecision=8 DefaultPeriod=0 ref='klinechart'></stockHq>
+        <stockHq DefaultPairName="ETH/BTC" DefaultName="以太币" DefaultfloatPrecision=8 DefaultPeriod=0 ref='klinechart'>
+        </stockHq>
         <coinList @ChangeSymbol="ChangeSymbol">
         </coinList>
     </div>
@@ -20,26 +21,18 @@ export default
         var data={};
         return data;
     },
+
     components: 
     { 
         stockHq: stockHq, 
         coinList: coinList
     },
 
-    created() 
-    {
-        
-    },
-
     mounted()
     {
         this.OnSize();
     },
 
-    computed: 
-    {
-        
-    },
     methods: 
     {
         ChangeSymbol(symbol,name,floatPrecision)    //转发切换股票数据到图形
@@ -69,4 +62,3 @@ a {text-decoration: none;}
 ul,ol {list-style: none;}
 .clear:after {content: " "; height: 0; display: block; overflow: hidden; clear: both;}
 </style>
-
diff --git a/vue.demo/bitdemo/src/pages/stockHq/components/coinList.vue b/vue.demo/bitdemo/src/pages/stockHq/components/coinList.vue
@@ -45,13 +45,13 @@ function numberFormat(value) {
         sizes = ['', '万', '亿', '万亿'],
         i,
         result;
-        if(value < k){
-            result = keepTwoDecimal(value, 2);
-        }else{
-            i = Math.floor(Math.log(value) / Math.log(k)); 
-        
-            result = ((value / Math.pow(k, i))).toFixed(2) + sizes[i];
-        }
+    if(value < k){
+        result = keepTwoDecimal(value, 2);
+    }else{
+        i = Math.floor(Math.log(value) / Math.log(k)); 
+    
+        result = ((value / Math.pow(k, i))).toFixed(2) + sizes[i];
+    }
     return result;
 }
 
@@ -76,7 +76,7 @@ DefaultData.BitList=function()
 
 export default 
 {
-    name:'BitList', //类名
+    name:'BitList',
 
     data()
     {
@@ -97,7 +97,7 @@ export default
     {
         ClickSymbol(item) 
         {
-            this.$emit('ChangeSymbol', item.Symbol, item.Name,item.FloatPrecision)
+            this.$emit('ChangeSymbol', item.Symbol, item.Name, item.FloatPrecision)
         },
 
         LoadMarketData()