From 3d104fabfb6f1b21662591b1cd352b258cb4b94f Mon Sep 17 00:00:00 2001 From: datagear Date: Sun, 9 Feb 2020 20:04:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=86=85=E7=BD=AE=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E6=8F=92=E4=BB=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=95=A3?= =?UTF-8?q?=E7=82=B9=E5=9B=BE=E3=80=81=E9=9B=B7=E8=BE=BE=E5=9B=BE=E3=80=81?= =?UTF-8?q?=E6=BC=8F=E6=96=97=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/datagear/analysis/DataSet.java | 7 + .../analysis/support/AbstractDataSet.java | 20 +- .../support/SimpleDashboardThemeSource.java | 2 +- .../datagear/analysis/support/SqlDataSet.java | 8 +- .../html/DirectoryHtmlChartPluginManager.java | 2 +- .../html/HtmlChartScriptObjectWriter.java | 2 +- .../analysis/support/SqlDataSetTest.java | 4 +- .../management/domain/SqlDataSetEntity.java | 21 +- .../org.datagear.chart.bar.zip | Bin 3489 -> 3720 bytes .../org.datagear.chart.funnel.zip | Bin 0 -> 3821 bytes .../org.datagear.chart.gauge.zip | Bin 3538 -> 3565 bytes .../org.datagear.chart.line.zip | Bin 3490 -> 3693 bytes .../org.datagear.chart.pie.zip | Bin 3657 -> 3782 bytes .../org.datagear.chart.radar.zip | Bin 0 -> 3915 bytes .../org.datagear.chart.scatter.zip | Bin 0 -> 3651 bytes .../static/script/datagear-chart-util.js | 217 +++++++++++++----- test/sql/test-sql-script-mysql.sql | 14 ++ 17 files changed, 213 insertions(+), 84 deletions(-) create mode 100644 datagear-web/src/main/resources/org/datagear/web/builtInHtmlChartPlugins/org.datagear.chart.funnel.zip create mode 100644 datagear-web/src/main/resources/org/datagear/web/builtInHtmlChartPlugins/org.datagear.chart.radar.zip create mode 100644 datagear-web/src/main/resources/org/datagear/web/builtInHtmlChartPlugins/org.datagear.chart.scatter.zip diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/DataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/DataSet.java index 2c9180b9..01b29278 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/DataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/DataSet.java @@ -15,6 +15,13 @@ import java.util.Map; */ public interface DataSet extends Identifiable { + /** + * 获取名称。 + * + * @return + */ + String getName(); + /** * 获取属性列表。 *

diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractDataSet.java index 91371aad..be25d651 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/AbstractDataSet.java @@ -14,12 +14,12 @@ import java.util.Map; import org.datagear.analysis.AbstractIdentifiable; import org.datagear.analysis.DataNameAndType; -import org.datagear.analysis.DataSetResult; +import org.datagear.analysis.DataSet; import org.datagear.analysis.DataSetException; import org.datagear.analysis.DataSetExport; -import org.datagear.analysis.DataSet; import org.datagear.analysis.DataSetParam; import org.datagear.analysis.DataSetProperty; +import org.datagear.analysis.DataSetResult; /** * 抽象{@linkplain DataSet}。 @@ -29,6 +29,8 @@ import org.datagear.analysis.DataSetProperty; */ public abstract class AbstractDataSet extends AbstractIdentifiable implements DataSet { + private String name; + private List properties; private List params; @@ -40,12 +42,24 @@ public abstract class AbstractDataSet extends AbstractIdentifiable implements Da super(); } - public AbstractDataSet(String id, List properties) + public AbstractDataSet(String id, String name, List properties) { super(id); + this.name = name; this.properties = properties; } + @Override + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + @Override public List getProperties() { diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleDashboardThemeSource.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleDashboardThemeSource.java index 4d2c8823..539eeabe 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleDashboardThemeSource.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/SimpleDashboardThemeSource.java @@ -31,7 +31,7 @@ public class SimpleDashboardThemeSource implements DashboardThemeSource public static final DashboardTheme THEME_DARK = new DashboardTheme("#000", "#EEE", "#333", new ChartTheme("#101010", "#EEE", "#202020", "#AAA", "#888", "#444", "#F58400", new String[] { "#5EF6FE", - "#12CDD2", "#019DA2", "#24666C", "#73A373", "#EA7E53", "#EEDD78", "#73B9BC", "#7289AB", "#91CA8C" }, + "#91CA8C", "#EA7E53", "#24666C", "#73A373", "#019DA2", "#EEDD78", "#73B9BC", "#7289AB", "#12CDD2" }, new Theme("#000", "#EEE", "#333"))); private Map dashboardThemes; diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/SqlDataSet.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/SqlDataSet.java index feb2f47f..efeb5f81 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/SqlDataSet.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/SqlDataSet.java @@ -13,11 +13,11 @@ import java.sql.SQLException; import java.util.List; import java.util.Map; -import org.datagear.analysis.DataSetResult; -import org.datagear.analysis.DataSetException; import org.datagear.analysis.DataSet; +import org.datagear.analysis.DataSetException; import org.datagear.analysis.DataSetParam; import org.datagear.analysis.DataSetProperty; +import org.datagear.analysis.DataSetResult; import org.datagear.analysis.support.ParameterSqlResolver.ParameterSql; import org.datagear.util.JdbcUtil; import org.datagear.util.JdbcUtil.QueryResultSet; @@ -46,10 +46,10 @@ public class SqlDataSet extends AbstractDataSet super(); } - public SqlDataSet(String id, List properties, ConnectionFactory connectionFactory, + public SqlDataSet(String id, String name, List properties, ConnectionFactory connectionFactory, String sql) { - super(id, properties); + super(id, name, properties); this.connectionFactory = connectionFactory; this.sql = sql; } diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/DirectoryHtmlChartPluginManager.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/DirectoryHtmlChartPluginManager.java index eb19acbc..c5d5487f 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/DirectoryHtmlChartPluginManager.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/DirectoryHtmlChartPluginManager.java @@ -42,7 +42,7 @@ public class DirectoryHtmlChartPluginManager extends ConcurrentChartPluginManage private HtmlChartPluginLoader htmlChartPluginLoader = new HtmlChartPluginLoader(); - private long readCheckForReloadTimeThreashold = 5 * 60 * 1000; + private long readCheckForReloadTimeThreashold = (LOGGER.isDebugEnabled() ? 0 : 5 * 60 * 1000); private Map pluginIdFileNameMap = new HashMap(); diff --git a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartScriptObjectWriter.java b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartScriptObjectWriter.java index 15e6d26b..6498ede4 100644 --- a/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartScriptObjectWriter.java +++ b/datagear-analysis/src/main/java/org/datagear/analysis/support/html/HtmlChartScriptObjectWriter.java @@ -107,7 +107,7 @@ public class HtmlChartScriptObjectWriter extends AbstractHtmlScriptObjectWriter { public JsonDataSet(DataSet dataSet) { - super(dataSet.getId(), dataSet.getProperties()); + super(dataSet.getId(), dataSet.getName(), dataSet.getProperties()); setParams(dataSet.getParams()); setExports(dataSet.getExports()); } diff --git a/datagear-analysis/src/test/java/org/datagear/analysis/support/SqlDataSetTest.java b/datagear-analysis/src/test/java/org/datagear/analysis/support/SqlDataSetTest.java index 8e78f14b..9be80e85 100644 --- a/datagear-analysis/src/test/java/org/datagear/analysis/support/SqlDataSetTest.java +++ b/datagear-analysis/src/test/java/org/datagear/analysis/support/SqlDataSetTest.java @@ -14,9 +14,9 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.datagear.analysis.DataSetResult; import org.datagear.analysis.DataSetParam; import org.datagear.analysis.DataSetProperty; +import org.datagear.analysis.DataSetResult; import org.datagear.analysis.DataType; import org.datagear.util.JdbcUtil; import org.datagear.util.resource.SimpleConnectionFactory; @@ -66,7 +66,7 @@ public class SqlDataSetTest extends DBTestSupport List dataSetParams = Arrays.asList(new DataSetParam("id", DataType.INTEGER, true), new DataSetParam("name", DataType.STRING, true)); - SqlDataSet sqlDataSet = new SqlDataSet("1", dataSetProperties, connectionFactory, sql); + SqlDataSet sqlDataSet = new SqlDataSet("1", "1", dataSetProperties, connectionFactory, sql); sqlDataSet.setParams(dataSetParams); Map dataSetParamValues = new HashMap(); diff --git a/datagear-management/src/main/java/org/datagear/management/domain/SqlDataSetEntity.java b/datagear-management/src/main/java/org/datagear/management/domain/SqlDataSetEntity.java index a1ec14f7..02474bbe 100644 --- a/datagear-management/src/main/java/org/datagear/management/domain/SqlDataSetEntity.java +++ b/datagear-management/src/main/java/org/datagear/management/domain/SqlDataSetEntity.java @@ -27,9 +27,6 @@ public class SqlDataSetEntity extends SqlDataSet implements CreateUserEntity properties, SchemaConnectionFactory connectionFactory, - String sql, String name, User createUser) + public SqlDataSetEntity(String id, String name, List properties, + SchemaConnectionFactory connectionFactory, + String sql, User createUser) { - super(id, properties, connectionFactory, sql); - this.name = name; + super(id, name, properties, connectionFactory, sql); this.createTime = new Date(); } @@ -78,16 +75,6 @@ public class SqlDataSetEntity extends SqlDataSet implements CreateUserEntityiX1ia%$vL^}P2`6s zC!2%5Xxy{8((F;+o4fa?c+Kc6;!YZlYf zi*F_r3CafCUtx0H^ZNPwV)y*5`}Q$prqGJC@RC88R1=7cIOq`m*%WHnx39r z&+Wg-wQjE5f4j>6&!4mFYF!s^N{wPs4fnb+QMN#~^~~!UHG{VfmOP=wpDyfFYE~A$ zRF=Fn{J7xLB^s)HzFvzRZ4b7*@$o)V!=mH5XO)IlWgwIIS#Qf-$1Th!+k6R-JR>N2 zMnU{Qv-jkE3}-?_iuyKA^Z7OJfsSu#JfrZ23-v4JwWdr+x}M$9WPGNf!THbET_;%2 zHeGPjJ~iXcu3T5owKIIa|6QS({@PIV-MJIrqu=R9rn)!V`F1wHI=`Y}%LCv0YL*(W zY!>dRbnrerqdqO)%q?`uo8R+96PCZQ+PZJj#v9*PMfYxfy_Tb?Tc>vw0a9?QMd5$=`%R5-P9;wekgaPOqAC%&BwJnpD$Rk)9ZO8&+2O#t34HJ z1uXB%$4g!Ln{(myPD`)SGu(C)!ptOlId{KS?K3(NT-fpJ?c0UBWnUk?eM`6Cln>X_ znHg(i1lD`H+ZQ}^W?#+z{NR>XitGLsB|MW7N^|^`@|jV2GN&YOeXY~#pHpV9s>mw) zc`{~S$=<3%r@ycDy;PjOC+_B6rPbm;<(_X@>C>pFw)MujwZYde|8ckNjqjiPsdROw zSAC4O-ovwr0?*Tqy}Oi|y;}TSAy?08>4?f47hgSllyB?BtozJu*VV4J>AUu63HXPcYTUo6;=$#=tO4Ha9GmU=`~EU9FdSuP zUTy`{f-yJ0|3){uiO9t delta 700 zcmeB>T`0{L;LXe;!oUH95gYpaC-O;i)a%*BwZHxnyV0CW6FgJLAx3HtgI^`esHkVYyr|n&G_c2%C20=f+Eu5NaH>X={*uMMRnKqr%*P5nI zZ7s^sEE7vtEUG^nd+uEQ!S88mJMYG@m~L>s*Z;oS{@LtT|MvFvC^p3{6HCcRDf?ZT6H>+I`y+STv=_hl9nSG;IYqD*5TD_cRBirX_zHv{obw-wE1$vdZi zeD?cjyul`3(~rJ0N;!^M)kZC=v_uEKxvC^T71xJ?MJ+Ha!$&-g#zxddhtr8i+ z>!&}r*T47o*T;J^&A#rO*lB$6)-9=ao5ms?1N}=g7jCMZU69cJ`0!OOTfV-9tNPd6 zm-Akza9Yw`@pa*XbFU71z2ew&)iBks_*>ec2TH+9_bUAJ-K^BxswLljN54$?;p^@M zo5HlWcb~>Z?fw;K9lUsw$I8c9?FJdiktuR7vrLcIXPl_q(G2h(KP zryVN|ei9;6UVf(Q!V<>25oYf%v&nC)+8CRwH`R<^I88WXjrq^QgV! z>6-0d!p;OVUNvyD-NiMd>EDliuNda+I$^r6_tzy;p99$${WVU#&yHMsvAxxaz4mK< zfHynGEVGlXVoVGSf~*V-0p5&EqRfcoHTfT}rV=cDAxi?2SpY)gWKTXtIarDd@MdLW P00Jf;Yyr~jydWL`2pTg8 diff --git a/datagear-web/src/main/resources/org/datagear/web/builtInHtmlChartPlugins/org.datagear.chart.funnel.zip b/datagear-web/src/main/resources/org/datagear/web/builtInHtmlChartPlugins/org.datagear.chart.funnel.zip new file mode 100644 index 0000000000000000000000000000000000000000..6f1d03867cea33766947c4bc7f751225f0c5f1c2 GIT binary patch literal 3821 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 delta 756 zcmaDWeMy=xz?+#xgnr?a`mhRc5z-n ziEoS|40ETP&AaR%aQyu1%D0A0SbArLl+wNx#mcK?g6xEMvfXo&%Ter>dv*Hh-LLJj zQY-)W3%~#Va9^x!7xxWGq3H{@=x~Rqf7I~HarBzn=yXq`vO{~-2ThSJ;v3kS1MYU6 zuYZ-46(DJyU1<^TSt6B}% zM2=nSm}Wm~1-t(&&+fX}nbr%OLxhi+XmH+IdED==;|gT~gN|KWE!V%Px@-95#JtYlqvmp>rM%W|D7T)yEXlthqr!IeNND~RS%`avYp;vcYBuIt+S-C zwI@tfDvIOhdhIWKdnetlzE-iZDz-X0!N_)VF7Lk8Ged6K+}%_rUcM*DDk{F%>-WP` zGt1}RxIT6H37OwZwX_4C{Ygn%u6>73tLXBEkKJc$crn&44hpf#DB7%Nz z&U)4RIqUXEZj&6jW<+{S;g0*B%EiDiIh$8e5tcBK6#>&{0NjAdYk8IA XU@0}gn-ypv0|OHfwg71hUJwreK=nwL diff --git a/datagear-web/src/main/resources/org/datagear/web/builtInHtmlChartPlugins/org.datagear.chart.line.zip b/datagear-web/src/main/resources/org/datagear/web/builtInHtmlChartPlugins/org.datagear.chart.line.zip index 27971d2d71aa434495ba4af2bcd6b00a6a3ac1d6..57865fcef4564271322056b25027617563987392 100644 GIT binary patch delta 906 zcmZ1^{Z@uAz?+#xgnMZ`{7~-uE9*p7Eu{XAx(pNn(iG zW67ynUX{nH7QRm{ITv>!d79JBvp4IP-#$J6di**A!^ERItQlR}ZBBOG`0lpvxh`js z!_`ME%Ty;!5_`V={q^VadHeRY??}n_){~s$adJ{?O5C!p=b8!2O>`w9TlHeEx|Ua0 zev~iSp{9M`n(2_R8n>R&0lr0VGa6($EEA2?ZZ|XPe6iq*Xj8l&{p;SfV{Pvz@_u^# zs{YUSqsQ&-?OspSt6p2ND%?k(`_Eq1^l5B<%Tmq4HbllRXMV#bx7jttFlD+%xI9?Xb4)bnQDLT;~{A`W{EPm4_6 zYqgl2cQ;3)aQD|kId3#iPG+foS$OoB)We&frl?-1PhTD7!FMLWra6AOQn1O})@dG3 z3@bMzhilB5(bE^R&*hWZ>^2*z9j4uTS@qv2ELd9H-Q;Jrd?B}bh4n4KlJK6fla)zoKmMnkQ z2ReDH99yC=^;v!Cb;)^!srO1EwACGi?z+xAEca%ez(p^_IVN z=l}Q+`3vDq}Ul40=yZSM41tpWwHdXrV=c-AWH%>O#n=%6#L|4 ZUPU=r{t57AWn%yWCLnA9(wBKbJOH(iljr~d delta 701 zcmaDWvq+jRz?+#xgn_)?8F6OK_kICD)oJ^Ki>16`0M2zQ>&OY4gB;J4E^?G!NYyDf zx)&GshgJD@fbjh(p3_%sITPg6f4I5ePI~;Zq!5=11G&wa;w4R*mX$lY_Wixs;U{tM zYyH)q=ezm$@2f9b=3ASY^2le)wr$7k{1?b@pXn}1Tk+TgzF@yhx2 z_TxbsCyI^*o~V*pvAt@`BrB%;uRb#`&uN}%u;WBXrhZ5L^2mwDoTmD_z7xOg^5d7% z44=7?)#W=UUt72DVNQ^#R_7G!mD?nm^=_Ox;~cy7TYbaamvap=*=H}!Q!<)*Y^`2~ z*rxQ%7;9I*tA*94*Kqo3U07TC*)8`2=WFrZSDyuCe%>Mab$jWKMyo@=7YM(WH~YG6 zUBT3HfsM-b>o&xw`?>+^`h~KeI8A3IM*N6`e)mObiSntPBhR-i%D5%!u?g`7y7i5-fosO9Inb07BzrJw8P_Sdt6y SW@Tdl0wy4A0n!}2ARYiMp*gGo diff --git a/datagear-web/src/main/resources/org/datagear/web/builtInHtmlChartPlugins/org.datagear.chart.pie.zip b/datagear-web/src/main/resources/org/datagear/web/builtInHtmlChartPlugins/org.datagear.chart.pie.zip index 33f19a2dc5b0bd2a3a7fa45197d7d5bffc855dc6..a0729ff5886078ddae983a5844ca6782adf40aed 100644 GIT binary patch delta 995 zcmX>pb4->mz?+#xgnldboAZow#@T`(fh!fV;i7)0O5@}2&xze<^MAFz z<6<@&-8tyegFKEfrU;TzlUrb(?84nYT*H?>ulS4+>!kgnbNe4I4AzR#V5OPm*s?-pDPTU zBlX@ms92sl@o-A_5s}s}M^9?$08y#PF7%S5r#g;j!oS>@zQR`Dd2bUbw2w zp&%MnyvDS*b@8ru@!VPl({^SA8#{eUvRIVLc;{h3_R-L%Z3pf?WVmr+FWY)gZL`R& zJey8D-?2a~MBAg@ea->ScqjWUYo=b%d}eWK-hD5xoA>VRN-&u%+G5Xn;r*i9k&_Iq zYkz(%@Vm9Ac2d}J7V(%>+rIVwG?M?d_S}hg@BKb&|2JULc2Qoa`IPIj@#hQE^R8G< zv%J#1hJWS_4%Rmfhh~`>1_V{OztL7w&(n2OzG%thlfAMkRHNZ$MN$0)t`O;)OqxxF zFE|ZtrDPPUZWO*(SLyvJ^TXP@wtCBTXA?oG!-iK61Q`d#Tf8rVve(x{#0A?yUNVX_@nfTgsNZi3CYVVw=zonS`o9vT=MW~r^kmk zozFe|%KpOD{Kd@ixlQ6%CvCQ!m20P}xZU{!!wriK;?wOui#}|RluEkS%+g!8+&au< zb)@9kXZ*9}uSzj|(+FC9&?(>Mt%w-gs;M`caxSpEoO#mds2okz?+#xgn_)?8F6QJ|kICD)iP=WEzrP1GqUfPbDVzPj>CgExYbGHFc$a z!x2_Kg}#n#{X2{7c%ME$qHVA_+qy5f@W7ho%=CN*4&e^S)mH^=tp|V{%Pgd0Ujv%$%X#)mvb8@Vcf%V?s>- zv3bXD&Di_8JioqfugmI|>pLe1^v#%NS&=jIcvOmEPsEXA)-_+Y9SpNMSAL;x&;C98 zBK`~aK3n6mMw4-!gVsc~8CGBT|0ee5tmJW2y7lk_pYPeWIZjP(QNfMxA3R{#|E8gK zfBmmNuWz^8zwR%~a+;qlcw2MEPNT_;8>fr4x>gEh=-f7E{GFEgW#iUATK#v^T`P0m zJlp(e(o)H%3r|PnOj>+-N|^bk&8J>uXg(`m^^A+xyV&ZB%gUIdwY`fUsO~nO+{}J- z%@I~{$CJNYBi_B;ZMI|0q@)?jpZV&vSXHC~3;4Hk)K}b@(xIqi%`2=KrhtS#xGB)SamNH=-uw;w&H={;iu29-A+A_)_vV_KP-&XLEOH&fBUf-2Ljz9;q{* zbZ<@xJ+#}g*lyc_8v(EKS99C{m{!ji;LXnQ`5Vip6^}HY+ E06-Xxx&QzG diff --git a/datagear-web/src/main/resources/org/datagear/web/builtInHtmlChartPlugins/org.datagear.chart.radar.zip b/datagear-web/src/main/resources/org/datagear/web/builtInHtmlChartPlugins/org.datagear.chart.radar.zip new file mode 100644 index 0000000000000000000000000000000000000000..268cb1d53c3e45070add52674eb5f5f8cb4a4dd2 GIT binary patch literal 3915 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 MB7Xm6WPhgr1EVmq(EtDd literal 0 HcmV?d00001 diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/staticResource/static/script/datagear-chart-util.js b/datagear-web/src/main/resources/org/datagear/web/webapp/staticResource/static/script/datagear-chart-util.js index 51dcba86..c9cde9cb 100644 --- a/datagear-web/src/main/resources/org/datagear/web/webapp/staticResource/static/script/datagear-chart-util.js +++ b/datagear-web/src/main/resources/org/datagear/web/webapp/staticResource/static/script/datagear-chart-util.js @@ -15,6 +15,9 @@ /** * 获取图表主题。 + * + * @param chart + * @return {...} */ util.chartTheme = function(chart) { @@ -22,7 +25,10 @@ }; /** - * 获取渲染样式。 + * 获取渲染风格。 + * + * @param chart + * @return "..." */ util.chartRenderStyle = function(chart) { @@ -87,9 +93,10 @@ }; /** - * 获取第一个图标数据集对象。 + * 获取第一个图表数据集对象。 * * @param chart + * @return {dataSet: [], propertySigns: {...}} */ util.firstChartDataSet = function(chart) { @@ -99,6 +106,30 @@ return chart.chartDataSets[0]; }; + /** + * 获取图表数据集对象数组。 + */ + util.chartDataSets = function(chart) + { + if(!chart || !chart.chartDataSets || chart.chartDataSets.length < 1) + return []; + + return chart.chartDataSets; + }; + + /** + * 获取图表名称。 + * + * @param chartDataSet 图表数据集对象 + */ + util.dataSetName = function(chartDataSet) + { + var dataSet = (chartDataSet.dataSet || chartDataSet); + var name = (dataSet ? dataSet.name : ""); + + return (name ? name : ""); + }; + /** * 获取指定标记的第一个数据集属性，没有则返回null。 * @@ -145,12 +176,12 @@ } } - for(var i=0; i 0) - { - for(var i=0; i< property.length; i++) - re[i] = (re[i].length > 0 ? re[i][0] : null); + if(!dataSetResults || !dataSetResults.length || dataSetResults.length < index) + return {}; - return re; - } - else - return (re.length > 0 ? re[0] : null); + return dataSetResults[index]; }; /** - * 获取结果数据属性值数组。 + * 获取数据集结果指定属性、指定行的单元格值。 * * @param result 数据集结果对象、对象数组 - * @param property 属性对象、属性名、属性对象数组、属性名数组 - * @param count 获取结果数据的最多行数，可选，默认为全部 + * @param property 数据集属性对象、属性名 + * @param row 行索引，以0开始，默认为0 */ - util.dataPropertyValues = function(result, property, count) + util.resultCell = function(result, property, row) + { + if(row == null) + row = 0; + + var re = this.resultRowArrays(result, property, row+1); + + return (re.length > row ? re[row] : undefined); + }; + + /** + * 将数据集结果的行对象按照指定properties顺序转换为行值数组。 + * + * @param result 数据集结果对象、对象数组 + * @param properties 数据集属性对象数组、属性名数组、属性对象、属性名 + * @param count 获取的最多行数，可选，默认为全部 + * @return properties为数组时：[[..., ...], ...]；properties非数组时：[..., ...] + */ + util.resultRowArrays = function(result, properties, count) { var re = []; - if(property == null) + if(properties == null) return re; var datas = (result.length != null ? result : (result.datas || [])); + var getCount = datas.length; if(count != null && count < getCount) getCount = count; - if(property.length > 0) + if(properties.length > 0) { - for(var i=0; i 0) + { + for(var i=0; i