@titaui/pc 1.16.49-beta.3 → 1.16.49-beta.5

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

@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _moment = _interopRequireDefault(require("moment"));
 
-var _scrollbar = _interopRequireDefault(require("../../../../scrollbar"));
-
 var _openData = require("../../../../../utils/open-data");
 
 require("./index.css");
@@ -24,10 +22,6 @@ var Schedule = function Schedule(_ref) {
       oldValue = _ref.oldValue;
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
-  }, /*#__PURE__*/_react["default"].createElement(_scrollbar["default"], {
-    style: {
-      maxHeight: 164
-    }
   }, (value === null || value === void 0 ? void 0 : value.length) !== 0 && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
   }, value === null || value === void 0 ? void 0 : value.map(function (val) {
@@ -60,7 +54,7 @@ var Schedule = function Schedule(_ref) {
     }
   })) : /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__no-progress")
-  }, "-"))));
+  }, "-")));
 };
 
 exports.Schedule = Schedule;

package/lib/components/dynamic/dynamic-item/components/table-row-o-project/index.js

@@ -44,7 +44,7 @@ var TableRowOProject = function TableRowOProject(_ref) {
     className: (0, _classnames["default"])("".concat(prefix, " ").concat(extraClass), _defineProperty({}, "".concat(prefix, "--disable"), data.Id === -1)),
     onClick: handleTitleClick
   }, /*#__PURE__*/_react["default"].createElement("i", {
-    className: (0, _classnames["default"])("".concat(prefix, "__icon"), (_classNames2 = {}, _defineProperty(_classNames2, "tu-icon-H5-O-s", data.ParentObjType === 62 || data.ObjectType === 62), _defineProperty(_classNames2, "tu-icon-project-s", data.ParentObjType === 4 || data.ObjectType === 4), _classNames2))
+    className: (0, _classnames["default"])("".concat(prefix, "__icon"), (_classNames2 = {}, _defineProperty(_classNames2, "tu-icon-H5-O-s", data.ParentObjType === 62 || data.ObjectType === 62 && data.Id !== 0), _defineProperty(_classNames2, "tu-icon-project-s", data.ParentObjType === 4 || data.ObjectType === 4), _defineProperty(_classNames2, "tu-icon-fenlei", data.ObjectType === 62 && data.Id === 0), _classNames2))
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__text")
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {

package/lib/components/dynamic/dynamic-item/components/work-progress/index.css

@@ -131,6 +131,7 @@
   font-size: 12px;
   color: #3f4755;
   line-height: 18px;
+  margin-left: 0px;
 }
 
 .tita-summary-work-progress__table-row-title-worktime {

package/lib/components/dynamic/dynamic-item/components/work-progress/index.js

@@ -44,10 +44,14 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var prefix = "tita-summary-work-progress";
 
 var Item = function Item(props) {
-  var children = props.children;
+  var children = props.children,
+      openWorkMileSetting = props.openWorkMileSetting,
+      openWorkTaskSetting = props.openWorkTaskSetting;
   return /*#__PURE__*/_react["default"].createElement("div", null, children.map(function (item) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_renderRow["default"], {
-      item: item
+      item: item,
+      openWorkMileSetting: openWorkMileSetting,
+      openWorkTaskSetting: openWorkTaskSetting
     }), item.children && item.children.length !== 0 && /*#__PURE__*/_react["default"].createElement(Item, null, item.children));
   }));
 };
