@zat-design/sisyphus-react 4.7.2-beta.1 → 4.7.2

package/es/ProForm/components/base/TextArea/index.js

@@ -15,7 +15,7 @@ const TextAreaDef = (props) => {
   const isView = typeof props.isView === "boolean" ? props.isView : isViewCon;
   const initialConfig = useProConfig("TextArea");
   if (isView) {
-    return /* @__PURE__ */ jsx(Container, { nowrap: false, tooltip, viewEmpty, children: rest.value });
+    return /* @__PURE__ */ jsx("div", { style: { whiteSpace: "pre-wrap", width: "100%" }, children: /* @__PURE__ */ jsx(Container, { nowrap: false, tooltip, viewEmpty, children: rest.value }) });
   }
   const _className = classnames({
     "pro-textarea": true,

package/es/ProForm/components/combination/ProRangeLimit/index.js

@@ -15,11 +15,24 @@ const defaultPickerValue = [dayjs(), dayjs()];
 const useControlled = (props) => {
   var _a, _b;
   const [value, setValue] = useState();
+  const [startDate, endDate] = [
+    ((_a = props.value) == null ? void 0 : _a[0]) && dayjs(props.value[0], props.format),
+    ((_b = props.value) == null ? void 0 : _b[1]) && dayjs(props.value[1], props.format)
+  ];
+  const internalValue = useMemo(
+    () => [startDate, endDate],
+    [
+      "value" in props,
+      props.format,
+      startDate == null ? void 0 : startDate.valueOf(),
+      startDate && startDate.utcOffset(),
+      startDate && startDate.locale(),
+      endDate == null ? void 0 : endDate.valueOf(),
+      endDate && endDate.utcOffset(),
+      endDate && endDate.locale()
+    ]
+  );
   if ("value" in props) {
-    const internalValue = [
-      ((_a = props.value) == null ? void 0 : _a[0]) && dayjs(props.value[0], props.format),
-      ((_b = props.value) == null ? void 0 : _b[1]) && dayjs(props.value[1], props.format)
-    ];
     const handleChange = (value2, other) => {
       var _a2;
       if (!value2) {

package/es/ProTable/style/index.less

@@ -1,6 +1,9 @@
 @import '../../style/variables.less';
 
 .pro-table {
+  // 固定列层级随列数增长，限制在表格内部，避免遮挡相邻查询字段的浮层。
+  isolation: isolate;
+
   .pro-tooltip .singleLine {
     transition: none;
   }

package/es/ProUpload/components/ImageRender.d.ts

@@ -1,5 +1,5 @@
-import { FC, ReactNode } from 'react';
-import { UploadFile } from 'antd/es/upload/interface';
+import type { FC, ReactNode } from 'react';
+import type { UploadFile } from 'antd/es/upload/interface';
 import type { ProUploadType } from '../propsType';
 interface DragRenderProps extends Pick<ProUploadType, 'buttonProps' | 'disabled' | 'maxCount' | 'extraTipText' | 'showExampleContent' | 'exampleTitle' | 'exampleContent' | 'exampleModalProps'> {
     isView?: boolean;

package/es/ProUpload/components/ImageRender.js

@@ -1,6 +1,6 @@
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { Button, Upload, Progress, Space, Modal } from "antd";
-import { useRef, useState } from "react";
+import { useEffect, useState } from "react";
 import { DndContext } from "@dnd-kit/core";
 import { SortableContext, rectSortingStrategy } from "@dnd-kit/sortable";
 import isFunction from "lodash/isFunction";
@@ -19,8 +19,7 @@ const isImgage = (_fileExt) => {
 };
 const ImageRender = (props) => {
   var _a, _b;
-  const [previewImg, setPreviewImg] = useState({});
-  const proViewerRef = useRef(null);
+  const [previewImg, setPreviewImg] = useState(null);
   const {
     isView,
     disabled,
@@ -48,14 +47,18 @@ const ImageRender = (props) => {
     } else {
       const _fileExt = getFileExt(file.name || ((_a2 = file == null ? void 0 : file.url) == null ? void 0 : _a2.split("?")[0]));
       if (isImgage(_fileExt)) {
-        setPreviewImg(file);
+        const objectUrl = !file.url && file.originFileObj ? URL.createObjectURL(file.originFileObj) : void 0;
+        const url = file.url || objectUrl;
+        if (url) {
+          setPreviewImg({ name: file.name, url, objectUrl });
+        }
       } else {
         window.open(file.url, "_blank");
       }
     }
   };
   const handlePreviewCancel = () => {
-    setPreviewImg({});
+    setPreviewImg(null);
   };
   const handleDownload = (file) => {
     if (onDownload) {
@@ -93,6 +96,7 @@ const ImageRender = (props) => {
                     {
                       type: "link",
                       className: "action-item",
+                      disabled: !onPreview && isImg && !file.url && !file.originFileObj,
                       onClick: () => {
                         handlePreviewImg(file);
                       },
@@ -154,6 +158,14 @@ const ImageRender = (props) => {
   const hasFooter = !isEmptyReactNode(footer);
   const hasCenterRender = typeof centerRender === "function" || !isEmptyReactNode(centerRender);
   const tipText = typeof extraTipText === "function" ? extraTipText() : extraTipText;
+  useEffect(() => {
+    const objectUrl = previewImg == null ? void 0 : previewImg.objectUrl;
+    return () => {
+      if (objectUrl) {
+        URL.revokeObjectURL(objectUrl);
+      }
+    };
+  }, [previewImg == null ? void 0 : previewImg.objectUrl]);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsxs(Space, { orientation: "vertical", size: 8, className: "pro-upload-image", children: [
       headerRender(),
@@ -187,11 +199,11 @@ const ImageRender = (props) => {
         title: previewImg == null ? void 0 : previewImg.name,
         width: "600",
         style: { width: "400px" },
-        open: (previewImg == null ? void 0 : previewImg.url) || (previewImg == null ? void 0 : previewImg.thumbUrl),
+        open: !!previewImg,
         wrapClassName: "proupload-modal-preview",
         onCancel: handlePreviewCancel,
         footer: false,
-        children: /* @__PURE__ */ jsx("img", { alt: "example", style: { width: "100%" }, src: (previewImg == null ? void 0 : previewImg.url) || previewImg.thumbUrl })
+        children: /* @__PURE__ */ jsx("img", { alt: "example", style: { width: "100%" }, src: previewImg == null ? void 0 : previewImg.url })
       }
     )
   ] });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.7.2-beta.1",
+  "version": "4.7.2",
   "license": "MIT",
   "publishConfig": {
     "access": "public",