@zgfe/business-lib 1.2.10 → 1.2.11-data.1

package/es/assets/styles/resetAntd.less

@@ -194,9 +194,11 @@
     }
   }
 
-  &:hover:not(.ant-picker-disabled),
-  &.ant-picker-focused {
-    border-color: @primary-color!important;
+  &:not(.ant-picker-disabled, .ant-picker-status-error) {
+    &:hover,
+    &.ant-picker-focused {
+      border-color: @primary-color!important;
+    }
   }
 
   .ant-picker-active-bar {

package/es/cycleTime/demo/hour.d.ts

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

package/es/cycleTime/demo/hour.js

@@ -0,0 +1,38 @@
+import React from 'react';
+import { BizCycleTime } from '@zgfe/business-lib';
+import { CycleTimeUnit } from '..';
+export default (function () {
+  var options = [{
+    label: '每小时',
+    value: CycleTimeUnit.hour
+  }, {
+    label: '每日',
+    value: CycleTimeUnit.day
+  }, {
+    label: '每周',
+    value: CycleTimeUnit.week
+  }, {
+    label: '每月',
+    value: CycleTimeUnit.month
+  }];
+  var onChange = function onChange(data) {
+    console.log('change:', data);
+  };
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("p", null, /*#__PURE__*/React.createElement("b", null, "\u9ED8\u8BA4\u503C")), /*#__PURE__*/React.createElement(BizCycleTime, {
+    value: {
+      unit: 3,
+      day: [1, 23, 4],
+      time: '12:00:00'
+    },
+    multiple: true,
+    showHour: true,
+    options: options,
+    onChange: onChange
+  }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, /*#__PURE__*/React.createElement("b", null, "\u65E0\u9ED8\u8BA4\u503C")), /*#__PURE__*/React.createElement(BizCycleTime, {
+    multiple: true,
+    showHour: true,
+    options: options,
+    format: "HH",
+    onChange: onChange
+  }));
+});

package/es/cycleTime/index.d.ts

@@ -1,7 +1,9 @@
 import { SizeType } from 'antd/es/config-provider/SizeContext';
 import React from 'react';
+import { BaseOption } from '../utils/type';
 import './styles/index.less';
 export declare enum CycleTimeUnit {
+    hour = 0,
     day = 1,
     week = 2,
     month = 3
@@ -18,5 +20,8 @@ declare const BizCycleTime: React.FC<{
     onChange?: (val: Value) => void;
     size?: SizeType;
     disable?: boolean;
+    showHour?: boolean;
+    format?: string;
+    options?: BaseOption<CycleTimeUnit>[];
 }>;
 export default BizCycleTime;

package/es/cycleTime/index.js

@@ -12,6 +12,7 @@ import MonthDay from './month';
 import './styles/index.less';
 export var CycleTimeUnit;
 (function (CycleTimeUnit) {
+  CycleTimeUnit[CycleTimeUnit["hour"] = 0] = "hour";
   CycleTimeUnit[CycleTimeUnit["day"] = 1] = "day";
   CycleTimeUnit[CycleTimeUnit["week"] = 2] = "week";
   CycleTimeUnit[CycleTimeUnit["month"] = 3] = "month";
@@ -19,9 +20,11 @@ export var CycleTimeUnit;
 var BizCycleTime = function BizCycleTime(props) {
   var multiple = props.multiple,
     size = props.size,
-    disable = props.disable;
+    disable = props.disable,
+    showHour = props.showHour,
+    options = props.options;
   var classPrefix = 'biz-cycle-time';
-  var unitList = [{
+  var unitList = options || [{
     label: '每日',
     value: CycleTimeUnit.day
   }, {
@@ -59,6 +62,9 @@ var BizCycleTime = function BizCycleTime(props) {
     _useState10 = _slicedToArray(_useState9, 2),
     initing = _useState10[0],
     setIniting = _useState10[1];
+  var _useState11 = useState(props.format || 'hh:mm:ss'),
+    _useState12 = _slicedToArray(_useState11, 1),
+    format = _useState12[0];
   useEffect(function () {
     if (!props.value) {
       setIniting(false);
@@ -85,6 +91,7 @@ var BizCycleTime = function BizCycleTime(props) {
             } else {
               setDay(valList[0]);
             }
+            if (showHour) setTime(props.value.time);
             break;
           case CycleTimeUnit.month:
             setDay(props.value.day.map(function (v) {
@@ -93,6 +100,7 @@ var BizCycleTime = function BizCycleTime(props) {
                 value: v
               };
             }));
+            if (showHour) setTime(props.value.time);
             break;
         }
       }
@@ -111,9 +119,12 @@ var BizCycleTime = function BizCycleTime(props) {
       }) : [day.value],
       time: time
     };
-    if (unit.value === CycleTimeUnit.day) {
+    if (unit.value === CycleTimeUnit.hour) {
       delete res.day;
-    } else {
+      delete res.time;
+    } else if (unit.value === CycleTimeUnit.day) {
+      delete res.day;
+    } else if (!showHour) {
       delete res.time;
     }
     if (props.onChange) props.onChange(res);
@@ -138,15 +149,6 @@ var BizCycleTime = function BizCycleTime(props) {
       setTime(undefined);
       setUnit(v);
     }
-  }), unit.value === CycleTimeUnit.day && /*#__PURE__*/React.createElement(DatePicker.TimePicker, {
-    className: "".concat(classPrefix, "-hour"),
-    size: size,
-    placeholder: props.placeholder,
-    defaultValue: time ? moment(time, 'hh:mm:ss') : undefined,
-    onChange: function onChange(time) {
-      setTime(time === null || time === void 0 ? void 0 : time.format('hh:mm:ss'));
-    },
-    disabled: disable
   }), unit.value === CycleTimeUnit.week && /*#__PURE__*/React.createElement(BizSelect, {
     options: days,
     labelField: "label",
@@ -166,7 +168,17 @@ var BizCycleTime = function BizCycleTime(props) {
     defaultValue: day,
     onChange: setDayList,
     disable: disable
-  }));
+  }), unit.value === CycleTimeUnit.day || unit.value && showHour ? /*#__PURE__*/React.createElement(DatePicker.TimePicker, {
+    className: "".concat(classPrefix, "-hour"),
+    size: size,
+    placeholder: props.placeholder,
+    value: time ? moment(time, format) : undefined,
+    format: format,
+    onChange: function onChange(time) {
+      setTime(time === null || time === void 0 ? void 0 : time.format(format));
+    },
+    disabled: disable
+  }) : null);
 };
 BizCycleTime.defaultProps = {
   multiple: false,

package/es/cycleTime/month.js

@@ -5,10 +5,11 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Dropdown, Tag } from 'antd';
-import React, { useEffect, useState } from 'react';
+import React, { useContext, useEffect, useState } from 'react';
 import { IconFont } from '..';
 import './styles/month.less';
 import _ from 'lodash';
+import { FormItemInputContext } from 'antd/lib/form/context';
 var MonthDay = function MonthDay(props) {
   var classPrefix = 'biz-month-day';
   var disable = props.disable;
@@ -20,6 +21,8 @@ var MonthDay = function MonthDay(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     visible = _useState4[0],
     setVisible = _useState4[1];
+  var _useContext = useContext(FormItemInputContext),
+    contextStatus = _useContext.status;
   var dayList = [];
   for (var i = 1; i < 33; i++) {
     dayList.push({
@@ -90,7 +93,7 @@ var MonthDay = function MonthDay(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-wrapper")
   }, /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-handle ").concat(props.size, " ").concat(!chosenDayList.length ? "holder" : '', " ").concat(disable ? 'disable' : '')
+    className: "".concat(classPrefix, "-handle ").concat(props.size, " ").concat(!chosenDayList.length ? "holder" : '', " ").concat(disable ? 'disable' : '', " ").concat(contextStatus ? "".concat(classPrefix, "-status-").concat(contextStatus) : '')
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-val")
   }, chosenDayList.map(function (item) {

package/es/cycleTime/styles/index.less

@@ -1,6 +1,7 @@
 @import '../../assets//styles/inner.less';
 .biz-cycle-time {
-  display: inline-block;
+  display: flex;
+  gap: 12px;
   &-unit {
     width: 129px;
   }
@@ -15,7 +16,6 @@
   &-day,
   &-hour {
     display: inline-block;
-    margin-right: @margin-xs;
   }
   &-hour {
     width: 220px;

package/es/cycleTime/styles/month.less

@@ -35,6 +35,13 @@
   &-holder {
     color: @input-placeholder-color;
   }
+
+  &-status-error:not(.disable) {
+    border-color: @error-color;
+    &.biz-month-day-handle:hover {
+      border-color: @error-color;
+    }
+  }
   &-val {
     flex: 1;
     .ant-tag {
@@ -46,6 +53,10 @@
     vertical-align: top;
     &.ant-dropdown-open > .biz-month-day-handle {
       .__default-focused();
+      &.biz-month-day-status-error:not(.disable) {
+        border-color: @error-color;
+        box-shadow: 0 0 0 4px rgba(#ff8170, 0.2) !important;
+      }
     }
     .biz-month-day-handle {
       &.disable {

package/es/select/styles/handle.less

@@ -156,5 +156,9 @@
     &.biz-select-handle-input:hover {
       border-color: @error-color;
     }
+    &.biz-select-handle-input.active:not(.disable) {
+      border-color: @error-color;
+      box-shadow: 0 0 0 4px rgba(#ff8170, 0.2) !important;
+    }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.2.10",
+  "version": "1.2.11-data.1",
   "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": "71e30864f9f522e730c623aa15381b230397d7c8",
+  "gitHead": "1fa4bb23f2f6ea058858a40192765a1932f24577",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }