@zat-design/sisyphus-react 4.7.0 → 4.7.1

package/es/ProForm/components/combination/FormList/components/LineFields.js

@@ -65,7 +65,7 @@ const LineFields = (props) => {
         ...listeners,
         className: "pro-form-list-drag-handle",
         ref: setActivatorNodeRef,
-        children: /* @__PURE__ */ jsx(ProIcon, { component: dragSvg, size: 20, color: "#949599" })
+        children: /* @__PURE__ */ jsx(ProIcon, { component: dragSvg, size: 16 })
       }
     ),
     /* @__PURE__ */ jsx(Row, { className: "pro-form-list-fields", gutter: isLess ? 0 : 24, children: /* @__PURE__ */ jsx(

package/es/ProForm/components/combination/FormList/style/index.less

@@ -35,12 +35,17 @@
 
   .pro-form-list-drag-handle {
     display: flex;
+    flex-shrink: 0;
     align-items: center;
     height: 32px;
     margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
     padding: 0;
     padding-right: @zaui-space-size-sm;
     border: none;
+
+    .pro-icon {
+      cursor: move;
+    }
   }
 
   > .pro-form-list-fields {

package/es/ProForm/components/render/Render.js

@@ -279,7 +279,17 @@ const Render = (props) => {
     const internalItemRender = {
       mark: "pro_table_render",
       render: (inputProps, doms) => /* @__PURE__ */ jsxs(Fragment, { children: [
-        /* @__PURE__ */ jsx(Space, { size: 0, style: { marginTop: 8 }, children: formItemProps.above }),
+        /* @__PURE__ */ jsx(
+          Space,
+          {
+            size: 0,
+            style: {
+              marginTop: 8,
+              marginBottom: type === "ProUpload" && lastComponentProps.uploadType === "image" ? 8 : void 0
+            },
+            children: formItemProps.above
+          }
+        ),
         /* @__PURE__ */ jsxs(
           "div",
           {

package/es/ProUpload/components/ButtonRender.js

@@ -5,6 +5,7 @@ import { SortableContext, rectSortingStrategy } from "@dnd-kit/sortable";
 import { CloudUploadOutlined } from "@ant-design/icons";
 import { FileItem } from "./FileItem";
 import { DraggableUploadListItem } from "./DraggableUploadListItem";
+import { isEmptyReactNode } from "../../utils";
 import locale from "../../locale";
 const ButtonRender = (props) => {
   var _a, _b;
@@ -46,13 +47,14 @@ const ButtonRender = (props) => {
       ) });
     }
   };
+  const tipText = typeof extraTipText === "function" ? extraTipText() : extraTipText;
   return /* @__PURE__ */ jsxs("div", { className: "pro-upload-button", children: [
     /* @__PURE__ */ jsx(DndContext, { sensors: [sensor], onDragEnd, children: /* @__PURE__ */ jsx(SortableContext, { items: fileList.map((i) => i.uid), strategy: rectSortingStrategy, children: /* @__PURE__ */ jsx(Upload, { ...buttonUploadProps, children: !isView && /* @__PURE__ */ jsxs("div", { className: "pro-upload-button-inner", children: [
       /* @__PURE__ */ jsxs(Button, { ...buttonProps, disabled: disabled || isView, children: [
         /* @__PURE__ */ jsx(CloudUploadOutlined, {}),
         buttonText
       ] }),
-      afterRender ? /* @__PURE__ */ jsx(
+      !isEmptyReactNode(afterRender) ? /* @__PURE__ */ jsx(
         "div",
         {
           className: "pro-upload-button-inner-right",
@@ -61,7 +63,7 @@ const ButtonRender = (props) => {
         }
       ) : null
     ] }) }) }) }),
-    extraTipText && /* @__PURE__ */ jsx("div", { className: "upload-tip-txt", children: typeof extraTipText === "function" ? extraTipText() : extraTipText })
+    !isEmptyReactNode(tipText) && /* @__PURE__ */ jsx("div", { className: "upload-tip-txt", children: tipText })
   ] });
 };
 var ButtonRender_default = ButtonRender;

package/es/ProUpload/components/DragRender.js

@@ -6,6 +6,7 @@ import { SortableContext, rectSortingStrategy } from "@dnd-kit/sortable";
 import { CloudUploadOutlined } from "@ant-design/icons";
 import { DragSingleFileItem, FileItem, getFileExt, getFileIcon } from "./FileItem";
 import { DraggableUploadListItem } from "./DraggableUploadListItem";
+import { isEmptyReactNode } from "../../utils";
 import locale from "../../locale";
 const { Dragger } = Upload;
 const DragRender = (props) => {
@@ -88,9 +89,11 @@ const DragRender = (props) => {
     disabled,
     openFileDialogOnClick: !showDraggerSingleRender
   };
+  const header = headerRender();
+  const footer = footerRender();
   return /* @__PURE__ */ jsxs("div", { className: "pro-upload-dragger", children: [
     /* @__PURE__ */ jsxs("div", { className: "pro-upload-handle-box", children: [
-      /* @__PURE__ */ jsx("div", { className: "pro-upload-dragger-header", children: headerRender() }),
+      !isEmptyReactNode(header) && /* @__PURE__ */ jsx("div", { className: "pro-upload-dragger-header", children: header }),
       /* @__PURE__ */ jsx(Dragger, { ...dragUploadProps, children: /* @__PURE__ */ jsxs("div", { className: "drag-upload-inner", ref: refReSelect, children: [
         !showDraggerSingleRender && /* @__PURE__ */ jsxs("div", { className: "upload-dragger-control", children: [
           /* @__PURE__ */ jsxs("div", { className: "dragger-txt-line1", children: [
@@ -108,11 +111,11 @@ const DragRender = (props) => {
             "：",
             extExt.length > 0 ? extExt.join("、") : `${(_h = (_g = locale) == null ? void 0 : _g.ProUpload) == null ? void 0 : _h.draggerLimitless}`
           ] }),
-          customTextRender && /* @__PURE__ */ jsx("p", { className: "file-ext", children: customTextRender })
+          !isEmptyReactNode(customTextRender) && /* @__PURE__ */ jsx("p", { className: "file-ext", children: customTextRender })
         ] }),
         /* @__PURE__ */ jsx("div", { className: "dragger-file-show", children: showDraggerSingleRender && draggerSingleRender(fileList[0]) })
       ] }) }),
-      /* @__PURE__ */ jsx("div", { className: "pro-upload-dragger-footer", children: footerRender() })
+      !isEmptyReactNode(footer) && /* @__PURE__ */ jsx("div", { className: "pro-upload-dragger-footer", children: footer })
     ] }),
     /* @__PURE__ */ jsx("div", { className: "pro-upload-file-list", children: /* @__PURE__ */ jsx(DndContext, { sensors: [sensor], onDragEnd, children: /* @__PURE__ */ jsx(SortableContext, { items: fileList.map((i) => i.uid), strategy: rectSortingStrategy, children: maxCount > 1 && fileList.map((file) => {
       return /* @__PURE__ */ jsx(DraggableUploadListItem, { file, children: /* @__PURE__ */ jsx(

package/es/ProUpload/components/ImageRender.js

@@ -9,6 +9,7 @@ import { PlusOutlined } from "@ant-design/icons";
 import { Example } from "./Example";
 import { getFileExt, getFileIcon } from "./FileItem";
 import { DraggableUploadListItem } from "./DraggableUploadListItem";
+import { isEmptyReactNode } from "../../utils";
 import lookSvg from "../../assets/look.svg";
 import deleteSvg from "../../assets/delete.svg";
 import downloadSvg from "../../assets/download.svg";
@@ -149,31 +150,37 @@ const ImageRender = (props) => {
       ) });
     }
   };
-  return /* @__PURE__ */ jsxs(Space, { orientation: "vertical", size: 8, className: "pro-upload-image", children: [
-    headerRender(),
-    /* @__PURE__ */ jsxs("div", { className: "pro-upload-image", children: [
-      /* @__PURE__ */ jsx(DndContext, { sensors: [sensor], onDragEnd, children: /* @__PURE__ */ jsx(SortableContext, { items: fileList.map((i) => i.uid), strategy: rectSortingStrategy, children: /* @__PURE__ */ jsx(Upload, { ...imageUploadProps, children: fileList.length < maxCount && !isView && (centerRender ? isFunction(centerRender) ? centerRender() : centerRender : /* @__PURE__ */ jsxs(
-        "div",
-        {
-          className: `pro-upload-image-inner ${disabled ? "pro-upload-image-disabled" : ""} `,
-          children: [
-            /* @__PURE__ */ jsx(PlusOutlined, {}),
-            /* @__PURE__ */ jsx("div", { style: { marginTop: 8 }, children: (_b = (_a = locale) == null ? void 0 : _a.ProUpload) == null ? void 0 : _b.buttonText })
-          ]
-        }
-      )) }) }) }),
-      showExampleContent && !isView && /* @__PURE__ */ jsx(
-        Example,
-        {
-          className: "image-example",
-          exampleTitle,
-          exampleContent,
-          exampleModalProps
-        }
-      ),
-      extraTipText && /* @__PURE__ */ jsx("div", { className: "upload-tip-txt", children: extraTipText })
+  const footer = footerRender();
+  const hasFooter = !isEmptyReactNode(footer);
+  const hasCenterRender = typeof centerRender === "function" || !isEmptyReactNode(centerRender);
+  const tipText = typeof extraTipText === "function" ? extraTipText() : extraTipText;
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsxs(Space, { orientation: "vertical", size: 8, className: "pro-upload-image", children: [
+      headerRender(),
+      /* @__PURE__ */ jsxs("div", { className: "pro-upload-image", children: [
+        /* @__PURE__ */ jsx(DndContext, { sensors: [sensor], onDragEnd, children: /* @__PURE__ */ jsx(SortableContext, { items: fileList.map((i) => i.uid), strategy: rectSortingStrategy, children: /* @__PURE__ */ jsx(Upload, { ...imageUploadProps, children: fileList.length < maxCount && !isView && (hasCenterRender ? isFunction(centerRender) ? centerRender() : centerRender : /* @__PURE__ */ jsxs(
+          "div",
+          {
+            className: `pro-upload-image-inner ${disabled ? "pro-upload-image-disabled" : ""} `,
+            children: [
+              /* @__PURE__ */ jsx(PlusOutlined, {}),
+              /* @__PURE__ */ jsx("div", { style: { marginTop: 8 }, children: (_b = (_a = locale) == null ? void 0 : _a.ProUpload) == null ? void 0 : _b.buttonText })
+            ]
+          }
+        )) }) }) }),
+        showExampleContent && !isView && /* @__PURE__ */ jsx(
+          Example,
+          {
+            className: "image-example",
+            exampleTitle,
+            exampleContent,
+            exampleModalProps
+          }
+        ),
+        !isEmptyReactNode(tipText) && /* @__PURE__ */ jsx("div", { className: "upload-tip-txt", children: tipText })
+      ] }),
+      hasFooter && /* @__PURE__ */ jsx("div", { className: "pro-upload-image-footer", children: footer })
     ] }),
-    /* @__PURE__ */ jsx("div", { className: "pro-upload-image-footer", children: footerRender() }),
     /* @__PURE__ */ jsx(
       Modal,
       {

package/es/ProUpload/style/index.less

@@ -4,6 +4,11 @@
   // 将拖拽项的内部层级限制在上传组件内，避免覆盖相邻字段的下拉浮层。
   isolation: isolate;
 
+  > .pro-upload-image {
+    // 图片布局不参与文本基线对齐，避免顶部出现额外行盒留白。
+    vertical-align: top;
+  }
+
   // display: inline-flex;
 
   // 拖拽上传

package/es/utils/index.d.ts

@@ -1,3 +1,4 @@
+import React from 'react';
 export declare const customEqualForFunction: (value: any, other: any) => boolean;
 /**
  * 兼容 React17/18 的 startTransition。
@@ -10,6 +11,8 @@ export declare function compatStartTransition(cb: () => void): void;
  * 空值 或者 仅包含空值的数组视为空
  */
 export declare const isEmpty: (value: any, emptyValue?: string) => boolean;
+/** 判断 React 节点是否没有可渲染内容，保留数字 0 */
+export declare const isEmptyReactNode: (value: React.ReactNode) => boolean;
 /**
  * 生成用于 UI 元素的随机短 ID（非安全用途）
  */

package/es/utils/index.js

@@ -32,6 +32,12 @@ const isEmpty = (value, emptyValue) => {
   }
   return false;
 };
+const isEmptyReactNode = (value) => {
+  if (Array.isArray(value)) {
+    return value.every(isEmptyReactNode);
+  }
+  return value === void 0 || value === null || typeof value === "boolean" || value === "";
+};
 const generateId = () => Math.random().toString(36).slice(-6);
 const isEllipsisActive = (element) => {
   if (!element)
@@ -47,5 +53,6 @@ export {
   customEqualForFunction,
   generateId,
   isEllipsisActive,
-  isEmpty
+  isEmpty,
+  isEmptyReactNode
 };

package/package.json

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