@titaui/pc 1.12.13-beta.2 → 1.12.13-beta.3

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

@@ -51,7 +51,8 @@ var isImport = false;
 var OkrProgress = function OkrProgress(_ref) {
   var data = _ref.data,
       _ref$type = _ref.type,
-      type = _ref$type === void 0 ? 'day' : _ref$type;
+      type = _ref$type === void 0 ? 'day' : _ref$type,
+      title = _ref.title;
 
   var _useState = (0, _react.useState)(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -142,7 +143,7 @@ var OkrProgress = function OkrProgress(_ref) {
     className: prefix
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__title")
-  }, renderTitle), /*#__PURE__*/_react["default"].createElement("div", {
+  }, title), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__table")
   }, renderTable));
 };

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

@@ -49,7 +49,8 @@ var isImport = true;
 var TaskProgress = function TaskProgress(_ref) {
   var data = _ref.data,
       _ref$type = _ref.type,
-      type = _ref$type === void 0 ? 'day' : _ref$type;
+      type = _ref$type === void 0 ? 'day' : _ref$type,
+      title = _ref.title;
 
   var _useState = (0, _react.useState)(),
       _useState2 = _slicedToArray(_useState, 2),
@@ -146,7 +147,7 @@ var TaskProgress = function TaskProgress(_ref) {
     className: prefix
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__title")
-  }, renderTitle), /*#__PURE__*/_react["default"].createElement("div", {
+  }, title), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__statistic")
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(prefix, "__statistic-item ").concat(prefix, "__statistic-item--finished")

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

