@titaui/pc 1.12.22-beta.8 → 1.12.22-beta.9

package/lib/components/drawer/index.js

@@ -150,7 +150,8 @@ function DrawerHeader(_ref) {
       detailInfo = _ref.detailInfo;
   var drawer = (0, _react.useContext)(DrawerContext);
   var manager = (0, _react.useContext)(_context["default"]);
-  var showClose = closable && (!!onClose || !!drawer);
+  var showClose = closable;
+  debugger;
   if (!showClose && !(actions && actions.length) && !content) return null;
   var displayActions = actions || [];
   var collapsedActions = [];

package/lib/components/drawer-manager/drawerWrapper.js

@@ -63,7 +63,8 @@ var transDuration = 200;
 function DrawerWrapper(_ref, ref) {
   var _classNames;
 
-  var getContainer = _ref.getContainer;
+  var getContainer = _ref.getContainer,
+      onCloseDrawer = _ref.onCloseDrawer;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -195,7 +196,8 @@ function DrawerWrapper(_ref, ref) {
   return /*#__PURE__*/_react["default"].createElement(_drawer["default"], _extends({}, drawerProps, {
     visible: visible,
     onClose: function onClose() {
-      return manager && manager.close();
+      manager && manager.close();
+      onCloseDrawer && onCloseDrawer(setVisible);
     },
     afterVisibleChange: afterVisibleChange,
     getContainer: getContainer

package/lib/components/drawer-manager/index.js

@@ -139,7 +139,9 @@ var DrawerManager = /*#__PURE__*/function () {
   _createClass(DrawerManager, [{
     key: "drawer",
     get: function get() {
-      var _this2 = this;
+      var _this2 = this,
+          _this$history2,
+          _this$history2$props;
 
       if (this._drawer) return this._drawer;
 
@@ -171,7 +173,8 @@ var DrawerManager = /*#__PURE__*/function () {
         },
         getContainer: function getContainer() {
           return _this2.el;
-        }
+        },
+        onCloseDrawer: (_this$history2 = this.history[this.history.length - 1]) === null || _this$history2 === void 0 ? void 0 : (_this$history2$props = _this$history2.props) === null || _this$history2$props === void 0 ? void 0 : _this$history2$props.onClose
       })), this.getEl());
 
       return this._drawer;

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

@@ -13,6 +13,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _avatar = _interopRequireDefault(require("../../../../avatar"));
 
+var _dropSelector = _interopRequireWildcard(require("../../../../drop-selector"));
+
 var _requestApi = require("../../../request-api");
 
 var _dialogConfirm = _interopRequireWildcard(require("../../../../dialog-confirm"));
@@ -21,6 +23,8 @@ var _toast = _interopRequireDefault(require("../../../../toast"));
 
 var _openData = require("../../../../../utils/open-data");
 
+var _conditionRender = _interopRequireDefault(require("../../../../condition-render"));
+
 var _tooltip = _interopRequireDefault(require("../../../../tooltip"));
 
 var _constant = require("../../../constant");
@@ -71,6 +75,7 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       _data$isCollect = data.isCollect,
       isCollect = _data$isCollect === void 0 ? false : _data$isCollect,
       feedType = data.feedType;
+  var isOldSummary = feedType === _constant.EFeedType.Report && !data.newSummary;
 
   var _useState = (0, _react.useState)(isTop),
       _useState2 = _slicedToArray(_useState, 2),
@@ -261,7 +266,43 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
       name: user.name,
       id: user.userId
     })
-  })), desc, suffixContent)), /*#__PURE__*/_react["default"].createElement("div", {
+  })), desc, suffixContent), !isOldSummary && /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__more-operate")
+  }, /*#__PURE__*/_react["default"].createElement(_dropSelector["default"], {
+    popupPlacement: "bottomRight",
+    checked: ["collect"],
+    onChange: onChangeHandler,
+    multi: false,
+    visible: selectVisible,
+    trigger: /*#__PURE__*/_react["default"].createElement("span", {
+      className: (0, _classnames["default"])("".concat(prefix, "-right"), "tu-icon-more1"),
+      onClick: handleShowDropSelector
+    })
+  }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
+    name: "collect"
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__more-operate-selection")
+  }, /*#__PURE__*/_react["default"].createElement("i", {
+    className: (0, _classnames["default"])("tu-icon-APP-shoucang", "".concat(prefix, "__more-operate-selection-icon"))
+  }), nowIsCollect ? (0, _getLocale.getLocale)("Mod_CancCollection") : (0, _getLocale.getLocale)("Mod_Collection"))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: showTopping
+  }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
+    name: "top",
+    onClick: handleTopOperateClick
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__more-operate-selection")
+  }, /*#__PURE__*/_react["default"].createElement("i", {
+    className: (0, _classnames["default"])("tu-icon-zhiding", "".concat(prefix, "__more-operate-selection-icon"))
+  }), nowIsTop ? (0, _getLocale.getLocale)("OKR_MyO_Unpinned") : (0, _getLocale.getLocale)("Feed_Top")))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: showDelete
+  }, /*#__PURE__*/_react["default"].createElement(_dropSelector.Item, {
+    name: "delete",
+    onClick: handleDeleteClick
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__more-operate-selection")
+  }, /*#__PURE__*/_react["default"].createElement("i", {
+    className: (0, _classnames["default"])("tu-icon-del", "".concat(prefix, "__more-operate-selection-icon"))
+  }), (0, _getLocale.getLocale)("Mod_Delete"))))))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "-desc-time")
   }, createDate))), renderDialogConfirm);
 };

