@titaui/pc 1.12.31 → 1.12.34

package/lib/components/dynamic/components/comments-dialog/index.js

@@ -120,7 +120,7 @@ var EvaluationDialog = function EvaluationDialog(props) {
           remark: remark,
           type: Number(evaluateType),
           value: value,
-          user: res === null || res === void 0 ? void 0 : res.user
+          user: res === null || res === void 0 ? void 0 : res.userV2
         });
 
         _toast["default"].Success((0, _getLocale.getLocale)("Mod_Successfuloperat"));

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

@@ -51,6 +51,8 @@ var prefix = 'titaui-okr-progress';
 var isImport = false;
 
 var OkrProgress = function OkrProgress(_ref) {
+  var _rowsData$Rows;
+
   var data = _ref.data,
       reportType = _ref.reportType;
 
@@ -142,7 +144,7 @@ var OkrProgress = function OkrProgress(_ref) {
       setRowsData(JSON.parse(data || '{}'));
     }
   }, [data]);
-  if (!(rowsData !== null && rowsData !== void 0 && rowsData.Rows.length)) return null;
+  if (!(rowsData !== null && rowsData !== void 0 && (_rowsData$Rows = rowsData.Rows) !== null && _rowsData$Rows !== void 0 && _rowsData$Rows.length)) return null;
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: prefix
   }, /*#__PURE__*/_react["default"].createElement("div", {

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

@@ -192,11 +192,12 @@ var DynamicReply = function DynamicReply(_ref) {
     alt: ""
   }))), dailyContent.map(function (item) {
     if (item.contentType === _constant.dailyContentType.richText) {
-      return item.richContent !== "" && typeof item.richContent === "string" && /*#__PURE__*/_react["default"].createElement("div", {
+      return !item.richContent && typeof item.richContent === "string" && /*#__PURE__*/_react["default"].createElement("div", {
         className: "".concat(prefix, "__work")
       }, item.title === "工作总结" ? (0, _getLocale.getLocale)('Tasks_Tab_MyS_JobSummary') : (0, _getLocale.getLocale)('Rep_Tab_Mys_NextWorkPlans'), /*#__PURE__*/_react["default"].createElement(_richEditor["default"], null, /*#__PURE__*/_react["default"].createElement(_richEditor.EditorComponent, {
         editable: false,
-        initialState: JSON.parse(item.richContent || '{}')
+        initialState: JSON.parse(item.richContent || '{}'),
+        placeholder: (0, _getLocale.getLocale)('Rep_NewS_Notfilled')
       })));
     }
 

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

@@ -27,7 +27,7 @@ var _selectLayer = _interopRequireDefault(require("../../select-layer"));
 
 var _utils = require("../utils");
 
-var _context2 = require("../context");
+var _context3 = require("../context");
 
 var _bsGlobal = require("../../../utils/bs-global");
 
@@ -140,11 +140,11 @@ var ExportMapModal = function ExportMapModal(props) {
   }, [visible, mapInstance]);
 
   var downloadImg = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+    var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
       var okrMapRef, width, height, canvas, scale, opts;
-      return regeneratorRuntime.wrap(function _callee$(_context) {
+      return regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
               okrMapRef = document.querySelector('.titaui-okr-flow__export') || document.createElement('div');
               width = okrMapRef.clientWidth; // 获取dom 宽度
@@ -176,7 +176,7 @@ var ExportMapModal = function ExportMapModal(props) {
                 useCORS: true // 【重要】开启跨域配置
 
               };
-              _context.next = 12;
+              _context2.next = 12;
               return (0, _html2canvas["default"])(okrMapRef, opts).then(function (result) {
                 var _window, _window$BSGlobal, _window$BSGlobal$logi, _window2, _window2$BSGlobal, _window2$BSGlobal$ten;
 
@@ -240,7 +240,13 @@ var ExportMapModal = function ExportMapModal(props) {
                   scope.setExtra('userMessage', userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
                 });
                 (0, _requestApis.getBase64DownloadUrl)(imgUrl.split(',')[1]).then(function (url) {
-                  // const image = new Image()
+                  var image = new Image(); // @ts-ignore
+                  // window.titaTracker && window.titaTracker("action").record({
+                  //   actionName: userId+'租户：'+telentId+'我获得了地址'+url.Data.obj,
+                  //   actionGroup: 'okr地图接口',
+                  //   productName: 'okr地图导出',
+                  // });
+
                   // @ts-ignore
                   // window.titaTracker && window.titaTracker("action").record({
                   //   actionName: userId+'租户：'+telentId+'我获得了地址'+url.Data.obj,
@@ -251,46 +257,87 @@ var ExportMapModal = function ExportMapModal(props) {
                     scope.setTag('error-level', "P0");
                     scope.setTag('error-type', '地图导出-图片地址');
                     scope.setExtra('userMessage', userId + '租户：' + telentId + '我得到了图片大小为：' + size + '，路径为' + imgUrl);
-                  });
-                  var newUrl = url.Data.obj;
-                  var x = new XMLHttpRequest();
-                  x.open('GET', newUrl, true);
-                  x.responseType = 'blob';
-
-                  x.onload = function (e) {
-                    var url = window.URL.createObjectURL(x.response);
-                    var a = document.createElement('a');
-                    a.href = url;
-                    a.download = model.value === 20 ? '高清图片' : '标清图片';
-                    a.click();
-
-                    _toast["default"].Success('导出成功');
-
-                    setIsExport(false);
-
-                    if (onCloseHandler) {
-                      onCloseHandler();
-                    }
-                  };
-
-                  x.send(); // image.setAttribute('crossOrigin', 'anonymous')
-                  // image.onload = async() => {
-                  //   if (!url.Data.obj) {
-                  //     Toast.Error('导出失败，请稍后重试', { canClose: false })
-                  //   }
-                  //   await downloadFile(url.Data.obj,model.value===20?'高清分享图片':'标准分享图片')
-                  //   // const a = document.createElement('a') // 生成一个a元素
-                  //   // const event = new MouseEvent('click') // 创建一个单击事件
-                  //   // a.download = '123' // 设置图片名称
-                  //   // a.href = url.Data.obj // 将生成的URL设置为a
-                  //   // a.dispatchEvent(event) // 触发a的单击事件
-                  //   Toast.Success('导出成功')
-                  //   setIsExport(false)
-                  //   if (onCloseHandler) {
-                  //     onCloseHandler()
-                  //   }
+                  }); // var newUrl = url.Data.obj
+                  // var x = new XMLHttpRequest();
+                  // x.open("GET", newUrl, true);
+                  // x.responseType = 'blob';
+                  // x.onload=function(e) {
+                  //     var url = window.URL.createObjectURL(x.response)
+                  //     var a = document.createElement('a');
+                  //     a.href = url
+                  //     a.download = model.value===20?'高清图片':'标清图片';
+                  //     a.click()
+                  //     Toast.Success('导出成功')
+                  //     setIsExport(false)
+                  //     if (onCloseHandler) {
+                  //       onCloseHandler()
+                  //     }
+                  // }
+                  // x.send();
+
+                  // var newUrl = url.Data.obj
+                  // var x = new XMLHttpRequest();
+                  // x.open("GET", newUrl, true);
+                  // x.responseType = 'blob';
+                  // x.onload=function(e) {
+                  //     var url = window.URL.createObjectURL(x.response)
+                  //     var a = document.createElement('a');
+                  //     a.href = url
+                  //     a.download = model.value===20?'高清图片':'标清图片';
+                  //     a.click()
+                  //     Toast.Success('导出成功')
+                  //     setIsExport(false)
+                  //     if (onCloseHandler) {
+                  //       onCloseHandler()
+                  //     }
                   // }
-                  // image.src = imgUrl
+                  // x.send();
+                  image.setAttribute('crossOrigin', 'anonymous');
+                  image.onload = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() {
+                    var a, event;
+                    return regeneratorRuntime.wrap(function _callee$(_context) {
+                      while (1) {
+                        switch (_context.prev = _context.next) {
+                          case 0:
+                            if (!url.Data.obj) {
+                              _toast["default"].Error('导出失败，请稍后重试', {
+                                canClose: false
+                              });
+                            } // await downloadFile(url.Data.obj,model.value===20?'高清分享图片':'标准分享图片')
+
+
+                            // await downloadFile(url.Data.obj,model.value===20?'高清分享图片':'标准分享图片')
+                            a = document.createElement('a'); // 生成一个a元素
+
+                            // 生成一个a元素
+                            event = new MouseEvent('click'); // 创建一个单击事件
+
+                            // 创建一个单击事件
+                            a.download = '分享图片'; // 设置图片名称
+
+                            // 设置图片名称
+                            a.href = url.Data.obj; // 将生成的URL设置为a
+
+                            // 将生成的URL设置为a
+                            a.dispatchEvent(event); // 触发a的单击事件
+
+                            // 触发a的单击事件
+                            _toast["default"].Success('导出成功');
+
+                            setIsExport(false);
+
+                            if (onCloseHandler) {
+                              onCloseHandler();
+                            }
+
+                          case 9:
+                          case "end":
+                            return _context.stop();
+                        }
+                      }
+                    }, _callee);
+                  }));
+                  image.src = imgUrl;
                 });
               })["catch"](function (err) {
                 setIsExport(false);
@@ -302,10 +349,10 @@ var ExportMapModal = function ExportMapModal(props) {
 
             case 12:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee);
+      }, _callee2);
     }));
 
     return function downloadImg() {
@@ -398,7 +445,7 @@ var ExportMapModal = function ExportMapModal(props) {
     className: "titaui-search-dropdown__text"
   }, model.label), /*#__PURE__*/_react["default"].createElement("span", {
     className: "tu-icon-sort-down"
-  })))), /*#__PURE__*/_react["default"].createElement("div", null, visible && /*#__PURE__*/_react["default"].createElement(_context2.CommonContext.Provider, {
+  })))), /*#__PURE__*/_react["default"].createElement("div", null, visible && /*#__PURE__*/_react["default"].createElement(_context3.CommonContext.Provider, {
     value: {
       direction: direction,
       showkr: showkr,

package/package.json

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