@titaui/pc 1.12.7-beta.13 → 1.12.7-beta.14

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

@@ -264,16 +264,18 @@ var DynamicItemHeader = function DynamicItemHeader(_ref) {
     }, (0, _getLocale.getLocale)("Mod_Delete")));
   }, [showDialogConfirm]);
   (0, _react.useEffect)(function () {
-    var mindData = dailyContent.filter(function (item) {
-      return item.title === "心情";
-    }); // 暂时用title
-
-    if (typeof mindData[0].content === 'string') {
-      setMindImg(_constant2.Motion.filter(function (item) {
-        return item.id === JSON.parse(mindData[0].content).SelectedValues[0];
-      })[0].img);
+    if (dailyContent) {
+      var mindData = dailyContent.filter(function (item) {
+        return item.title === "心情";
+      }); // 暂时用title
+
+      if (typeof mindData[0].content === 'string') {
+        setMindImg(_constant2.Motion.filter(function (item) {
+          return item.id === JSON.parse(mindData[0].content).SelectedValues[0];
+        })[0].img);
+      }
     }
-  }, []);
+  }, [dailyContent]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix)
   }, /*#__PURE__*/_react["default"].createElement("span", {

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

@@ -19,6 +19,8 @@ var _tableRowOProject = _interopRequireDefault(require("../table-row-o-project")
 
 var _constant = require("./constant");
 
+var _utils = require("./utils");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -73,6 +75,11 @@ var TaskProgress = function TaskProgress(_ref) {
       rowsData = _useState2[0],
       setRowsData = _useState2[1];
 
+  var _useState3 = (0, _react.useState)((0, _utils.getStatusStatistic)([])),
+      _useState4 = _slicedToArray(_useState3, 2),
+      statusStatistic = _useState4[0],
+      setStatusStatistic = _useState4[1];
+
   var renderTitle = (0, _react.useMemo)(function () {
     if (type === 'day') {
       return (0, _getLocale.getLocale)('Rep_NewS_Toworkasks');
@@ -140,7 +147,7 @@ var TaskProgress = function TaskProgress(_ref) {
   (0, _react.useEffect)(function () {
     if (_typeof(data) !== 'object') {
       setRowsData(JSON.parse(data));
-      console.log(JSON.parse(data));
+      setStatusStatistic((0, _utils.getStatusStatistic)(JSON.parse(data).Rows));
     }
   }, [data]);
   return /*#__PURE__*/_react["default"].createElement("div", {
@@ -153,15 +160,15 @@ var TaskProgress = function TaskProgress(_ref) {
     className: "".concat(prefix, "__statistic-item ").concat(prefix, "__statistic-item--finished")
   }, (0, _getLocale.getLocale)('OKR_MyO_E_From_Completed'), ' ', /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__statistic-item--finished-text")
-  }, "5")), /*#__PURE__*/_react["default"].createElement("span", {
+  }, statusStatistic.doing)), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__statistic-item ").concat(prefix, "__statistic-item--processing")
   }, (0, _getLocale.getLocale)('OKR_MyO_Butt_Inprogress'), ' ', /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__statistic-item--processing-text")
-  }, "5")), /*#__PURE__*/_react["default"].createElement("span", {
+  }, statusStatistic.doing)), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__statistic-item ").concat(prefix, "__statistic-item--overdue")
   }, (0, _getLocale.getLocale)('OKR_MyO_E_Overdue'), ' ', /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__statistic-item--overdue-text")
-  }, "5"))), /*#__PURE__*/_react["default"].createElement("div", {
+  }, statusStatistic.overDue))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__table")
   }, renderTable));
 };

package/lib/components/dynamic/dynamic-item/components/task-progress/utils.js

@@ -3,8 +3,25 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatOkrsData = void 0;
+exports.getStatusStatistic = void 0;
 
