@titaui/pc 1.9.44 → 1.9.45

package/lib/components/change-okr-modal/index.js

@@ -308,9 +308,9 @@ var ChangeOkr = /*#__PURE__*/function (_PureComponent) {
         onClick: function onClick() {
           return _this3.getListData(true);
         }
-      }, loadingMore ? '加载中…' : (0, _getLocale.getLocale)('OKR_MyO_Butt_Loadmore'), /*#__PURE__*/_react["default"].createElement("i", {
+      }, loadingMore ? (0, _getLocale.getLocale)('Mod_loading') + '…' : (0, _getLocale.getLocale)('OKR_MyO_Butt_Loadmore'), /*#__PURE__*/_react["default"].createElement("i", {
         className: "tu-icon-arrow-down"
-      }))), !!data.length && isEnd && /*#__PURE__*/_react["default"].createElement(_styledComponents.NoMore, null, "\u6CA1\u6709\u66F4\u591A\u4E86\uFF5E"))), /*#__PURE__*/_react["default"].createElement(_styledComponents.Footer, null, okrPopType === 1 && parentId != 0 && !hideCancelBtn && /*#__PURE__*/_react["default"].createElement(_styledComponents.Button, {
+      }))), !!data.length && isEnd && /*#__PURE__*/_react["default"].createElement(_styledComponents.NoMore, null, (0, _getLocale.getLocale)('Mod_Nomore'), "\uFF5E"))), /*#__PURE__*/_react["default"].createElement(_styledComponents.Footer, null, okrPopType === 1 && parentId != 0 && !hideCancelBtn && /*#__PURE__*/_react["default"].createElement(_styledComponents.Button, {
         type: "confirm",
         onClick: this.handleUnConnect
       }, (0, _getLocale.getLocale)('OKR_MyO_Text_Cancel')), /*#__PURE__*/_react["default"].createElement(_styledComponents.ButtonGroup, null, /*#__PURE__*/_react["default"].createElement(_styledComponents.Button, {

package/lib/components/common-share/publishMblog.js

@@ -59,7 +59,7 @@ function PublishMblog(_ref) {
       closeModal = _ref.closeModal,
       uid = _ref.uid,
       _ref$defaultContent = _ref.defaultContent,
-      defaultContent = _ref$defaultContent === void 0 ? "秀一秀我的 OKR" : _ref$defaultContent;
+      defaultContent = _ref$defaultContent === void 0 ? (0, _getLocale.getLocale)('OKR_MyO_Popup_ShowmyOKR') : _ref$defaultContent;
 
   var _useState = (0, _react.useState)({
     url: "",

package/lib/components/dynamic/dynamic-like-ranking/index.css

@@ -67,29 +67,24 @@
   margin: auto;
 }
 
-.danamic-like-ranking__item {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 16px;
+.danamic-like-ranking__content-table-items {
+  display: grid;
+  grid-template-columns: auto auto auto auto;
+  grid-row-gap: 16px;
 }
 
 .danamic-like-ranking__item:last-of-type {
   margin-bottom: unset;
 }
 
-.danamic-like-ranking__item-left {
+.danamic-like-ranking__item-pre {
   display: flex;
   align-items: center;
-}
-
-.danamic-like-ranking__item-pre {
-  width: 21px;
-  text-align: center;
+  justify-content: center;
 }
 
 .danamic-like-ranking__item-medal {
-  width: 21px;
+  min-width: 21px;
   height: 24px;
 }
 
@@ -107,6 +102,8 @@
 
 .danamic-like-ranking__item-name {
   margin-left: 8px;
+  display: inline-flex;
+  align-items: center;
 }
 
 .danamic-like-ranking__item-like-text {
@@ -114,6 +111,8 @@
   font-weight: 400;
   color: #89919f;
   line-height: 22px;
+  display: inline-flex;
+  align-items: center;
 }
 
 .danamic-like-ranking__item-like-num {

package/lib/components/dynamic/dynamic-like-ranking/index.js

@@ -54,7 +54,7 @@ var DynamicLikeRanking = function DynamicLikeRanking() {
       rankingData = _useState2[0],
       setRankingData = _useState2[1];
 
-  var _useState3 = (0, _react.useState)((0, _getLocale.getLocale)('Mod_all')),
+  var _useState3 = (0, _react.useState)((0, _getLocale.getLocale)("Mod_all")),
       _useState4 = _slicedToArray(_useState3, 2),
       type = _useState4[0],
       setType = _useState4[1];
@@ -115,10 +115,10 @@ var DynamicLikeRanking = function DynamicLikeRanking() {
     var createDate = "";
     var endDate = "";
 
-    if (item == (0, _getLocale.getLocale)('Feed_Tab_Title_Thismonth')) {
+    if (item == (0, _getLocale.getLocale)("Feed_Tab_Title_Thismonth")) {
       createDate = (0, _formatTime.showMonthFirstDay)();
       endDate = (0, _formatTime.showNextMonthFirstDay)();
-    } else if (item == (0, _getLocale.getLocale)('Feed_Tab_Title_Thisweek')) {
+    } else if (item == (0, _getLocale.getLocale)("Feed_Tab_Title_Thisweek")) {
       createDate = (0, _formatTime.showWeekFirstDay)();
       endDate = (0, _formatTime.showNextWeekFirstDay)();
     }
@@ -130,7 +130,7 @@ var DynamicLikeRanking = function DynamicLikeRanking() {
   };
 
   var TabBar = function TabBar() {
-    var typeData = [(0, _getLocale.getLocale)('Mod_all'), (0, _getLocale.getLocale)('Feed_Tab_Title_Thisweek'), (0, _getLocale.getLocale)('Feed_Tab_Title_Thismonth')];
+    var typeData = [(0, _getLocale.getLocale)("Mod_all"), (0, _getLocale.getLocale)("Feed_Tab_Title_Thisweek"), (0, _getLocale.getLocale)("Feed_Tab_Title_Thismonth")];
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(preCls, "__tab-bar")
     }, typeData.map(function (item, key) {
@@ -155,10 +155,10 @@ var DynamicLikeRanking = function DynamicLikeRanking() {
     src: require("./image/like-ranking.svg")
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(preCls, "__header-text"))
-  }, (0, _getLocale.getLocale)('Feed_Title_Likeranking'))), Auth.hasPraiseAuth() && /*#__PURE__*/_react["default"].createElement("div", {
+  }, (0, _getLocale.getLocale)("Feed_Title_Likeranking"))), Auth.hasPraiseAuth() && /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__header-right")),
     onClick: handleLinkToPraiseRaking
-  }, (0, _getLocale.getLocale)('Feed_Set_Pop_Butt_More'))), /*#__PURE__*/_react["default"].createElement("div", {
+  }, (0, _getLocale.getLocale)("Feed_Set_Pop_Butt_More"))), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__content"))
   }, TabBar(), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(preCls, "__content-table"))
@@ -166,12 +166,14 @@ var DynamicLikeRanking = function DynamicLikeRanking() {
     className: "".concat(preCls, "__content-table-empty")
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(preCls, "__content-table-empty-text")
-  }, "\u6682\u65E0\u6392\u884C")), rankingData && rankingData.length > 0 && rankingData.map(function (item, index) {
+  }, "\u6682\u65E0\u6392\u884C")), rankingData && rankingData.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(preCls, "__content-table-items"))
+  }, rankingData.map(function (item, index) {
     return /*#__PURE__*/_react["default"].createElement(_item["default"], {
       userInfo: item,
       key: index
     });
-  }))));
+  })))));
 };
 
 var _default = DynamicLikeRanking;

