@titaui/pc 1.12.8 → 1.12.9-beta.1

package/lib/components/create-okr-modal/fields/okr-case.js

@@ -43,7 +43,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function OkrCase(_ref) {
   var onOkrApply = _ref.onOkrApply,
-      okrTemplateEnabled = _ref.okrTemplateEnabled;
+      okrTemplateEnabled = _ref.okrTemplateEnabled,
+      onVisibleChange = _ref.onVisibleChange;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -52,6 +53,7 @@ function OkrCase(_ref) {
 
   var okrCaseClickHandler = function okrCaseClickHandler() {
     setVisible(true);
+    onVisibleChange === null || onVisibleChange === void 0 ? void 0 : onVisibleChange(true);
   };
 
   var onCasesCloseHandler = function onCasesCloseHandler() {
@@ -62,13 +64,13 @@ function OkrCase(_ref) {
     onOkrApply === null || onOkrApply === void 0 ? void 0 : onOkrApply(data);
     setVisible(false);
 
-    _toast["default"].Success("成功套用");
+    _toast["default"].Success('成功套用');
   };
 
   return /*#__PURE__*/_react["default"].createElement(_style.Line, null, okrTemplateEnabled && !(0, _helpers.isLocal)() && !(0, _helpers.isTencentHr)() ? /*#__PURE__*/_react["default"].createElement(_style.CaseLink, {
     onClick: okrCaseClickHandler,
     className: "tu-icon-shoushi"
-  }, (0, _getLocale.getLocale)("OKR_MyO_Pop_Butt_AddfromOKR")) : null, okrTemplateEnabled && /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
+  }, (0, _getLocale.getLocale)('OKR_MyO_Pop_Butt_AddfromOKR')) : null, okrTemplateEnabled && /*#__PURE__*/_react["default"].createElement(_dialog["default"], {
     zIndex: 1200,
     noHeadLine: true,
     visible: visible,
@@ -78,8 +80,8 @@ function OkrCase(_ref) {
     noCloseIcon: true,
     destroyOnClose: true,
     style: {
-      width: "100%",
-      height: "100%"
+      width: '100%',
+      height: '100%'
     },
     maskClosable: true
   }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -613,32 +613,35 @@ function CreateOkrModal(_ref, ref) {
 
 
   var OnOkRApplyTplHandler = function OnOkRApplyTplHandler(data) {
-    setRichEditorStatus('refresh');
     var name = data.name,
         subelements = data.subelements;
-    setOkrNameData({
-      mentionUsers: [],
-      pureText: name,
-      pureTextExcludeAt: name,
-      richText: (0, _richEditor.TitaRichEditorInitTextState)(name)
-    });
-    setKrDatas(subelements.map(function (s) {
+    setOkrNameData(function () {
       return {
-        uuid: _uuid["default"].v1(),
-        principalId: Id,
-        principalName: Name,
-        userAvatar: UserAvatar,
-        krWeight: (0, _roundWeight.RoundWeight)(100 / subelements.length),
-        mileStoneName: s.name,
-        mileStoneNamePureTextExcludeAt: s.name,
-        mileStoneNameRichText: (0, _richEditor.TitaRichEditorInitTextState)(s.name),
-        aiteUsers: [],
-        confidenceIndex: 5
+        mentionUsers: [],
+        pureText: name,
+        pureTextExcludeAt: name,
+        richText: (0, _richEditor.TitaRichEditorInitTextState)(name)
       };
-    }));
+    });
+    setKrDatas(function () {
+      return subelements.map(function (s) {
+        return {
+          uuid: _uuid["default"].v1(),
+          principalId: Id,
+          principalName: Name,
+          userAvatar: UserAvatar,
+          krWeight: (0, _roundWeight.RoundWeight)(100 / subelements.length),
+          mileStoneName: s.name,
+          mileStoneNamePureTextExcludeAt: s.name,
+          mileStoneNameRichText: (0, _richEditor.TitaRichEditorInitTextState)(s.name),
+          aiteUsers: [],
+          confidenceIndex: 5
+        };
+      });
+    });
     setIsCustomWeight(false);
     setIsApplyTpl(true);
-    setRichEditorStatus('initialization');
+    setRichEditorStatus('refresh');
   };
 
   (0, _react.useEffect)(function () {
@@ -795,7 +798,11 @@ function CreateOkrModal(_ref, ref) {
       className: "create-modal__title"
     }, (0, _getLocale.getLocale)('OKR_MyO_Pop_Title_Newobjective')), /*#__PURE__*/_react["default"].createElement(_okrCase["default"], {
       okrTemplateEnabled: true,
-      onOkrApply: OnOkRApplyTplHandler
+      onOkrApply: OnOkRApplyTplHandler,
+      onVisibleChange: function onVisibleChange() {
+        setIsApplyTpl(false);
+        setRichEditorStatus('initialization');
+      }
     }));
   }, []);
   var krCheckFinalResult = (0, _react.useMemo)(function () {
@@ -917,6 +924,7 @@ function CreateOkrModal(_ref, ref) {
     setONameCheckResult: setONameCheckResult,
     setIsInputContent: setIsInputContent
   }), /*#__PURE__*/_react["default"].createElement(_krDatas["default"], {
+    isApplyTpl: isApplyTpl,
     isCustomWeight: isCustomWeight,
     wrapperRef: wrapperRef,
     krDatas: krDatas,

package/lib/components/create-okr-modal/kr-items/krDatas.js

@@ -62,7 +62,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function KrDatas(props) {
-  var isCustomWeight = props.isCustomWeight,
+  var isApplyTpl = props.isApplyTpl,
+      isCustomWeight = props.isCustomWeight,
       wrapperRef = props.wrapperRef,
       setKrDatas = props.setKrDatas,
       krDatas = props.krDatas,
@@ -286,7 +287,7 @@ function KrDatas(props) {
   }, [inputKrInfo, setIsInputContent]);
   (0, _react.useEffect)(function () {
     krDatasRef.current = krDatas;
-  }, []);
+  }, [isApplyTpl]);
   return /*#__PURE__*/_react["default"].createElement("div", null, krDatasRef.current.map(function (kr, index) {
     return /*#__PURE__*/_react["default"].createElement(_krItem["default"], {
       key: kr === null || kr === void 0 ? void 0 : kr.uuid,

package/lib/components/okr-flow/export-modal/index.css

@@ -15,28 +15,43 @@
   display: flex;
   align-items: center;
   padding: 0 32px 10px;
-  color: #89919F;
 }
 
-.export-map-modal__color-trigger {
-  border-radius: 4px;
-  display: inline-block;
-  width: 30px;
+.export-map-modal__setting-color {
   height: 30px;
+  display: flex;
+  align-items: center;
+  padding: 0 12px;
+  background: #FFFFFF;
+  border-radius: 16px;
+  border: 1px solid #E9ECF0;
+  font-size: 14px;
+  font-weight: 400;
+  color: #141C28;
+  margin-right: 12px;
+}
+
+.export-map-modal__setting-color:hover {
+  border: 1px solid #2879ff;
+}
+
+.export-map-modal__setting-color-trigger {
+  cursor: pointer;
+  width: 20px;
+  height: 20px;
   background: url("./color.png") no-repeat;
   background-size: cover;
-  cursor: pointer;
+  border-radius: 16px;
+  margin-right: 4px;
 }
 
-.export-map-modal__color-trans {
-  border-radius: 4px;
-  display: inline-block;
-  width: 30px;
-  height: 30px;
+.export-map-modal__setting-color-trans {
+  cursor: pointer;
+  width: 20px;
+  height: 20px;
   background: url("./trans1.png") no-repeat;
   background-size: cover;
-  margin-left: 10px;
-  cursor: pointer;
+  border-radius: 16px;
 }
 
 .export-map-modal .titaui-color-picker {

package/lib/components/okr-flow/export-modal/index.js

@@ -21,6 +21,10 @@ var _toast = _interopRequireDefault(require("../../toast"));
 
 var _dialog = _interopRequireDefault(require("../../dialog"));
 
+var _tooltip = _interopRequireDefault(require("../../tooltip"));
+
+var _selectLayer = _interopRequireDefault(require("../../select-layer"));
+
 var _utils = require("../utils");
 
 var _context2 = require("../context");
@@ -101,8 +105,25 @@ var ExportMapModal = function ExportMapModal(props) {
       isExport = _useState6[0],
       setIsExport = _useState6[1];
 
+  var _useState7 = (0, _react.useState)({
+    label: (0, _getLocale.getLocale)('Rep_NewS_HDmode'),
+    value: 20
+  }),
+      _useState8 = _slicedToArray(_useState7, 2),
+      model = _useState8[0],
+      setModel = _useState8[1];
+
   var modalRef = (0, _react.useRef)();
   var virtualElements = (0, _react.useRef)([]);
+  var models = [{
+    label: (0, _getLocale.getLocale)('Rep_NewS_Standardmode'),
+    value: 10,
+    toolText: (0, _getLocale.getLocale)('Rep_NewS_SmallFileSuita')
+  }, {
+    label: (0, _getLocale.getLocale)('Rep_NewS_HDmode'),
+    value: 20,
+    toolText: (0, _getLocale.getLocale)('Rep_NewS_LargeileSize')
+  }];
   (0, _react.useEffect)(function () {
     if ((0, _bsGlobal.isWx)() && window.WWOpenData) {
       if (window.WWOpenData.enableCanvasSharing) {
@@ -134,7 +155,7 @@ var ExportMapModal = function ExportMapModal(props) {
 
               canvas = document.createElement('canvas'); // 创建一个canvas节点
 
-              scale = 20; // 定义任意放大倍数 支持小数
+              scale = model.value; // 定义任意放大倍数 支持小数
 
               canvas.width = width * scale; // 定义canvas 宽度 * 缩放
 
@@ -296,6 +317,10 @@ var ExportMapModal = function ExportMapModal(props) {
     setMapInstance(instance);
   };
 
+  var onChangeHandler = function onChangeHandler(data) {
+    setModel(data);
+  };
+
   var colorChangeHandler = function colorChangeHandler(colors) {
     setBgColor(colors ? colors.color : 'none');
   };
@@ -317,7 +342,7 @@ var ExportMapModal = function ExportMapModal(props) {
     title: (0, _getLocale.getLocale)('OKR_Ali_Exportmap'),
     noFooterLine: true,
     visible: visible,
-    width: "1000px",
+    width: "840px",
     onClose: onCloseHandler,
     onOk: confirmHandler,
     onCancel: onCloseHandler,
@@ -327,9 +352,11 @@ var ExportMapModal = function ExportMapModal(props) {
     forceRender: true
   }, /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
     className: "export-map-modal__setting"
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "export-map-modal__setting-color"
   }, /*#__PURE__*/_react["default"].createElement("span", {
     style: {
-      marginRight: 10
+      marginRight: 16
     }
   }, (0, _getLocale.getLocale)('OKR_Ali_Selectbackground')), /*#__PURE__*/_react["default"].createElement(_rcColorPicker["default"], {
     animation: "slide-up",
@@ -337,12 +364,28 @@ var ExportMapModal = function ExportMapModal(props) {
     onChange: colorChangeHandler,
     className: "titaui-color-picker",
     mode: "HSB"
+  }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: (0, _getLocale.getLocale)('Mod_Customization'),
+    placement: "top"
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "export-map-modal__setting-color-trigger"
+  }))), /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: (0, _getLocale.getLocale)('OKR_Ali_Butt_Transparent'),
+    placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("span", {
-    className: "export-map-modal__color-trigger"
-  })), /*#__PURE__*/_react["default"].createElement("span", {
-    className: "export-map-modal__color-trans",
+    className: "export-map-modal__setting-color-trans",
     onClick: colorChangeHandler
-  })), /*#__PURE__*/_react["default"].createElement("div", null, visible && /*#__PURE__*/_react["default"].createElement(_context2.CommonContext.Provider, {
+  }))), /*#__PURE__*/_react["default"].createElement(_selectLayer["default"], {
+    onChangeSelect: onChangeHandler,
+    items: models,
+    initValue: model.value
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "titaui-search-dropdown"
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "titaui-search-dropdown__text"
+  }, model.label), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "tu-icon-sort-down"
+  })))), /*#__PURE__*/_react["default"].createElement("div", null, visible && /*#__PURE__*/_react["default"].createElement(_context2.CommonContext.Provider, {
     value: {
       direction: direction,
       showkr: showkr,
@@ -361,7 +404,7 @@ var ExportMapModal = function ExportMapModal(props) {
     zoomOnDoubleClick: false,
     paneMoveable: false,
     style: {
-      height: 600,
+      height: 446,
       width: '100%',
       background: bgColor
     }

package/lib/components/period-selector/components/button/style.js

@@ -13,7 +13,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
-var DefaultWrapper = _styledComponents["default"].button(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  box-sizing: border-box;\n  display: inline-flex;\n\n  align-items: center;\n  justify-content: center;\n  color: #6f7886;\n  cursor: pointer;\n  outline: none;\n  transition: color 0.3s ease, border 0.3s ease;\n  background: transparent;\n  border-radius: 3px;\n  border: 1px solid #e9ecf0;\n  &.btn-size-m {\n    min-width: 90px;\n    height: 36px;\n    padding: 0 18px;\n    font-size: 14px;\n    font-weight: 400;\n  }\n  &.btn-size-s {\n    min-width: 68px;\n    height: 26px;\n    padding: 0 20px;\n    font-size: 13px;\n    font-weight: 400;\n  }\n  :hover {\n    color: #2879ff;\n    border-color: #2879ff;\n  }\n  :disabled {\n    cursor: not-allowed;\n    background-color: #f0f2f5;\n    color: #a4acb9;\n    border: none;\n    :hover {\n      border: none;\n      color: #bfc7d5;\n      opacity: 1;\n      background-color: #f0f2f5;\n    }\n  }\n"])));
+var DefaultWrapper = _styledComponents["default"].button(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  box-sizing: border-box;\n  display: inline-flex;\n\n  align-items: center;\n  justify-content: center;\n  color: #6f7886;\n  cursor: pointer;\n  outline: none;\n  transition: color 0.3s ease, border 0.3s ease;\n  background: transparent;\n  border-radius: 3px;\n  border: 1px solid #e9ecf0;\n  &.btn-size-m {\n    min-width: 90px;\n    height: 36px;\n    border-radius: 18px;\n    padding: 0 18px;\n    font-size: 14px;\n    font-weight: 400;\n  }\n  &.btn-size-s {\n    min-width: 68px;\n    height: 26px;\n    padding: 0 20px;\n    font-size: 13px;\n    font-weight: 400;\n  }\n  :hover {\n    color: #2879ff;\n    border-color: #2879ff;\n  }\n  :disabled {\n    cursor: not-allowed;\n    background-color: #f0f2f5;\n    color: #a4acb9;\n    border: none;\n    :hover {\n      border: none;\n      color: #bfc7d5;\n      opacity: 1;\n      background-color: #f0f2f5;\n    }\n  }\n"])));
 
 exports.DefaultWrapper = DefaultWrapper;
 var PrimaryWrapper = (0, _styledComponents["default"])(DefaultWrapper)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  color: #ffffff;\n  background: #2879ff;\n  border: none;\n  :hover {\n    color: #ffffff;\n    background-color: #5c8eff;\n    border: none;\n  }\n"])));

package/lib/components/period-selector/index.css

@@ -6,6 +6,7 @@
   font-size: 16px;
   transform: scale(0.5);
   margin-left: 4px;
+  color: #6f7886;
 }
 
 .titaui-period-selector__down-arrow {

package/lib/components/period-selector/index.js

@@ -52,9 +52,12 @@ function PeriodSelector(_ref) {
       onChange = _ref.onChange,
       getPopupContainer = _ref.getPopupContainer,
       selected = _ref.selected,
+      lastSelected = _ref.lastSelected,
       selectorClass = _ref.selectorClass,
       _ref$showCustom = _ref.showCustom,
       showCustom = _ref$showCustom === void 0 ? true : _ref$showCustom,
+      _ref$isShowCustom = _ref.isShowCustom,
+      isShowCustom = _ref$isShowCustom === void 0 ? true : _ref$isShowCustom,
       _ref$showFullCycle = _ref.showFullCycle,
       showFullCycle = _ref$showFullCycle === void 0 ? true : _ref$showFullCycle,
       _ref$showMonth = _ref.showMonth,
@@ -110,6 +113,8 @@ function PeriodSelector(_ref) {
   (0, _react.useEffect)(function () {
     if (selected) {
       setSelectedPeriod(selected);
+    } else if (lastSelected) {
+      setSelectedPeriod(lastSelected);
     }
   }, []);
   (0, _react.useEffect)(function () {
@@ -124,7 +129,7 @@ function PeriodSelector(_ref) {
 
           if (selected) {
             setSelectedPeriod(selected);
-          } else {
+          } else if (lastSelected) {} else {
             setSelectedPeriod((0, _common.getDefalutCycle)(res.Data));
             onChange && onChange((0, _common.getDefalutCycle)(res.Data));
           }
@@ -143,7 +148,7 @@ function PeriodSelector(_ref) {
   var popup = /*#__PURE__*/_react["default"].createElement(_selector["default"], {
     className: selectorClass,
     selected: selectedPeriod,
-    showCustom: isFetch ? cycleSetting.isOpenCustom : showCustom,
+    showCustom: isShowCustom ? isFetch ? cycleSetting.isOpenCustom : showCustom : isShowCustom,
     showFullCycle: showFullCycle,
     showMonth: isFetch ? cycleSetting.isOpenMonth : showMonth,
     showQuarter: isFetch ? cycleSetting.isOpenQuarter : showQuarter,

package/lib/components/select-layer/index.js

@@ -13,6 +13,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _popup = _interopRequireDefault(require("../popup"));
 
+var _tooltip = _interopRequireDefault(require("../tooltip"));
+
 var _getLocale = require("../../utils/getLocale");
 
 require("./index.css");
@@ -42,7 +44,7 @@ var SelectLayer = function SelectLayer(props) {
       onChangeSelect = props.onChangeSelect,
       items = props.items,
       _props$initText = props.initText,
-      initText = _props$initText === void 0 ? (0, _getLocale.getLocale)("OKR_MyO_E_Temporarilynone") : _props$initText,
+      initText = _props$initText === void 0 ? (0, _getLocale.getLocale)('OKR_MyO_E_Temporarilynone') : _props$initText,
       popupProps = props.popupProps,
       renderPrefixIcon = props.renderPrefixIcon,
       renderSuffixIcon = props.renderSuffixIcon,
@@ -82,13 +84,25 @@ var SelectLayer = function SelectLayer(props) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "select-layout__layer-select-wrapper"
     }, items.map(function (item, index) {
+      if (item.toolText) return /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+        placement: "top",
+        overlay: item.toolText
+      }, /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("div", {
+        key: index,
+        onClick: function onClick(e) {
+          return handleSelectItem(item);
+        },
+        className: (0, _classnames["default"])('select-layout__layer-select-text', {
+          'select-layout__layer-select-text--active': selectItem && item.value === selectItem.value
+        })
+      }, item.label)));
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: index,
         onClick: function onClick(e) {
           return handleSelectItem(item);
         },
-        className: (0, _classnames["default"])("select-layout__layer-select-text", {
-          "select-layout__layer-select-text--active": selectItem && item.value === selectItem.value
+        className: (0, _classnames["default"])('select-layout__layer-select-text', {
+          'select-layout__layer-select-text--active': selectItem && item.value === selectItem.value
         })
       }, item.label);
     }));
@@ -113,9 +127,9 @@ var SelectLayer = function SelectLayer(props) {
     }
 
     return /*#__PURE__*/_react["default"].createElement("div", {
-      className: (0, _classnames["default"])("select-layout__layer-text", {
-        "select-layout__layer-text--focus": visible && canEdit,
-        "select-layout__layer-text--hidden-border": !canEdit
+      className: (0, _classnames["default"])('select-layout__layer-text', {
+        'select-layout__layer-text--focus': visible && canEdit,
+        'select-layout__layer-text--hidden-border': !canEdit
       }),
       onClick: handleClickText
     }, renderPrefixIcon && /*#__PURE__*/_react["default"].createElement("span", {
@@ -136,7 +150,7 @@ var SelectLayer = function SelectLayer(props) {
   // @ts-ignore
   _react["default"].createElement(_popup["default"], _extends({
     popupVisible: visible,
-    action: ["click"],
+    action: ['click'],
     destroyPopupOnHide: true,
     popup: renderSelection,
     mask: false,
@@ -144,7 +158,7 @@ var SelectLayer = function SelectLayer(props) {
       return popupRef.current;
     },
     popupStyle: {
-      width: "100%"
+      width: '100%'
     }
   }, popupProps, {
     onPopupVisibleChange: function onPopupVisibleChange(visible) {

package/lib/components/task-relation-modal/helper.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatDateStr = void 0;
-exports.formatPeriodPlanData = formatPeriodPlanData;
-exports.lableTypeMap = exports.isOpenWorkManage = exports.isOpenOkrManage = exports.isOpenLabel = void 0;
+exports.lableTypeMap = exports.isOpenWorkManage = exports.isOpenOkrManage = exports.isOpenLabel = exports.formatDateStr = void 0;
 exports.momentDate = momentDate;
 exports.workStatus = exports.timeFormat = exports.preCls = exports.okrStatus = void 0;
 
@@ -13,8 +11,6 @@ var _bsGlobal = require("../../utils/bs-global");
 
 var _getLocale = require("../../utils/getLocale");
 
-var _planDataJson = require("../../utils/planDataJson");
-
 var preCls = "titaui-task-relation";
 exports.preCls = preCls;
 var isOpenOkrManage = (0, _bsGlobal.getAppHead)("113"); // 开通OKR
@@ -125,55 +121,4 @@ exports.workStatus = workStatus;
 function momentDate(date) {
   var reg = new RegExp('年|月|日', 'g');
   return date.replace(reg, '/').slice(0, -1);
-}
-
-function formatPeriodPlanData(period) {
-  var planData; // 获取选取年份的 dataJSON
-
-  var yearGroup = (0, _planDataJson.PlanDataJson)().find(function (p) {
-    return p.GroupName == period.annualNum + '';
-  }); // 年份下的 ‘年/季’ data
-
-  var seasonData = yearGroup ? yearGroup.PlanTableListModels.find(function (item) {
-    return item.TagName == (0, _getLocale.getLocale)('Tasks_Menu_Yearseason');
-  }) : null;
-
-  switch (period.cycleType) {
-    // case '-1': // 全部周期
-    //     break;
-    case '0':
-      planData = {
-        StartDate: period.startDate,
-        EndDate: period.endDate
-      };
-      break;
-
-    case '1':
-      // 年度
-      planData = seasonData ? seasonData.PlanTableModels[0] : null;
-      break;
-
-    case '2':
-      planData = seasonData ? seasonData.PlanTableModels[period.yqmNum] : null; // 季度
-
-      break;
-
-    case '3':
-      // @ts-ignore
-      var monthData = yearGroup ? yearGroup.PlanTableListModels.find(function (p) {
-        return p.TagName == period.yqmNum + '月';
-      }) : null;
-      planData = monthData ? monthData.PlanTableModels[0] : null;
-      break;
-
-    default:
-      break;
-  }
-
-  return {
-    endDate: planData ? period.cycleType == '0' ? planData.EndDate : momentDate(planData.EndDate || '') : '',
-    planTableId: planData && planData.PlanTableId,
-    planTableType: planData && planData.PlanTableType,
-    startDate: planData ? period.cycleType == '0' ? planData.StartDate : momentDate(planData.StartDate || '') : ''
-  };
 }

package/lib/components/task-relation-modal/okr-relation/relation-task-model/search-form.js

@@ -21,8 +21,6 @@ var _taskStatusSelect = _interopRequireDefault(require("../../search/task-status
 
 var _taskRelation = _interopRequireDefault(require("../../search/task-relation"));
 
-var _helper = require("../../helper");
-
 var _formatTime = require("../../../../utils/format-time");
 
 var _getLocale = require("../../../../utils/getLocale");
@@ -85,12 +83,11 @@ function SearchForm(props) {
 
   var dilagRef = (0, _react.useRef)(document.createElement('div'));
   (0, _react.useEffect)(function () {
-    var planCycle = (0, _helper.formatPeriodPlanData)(cycle);
     onChange(_objectSpread({
       status: status,
       keyWords: keyWords,
       relation: relation
-    }, planCycle));
+    }, cycle));
   }, [status, keyWords, cycle, relation]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     ref: dilagRef

package/lib/components/task-relation-modal/okr-relation/request-api.js

@@ -32,10 +32,6 @@ var planTableTask = function planTableTask(params, pageNum, pageSize) {
       keyWords = _params$keyWords === void 0 ? '' : _params$keyWords,
       _params$status = params.status,
       status = _params$status === void 0 ? 10 : _params$status,
-      _params$planTableId = params.planTableId,
-      planTableId = _params$planTableId === void 0 ? '' : _params$planTableId,
-      _params$planTableType = params.planTableType,
-      planTableType = _params$planTableType === void 0 ? '' : _params$planTableType,
       _params$relation = params.relation,
       relation = _params$relation === void 0 ? 0 : _params$relation;
 
@@ -54,8 +50,8 @@ var planTableTask = function planTableTask(params, pageNum, pageSize) {
     EndDate: endDate,
     startNum: pageNum,
     count: pageSize,
-    planTableId: planTableId,
-    planTableType: planTableType,
+    // planTableId: planTableId,
+    // planTableType: planTableType,
     fromLevel: 1,
     toLevel: 1,
     RelationType: relation,

package/lib/components/task-relation-modal/request-api.js

@@ -90,7 +90,9 @@ var workData = function workData(params, pageNum, pageSize) {
       status = _params$status === void 0 ? 0 : _params$status,
       _params$relation = params.relation,
       relation = _params$relation === void 0 ? 0 : _params$relation,
-      userIds = params.userIds;
+      userIds = params.userIds,
+      _params$isGetMileston = params.isGetMilestone,
+      isGetMilestone = _params$isGetMileston === void 0 ? false : _params$isGetMileston;
   var url = "work/list?toUserId=".concat(userIds || (0, _helpers.getLoginUserInfo)().Id);
   return (0, _request.rpost)("v1")(url, {
     keyWords: keyWords,
@@ -99,7 +101,8 @@ var workData = function workData(params, pageNum, pageSize) {
     pageSize: pageSize,
     relation: relation,
     status: status,
-    userIds: userIds
+    userIds: userIds,
+    isGetMilestone: isGetMilestone
   }).then(function (res) {
     return res;
   });