@titaui/pc 1.12.35 → 1.12.38

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

@@ -116,11 +116,13 @@ var EvaluationDialog = function EvaluationDialog(props) {
     };
     (0, _api.setSummaryEvaluate)(params).then(function (res) {
       if (res.Code === 1) {
+        var _res$Data;
+
         closeDialog({
           remark: remark,
           type: Number(evaluateType),
           value: value,
-          user: res === null || res === void 0 ? void 0 : res.userV2
+          user: res === null || res === void 0 ? void 0 : (_res$Data = res.Data) === null || _res$Data === void 0 ? void 0 : _res$Data.user
         });
 
         _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));
@@ -136,18 +138,18 @@ var EvaluationDialog = function EvaluationDialog(props) {
         toUserId: toUserId
       };
       (0, _api.getSummaryEvaluate)(params).then(function (res) {
-        var _res$Data, _res$Data2, _res$Data4;
+        var _res$Data2, _res$Data3, _res$Data5;
 
-        setRemark(res === null || res === void 0 ? void 0 : (_res$Data = res.Data) === null || _res$Data === void 0 ? void 0 : _res$Data.remark);
+        setRemark(res === null || res === void 0 ? void 0 : (_res$Data2 = res.Data) === null || _res$Data2 === void 0 ? void 0 : _res$Data2.remark);
 
-        if ((res === null || res === void 0 ? void 0 : (_res$Data2 = res.Data) === null || _res$Data2 === void 0 ? void 0 : _res$Data2.type) === 1) {
-          var _res$Data3;
+        if ((res === null || res === void 0 ? void 0 : (_res$Data3 = res.Data) === null || _res$Data3 === void 0 ? void 0 : _res$Data3.type) === 1) {
+          var _res$Data4;
 
-          setRatingScore(Number(res === null || res === void 0 ? void 0 : (_res$Data3 = res.Data) === null || _res$Data3 === void 0 ? void 0 : _res$Data3.value) / 2);
-        } else if ((res === null || res === void 0 ? void 0 : (_res$Data4 = res.Data) === null || _res$Data4 === void 0 ? void 0 : _res$Data4.type) === 2) {
-          var _res$Data5;
+          setRatingScore(Number(res === null || res === void 0 ? void 0 : (_res$Data4 = res.Data) === null || _res$Data4 === void 0 ? void 0 : _res$Data4.value) / 2);
+        } else if ((res === null || res === void 0 ? void 0 : (_res$Data5 = res.Data) === null || _res$Data5 === void 0 ? void 0 : _res$Data5.type) === 2) {
+          var _res$Data6;
 
-          setEencourageState(res === null || res === void 0 ? void 0 : (_res$Data5 = res.Data) === null || _res$Data5 === void 0 ? void 0 : _res$Data5.value);
+          setEencourageState(res === null || res === void 0 ? void 0 : (_res$Data6 = res.Data) === null || _res$Data6 === void 0 ? void 0 : _res$Data6.value);
         }
       });
     }

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

@@ -62,7 +62,7 @@ var Progress = function Progress(_ref) {
   }, renderContent, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(prefix, "__bg"), (_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "__bg--normal"), status === "normal"), _defineProperty(_classNames, "".concat(prefix, "__bg--risk"), status === "risk"), _defineProperty(_classNames, "".concat(prefix, "__bg--delay"), status === "delay"), _classNames)),
     style: {
-      width: "".concat(value, "%")
+      width: "".concat(value > 100 ? 100 : value, "%")
     }
   }));
 };

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

@@ -137,19 +137,20 @@ var EvaluteCard = function EvaluteCard(props) {
   (0, _react.useEffect)(function () {
     if (evaluation) {
       setCurrentEvalute(evaluation);
-
-      if (type === 1) {
-        setEvaluateConfig({
-          bgc: "rgba(240, 163, 38, 0.12)"
-        });
-      } else if (type === 2) {
-        var curTypeConfig = RemarkTypeList.find(function (item) {
-          return item.id === Number(value);
-        }) || {};
-        setEvaluateConfig(curTypeConfig);
-      }
     }
   }, [evaluation]);
+  (0, _react.useEffect)(function () {
+    if (type === 1) {
+      setEvaluateConfig({
+        bgc: "rgba(240, 163, 38, 0.12)"
+      });
+    } else if (type === 2) {
+      var curTypeConfig = RemarkTypeList.find(function (item) {
+        return item.id === Number(value);
+      }) || {};
+      setEvaluateConfig(curTypeConfig);
+    }
+  }, [currentEvalute]);
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])(preCls, (_classNames = {}, _defineProperty(_classNames, "".concat(preCls, "__score"), type === 1), _defineProperty(_classNames, "".concat(preCls, "__").concat(evaluateConfig.key), type === 2), _classNames)),
     style: {

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

@@ -192,11 +192,11 @@ var DynamicReply = function DynamicReply(_ref) {
     alt: ""
   }))), dailyContent.map(function (item) {
     if (item.contentType === _constant.dailyContentType.richText) {
-      return item.content !== '' && typeof item.richContent === "string" && /*#__PURE__*/_react["default"].createElement("div", {
+      return /*#__PURE__*/_react["default"].createElement("div", {
         className: "".concat(prefix, "__work")
       }, item.title === "工作总结" ? (0, _getLocale.getLocale)('Tasks_Tab_MyS_JobSummary') : (0, _getLocale.getLocale)('Rep_Tab_Mys_NextWorkPlans'), /*#__PURE__*/_react["default"].createElement(_richEditor["default"], null, /*#__PURE__*/_react["default"].createElement(_richEditor.EditorComponent, {
         editable: false,
-        initialState: JSON.parse(item.richContent || '{}'),
+        initialState: !!item.richContent ? JSON.parse(item.richContent || '{}') : undefined,
         placeholder: (0, _getLocale.getLocale)('Rep_NewS_Notfilled')
       })));
     }

package/lib/components/guide-tip/index.js

@@ -101,10 +101,10 @@ var GuideTip = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       showGuideTip: function showGuideTip() {
-        return setPopupVisible(true);
+        return popupRef.current.open();
       },
       hideGuideTip: function hideGuideTip() {
-        return setPopupVisible(false);
+        return popupRef.current.close();
       }
     };
   });

package/lib/components/import-modal/tree-node/kr-node/index.js

@@ -89,7 +89,7 @@ function KrNode(props) {
     className: "".concat(precls, "__name-text"),
     onClick: openKrDrawer
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
-    text: (0, _tools.htmlDecodeByHtmlRegExp)(data.mileStoneName),
+    text: (0, _openData.parseString)((0, _tools.htmlDecodeByHtmlRegExp)(data.mileStoneName)),
     maxWidth: 374
   }))), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__principle")

package/lib/components/import-modal/tree-node/milestone-node/index.js

@@ -95,7 +95,7 @@ function MileStone(props) {
     className: (0, _classnames["default"])("tu-icon-licheng-s", "".concat(precls, "__name-icon"))
   }), /*#__PURE__*/_react["default"].createElement("span", {
     onClick: openKrDrawer
-  }, (0, _tools.htmlDecodeByHtmlRegExp)(data.mileStoneName))), /*#__PURE__*/_react["default"].createElement("span", {
+  }, (0, _openData.parseString)((0, _tools.htmlDecodeByHtmlRegExp)(data.mileStoneName)))), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__status")
   }, statusMap[data.status]), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__principle")

package/lib/components/import-modal/tree-node/o-node/index.js

@@ -119,7 +119,7 @@ function ONode(props) {
     className: "".concat(precls, "__name-text"),
     onClick: openOkrDrawer
   }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {
-    text: (0, _tools.htmlDecodeByHtmlRegExp)(data.workName),
+    text: (0, _openData.parseString)((0, _tools.htmlDecodeByHtmlRegExp)(data.workName)),
     maxWidth: 390
   }))), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__principle")