package/lib/components/dynamic/dynamic-like-ranking/item.js

@@ -1,13 +1,13 @@
 "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 = _interopRequireDefault(require("react"));
-
-var _classnames = _interopRequireDefault(require("classnames"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _avatar = _interopRequireDefault(require("../../avatar"));
 
@@ -23,6 +23,10 @@ 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; }
+
 var preCls = "danamic-like-ranking__item";
 
 var Item = function Item(_ref) {
@@ -70,11 +74,7 @@ var Item = function Item(_ref) {
   //   window.open(url, "_blank");
   // };
 
-  return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(preCls))
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(preCls, "-left"))
-  }, /*#__PURE__*/_react["default"].createElement("div", {
+  return /*#__PURE__*/_react["default"].createElement(_react.Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "-pre")
   }, formatRaking(rankNum)), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "-avatar")
@@ -96,13 +96,11 @@ var Item = function Item(_ref) {
       name: name
     }),
     maxWidth: 120
-  }))), /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])("".concat(preCls, "-left"))
-  }, /*#__PURE__*/_react["default"].createElement("div", {
+  })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(preCls, "-like-text")
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(preCls, "-like-num")
-  }, (0, _bsGlobal.formatNum)(pariseNums)), (0, _getLocale.getLocale)('Mod_Kudos'))));
+  }, (0, _bsGlobal.formatNum)(pariseNums)), (0, _getLocale.getLocale)("Mod_Kudos")));
 };
 
 var _default = Item;

package/lib/components/edit-kr-wight/EditKrWightModal.js

