From f39e2530a26904ea1bedf7a795651c7103810fe8 Mon Sep 17 00:00:00 2001 From: datagear Date: Sat, 11 Apr 2020 20:39:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=86=85=E7=BD=AE=E7=83=AD?= =?UTF-8?q?=E5=8A=9B=E5=9B=BE=E5=9B=BE=E8=A1=A8=E6=8F=92=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org.datagear.chart.heatmap.zip | Bin 0 -> 6369 bytes .../static/script/datagear-chartSupport.js | 138 ++++++++++++++++++ 2 files changed, 138 insertions(+) create mode 100644 datagear-web/src/main/resources/org/datagear/web/builtInHtmlChartPlugins/org.datagear.chart.heatmap.zip diff --git a/datagear-web/src/main/resources/org/datagear/web/builtInHtmlChartPlugins/org.datagear.chart.heatmap.zip b/datagear-web/src/main/resources/org/datagear/web/builtInHtmlChartPlugins/org.datagear.chart.heatmap.zip new file mode 100644 index 0000000000000000000000000000000000000000..391a73ded22bc9a7856966cc29e11f2f527e56fd GIT binary patch literal 6369 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 literal 0 HcmV?d00001 diff --git a/datagear-web/src/main/resources/org/datagear/web/webapp/static/script/datagear-chartSupport.js b/datagear-web/src/main/resources/org/datagear/web/webapp/static/script/datagear-chartSupport.js index c5fc9e49..01ded03b 100644 --- a/datagear-web/src/main/resources/org/datagear/web/webapp/static/script/datagear-chartSupport.js +++ b/datagear-web/src/main/resources/org/datagear/web/webapp/static/script/datagear-chartSupport.js @@ -62,6 +62,28 @@ return (dataType == "INTEGER" || dataType == "DECIMAL"); }; + /** + * 为源数组追加不重复的元素。 + * + * @param sourceArray + * @param append 追加元素、数组 + */ + chartSupport.appendDistinct = function(sourceArray, append) + { + if(append == undefined) + return sourceArray; + + append = ($.isArray(append) ? append : [append]); + + for(var i=0; i