package/lib/components/import-modal/tree-node/work-node/index.js

@@ -88,7 +88,7 @@ function WorkNode(props) {
     className: (0, _classnames["default"])('tu-icon-project-s', "".concat(precls, "__name-icon"))
   }), /*#__PURE__*/_react["default"].createElement("span", {
     onClick: gotoWorkDetail
-  }, (0, _tools.htmlDecodeByHtmlRegExp)(data.WorkName))), /*#__PURE__*/_react["default"].createElement("span", {
+  }, (0, _openData.parseString)((0, _tools.htmlDecodeByHtmlRegExp)(data.WorkName)))), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__status")
   }, statusMap[data.Status]), /*#__PURE__*/_react["default"].createElement("span", {
     className: "".concat(precls, "__principle")

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

@@ -125,22 +125,29 @@ var getPointYearMonthWeeksRange = function getPointYearMonthWeeksRange(year, mon
 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();
-    }
+  var isPreMonth = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  var currentMonth = new Date(date).getMonth() + 1;
+  var currentYear = new Date(date).getFullYear();
+  var currentDate = new Date(date).getDate();
+  var week;
+  var range = getPointYearMonthWeeksRange(currentYear, currentMonth);
+
+  if (new Date(range[0].startTime).getDate() > currentDate) {
+    //计入上个月
+    currentMonth -= 1;
+
+    var _range = getPointYearMonthWeeksRange(currentYear, currentMonth);
+
+    week = _range.length;
+  } else {
+    range.forEach(function (item, index) {
+      if (new Date(item.startTime).getDate() < currentDate && new Date(item.endTime).getDate() > currentDate || new Date(item.startTime).getDate() === currentDate || new Date(item.endTime).getDate() === currentDate) {
+        week = index + 1;
+      }
+    });
   }
 
-  return [week, month, year];
+  return [week, currentMonth, currentYear];
 };
 
 exports.getWeek = getWeek;

package/lib/components/toast/index.js

@@ -48,7 +48,7 @@ function _getInstance() {
                   top: "36px",
                   left: "50%",
                   position: "fixed",
-                  // 'transform': 'translate(-50%, 0)',
+                  'transform': 'translate(-50%, 0)',
                   borderRadius: 12
                 },
                 maxCount: 1,

package/lib/utils/open-data.js

@@ -71,6 +71,7 @@ var getOpenId = function getOpenId(id, type) {
 exports.getOpenId = getOpenId;
 
 function openData(p) {
+  //@ts-ignore
   if (getSource() == WX_SOURCE || getUA().includes(WX_UA_STR)) {
     return function (p) {
       if (p.id === undefined && p.corpId === undefined) {
@@ -86,7 +87,7 @@ function openData(p) {
           Sentry.captureException(new Error("企业微信openData调用失败"), scope);
         });
         return p.name || null;
-      } // @ts-ignore
+      } //@ts-ignore
 
 
       var openId = p.corpId || getOpenId(p.id, p.type);
@@ -105,31 +106,35 @@ function openData(p) {
           Sentry.captureException(new Error("企业微信openData调用失败"), scope);
         });
         return p.name || p.id || null;
-      }
+      } //<span style={{color:'red'}}>OPENID_EMPTY</span>;
+
 
       var ref = (0, _react.useRef)(null);
       (0, _react.useEffect)(function () {
-        var wWOpenData = window.top.WWOpenData; // // 如果当前页面中没有 WWOpenData 则去 top 上尝试获取
-        // if (!wWOpenData && window.top.WWOpenData) {
-        //   wWOpenData = window.top.WWOpenData;
-        // }
+        //@ts-ignore
+        window.WWOpenData && window.WWOpenData.bind(ref.current);
+        if (!p.id) return;
+        var openId = getOpenId(p.id, p.type);
 
-        wWOpenData && wWOpenData.bind(ref.current);
-      });
+        if (!openId) {}
+      }, []);
       return /*#__PURE__*/_react["default"].createElement("div", {
         style: {
-          display: "inline",
-          position: "relative",
-          overflow: "hidden",
-          textOverflow: "ellipsis"
+          display: 'inline',
+          position: 'relative',
+          overflow: 'hidden',
+          textOverflow: 'ellipsis'
         }
-      }, /*#__PURE__*/_react["default"].createElement("ww-open-data", {
+      },
+      /*#__PURE__*/
+      //@ts-ignore
+      _react["default"].createElement("ww-open-data", {
         ref: ref,
         type: p.type,
         openid: openId
       }), /*#__PURE__*/_react["default"].createElement("div", {
         style: {
-          position: "absolute",
+          position: 'absolute',
           top: 0,
           left: 0,
           right: 0,
@@ -138,11 +143,11 @@ function openData(p) {
         }
       }));
     };
+  } else {
+    return function (p) {
+      return p.name || p.id || null;
+    };
   }
