@titaui/pc 1.11.11 → 1.11.13-beta.11

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-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/new-ui.css

@@ -1,4 +1,5 @@
 .titaui-new-ui-dynamic {
+  width: 100%;
   position: relative;
   display: flex;
   flex-direction: column;

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/nav-top/index.js

@@ -25,12 +25,14 @@ var _version = _interopRequireDefault(require("./components/version"));
 
 var _utils = require("./utils");
 
-require("./index.css");
-
 var _request = require("../../utils/request");
 
 var _toast = _interopRequireDefault(require("../toast"));
 
+var _useGlobalValue = _interopRequireDefault(require("./useGlobalValue"));
+
+require("./index.css");
+
 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); }
@@ -171,4 +173,5 @@ var NavTop = function NavTop() {
 };
 
 var _default = NavTop;
-exports["default"] = _default;
+exports["default"] = _default;
+NavTop.useGlobalValue = _useGlobalValue["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.11",
+  "version": "1.11.13-beta.11",
   "nameCN": "",
   "description": "",
   "main": "lib/index.js",