@zgfe/business-lib 1.2.29 → 1.2.31

package/es/attributeSelector/demo/index.js

@@ -35,7 +35,7 @@ export default (function () {
       eventEnvList: store.envPropList
     }
   }, /*#__PURE__*/React.createElement(BizAttributeSelector, {
-    isNumber: true,
+    isStrNum: true,
     enableEventProp: true,
     enableUserProp: true,
     eventIdList: [24143016],

package/es/attributeSelector/index.js

@@ -24,7 +24,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
     theme = props.theme,
     extra = props.extra,
     isNumber = props.isNumber,
-    overlayClassName = props.overlayClassName;
+    overlayClassName = props.overlayClassName,
+    isStrNum = props.isStrNum;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     currentAttr = _useState2[0],
@@ -122,7 +123,8 @@ var BizAttributeSelector = function BizAttributeSelector(props) {
       }, props), {}, {
         value: currentAttr,
         onChange: onChange,
-        isNumber: isNumber
+        isNumber: isNumber,
+        isStrNum: isStrNum
       }));
     },
     trigger: ['click'],

package/es/attributeSelector/listPanel.js

@@ -24,7 +24,8 @@ var AttrListPanel = function AttrListPanel(props) {
     eventIdList = props.eventIdList,
     funnelEventIdList = props.funnelEventIdList,
     extra = props.extra,
-    isNumber = props.isNumber;
+    isNumber = props.isNumber,
+    isStrNum = props.isStrNum;
   var _useState = useState(''),
     _useState2 = _slicedToArray(_useState, 2),
     searchValue = _useState2[0],
@@ -158,7 +159,7 @@ var AttrListPanel = function AttrListPanel(props) {
             anchor: hasAnchor ? String(Math.random()) : anchor.event,
             key: "event-".concat(event.id),
             children: event.attrList.slice().filter(function (item) {
-              return isNumber ? item.type === 2 : true;
+              return isStrNum ? item.type === 2 || item.type === 1 : isNumber ? item.type === 2 : true;
             })
           };
           list.push(group);

package/es/attributeSelector/types.d.ts

@@ -97,6 +97,7 @@ export declare namespace AttributeSelect {
         status?: string;
         extra?: AttributeExtra[];
         isNumber?: Boolean;
+        isStrNum?: Boolean;
     }
     interface AttributeExtra {
         type: string;

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

@@ -0,0 +1,19 @@
+declare const _default: {
+    series: ({
+        type: string;
+        names: string[];
+        values: number[];
+        yAxisIndex: number;
+        duration?: undefined;
+        index?: undefined;
+    } | {
+        duration: never[];
+        type: string;
+        index: string;
+        names: string[];
+        values: number[];
+        yAxisIndex: number;
+    })[];
+    xAxis: string[];
+};
+export default _default;

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

@@ -0,0 +1,51 @@
+export default {
+  series: [{
+    type: 'bar',
+    names: ['histogramFirstUv1'],
+    values: [12, 23, 34, 45, 56],
+    yAxisIndex: 0
+  }, {
+    duration: [],
+    type: 'bar',
+    index: '人数',
+    names: ['histogramSecondUv2'],
+    values: [21, 32, 43, 54, 65],
+    yAxisIndex: 0
+  }, {
+    duration: [],
+    type: 'bar',
+    index: '人数',
+    names: ['lineChartFirstUv3'],
+    values: [1123, 3123, 1233, 2231, 4322],
+    yAxisIndex: 1
+  }, {
+    duration: [],
+    type: 'bar',
+    index: '人数',
+    names: ['lineChartSecondUv4'],
+    values: [2133, 1235, 4321, 2234, 2323],
+    yAxisIndex: 1
+  }, {
+    duration: [],
+    type: 'bar',
+    index: '人数',
+    names: ['lineChartSecondUv5'],
+    values: [3242, 2342, 4234, 2123, 3242],
+    yAxisIndex: 1
+  }, {
+    duration: [],
+    type: 'bar',
+    index: '人数',
+    names: ['lineChartSecondUv6'],
+    values: [2343, 3242, 3434, 4352, 2344],
+    yAxisIndex: 1
+  }, {
+    duration: [],
+    type: 'line',
+    index: '额度',
+    names: ['lineChartFirstNv'],
+    values: [0.1, 0.2, 0.3, 0.4, 0.5],
+    yAxisIndex: 2
+  }],
+  xAxis: ['2023-10-25 00:00:00', '2023-10-25 01:00:00', '2023-10-25 02:00:00', '2023-10-25 03:00:00', '2023-10-25 04:00:00']
+};

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

@@ -0,0 +1,3 @@
+import React from 'react';
+declare const _default: () => React.JSX.Element;
+export default _default;

package/es/chart/demo/muit_y.js

@@ -0,0 +1,18 @@
+import React from 'react';
+import { BizChart } from '@zgfe/business-lib';
+import data from './data/data6';
+export default (function () {
+  return /*#__PURE__*/React.createElement(BizChart, {
+    data: data,
+    type: "muit_y",
+    showAll: false,
+    legendPosition: "bottom",
+    muit_yAxis: [{
+      name: '单位：张'
+    }, {
+      name: '单位：百万'
+    }, {
+      show: false
+    }]
+  });
+});

package/es/chart/index.js

@@ -41,7 +41,8 @@ var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     legendOrient = props.legendOrient,
     autoHeight = props.autoHeight,
     isHideLegend = props.isHideLegend,
-    tooltipTrigger = props.tooltipTrigger;
+    tooltipTrigger = props.tooltipTrigger,
+    muit_yAxis = props.muit_yAxis;
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     chartOption = _useState2[0],
@@ -109,10 +110,10 @@ var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     if (type === 'pie') {
       var rData = formatPieData(data, showAll, showList, props.showOther);
       eOption = getPieOption(rData, legendPosition, legendOrient, props.showLabel, props.radius, props.center, tooltipFormatter);
-    } else if (type === 'line' || type === 'bar' || type === 'line_bar') {
-      var _rData = formatChartData(data, showAll, showList, reverseXAxis, colors, type === 'line_bar');
-      eOption = getChartOption(type, _rData, legendPosition, legendOrient, valueUnit, xRotate, yRotate, tooltipFormatter, xAxisFormatter, yAxisFormatter, legendFormatter, reverseXAxis, seriesName, isHideLegend, tooltipTrigger);
-      if (type === 'line_bar') {
+    } else if (type === 'line' || type === 'bar' || type === 'line_bar' || type === 'muit_y') {
+      var _rData = formatChartData(data, showAll, showList, reverseXAxis, colors, type === 'line_bar' || type === 'muit_y');
+      eOption = getChartOption(type, _rData, legendPosition, legendOrient, valueUnit, xRotate, yRotate, tooltipFormatter, xAxisFormatter, yAxisFormatter, legendFormatter, reverseXAxis, seriesName, isHideLegend, tooltipTrigger, muit_yAxis);
+      if (type === 'line_bar' || type === 'muit_y') {
         eOption.grid.right = '1%';
         eOption.grid.left = '1%';
       }

package/es/chart/types.d.ts

@@ -28,7 +28,7 @@ export declare namespace ChartTypes {
         };
     }
     interface Props {
-        type?: 'bar' | 'pie' | 'line' | 'map' | 'line_bar';
+        type?: 'bar' | 'pie' | 'line' | 'map' | 'line_bar' | 'muit_y';
         data?: Value;
         option?: EChartsOption;
         isCity?: boolean;
@@ -54,5 +54,6 @@ export declare namespace ChartTypes {
         autoHeight?: boolean;
         isHideLegend?: boolean;
         tooltipTrigger?: string;
+        muit_yAxis?: {}[];
     }
 }

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

@@ -10,7 +10,9 @@ export declare const gridConfig: GridOption;
 export declare const xAxisConfig: XAXisOption;
 export declare const yAxisConfig: YAXisOption;
 export declare const tooltipConfig: TooltipComponentOption;
-export declare const getChartOption: (chartType: string, data: ChartTypes.Value, legendPosition?: 'top' | 'bottom' | 'middle', legendOrient?: 'horizontal' | 'vertical', unit?: string, xRotate?: number, yRotate?: number, tooltipFormatter?: ((value: any) => string) | undefined, xAxisFormatter?: ((value: any) => string) | undefined, yAxisFormatter?: ((value: any) => string) | undefined, legendFormatter?: ((value: any) => string) | undefined, reverseXAxis?: boolean, seriesName?: string, isHideLegend?: boolean, tooltipTrigger?: string) => EChartsOption;
+export declare const getChartOption: (chartType: string, data: ChartTypes.Value, legendPosition?: 'top' | 'bottom' | 'middle', legendOrient?: 'horizontal' | 'vertical', unit?: string, xRotate?: number, yRotate?: number, tooltipFormatter?: ((value: any) => string) | undefined, xAxisFormatter?: ((value: any) => string) | undefined, yAxisFormatter?: ((value: any) => string) | undefined, legendFormatter?: ((value: any) => string) | undefined, reverseXAxis?: boolean, seriesName?: string, isHideLegend?: boolean, tooltipTrigger?: string, muit_yAxis?: {
+    name?: string;
+}[]) => EChartsOption;
 export declare const getPieOption: (seriesData?: object[], legendPosition?: 'top' | 'bottom' | 'middle', legendOrient?: 'horizontal' | 'vertical', showLabel?: boolean, radius?: string | number | Array<string | number>, center?: Array<string | number>, tooltipFormatter?: ((value: any) => string) | undefined, legendFormatter?: ((value: any) => string) | undefined) => EChartsOption;
 export declare const getMapOption: (seriesData: object[] | undefined, maxMinValue: {
     min: number;

package/es/chart/util/chartOptionConfig.js

@@ -124,6 +124,7 @@ export var getChartOption = function getChartOption(chartType, data) {
   var seriesName = arguments.length > 12 ? arguments[12] : undefined;
   var isHideLegend = arguments.length > 13 ? arguments[13] : undefined;
   var tooltipTrigger = arguments.length > 14 ? arguments[14] : undefined;
+  var muit_yAxis = arguments.length > 15 ? arguments[15] : undefined;
   var xAxis = JSON.parse(JSON.stringify(xAxisConfig)),
     tooltip = JSON.parse(JSON.stringify(tooltipConfig)),
     yAxis = _objectSpread({}, yAxisConfig),
@@ -136,7 +137,7 @@ export var getChartOption = function getChartOption(chartType, data) {
   if (data.xAxis) {
     xAxis.data = data.xAxis;
   }
-  xAxis.boundaryGap = chartType === 'bar' || chartType === 'line_bar';
+  xAxis.boundaryGap = chartType === 'bar' || chartType === 'line_bar' || chartType === 'muit_y';
   xAxis.axisLabel = xAxis.axisLabel || {
     rotate: 0
   };
@@ -155,7 +156,7 @@ export var getChartOption = function getChartOption(chartType, data) {
       return yAxisFormatterDefault(value, unit);
     };
   }
-  if (chartType === 'line_bar') {
+  if (chartType === 'line_bar' || chartType === 'muit_y') {
     yAxis.alignTicks = true;
     yAxis.minInterval = 1;
   }
@@ -165,24 +166,30 @@ export var getChartOption = function getChartOption(chartType, data) {
   }
   if (!reverseXAxis) {
     series = data.series.map(function (item) {
-      return _objectSpread(_objectSpread(_objectSpread({}, item), seriesItem), {}, {
-        type: chartType === 'line_bar' ? item.type : chartType
+      console.log('item', item);
+      return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, item), seriesItem), {}, {
+        type: chartType === 'line_bar' || chartType === 'muit_y' ? item.type : chartType
       }, chartType === 'line_bar' ? {
         yAxisIndex: item.type === 'line' ? 1 : 0
+      } : {}), chartType === 'muit_y' ? {
+        yAxisIndex: item.yAxisIndex
       } : {});
     });
   } else {
-    series = [_objectSpread(_objectSpread({
+    console.log('seriesItem', seriesItem);
+    series = [_objectSpread(_objectSpread(_objectSpread({
       name: seriesName || '',
       data: data.series
     }, seriesItem), {}, {
-      type: chartType === 'line_bar' ? seriesItem.type : chartType
+      type: chartType === 'line_bar' || chartType === 'muit_y' ? seriesItem.type : chartType
     }, chartType === 'line_bar' ? {
       yAxisIndex: seriesItem.type === 'line' ? 1 : 0
+    } : {}), chartType === 'muit_y' ? {
+      yAxisIndex: seriesItem.yAxisIndex
     } : {})];
   }
   tooltip.axisPointer = tooltip.axisPointer || {};
-  tooltip.axisPointer.type = chartType === 'bar' || chartType === 'line_bar' ? 'shadow' : 'line';
+  tooltip.axisPointer.type = chartType === 'bar' || chartType === 'line_bar' || chartType === 'muit_y' ? 'shadow' : 'line';
   tooltip.formatter = function (params) {
     return tooltipFormatter ? tooltipFormatter(params) : tooltip.trigger === 'item' ? tooltipFormatterItemDefault(params, data.resultFormatMap, unit) : tooltipFormatterDefault(params, data.resultFormatMap, unit);
   };
@@ -202,11 +209,20 @@ export var getChartOption = function getChartOption(chartType, data) {
     legend.width = 50;
     grid.left = '10%';
   }
-  if (chartType === 'line') {
+  if (chartType === 'line' || chartType === 'muit_y') {
     legend.icon = 'circle';
   }
   legend.formatter = legendFormatter ? legendFormatter : legendFormatterDefault;
   var dealyAxis = chartType === 'line_bar' ? [yAxis, yAxis] : yAxis;
+  console.log('yAxis', yAxis, grid);
+  if (chartType === 'muit_y' && muit_yAxis) {
+    dealyAxis = muit_yAxis === null || muit_yAxis === void 0 ? void 0 : muit_yAxis.map(function (item) {
+      if (item && item.name) {
+        grid.top = 45;
+      }
+      return _objectSpread(_objectSpread({}, yAxis), item);
+    });
+  }
   return _objectSpread(_objectSpread({}, baseConfig), {}, {
     legend: legend,
     xAxis: xAxis,

package/es/chart/util/formatData.js

@@ -70,7 +70,8 @@ export var formatChartData = function formatChartData(data, showAll, showList, r
         }, seriesItem.stack ? {
           stack: seriesItem.stack
         } : {}), {}, {
-          type: isUseSelf ? seriesItem.type : undefined
+          type: isUseSelf ? seriesItem.type : undefined,
+          yAxisIndex: isUseSelf ? seriesItem.yAxisIndex : undefined
         }));
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.29",
+    "version": "1.2.31",
     "module": "es/index.js",
     "typings": "es/index.d.ts",
     "files": [
@@ -55,7 +55,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "06746687e6ba582c5b90b5157ef1fd336e394019",
+    "gitHead": "633baf122e8b6be641cc5d49360ba49845fbd7aa",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }