@titaui/pc 1.7.100 → 1.8.2

package/lib/pages/personal-info/components/edit-info/input/index.css

@@ -0,0 +1,89 @@
+.edit-base-info-input {
+  display: flex;
+  box-sizing: border-box;
+  padding: 0 32px;
+  align-items: center;
+  margin-bottom: 16px;
+}
+
+.edit-base-info-input__label {
+  width: 56px;
+  height: 22px;
+  font-size: 14px;
+  margin-bottom: 5px;
+  margin-right: 20px;
+  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
+  font-weight: 400;
+  line-height: 22px;
+}
+
+.edit-base-info-input__label-text {
+  color: #89919F;
+}
+
+.edit-base-info-input__label-require {
+  color: red;
+}
+
+.edit-base-info-input__border {
+  flex: 1;
+  padding: 6px 12px;
+  transition: all 0.2s;
+  border: 1px solid #e9ecf0;
+  box-sizing: border-box;
+  border-radius: 8px;
+}
+
+.edit-base-info-input__border--disabled {
+  background-color: #fafafa;
+  cursor: not-allowed;
+}
+
+.edit-base-info-input__border--disabled input:disabled {
+  background-color: #fafafa;
+  cursor: not-allowed;
+  color: #3f475594;
+}
+
+.edit-base-info-input__border--error {
+  box-shadow: inset 0px 0px 4px 0px rgba(240, 94, 94, 0.3) !important;
+  border: 1px solid #f05e5e !important;
+}
+
+.edit-base-info-input__border--active {
+  box-shadow: inset 0px 0px 4px 0px rgba(40, 121, 255, 0.3);
+  border: 1px solid #2879ff;
+}
+
+.edit-base-info-input__input {
+  display: inline-block;
+  padding: 0;
+  width: calc(100% - 12px);
+  font-size: 14px;
+  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
+  font-weight: 400;
+  color: #3f4755;
+  height: 22px;
+  line-height: inherit;
+  border: none;
+}
+
+.edit-base-info-input__input::-webkit-input-placeholder {
+  color: #bfc7d5;
+  font-weight: unset;
+}
+
+.edit-base-info-input__input::-moz-placeholder {
+  color: #bfc7d5;
+  font-weight: unset;
+}
+
+.edit-base-info-input__input:-moz-placeholder {
+  color: #bfc7d5;
+  font-weight: unset;
+}
+
+.edit-base-info-input__input:-ms-input-placeholder {
+  color: #bfc7d5;
+  font-weight: unset;
+}

package/lib/pages/personal-info/components/edit-info/input/index.js

@@ -0,0 +1,199 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _errorTip = _interopRequireDefault(require("../../../../../components/tooltip/error-tip"));
+
+require("./index.css");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+var preCls = 'edit-base-info-input';
+
+var OverlayInner = function OverlayInner(_ref) {
+  var hasError = _ref.hasError,
+      hasActive = _ref.hasActive,
+      tip = _ref.tip;
+  if (hasError) return /*#__PURE__*/_react["default"].createElement("span", {
+    style: {
+      'color': '#F05E5E'
+    }
+  }, tip);
+  if (hasActive) return /*#__PURE__*/_react["default"].createElement("span", {
+    style: {
+      'color': '#3F4755'
+    }
+  }, tip);
+  return /*#__PURE__*/_react["default"].createElement("span", null);
+};
+
+var popupAlign = {
+  offset: [-12, -4],
+  overflow: {
+    adjustX: true,
+    adjustY: true
+  },
+  targetOffset: [0, 0]
+};
+
+var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var _classNames;
+
+  var label = props.label,
+      verifies = props.verifies,
+      placeholder = props.placeholder,
+      onChange = props.onChange,
+      require = props.require,
+      type = props.type,
+      name = props.name,
+      disabled = props.disabled,
+      getContainer = props.getContainer;
+  var inputRef = (0, _react.useRef)();
+
+  var _useState = (0, _react.useState)(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      hasError = _useState2[0],
+      setHasError = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(false),
+      _useState4 = _slicedToArray(_useState3, 2),
+      hasActive = _useState4[0],
+      setHasActive = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(''),
+      _useState6 = _slicedToArray(_useState5, 2),
+      tip = _useState6[0],
+      setTip = _useState6[1];
+
+  var _useState7 = (0, _react.useState)(props.value || ''),
+      _useState8 = _slicedToArray(_useState7, 2),
+      value = _useState8[0],
+      setValue = _useState8[1];
+
+  (0, _react.useEffect)(function () {
+    setValue(props.value);
+  }, [props.value]);
+
+  var _verifing = function verifing() {
+    var value = inputRef.current && inputRef.current.value;
+    if (!verifies || !verifies.length) return [];
+    if (!require && !value) return [];
+    var errors = [];
+
+    for (var i = 0; i < verifies.length; i++) {
+      var _verifies$i = verifies[i],
+          test = _verifies$i.test,
+          _tip = _verifies$i.tip;
+
+      if (!value.match(test)) {
+        errors.push({
+          name: name,
+          tip: _tip
+        });
+      }
+    }
+
+    return errors;
+  };
+
+  var onInputFocusHandler = function onInputFocusHandler() {
+    setHasActive(true);
+    inputRef.current.setSelectionRange(9999999, 9999999);
+  };
+
+  var onBlurHandler = function onBlurHandler() {
+    setHasActive(false);
+  };
+
+  var onChangeHandler = function onChangeHandler() {
+    var value = inputRef.current && inputRef.current.value;
+    onChange && onChange(value);
+    setValue(value);
+
+    var errors = _verifing();
+
+    if (errors.length) {
+      setHasError(true);
+      setTip(errors[0].tip);
+    } else {
+      setHasError(false);
+      setTip('');
+    }
+  };
+
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      'verifing': function verifing() {
+        var errors = _verifing();
+
+        if (errors.length) {
+          setHasError(true);
+          setTip(errors[0].tip);
+          inputRef.current.focus();
+        }
+
+        return errors;
+      }
+    };
+  });
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])(preCls)
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__label"))
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: (0, _classnames["default"])("".concat(preCls, "__label-text"))
+  }, label)), /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__border"), (_classNames = {}, _defineProperty(_classNames, "".concat(preCls, "__border--error"), hasError), _defineProperty(_classNames, "".concat(preCls, "__border--active"), hasActive), _defineProperty(_classNames, "".concat(preCls, "__border--disabled"), disabled), _classNames))
+  }, /*#__PURE__*/_react["default"].createElement(_errorTip["default"], {
+    placement: 'topLeft',
+    popupAlign: popupAlign,
+    destroyTooltipOnHide: true,
+    visible: (hasActive || hasError) && tip,
+    overlay: /*#__PURE__*/_react["default"].createElement(OverlayInner, {
+      hasActive: hasActive,
+      hasError: hasError,
+      tip: tip
+    }),
+    getTooltipContainer: getContainer
+  }, /*#__PURE__*/_react["default"].createElement("input", {
+    ref: inputRef,
+    type: type,
+    disabled: disabled,
+    className: (0, _classnames["default"])("".concat(preCls, "__input")),
+    value: value,
+    placeholder: placeholder,
+    onFocus: onInputFocusHandler,
+    onBlur: onBlurHandler,
+    onChange: onChangeHandler,
+    autoComplete: "off"
+  }))));
+});
+
+exports["default"] = _default;

package/lib/pages/personal-info/components/person-photo/index.css

