@titaui/pc 1.12.9-beta.1 → 1.12.10

package/lib/components/menus/export-modules/demo-menus/menu-highlight.js

@@ -25,7 +25,7 @@ var _default = /*#__PURE__*/function () {
   _createClass(_default, [{
     key: "highlight",
     value: function highlight(cb) {
-      if (this.isUnAssigned()) cb(_menus.PAGE_UNASSIGNED_DEMOFREE);else if (this.isAssigned()) cb(_menus.PAGE_ASSIGNED_DEMOFREE);else if (this.isReserved()) cb(_menus.PAGE_RESERVED_DEMOFREE);else if (this.isDone()) cb(_menus.PAGE_DONE_DEMOFREE);else if (this.isIgnore()) cb(_menus.PAGE_IGNORED_DEMOFREE);else if (this.isChart()) cb(_menus.PAGE_CHARTS_DEMOFREE);else if (this.isRechargeList()) cb(_menus.PAGE_RECHARGE_LIST);else if (this.isRechargeStatistics()) cb(_menus.PAGE_RECHARGE_STATISTICS);else if (this.isRechargeStatus()) cb(_menus.PAGE_RECHARGE_STATUS);else if (this.isDueDateOrder()) cb(_menus.PAGE_DUEDATE_ORDER);
+      if (this.isUnAssigned()) cb(_menus.PAGE_UNASSIGNED_DEMOFREE);else if (this.isAssigned()) cb(_menus.PAGE_ASSIGNED_DEMOFREE);else if (this.isReserved()) cb(_menus.PAGE_RESERVED_DEMOFREE);else if (this.isDone()) cb(_menus.PAGE_DONE_DEMOFREE);else if (this.isIgnore()) cb(_menus.PAGE_IGNORED_DEMOFREE);else if (this.isChart()) cb(_menus.PAGE_CHARTS_DEMOFREE);else if (this.isRechargeList()) cb(_menus.PAGE_RECHARGE_LIST);else if (this.isRechargeStatistics()) cb(_menus.PAGE_RECHARGE_STATISTICS);else if (this.isRechargeStatus()) cb(_menus.PAGE_RECHARGE_STATUS);else if (this.isDueDateOrder()) cb(_menus.PAGE_DUEDATE_ORDER);else if (this.isAllCustomer()) cb(_menus.PAGE_ALL_CUSTOMER);else if (this.isPublicCustomer()) cb(_menus.PAGE_PUBLIC_CUSTOMER);else if (this.isMyCustomer()) cb(_menus.PAGE_MY_CUSTOMER);
     }
   }, {
     key: "isChart",
@@ -102,6 +102,24 @@ var _default = /*#__PURE__*/function () {
           search = _this$history$locatio5.search;
       return pathname.match(/demofree/) && search.match(/selected[\s]*?=[\s]*?ignore/);
     }
+  }, {
+    key: "isPublicCustomer",
+    value: function isPublicCustomer() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/demofree\/customer\/public/);
+    }
+  }, {
+    key: "isMyCustomer",
+    value: function isMyCustomer() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/demofree\/customer\/my/);
+    }
+  }, {
+    key: "isAllCustomer",
+    value: function isAllCustomer() {
+      var pathname = this.history.location.pathname;
+      return pathname.match(/demofree\/customer\/all/);
+    }
   }]);
 
   return _default;

package/lib/components/menus/export-modules/demo-menus/menus.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.defaultRefObject = exports["default"] = exports.PAGE_UNASSIGNED_DEMOFREE = exports.PAGE_RESERVED_DEMOFREE = exports.PAGE_RECHARGE_STATUS = exports.PAGE_RECHARGE_STATISTICS = exports.PAGE_RECHARGE_LIST = exports.PAGE_IGNORED_DEMOFREE = exports.PAGE_DUEDATE_ORDER = exports.PAGE_DONE_DEMOFREE = exports.PAGE_CHARTS_DEMOFREE = exports.PAGE_ASSIGNED_DEMOFREE = void 0;
+exports.defaultRefObject = exports["default"] = exports.PAGE_UNASSIGNED_DEMOFREE = exports.PAGE_RESERVED_DEMOFREE = exports.PAGE_RECHARGE_STATUS = exports.PAGE_RECHARGE_STATISTICS = exports.PAGE_RECHARGE_LIST = exports.PAGE_PUBLIC_CUSTOMER = exports.PAGE_MY_CUSTOMER = exports.PAGE_IGNORED_DEMOFREE = exports.PAGE_DUEDATE_ORDER = exports.PAGE_DONE_DEMOFREE = exports.PAGE_CHARTS_DEMOFREE = exports.PAGE_CHARTS = exports.PAGE_ASSIGNED_DEMOFREE = exports.PAGE_ALL_CUSTOMER = void 0;
 
 var _index = require("../../components/menu-tree/tree-node/index");
 
