@titaui/pc 1.10.6-3.beta-6 → 1.10.6-3.beta-9

package/.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npm run lint-staged
+# npm run lint-staged

package/.prettierignore

@@ -22,10 +22,10 @@ lib
 
 stories
 
-*.js
+# *.js
 
-*.jsx
+# *.jsx
 
-*.ts
+# *.ts
 
 # *.tsx

package/lib/components/dynamic/dynamic-item/components/feed-operate/index.js

@@ -91,7 +91,7 @@ var DynamicOperation = function DynamicOperation(_ref) {
       })
     })), /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-content")
-    }, content))), index === 2 && feedOperations.total > 3 && /*#__PURE__*/_react["default"].createElement("div", {
+    }, (0, _openData.parseHtmlAndTextTag)(content)))), index === 2 && feedOperations.total > 3 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__operate-item")
     }, /*#__PURE__*/_react["default"].createElement("img", {
       className: "".concat(prefix, "__operate-icon"),

package/lib/components/dynamic/dynamic-item/dynamic-ai-dialy/index.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _supersetCharts = _interopRequireDefault(require("../../../superset-charts"));
+
+var _utils = require("../dynamic-chart/utils");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+var prefixCls = "titaui-dynamic-item";
+
+var DynamicAIDialy = function DynamicAIDialy(_ref) {
+  var data = _ref.data;
+  var chartQuery = (0, _utils.getChartProps)(data.biId);
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: prefixCls
+  }, /*#__PURE__*/_react["default"].createElement(_supersetCharts["default"], _extends({
+    layout: "feed-card"
+  }, chartQuery)));
+};
+
+var _default = DynamicAIDialy;
+exports["default"] = _default;

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

@@ -72,7 +72,7 @@ var DynamicReply = function DynamicReply(_ref) {
         actionName: "查看日报",
         actionGroup: "动态-推屏",
         productName: "动态",
-        feedId: data.dailyId
+        feedId: feedId
       });
     } // @ts-ignore
 

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

@@ -173,7 +173,7 @@ var DynamicItem = function DynamicItem(_ref) {
           actionName: "查看日报",
           actionGroup: "动态-查看更多",
           productName: "动态",
-          feedId: data.dailyId
+          feedId: feedId
         });
       }
     }

package/lib/components/dynamic/dynamic-list/index.js

@@ -11,6 +11,8 @@ var _rcQueueAnim = _interopRequireDefault(require("rc-queue-anim"));
 
 var _dynamicItem = _interopRequireDefault(require("../dynamic-item"));
 
+var _dynamicAiDialy = _interopRequireDefault(require("../dynamic-item/dynamic-ai-dialy"));
+
 var _dynamicEmpty = _interopRequireDefault(require("../img/dynamic-empty.png"));
 
 var _conditionRender = _interopRequireDefault(require("../../condition-render"));
@@ -19,6 +21,8 @@ var _getLocale = require("../../../utils/getLocale");
 
 require("./index.css");
 
