@titaui/pc 1.7.61 → 1.7.65

package/lib/components/dynamic/dynamic-item/dynamic-milestone/constant.js

@@ -3,14 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.EStatusClass2StatusTypeText = void 0;
-var EStatusClass2StatusTypeText = {
-  2: '已完成',
-  1: '进行中',
-  4: '已取消',
-  3: '已延迟',
-  6: '暂停中',
-  0: '未开始',
-  5: '未接受'
+exports.MileStoneStatusClass2StatusTypeText = void 0;
+var MileStoneStatusClass2StatusTypeText = {
+  2: '未完成',
+  1: '未开始',
+  4: '已过期',
+  3: '已完成'
 };
-exports.EStatusClass2StatusTypeText = EStatusClass2StatusTypeText;
+exports.MileStoneStatusClass2StatusTypeText = MileStoneStatusClass2StatusTypeText;

package/lib/components/dynamic/dynamic-item/dynamic-milestone/index.js

@@ -130,7 +130,7 @@ var DynamicMilestone = function DynamicMilestone(_ref) {
     className: (0, _classnames["default"])(_constant2.EStatusStatus2ClassType[status])
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: prefix + '__content-status-text'
-  }, _constant.EStatusClass2StatusTypeText[status]), /*#__PURE__*/_react["default"].createElement("i", {
+  }, _constant.MileStoneStatusClass2StatusTypeText[status]), /*#__PURE__*/_react["default"].createElement("i", {
     className: (0, _classnames["default"])('tu-icon-deferred')
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: prefix + '__content-time-range'

package/lib/components/dynamic/dynamic.js

@@ -321,17 +321,6 @@ var Dynamic = function Dynamic() {
   }, []);
   (0, _react.useEffect)(function () {
     if (searchKeyWord || searchKeyType || searchUser) {
-      // 搜索跳到全部动态
-      if (searchKeyWord) {
-        setActiveFirstLevelTabKey(1006); // @ts-ignore
-
-        var secondTabsArr = tabsInfo.find(function (item) {
-          return item.CodeId === 1006;
-        }).ChildMenus;
-        setSecondTabs(secondTabsArr);
-        setActiveSecondLevelTabKey(secondTabsArr[0].CodeId);
-      }
-
       setIsChangeConditionLoading(true);
       resetValue();
       getDynamicData(true);

package/lib/components/file-list/index.js

@@ -30,30 +30,31 @@ var FileList = function FileList(_ref) {
       _ref$showDownload = _ref.showDownload,
       showDownload = _ref$showDownload === void 0 ? true : _ref$showDownload;
   var imgViewerRef = (0, _react.useRef)();
-  var imageIndexRef = (0, _react.useRef)(0);
 
-  var handleImgPreview = function handleImgPreview(index) {
-    // @ts-ignore
-    imgViewerRef.current && imgViewerRef.current.show(index);
-  };
-
-  var getIndex = function getIndex(file) {
-    var index = imageIndexRef.current;
+  var getImgIndex = function getImgIndex(index) {
+    var newIndex = 0;
 
-    if ((0, _util.isImg)(file.fileType)) {
-      imageIndexRef.current = index + 1;
+    for (var i = 0; i < index; i++) {
+      if ((0, _util.isImg)(data[i].fileType)) {
+        newIndex++;
+      }
     }
 
-    return index;
+    return newIndex;
+  };
+
+  var handleImgPreview = function handleImgPreview(index) {
+    // @ts-ignore
+    imgViewerRef.current && imgViewerRef.current.show(getImgIndex(index));
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
   }, data.map(function (file, index) {
     return /*#__PURE__*/_react["default"].createElement(_singleFile["default"], {
-      key: file.documentSource + index,
+      key: file.documentId + index,
       data: file,
-      index: getIndex(file),
+      index: index,
       showDownload: showDownload,
       onPreview: handleImgPreview
     });

package/lib/components/okr-detail/components/okr-tree/tree-node/o-child-node/index.js

@@ -80,6 +80,9 @@ var _default = function _default(props) {
       refreshAll = _useContext.refreshAll,
       okrInfo = _useContext.okrInfo;
 
+  var _useContext2 = (0, _react.useContext)(_context.OkrListContext),
+      getParentAndChildWorks = _useContext2.getParentAndChildWorks;
+
   var _useState3 = (0, _react.useState)(data.principalUser),
       _useState4 = _slicedToArray(_useState3, 1),
       user = _useState4[0];
@@ -131,6 +134,7 @@ var _default = function _default(props) {
   var handleOk = function handleOk() {
     setEditVisible(false);
     refreshAll();
+    getParentAndChildWorks();
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/okr-detail/components/okr-tree/tree-node/o-child-node/weight-input.js

@@ -60,7 +60,7 @@ var WeightInput = function WeightInput(props) {
   var onBlurHandler = function onBlurHandler(e) {
     var currentValue = e.currentTarget.value;
 
-    if (currentValue == "") {
+    if (currentValue.trim() == "") {
       onChange({
         workId: workId,
         value: 0,
@@ -82,7 +82,6 @@ var WeightInput = function WeightInput(props) {
     visible: isError
   }, /*#__PURE__*/_react["default"].createElement("input", {
     className: "".concat(precls, "__item-weight-input"),
-    type: "number",
     value: value,
     onChange: onChangeHandler,
     onBlur: onBlurHandler

package/lib/components/okr-detail/okr-list/index.js

@@ -473,7 +473,8 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       modifyOParent: onAddParentOkrHandler,
       removeKr: onKrRemoveHandler,
       removeParent: onParentRemoveHandler,
-      updateKrs: updateKrs
+      updateKrs: updateKrs,
+      getParentAndChildWorks: getParentAndChildWorks
     }
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])(preCls)

package/lib/pages/home/components/data-list/table/utils-function.js

@@ -109,85 +109,87 @@ var _default = function _default(source, params) {
       if (res.Code == 1) {
         var listData = [];
 
-        var _iterator = _createForOfIteratorHelper(res.Data.componentData),
-            _step;
-
-        try {
-          var _loop = function _loop() {
-            var item = _step.value;
-            listData.push({
-              columnId: item.workId,
-              okrType: 'O',
-              okrName: item.workName,
-              cycleTime: cycleTimeDisplay(item.cycleType, item.annualNum, item.yqmnum),
-              userInfo: {
-                name: item.principalUser.name,
-                avatarImg: item.principalUser.avatar.medium,
-                userId: item.principalUser.userId,
-                avatarColor: item.principalUser.avatar.color
-              },
-              riskLevel: item.manualRiskLevel,
-              progress: item.progress,
-              typeName: item.parentId > 0 || item.parentKrId > 0 ? '已对齐' : '未对齐',
-              updateTime: item.lastUpdatedDate,
-              status: item.status,
-              createDate: item.CreateDate,
-              behave: function behave() {
-                return _drawerManager["default"].open('okrDetail', {
-                  okrId: item.workId
-                });
-              }
-            });
-
-            if (item.Krs.length && source !== 'align') {
-              var _iterator2 = _createForOfIteratorHelper(item.Krs),
-                  _step2;
-
-              try {
-                var _loop2 = function _loop2() {
-                  var item1 = _step2.value;
-                  listData.push({
-                    columnId: item1.mileStoneId,
-                    okrType: 'KR',
-                    okrName: item1.mileStoneName,
-                    cycleTime: "".concat(item1.startDate.slice(-5), "~").concat(item1.endDate.slice(-5)),
-                    userInfo: {
-                      name: item1.user.name,
-                      avatarImg: item1.user.avatar.medium,
-                      userId: item1.user.userId,
-                      avatarColor: item1.user.avatar.color
-                    },
-                    riskLevel: item1.manualRiskLevel,
-                    progress: item1.progress,
-                    status: item1.status,
-                    updateTime: item1.progressDescriptionDate,
-                    createDate: item1.CreateDate,
-                    behave: function behave() {
-                      return _drawerManager["default"].open('krDetail', {
-                        krId: item1.mileStoneId
-                      });
-                    }
+        if (res.Data.componentData) {
+          var _iterator = _createForOfIteratorHelper(res.Data.componentData),
+              _step;
+
+          try {
+            var _loop = function _loop() {
+              var item = _step.value;
+              listData.push({
+                columnId: item.workId,
+                okrType: 'O',
+                okrName: item.workName,
+                cycleTime: cycleTimeDisplay(item.cycleType, item.annualNum, item.yqmnum),
+                userInfo: {
+                  name: item.principalUser.name,
+                  avatarImg: item.principalUser.avatar.medium,
+                  userId: item.principalUser.userId,
+                  avatarColor: item.principalUser.avatar.color
+                },
+                riskLevel: item.manualRiskLevel,
+                progress: item.progress,
+                typeName: item.parentId > 0 || item.parentKrId > 0 ? '已对齐' : '未对齐',
+                updateTime: item.lastUpdatedDate,
+                status: item.status,
+                createDate: item.CreateDate,
+                behave: function behave() {
+                  return _drawerManager["default"].open('okrDetail', {
+                    okrId: item.workId
                   });
-                };
-
-                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                  _loop2();
                 }
-              } catch (err) {
-                _iterator2.e(err);
-              } finally {
-                _iterator2.f();
+              });
+
+              if (item.Krs.length && source !== 'align') {
+                var _iterator2 = _createForOfIteratorHelper(item.Krs),
+                    _step2;
+
+                try {
+                  var _loop2 = function _loop2() {
+                    var item1 = _step2.value;
+                    listData.push({
+                      columnId: item1.mileStoneId,
+                      okrType: 'KR',
+                      okrName: item1.mileStoneName,
+                      cycleTime: "".concat(item1.startDate.slice(-5), "~").concat(item1.endDate.slice(-5)),
+                      userInfo: {
+                        name: item1.user.name,
+                        avatarImg: item1.user.avatar.medium,
+                        userId: item1.user.userId,
+                        avatarColor: item1.user.avatar.color
+                      },
+                      riskLevel: item1.manualRiskLevel,
+                      progress: item1.progress,
+                      status: item1.status,
+                      updateTime: item1.progressDescriptionDate,
+                      createDate: item1.CreateDate,
+                      behave: function behave() {
+                        return _drawerManager["default"].open('krDetail', {
+                          krId: item1.mileStoneId
+                        });
+                      }
+                    });
+                  };
+
+                  for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                    _loop2();
+                  }
+                } catch (err) {
+                  _iterator2.e(err);
+                } finally {
+                  _iterator2.f();
+                }
               }
-            }
-          };
+            };
 
-          for (_iterator.s(); !(_step = _iterator.n()).done;) {
-            _loop();
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              _loop();
+            }
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
           }
-        } catch (err) {
-          _iterator.e(err);
-        } finally {
-          _iterator.f();
         }
 
         dataList = listData;

package/package.json

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

package/src/components/dynamic/dynamic-item/dynamic-milestone/constant.ts

@@ -1,9 +1,6 @@
-export const EStatusClass2StatusTypeText = {
-  2: '已完成',
-  1: '进行中',
-  4: '已取消',
-  3: '已延迟',
-  6: '暂停中',
-  0: '未开始',
-  5: '未接受',
+export const MileStoneStatusClass2StatusTypeText = {
+  2: '未完成',
+  1: '未开始',
+  4: '已过期',
+  3: '已完成',
 }

package/src/components/dynamic/dynamic-item/dynamic-milestone/index.tsx

@@ -2,7 +2,7 @@ import React, { FC, useContext, useMemo, Fragment } from "react";
 import classNames from "classnames";
 import { IDynamicItemContentProps } from "../../interface";
 import DynamicItemHeader from "../components/header";
-import { EStatusClass2StatusTypeText } from "./constant";
+import { MileStoneStatusClass2StatusTypeText } from "./constant";
 import { EObjType, EStatusStatus2ClassType } from "../../constant";
 import { SearchKeyContext } from "../../context";
 import SearchKeyHandle from "../../../search-key-handle";
@@ -91,7 +91,7 @@ const DynamicMilestone: FC<IDynamicItemContentProps> = ({
           <div className={prefix + '__content-status-and-time-range'}>
             <i className={classNames(EStatusStatus2ClassType[status])} />
             <span className={prefix + '__content-status-text'}>
-              {EStatusClass2StatusTypeText[status]}
+              {MileStoneStatusClass2StatusTypeText[status]}
             </span>
             <i className={classNames('tu-icon-deferred')} />
             <span className={prefix + '__content-time-range'}>

package/src/components/dynamic/dynamic.tsx

@@ -223,15 +223,6 @@ const Dynamic: FC = () => {
 
   useEffect(() => {
     if (searchKeyWord || searchKeyType || searchUser) {
-      // 搜索跳到全部动态
-      if (searchKeyWord) {
-        setActiveFirstLevelTabKey(1006);
-        // @ts-ignore
-        const secondTabsArr = tabsInfo.find((item) => item.CodeId === 1006)
-          .ChildMenus;
-        setSecondTabs(secondTabsArr);
-        setActiveSecondLevelTabKey(secondTabsArr[0].CodeId);
-      }
       setIsChangeConditionLoading(true);
       resetValue();
       getDynamicData(true);

package/src/components/file-list/index.tsx

@@ -9,24 +9,25 @@ const prefix = "titaui-new-file-list";
 
 const FileList: FC<IFileListProps> = ({ data, showDownload = true }) => {
   const imgViewerRef = useRef();
-  const imageIndexRef = useRef(0);
+  const getImgIndex = (index) => {
+    let newIndex = 0;
+    for (let i = 0; i < index; i++) {
+      if (isImg(data[i].fileType)) {
+        newIndex++;
+      }
+    }
+    return newIndex;
+  }
+
   const handleImgPreview = (index) => {
     // @ts-ignore
-    imgViewerRef.current && imgViewerRef.current.show(index);
+    imgViewerRef.current && imgViewerRef.current.show(getImgIndex(index));
   };
 
-  const getIndex = (file) => {
-    let index = imageIndexRef.current;
-    if (isImg(file.fileType)) {
-      imageIndexRef.current = index + 1;
-    }
-    return index
-  }
-
   return (
     <div className={prefix}>
       {data.map((file, index) => (
-        <SingleFileCmp key={file.documentSource+index} data={file} index={getIndex(file)} showDownload={showDownload} onPreview={handleImgPreview} />
+        <SingleFileCmp key={file.documentId+index} data={file} index={index} showDownload={showDownload} onPreview={handleImgPreview} />
       ))}
       <ImgViewer showDownload={showDownload} data={data.filter(file => isImg(file.fileType))} ref={imgViewerRef}/>
     </div>

package/src/components/okr-detail/components/okr-tree/tree-node/o-child-node/index.js

@@ -2,7 +2,7 @@ import React, { useState, useContext } from "react";
 import classNames from "classnames";
 import { getBSGlobal } from "../../../../../../utils/bs-global";
 import { ChildAuth } from "../../../../../../utils/auth";
-import { CommonContext } from "../../../../context";
+import { CommonContext, OkrListContext } from "../../../../context";
 import { OkrRiskMapping } from "../../../../../progress/utils";
 import drawerManager from "../../../../../drawer-manager";
 import Progress from "../../../../../progress";
@@ -27,6 +27,7 @@ export default (props) => {
   const [editVisible, setEditVisible] = useState(false);
 
   const { refreshAll, okrInfo } = useContext(CommonContext);
+  const { getParentAndChildWorks } = useContext(OkrListContext);
   const [user] = useState(data.principalUser);
   const [OKrWeightSetting] = useState(
     getBSGlobal("OkrAdvancedSetting")?.KRSetting?.OKrWeight || false
@@ -58,6 +59,7 @@ export default (props) => {
   const handleOk = () => {
     setEditVisible(false);
     refreshAll();
+    getParentAndChildWorks()
   };
 
   return (

package/src/components/okr-detail/components/okr-tree/tree-node/o-child-node/weight-input.tsx

@@ -22,7 +22,7 @@ const WeightInput = (props: IProps) => {
 
   const onBlurHandler = (e) => {
     const currentValue = e.currentTarget.value;
-    if (currentValue == "") {
+    if (currentValue.trim() == "") {
       onChange({ workId, value: 0, isError: false });
       setIsError(false);
     }
@@ -45,7 +45,6 @@ const WeightInput = (props: IProps) => {
       >
         <input
           className={`${precls}__item-weight-input`}
-          type="number"
           value={value}
           onChange={onChangeHandler}
           onBlur={onBlurHandler}

package/src/components/okr-detail/okr-list/index.js

@@ -326,6 +326,7 @@ export default forwardRef((props, ref) => {
         removeKr: onKrRemoveHandler,
         removeParent: onParentRemoveHandler,
         updateKrs: updateKrs,
+        getParentAndChildWorks
       }}
     >
       <div className={classNames(preCls)}>

package/src/pages/home/components/data-list/table/utils-function.ts

@@ -81,46 +81,48 @@ export default (source, params): Promise<{ dataList: TableData[], dataTotal: num
     }).then(res => {
       if (res.Code == 1) {
         const listData: TableData[] = []
-        for (let item of res.Data.componentData) {
-          listData.push({
-            columnId: item.workId,
-            okrType: 'O',
-            okrName: item.workName,
-            cycleTime: cycleTimeDisplay(item.cycleType, item.annualNum, item.yqmnum),
-            userInfo: {
-              name: item.principalUser.name,
-              avatarImg: item.principalUser.avatar.medium,
-              userId: item.principalUser.userId,
-              avatarColor: item.principalUser.avatar.color
-            },
-            riskLevel: item.manualRiskLevel,
-            progress: item.progress,
-            typeName: item.parentId > 0 || item.parentKrId > 0 ? '已对齐' : '未对齐',
-            updateTime: item.lastUpdatedDate,
-            status: item.status,
-            createDate: item.CreateDate,
-            behave: () => drawerManager.open('okrDetail', { okrId: item.workId })
-          })
-          if (item.Krs.length && source !== 'align') {
-            for (let item1 of item.Krs) {
-              listData.push({
-                columnId: item1.mileStoneId,
-                okrType: 'KR',
-                okrName: item1.mileStoneName,
-                cycleTime: `${item1.startDate.slice(-5)}~${item1.endDate.slice(-5)}`,
-                userInfo: {
-                  name: item1.user.name,
-                  avatarImg: item1.user.avatar.medium,
-                  userId: item1.user.userId,
-                  avatarColor: item1.user.avatar.color
-                },
-                riskLevel: item1.manualRiskLevel,
-                progress: item1.progress,
-                status: item1.status,
-                updateTime: item1.progressDescriptionDate,
-                createDate: item1.CreateDate,
-                behave: () => drawerManager.open('krDetail', { krId: item1.mileStoneId })
-              })
+        if (res.Data.componentData) {
+          for (let item of res.Data.componentData) {
+            listData.push({
+              columnId: item.workId,
+              okrType: 'O',
+              okrName: item.workName,
+              cycleTime: cycleTimeDisplay(item.cycleType, item.annualNum, item.yqmnum),
+              userInfo: {
+                name: item.principalUser.name,
+                avatarImg: item.principalUser.avatar.medium,
+                userId: item.principalUser.userId,
+                avatarColor: item.principalUser.avatar.color
+              },
+              riskLevel: item.manualRiskLevel,
+              progress: item.progress,
+              typeName: item.parentId > 0 || item.parentKrId > 0 ? '已对齐' : '未对齐',
+              updateTime: item.lastUpdatedDate,
+              status: item.status,
+              createDate: item.CreateDate,
+              behave: () => drawerManager.open('okrDetail', { okrId: item.workId })
+            })
+            if (item.Krs.length && source !== 'align') {
+              for (let item1 of item.Krs) {
+                listData.push({
+                  columnId: item1.mileStoneId,
+                  okrType: 'KR',
+                  okrName: item1.mileStoneName,
+                  cycleTime: `${item1.startDate.slice(-5)}~${item1.endDate.slice(-5)}`,
+                  userInfo: {
+                    name: item1.user.name,
+                    avatarImg: item1.user.avatar.medium,
+                    userId: item1.user.userId,
+                    avatarColor: item1.user.avatar.color
+                  },
+                  riskLevel: item1.manualRiskLevel,
+                  progress: item1.progress,
+                  status: item1.status,
+                  updateTime: item1.progressDescriptionDate,
+                  createDate: item1.CreateDate,
+                  behave: () => drawerManager.open('krDetail', { krId: item1.mileStoneId })
+                })
+              }
             }
           }
         }