@titaui/pc 1.12.54 → 1.12.55

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

@@ -129,7 +129,7 @@ var DynamicReply = function DynamicReply(_ref) {
     return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-desc")
     }, reportTextMap[reportType]);
-  }, []);
+  }, [reportType]);
   (0, _react.useEffect)(function () {
     setCurrentEvalutes(evaluates);
   }, [evaluates]);
@@ -192,8 +192,9 @@ var DynamicReply = function DynamicReply(_ref) {
     alt: ""
   }))), dailyContent.map(function (item) {
     if (item.contentType === _constant.dailyContentType.richText) {
-      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, (item === null || item === void 0 ? void 0 : item.content) && /*#__PURE__*/_react["default"].createElement("div", {
-        className: "".concat(prefix, "__work")
+      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, ((item === null || item === void 0 ? void 0 : item.content) || !(0, _util.isEmptyImage)(item === null || item === void 0 ? void 0 : item.richContent)) && /*#__PURE__*/_react["default"].createElement("div", {
+        className: "".concat(prefix, "__work"),
+        key: item.richContent || Math.random()
       }, 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: !!item.richContent ? JSON.parse(item.richContent || '{}') : undefined,

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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.formatAttachments = void 0;
+exports.isEmptyImage = exports.formatAttachments = void 0;
 
 var firstLaterUpperCase = function firstLaterUpperCase(str) {
   var temp = str.split("");
@@ -25,6 +25,43 @@ var formatAttachments = function formatAttachments(data) {
     });
     return tempObj;
   });
+}; // 获取富文本某个类型的内容
+
+
+exports.formatAttachments = formatAttachments;
+
+var getTypeContent = function getTypeContent(data, initType) {
+  var type = data.type,
+      content = data.content;
+
+  if (type === initType) {
+    return data;
+  } else {
+    if (content !== null && content !== void 0 && content.length) {
+      for (var i = 0; i < (content === null || content === void 0 ? void 0 : content.length); i++) {
+        return getTypeContent(content[i], initType);
+      }
+    }
+
+    return null;
+  }
+};
+
+var isEmptyImage = function isEmptyImage(richText) {
+  if (!richText) return;
+  richText = JSON.parse(richText || '{}');
+  var _richText = richText,
+      doc = _richText.doc;
+  var bol = true;
+
+  if (doc) {
+    var _imageData$attrs;
+
+    var imageData = getTypeContent(doc, 'image');
+    bol = !(imageData !== null && imageData !== void 0 && (_imageData$attrs = imageData.attrs) !== null && _imageData$attrs !== void 0 && _imageData$attrs.src);
+  }
+
+  return bol;
 };
 
-exports.formatAttachments = formatAttachments;
+exports.isEmptyImage = isEmptyImage;

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

@@ -96,7 +96,7 @@ var DynamicReply = function DynamicReply(_ref) {
     return /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-desc")
     }, reportTextMap[reportType]);
-  }, []);
+  }, [reportType]);
   (0, _react.useEffect)(function () {
     (0, _tools.highLightWord)({
       parentDom: contentRichTextRef.current,

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

@@ -124,8 +124,8 @@ var _default = function _default() {
       });
     } else {
       (0, _requestApis.getMyDepartMent)().then(function (res) {
-        location.href = "#/summary/manage?departmentName=".concat(res.Data[0].name, "&departmentId=").concat(res.Data[0].id);
-        var rawTreeData = (0, _helper.translateDepartsToTreeNode)(res.Data);
+        location.href = "#/summary/manage?departmentName=".concat(res.Data.departments[0].name, "&departmentId=").concat(res.Data.departments[0].id);
+        var rawTreeData = (0, _helper.translateDepartsToTreeNode)(res.Data.departments);
         var rootNode = {
           async: true,
           data: {
@@ -166,7 +166,12 @@ var _default = function _default() {
         nodes.forEach(function (it) {
           return rawTreeData.push(it);
         });
-        setRawTreeData(rawTreeData);
+        var deWeightData = {};
+        rawTreeData.forEach(function (item) {
+          deWeightData[item.id] = item;
+        });
+        var result = Object.values(deWeightData);
+        setRawTreeData(_toConsumableArray(result));
         setTreeData((0, _utils.toTree)(rawTreeData));
         resolve(true);
       });

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

@@ -64,7 +64,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       maxHeight = _useState2[0],
       setMaxHeight = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(["myokr"]),
+  var _useState3 = (0, _react.useState)(['myokr']),
       _useState4 = _slicedToArray(_useState3, 2),
       expandedKeys = _useState4[0],
       setExpandedKeys = _useState4[1];
@@ -79,27 +79,23 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       isShowShare = _useState8[0],
       setIsShowShare = _useState8[1];
 
-  var _useState9 = (0, _react.useState)(baseAuth.isBoss() || baseAuth.isAssistant() || baseAuth.isPlanDailyManager()),
-      _useState10 = _slicedToArray(_useState9, 2),
-      isShowDepartment = _useState10[0],
-      setIsShowDepartment = _useState10[1];
-
+  var isShowDepartment = baseAuth.isBoss() || baseAuth.isAssistant() || baseAuth.isPlanDailyManager() || baseAuth.isDepartmentLeader();
   var flipRef = (0, _react.useRef)({
     next: function next() {},
     goback: function goback() {}
   });
   var summaryMenusData = (0, _react.useRef)(_menus.defaultRefObject);
 
-  var _useState11 = (0, _react.useState)(function () {
+  var _useState9 = (0, _react.useState)(function () {
     summaryMenusData.current = new _menus["default"]({
       isShowShare: false,
       isShowDept: true
     });
     return summaryMenusData.current.getMenus();
   }),
-      _useState12 = _slicedToArray(_useState11, 2),
-      menus = _useState12[0],
-      setMenus = _useState12[1]; // 判断路由高亮菜单
+      _useState10 = _slicedToArray(_useState9, 2),
+      menus = _useState10[0],
+      setMenus = _useState10[1]; // 判断路由高亮菜单
 
 
   (0, _react.useEffect)(function () {
@@ -139,7 +135,7 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       resolve(true); // 获取数据
 
       (0, _requestApis.getSubordinates)({
-        relationIds: "1,2"
+        relationIds: '1,2'
       }, {
         disabledDottedSubordinatesDig: true
       }).then(function (users) {
@@ -194,17 +190,6 @@ var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
         }
       }
     });
-
-    if (!isShowDepartment) {
-      (0, _requestApis.getMyDepartMent)().then(function (resp) {
-        if (resp.Code === 1) {
-          if (resp.Data.length > 0) {
-            setIsShowDepartment(true);
-          }
-        }
-      });
-    }
-
     var obs = new _resizeObserverPolyfill["default"](function (entries) {
       var _iterator = _createForOfIteratorHelper(entries),
           _step;

package/lib/components/menus/request-apis.js

@@ -140,7 +140,7 @@ var getDepsAndUsers = function getDepsAndUsers() {
 exports.getDepsAndUsers = getDepsAndUsers;
 
 var getMyDepartMent = function getMyDepartMent() {
-  return (0, _request.rget)('v2')("department/myLead?toUserId=".concat(userId));
+  return (0, _request.rget)('v2')("department/sub/depsAndUsersByPrivilege?objType=8&isGetUser=false");
 };
 
 exports.getMyDepartMent = getMyDepartMent;

package/lib/components/select-tags/index.js

@@ -21,7 +21,7 @@ var _openData = require("../../utils/open-data");
 
 require("./index.css");
 
-var _excluded = ["selected", "controlValue", "data", "onChange", "style", "mode", "className", "placeholder", "name", "noBorder"];
+var _excluded = ["selected", "controlValue", "data", "onChange", "style", "mode", "className", "placeholder", "name", "noBorder", "isParse"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -69,6 +69,8 @@ var SelectTags = function SelectTags(_ref) {
       placeholder = _ref$placeholder === void 0 ? "".concat((0, _getLocale.getLocale)("Mod_Pleaseselect")) : _ref$placeholder,
       name = _ref.name,
       noBorder = _ref.noBorder,
+      _ref$isParse = _ref.isParse,
+      isParse = _ref$isParse === void 0 ? false : _ref$isParse,
       restProps = _objectWithoutProperties(_ref, _excluded);
 
   var _useState = (0, _react.useState)(selected),
@@ -112,7 +114,7 @@ var SelectTags = function SelectTags(_ref) {
     return /*#__PURE__*/_react["default"].createElement(_rcSelect.Option, {
       key: key,
       value: item.value
-    }, (0, _openData.parseString)(item.label));
+    }, isParse ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, (0, _openData.parseString)(item.label)) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item.label));
   })));
 };
 

package/package.json

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