@@ -303,7 +303,8 @@ var EditKrWightModal = /*#__PURE__*/function (_Component) {
         ,
         onClose: this.onModalClose,
         onOk: this.handleOk,
-        onCancel: this.handleCancel
+        onCancel: this.handleCancel,
+        zIndex: 2000
       }, /*#__PURE__*/_react["default"].createElement(_style.EditWightContent, null, milepostData && milepostData.map(function (data, index) {
         var feedId = data.feedId,
             mileStoneId = data.mileStoneId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.9.44",
+  "version": "1.9.45",
   "nameCN": "",
   "description": "",
   "main": "src/index.js",

package/src/components/change-okr-modal/index.tsx

@@ -422,12 +422,12 @@ export default class ChangeOkr extends PureComponent<Props, State> {
               {!!data.length && !isEnd && (
                 <LoadMore>
                   <a onClick={() => this.getListData(true)}>
-                    {loadingMore ? '加载中…' : getLocale('OKR_MyO_Butt_Loadmore')}
+                    {loadingMore ? getLocale('Mod_loading') + '…' : getLocale('OKR_MyO_Butt_Loadmore')}
                     <i className='tu-icon-arrow-down' />
                   </a>
                 </LoadMore>
               )}
-              {!!data.length && isEnd && <NoMore>没有更多了～</NoMore>}
+              {!!data.length && isEnd && <NoMore>{getLocale('Mod_Nomore')}～</NoMore>}
             </List>
           </Body>
           <Footer>

package/src/components/common-share/publishMblog.tsx

@@ -22,7 +22,7 @@ function PublishMblog({
   getModalRef,
   closeModal,
   uid,
-  defaultContent="秀一秀我的 OKR"
+  defaultContent = getLocale('OKR_MyO_Popup_ShowmyOKR')
 }: Props): ReactElement {
   const [file, setFile] = useState({ url: "", pending: true });
   const [status, setStatus] = useState(0);

package/src/components/create-okr-modal/fields/okr-visibility-detail.tsx

@@ -119,7 +119,8 @@ export default ({
     <Fragment>
       {canEdit && (
         <Fragment>
-          <UserSelector             ref={selectorRef}
+          <UserSelector 
+            ref={selectorRef}
             // @ts-ignore
             multiple
             onOk={onOk}

package/src/components/dynamic/dynamic-like-ranking/index.scss

@@ -64,31 +64,27 @@
           margin: auto;
         }
       }
+      &-items {
+        display: grid;
+        grid-template-columns: auto auto auto auto;
+        grid-row-gap: 16px;
+      }
     }
   }
 
   &__item {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    margin-bottom: 16px;
-
     &:last-of-type {
       margin-bottom: unset;
     }
 
-    &-left {
+    &-pre {
       display: flex;
       align-items: center;
-    }
-
-    &-pre {
-      width: 21px;
-      text-align: center;
+      justify-content: center;
     }
 
     &-medal {
-      width: 21px;
+      min-width: 21px;
       height: 24px;
     }
 
@@ -106,6 +102,8 @@
 
     &-name {
       margin-left: 8px;
+      display: inline-flex;
+      align-items: center;
     }
 
     &-like-text {
@@ -113,6 +111,8 @@
       font-weight: 400;
       color: #89919f;
       line-height: 22px;
+      display: inline-flex;
+      align-items: center;
     }
 
     &-like-num {

package/src/components/dynamic/dynamic-like-ranking/index.tsx

@@ -18,7 +18,7 @@ const Auth = new DynamicManagerAuth();
 
 const DynamicLikeRanking: FC = () => {
   const [rankingData, setRankingData] = useState([]);
-  const [type, setType] = useState(getLocale('Mod_all'));
+  const [type, setType] = useState(getLocale("Mod_all"));
   const [date, setDate] = useState({ createDate: "", endDate: "" });
   useEffect(() => {
     const { createDate, endDate } = date;
@@ -62,10 +62,10 @@ const DynamicLikeRanking: FC = () => {
     setType(item);
     let createDate = "";
     let endDate = "";
-    if (item == getLocale('Feed_Tab_Title_Thismonth')) {
+    if (item == getLocale("Feed_Tab_Title_Thismonth")) {
       createDate = showMonthFirstDay();
       endDate = showNextMonthFirstDay();
-    } else if (item == getLocale('Feed_Tab_Title_Thisweek')) {
+    } else if (item == getLocale("Feed_Tab_Title_Thisweek")) {
       createDate = showWeekFirstDay();
       endDate = showNextWeekFirstDay();
     }
@@ -73,7 +73,11 @@ const DynamicLikeRanking: FC = () => {
   };
 
   const TabBar = () => {
-    const typeData = [getLocale('Mod_all'), getLocale('Feed_Tab_Title_Thisweek'), getLocale('Feed_Tab_Title_Thismonth')];
+    const typeData = [
+      getLocale("Mod_all"),
+      getLocale("Feed_Tab_Title_Thisweek"),
+      getLocale("Feed_Tab_Title_Thismonth"),
+    ];
     return (
       <div className={`${preCls}__tab-bar`}>
         {typeData.map((item, key) => {
@@ -102,7 +106,7 @@ const DynamicLikeRanking: FC = () => {
             src={require("./image/like-ranking.svg")}
           ></img>
           <span className={classNames(`${preCls}__header-text`)}>
-            {getLocale('Feed_Title_Likeranking')}
+            {getLocale("Feed_Title_Likeranking")}
           </span>
         </div>
         {Auth.hasPraiseAuth() && (
@@ -110,7 +114,7 @@ const DynamicLikeRanking: FC = () => {
             className={classNames(`${preCls}__header-right`)}
             onClick={handleLinkToPraiseRaking}
           >
-            {getLocale('Feed_Set_Pop_Butt_More')}
+            {getLocale("Feed_Set_Pop_Butt_More")}
           </div>
         )}
       </div>
@@ -125,11 +129,13 @@ const DynamicLikeRanking: FC = () => {
                 </span>
               </div>
             ))}
-          {rankingData &&
-            rankingData.length > 0 &&
-            rankingData.map((item, index) => {
-              return <Item userInfo={item} key={index}></Item>;
-            })}
+          {rankingData && rankingData.length > 0 && (
+            <div className={classNames(`${preCls}__content-table-items`)}>
+              {rankingData.map((item, index) => {
+                return <Item userInfo={item} key={index}></Item>;
+              })}
+            </div>
+          )}
         </div>
       </div>
     </div>

package/src/components/dynamic/dynamic-like-ranking/item.tsx

@@ -1,9 +1,8 @@
-import React, { FC } from "react";
-import classNames from "classnames";
+import React, { FC, Fragment } from "react";
 import Avatar from "../../avatar";
 import { formatNum } from "../../../utils/bs-global";
 import { OpenUserName } from "../../../utils/open-data";
-import Tooltip from '../../tooltip';
+import Tooltip from "../../tooltip";
 import { getLocale } from "../../../utils/getLocale";
 import "./index.scss";
 const preCls = "danamic-like-ranking__item";
@@ -42,7 +41,7 @@ const Item: FC<any> = ({ userInfo }) => {
   if (!userInfo || Object.keys(userInfo).length === 0) return null;
   const { rankNum, user, pariseNums } = userInfo;
   const { avatar, name, userId, userType } = user;
-  
+
   // 之后要用
   // const url = getUrlForUserPage({
   //   userId: userId,
@@ -54,32 +53,28 @@ const Item: FC<any> = ({ userInfo }) => {
   // };
 
   return (
-    <div className={classNames(`${preCls}`)}>
-      <div className={classNames(`${preCls}-left`)}>
-        <div className={`${preCls}-pre`}>{formatRaking(rankNum)}</div>
-        <div className={`${preCls}-avatar`}>
-          <Avatar
-            name={name}
-            src={avatar.small}
-            color={avatar.color}
-            userId={userId}
-            size={{ width: 28, textNum: 1, fontSize: 14 }}
-          />
-        </div>
-        <div className={`${preCls}-name`}>
-          <Tooltip.Text
-            text={<OpenUserName id={userId} name={name} />}
-            maxWidth={120}
-          />
-        </div>
+    <Fragment>
+      <div className={`${preCls}-pre`}>{formatRaking(rankNum)}</div>
+      <div className={`${preCls}-avatar`}>
+        <Avatar
+          name={name}
+          src={avatar.small}
+          color={avatar.color}
+          userId={userId}
+          size={{ width: 28, textNum: 1, fontSize: 14 }}
+        />
+      </div>
+      <div className={`${preCls}-name`}>
+        <Tooltip.Text
+          text={<OpenUserName id={userId} name={name} />}
+          maxWidth={120}
+        />
       </div>
-      <div className={classNames(`${preCls}-left`)}>
-        <div className={`${preCls}-like-text`}>
-          <span className={`${preCls}-like-num`}>{formatNum(pariseNums)}</span>
-          {getLocale('Mod_Kudos')}
-        </div>
+      <div className={`${preCls}-like-text`}>
+        <span className={`${preCls}-like-num`}>{formatNum(pariseNums)}</span>
+        {getLocale("Mod_Kudos")}
       </div>
-    </div>
+    </Fragment>
   );
 };
 

package/src/components/edit-kr-wight/EditKrWightModal.tsx

@@ -159,6 +159,7 @@ export default class EditKrWightModal extends Component<EditKrWightProps, EditKr
         onClose={this.onModalClose}
         onOk={this.handleOk}
         onCancel={this.handleCancel}
+        zIndex={2000}
       >
         <EditWightContent>
           {milepostData &&