@zgfe/business-lib 1.2.9-session.0 → 1.2.10-session.0

package/es/chart/util/chartOptionConfig.js

@@ -146,10 +146,9 @@ export var getChartOption = function getChartOption(chartType, data) {
   if (yAxisFormatter) {
     yAxis.axisLabel.formatter = yAxisFormatter;
   } else {
-    yAxis.axisLabel.formatter = yAxisFormatterDefault;
-  }
-  if (unit) {
-    yAxis.name = unit;
+    yAxis.axisLabel.formatter = function (value) {
+      return yAxisFormatterDefault(value, unit);
+    };
   }
   if (chartType === 'line_bar') {
     yAxis.alignTicks = true;

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

@@ -1,7 +1,7 @@
 declare const tooltipFormatterDefault: (params: any, resultFormatMap?: {
     [key: string]: string;
 } | undefined, unit?: string) => string;
-declare const yAxisFormatterDefault: (value: number) => string;
+declare const yAxisFormatterDefault: (value: number, unit?: string) => string;
 declare const xAxisFormatterDefault: (value: string) => string;
 declare const mapTooltipFormatter: (params: any) => string | undefined;
 declare const legendFormatterDefault: (label: string) => string;

package/es/chart/util/formatOption.js

@@ -25,6 +25,8 @@ var tooltipFormatterDefault = function tooltipFormatterDefault(params, resultFor
       lineLabel += '%';
     } else if (resultFormatMap && resultFormatMap[item.seriesName] && /percent/.test(resultFormatMap[item.seriesName])) {
       lineLabel = util.toThousands(lineLabel) + '%';
+    } else if (unit && unit === 'time') {
+      lineLabel = util.timeFormat(lineLabel, 'hhhmmmsss', 1);
     } else {
       lineLabel = util.toThousands(lineLabel) + (unit || '');
     }
@@ -39,8 +41,12 @@ var tooltipFormatterDefault = function tooltipFormatterDefault(params, resultFor
   });
   return htmlArray.join('');
 };
-var yAxisFormatterDefault = function yAxisFormatterDefault(value) {
-  if (parseFloat(String(value)) >= 1000) {
+var yAxisFormatterDefault = function yAxisFormatterDefault(value, unit) {
+  if (unit && unit === '%') {
+    return value + '%';
+  } else if (unit && unit === 'time') {
+    return util.timeFormat(value, 'hhhmmmsss', 1);
+  } else if (parseFloat(String(value)) >= 1000) {
     return util.toThousands(parseFloat((value / 1000).toFixed(1))) + 'k';
   } else {
     return String(value);

package/es/datePicker/index.js

@@ -72,15 +72,14 @@ var BizDatePicker = function BizDatePicker(_ref) {
       return item.value === initValue.unit;
     }) : list[0];
     setCurrentType(currentType);
-    if ((initValue === null || initValue === void 0 ? void 0 : initValue.begin) && (initValue === null || initValue === void 0 ? void 0 : initValue.end)) {
+    if (initValue === null || initValue === void 0 ? void 0 : initValue.relative) {
+      setRelative(initValue.relative);
+    } else if ((initValue === null || initValue === void 0 ? void 0 : initValue.begin) && (initValue === null || initValue === void 0 ? void 0 : initValue.end)) {
       setDateRange({
         begin: initValue.begin,
         end: initValue.end
       });
     }
-    if (initValue === null || initValue === void 0 ? void 0 : initValue.relative) {
-      setRelative(initValue.relative);
-    }
     setReady(true);
   }
   useEffect(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.2.9-session.0",
+  "version": "1.2.10-session.0",
   "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": "e03c8aeee34de195821208835f513859f9616b8b",
+  "gitHead": "6d56b63269006a28fcc912282bd0d6b06a3f16a2",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }