@titaui/pc 1.15.10 → 1.15.11

package/lib/components/okrcase-library/index.js

@@ -277,7 +277,7 @@ function OKRCases(props) {
     setIsNextPageEmpty(false); // 每当一级菜单改变，获取二级菜单
 
     navList.map(function (item) {
-      if (item.id === activeNavId) {
+      if (item.orderNumber === activeNavId) {
         var navSecondList = item.subLabel;
 
         if (activeNavId === 0) {
@@ -350,8 +350,9 @@ function OKRCases(props) {
           setIsTouchBottom(false);
         });
       } else {
+        var work = navList[activeNavId];
         (0, _network.postForCases)({
-          labelId: activeNavId,
+          labelId: work.id,
           subLabelId: secondActiveNavId,
           key: "",
           pageNumber: pageNumberRef.current

package/lib/components/upload/components/uploadedPreview.js

@@ -71,9 +71,39 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
       }); // 上传成功且为图片时
     };
 
-    _this.dealPreviewOptions = function (uploadStatus, index, deleteable, smallImageUrl) {
-      var onSubmit = _this.props.onSubmit;
+    _this.onDelete = function (event) {
+      var _this$props = _this.props,
+          onSubmit = _this$props.onSubmit,
+          index = _this$props.index;
+      event.stopPropagation();
+      onSubmit(index, 'delete');
+    };
+
+    _this.onCancel = function (event) {
+      var _this$props2 = _this.props,
+          onSubmit = _this$props2.onSubmit,
+          index = _this$props2.index;
+      event.stopPropagation();
+      onSubmit(index, 'cancel');
+    };
+
+    _this.onReupload = function (event) {
+      var _this$props3 = _this.props,
+          onSubmit = _this$props3.onSubmit,
+          index = _this$props3.index;
+      event.stopPropagation();
+      onSubmit(index, 'reupload');
+    };
 
+    _this.onPreview = function (event) {
+      var _this$props4 = _this.props,
+          onSubmit = _this$props4.onSubmit,
+          index = _this$props4.index;
+      event.stopPropagation();
+      onSubmit(index, 'preview');
+    };
+
+    _this.dealPreviewOptions = function (uploadStatus, deleteable, smallImageUrl, clientUrl) {
       if (uploadStatus === 2 || uploadStatus === 1) {
         // 上传中
         return /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
@@ -83,15 +113,13 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
           className: "upload-file-action-wrapper"
         }, /*#__PURE__*/_react["default"].createElement("span", {
           className: "tu-icon-canceled action-icon action-icon-delete",
-          onMouseDown: function onMouseDown() {
-            return onSubmit(index, 'cancel');
-          }
+          onMouseDown: _this.onCancel
         })));
       }
 
       if (uploadStatus === 3) {
         // 上传成功
-        if (smallImageUrl && deleteable) {
+        if ((smallImageUrl || clientUrl) && deleteable) {
           // 是图片且能删除
           return [/*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
             content: (0, _getLocale.getLocale)('Mod_Preview'),
@@ -99,10 +127,7 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
           }, /*#__PURE__*/_react["default"].createElement("span", {
             className: "upload-file-action-wrapper"
           }, /*#__PURE__*/_react["default"].createElement("span", {
-            className: "tu-icon-yulan action-icon",
-            onMouseDown: function onMouseDown() {
-              return onSubmit(index, 'preview');
-            }
+            className: "tu-icon-yulan action-icon"
           }))), /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
             content: (0, _getLocale.getLocale)('Mod_Delete'),
             container: document.body
@@ -110,13 +135,11 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
             className: "upload-file-action-wrapper"
           }, /*#__PURE__*/_react["default"].createElement("span", {
             className: "tu-icon-canceled action-icon delete",
-            onMouseDown: function onMouseDown() {
-              return onSubmit(index, 'delete');
-            }
+            onMouseDown: _this.onDelete
           })))];
         }
 
-        if (!smallImageUrl && deleteable) {
+        if (!smallImageUrl && !clientUrl && deleteable) {
           // 不是图片但能删除
           return /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
             content: (0, _getLocale.getLocale)('Mod_Delete'),
@@ -125,13 +148,11 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
             className: "upload-file-action-wrapper"
           }, /*#__PURE__*/_react["default"].createElement("span", {
             className: "tu-icon-canceled action-icon delete",
-            onMouseDown: function onMouseDown() {
-              return onSubmit(index, 'delete');
-            }
+            onMouseDown: _this.onDelete
           })));
         }
 