@@ -0,0 +1,88 @@
+@charset "UTF-8";
+
+.titaui-personal-info-person-photo {
+  background: #ffffff;
+  box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
+  border-radius: 12px;
+  padding: 20px 32px;
+  margin-top: 10px;
+  font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
+}
+
+.titaui-personal-info-person-photo__header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 12px;
+}
+
+.titaui-personal-info-person-photo__header-title {
+  font-size: 16px;
+  font-weight: 600;
+  color: #141c28;
+  line-height: 24px;
+  position: relative;
+  display: inline-flex;
+  align-items: center;
+}
+
+.titaui-personal-info-person-photo__header-title::before {
+  content: "";
+  width: 4px;
+  height: 16px;
+  background: linear-gradient(90deg, #4e90ff 0%, #2879ff 100%);
+  border-radius: 2px;
+  display: inline-block;
+  position: absolute;
+  left: -8px;
+  top: 3px;
+}
+
+.titaui-personal-info-person-photo__main {
+  display: flex;
+  align-items: center;
+}
+
+.titaui-personal-info-person-photo__main-mask {
+  position: absolute;
+  width: 160px;
+  height: 32px;
+  box-sizing: border-box;
+  padding: 7px 52px;
+  background: rgba(20, 28, 40, 0.5);
+  font-size: 12px;
+  color: #FFFFFF;
+  line-height: 18px;
+}
+
+.titaui-personal-info-person-photo__main > span {
+  margin-left: 24px;
+  font-size: 12px;
+  color: #A4ACB9;
+  line-height: 20px;
+}
+
+.titaui-personal-info-person-photo .titaui-pc-avator-container {
+  cursor: pointer;
+}
+
+.titaui-personal-info-person-photo .titaui-pc-avator-wrapper::before {
+  position: absolute;
+  bottom: 0;
+  display: block;
+  content: "点击修改";
+  width: 160px;
+  height: 32px;
+  background: rgba(20, 28, 40, 0.5);
+  color: #FFFFFF;
+  font-size: 12px;
+  line-height: 18px;
+  text-align: center;
+  box-sizing: border-box;
+  padding: 7px 0;
+  backdrop-filter: blur(4px);
+}
+
+.titaui-personal-info-person-photo .titaui-pc-avator-wrapper:hover::before {
+  background: rgba(20, 28, 40, 0.4);
+}

package/lib/pages/personal-info/components/person-photo/index.js

@@ -0,0 +1,86 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _bsGlobal = require("../../../../utils/bs-global");
+
+var _avatar = _interopRequireDefault(require("../../../../components/avatar"));
+
+var _uploadPhotoModal = _interopRequireDefault(require("../../../../components/upload-photo-modal"));
+
+require("./index.css");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+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 = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+var prefix = 'titaui-personal-info-person-photo';
+
+var _getUserInfo = (0, _bsGlobal.getUserInfo)(),
+    Id = _getUserInfo.Id,
+    Name = _getUserInfo.Name,
+    UserAvatar = _getUserInfo.UserAvatar;
+
+var PersonPhoto = function PersonPhoto() {
+  var _useState = (0, _react.useState)(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      visible = _useState2[0],
+      setVisible = _useState2[1];
+
+  var handleChangePhoto = function handleChangePhoto() {
+    setVisible(true);
+  };
+
+  var handleCancel = function handleCancel() {
+    setVisible(false);
+  };
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: prefix
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__header")
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__header-title")
+  }, "\u4E0A\u4F20\u5934\u50CF")), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__main")
+  }, /*#__PURE__*/_react["default"].createElement(_avatar["default"], {
+    userId: Id,
+    name: Name,
+    color: UserAvatar.Color,
+    src: UserAvatar.Large,
+    size: {
+      width: 160,
+      textNum: 1,
+      fontSize: 24
+    },
+    onClick: handleChangePhoto
+  }), /*#__PURE__*/_react["default"].createElement("span", null, "\xB7 \u5EFA\u8BAE\u56FE\u7247\u6700\u5C0F\u5C3A\u5BF8 150*150px")), /*#__PURE__*/_react["default"].createElement(_uploadPhotoModal["default"], {
+    visible: visible,
+    onCancel: handleCancel,
+    type: "person"
+  }));
+};
+
+var _default = PersonPhoto;
+exports["default"] = _default;

package/lib/pages/personal-info/index.js

@@ -9,6 +9,8 @@ var _react = _interopRequireDefault(require("react"));
 
 var _baseInfo = _interopRequireDefault(require("./components/base-info"));
 
+var _personPhoto = _interopRequireDefault(require("./components/person-photo"));
+
 var _aha = _interopRequireDefault(require("../aha2021"));
 
 require("./index.css");
@@ -20,7 +22,7 @@ var prefix = "titaui-personal-info";
 var PersonalInfo = function PersonalInfo() {
   return /*#__PURE__*/_react["default"].createElement(_aha["default"].ContentTemplate, null, /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
-  }, /*#__PURE__*/_react["default"].createElement(_baseInfo["default"], null)));
+  }, /*#__PURE__*/_react["default"].createElement(_baseInfo["default"], null), /*#__PURE__*/_react["default"].createElement(_personPhoto["default"], null)));
 };
 
 var _default = PersonalInfo;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.7.100",
+  "version": "1.8.2",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",
@@ -81,6 +81,7 @@
     "rc-cascader": "^2.2.0",
     "rc-checkbox": "^2.3.2",
     "rc-color-picker": "^1.2.6",
+    "rc-cropper": "^1.3.1",
     "rc-dialog": "8.5.2",
     "rc-drawer": "^4.3.1",
     "rc-input-number": "^5.0.0",
@@ -97,6 +98,7 @@
     "rc-util": "^5.13.1",
     "react-collapse": "^5.1.0",
     "react-content-loader": "^6.0.3",
+    "react-cropper": "^2.1.8",
     "react-custom-scrollbars": "^4.2.1",
     "react-grid-layout": "^1.2.5",
     "react-sizeme": "^3.0.1",

package/src/components/dialog/index.js

@@ -22,6 +22,7 @@ export default props => {
     visible,
     extraClass=[],
     extendFooterBtn,
+    disabled,
     ...restProps
   } = props;
 
@@ -30,7 +31,7 @@ export default props => {
     <span key="cancel" className={classNames(`${preCls}__btn`, `${preCls}__btn-cancel`)} onClick={onCancel}>
       <span className={classNames(`${preCls}__btn-cancel-text`)}>{cancelText}</span>
     </span>,
-    <span key="ok" className={classNames(`${preCls}__btn`, `${preCls}__btn-ok`)} onClick={onOk}>
+    <span key="ok" className={classNames(`${preCls}__btn`, `${preCls}__btn-ok`, {[`${preCls}__btn-ok-not-allowed`]:disabled})} onClick={onOk}>
       <span className={classNames(`${preCls}__btn-ok-text`)}>{okText}</span>
     </span>
   ];

package/src/components/dialog/index.scss

@@ -92,6 +92,9 @@ $font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-ser
       background: #5c8eff;
       color: #ffffff;
     }
+    &-not-allowed {
+      cursor: not-allowed;
+    }
   }
 
   &__btn-cancel {

package/src/components/form/form-fields/input/index.scss

@@ -1,4 +1,15 @@
 .form-field-input {
+  &-row{
+    display: flex;
+    align-items: center;
+    .form-field-input__label{
+      margin-bottom: unset;
+    }
+    .form-field-input__border{
+      margin-left: 16px;
+      flex: 1;
+    }
+  }
   &__label {
     height: 22px;
     font-size: 14px;
@@ -18,7 +29,7 @@
 
   &__border {
     padding: 6px 12px;
-    border-radius: 3px;
+    border-radius: 8px;
     transition: all 0.2s;
     border: 1px solid #e9ecf0;
     box-sizing: border-box;
@@ -34,12 +45,12 @@
     }
   }
   &__border--error {
-    box-shadow: inset 0px 0px 4px 0px rgba(240, 94, 94, 0.3) !important;
-    border: 1px solid #f05e5e !important;
+    box-shadow: inset 0px 0px 4px 0px rgba(240, 94, 94, 0.3) ;
+    border: 1px solid #f05e5e ;
   }
   &__border--active {
-    box-shadow: inset 0px 0px 4px 0px rgba(40, 121, 255, 0.3);
-    border: 1px solid #2879ff;
+    box-shadow: inset 0px 0px 4px 0px rgba(40, 121, 255, 0.3) !important;
+    border: 1px solid #2879ff !important;
   }
 
   &__input {

package/src/components/form/form-fields/input/index.tsx

@@ -19,7 +19,9 @@ interface Props {
   type?: string;
   name: string;
   getContainer?: Function;
-  disabled?: boolean
+  disabled?: boolean;
+  layout?: 'clomn'|'row';
+  className?:string;
 }
 interface Error {
   name: string;
@@ -27,8 +29,9 @@ interface Error {
 }
 
 const OverlayInner = ({ hasError, hasActive, tip }) => {
-  if (hasError) return <span style={{ 'color': '#F05E5E' }}>{tip}</span>;
   if (hasActive) return <span style={{ 'color': '#3F4755' }}>{tip}</span>;
+  if (hasError) return <span style={{ 'color': '#F05E5E' }}>{tip}</span>;
+
   return <span />;
 }
 
@@ -42,7 +45,9 @@ export default forwardRef((props: Props, ref) => {
     type,
     name,
     disabled,
-    getContainer
+    getContainer,
+    layout,
+    className="",
   } = props;
 
   const inputRef = useRef<any>();
@@ -104,7 +109,7 @@ export default forwardRef((props: Props, ref) => {
     }
   }))
 
-  return <div className={classNames(preCls)}>
+  return <div className={classNames(preCls,{[`${preCls}-row`]:layout==='row'},className)}>
     <div className={classNames(`${preCls}__label`)}>
       <span className={classNames(`${preCls}__label-text`)}>{label}</span>
       {require && <span className={classNames(`${preCls}__label-require`)}>*</span>}