@titaui/pc 1.8.5 → 1.8.9

package/src/pages/personal-info/components/base-info/index.tsx

@@ -1,7 +1,9 @@
 import React, { FC, useState, useRef, useEffect } from "react";
-import { getUserInfoFun } from '../../request-api';
 import Form from "../../../../components/form";
-import EditModle from '../edit-info'
+import { getUserInfoFun } from "../../request-api";
+import { getLocale } from "../../../../utils/getLocale";
+import EditModle from '../edit-base-info'
+import { RectBtn } from "../../../../components/button";
 import "./index.scss";
 
 const {Fields} = Form
@@ -20,6 +22,10 @@ const BaseInfo: FC = () => {
     setVisible(false);
   }
 
+  const handleSuccessEditBaseInfo = (userInfo) => {
+    setUserInfo({...userInfo});
+  }
+
   useEffect(() => {
 		getUserInfoFun().then((resp) => {
 			if (resp.Code === 1 && resp.Data) {
@@ -31,15 +37,19 @@ const BaseInfo: FC = () => {
   return (
     <div className={prefix}>
       <div className={`${prefix}__header`}>
-        <span className={`${prefix}__header-title`}>基本信息</span>
-        <span className={`${prefix}__header-btn`} onClick={handleClickEdit}>编辑</span>
-        <EditModle visible={visible} onCancel={handleCancelEdit}/>
+        <span className={`${prefix}__header-title`}>{getLocale('Per_Ass_New_title_text_BasicIn')}</span>
+        <RectBtn
+          type={"primary"}
+          text={getLocale('Mod_Editor')}
+          onClick={handleClickEdit}
+        />
+        <EditModle visible={visible} onCancel={handleCancelEdit} handleSuccessEditBaseInfo={handleSuccessEditBaseInfo}/>
       </div>
       <div className={`${prefix}__form`}>
         <Form ref={formRef}>
           <Fields.Input
             name="name"
-            label={"姓名"}
+            label={getLocale('Mod_UserName')}
             placeholder={"未设置"}
             type="text"
             verifies={[]}

package/src/pages/personal-info/components/{edit-info → edit-base-info}/index.scss

@@ -5,7 +5,7 @@
       padding: 0 32px;
     }
     .form-field-input__label {
-      width: 62px;
+      min-width: 64px;
     }
     .form-field-input__label-text {
       font-size: 14px;

package/src/pages/personal-info/components/{edit-info → edit-base-info}/index.tsx

@@ -11,7 +11,7 @@ const { Fields } = Form;
 const prefix = "titaui-edit-personal-info"
 
 const EditBaseInfo = (props) => {
-	const { visible, onCancel } = props;
+	const { visible, onCancel, handleSuccessEditBaseInfo } = props;
 
 	const modalRef = useRef<any>();
   const formContainerRef = useRef<any>();
@@ -53,10 +53,8 @@ const EditBaseInfo = (props) => {
 			saveUserInfo({ data: userInfo }).then((resp) => {
 				if (resp.Code === 1) {
 					Toast.Success('更新成功', { canClose: false });
+          handleSuccessEditBaseInfo(userInfo);
           onCancel();
-          setTimeout(() => {
-            window.location.reload();
-          }, 2000)
 				} else {
 					Toast.Error(resp.Message, { canClose: false });
 				}

package/src/pages/personal-info/components/person-photo/index.scss

@@ -2,14 +2,14 @@
   background: #ffffff;
   box-shadow: 0px 0px 8px 0px rgba(127, 145, 180, 0.1);
   border-radius: 12px;
-  padding: 20px 32px;
+  padding: 20px 32px 30px 36px;
   margin-top: 10px;
   font-family: -apple-system, Arial, Verdana, Helvetica Neue, Helvetica, sans-serif, PingFang SC, Microsoft YaHei;
   &__header {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    margin-bottom: 12px;
+    margin-bottom: 20px;
     &-title {
       font-size: 16px;
       font-weight: 600;
@@ -26,7 +26,7 @@
         border-radius: 2px;
         display: inline-block;
         position: absolute;
-        left: -8px;
+        left: -12px;
         top: 3px;
       }
     }
@@ -46,11 +46,23 @@
       color: #FFFFFF;
       line-height: 18px;
     }
-    & > span {
-      margin-left: 24px;
+    &-tip {
+      margin-left: 32px;
       font-size: 12px;
       color: #A4ACB9;
       line-height: 20px;
+      position: relative;
+      &::before {
+        display: block;
+        content: '';
+        width: 4px;
+        height: 4px;
+        background: #A4ACB9;
+        position: absolute;
+        top: 7px;
+        left: -12px;
+        border-radius: 50%;
+      }
     }
   }
   .titaui-pc-avator-container {

package/src/pages/personal-info/components/person-photo/index.tsx

@@ -1,5 +1,4 @@
 import React, { useState, useEffect } from 'react';
-import classNames from 'classnames';
 import { getUserInfo } from '../../../../utils/bs-global';
 import Avatar from '../../../../components/avatar';
 import ChangePhotoModal from '../../../../components/upload-photo-modal';
@@ -12,6 +11,7 @@ const { Id, Name, UserAvatar } = getUserInfo();
 const PersonPhoto = () => {
 
   const [visible, setVisible] = useState(false);
+  const [avatar, setAvatar] = useState('');
 
   const handleChangePhoto = () => {
     setVisible(true);
@@ -21,6 +21,14 @@ const PersonPhoto = () => {
     setVisible(false);
   }
 
+  const handleSuccessUploadPhoto = (image) => {
+    setAvatar(image);
+  }
+
+  useEffect(() => {
+    setAvatar(UserAvatar.Large)
+  }, [])
+
 	return (
 		<div className={prefix}>
 			<div className={`${prefix}__header`}>
@@ -31,7 +39,7 @@ const PersonPhoto = () => {
 					userId={Id}
 					name={Name}
 					color={UserAvatar.Color}
-					src={UserAvatar.Large}
+					src={avatar}
 					size={{
 						width: 160,
 						textNum: 1,
@@ -39,9 +47,9 @@ const PersonPhoto = () => {
 					}}
           onClick={handleChangePhoto}
 				/>
-        <span>· 建议图片最小尺寸 150*150px</span>
+        <span className={`${prefix}__main-tip`}>建议图片最小尺寸 150*150px</span>
 			</div>
-      <ChangePhotoModal visible={visible} onCancel={handleCancel} type="person"/>
+      <ChangePhotoModal visible={visible} onCancel={handleCancel} type="person" handleSuccessUploadPhoto={handleSuccessUploadPhoto}/>
     </div>
 	);
 };

package/src/utils/date-test-change.ts

@@ -1,3 +1,5 @@
+import { getLocale } from "./getLocale"
+
 //精确到日期的检测 date为2021/8/26这样的类型，返回距现在几天
 export const testDateDiff = (date) => {
 
@@ -38,7 +40,7 @@ export const testDateDiff = (date) => {
 //           if (hourDiff < 1) {
 //             const minDiff = Math.floor((nTime - tTime) / (1000 * 60))
 //             if (minDiff < 1) {
-//               return '刚刚'
+//               return getLocale('Pro_page_Int_Justnow')
 //             } else {
 //               return `${minDiff}分钟前`
 //             }
@@ -81,7 +83,7 @@ export const testDayChange = (date) => {
 
   const secondDiff = Math.floor((nowMilliSecond - timeMilliSecond) / 1000);
   if (secondDiff <= 3) {
-    return '刚刚';
+    return getLocale('Pro_page_Int_Justnow');
   }
   if (secondDiff < 60) {
     return `${secondDiff}秒前`;
@@ -93,7 +95,7 @@ export const testDayChange = (date) => {
     return `${Math.floor(secondDiff / (60 * 60))}小时前`;
   }
   if (secondDiff < 60 * 60 * 24 * 2 && nowDate - 1 === timeDate) {
-    return `昨天`;
+    return getLocale('OKR_MyO_Pr_Text_Yesterday');
   }
   if (secondDiff < 60 * 60 * 24 * 3 && nowDate - 2 === timeDate) {
     return `前天`;

package/src/utils/format-time.ts

@@ -1,6 +1,8 @@
+import { getLocale } from "./getLocale";
+
 export const getTimeString = (time: string, nowTime): string => {
   if (!time) {
-    return "暂未更新";
+    return getLocale('OKR_MyO_KRP_Notupdated');
   }
   const timeDateObj = new Date(time);
   const timeMilliSecond = timeDateObj.getTime();
@@ -16,7 +18,7 @@ export const getTimeString = (time: string, nowTime): string => {
 
   const secondDiff = Math.floor((nowMilliSecond - timeMilliSecond) / 1000);
   if (secondDiff <= 3) {
-    return "刚刚";
+    return getLocale('Pro_page_Int_Justnow');
   }
   if (secondDiff < 60) {
     return `${secondDiff}秒前`;
@@ -28,7 +30,7 @@ export const getTimeString = (time: string, nowTime): string => {
     return `${Math.floor(secondDiff / (60 * 60))}小时前`;
   }
   if (secondDiff < 60 * 60 * 24 * 2 && nowDate - 1 === timeDate) {
-    return `昨天 ${timeHours + ":" + timeMinutes}`;
+    return `${getLocale('OKR_MyO_Pr_Text_Yesterday')} ${timeHours + ":" + timeMinutes}`;
   }
   if (secondDiff < 60 * 60 * 24 * 3 && nowDate - 2 === timeDate) {
     return `前天 ${timeHours + ":" + timeMinutes}`;

package/src/utils/getLocale.ts

@@ -0,0 +1,9 @@
+import { getBSGlobal } from "./bs-global";
+
+export const getLocale = (key) => {
+  return window.getLocale && window.getLocale(key) || '';
+};
+
+const i18nInfo = getBSGlobal("I18NInfo");
+
+export const isEn = i18nInfo && i18nInfo.I18NOpen && i18nInfo.I18NUserLang === "en_US";

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

@@ -1,89 +0,0 @@
-.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

@@ -1,199 +0,0 @@
-"use strict";
-
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _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/src/pages/personal-info/components/edit-info/input/index.scss

@@ -1,82 +0,0 @@
-.edit-base-info-input {
-  display: flex;
-  box-sizing: border-box;
-  padding: 0 32px;
-  align-items: center;
-  margin-bottom: 16px;
-  &__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;
-
-    &-text {
-      color: #89919F;
-    }
-
-    &-require {
-      color: red;
-    }
-  }
-
-  &__border {
-    flex:1;
-    padding: 6px 12px;
-    transition: all 0.2s;
-    border: 1px solid #e9ecf0;
-    box-sizing: border-box;
-    border-radius: 8px;
-
-    &--disabled {
-      background-color: #fafafa;
-      cursor: not-allowed;
-      input:disabled {
-        background-color: #fafafa;
-        cursor: not-allowed;
-        color: #3f475594;
-      }
-    }
-  }
-  &__border--error {
-    box-shadow: inset 0px 0px 4px 0px rgba(240, 94, 94, 0.3) !important;
-    border: 1px solid #f05e5e !important;
-  }
-  &__border--active {
-    box-shadow: inset 0px 0px 4px 0px rgba(40, 121, 255, 0.3);
-    border: 1px solid #2879ff;
-  }
-
-  &__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;
-
-    &::-webkit-input-placeholder {
-      color: #bfc7d5;
-      font-weight: unset;
-    }
-    &::-moz-placeholder {
-      color: #bfc7d5;
-      font-weight: unset;
-    }
-    &:-moz-placeholder {
-      color: #bfc7d5;
-      font-weight: unset;
-    }
-    &:-ms-input-placeholder {
-      color: #bfc7d5;
-      font-weight: unset;
-    }
-  }
-}