@@ -40,6 +40,14 @@ var PAGE_IGNORED_DEMOFREE = "ignore";
 exports.PAGE_IGNORED_DEMOFREE = PAGE_IGNORED_DEMOFREE;
 var PAGE_CHARTS_DEMOFREE = "charts";
 exports.PAGE_CHARTS_DEMOFREE = PAGE_CHARTS_DEMOFREE;
+var PAGE_ALL_CUSTOMER = "allCustomer";
+exports.PAGE_ALL_CUSTOMER = PAGE_ALL_CUSTOMER;
+var PAGE_PUBLIC_CUSTOMER = "publicCustomer";
+exports.PAGE_PUBLIC_CUSTOMER = PAGE_PUBLIC_CUSTOMER;
+var PAGE_MY_CUSTOMER = "myCustomer";
+exports.PAGE_MY_CUSTOMER = PAGE_MY_CUSTOMER;
+var PAGE_CHARTS = "charts";
+exports.PAGE_CHARTS = PAGE_CHARTS;
 var PAGE_RECHARGE_LIST = "rechargeList";
 exports.PAGE_RECHARGE_LIST = PAGE_RECHARGE_LIST;
 var PAGE_DUEDATE_ORDER = "dueDateOrder";
@@ -91,6 +99,31 @@ var DemoMenuData = /*#__PURE__*/function () {
         href: "#/demofree/list?selected=ignore",
         isShow: this.isManager === EManagerType.Manager
       }]
+    }, {
+      icon: "KH-help",
+      label: "公海资源",
+      key: "customer",
+      href: "#/demofree/customer/public",
+      isShow: true,
+      children: [{
+        icon: "",
+        label: "全部客户",
+        key: PAGE_ALL_CUSTOMER,
+        href: "#/demofree/customer/all",
+        isShow: this.isManager === EManagerType.ReCharge || this.isManager === EManagerType.Manager
+      }, {
+        icon: "",
+        label: "公海资源",
+        key: PAGE_PUBLIC_CUSTOMER,
+        href: "#/demofree/customer/public",
+        isShow: this.isManager !== EManagerType.ReCharge
+      }, {
+        icon: "",
+        label: "我的资源",
+        key: PAGE_MY_CUSTOMER,
+        href: "#/demofree/customer/my",
+        isShow: this.isManager !== EManagerType.ReCharge
+      }]
     }, {
       icon: "KH-help",
       label: "客户续费",

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

@@ -15,43 +15,28 @@
   display: flex;
   align-items: center;
   padding: 0 32px 10px;
+  color: #89919F;
 }
 
