@titaui/pc 1.11.10 → 1.11.13

package/lib/components/dynamic/constant.js

@@ -3,12 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.OkrRiskMapping = exports.ObjectType = exports.ObjTypeMapText = exports.EStatusStatus2ClassType = exports.EShareType = exports.EObjType = exports.EFeedType = void 0;
+exports.getObjTypeMapText = exports.OkrRiskMapping = exports.ObjectType = exports.EStatusStatus2ClassType = exports.EShareType = exports.EObjType = exports.EFeedType = void 0;
 
 var _getLocale = require("../../utils/getLocale");
 
-var _ObjTypeMapText;
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 var OkrRiskMapping = {
@@ -80,8 +78,14 @@ exports.EObjType = EObjType;
   EObjType[EObjType["Report"] = 8] = "Report";
 })(EObjType || (exports.EObjType = EObjType = {}));
 
-var ObjTypeMapText = (_ObjTypeMapText = {}, _defineProperty(_ObjTypeMapText, EObjType.Project, (0, _getLocale.getLocale)("Menu_Title_Projects")), _defineProperty(_ObjTypeMapText, EObjType.Task, (0, _getLocale.getLocale)("Mod_Tasks")), _defineProperty(_ObjTypeMapText, EObjType.O, (0, _getLocale.getLocale)("Mod_Objective")), _defineProperty(_ObjTypeMapText, EObjType.Kr, (0, _getLocale.getLocale)("Mod_KeyResults")), _defineProperty(_ObjTypeMapText, EObjType.MileStone, (0, _getLocale.getLocale)("Pro_page_Plan_Milestone")), _defineProperty(_ObjTypeMapText, EObjType.KanBan, (0, _getLocale.getLocale)("Pro_page_V_Tab_Kanban")), _defineProperty(_ObjTypeMapText, EObjType.Report, "总结"), _ObjTypeMapText);
-exports.ObjTypeMapText = ObjTypeMapText;
+var getObjTypeMapText = function getObjTypeMapText(key) {
+  var _data;
+
+  var data = (_data = {}, _defineProperty(_data, EObjType.Project, (0, _getLocale.getLocale)("Menu_Title_Projects")), _defineProperty(_data, EObjType.Task, (0, _getLocale.getLocale)("Mod_Tasks")), _defineProperty(_data, EObjType.O, (0, _getLocale.getLocale)("Mod_Objective")), _defineProperty(_data, EObjType.Kr, (0, _getLocale.getLocale)("Mod_KeyResults")), _defineProperty(_data, EObjType.MileStone, (0, _getLocale.getLocale)("Pro_page_Plan_Milestone")), _defineProperty(_data, EObjType.KanBan, (0, _getLocale.getLocale)("Pro_page_V_Tab_Kanban")), _defineProperty(_data, EObjType.Report, "总结"), _data);
+  return data[key];
+};
+
+exports.getObjTypeMapText = getObjTypeMapText;
 
 var ObjectType = function ObjectType() {
   return {

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

@@ -68,4 +68,6 @@
 .titaui-dynamic-operation__operate-content {
   color: #6f7886;
   white-space: pre-wrap;
+  display: inline-flex;
+  align-items: center;
 }

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

@@ -0,0 +1,243 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _classnames = _interopRequireDefault(require("classnames"));
+
+var _conditionRender = _interopRequireDefault(require("../../../condition-render"));
+
+var _bsGlobal = require("../../../../utils/bs-global");
+
+var _communication = _interopRequireDefault(require("../../../communication"));
+
+var _avatar = _interopRequireDefault(require("../../../avatar"));
+
+var _tooltip = _interopRequireDefault(require("../../../tooltip"));
+
+var _upvote = _interopRequireDefault(require("../../../upvote"));
+
+var _upvoteListModal = _interopRequireDefault(require("../../../upvote/upvoteListModal"));
+
+var _getLocale = require("../../../../utils/getLocale");
+
+var _context = require("../../context");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+var prefix = "titaui-dynamic-item";
+
+var DynamicFooter = function DynamicFooter(_ref) {
+  var _getBSGlobal;
+
+  var data = _ref.data;
+  var feedId = data.feedId,
+      feedComments = data.feedComments,
+      praiseType = data.praiseType,
+      praiseUsers = data.praiseUsers,
+      feedType = data.feedType,
+      publishUser = data.publishUser;
+
+  var _useState = (0, _react.useState)(true),
+      _useState2 = _slicedToArray(_useState, 2),
+      usePropsComment = _useState2[0],
+      setUsePropsComment = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(feedComments.total > 0),
+      _useState4 = _slicedToArray(_useState3, 2),
+      showComment = _useState4[0],
+      setShowComment = _useState4[1];
+
+  var _useState5 = (0, _react.useState)(praiseUsers || []),
+      _useState6 = _slicedToArray(_useState5, 2),
+      praiseData = _useState6[0],
+      setPraiseData = _useState6[1];
+
+  var _useState7 = (0, _react.useState)(false),
+      _useState8 = _slicedToArray(_useState7, 2),
+      upvoteModalVisible = _useState8[0],
+      setUpvoteModalVisible = _useState8[1];
+
+  var communicationRef = (0, _react.useRef)();
+  var hasRewardBtn = !!((_getBSGlobal = (0, _bsGlobal.getBSGlobal)("WebHead")) !== null && _getBSGlobal !== void 0 && _getBSGlobal.AppHead.find(function (item) {
+    return item.AppId === "950";
+  }));
+
+  var _useContext = (0, _react.useContext)(_context.SearchKeyContext),
+      searchKeyWord = _useContext.searchKeyWord;
+
+  var handleCommentClick = function handleCommentClick() {
+    setShowComment(!showComment);
+    setUsePropsComment(false);
+  };
+
+  var onChangeParse = function onChangeParse(type) {
+    var _getBSGlobal2 = (0, _bsGlobal.getBSGlobal)("loginUserInfo"),
+        Id = _getBSGlobal2.Id;
+
+    var data = _toConsumableArray(praiseData).filter(function (item) {
+      return Number("".concat(item.userId)) !== Number("".concat(Id));
+    });
+
+    if (type) {
+      var avatar = (0, _bsGlobal.getBSGlobal)("loginUserInfo").UserAvatar;
+      var name = (0, _bsGlobal.getBSGlobal)("loginUserInfo").Name;
+      avatar.color = avatar.Color;
+      avatar.medium = avatar.Medium;
+      var parseUser = {
+        avatar: avatar,
+        name: name,
+        userId: Id,
+        praiseType: type
+      };
+      setPraiseData([parseUser].concat(_toConsumableArray(data)));
+    } else {
+      setPraiseData(data);
+    }
+  };
+
+  var handlePayReward = function handlePayReward() {
+    var data = {
+      multi: false,
+      toUserInfo: _objectSpread(_objectSpread({}, publishUser), {}, {
+        id: publishUser.userId
+      }),
+      objId: feedId,
+      objType: feedType
+    };
+
+    if (window.util) {
+      window.util.rewardGetFile(function (myReward) {
+        myReward.renderPayReward(data);
+      });
+    }
+  };
+
+  var renderUpvoteCount = function renderUpvoteCount(type, count) {
+    if (count === 0) {
+      return "";
+    }
+
+    return count || type;
+  };
+
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(prefix, "__footer"))
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__footer-left")
+  }, praiseData.map(function (item, index) {
+    if (index >= 8) return /*#__PURE__*/_react["default"].createElement("span", null);
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      className: "".concat(prefix, "__footer-left-item"),
+      key: item.userId
+    }, /*#__PURE__*/_react["default"].createElement(_avatar["default"].Icon, {
+      name: item.name,
+      userId: item.userId,
+      avatar: item.avatar,
+      type: item.praiseType,
+      size: {
+        width: 28,
+        textNum: 1,
+        fontSize: 12
+      }
+    }));
+  }), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: praiseData && praiseData.length > 8
+  }, /*#__PURE__*/_react["default"].createElement(_avatar["default"].Num, {
+    onClick: function onClick() {
+      return setUpvoteModalVisible(true);
+    },
+    num: praiseData.length - 8
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
+    className: "".concat(prefix, "__footer-right")
+  }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: hasRewardBtn
+  }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
+    overlay: (0, _getLocale.getLocale)("Feed_Approval"),
+    align: {
+      offset: [0, 0]
+    },
+    placement: "top"
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    onClick: handlePayReward,
+    className: (0, _classnames["default"])("".concat(prefix, "__footer-icon"), "".concat(prefix, "__footer-icon-redenvelopes"))
+  }))), /*#__PURE__*/_react["default"].createElement("span", {
+    onClick: handleCommentClick,
+    className: (0, _classnames["default"])("tu-icon-pinglun-m", "".concat(prefix, "__footer-icon"))
+  }, /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: feedComments.total > 0
+  }, /*#__PURE__*/_react["default"].createElement("span", {
+    className: "".concat(prefix, "__footer-number")
+  }, feedComments.total))), /*#__PURE__*/_react["default"].createElement(_upvote["default"], {
+    type: praiseType,
+    count: praiseUsers ? praiseUsers.length : 0,
+    feedId: feedId,
+    onChange: onChangeParse,
+    style: {
+      marginLeft: 30
+    },
+    buttonType: "tu-icon-tyle-column",
+    customUpvoteBtnCls: "".concat(prefix, "__upvote-btn"),
+    renderCount: renderUpvoteCount
+  }), /*#__PURE__*/_react["default"].createElement(_upvoteListModal["default"], {
+    feedId: feedId,
+    visible: upvoteModalVisible,
+    onClose: function onClose() {
+      return setUpvoteModalVisible(false);
+    }
+  }))), /*#__PURE__*/_react["default"].createElement(_conditionRender["default"], {
+    condition: showComment
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: (0, _classnames["default"])("".concat(prefix, "__communication"))
+  }, /*#__PURE__*/_react["default"].createElement(_communication["default"], {
+    feedId: feedId,
+    commentCount: 3,
+    ref: communicationRef,
+    highLightKeyWord: searchKeyWord,
+    autoFocus: feedComments.total === 0,
+    usePropsComment: usePropsComment,
+    communication: feedComments.comments,
+    totalCommunicationNum: feedComments.total,
+    showUser: true,
+    showDefaultInput: true
+  }))));
+};
+
+var _default = DynamicFooter;
+exports["default"] = _default;

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

@@ -11,6 +11,8 @@ var _supersetCharts = _interopRequireDefault(require("../../../superset-charts")
 
 var _utils = require("../dynamic-chart/utils");
 
+var _dynamicFooter = _interopRequireDefault(require("./dynamic-footer"));
+
 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); }
@@ -28,7 +30,9 @@ var DynamicAIDialy = function DynamicAIDialy(_ref) {
     className: prefixCls
   }, /*#__PURE__*/_react["default"].createElement(_supersetCharts["default"], _extends({
     feedData: data
-  }, chartQuery)));
+  }, chartQuery)), /*#__PURE__*/_react["default"].createElement(_dynamicFooter["default"], {
+    data: data
+  }));
 };
 
 var _default = /*#__PURE__*/_react["default"].memo(DynamicAIDialy);

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

@@ -71,7 +71,7 @@ var DynamicKr = function DynamicKr(_ref) {
       className: "".concat(prefix, "__operate-desc")
     }, /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-desc-wrapper")
-    }, (0, _getLocale.getLocale)("Mod_InChargeof"), _constant.ObjTypeMapText[data.obj.objType], /*#__PURE__*/_react["default"].createElement("span", {
+    }, (0, _getLocale.getLocale)("Mod_InChargeof"), (0, _constant.getObjTypeMapText)(data.obj.objType), /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__object-name"),
       onClick: handleClickOTitle
     }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {

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

@@ -114,7 +114,7 @@ var DynamicTask = function DynamicTask(_ref) {
     } else {
       dom = /*#__PURE__*/_react["default"].createElement("span", {
         className: "".concat(prefix, "__operate-desc-wrapper")
-      }, (0, _getLocale.getLocale)("Mod_InChargeof"), _constant2.ObjTypeMapText[obj.objType], /*#__PURE__*/_react["default"].createElement("span", {
+      }, (0, _getLocale.getLocale)("Mod_InChargeof"), (0, _constant2.getObjTypeMapText)(obj.objType), /*#__PURE__*/_react["default"].createElement("span", {
         className: "".concat(prefix, "__object-name"),
         onClick: handleClickTitle
       }, /*#__PURE__*/_react["default"].createElement(_tooltip["default"].Text, {

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

@@ -167,15 +167,13 @@ var DynamicItem = function DynamicItem(_ref) {
   };
 
   var handleShowMore = function handleShowMore() {
-    if (data.feedType === _constant.EFeedType.Report) {
-      if (window.titaTracker) {
-        window.titaTracker("planAction").record({
-          actionName: "查看日报",
-          actionGroup: "动态-查看更多",
-          productName: "动态",
-          feedId: feedId
-        });
-      }
+    if (data.feedType === _constant.EFeedType.Report && window.titaTracker) {
+      window.titaTracker("planAction").record({
+        actionName: "查看日报",
+        actionGroup: "动态-查看更多",
+        productName: "动态",
+        feedId: feedId
+      });
     }
 
     setIsFold(false);
@@ -209,7 +207,7 @@ var DynamicItem = function DynamicItem(_ref) {
       actionName = "取消日报点赞";
     }
 
-    if (window.titaTracker) {
+    if (feedType === _constant.EFeedType.Report && window.titaTracker) {
       window.titaTracker("planAction").record({
         actionName: actionName,
         actionGroup: "动态-日报",
@@ -353,7 +351,7 @@ var DynamicItem = function DynamicItem(_ref) {
     };
 
     if (window.util) {
-      if (window.titaTracker) {
+      if (feedType === _constant.EFeedType.Report && window.titaTracker) {
         window.titaTracker("planAction").record({
           actionName: "打开打赏弹层",
           actionGroup: "动态-日报",
@@ -370,6 +368,7 @@ var DynamicItem = function DynamicItem(_ref) {
 
   var handleReply = function handleReply(_ref2) {
     var submitType = _ref2.submitType;
+    if (feedType !== _constant.EFeedType.Report) return;
     var actionName = submitType === "delete" ? "删除日报评论" : "评论日报";
 
     if (window.titaTracker) {

package/lib/components/e-priority/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"));
 
@@ -37,7 +37,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 var preCls = "tita-okrdt-tree";
 
-function _default(props) {
+var EPriority = function EPriority(props) {
   var onChange = props.onChange,
       checked = props.checked,
       hasAuth = props.hasAuth,
@@ -50,7 +50,10 @@ function _default(props) {
 
   var onMenuClickHandler = function onMenuClickHandler(name) {
     setLevel(name);
-    onChange && onChange(name);
+
+    if (onChange) {
+      onChange(name);
+    }
   };
 
   (0, _react.useEffect)(function () {
@@ -85,4 +88,7 @@ function _default(props) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: (0, _classnames["default"])("".concat(preCls, "__e-task-node-priority-p5 ").concat(preCls, "__e-task-node-select-priority"))
   }), (0, _getLocale.getLocale)("OKR_MyO_E_Butt_Verylow")));
-}
+};
+
+var _default = EPriority;
+exports["default"] = _default;

package/lib/components/okrcase-library/okrcases-components/submitOkr-dialog.js

@@ -303,6 +303,7 @@ function PayDialog(props) {
     if (payCode === "wxPay") {
       e.preventDefault();
       var path = window.location.href.split("#")[0];
+      path = path.replace(/eLearningHome/, "Home");
       var encode = encodeURIComponent("orderId=".concat(orderId, "&payCode=").concat(payCode, "&payName=").concat(payName));
       window.open("".concat(path, "#/pay?").concat(encode), "_blank"); // postWxPayOrder({
       //   order_id: orderId,

package/lib/utils/open-data.js

@@ -263,9 +263,12 @@ var parseHtmlAndTextTag = function parseHtmlAndTextTag(str) {
   var openDatareg = /\[(\w+?)\:(\w+?)\]/g;
   var openDataStrReg = /\[\w+?\:\w+?\]/;
   var openDataMatchStr = openDatareg.exec(str);
+  var hasMatchStr = false;
+  var renderData = [];
 
-  while (matchStr != null || openDataMatchStr != null) {
+  while (matchStr != null) {
     if (matchStr) {
+      hasMatchStr = true;
       var OpenDataCompoent = matchStr[1] == "userId" ? OpenUserName : OpenDepartmentName;
 
       if (!OpenDataCompoent) {
@@ -293,7 +296,24 @@ var parseHtmlAndTextTag = function parseHtmlAndTextTag(str) {
       }
 
       matchStr = reg.exec(str);
-    } else if (openDataMatchStr) {
+    }
+  }
+
+  if (hasMatchStr) {
+    var commonStrs = str.split(strReg);
+
+    for (var i = 0; i < commonStrs.length; i++) {
+      renderData.push( /*#__PURE__*/_react["default"].createElement("span", {
+        dangerouslySetInnerHTML: {
+          __html: commonStrs[i]
+        }
+      }));
+      renderData.push(openDatas[i]);
+    }
+  }
+
+  while (openDataMatchStr != null) {
+    if (openDataMatchStr) {
       var _OpenDataCompoent = openDataMap[openDataMatchStr[2]];
 
       if (!_OpenDataCompoent) {
@@ -304,32 +324,32 @@ var parseHtmlAndTextTag = function parseHtmlAndTextTag(str) {
         })));
       }
 
-      openDataMatchStr = reg.exec(str);
+      openDataMatchStr = openDatareg.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 = [];
+  var newCommonStrs = str.split(openDataStrReg);
 
-  for (var i = 0; i < tempStrs.length; i++) {
+  for (var _i = 0; _i < newCommonStrs.length; _i++) {
     renderData.push( /*#__PURE__*/_react["default"].createElement("span", {
-      style: {
-        verticalAlign: 'middle'
-      },
       dangerouslySetInnerHTML: {
-        __html: tempStrs[i]
+        __html: newCommonStrs[_i]
       }
     }));
-    renderData.push(openDatas[i]);
+    renderData.push(openDatas[_i]);
   }
 
-  return renderData;
+  return renderData.filter(function (item) {
+    return item !== undefined;
+  }).map(function (item) {
+    if (typeof item === 'string') {
+      return item.replace('，', '');
+    } else {
+      return item;
+    }
+  }).filter(function (item) {
+    return item !== "";
+  });
 };
 
 exports.parseHtmlAndTextTag = parseHtmlAndTextTag;

package/package.json

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