@datarailsshared/dr_renderer 1.2.125 → 1.2.126
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.circleci/config.yml +11 -1
- package/package.json +1 -1
- package/src/highcharts_renderer.js +11 -3
package/.circleci/config.yml
CHANGED
|
@@ -29,7 +29,17 @@ jobs:
|
|
|
29
29
|
- run:
|
|
30
30
|
name: Publish package
|
|
31
31
|
command: npm publish . --access=public
|
|
32
|
-
|
|
32
|
+
- run:
|
|
33
|
+
name: prepare git tag
|
|
34
|
+
command: |
|
|
35
|
+
VERSION="1.2.$CIRCLE_BUILD_NUM"
|
|
36
|
+
git config --global user.email noreplay@circleci.com
|
|
37
|
+
git config --global user.name circleci
|
|
38
|
+
git config --global -l
|
|
39
|
+
git tag -a "$CIRCLE_BRANCH/$VERSION" -m "circleci build"
|
|
40
|
+
ssh -o "StrictHostKeyChecking no" -T git@bitbucket.org
|
|
41
|
+
git push --tags origin
|
|
42
|
+
echo 555
|
|
33
43
|
workflows:
|
|
34
44
|
version: 2
|
|
35
45
|
npm-publish:
|
package/package.json
CHANGED
|
@@ -7895,13 +7895,21 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
|
|
|
7895
7895
|
}
|
|
7896
7896
|
|
|
7897
7897
|
// another code for charts and tables
|
|
7898
|
+
let default_show = lodash.get(widget_obj.options, 'chartOptions.default_show.value', 'chart');
|
|
7898
7899
|
|
|
7899
7900
|
let subopts = null;
|
|
7901
|
+
let is_table = false;
|
|
7900
7902
|
|
|
7901
|
-
|
|
7902
|
-
|
|
7903
|
+
if (default_show == "table"){
|
|
7904
|
+
subopts = highchartsRenderer.getOptionsForTable(widget_obj, pivot);
|
|
7905
|
+
is_table = true;
|
|
7906
|
+
}
|
|
7907
|
+
else{
|
|
7908
|
+
subopts = highchartsRenderer.getSupOptionsForPivot(widget_obj, pivot, true);
|
|
7909
|
+
subopts.onlyOptions = true;
|
|
7910
|
+
}
|
|
7903
7911
|
|
|
7904
|
-
let hc_options = highchartsRenderer.rhPivotView(res, subopts,
|
|
7912
|
+
let hc_options = highchartsRenderer.rhPivotView(res, subopts, is_table);
|
|
7905
7913
|
|
|
7906
7914
|
return hc_options;
|
|
7907
7915
|
}
|