@titaui/pc 1.12.22-beta.10 → 1.12.22-beta.12

package/lib/components/dynamic/components/comments-dialog/index.css

@@ -22,7 +22,7 @@
 .rate_container .rate-points {
   font-size: 16px;
   font-weight: normal;
-  color: #3F4755;
+  color: #3f4755;
   line-height: 32px;
 }
 
@@ -33,7 +33,7 @@
 }
 
 .encourage_container .encourage {
-  background: #F0F4FA;
+  background: #f0f4fa;
   border-radius: 12px;
   padding: 7px 12px;
   display: flex;
@@ -43,6 +43,15 @@
   cursor: pointer;
 }
 
+.encourage_container .encourage .encourage-text {
+  color: #89919F;
+}
+
+.encourage_container .encourage img {
+  width: 20px;
+  height: 20px;
+}
+
 .encourage_container .curEnourageGreat {
   background: rgba(246, 189, 22, 0.2);
 }
@@ -70,6 +79,27 @@
 .titleDesc {
   font-size: 12px;
   font-weight: normal;
-  color: #A4ACB9;
+  color: #a4acb9;
   line-height: 18px;
 }
+
+.remind-dialog-content .titaui-form .titaui-form-field {
+  margin-top: 20px;
+}
+
+.remind-dialog-content .titaui-form .titaui-form-field:first-child {
+  margin-top: 0;
+}
+
+.remind-text .regulation-setting-item__label {
+  align-items: flex-start;
+  margin-top: 7px;
+}
+
+.remind-dialog-content {
+  padding: 16px 26px 5px;
+}
+
+.remind-dialog-content .titaui-textArea {
+  width: 398px;
+}

package/lib/components/dynamic/components/comments-dialog/index.js

@@ -71,7 +71,7 @@ var RemindDialog = function RemindDialog(props) {
       encourageState = _useState6[0],
       setEencourageState = _useState6[1];
 
-  var inputRef = (0, _react.useRef)();
+  var inputRef = (0, _react.useRef)(document.createElement('input'));
 
   var _onChange = function onChange(e) {
     setRemark(e);
@@ -161,6 +161,7 @@ var RemindDialog = function RemindDialog(props) {
     onCancel: onCloseHandler,
     onOk: handleSubmit,
     noFooterLine: true,
+    destroyOnClose: true,
     noHeadLine: true,
     title: /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("p", null, (0, _getLocale.getLocale)("Rep_NewS_Evaluation")), /*#__PURE__*/_react["default"].createElement("span", {
       className: "titleDesc"
@@ -181,6 +182,7 @@ var RemindDialog = function RemindDialog(props) {
     encourageState: encourageState,
     changeEncourage: changeEncourage
   })), /*#__PURE__*/_react["default"].createElement(_regulationSettingItem["default"], {
+    className: "remind-text",
     label: (0, _getLocale.getLocale)("Per_Ass_New_Appr_detail_Com")
   }, /*#__PURE__*/_react["default"].createElement(_textarea["default"], {
     maxLine: 4,

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

@@ -47,9 +47,10 @@ var _getUserInfo = (0, _bsGlobal.getUserInfo)(),
     IsBoss = _getUserInfo.IsBoss,
     IsRoot = _getUserInfo.IsRoot,
     Role = _getUserInfo.Role,
-    IsPlanDailyManager = _getUserInfo.IsPlanDailyManager;
+    IsPlanDailyManager = _getUserInfo.IsPlanDailyManager,
+    HasSub = _getUserInfo.HasSub;
 
-var isShowManage = IsPlanDailyManager || IsBoss || IsRoot && Role !== 4 || IsLeader;
+var isShowManage = IsPlanDailyManager || IsBoss || HasSub || IsRoot && Role !== 4 || IsLeader;
 
 var summaryMenus = /*#__PURE__*/function () {
   function summaryMenus(props) {

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

@@ -26,8 +26,17 @@ function DatePanelHead(props) {
       onPrev = props.onPrev,
       onNext = props.onNext,
       onPanelChange = props.onPanelChange;
-  var yearText = (0, _moment["default"])(viewDate).year();
-  var monthText = (0, _utils2.getWeek)(new Date(viewDate))[1];
+  var yearText;
+  var monthText;
+
+  if (typeof viewDate === 'string') {
+    yearText = (0, _moment["default"])(viewDate.split('~')[0]).year();
+    monthText = (0, _utils2.getWeek)(new Date(viewDate.split('~')[0]))[1];
+  } else {
+    yearText = (0, _moment["default"])(viewDate).year();
+    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/lib/components/textarea/index.css

@@ -91,12 +91,12 @@
 
 .area-error {
   border: 1px solid #f05e5e !important;
-  box-shadow: 0px 0px 6px 0px rgba(240, 94, 94, 0.3);
+  box-shadow: inset 0px 0px 6px 0px rgba(240, 94, 94, 0.3);
 }
 
 .area-focus {
   border: 1px solid #2879ff !important;
-  box-shadow: 0px 0px 6px 0px rgba(40, 121, 255, 0.3);
+  box-shadow: inset 0px 0px 6px 0px rgba(40, 121, 255, 0.3);
 }
 
 .area-normal {

package/lib/components/textarea/index.js

@@ -74,7 +74,7 @@ var Textarea = function Textarea(p) {
   var selfInputRef = (0, _react.useRef)();
   var realInputRef = inputRef || selfInputRef;
   var isControlled = ("value" in p);
-  var realValue = isControlled ? value : selfValue;
+  var realValue = isControlled ? value || '' : selfValue || '';
 
   var _useState5 = (0, _react.useState)(false),
       _useState6 = _slicedToArray(_useState5, 2),

package/package.json

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