-        if (smallImageUrl && !deleteable) {
+        if ((smallImageUrl || clientUrl) && !deleteable) {
           // 是图片不能删除
           return /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
             content: (0, _getLocale.getLocale)('Mod_Preview'),
@@ -139,10 +160,7 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
           }, /*#__PURE__*/_react["default"].createElement("span", {
             className: "upload-file-action-wrapper"
           }, /*#__PURE__*/_react["default"].createElement("span", {
-            className: "tu-icon-magnifier-circle action-icon",
-            onMouseDown: function onMouseDown() {
-              return onSubmit(index, 'preview');
-            }
+            className: "tu-icon-magnifier-circle action-icon"
           })));
         } // 不是图片也不能删除
 
@@ -158,9 +176,7 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
           className: "upload-file-action-wrapper"
         }, /*#__PURE__*/_react["default"].createElement("span", {
           className: "tu-icon-canceled action-icon delete",
-          onMouseDown: function onMouseDown() {
-            return onSubmit(index, 'delete');
-          }
+          onMouseDown: _this.onDelete
         })));
       } // 4：上传失败
 
@@ -172,9 +188,7 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
         className: "upload-file-action-wrapper"
       }, /*#__PURE__*/_react["default"].createElement("span", {
         className: "tu-icon-gengxin1 action-icon",
-        onMouseDown: function onMouseDown() {
-          return onSubmit(index, 'reupload');
-        }
+        onMouseDown: _this.onReupload
       }))), /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
         content: (0, _getLocale.getLocale)('Mod_Delete'),
         container: document.body
@@ -182,9 +196,7 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
         className: "upload-file-action-wrapper"
       }, /*#__PURE__*/_react["default"].createElement("span", {
         className: "tu-icon-canceled action-icon delete",
-        onMouseDown: function onMouseDown() {
-          return onSubmit(index, 'delete');
-        }
+        onMouseDown: _this.onDelete
       }))));
     };
 
@@ -200,12 +212,13 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
   }, {
     key: "render",
     value: function render() {
-      var _this$props = this.props,
-          className = _this$props.className,
-          uploadResultItem = _this$props.uploadResultItem,
-          index = _this$props.index;
+      var _this$props5 = this.props,
+          className = _this$props5.className,
+          uploadResultItem = _this$props5.uploadResultItem;
+      console.log('uploadResultItem', uploadResultItem);
       return /*#__PURE__*/_react["default"].createElement(_style.PreviewContent, {
-        className: ['preview__content document-mouse-event-ignore', className].join(' ')
+        className: ['preview__content document-mouse-event-ignore', className].join(' '),
+        onMouseDown: this.onPreview
       }, /*#__PURE__*/_react["default"].createElement(_style.PreviewImageWrapper, null, this.renderPreviewThumbnail()), /*#__PURE__*/_react["default"].createElement(_style.PreviewMessageWrapper, null, /*#__PURE__*/_react["default"].createElement(_titaUi.Tooltip, {
         content: uploadResultItem.FileName,
         container: document.body
@@ -219,7 +232,7 @@ var UploadedPreview = /*#__PURE__*/function (_PureComponent) {
         className: "upload-file--progress"
       })) : /*#__PURE__*/_react["default"].createElement("div", {
         className: uploadResultItem.uploadStatus === 3 || uploadResultItem.uploadStatus === 2 ? 'upload-file-size' : 'upload-file-size upload-file-size--error'
-      }, uploadResultItem.uploadStatus === 3 || uploadResultItem.uploadStatus === 2 ? (0, _util.getFileSize)(uploadResultItem.FileSize) : uploadResultItem.Msg)))), /*#__PURE__*/_react["default"].createElement(_style.PreviewOptionsWrapper, null, this.dealPreviewOptions(uploadResultItem.uploadStatus, index, uploadResultItem.Deleteable, uploadResultItem.SmallImageUrl), ' '));
+      }, uploadResultItem.uploadStatus === 3 || uploadResultItem.uploadStatus === 2 ? (0, _util.getFileSize)(uploadResultItem.FileSize) : uploadResultItem.Msg)))), /*#__PURE__*/_react["default"].createElement(_style.PreviewOptionsWrapper, null, this.dealPreviewOptions(uploadResultItem.uploadStatus, uploadResultItem.Deleteable, uploadResultItem.SmallImageUrl, uploadResultItem.ClientUrl), ' '));
     }
   }]);
 

package/lib/components/upload/index.css

@@ -4,6 +4,10 @@
   height: 36px;
 }
 
+.uploaded__preview {
+  cursor: pointer;
+}
+
 .upload-file-action-wrapper {
   width: 20px;
   height: 20px;

package/lib/components/upload/index.js

@@ -39,6 +39,8 @@ var _platform = require("../../utils/platform");
 
 var _utils = require("../dialog-qq-docs/utils");
 
+var _tools = require("../../utils/tools");
+
 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); }
@@ -425,9 +427,17 @@ var Upload = /*#__PURE__*/function (_PureComponent) {
           uploadSuccessFiles: uploadResultFiles
         });
       } else if (options === 'preview') {
-        var imgIndex = _this.getImgIndex(index);
+        var _uploadResultFiles = _toConsumableArray(_this.state.uploadSuccessFiles);
+
+        var currentFiles = _uploadResultFiles[index];
 
-        _this.refs.imgViewerRef.show(imgIndex);
+        if (currentFiles.SmallImageUrl) {
+          var imgIndex = _this.getImgIndex(index);
+
+          _this.refs.imgViewerRef.show(imgIndex);
+        } else if (currentFiles.ClientUrl) {
+          (0, _tools.openUrl)(currentFiles.ClientUrl);
+        }
       } else if (options === 'reupload') {
         var _reUploadFileInfo = _this.state.uploadSuccessFiles[index];
         var reUploadFile = _this.state.selectFiles[_reUploadFileInfo.FileName];

package/lib/utils/open-data.js

@@ -100,6 +100,7 @@ function openData() {
           pName = p.name,
           pCorpId = p.corpId,
           pType = p.type;
+      var ref = (0, _react.useRef)(null);
       (0, _react.useEffect)(function () {
         var openId = pCorpId || getOpenId(pId, pType);
 
@@ -128,6 +129,12 @@ function openData() {
           }
         }
       }, [pId, pName]);
+      (0, _react.useLayoutEffect)(function () {
+        var _ref;
+
+        // @ts-ignore
+        (_ref = window.WWOpenData && window.WWOpenData || window.top.WWOpenData) === null || _ref === void 0 ? void 0 : _ref.bind(ref.current);
+      }, [pId, pName]);
 
       if (pId === undefined && pCorpId === undefined) {
         return pName || null;
@@ -157,13 +164,6 @@ function openData() {
         return pName || pId || null;
       }
 
-      var ref = (0, _react.useRef)(null);
-      (0, _react.useLayoutEffect)(function () {
-        var _ref;
-
-        // @ts-ignore
-        (_ref = window.WWOpenData && window.WWOpenData || window.top.WWOpenData) === null || _ref === void 0 ? void 0 : _ref.bind(ref.current);
-      }, [pId, pName]);
       return /*#__PURE__*/_react["default"].createElement("div", {
         style: {
           display: 'inline',

package/package.json

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