Merge branch 'bar_scroll' into 'master'

* Finish bar chart datazoom.

See merge request easycorp/zentaopms!7384

module/chart/model.php

@@ -477,7 +477,12 @@ class chartModel extends model
             $series[]   = array('name' => $seriesName, 'data' => $yData, 'type' => 'bar', 'stack' => $stack);
         }
 
-        $options = array('series' => $series, 'legend' => $legend, 'xAxis' => $xaxis, 'yAxis' => $yaxis, 'tooltip' => array('trigger' => 'axis'));
+        $dataZoomX = '[{"type":"inside","startValue":0,"endValue":5,"minValueSpan":10,"maxValueSpan":10,"xAxisIndex":[0],"zoomOnMouseWheel":false,"moveOnMouseWheel":true,"moveOnMouseMove":true},{"type":"slider","realtime":true,"startValue":0,"endValue":5,"zoomLock":true,"brushSelect":false,"width":"80%","height":"5","xAxisIndex":[0],"fillerColor":"#33aaff","borderColor":"#33aaff00","backgroundColor":"#cfcfcf00","handleSize":0,"showDataShadow":false,"showDetail":false,"bottom":"0","left":"10%"}]';
+        $dataZoomY = '[{"type":"inside","startValue":0,"endValue":5,"minValueSpan":10,"maxValueSpan":10,"yAxisIndex":[0],"zoomOnMouseWheel":false,"moveOnMouseWheel":true,"moveOnMouseMove":true},{"type":"slider","realtime":true,"startValue":0,"endValue":5,"zoomLock":true,"brushSelect":false,"width":5,"height":"80%","yAxisIndex":[0],"fillerColor":"#33aaff","borderColor":"#33aaff00","backgroundColor":"#cfcfcf00","handleSize":0,"showDataShadow":false,"showDetail":false,"top":"10%","right":0}]';
+        $isY = in_array($settings['type'], array('cluBarY', 'stackedBarY'));
+        $dataZoom = $isY ? json_decode($dataZoomY, true) : json_decode($dataZoomX, true);
+
+        $options = array('series' => $series, 'legend' => $legend, 'xAxis' => $xaxis, 'yAxis' => $yaxis, 'tooltip' => array('trigger' => 'axis'), 'dataZoom' => $dataZoom);
         return $options;
     }
 

www/static/js/403-02732d5c.js

@@ -0,0 +1 @@
+import{_}from"./403-24e394e4.js";import{j as c,d as r,r as n,m as u,e as p,w as d,E as i,P as m,o as l,p as E,G as v,H as x,z as t}from"./index.js";const o=e=>(v("data-v-6eb339c3"),e=e(),x(),e),B={class:"go-error"},f=o(()=>t("div",{class:"text-center"},[t("img",{src:_,alt:""})],-1)),h=o(()=>t("div",{class:"text-center"},[t("h1",{class:"text-base text-gray-500"},"\u62B1\u6B49\uFF0C\u4F60\u65E0\u6743\u8BBF\u95EE\u8BE5\u9875\u9762")],-1)),g=r({__name:"403",setup(e){function s(){i(m.BASE_HOME_NAME)}return(b,y)=>{const a=n("n-button");return l(),u("div",B,[f,h,p(a,{type:"primary",onClick:s},{default:d(()=>[E("\u56DE\u5230\u9996\u9875")]),_:1})])}}});var F=c(g,[["__scopeId","data-v-6eb339c3"]]);export{F as default};

www/static/js/403-77527792.js

@@ -1 +0,0 @@
-import{_ as a}from"./403-24e394e4.js";import{j as c,d as r,r as n,o as u,m as d,e as p,w as i,D as m,E as l,z as t,p as E,H as v,P as x}from"./index.js";const o=e=>(m("data-v-3497d613"),e=e(),l(),e),B={class:"go-error"},h=o(()=>t("div",{class:"text-center"},[t("img",{src:a,alt:""})],-1)),f=o(()=>t("div",{class:"text-center"},[t("h1",{class:"text-base text-gray-500"},"\u62B1\u6B49\uFF0C\u4F60\u65E0\u6743\u8BBF\u95EE\u8BE5\u9875\u9762")],-1)),g=E("\u56DE\u5230\u9996\u9875"),y=r({__name:"403",setup(e){function s(){v(x.BASE_HOME_NAME)}return(C,N)=>{const _=n("n-button");return u(),d("div",B,[h,f,p(_,{type:"primary",onClick:s},{default:i(()=>[g]),_:1})])}}});var I=c(y,[["__scopeId","data-v-3497d613"]]);export{I as default};