-.export-map-modal__setting-color {
+.export-map-modal__color-trigger {
+  border-radius: 4px;
+  display: inline-block;
+  width: 30px;
   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;
-  border-radius: 16px;
-  margin-right: 4px;
+  cursor: pointer;
 }
 
-.export-map-modal__setting-color-trans {
-  cursor: pointer;
-  width: 20px;
-  height: 20px;
+.export-map-modal__color-trans {
+  border-radius: 4px;
+  display: inline-block;
+  width: 30px;
+  height: 30px;
   background: url("./trans1.png") no-repeat;
   background-size: cover;
-  border-radius: 16px;
+  margin-left: 10px;
+  cursor: pointer;
 }
 
 .export-map-modal .titaui-color-picker {

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

@@ -21,10 +21,6 @@ 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");
@@ -105,25 +101,8 @@ 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) {
@@ -155,7 +134,7 @@ var ExportMapModal = function ExportMapModal(props) {
 
               canvas = document.createElement('canvas'); // 创建一个canvas节点
 
-              scale = model.value; // 定义任意放大倍数 支持小数
+              scale = 20; // 定义任意放大倍数 支持小数
 
               canvas.width = width * scale; // 定义canvas 宽度 * 缩放
 
@@ -317,10 +296,6 @@ var ExportMapModal = function ExportMapModal(props) {
     setMapInstance(instance);
   };
 
-  var onChangeHandler = function onChangeHandler(data) {
-    setModel(data);
-  };
-
   var colorChangeHandler = function colorChangeHandler(colors) {
     setBgColor(colors ? colors.color : 'none');
   };
@@ -342,7 +317,7 @@ var ExportMapModal = function ExportMapModal(props) {
     title: (0, _getLocale.getLocale)('OKR_Ali_Exportmap'),
     noFooterLine: true,
     visible: visible,
-    width: "840px",
+    width: "1000px",
     onClose: onCloseHandler,
     onOk: confirmHandler,
     onCancel: onCloseHandler,
@@ -352,11 +327,9 @@ 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: 16
+      marginRight: 10
     }
   }, (0, _getLocale.getLocale)('OKR_Ali_Selectbackground')), /*#__PURE__*/_react["default"].createElement(_rcColorPicker["default"], {
     animation: "slide-up",
@@ -364,28 +337,12 @@ 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__setting-color-trans",
+    className: "export-map-modal__color-trigger"
+  })), /*#__PURE__*/_react["default"].createElement("span", {
+    className: "export-map-modal__color-trans",
     onClick: colorChangeHandler
-  }))), /*#__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, {
+  })), /*#__PURE__*/_react["default"].createElement("div", null, visible && /*#__PURE__*/_react["default"].createElement(_context2.CommonContext.Provider, {
     value: {
       direction: direction,
       showkr: showkr,
@@ -404,7 +361,7 @@ var ExportMapModal = function ExportMapModal(props) {
     zoomOnDoubleClick: false,
     paneMoveable: false,
     style: {
-      height: 446,
+      height: 600,
       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    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"])));
+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"])));
 
 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,7 +6,6 @@
   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,12 +52,9 @@ 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,
@@ -113,8 +110,6 @@ function PeriodSelector(_ref) {
   (0, _react.useEffect)(function () {
     if (selected) {
       setSelectedPeriod(selected);
-    } else if (lastSelected) {
-      setSelectedPeriod(lastSelected);
     }
   }, []);
   (0, _react.useEffect)(function () {
@@ -129,7 +124,7 @@ function PeriodSelector(_ref) {
 
           if (selected) {
             setSelectedPeriod(selected);
-          } else if (lastSelected) {} else {
+          } else {
             setSelectedPeriod((0, _common.getDefalutCycle)(res.Data));
             onChange && onChange((0, _common.getDefalutCycle)(res.Data));
           }
@@ -148,7 +143,7 @@ function PeriodSelector(_ref) {
   var popup = /*#__PURE__*/_react["default"].createElement(_selector["default"], {
     className: selectorClass,
     selected: selectedPeriod,
-    showCustom: isShowCustom ? isFetch ? cycleSetting.isOpenCustom : showCustom : isShowCustom,
+    showCustom: isFetch ? cycleSetting.isOpenCustom : showCustom,
     showFullCycle: showFullCycle,
     showMonth: isFetch ? cycleSetting.isOpenMonth : showMonth,
     showQuarter: isFetch ? cycleSetting.isOpenQuarter : showQuarter,

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

@@ -13,8 +13,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _popup = _interopRequireDefault(require("../popup"));
 
-var _tooltip = _interopRequireDefault(require("../tooltip"));
-
 var _getLocale = require("../../utils/getLocale");
 
 require("./index.css");
@@ -44,7 +42,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,
@@ -84,25 +82,13 @@ 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);
     }));
@@ -127,9 +113,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", {
@@ -150,7 +136,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,
@@ -158,7 +144,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,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.lableTypeMap = exports.isOpenWorkManage = exports.isOpenOkrManage = exports.isOpenLabel = exports.formatDateStr = void 0;
+exports.formatDateStr = void 0;
+exports.formatPeriodPlanData = formatPeriodPlanData;
+exports.lableTypeMap = exports.isOpenWorkManage = exports.isOpenOkrManage = exports.isOpenLabel = void 0;
 exports.momentDate = momentDate;
 exports.workStatus = exports.timeFormat = exports.preCls = exports.okrStatus = void 0;
 
@@ -11,6 +13,8 @@ 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
@@ -121,4 +125,55 @@ 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,6 +21,8 @@ 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");
@@ -83,11 +85,12 @@ 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
-    }, cycle));
+    }, planCycle));
   }, [status, keyWords, cycle, relation]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     ref: dilagRef

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

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