@zgfe/business-lib 1.2.11-data.0 → 1.2.11-data.2

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.js

@@ -1,6 +1,13 @@
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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; }
+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 React from 'react';
 import { BizCycleTime } from '@zgfe/business-lib';
 import { CycleTimeUnit } from '..';
+import { Button, Form } from 'antd';
 export default (function () {
   var options = [{
     label: '每小时',
@@ -15,6 +22,9 @@ export default (function () {
     label: '每月',
     value: CycleTimeUnit.month
   }];
+  var _Form$useForm = Form.useForm(),
+    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
+    form = _Form$useForm2[0];
   var onChange = function onChange(data) {
     console.log('change:', data);
   };
@@ -34,5 +44,30 @@ export default (function () {
     options: options,
     format: "HH",
     onChange: onChange
-  }));
+  }), /*#__PURE__*/React.createElement("br", null), /*#__PURE__*/React.createElement("p", null, /*#__PURE__*/React.createElement("b", null, "Form")), /*#__PURE__*/React.createElement(Form, {
+    form: form
+  }, /*#__PURE__*/React.createElement(Form.Item, {
+    label: "\u65E5\u671F",
+    name: "date",
+    rules: [{
+      validator: function validator(_, value) {
+        if (value.unit > 1 && !value.day.length) {
+          return Promise.reject('请选择日期');
+        }
+        if (value.unit > 0 && !value.time) {
+          return Promise.reject('请选择小时');
+        }
+        return Promise.resolve();
+      }
+    }]
+  }, /*#__PURE__*/React.createElement(BizCycleTime, {
+    multiple: true,
+    showHour: true,
+    options: options,
+    format: "HH",
+    onChange: onChange
+  })), /*#__PURE__*/React.createElement(Form.Item, null, /*#__PURE__*/React.createElement(Button, {
+    type: "primary",
+    htmlType: "submit"
+  }, "\u786E\u5B9A"))));
 });

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/es/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),
+    status = _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(status ? " ".concat(classPrefix, "-status-").concat(status) : '')
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-val")
   }, chosenDayList.map(function (item) {

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.11-data.0",
+  "version": "1.2.11-data.2",
   "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": "dd0fcae68835a8dfbc1bacd80ed6a06c7f7a7e4c",
+  "gitHead": "d7b92f56d95d403c04fce4f5a19009bce1186820",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }