@titaui/pc 1.11.11 → 1.11.12

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/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/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.11",
+  "version": "1.11.12",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",