@@ -68,7 +68,7 @@ var DynamicAssessment = function DynamicAssessment(_ref) {
     data: data
   }, restProps, {
     desc: renderDesc,
-    user: data.principalUser
+    user: data.principalUser || data.publishUser
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__content")
   }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -106,15 +106,35 @@ var DynamicReply = function DynamicReply(_ref) {
       taskTableData = _useState6[0],
       setTasktableData = _useState6[1];
 
-  var _useState7 = (0, _react.useState)(""),
+  var _useState7 = (0, _react.useState)(''),
       _useState8 = _slicedToArray(_useState7, 2),
-      workSummaryData = _useState8[0],
-      setWorkSummaryData = _useState8[1];
+      okrTableTitle = _useState8[0],
+      setOkrtableTitle = _useState8[1];
 
-  var _useState9 = (0, _react.useState)(""),
+  var _useState9 = (0, _react.useState)(''),
       _useState10 = _slicedToArray(_useState9, 2),
-      nextWorkPlanData = _useState10[0],
-      setNextWorkPlanData = _useState10[1];
+      taskTableTitle = _useState10[0],
+      setTasktableTitle = _useState10[1];
+
+  var _useState11 = (0, _react.useState)(""),
+      _useState12 = _slicedToArray(_useState11, 2),
+      workSummaryData = _useState12[0],
+      setWorkSummaryData = _useState12[1];
+
+  var _useState13 = (0, _react.useState)(''),
+      _useState14 = _slicedToArray(_useState13, 2),
+      workSummaryTitle = _useState14[0],
+      setWorkSummaryTitle = _useState14[1];
+
+  var _useState15 = (0, _react.useState)(""),
+      _useState16 = _slicedToArray(_useState15, 2),
+      nextWorkPlanData = _useState16[0],
+      setNextWorkPlanData = _useState16[1];
+
+  var _useState17 = (0, _react.useState)(""),
+      _useState18 = _slicedToArray(_useState17, 2),
+      nextWorkPlanTitle = _useState18[0],
+      setNextWorkPlanTitle = _useState18[1];
 
   var contentRichTextRef = (0, _react.useRef)();
   var workPlanRichTextRef = (0, _react.useRef)();
@@ -126,10 +146,10 @@ var DynamicReply = function DynamicReply(_ref) {
     var _classNames, _classNames2;
 
     return /*#__PURE__*/_react["default"].createElement("span", {
-      className: (0, _classnames["default"])("".concat(prefix, "__complete-type"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "__complete-type--normal"), submitState === 1), _defineProperty(_classNames, "".concat(prefix, "__complete-type--delay"), submitState === 2), _defineProperty(_classNames, "".concat(prefix, "__complete-type--unsubmit"), submitState === 3), _classNames))
+      className: (0, _classnames["default"])("".concat(prefix, "__complete-type"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "__complete-type--normal"), submitState === 1), _defineProperty(_classNames, "".concat(prefix, "__complete-type--delay"), submitState === 2), _classNames))
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: (0, _classnames["default"])("".concat(prefix, "__complete-type-icon"), (_classNames2 = {}, _defineProperty(_classNames2, "".concat(prefix, "__complete-type-icon--normal"), submitState === 1), _defineProperty(_classNames2, "".concat(prefix, "__complete-type-icon--delay"), submitState === 2), _classNames2))
-    }), submitState === 1 && (0, _getLocale.getLocale)('Rep_Tab_Mys_Submitontime'), submitState === 2 && (0, _getLocale.getLocale)('Tasks_Tab_DelaSubmission'), submitState === 3 && (0, _getLocale.getLocale)('Mod_Unsubmitted'));
+    }), submitState === 1 && (0, _getLocale.getLocale)('Rep_Tab_Mys_Submitontime'), submitState === 2 && (0, _getLocale.getLocale)('Tasks_Tab_DelaSubmission'));
   }, []);
   var renderDesc = (0, _react.useMemo)(function () {
     var reportTextMap = {
@@ -153,22 +173,36 @@ var DynamicReply = function DynamicReply(_ref) {
   }, [data, searchKeyWord]);
   (0, _react.useEffect)(function () {
     if (dailyContent) {
+      var _dailyContent$filter$, _dailyContent$filter$2, _dailyContent$filter$3, _dailyContent$filter$4, _dailyContent$filter$5, _dailyContent$filter$6, _dailyContent$filter$7, _dailyContent$filter$8;
+
       var mindData = dailyContent.filter(function (item) {
-        return item.title === "心情";
+        return (item === null || item === void 0 ? void 0 : item.title) === "心情";
       }); // 暂时用title
 
-      setOkrtableData(dailyContent.filter(function (item) {
+      setOkrtableData(((_dailyContent$filter$ = dailyContent.filter(function (item) {
         return item.title === "目标";
-      })[0].content);
-      setTasktableData(dailyContent.filter(function (item) {
+      })[0]) === null || _dailyContent$filter$ === void 0 ? void 0 : _dailyContent$filter$.content) || null);
+      setOkrtableTitle((_dailyContent$filter$2 = dailyContent.filter(function (item) {
+        return item.title === "目标";
+      })[0]) === null || _dailyContent$filter$2 === void 0 ? void 0 : _dailyContent$filter$2.title);
+      setTasktableData(((_dailyContent$filter$3 = dailyContent.filter(function (item) {
+        return item.title === "任务";
+      })[0]) === null || _dailyContent$filter$3 === void 0 ? void 0 : _dailyContent$filter$3.content) || null);
+      setTasktableTitle((_dailyContent$filter$4 = dailyContent.filter(function (item) {
         return item.title === "任务";
-      })[0].content);
-      setWorkSummaryData(dailyContent.filter(function (item) {
+      })[0]) === null || _dailyContent$filter$4 === void 0 ? void 0 : _dailyContent$filter$4.title);
+      setWorkSummaryData((_dailyContent$filter$5 = dailyContent.filter(function (item) {
         return item.title === "工作总结";
-      })[0].content);
-      setNextWorkPlanData(dailyContent.filter(function (item) {
+      })[0]) === null || _dailyContent$filter$5 === void 0 ? void 0 : _dailyContent$filter$5.content);
+      setWorkSummaryTitle((_dailyContent$filter$6 = dailyContent.filter(function (item) {
+        return item.title === "工作总结";
+      })[0]) === null || _dailyContent$filter$6 === void 0 ? void 0 : _dailyContent$filter$6.title);
+      setNextWorkPlanData((_dailyContent$filter$7 = dailyContent.filter(function (item) {
+        return item.title === "下一步工作计划";
+      })[0]) === null || _dailyContent$filter$7 === void 0 ? void 0 : _dailyContent$filter$7.content);
+      setNextWorkPlanTitle((_dailyContent$filter$8 = dailyContent.filter(function (item) {
         return item.title === "下一步工作计划";
-      })[0].content);
+      })[0]) === null || _dailyContent$filter$8 === void 0 ? void 0 : _dailyContent$filter$8.title);
 
       if (typeof mindData[0].content === "string" && mindData[0].content !== "") {
         setMindImg(_constant.Motion.filter(function (item) {
@@ -203,18 +237,20 @@ var DynamicReply = function DynamicReply(_ref) {
     alt: ""
   })), workSummaryData && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__work")
-  }, (0, _getLocale.getLocale)("Tasks_Tab_MyS_JobSummary"), /*#__PURE__*/_react["default"].createElement(_richEditor["default"].Editor, {
+  }, workSummaryTitle, /*#__PURE__*/_react["default"].createElement(_richEditor["default"].Editor, {
     defaultState: JSON.parse(workSummaryData).RichText,
     editable: false
   })), nextWorkPlanData && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__work")
-  }, (0, _getLocale.getLocale)("Rep_Tab_Mys_NextWorkPlans"), /*#__PURE__*/_react["default"].createElement(_richEditor["default"].Editor, {
+  }, nextWorkPlanTitle, /*#__PURE__*/_react["default"].createElement(_richEditor["default"].Editor, {
     defaultState: JSON.parse(nextWorkPlanData).RichText,
     editable: false
   })), /*#__PURE__*/_react["default"].createElement(_okrProgress["default"], {
-    data: okrTableData
+    data: okrTableData,
+    title: okrTableTitle
   }), /*#__PURE__*/_react["default"].createElement(_taskProgress["default"], {
-    data: taskTableData
+    data: taskTableData,
+    title: taskTableTitle
   }), files.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefix, "__upload")
   }, /*#__PURE__*/_react["default"].createElement(_richEditorUpload["default"], {

package/lib/components/form/form-fields/date/index.js

@@ -29,7 +29,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-var prefixCls = 'form-field-date';
+var prefixCls = "form-field-date";
 
 var Date = function Date(props) {
   var label = props.label,
@@ -46,7 +46,7 @@ var Date = function Date(props) {
     var newDate;
 
     switch (type) {
-      case 'date':
+      case "date":
         newDate = (0, _moment["default"])(value || (0, _moment["default"])()).set({
           year: (0, _moment["default"])(date[0]).year(),
           month: (0, _moment["default"])(date[0]).month(),
@@ -54,10 +54,10 @@ var Date = function Date(props) {
         });
         break;
 
-      case 'time':
+      case "time":
         newDate = (0, _moment["default"])(value || (0, _moment["default"])()).set({
-          hour: (0, _moment["default"])(date[0], 'HH:mm').hour(),
-          minute: (0, _moment["default"])(date[0], 'HH:mm').minute()
+          hour: (0, _moment["default"])(date[0], "HH:mm").hour(),
+          minute: (0, _moment["default"])(date[0], "HH:mm").minute()
         });
         break;
 
@@ -66,10 +66,11 @@ var Date = function Date(props) {
     }
 
     onChange(newDate);
+    return true;
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: (0, _classnames["default"])(prefixCls, _defineProperty({}, "".concat(prefixCls, "-row"), layout === 'row'))
+    className: (0, _classnames["default"])(prefixCls, _defineProperty({}, "".concat(prefixCls, "-row"), layout === "row"))
   }, !!label && /*#__PURE__*/_react["default"].createElement("div", {
     className: "".concat(prefixCls, "__label")
   }, /*#__PURE__*/_react["default"].createElement("span", {
@@ -81,21 +82,21 @@ var Date = function Date(props) {
   }, /*#__PURE__*/_react["default"].createElement(_picker["default"], _extends({
     value: [value],
     onChange: function onChange(date) {
-      return onDateChange(date, 'date');
+      return onDateChange(date, "date");
     },
     popupAlign: datePopupAlign
   }, restProps)), /*#__PURE__*/_react["default"].createElement(_timePicker["default"], _extends({
     value: value,
     popupAlign: timePopupAlign,
     onChange: function onChange(time) {
-      return onDateChange(time, 'time');
+      return onDateChange([time], "time");
     }
   }, restProps))));
 };
 
 Date.defaultProps = {
   disabled: false,
-  layout: 'column',
+  layout: "column",
   require: false
 };
 var _default = Date;

package/package.json

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