@zgfe/business-lib 1.1.67-beta.6 → 1.1.67-beta.8

package/es/chart/demo/data/data.d.ts

@@ -1,5 +1,5 @@
 declare const _default: {
-    x_axis: string[];
+    xAxis: string[];
     series: {
         names: string[];
         values: number[];
@@ -7,7 +7,7 @@ declare const _default: {
 };
 export default _default;
 export declare const barData: {
-    x_axis: string[];
+    xAxis: string[];
     series: {
         names: string[];
         values: number[];

package/es/chart/demo/data/data.js

@@ -1,5 +1,5 @@
 export default {
-  x_axis: ['2022-03-31', '2022-04-01', '2022-04-02', '2022-04-03', '2022-04-04', '2022-04-05', '2022-04-06', '2022-04-07', '2022-04-08', '2022-04-09', '2022-04-10', '2022-04-11', '2022-04-12', '2022-04-13'],
+  xAxis: ['2022-03-31', '2022-04-01', '2022-04-02', '2022-04-03', '2022-04-04', '2022-04-05', '2022-04-06', '2022-04-07', '2022-04-08', '2022-04-09', '2022-04-10', '2022-04-11', '2022-04-12', '2022-04-13'],
   series: [{
     names: ['付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功'],
     values: [26, 27, 43, 44, 40, 34, 33, 33, 34, 24, 30, 31, 31, 38]
@@ -27,7 +27,7 @@ export default {
   }]
 };
 export var barData = {
-  x_axis: ['2022-08-23|2022-08-30'],
+  xAxis: ['2022-08-23|2022-08-30'],
   series: [{
     names: ['北京市', '所有用户', '查看商品'],
     values: [1560]

package/es/chart/demo/data/data2.d.ts

@@ -1,5 +1,5 @@
 declare const _default: {
-    x_axis: string[];
+    xAxis: string[];
     series: {
         names: string[];
         values: number[];

package/es/chart/demo/data/data2.js

@@ -1,5 +1,5 @@
 export default {
-  x_axis: ['2022-03-31', '2022-04-01', '2022-04-02', '2022-04-03', '2022-04-04', '2022-04-05', '2022-04-06', '2022-04-07', '2022-04-08', '2022-04-09', '2022-04-10', '2022-04-11', '2022-04-12', '2022-04-13'],
+  xAxis: ['2022-03-31', '2022-04-01', '2022-04-02', '2022-04-03', '2022-04-04', '2022-04-05', '2022-04-06', '2022-04-07', '2022-04-08', '2022-04-09', '2022-04-10', '2022-04-11', '2022-04-12', '2022-04-13'],
   series: [{
     names: ['付款成功'],
     values: [26, 27, 43, 44, 40, 34, 33, 33, 34, 24, 30, 31, 31, 38]

package/es/chart/demo/data/data3.d.ts

@@ -1,5 +1,5 @@
 declare const _default: {
-    x_axis: string[];
+    xAxis: string[];
     series: {
         names: string[];
         values: number[];

package/es/chart/demo/data/data3.js

@@ -1,5 +1,5 @@
 export default {
-  x_axis: ['2022-08-25|2022-09-01'],
+  xAxis: ['2022-08-25|2022-09-01'],
   series: [{
     names: ['北京市', '所有用户', '加购商品'],
     values: [1370]

package/es/chart/types.d.ts

@@ -3,6 +3,7 @@ export interface ChartItmProps {
     names: Array<string>;
     values: Array<number>;
     userGroupCompareData?: object;
+    [key: string]: any;
 }
 export interface ItemDataProps {
     data: Array<object>;
@@ -19,7 +20,8 @@ export interface ProvinceMapDataProps {
 }
 export declare namespace ChartTypes {
     interface Value {
-        x_axis: Array<string>;
+        xAxis: Array<string>;
+        x_axis?: Array<string>;
         series: Array<ChartItmProps>;
     }
     interface Props {

package/es/chart/util/chartOptionConfig.js

@@ -127,8 +127,8 @@ export var getChartOption = function getChartOption(chartType, data) {
     legend = _objectSpread({}, legendConfig),
     grid = _objectSpread({}, gridConfig),
     seriesItem = _objectSpread({}, seriesConfig);
-  if (data.x_axis) {
-    xAxis.data = data.x_axis;
+  if (data.xAxis) {
+    xAxis.data = data.xAxis;
   }
   xAxis.boundaryGap = chartType === 'bar';
   xAxis.axisLabel = xAxis.axisLabel || {

package/es/chart/util/formatData.d.ts

@@ -7,6 +7,6 @@ export declare const formatPieData: (data: ChartTypes.Value, showAll?: boolean,
     };
 }[];
 export declare const formatChartData: (data: ChartTypes.Value, showAll?: boolean, showList?: Array<any>, reverseXAxis?: boolean, color?: string[]) => {
-    x_axis: string[];
+    xAxis: string[];
     series: any;
 };

package/es/chart/util/formatData.js

@@ -30,16 +30,17 @@ export var formatPieData = function formatPieData(data, showAll, showList, showO
 };
 export var formatChartData = function formatChartData(data, showAll, showList, reverseXAxis, color) {
   var showMap = getShowMap(showList);
-  var x_axis = reverseXAxis && data.series.length ? [] : data.x_axis;
+  var xAxisData = data.xAxis || data.x_axis;
+  var xAxis = reverseXAxis && data.series.length ? [] : xAxisData;
   var sData = [];
   var colorData = color || chartColors;
   data.series.forEach(function (seriesItem) {
     var name = seriesItem.names.join(',');
     if (showAll || showList && showMap[name] || !showList && sData.length < 10) {
       if (reverseXAxis) {
-        x_axis.push(name);
+        xAxis.push(name);
         sData.push({
-          name: data.x_axis[0],
+          name: xAxisData[0],
           value: seriesItem.values[0],
           label: name,
           itemStyle: {
@@ -57,7 +58,7 @@ export var formatChartData = function formatChartData(data, showAll, showList, r
     }
   });
   return {
-    x_axis: x_axis,
+    xAxis: xAxis,
     series: sData
   };
 };

package/es/chart/util/mapUtil.js

@@ -31,7 +31,7 @@ var citySeries = function citySeries(data) {
   };
   var provinceMapData = {};
   var mapStore = formatMapData(data, 'city');
-  mapStore.x_axis.forEach(function (xItem) {
+  (mapStore.xAxis || mapStore.x_axis).forEach(function (xItem) {
     scatterSeries.name = xItem;
     mapStore.series.forEach(function (cityItem) {
       var cityName = cityItem.name;
@@ -68,7 +68,7 @@ var citySeries = function citySeries(data) {
 var provinceSeries = function provinceSeries(data) {
   var series = [];
   var mapStore = formatMapData(data, 'province');
-  mapStore.x_axis.forEach(function (xItem) {
+  (mapStore.xAxis || mapStore.x_axis).forEach(function (xItem) {
     var item = {
       name: xItem,
       type: 'map',
@@ -115,7 +115,7 @@ var maxMinValue = function maxMinValue(series) {
 };
 var formatMapData = function formatMapData(seriesData, type) {
   var store = {
-    x_axis: seriesData.x_axis,
+    xAxis: seriesData.xAxis || seriesData.x_axis,
     series: []
   };
   var areaObjMap = {};

package/es/formulaTarget/demo/group.js

@@ -44,6 +44,7 @@ export default (function () {
     }
     callback({
       type: 'custom',
+      alias: name,
       eventName: name
     });
   };

package/es/formulaTarget/demo/index.js

@@ -17,6 +17,7 @@ export default (function () {
   }, /*#__PURE__*/React.createElement(BizFormulaTarget, {
     value: {
       type: 'custom',
+      alias: '自定义指标',
       eventName: '自定义指标'
     },
     onChange: onChange,

package/es/formulaTarget/index.js

@@ -20,6 +20,7 @@ import _ from 'lodash';
 var classPrefix = 'biz-formula-target';
 var defaultValue = {
   type: 'custom',
+  alias: '自定义指标',
   eventName: '自定义指标'
 };
 var BizFormulaTarget = function BizFormulaTarget(props) {
@@ -96,9 +97,7 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
       setOpen(true);
       return;
     }
-    props.onChange && props.onChange(_objectSpread(_objectSpread({}, condition), {}, {
-      alias: condition.eventName
-    }));
+    props.onChange && props.onChange(condition);
   };
   var onDelete = function onDelete(e) {
     e.stopPropagation();
@@ -130,6 +129,7 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
   var onChange = function onChange(customCondition, formula, resultFormat) {
     setCondition(function (value) {
       return _objectSpread(_objectSpread({}, value), {}, {
+        alias: value.eventName,
         customCondition: customCondition,
         formula: formula,
         resultFormat: resultFormat

package/es/layout/columnLayout/demo/data.d.ts

@@ -1,5 +1,5 @@
 declare const _default: {
-    x_axis: string[];
+    xAxis: string[];
     series: {
         names: string[];
         values: number[];

package/es/layout/columnLayout/demo/data.js

@@ -9,7 +9,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 import { util } from '../../..';
 export default {
-  x_axis: ['2022-03-31', '2022-04-01', '2022-04-02', '2022-04-03', '2022-04-04', '2022-04-05', '2022-04-06', '2022-04-07', '2022-04-08', '2022-04-09', '2022-04-10', '2022-04-11', '2022-04-12', '2022-04-13'],
+  xAxis: ['2022-03-31', '2022-04-01', '2022-04-02', '2022-04-03', '2022-04-04', '2022-04-05', '2022-04-06', '2022-04-07', '2022-04-08', '2022-04-09', '2022-04-10', '2022-04-11', '2022-04-12', '2022-04-13'],
   series: [{
     names: ['付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功付款成功'],
     values: [26, 27, 43, 44, 40, 34, 33, 33, 34, 24, 30, 31, 31, 38]

package/es/layout/columnLayout/demo/index.js

@@ -19,7 +19,7 @@ export default (function () {
     setTableData = _useState4[1];
   var formRef = useRef(null);
   useEffect(function () {
-    setColumn(getColumn(chartData.x_axis));
+    setColumn(getColumn(chartData.xAxis));
     setTableData(formateTableData(chartData.series));
   }, []);
   var onFinish = function onFinish(values) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.67-beta.6",
+  "version": "1.1.67-beta.8",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "ddc4e5fd47df814c4b228d766969fdfb4433d201"
+  "gitHead": "69f43c91e600c8c965e1f83da23b9e3d96e4b490"
 }