@zgfe/modules-event 1.0.29-zhongyuan.23 → 1.0.29-zhongyuan.25

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.
Files changed (2) hide show
  1. package/es/modules/chart/index.js +5 -1
  2. package/package.json +2 -2
package/es/modules/chart/index.js CHANGED
@@ -189,7 +189,11 @@ var EventChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
189
189
  xLabel = moment(array[0]).format('MM-DD') + '~' + moment(array[1]).format('MM-DD');
190
190
  } else {
191
191
  var _props$params, _props$params$time, _props$params2, _props$params2$time;
192
- xLabel = moment(array[0]).isValid() ? (props === null || props === void 0 ? void 0 : (_props$params = props.params) === null || _props$params === void 0 ? void 0 : (_props$params$time = _props$params.time) === null || _props$params$time === void 0 ? void 0 : _props$params$time.unit) == 'hour' || (props === null || props === void 0 ? void 0 : (_props$params2 = props.params) === null || _props$params2 === void 0 ? void 0 : (_props$params2$time = _props$params2.time) === null || _props$params2$time === void 0 ? void 0 : _props$params2$time.unit) == 'minute' ? moment(array[0]).format('MM-DD hh') : moment(array[0]).format('MM-DD') : array[0];
192
+ if ((props === null || props === void 0 ? void 0 : (_props$params = props.params) === null || _props$params === void 0 ? void 0 : (_props$params$time = _props$params.time) === null || _props$params$time === void 0 ? void 0 : _props$params$time.unit) == 'hour') {
193
+ xLabel = moment(array[0]).isValid() ? moment(array[0]).format('MM-DD HH') : array[0];
194
+ } else if ((props === null || props === void 0 ? void 0 : (_props$params2 = props.params) === null || _props$params2 === void 0 ? void 0 : (_props$params2$time = _props$params2.time) === null || _props$params2$time === void 0 ? void 0 : _props$params2$time.unit) == 'minute') {
195
+ xLabel = moment(array[0]).isValid() ? moment(array[0]).format('MM-DD HH:mm') : array[0];
196
+ } else xLabel = moment(array[0]).isValid() ? moment(array[0]).format('MM-DD') : array[0];
193
197
  }
194
198
  var series = [];
195
199
  var seriesMap = {};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zgfe/modules-event",
3
- "version": "1.0.29-zhongyuan.23",
3
+ "version": "1.0.29-zhongyuan.25",
4
4
  "module": "es/index.js",
5
5
  "typings": "es/index.d.ts",
6
6
  "private": false,
@@ -54,7 +54,7 @@
54
54
  "react": "^16.12.0 || ^17.0.0",
55
55
  "yorkie": "^2.0.0"
56
56
  },
57
- "gitHead": "64cee3709b249ed1fb17d95d3194c3ade5240465",
57
+ "gitHead": "6ceab13dbbc5574ea49e0027329d5f173ab9045b",
58
58
  "gitHooks": {
59
59
  "pre-commit": "lint-staged"
60
60
  }