@@ -57,7 +61,9 @@ var WorkProgress = function WorkProgress(_ref) {
 
   var data = _ref.data,
       title = _ref.title,
-      reportType = _ref.reportType;
+      reportType = _ref.reportType,
+      openWorkMileSetting = _ref.openWorkMileSetting,
+      openWorkTaskSetting = _ref.openWorkTaskSetting;
 
   var _useState = (0, _react.useState)(true),
       _useState2 = _slicedToArray(_useState, 2),
@@ -94,7 +100,9 @@ var WorkProgress = function WorkProgress(_ref) {
       className: "tu-icon-wiki ".concat(prefix, "__table-title-progress-desc-icon")
     }))))), /*#__PURE__*/_react["default"].createElement("tbody", null, (_toTree = (0, _utils.toTree)(tableData === null || tableData === void 0 ? void 0 : tableData.Rows)) === null || _toTree === void 0 ? void 0 : _toTree.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement(_renderRow["default"], {
-        item: item
+        item: item,
+        openWorkMileSetting: openWorkMileSetting,
+        openWorkTaskSetting: openWorkTaskSetting
       });
     })));
   }, [tableData]);

package/lib/components/dynamic/dynamic-item/components/work-progress/mile-stone.js

@@ -50,7 +50,9 @@ var MileStone = function MileStone(_ref) {
     className: "".concat(preCls, "__table-row-title-icon tu-icon-licheng-s")
   }), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(preCls, "__table-mile-title-text")
-  }, _openData["default"].parseString((0, _tools.htmlDecodeByRegExp)(data.MilestoneName))))), /*#__PURE__*/_react["default"].createElement("td", null, !!data.MilestoneId && /*#__PURE__*/_react["default"].createElement(_progress["default"], {
+  }, _openData["default"].parseString((0, _tools.htmlDecodeByRegExp)(data.MilestoneName))), data.IsDeadLine === true && /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(preCls, "__table-row-title-remain")
+  }, data.RemainingContent))), /*#__PURE__*/_react["default"].createElement("td", null, !!data.MilestoneId && /*#__PURE__*/_react["default"].createElement(_progress["default"], {
     id: "".concat(data.MilestoneId),
     type: "task",
     status: _constant.OkrRiskMapping[data.RiskLevel],

package/lib/components/dynamic/dynamic-item/components/work-progress/render-row.js

@@ -28,7 +28,9 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
 var prefix = "tita-summary-work-progress";
 
 var RenderRow = function RenderRow(_ref) {
-  var item = _ref.item;
+  var item = _ref.item,
+      openWorkMileSetting = _ref.openWorkMileSetting,
+      openWorkTaskSetting = _ref.openWorkTaskSetting;
   var render = (0, _react.useMemo)(function () {
     if (!item.IsImport) {
       var _item$children;
@@ -40,7 +42,7 @@ var RenderRow = function RenderRow(_ref) {
           data: child
         }));
 
-        if (child.Milestones) {
+        if (child.Milestones && openWorkMileSetting) {
           var _child$Milestones;
 
           (_child$Milestones = child.Milestones) === null || _child$Milestones === void 0 ? void 0 : _child$Milestones.forEach(function (mileStone) {
@@ -48,7 +50,7 @@ var RenderRow = function RenderRow(_ref) {
               data: mileStone
             }));
 
-            if (mileStone.Tasks) {
+            if (mileStone.Tasks && openWorkTaskSetting) {
               var _mileStone$Tasks;
 
               (_mileStone$Tasks = mileStone.Tasks) === null || _mileStone$Tasks === void 0 ? void 0 : _mileStone$Tasks.map(function (task) {

package/lib/components/dynamic/dynamic-item/dynamic-new-report/index.js

@@ -228,11 +228,13 @@ var DynamicReply = function DynamicReply(_ref) {
         });
       }
 
-      if (item.contentType === _constant.dailyContentType.work) {
+      if (item.contentType === _constant.dailyContentType.work && data.openWorkSetting) {
         return item.content && /*#__PURE__*/_react["default"].createElement(_workProgress["default"], {
           data: item.content,
           title: item.title,
-          reportType: data.reportType
+          reportType: data.reportType,
+          openWorkMileSetting: data.openWorkMileSetting,
+          openWorkTaskSetting: data.openWorkTaskSetting
         });
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.16.49-beta.3",
+  "version": "1.16.49-beta.5",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",