@titaui/pc 1.10.66 → 1.10.67

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

@@ -9,8 +9,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _dangerousHtml = _interopRequireDefault(require("../../../../dangerous-html"));
-
 var _tooltip = _interopRequireDefault(require("../../../../tooltip"));
 
 var _openData = require("../../../../../utils/open-data");
@@ -93,9 +91,7 @@ var DynamicOperation = function DynamicOperation(_ref) {
       })
     })), /*#__PURE__*/_react["default"].createElement("span", {
       className: "".concat(prefix, "__operate-content")
-    }, /*#__PURE__*/_react["default"].createElement(_dangerousHtml["default"], {
-      htmlText: 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/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.66",
+  "version": "1.10.67",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",