+var _constant = require("../constant");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 // @ts-ignore
@@ -64,10 +68,14 @@ var DynamicList = function DynamicList(_ref) {
       display: "none"
     }]
   }, data.map(function (item) {
+    var _JSON$parse;
+
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "".concat(prefix, "__item-wrapper"),
       key: item.feedId
-    }, /*#__PURE__*/_react["default"].createElement(_dynamicItem["default"], {
+    }, item.shareType === _constant.EShareType.BiShare && item.biId && ((_JSON$parse = JSON.parse(item.biId)) === null || _JSON$parse === void 0 ? void 0 : _JSON$parse.type) === "AIDialyFeed" ? /*#__PURE__*/_react["default"].createElement(_dynamicAiDialy["default"], {
+      data: item
+    }) : /*#__PURE__*/_react["default"].createElement(_dynamicItem["default"], {
       data: item,
       onDeleteFeed: handleDeleteFeed,
       dynamicShareIsShowToping: dynamicShareIsShowToping

package/lib/components/edit-kr-wight/style/index.js

@@ -13,7 +13,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
-var EditWightContent = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background-color: #fff;\n  padding-top: 21px;\n  padding: 32px 32px 0 32px;\n"])));
+var EditWightContent = _styledComponents["default"].div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  background-color: #fff;\n  padding-top: 21px;\n  padding: 32px 32px 0 32px;\n  max-height: 600px;\n  overflow-y: scroll;\n"])));
 
 exports.EditWightContent = EditWightContent;
 
@@ -37,7 +37,7 @@ var FormItemWrapper = _styledComponents["default"].div(_templateObject6 || (_tem
 
 exports.FormItemWrapper = FormItemWrapper;
 
-var ItemLabel = _styledComponents["default"].label.attrs(function (props) {// console.log(props);
+var ItemLabel = _styledComponents["default"].label.attrs(function () {// console.log(props);
 })(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n  text-align: right;\n  display: inline-block;\n  min-width: 60px;\n  position: relative;\n  right: 5px;\n  bottom: 2px;\n  font-size: 13px;\n  color: #83898f;\n  opacity: 0.7;\n  &::before {\n    font-family: SimSun, sans-serif;\n    content: '*';\n    font-size: 12px;\n    position: absolute;\n    top: 50%;\n    left: 45%;\n    transform: translate(-50%, -50%);\n    color: ", ";\n  }\n"])), function (props) {
   return props.required ? "#cc2929" : "transparent";
 });

package/lib/components/nav-top/request.apis.js

@@ -11,6 +11,7 @@ var _request = require("../../utils/request");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+/* eslint-disable default-case */
 // @ts-ignore
 var tenantId = window.BSGlobal && window.BSGlobal.tenantInfo.Id || 0; // @ts-ignore
 
@@ -76,15 +77,22 @@ var getMessages = function getMessages() {
   var year = nowTime.getFullYear();
   var month = nowTime.getMonth() + 1;
   var date = nowTime.getDate();
-  return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/RemindV2/Get?dateTime=").concat(year, "/").concat(month, "/").concat(date)).then(function (resp) {
-    if (resp.code === 401) {
-      window.location.href = "/Account/Logout";
-      return undefined;
+
+  _axios["default"].interceptors.response.use(function (response) {
+    return response;
+  }, function (error) {
+    if (error.response) {
+      switch (error.response.status) {
+        case 401:
+          window.location.reload();
+      }
     }
 
+    return Promise.reject(error.response.data);
+  });
+
+  return _axios["default"].get("".concat(requestDomain(), "/api/v1/").concat(tenantId, "/").concat(userId, "/RemindV2/Get?dateTime=").concat(year, "/").concat(month, "/").concat(date)).then(function (resp) {
     return resp.data;
-  }).then(function (data) {
-    return data;
   });
 };
 

package/lib/components/okr-detail/components/okr-tree/tree-node/e-kr-node/index.js

@@ -44,16 +44,15 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 var hasProject = (0, _bsGlobal.hasWebHead)("project");
 
 var EKrNode = function EKrNode(props) {
+  var _okrInfo$authority;
+
   var index = props.index,
       title = props.title,
       data = props.data,
       isOTask = props.isOTask,
-      _props$hasAddProject = props.hasAddProject,
-      hasAddProject = _props$hasAddProject === void 0 ? true : _props$hasAddProject,
       _props$hasRelation = props.hasRelation,
       hasRelation = _props$hasRelation === void 0 ? true : _props$hasRelation;
   var btnRef = (0, _react.useRef)();
-  hasProject = hasProject && hasAddProject;
 
   var _useContext = (0, _react.useContext)(_context2.CommonContext),
       okrInfo = _useContext.okrInfo;
@@ -61,7 +60,7 @@ var EKrNode = function EKrNode(props) {
   var _useContext2 = (0, _react.useContext)(_context2.EListContext),
       refreshEList = _useContext2.refreshEList;
 
-  var isParticipant = okrInfo.authority.roleRelation && okrInfo.authority.roleRelation.roleType === 2;
+  var isParticipant = ((_okrInfo$authority = okrInfo.authority) === null || _okrInfo$authority === void 0 ? void 0 : _okrInfo$authority.roleRelation) && okrInfo.authority.roleRelation.roleType === 2;
   var hasRelativeAuth;
 
   if (isOTask) {

package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/e-project.js

@@ -62,12 +62,16 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function _default(props) {
-  var _data$principalUser, _data$principalUser2;
+  var _okrInfo$authority, _data$principalUser, _data$principalUser2;
 
   var index = props.index,
       title = props.title,
       data = props.data,
-      createUserId = props.createUserId;
+      createUserId = props.createUserId,
+      _props$hasProgress = props.hasProgress,
+      hasProgress = _props$hasProgress === void 0 ? true : _props$hasProgress,
+      _props$hasRelation = props.hasRelation,
+      hasRelation = _props$hasRelation === void 0 ? true : _props$hasRelation;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -84,7 +88,7 @@ function _default(props) {
   var _useContext2 = (0, _react.useContext)(_context.EListContext),
       refreshEList = _useContext2.refreshEList;
 
-  var isParticipant = okrInfo.authority.roleRelation && okrInfo.authority.roleRelation.roleType === 2;
+  var isParticipant = ((_okrInfo$authority = okrInfo.authority) === null || _okrInfo$authority === void 0 ? void 0 : _okrInfo$authority.roleRelation) && okrInfo.authority.roleRelation.roleType === 2;
   var hasRelativeAuth = new _auth.KRAuth({
     user: data.user,
     createUserId: createUserId
@@ -154,7 +158,7 @@ function _default(props) {
   }, /*#__PURE__*/_react["default"].createElement(_statusTime["default"], {
     deadLine: data.deadLine,
     isComplete: data.status === 2
-  })), /*#__PURE__*/_react["default"].createElement("span", {
+  })), hasProgress && /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "__e-project-node-actions-progress ").concat(isGray && "".concat(_precls["default"], "__e-project-node-gray")))
   }, /*#__PURE__*/_react["default"].createElement(_progress["default"].Circle, {
     size: 22,
@@ -165,7 +169,7 @@ function _default(props) {
     linearStartColor: (0, _getProcessColor["default"])(data.riskLevel, "linearStartColor", data.status),
     linearEndColor: (0, _getProcessColor["default"])(data.riskLevel, "linearEndColor", data.status),
     backgroundColor: (0, _getProcessColor["default"])(data.riskLevel, "backgroundColor", data.status)
-  })), okrInfo.status === 1 && (hasRelativeAuth || isParticipant) ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+  })), okrInfo.status === 1 && hasRelation && (hasRelativeAuth || isParticipant) ? /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
     overlay: (0, _getLocale.getLocale)("OKR_MyO_Text_Cancel"),
     placement: "top"
   }, /*#__PURE__*/_react["default"].createElement("span", {

package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/e-task-level2.js

@@ -82,6 +82,8 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 function _default(props) {
+  var _okrInfo$authority;
+
   var index = props.index,
       title = props.title,
       data = props.data,
@@ -147,7 +149,7 @@ function _default(props) {
     principalUser: okrInfo.principalUser,
     createUserId: okrInfo.createUserId
   }).hasAuth()) && data.status !== 5;
-  var isParticipant = okrInfo.authority.roleRelation && okrInfo.authority.roleRelation.roleType === 2;
+  var isParticipant = ((_okrInfo$authority = okrInfo.authority) === null || _okrInfo$authority === void 0 ? void 0 : _okrInfo$authority.roleRelation) && okrInfo.authority.roleRelation.roleType === 2;
   var hasRelativeAuth = new _auth.KRAuth({
     user: data.user,
     createUserId: createUserId

package/lib/components/okr-detail/components/okr-tree/tree-node/e-node/e-task.js

@@ -83,6 +83,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 // status=3 已过期 status=2 已完成
 function ETaskNode(props) {
+  var _okrInfo$authority;
+
   var index = props.index,
       title = props.title,
       data = props.data,
@@ -91,7 +93,9 @@ function ETaskNode(props) {
       _props$hasProgress = props.hasProgress,
       hasProgress = _props$hasProgress === void 0 ? true : _props$hasProgress,
       _props$hasRelation = props.hasRelation,
-      hasRelation = _props$hasRelation === void 0 ? true : _props$hasRelation;
+      hasRelation = _props$hasRelation === void 0 ? true : _props$hasRelation,
+      _props$isPushScreen = props.isPushScreen,
+      isPushScreen = _props$isPushScreen === void 0 ? false : _props$isPushScreen;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -154,7 +158,7 @@ function ETaskNode(props) {
     principalUser: okrInfo.principalUser,
     createUserId: okrInfo.createUserId
   }).hasAuth()) && data.status !== 5;
-  var isParticipant = okrInfo.authority.roleRelation && okrInfo.authority.roleRelation.roleType === 2;
+  var isParticipant = ((_okrInfo$authority = okrInfo.authority) === null || _okrInfo$authority === void 0 ? void 0 : _okrInfo$authority.roleRelation) && okrInfo.authority.roleRelation.roleType === 2;
   var hasRelativeAuth = new _auth.KRAuth({
     user: krUser,
     createUserId: createUserId
@@ -328,7 +332,18 @@ function ETaskNode(props) {
       _drawerManager["default"].close();
     }
 
-    window.open("//".concat(window.location.host).concat(window.location.pathname, "#more/taskinfo?id=").concat(data.taskId));
+    if (isPushScreen) {
+      var _window$Talent, _window$Talent2;
+
+      (_window$Talent = window.Talent) === null || _window$Talent === void 0 ? void 0 : _window$Talent.app.vent.off("global-pull-screen:closed:".concat(data.taskId));
+      (_window$Talent2 = window.Talent) === null || _window$Talent2 === void 0 ? void 0 : _window$Talent2.app.vent.on("global-pull-screen:closed:".concat(data.taskId), function () {
+        refreshEList && refreshEList();
+      }); // 任务：打开推屏
+
+      window.Talent.app.vent.trigger('global-pull-screen', data.taskId, 'task');
+    } else {
+      window.open("//".concat(window.location.host).concat(window.location.pathname, "#more/taskinfo?id=").concat(data.taskId));
+    }
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/okr-detail/e-list/index.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = _default;
+exports["default"] = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -51,7 +51,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var preCls = "okr-detail-e";
 
-function _default(props) {
+function Elist(props, ref) {
   var okrId = props.okrId,
       _props$hasSearch = props.hasSearch,
       hasSearch = _props$hasSearch === void 0 ? true : _props$hasSearch,
@@ -66,15 +66,16 @@ function _default(props) {
       _props$hasdivider = props.hasdivider,
       hasdivider = _props$hasdivider === void 0 ? false : _props$hasdivider,
       className = props.className,
-      _props$includeWork = props.includeWork,
-      includeWork = _props$includeWork === void 0 ? true : _props$includeWork,
       _props$IncludeNoTaskK = props.IncludeNoTaskKr,
       IncludeNoTaskKr = _props$IncludeNoTaskK === void 0 ? true : _props$IncludeNoTaskK,
       _props$hasLoading = props.hasLoading,
       hasLoading = _props$hasLoading === void 0 ? true : _props$hasLoading,
       _props$IsDateFilter = props.IsDateFilter,
       IsDateFilter = _props$IsDateFilter === void 0 ? false : _props$IsDateFilter,
-      emptyPage = props.emptyPage;
+      emptyPage = props.emptyPage,
+      setIsEmpty = props.setIsEmpty,
+      _props$layoutPadding = props.layoutPadding,
+      layoutPadding = _props$layoutPadding === void 0 ? '0 32px 0 18px' : _props$layoutPadding;
   var loginUser = (0, _bsGlobal.getUserInfo)().Id;
   var hasCondition = hasSearch && localStorage.getItem("hasRememberCondition".concat(loginUser));
 
@@ -148,35 +149,47 @@ function _default(props) {
         startDate: startDate,
         endDate: endDate,
         toLevel: toLevel,
-        includeWork: includeWork,
         IncludeNoTaskKr: IncludeNoTaskKr,
         IsDateFilter: IsDateFilter
       })
     }).then(function (krs) {
-      debugger;
       var formatKrs = formatEList(krs, okrId, (0, _util.getIfInitCondition)(selectName, checkedStatus, selectUsers, searchKey));
-      var expandedKrEs = (formatKrs.krsEList || []).map(function (it) {
+      var newexpandedKrEs = (formatKrs.krsEList || []).map(function (it) {
         return it.key;
       });
-      var expandedOEs = (formatKrs.oEList[0] || []).map(function (it) {
+      var newexpandedOEs = (formatKrs.oEList[0] || []).map(function (it) {
         return it.key;
       });
-      setExpandedKrEs(expandedKrEs);
-      setExpandedOEs(expandedOEs);
+      setExpandedKrEs(newexpandedKrEs);
+      setExpandedOEs(newexpandedOEs);
       setKrList(formatKrs.krsEList);
       setOEList(formatKrs.oEList);
       setLoading(false);
     });
   };
 
+  (0, _react.useImperativeHandle)(ref, function () {
+    return {
+      getKrEsData: getKrEsData
+    };
+  });
   (0, _react.useEffect)(function () {
     // 可以接收一个格式化方法
     getKrEsData(formatTree);
   }, [noteOrder, searchKey, selectName, checkedStatus, selectUsers, startDate, endDate, okrId]);
   (0, _react.useEffect)(function () {
     var oElistLength = oEList[0] && oEList[0].length || 0;
-    setTotalDataNum(krList.length + oElistLength);
+    var totalLength = krList.length + oElistLength;
+    setTotalDataNum(totalLength);
+    setIsEmpty && setIsEmpty(!totalLength);
   }, [krList, oEList]);
+  var krsTree = (0, _react.useCallback)(function (kr) {
+    return /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
+      key: Math.random(),
+      data: [kr],
+      defaultExpandedKeys: expandedKrEs
+    });
+  }, [expandedKrEs, krList]);
   return /*#__PURE__*/_react["default"].createElement(_context.EListContext.Provider, {
     value: {
       refreshEList: function refreshEList() {
@@ -200,18 +213,16 @@ function _default(props) {
     condition: totalDataNum !== 0
   }, krList.map(function (kr, index) {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], {
-      padding: "0 32px 0 18px"
-    }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
-      data: [kr],
-      defaultExpandedKeys: expandedKrEs
-    })), // kr左后一个节点 && 没有 OE 时，不显示横线
+      padding: layoutPadding
+    }, krsTree(kr)), // kr左后一个节点 && 没有 OE 时，不显示横线
     !(index + 1 == krList.length && oEList.length == 0) && hasdivider && /*#__PURE__*/_react["default"].createElement("div", {
       className: "e__divider"
     }));
   }), oEList.map(function (kr) {
     return /*#__PURE__*/_react["default"].createElement(_paddingLayout["default"], {
-      padding: "0 32px 0 18px"
+      padding: layoutPadding
     }, /*#__PURE__*/_react["default"].createElement(_okrTree["default"], {
+      key: Math.random(),
       data: kr,
       defaultExpandedKeys: expandedOEs
     }));
@@ -227,4 +238,9 @@ function _default(props) {
   }, "\u6CA1\u6709\u641C\u7D22\u5230\u7B26\u5408\u6761\u4EF6\u7684E-\u6267\u884C")))) : /*#__PURE__*/_react["default"].createElement(_loading["default"], {
     type: "panel"
   })));
-}
+} // @ts-ignore
+
+
+Elist = /*#__PURE__*/(0, _react.forwardRef)(Elist);
+var _default = Elist;
+exports["default"] = _default;

package/lib/components/okr-detail/e-list/util.js

@@ -167,7 +167,6 @@ var formatCondition = function formatCondition(_ref) {
       startDate = _ref.startDate,
       endDate = _ref.endDate,
       toLevel = _ref.toLevel,
-      includeWork = _ref.includeWork,
       IncludeNoTaskKr = _ref.IncludeNoTaskKr,
       IsDateFilter = _ref.IsDateFilter;
   var resultStatus = [];
@@ -201,7 +200,6 @@ var formatCondition = function formatCondition(_ref) {
     FilterKey: keyWord,
     startDate: startDate || '',
     endDate: endDate || '',
-    includeWork: includeWork,
     IncludeNoTaskKr: IncludeNoTaskKr,
     IsDateFilter: IsDateFilter,
     status: resultStatus.join(","),

package/lib/components/superset-charts/utils/axios.js

@@ -65,6 +65,14 @@ var beforeResponse = function beforeResponse(res) {
   config.retry = 3;
   config.retryCount = config.retryCount || 0;
 
+  if (window.titaTracker) {
+    window.titaTracker("action").record({
+      actionName: JSON.stringify(config),
+      actionGroup: "调用接口",
+      productName: "接口"
+    });
+  }
+
   if (res.data.code === 401) {
     // 401错误表示未登录授权或者token失效
     clearToken();

package/lib/pages/new-okr-list/index.js

@@ -214,7 +214,8 @@ var NewOkrList = function NewOkrList(props) {
     if (!relation) {
       request = (0, _requestApi.okrSearch)(params);
     } else {
-      request = (0, _requestApi.okrList)(params);
+      // request = okrList(params);
+      request = (0, _requestApi.okrSearch)(params);
     }
 
     setLoading(true);

package/lib/utils/open-data.js

@@ -5,7 +5,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.parseTag = exports.parseString = exports.isWxTrial = exports.isWechat = exports.isPlatform = exports.getSource = exports.getOpenId = exports["default"] = exports.OpenUserName = exports.OpenDepartmentName = void 0;
+exports.parseTag = exports.parseString = exports.parseHtmlAndTextTag = exports.isWxTrial = exports.isWechat = exports.isPlatform = exports.getSource = exports.getOpenId = exports["default"] = exports.OpenUserName = exports.OpenDepartmentName = void 0;
 
 var _react = _interopRequireWildcard(require("react"));
 
@@ -254,6 +254,85 @@ var parseString = function parseString(str) {
 };
 
 exports.parseString = parseString;
+
+var parseHtmlAndTextTag = function parseHtmlAndTextTag(str) {
+  var reg = /<\w+[\w\W]*?(userId|departmentId)=["'](\S+?)["'][\w\W]*?>@([\w\W]*?)<\/\w+>/g;
+  var strReg = /<\w+[\w\s"'\/=\:\.]*?(?:userId|departmentId)=["']\S+?["'][\w\s"'\/=\:\.]*?>[\w\W]*?<\/\w+?>/;
+  var openDatas = [];
+  var matchStr = reg.exec(str);
+  var openDatareg = /\[(\w+?)\:(\w+?)\]/g;
+  var openDataStrReg = /\[\w+?\:\w+?\]/;
+  var openDataMatchStr = openDatareg.exec(str);
+
+  while (matchStr != null || openDataMatchStr != null) {
+    if (matchStr) {
+      var OpenDataCompoent = matchStr[1] == "userId" ? OpenUserName : OpenDepartmentName;
+
+      if (!OpenDataCompoent) {
+        openDatas.push( /*#__PURE__*/_react["default"].createElement("span", {
+          dangerouslySetInnerHTML: {
+            __html: matchStr[0]
+          },
+          onClick: function onClick(e) {
+            return e.stopPropagation();
+          }
+        }));
+      } else {
+        openDatas.push( /*#__PURE__*/_react["default"].createElement("span", {
+          style: {
+            color: "#1890ff",
+            margin: '0 4px'
+          },
+          onClick: function onClick(e) {
+            return e.stopPropagation();
+          }
+        }, "@", /*#__PURE__*/_react["default"].createElement(OpenDataCompoent, {
+          id: matchStr[2],
+          name: matchStr[3]
+        })));
+      }
+
+      matchStr = reg.exec(str);
+    } else if (openDataMatchStr) {
+      var _OpenDataCompoent = openDataMap[openDataMatchStr[2]];
+
+      if (!_OpenDataCompoent) {
+        openDatas.push(openDataMatchStr[0]);
+      } else {
+        openDatas.push( /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement(_OpenDataCompoent, {
+          id: openDataMatchStr[1]
+        })));
+      }
+
+      openDataMatchStr = reg.exec(str);
+    }
+  }
+
+  var commonStrs = str.split(strReg);
+  var tempStrs = [];
+  commonStrs && commonStrs.forEach(function (item) {
+    tempStrs.push(item.split(openDataStrReg).filter(function (item) {
+      return item !== '';
+    }));
+  });
+  var renderData = [];
+
+  for (var i = 0; i < tempStrs.length; i++) {
+    renderData.push( /*#__PURE__*/_react["default"].createElement("span", {
+      style: {
+        verticalAlign: 'middle'
+      },
+      dangerouslySetInnerHTML: {
+        __html: tempStrs[i]
+      }
+    }));
+    renderData.push(openDatas[i]);
+  }
+
+  return renderData;
+};
+
+exports.parseHtmlAndTextTag = parseHtmlAndTextTag;
 var _default = {
   OpenUserName: OpenUserName,
   OpenDepartmentName: OpenDepartmentName,

package/package.json

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