-var formatOkrsData = function formatOkrsData(data) {};
+var getStatusStatistic = function getStatusStatistic(data) {
+  var result = {
+    done: 0,
+    doing: 0,
+    overDue: 0
+  };
+  data.forEach(function (item) {
+    // 1 进行中 2 已完成 3 已延期
+    if (item.status === 1) {
+      result.doing = result.doing + 1;
+    } else if (item.status === 2) {
+      result.done = result.done + 1;
+    } else if (item.status === 3) {
+      result.overDue = result.overDue + 1;
+    }
+  });
+  return result;
+};
 
-exports.formatOkrsData = formatOkrsData;
+exports.getStatusStatistic = getStatusStatistic;

package/lib/components/dynamic/dynamic-item/dynamic-new-report/components/remind-user-view/index.css

@@ -23,7 +23,7 @@
   height: 32px;
   background: #F0F4FA;
   border-radius: 16px;
-  padding: 4px 8px 4px 4px;
+  padding: 5px 8px 5px 4px;
   box-sizing: border-box;
   font-size: 14px;
   color: #3F4755;
@@ -31,7 +31,9 @@
 }
 
 .titaui-dynamic-summary__remind-view__user-avatar {
-  width: 24px;
-  height: 24px;
   border-radius: 15px;
 }
+
+.titaui-dynamic-summary__remind-view__user-name {
+  margin-left: 6px;
+}

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

@@ -77,7 +77,9 @@ var RemindUserView = function RemindUserView(props) {
       name: item.name,
       src: item.avatar.medium,
       color: item.avatar.color
-    }), item.name);
+    }), /*#__PURE__*/_react["default"].createElement("span", {
+      className: "".concat(preCls, "__user-name")
+    }, item.name));
   })));
 };
 

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

@@ -151,29 +151,31 @@ var DynamicReply = function DynamicReply(_ref) {
     });
   }, [data, searchKeyWord]);
   (0, _react.useEffect)(function () {
-    var mindData = dailyContent.filter(function (item) {
-      return item.title === "心情";
-    }); // 暂时用title
-
-    setOkrtableData(dailyContent.filter(function (item) {
-      return item.title === "目标";
-    })[0].content);
-    setTasktableData(dailyContent.filter(function (item) {
-      return item.title === "任务";
-    })[0].content);
-    setWorkSummaryData(dailyContent.filter(function (item) {
-      return item.title === "工作总结";
-    })[0].content);
-    setNextWorkPlanData(dailyContent.filter(function (item) {
-      return item.title === "下一步工作计划";
-    })[0].content);
-
-    if (typeof mindData[0].content === 'string') {
-      setMindImg(_constant.Motion.filter(function (item) {
-        return item.id === JSON.parse(mindData[0].content).SelectedValues[0];
-      })[0].img);
+    if (dailyContent) {
+      var mindData = dailyContent.filter(function (item) {
+        return item.title === "心情";
+      }); // 暂时用title
+
+      setOkrtableData(dailyContent.filter(function (item) {
+        return item.title === "目标";
+      })[0].content);
+      setTasktableData(dailyContent.filter(function (item) {
+        return item.title === "任务";
+      })[0].content);
+      setWorkSummaryData(dailyContent.filter(function (item) {
+        return item.title === "工作总结";
+      })[0].content);
+      setNextWorkPlanData(dailyContent.filter(function (item) {
+        return item.title === "下一步工作计划";
+      })[0].content);
+
+      if (typeof mindData[0].content === 'string') {
+        setMindImg(_constant.Motion.filter(function (item) {
+          return item.id === JSON.parse(mindData[0].content).SelectedValues[0];
+        })[0].img);
+      }
     }
-  }, []);
+  }, [dailyContent]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
   }, /*#__PURE__*/_react["default"].createElement(_summaryHeader["default"], _extends({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.7-beta.13",
+  "version": "1.12.7-beta.14",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",
@@ -43,6 +43,7 @@
     "babel-plugin-module-resolver": "4.1.0",
     "babel-plugin-transform-class-properties": "6.24.1",
     "babel-plugin-transform-function-bind": "6.22.0",
+    "copy-to-clipboard": "^3.3.1",
     "cross-env": "7.0.2",
     "del": "6.0.0",
     "eslint": "8.7.0",