@titaui/pc 1.12.7 → 1.12.8

package/lib/components/okr-detail/schedule/components/o-progress/index.js

@@ -37,6 +37,8 @@ var _getLocale = require("../../../../../utils/getLocale");
 
 var _i18nFrontTranslate = require("../../../../../utils/i18n-front-translate");
 
+var _openData = require("../../../../../utils/open-data");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -103,12 +105,12 @@ var OProgress = function OProgress(_ref) {
       editOProgressVisiable = _useState12[0],
       setEditOProgressVisiable = _useState12[1];
 
-  var _useState13 = (0, _react.useState)(""),
+  var _useState13 = (0, _react.useState)(''),
       _useState14 = _slicedToArray(_useState13, 2),
       editOProgressContent = _useState14[0],
       setEditOProgressContent = _useState14[1];
 
-  var _useState15 = (0, _react.useState)(""),
+  var _useState15 = (0, _react.useState)(''),
       _useState16 = _slicedToArray(_useState15, 2),
       editOProgressId = _useState16[0],
       setEditOProgressId = _useState16[1];
@@ -143,9 +145,9 @@ var OProgress = function OProgress(_ref) {
   };
 
   var handleModalOkClick = function handleModalOkClick() {
-    (0, _requestApis.updateProgressDesc)(editOProgressId, okrInfo.workId, editOProgressContent || "").then(function (resp) {
+    (0, _requestApis.updateProgressDesc)(editOProgressId, okrInfo.workId, editOProgressContent || '').then(function (resp) {
       if (resp.Code === 1) {
-        _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"), {
+        _toast["default"].Success((0, _getLocale.getLocale)('Mod_Successfuloperat'), {
           canClose: false
         });
 
@@ -158,7 +160,7 @@ var OProgress = function OProgress(_ref) {
         });
       }
     })["catch"](function (e) {
-      _toast["default"].Error("网络异常", {
+      _toast["default"].Error('网络异常', {
         canClose: false
       });
     });
@@ -177,7 +179,7 @@ var OProgress = function OProgress(_ref) {
       onClick: onOpenModal
     }, /*#__PURE__*/_react["default"].createElement("i", {
       className: "tu-icon-gengxin o-progress__func-btn-icon"
-    }), (0, _getLocale.getLocale)("OKR_MyO_Prog_Butt_Update"));
+    }), (0, _getLocale.getLocale)('OKR_MyO_Prog_Butt_Update'));
   };
 
   var handleRemind = (0, _react.useCallback)(function () {
@@ -188,7 +190,7 @@ var OProgress = function OProgress(_ref) {
       type: 2
     }).then(function (resp) {
       if (resp.Code === 1) {
-        _toast["default"].Success((0, _getLocale.getLocale)("OKR_MyO_Prog_Remindersu"), {
+        _toast["default"].Success((0, _getLocale.getLocale)('OKR_MyO_Prog_Remindersu'), {
           canClose: false
         });
       } else {
@@ -197,7 +199,7 @@ var OProgress = function OProgress(_ref) {
         });
       }
     })["catch"](function (e) {
-      _toast["default"].Error("网络异常", {
+      _toast["default"].Error('网络异常', {
         canClose: false
       });
     })["finally"](function () {
@@ -212,7 +214,7 @@ var OProgress = function OProgress(_ref) {
         work_id: okrInfo.workId
       }).then(function (resp) {
         if (resp.Code === 1) {
-          _toast["default"].Success((0, _getLocale.getLocale)("OKR_MyO_Prog_Remindersu"), {
+          _toast["default"].Success((0, _getLocale.getLocale)('OKR_MyO_Prog_Remindersu'), {
             canClose: false
           });
         } else {
@@ -221,7 +223,7 @@ var OProgress = function OProgress(_ref) {
           });
         }
       })["catch"](function (e) {
-        _toast["default"].Error("网络异常", {
+        _toast["default"].Error('网络异常', {
           canClose: false
         });
       });
@@ -245,7 +247,7 @@ var OProgress = function OProgress(_ref) {
   }, [generalPrincipalUser]);
   (0, _react.useEffect)(function () {
     // @ts-ignore
-    var dom = document.querySelector(".o-progress__contnet-wrapper").querySelector(".okr-progress-item-wrapper"); // @ts-ignore
+    var dom = document.querySelector('.o-progress__contnet-wrapper').querySelector('.okr-progress-item-wrapper'); // @ts-ignore
 
     var height = dom ? dom.offsetHeight : 0; // 为了解决展开内容编辑过后收起时计算的高度是根据展开的算 16是第一个目标进展在展开和收起所以列表的时候的padding-bottom差
 
@@ -265,53 +267,53 @@ var OProgress = function OProgress(_ref) {
       type: "warning"
     }, /*#__PURE__*/_react["default"].createElement("span", {
       type: "title"
-    }, (0, _getLocale.getLocale)("OKR_DR_Pop_Areyousure")), /*#__PURE__*/_react["default"].createElement("span", {
+    }, (0, _getLocale.getLocale)('OKR_DR_Pop_Areyousure')), /*#__PURE__*/_react["default"].createElement("span", {
       type: "content"
-    }, (0, _getLocale.getLocale)("OKR_DR_Pop_ThesystemOKR")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.CancelButton, {
+    }, (0, _getLocale.getLocale)('OKR_DR_Pop_ThesystemOKR')), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.CancelButton, {
       type: "button",
       onClick: handleCancelRemind
-    }, (0, _getLocale.getLocale)("Mod_Cancel")), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.SureButton, {
+    }, (0, _getLocale.getLocale)('Mod_Cancel')), /*#__PURE__*/_react["default"].createElement(_dialogConfirm.SureButton, {
       type: "button",
       onClick: handleEnsureRemind
-    }, (0, _getLocale.getLocale)("OKR_MyO_Butt_Determine")));
+    }, (0, _getLocale.getLocale)('OKR_MyO_Butt_Determine')));
   }, [showRemindDialogConfirm, handleCancelRemind, handleEnsureRemind]);
   var renderEmptyCmp = (0, _react.useMemo)(function () {
     var renderUpdateBtn = function renderUpdateBtn(_ref3) {
       var onOpenModal = _ref3.onOpenModal;
       return /*#__PURE__*/_react["default"].createElement("button", {
-        className: "o-progress__empty-button ".concat(isPrincipalUser ? "" : "o-progress__empty-button--not-principaluser"),
+        className: "o-progress__empty-button ".concat(isPrincipalUser ? '' : 'o-progress__empty-button--not-principaluser'),
         onClick: onOpenModal
-      }, (0, _getLocale.getLocale)("OKR_MyO_Prog_Butt_Update"));
+      }, (0, _getLocale.getLocale)('OKR_MyO_Prog_Butt_Update'));
     };
 
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])({
-        "o-progress__empty-wrapper": true,
-        "o-progress__empty-wrapper--not-principaluser": hasOtherProgress
+        'o-progress__empty-wrapper': true,
+        'o-progress__empty-wrapper--not-principaluser': hasOtherProgress
       })
     }, /*#__PURE__*/_react["default"].createElement("img", {
       width: 128,
       src: _scheduleEmpty["default"]
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "o-progress__empty-text"
-    }, isPrincipalUser ? (0, _getLocale.getLocale)("OKR_MyO_KRP_tochecko") : (0, _getLocale.getLocale)("OKR_MyO_Pr_Text_Nooprogress")), isPrincipalUser && /*#__PURE__*/_react["default"].createElement(_oProgressUpdate["default"], {
+    }, isPrincipalUser ? (0, _getLocale.getLocale)('OKR_MyO_KRP_tochecko') : (0, _getLocale.getLocale)('OKR_MyO_Pr_Text_Nooprogress')), isPrincipalUser && /*#__PURE__*/_react["default"].createElement(_oProgressUpdate["default"], {
       okrInfo: okrInfo,
       renderContent: renderUpdateBtn,
       setUpdateData: setUpdateProgress
     }), !isCanEditProgress && /*#__PURE__*/_react["default"].createElement("button", {
       className: "o-progress__empty-button",
       onClick: handleRemindClick
-    }, (0, _getLocale.getLocale)("OKR_MyO_Pr_Butt_Reminder")), isCanEditProgress && !isPrincipalUser && /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("button", {
+    }, (0, _getLocale.getLocale)('OKR_MyO_Pr_Butt_Reminder')), isCanEditProgress && !isPrincipalUser && /*#__PURE__*/_react["default"].createElement("div", null, /*#__PURE__*/_react["default"].createElement("button", {
       className: "o-progress__empty-button",
       onClick: handleRemindClick
-    }, (0, _getLocale.getLocale)("OKR_MyO_Pr_Butt_Reminder")), /*#__PURE__*/_react["default"].createElement(_oProgressUpdate["default"], {
+    }, (0, _getLocale.getLocale)('OKR_MyO_Pr_Butt_Reminder')), /*#__PURE__*/_react["default"].createElement(_oProgressUpdate["default"], {
       okrInfo: okrInfo,
       renderContent: renderUpdateBtn,
       setUpdateData: setUpdateProgress
     })));
   }, [hasOtherProgress]);
   var renderDefaultRemindCmp = (0, _react.useMemo)(function () {
-    var text = isPrincipalUser ? (0, _auth.hasSuperior)() ? (0, _getLocale.getLocale)("OKR_MyO_Prog_Butt_Remind") : null : (0, _getLocale.getLocale)("OKR_MyO_Pr_Butt_Reminder");
+    var text = isPrincipalUser ? (0, _auth.hasSuperior)() ? (0, _getLocale.getLocale)('OKR_MyO_Prog_Butt_Remind') : null : (0, _getLocale.getLocale)('OKR_MyO_Pr_Butt_Reminder');
     return /*#__PURE__*/_react["default"].createElement("span", {
       className: "o-progress__func-btn",
       onClick: handleRemindClick
@@ -324,7 +326,7 @@ var OProgress = function OProgress(_ref) {
   }, oProgressData.length === 0 ? renderEmptyCmp : /*#__PURE__*/_react["default"].createElement("div", {
     className: "o-progress__header"
   }, /*#__PURE__*/_react["default"].createElement(_title["default"], {
-    title: (0, _getLocale.getLocale)("OKR_MyO_Prog_Objectiveprogress")
+    title: (0, _getLocale.getLocale)('OKR_MyO_Prog_Objectiveprogress')
   }), /*#__PURE__*/_react["default"].createElement("div", {
     className: "o-progress__func-btns"
   }, okrInfo.status === 2 ? null : renderDefaultRemindCmp, isCanEditProgress ? /*#__PURE__*/_react["default"].createElement(_oProgressUpdate["default"], {
@@ -332,12 +334,12 @@ var OProgress = function OProgress(_ref) {
     renderContent: renderContent,
     setUpdateData: setUpdateProgress
   }) : null)), /*#__PURE__*/_react["default"].createElement("div", {
-    className: "o-progress__contnet-wrapper ".concat(isMoreThanOneProgress && isShowAll ? "" : "o-progress__content-wrapper--fold"),
+    className: "o-progress__contnet-wrapper ".concat(isMoreThanOneProgress && isShowAll ? '' : 'o-progress__content-wrapper--fold'),
     style: {
-      height: isShowAll ? "auto" : "".concat(initHeight, "px")
+      height: isShowAll ? 'auto' : "".concat(initHeight, "px")
     }
   }, oProgressData && oProgressData.map(function (item, index) {
-    var rightTip = "";
+    var rightTip = '';
 
     if (okrInfo.status !== 2 && okrInfo.progress !== 100 && index === 0 && isCanEditProgress) {
       rightTip = (0, _util.getToNowTime)(item.time);
@@ -346,7 +348,7 @@ var OProgress = function OProgress(_ref) {
     return /*#__PURE__*/_react["default"].createElement(_okrProgressDetail["default"], {
       key: item.id,
       riskLevel: item.riskLevel,
-      title: item.title,
+      title: (0, _openData.parseString)(item.title || ''),
       percent: item.percent,
       oldPercent: item.oldPercent,
       content: item.content,
@@ -361,8 +363,8 @@ var OProgress = function OProgress(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "o-progress__shrink-text",
     onClick: handleChangeShowAll
-  }, isShowAll ? (0, _getLocale.getLocale)("OKR_MyO_Prog_Butt_Fold") : (0, _getLocale.getLocale)("OKR_MyO_Pr_Butt_Viewall"), /*#__PURE__*/_react["default"].createElement("i", {
-    className: isShowAll ? "tu-icon-arrow-up" : "tu-icon-arrow-down"
+  }, isShowAll ? (0, _getLocale.getLocale)('OKR_MyO_Prog_Butt_Fold') : (0, _getLocale.getLocale)('OKR_MyO_Pr_Butt_Viewall'), /*#__PURE__*/_react["default"].createElement("i", {
+    className: isShowAll ? 'tu-icon-arrow-up' : 'tu-icon-arrow-down'
   }))) : null, /*#__PURE__*/_react["default"].createElement(_titaUi.Modal, {
     className: "common-modal o-progress__modal",
     maskClosable: false,
@@ -373,9 +375,9 @@ var OProgress = function OProgress(_ref) {
     visible: editOProgressVisiable,
     width: 600
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "o-progress__textarea-wrapper ".concat(hasError ? "o-progress__textarea-wrapper--error" : "")
+    className: "o-progress__textarea-wrapper ".concat(hasError ? 'o-progress__textarea-wrapper--error' : '')
   }, /*#__PURE__*/_react["default"].createElement("textarea", {
-    placeholder: (0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Pleprogress"),
+    placeholder: (0, _getLocale.getLocale)('OKR_MyO_Pop_Upd_Pleprogress'),
     className: "o-progress__textarea",
     value: editOProgressContent,
     onChange: handleTextareaChange

package/lib/components/okr-detail/schedule/components/sub-o-progress/index.js

@@ -15,6 +15,8 @@ var _scheduleO = _interopRequireDefault(require("../../img/schedule-o.svg"));
 
 var _drawerManager = _interopRequireDefault(require("../../../../drawer-manager"));
 
+var _openData = require("../../../../../utils/open-data");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -30,7 +32,7 @@ var renderTitle = function renderTitle(title, workId) {
         okrId: workId
       });
     }
-  }, title));
+  }, (0, _openData.parseString)(title)));
 };
 
 var SubOProgress = function SubOProgress(_ref) {

package/lib/components/okr-flow/child-node/kr-node.js

@@ -11,6 +11,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _CircleProgress = _interopRequireDefault(require("../../../components-v1/progress/CircleProgress"));
 
+var _openData = require("../../../utils/open-data");
+
 var _creator = _interopRequireDefault(require("./fields/creator"));
 
 var _precls = _interopRequireDefault(require("../precls"));
@@ -50,7 +52,7 @@ function KrNode(_ref) {
       color: "#5AD8A6",
       marginRight: 8
     }
-  }, "KR", SortNum + 1), mileStoneName), /*#__PURE__*/_react["default"].createElement("div", {
+  }, "KR", SortNum + 1), (0, _openData.parseString)(mileStoneName)), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--node-desp"))
   }, /*#__PURE__*/_react["default"].createElement(_creator["default"], {
     creator: user || {}

package/lib/components/okr-flow/child-node/work-node.js

@@ -33,6 +33,8 @@ var _getLocale = require("../../../utils/getLocale");
 
 var _tools = require("../../../utils/tools");
 
+var _openData2 = require("../../../utils/open-data");
+
 var _drawerManager = _interopRequireDefault(require("../../../components/drawer-manager"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -241,7 +243,7 @@ function WorkNode(_ref) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--node-title")),
     onClick: openODetail
-  }, (0, _tools.htmlDecodeByRegExp)(workName), /*#__PURE__*/_react["default"].createElement(_okrClassify["default"], {
+  }, (0, _openData2.parseString)((0, _tools.htmlDecodeByRegExp)(workName)), /*#__PURE__*/_react["default"].createElement(_okrClassify["default"], {
     classify: okrClassify
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: (0, _classnames["default"])("".concat(_precls["default"], "--node-desp")),

package/lib/components/okr-flow/export-modal/index.js

@@ -206,9 +206,9 @@ var ExportMapModal = function ExportMapModal(props) {
                 // });
 
                 Sentry.withScope(function (scope) {
-                  scope.setTag("error-level", "P0");
-                  scope.setTag("error-type", "地图导出-图片生成");
-                  scope.setExtra("userMessage", userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
+                  scope.setTag('error-level', "P0");
+                  scope.setTag('error-type', '地图导出-图片生成');
+                  scope.setExtra('userMessage', userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
                 });
                 (0, _requestApis.getBase64DownloadUrl)(imgUrl.split(',')[1]).then(function (url) {
                   var image = new Image(); // @ts-ignore
@@ -219,9 +219,9 @@ var ExportMapModal = function ExportMapModal(props) {
                   // });
 
                   Sentry.withScope(function (scope) {
-                    scope.setTag("error-level", "P0");
-                    scope.setTag("error-type", "地图导出-图片地址");
-                    scope.setExtra("userMessage", userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
+                    scope.setTag('error-level', "P0");
+                    scope.setTag('error-type', '地图导出-图片地址');
+                    scope.setExtra('userMessage', userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
                   });
 
                   _toast["default"].Warning('图片上传成功，准备本地下载', {

package/lib/components/okr-progress/components/kr-progress/index.js

@@ -15,10 +15,12 @@ var _tooltipText = _interopRequireDefault(require("../../../tooltip/tooltip-text
 
 var _drawerManager = _interopRequireDefault(require("../../../drawer-manager"));
 
-require("./index.css");
-
 var _getLocale = require("../../../../utils/getLocale");
 
+var _openData = require("../../../../utils/open-data");
+
+require("./index.css");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var renderTitle = function renderTitle(index, title, id) {
@@ -33,7 +35,7 @@ var renderTitle = function renderTitle(index, title, id) {
   }, /*#__PURE__*/_react["default"].createElement("span", {
     className: "kr-progress__order"
   }, "KR", index + 1), /*#__PURE__*/_react["default"].createElement(_tooltipText["default"], {
-    text: title,
+    text: (0, _openData.parseString)(title),
     maxWidth: 600,
     exClass: "kr-progress__title-text"
   }));

package/lib/components/okr-progress/components/o-progress/index.js

@@ -35,6 +35,8 @@ var _getLocale = require("../../../../utils/getLocale");
 
 var _i18nFrontTranslate = require("../../../../utils/i18n-front-translate");
 
+var _openData = require("../../../../utils/open-data");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -329,7 +331,7 @@ var OProgress = function OProgress(_ref) {
     return /*#__PURE__*/_react["default"].createElement(_okrProgressDetail["default"], {
       key: item.id,
       riskLevel: item.riskLevel,
-      title: item.title,
+      title: (0, _openData.parseString)(item.title),
       percent: item.percent,
       oldPercent: item.oldPercent,
       content: item.content,

package/lib/components/okr-progress/components/o-progress-update/index.js

@@ -52,7 +52,7 @@ function OProgressUpdate(props) {
       renderContent = props.renderContent,
       setUpdateData = props.setUpdateData,
       _props$title = props.title,
-      title = _props$title === void 0 ? (0, _getLocale.getLocale)("OKR_MyO_Pop_Upd_Upd") : _props$title;
+      title = _props$title === void 0 ? (0, _getLocale.getLocale)('OKR_MyO_Pop_Upd_Upd') : _props$title;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -81,7 +81,7 @@ function OProgressUpdate(props) {
               data = _context.sent;
 
               if (data.Code === 1) {
-                _toast["default"].Success((0, _getLocale.getLocale)("Per_Ma_form_Updatesuc"));
+                _toast["default"].Success((0, _getLocale.getLocale)('Per_Ma_form_Updatesuc'));
 
                 setVisible(false);
               } else {

package/lib/components/okr-progress/components/sub-o-progress/index.js

@@ -15,6 +15,8 @@ var _scheduleO = _interopRequireDefault(require("../../img/schedule-o.svg"));
 
 var _drawerManager = _interopRequireDefault(require("../../../drawer-manager"));
 
+var _openData = require("../../../../utils/open-data");
+
 require("./index.css");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -31,7 +33,7 @@ var renderTitle = function renderTitle(title, workId) {
         okrId: workId
       });
     }
-  }, title));
+  }, (0, _openData.parseString)(title)));
 };
 
 var SubOProgress = function SubOProgress(_ref) {

package/lib/components/okr-review/ReviewPop/components/ReviewBody/index.js

@@ -13,6 +13,8 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _common = require("../../../common");
 
+var _openData = require("../../../../../utils/open-data");
+
 var _style = require("./style");
 
 var _getLocale = require("../../../../../utils/getLocale");
@@ -21,8 +23,6 @@ var _UserSelectorPop = _interopRequireDefault(require("../../../../../components
 
 var _requestV = require("../../../../../utils/request-v1");
 
-var _openData = require("../../../../../utils/open-data");
-
 var _mblog = require("../../../../../utils/mblog");
 
 var _ConfirmPop = _interopRequireDefault(require("../../../../delete-confirm-pop/ConfirmPop"));
@@ -614,7 +614,7 @@ var ReviewBody = /*#__PURE__*/function (_PureComponent) {
         className: ObjData.ObjType == 65 ? "review-kr" : "tu-icon-OKR"
       }, ObjData.ObjType == 65 ? "KR".concat(ObjData.ObjIndex == 0 ? "" : ObjData.ObjIndex) : ""), /*#__PURE__*/_react["default"].createElement("p", {
         className: "okr-name"
-      }, (0, _mblog.htmlDecodeByRegExp)(ObjData.ObjName)))), /*#__PURE__*/_react["default"].createElement(_style.ReviewWorth, null, /*#__PURE__*/_react["default"].createElement(_style.ReviewCatalog, null, (0, _getLocale.getLocale)("OKR_MyO_KRP_Pop_Value")), /*#__PURE__*/_react["default"].createElement(_textarea["default"], {
+      }, (0, _openData.parseString)((0, _mblog.htmlDecodeByRegExp)(ObjData.ObjName))))), /*#__PURE__*/_react["default"].createElement(_style.ReviewWorth, null, /*#__PURE__*/_react["default"].createElement(_style.ReviewCatalog, null, (0, _getLocale.getLocale)("OKR_MyO_KRP_Pop_Value")), /*#__PURE__*/_react["default"].createElement(_textarea["default"], {
         maxLength: 5000,
         value: (0, _mblog.htmlDecodeByRegExp)(data.gains),
         initialHeight: 56,

package/lib/components/okr-share/common-painter/openDataPainter.js

@@ -20,10 +20,13 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
 var getOpenData = function getOpenData(_ref) {
   var id = _ref.id,
       name = _ref.name,
-      type = _ref.type;
-  var openId = (0, _openData.getOpenId)(id, type);
+      type = _ref.type,
+      openId = _ref.openId;
+  openId = openId || (0, _openData.getOpenId)(id, type); //@ts-ignore
+
   if (!window.WWOpenData || !openId) return Promise.resolve(name);
   return new Promise(function (resolve, reject) {
+    //@ts-ignore
     window.WWOpenData.prefetch({
       items: [{
         id: openId,
@@ -37,7 +40,7 @@ var getOpenData = function getOpenData(_ref) {
       if (data && data.items[0]) {
         resolve(data.items[0].data);
       } else {
-        resolve(name);
+        resolve(name || '');
       }
     });
   });
@@ -75,18 +78,18 @@ function _openDataPainter() {
             name = _context.sent;
 
           case 6:
-            _ctx$measureText = ctx.measureText(name), width = _ctx$measureText.width;
+            _ctx$measureText = ctx.measureText(name || ''), width = _ctx$measureText.width;
             actualWidth = Math.min(width, maxWidth);
             return _context.abrupt("return", {
               width: actualWidth,
               height: lineHeight,
               draw: function draw(ctx, x, y) {
                 ctx.save();
-                ctx.textBaseline = "middle";
+                ctx.textBaseline = 'middle';
                 ctx.beginPath();
                 ctx.rect(x, y, actualWidth, lineHeight);
                 ctx.clip();
-                ctx.fillText(name, x, y + lineHeight / 2);
+                ctx.fillText(name || '', x, y + lineHeight / 2);
                 ctx.closePath();
                 ctx.restore();
               }