package/lib/components/dynamic/dynamic-item/components/summary-header/index.css

@@ -15,7 +15,6 @@
 
 .titaui-dynamic-new-summary-header-left .titaui-pc-avator-container {
   display: inline-flex;
-  align-items: center;
 }
 
 .titaui-dynamic-new-summary-header-right {

package/lib/components/picker/components/panels/week-panel/utils.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.endTime = endTime;
-exports.getWeeksNum = exports.getWeekNumber = exports.getPointYearMonthWeeksRange = exports.getPointYearMonthWeekStartTimeAndEndTime = exports.getDaysOfMonth = void 0;
+exports.getWeeksNum = exports.getWeekNumber = exports.getWeek = exports.getPointYearMonthWeeksRange = exports.getPointYearMonthWeekStartTimeAndEndTime = exports.getDaysOfMonth = void 0;
 exports.startTime = startTime;
 
 //获取当前日期在这个月是第几周
@@ -119,6 +119,28 @@ var getPointYearMonthWeeksRange = function getPointYearMonthWeeksRange(year, mon
   }
 
   return result;
+}; //获取某个日期处于的年月周
+
+
+exports.getPointYearMonthWeeksRange = getPointYearMonthWeeksRange;
+
+var getWeek = function getWeek(date) {
+  var month = date.getMonth() + 1; // 先计算出该日期为第几周
+
+  var week = Math.ceil(date.getDate() / 7);
+  var year = date.getFullYear(); // 判断这个月前7天是周几，如果不是周一，则计入上个月
+
+  if (date.getDate() < 7) {
+    if (date.getDay() !== 1) {
+      var preMonthDate = new Date(date.valueOf());
+      preMonthDate.setDate(0);
+      week = getWeek(new Date("".concat(preMonthDate.getFullYear(), "/").concat(preMonthDate.getMonth() + 1, "/").concat(preMonthDate.getDate())))[0];
+      month = preMonthDate.getMonth() + 1;
+      year = preMonthDate.getFullYear();
+    }
+  }
+
+  return [week, month, year];
 };
 
-exports.getPointYearMonthWeeksRange = getPointYearMonthWeeksRange;
+exports.getWeek = getWeek;

package/lib/components/picker/components/panels/week-panel/week-body.js

@@ -28,14 +28,22 @@ var preCls = 'titaui__picker';
 var WeekPanelBody = function WeekPanelBody(props) {
   var viewDate = props.viewDate,
       onSelect = props.onSelect;
-  var currentYear = new Date().getFullYear();
-  var currentMonth = new Date().getMonth() + 1;
-  var currentWeek = (0, _utils.getWeekNumber)(new Date());
 
   var getCells = function getCells(date) {
-    var year = (0, _moment["default"])(date).format('YYYY'); //获取年
-
-    var month = (0, _moment["default"])(date).format('MM'); //获取月
+    var currentYear = (0, _utils.getWeek)(new Date(new Date()))[2];
+    var currentMonth = (0, _utils.getWeek)(new Date(new Date()))[1];
+    var currentWeek = (0, _utils.getWeek)(new Date(new Date()))[0];
+    var year = Number((0, _moment["default"])(date).format('YYYY')); //获取年
+
+    var month = Number((0, _moment["default"])(date).format('MM'));
+    var dateYear = Number((0, _moment["default"])(date).format('YYYY'));
+    var dateMonth = Number((0, _moment["default"])(date).format('MM'));
+
+    if (currentMonth !== dateMonth && dateMonth !== 1) {
+      dateMonth = dateMonth - 1;
+    } else if (currentMonth !== dateMonth && dateMonth === 1) {
+      dateMonth = 12;
+    }
 
     var range = (0, _utils.getPointYearMonthWeeksRange)(year, month);
 
@@ -43,7 +51,7 @@ var WeekPanelBody = function WeekPanelBody(props) {
       return range.map(function (item, i) {
         return /*#__PURE__*/_react["default"].createElement("tr", {
           key: i,
-          className: (0, _classnames["default"])("".concat(preCls, "__week"), _defineProperty({}, "".concat(preCls, "__week--select"), currentWeek === i + 1 && parseInt(year) == currentYear && parseInt(month) == currentMonth))
+          className: (0, _classnames["default"])("".concat(preCls, "__week"), _defineProperty({}, "".concat(preCls, "__week--select"), currentWeek === i + 1 && dateYear == currentYear && dateMonth == currentMonth))
         }, /*#__PURE__*/_react["default"].createElement("div", {
           onClick: function onClick() {
             if (onSelect) {

package/lib/components/picker/components/panels/week-panel/week-head.js

@@ -15,6 +15,8 @@ var _getLocale = require("../../../../../utils/getLocale");
 
 var _utils = require("../../../utils");
 
+var _utils2 = require("./utils");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -24,8 +26,8 @@ function DatePanelHead(props) {
       onPrev = props.onPrev,
       onNext = props.onNext,
       onPanelChange = props.onPanelChange;
-  var yearText = parseInt((0, _moment["default"])(viewDate).format('YYYY'));
-  var monthText = parseInt((0, _moment["default"])(viewDate).format('MM'));
+  var yearText = (0, _moment["default"])(viewDate).year();
+  var monthText = (0, _utils2.getWeek)(new Date(viewDate))[1];
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])(_utils.PickerHeadClass)
   }, !_getLocale.isEn && /*#__PURE__*/_react["default"].createElement("div", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.22-beta.8",
+  "version": "1.12.22-beta.9",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",