-
-  return function (p) {
-    return p.name || p.id || null;
-  };
 }
 
 var getOpenData = openData();
@@ -249,18 +254,14 @@ var parseTag = function parseTag(str) {
 exports.parseTag = parseTag;
 
 var parseString = function parseString(str) {
-  // @ts-ignore
-  var source = window.BSGlobal.tenantInfo.Source;
-  var ua = navigator.userAgent.toLowerCase();
-
-  if (source != 860 && ua.indexOf("micromessenger") == -1) {
-    return /*#__PURE__*/_react["default"].createElement("span", {
-      dangerouslySetInnerHTML: {
-        __html: str
-      }
-    });
-  }
-
+  //@ts-ignore
+  var source = window.BSGlobal.tenantInfo.Source,
+      ua = navigator.userAgent.toLowerCase();
+  if (source != 860 && ua.indexOf('wxwork') == -1) return /*#__PURE__*/_react["default"].createElement("span", {
+    dangerouslySetInnerHTML: {
+      __html: str
+    }
+  });
   var reg = /\[(\w+?)\:(\w+?)\]/g;
   var strReg = /\[\w+?\:\w+?\]/;
   var openDatas = [];
@@ -275,14 +276,16 @@ var parseString = function parseString(str) {
       openDatas.push( /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, v2Paresed));
     } else {
       openDatas.push( /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(OpenDataCompoent, {
-        id: matchStr[1]
+        id: matchStr[1],
+        callFunc: "parseString",
+        extra: str
       })));
     }
 
     matchStr = reg.exec(str);
   }
 
-  var commonStrs = str === null || str === void 0 ? void 0 : str.split(strReg);
+  var commonStrs = str.split(strReg);
   var renderData = [];
 
   for (var i = 0; i < commonStrs.length; i++) {
@@ -308,15 +311,11 @@ var parseStringV2 = function parseStringV2(str) {
   // @ts-ignore
   var source = window.BSGlobal.tenantInfo.Source;
   var ua = navigator.userAgent.toLowerCase();
-
-  if (source != 860 && ua.indexOf("micromessenger") == -1) {
-    return /*#__PURE__*/_react["default"].createElement("span", {
-      dangerouslySetInnerHTML: {
-        __html: str
-      }
-    });
-  }
-
+  if (source != 860 && ua.indexOf('micromessenger') == -1) return /*#__PURE__*/_react["default"].createElement("span", {
+    dangerouslySetInnerHTML: {
+      __html: str
+    }
+  });
   var reg = /\$(userName|departmentName)\=(.+?)\$/g;
   var strReg = /\$(?:userName|departmentName)\=.+?\$/;
   var openDatas = [];
@@ -336,7 +335,7 @@ var parseStringV2 = function parseStringV2(str) {
     matchStr = reg.exec(str);
   }
 
-  var commonStrs = (str === null || str === void 0 ? void 0 : str.split(strReg)) || [];
+  var commonStrs = str.split(strReg);
   var renderData = [];
 
   for (var i = 0; i < commonStrs.length; i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@titaui/pc",
-  "version": "1.12.35",
+  "version": "1.12.38",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",