修复分类图表属性面板中"系列值"保存后无法显示的BUG

ureport2-js/src/panel/property/chart/BarChartValueEditor.js

@@ -75,10 +75,12 @@ export default class BarChartValueEditor extends CategoryChartValueEditor{
         this.seriesTextEditor.val(dataset.seriesText);
         this.valuePropertySelect.val(dataset.valueProperty);
         this.aggregateSelect.val(dataset.collectType);
-        if(dataset.seriesType==='text'){
+        if(dataset.seriesType==='property'){
             this.propertySeriesRadio.children('input').attr('checked',true);
+            this.propertySeriesRadio.children('input').trigger('click');
         }else{
             this.textSeriesRadio.children('input').attr('checked',true);
+            this.textSeriesRadio.children('input').trigger('click');
         }
         this.formatEditor.val(dataset.format);
 

ureport2-js/webpack.config.js

@@ -8,7 +8,7 @@ module.exports = {
         preview:'./src/preview.js'
     },
     output: {
-        path: '../ureport2-console/src/main/resources/asserts/js',
+        path: '../ureport2-console/src/main/resources/ureport-asserts/js',
         filename: '[name].bundle.js'
     },
     module: {
@@ -29,6 +29,10 @@ module.exports = {
             {
                 test: /\.(eot|woff|woff2|ttf|svg|png|jpg)$/,
                 loader: 'url-loader?limit=1000000&name=[name]-[hash].[ext]'
+            },
+            {
+                test: /\.json$/,
+                loader: 'json-loader'
             }
         ]
     }

ureport2-js/webpack.config.min.js

@@ -9,7 +9,7 @@ module.exports = {
         preview:'./src/preview.js'
     },
     output: {
-        path: '../ureport2-console/src/main/resources/asserts/js',
+        path: '../ureport2-console/src/main/resources/ureport-asserts/js',
         filename: '[name].bundle.js'
     },
     plugins: [
@@ -46,6 +46,10 @@ module.exports = {
             {
                 test: /\.(eot|woff|woff2|ttf|svg|png|jpg)$/,
                 loader: 'url-loader?limit=1000000&name=[name]-[hash].[ext]'
+            },
+            {
+                test: /\.json$/,
+                loader: 'json-loader'
             }
         ]
     }