@zat-design/sisyphus-react 4.6.3 → 4.6.4

package/es/ProForm/style/index.less

@@ -24,18 +24,6 @@
   }
 
   .pro-container {
-    .pro-collapse {
-      .pro-collapse-panel {
-        .@{ant-prefix}-collapse-header {
-          border-radius: var(--zaui-border-radius, 8px) !important;
-        }
-        &.@{ant-prefix}-collapse-item-active {
-          .@{ant-prefix}-collapse-header {
-            border-radius: var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px) 0 0 !important;
-          }
-        }
-      }
-    }
     .pro-collapse-content {
       margin: 0;
       border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
@@ -88,6 +76,10 @@
   }
 
   &.pro-form-view {
+    .pro-container {
+      width: 100%;
+    }
+
     .pro-group {
       .@{ant-prefix}-space-item,
       .pro-form-view-container {

package/es/ProLayout/components/ProCollapse/style/index.less

@@ -75,6 +75,7 @@
   }
 
   &.pro-collapse-level2 {
+    border-radius: 0;
     background: var(--zaui-base-bg, #ffffff);
     .pro-collapse-panel {
       margin-bottom: 0;
@@ -114,6 +115,7 @@
     }
 
     .pro-collapse-level2-collapse {
+      border-radius: 0;
       margin-bottom: var(--zaui-space-size-md, 16px);
       &.@{ant-prefix}-collapse-item-active {
         margin-bottom: 0;

package/es/ProLayout/components/TabsManager/style/index.less

@@ -296,8 +296,18 @@
   .pro-layout-tab-icon {
     display: none !important;
   }
+  .pro-layout-tab-item {
+    width: 100%;
+  }
   .pro-layout-tab-content {
     width: 100%;
+
+    .pro-layout-tab-title {
+      min-width: 0;
+    }
+    .pro-layout-tab-close {
+      margin-left: auto;
+    }
   }
 }
 

package/es/ProLayout/index.js

@@ -146,19 +146,20 @@ const ProLayout = (props) => {
     return {
       ...tabs,
       onTabChange: (activeKey, activeTab, allTabs) => {
-        var _a2, _b, _c, _d, _e;
+        var _a2, _b, _c, _d, _e, _f;
         if (!allTabs || allTabs.length === 0) {
           setState({ selectedPath: "##EMPTY##" });
+          (_a2 = tabs.onTabChange) == null ? void 0 : _a2.call(tabs, activeKey, activeTab, allTabs ?? []);
           return;
         }
-        const menuCodeSource = (_a2 = activeTab == null ? void 0 : activeTab.menuCodeSource) == null ? void 0 : _a2.trim();
+        const menuCodeSource = (_b = activeTab == null ? void 0 : activeTab.menuCodeSource) == null ? void 0 : _b.trim();
         const sourceMenu = menuCodeSource ? flattenMenuData(menuDataSource.menus).find((menu) => menu.code === menuCodeSource) : void 0;
         const sourcePath = (sourceMenu == null ? void 0 : sourceMenu.redirectUrl) || (sourceMenu == null ? void 0 : sourceMenu.url) || (sourceMenu == null ? void 0 : sourceMenu.router);
-        const targetPath = sourcePath || (activeTab == null ? void 0 : activeTab.url) || ((_b = activeTab == null ? void 0 : activeTab.menuItem) == null ? void 0 : _b.router) || ((_c = activeTab == null ? void 0 : activeTab.menuItem) == null ? void 0 : _c.redirectUrl) || ((_d = activeTab == null ? void 0 : activeTab.menuItem) == null ? void 0 : _d.url);
+        const targetPath = sourcePath || (activeTab == null ? void 0 : activeTab.url) || ((_c = activeTab == null ? void 0 : activeTab.menuItem) == null ? void 0 : _c.router) || ((_d = activeTab == null ? void 0 : activeTab.menuItem) == null ? void 0 : _d.redirectUrl) || ((_e = activeTab == null ? void 0 : activeTab.menuItem) == null ? void 0 : _e.url);
         if (targetPath && targetPath !== selectedPath) {
           setState({ selectedPath: targetPath });
         }
-        (_e = tabs.onTabChange) == null ? void 0 : _e.call(tabs, activeKey, activeTab, allTabs);
+        (_f = tabs.onTabChange) == null ? void 0 : _f.call(tabs, activeKey, activeTab, allTabs);
       }
     };
   }, [isTabsLayout, menuDataSource.menus, tabs, selectedPath]);

package/es/ProSelect/index.js

@@ -305,6 +305,10 @@ const ProSelect = (props, ref) => {
     const content = currentRecord && OptionRender ? OptionRender(currentRecord) : optionLabel;
     return /* @__PURE__ */ jsx(TooltipOption, { children: /* @__PURE__ */ jsx("span", { children: content }) });
   };
+  const selectLabelRender = tooltip ? (selectedOption) => {
+    const content = selectProps.labelRender ? selectProps.labelRender(selectedOption) : selectedOption.label ?? selectedOption.value;
+    return /* @__PURE__ */ jsx(AdaptiveTooltip, { children: content });
+  } : selectProps.labelRender;
   const mode = selectProps.mode;
   const handleChange = (value2, rawOption) => {
     if (mode !== "multiple" && !(labelInValue && !mode)) {
@@ -331,42 +335,50 @@ const ProSelect = (props, ref) => {
     flatOptions,
     code
   });
-  return /* @__PURE__ */ jsx("div", { style: props.style, className: `pro-select${popupOpen ? " pro-select-popup-open" : ""}`, children: /* @__PURE__ */ jsx(
-    Select,
+  return /* @__PURE__ */ jsx(
+    "div",
     {
-      placeholder: (_g = (_f = locale) == null ? void 0 : _f.ProSelect) == null ? void 0 : _g.select,
-      allowClear: true,
-      loading: fetchFunction == null ? void 0 : fetchFunction.loading,
-      onChange: handleChange,
-      showSearch: mergedShowSearch.enabled ? {
-        filterOption: mergedShowSearch.filterOption,
-        optionFilterProp: mergedShowSearch.optionFilterProp,
-        onSearch: mergedShowSearch.onSearch
-      } : false,
-      getPopupContainer: (trigger) => {
-        return scrollFollowParent ? trigger.parentElement : document.body;
-      },
-      ...omit({ ...selectProps }, [
-        "isView",
-        "showCodeName",
-        "form",
-        "name",
-        "style",
-        "onFieldChange",
-        "getChangeValue",
-        "viewportReady",
-        "showSearch",
-        "filterOption",
-        "optionFilterProp",
-        "searchValue"
-      ]),
-      onOpenChange: handleOpenChange,
-      maxTagPlaceholder: selectProps.mode === "multiple" && !selectProps.maxTagPlaceholder ? maxTagPlaceholder : selectProps.maxTagPlaceholder,
-      optionRender: selectOptionRender,
-      value: transformValue(),
-      options: selectOptions
+      style: props.style,
+      className: `pro-select${tooltip ? " pro-select-tooltip" : ""}${popupOpen ? " pro-select-popup-open" : ""}`,
+      children: /* @__PURE__ */ jsx(
+        Select,
+        {
+          placeholder: (_g = (_f = locale) == null ? void 0 : _f.ProSelect) == null ? void 0 : _g.select,
+          allowClear: true,
+          loading: fetchFunction == null ? void 0 : fetchFunction.loading,
+          onChange: handleChange,
+          showSearch: mergedShowSearch.enabled ? {
+            filterOption: mergedShowSearch.filterOption,
+            optionFilterProp: mergedShowSearch.optionFilterProp,
+            onSearch: mergedShowSearch.onSearch
+          } : false,
+          getPopupContainer: (trigger) => {
+            return scrollFollowParent ? trigger.parentElement : document.body;
+          },
+          ...omit({ ...selectProps }, [
+            "isView",
+            "showCodeName",
+            "form",
+            "name",
+            "style",
+            "onFieldChange",
+            "getChangeValue",
+            "viewportReady",
+            "showSearch",
+            "filterOption",
+            "optionFilterProp",
+            "searchValue"
+          ]),
+          onOpenChange: handleOpenChange,
+          labelRender: selectLabelRender,
+          maxTagPlaceholder: selectProps.mode === "multiple" && !selectProps.maxTagPlaceholder ? maxTagPlaceholder : selectProps.maxTagPlaceholder,
+          optionRender: selectOptionRender,
+          value: transformValue(),
+          options: selectOptions
+        }
+      )
     }
-  ) });
+  );
 };
 var ProSelect_default = forwardRef(ProSelect);
 export {

package/es/ProSelect/style/index.less

@@ -15,6 +15,13 @@
     z-index: 4;
   }
 
+  // antd 6 的搜索输入层会覆盖已选标签，收起时让 hover 落到 Tooltip 触发节点。
+  &.pro-select-tooltip:not(.pro-select-popup-open) {
+    .ant-select-content-has-value > .ant-select-input {
+      pointer-events: none;
+    }
+  }
+
   > .ant-select {
     width: 100%;
   }

package/es/ProUpload/components/FileItem.js

@@ -67,8 +67,7 @@ const FileItem = (props) => {
   return /* @__PURE__ */ jsxs("div", { className: "filelist-item-wrapper", children: [
     /* @__PURE__ */ jsxs("div", { className: `file-info-box ${file.status === "error" ? "file-box-error" : ""}`, children: [
       !hideFileIcon && /* @__PURE__ */ jsx("div", { className: "file-type-icon", children: /* @__PURE__ */ jsx("img", { src: _fileIcon }) }),
-      /* @__PURE__ */ jsx("div", { className: `file-name ${hideFileIcon ? "file-name-pf0" : ""}`, children: file.name.replace(_fileExt, "") }),
-      /* @__PURE__ */ jsx("div", { className: "file-ext", children: _fileExt }),
+      /* @__PURE__ */ jsx("div", { className: `file-name ${hideFileIcon ? "file-name-pf0" : ""}`, children: file.name }),
       _fileSize && /* @__PURE__ */ jsx("div", { className: "file-size", children: `(${_fileSize || 0}kb)` }),
       /* @__PURE__ */ jsx("div", { className: "file-actions-wrap", children: /* @__PURE__ */ jsxs("div", { className: "file-actions", children: [
         _isShowDownloadIcon && /* @__PURE__ */ jsx(Button, { type: "link", className: "file-action-item", onClick: _onDownload, children: /* @__PURE__ */ jsx(ReactSVG, { className: "action-icon", wrapper: "span", src: downloadSvg }) }),

package/es/ProUpload/style/index.less

@@ -374,16 +374,17 @@
       }
 
       .file-actions-wrap {
-        width: 100px;
+        flex: none;
         margin-left: auto;
+        padding: 0 var(--zaui-space-size-sm, 8px);
         .file-actions {
           display: none;
+          gap: var(--zaui-space-size-sm, 8px);
           justify-content: right;
 
           transition: all 1s;
 
           .file-action-item {
-            margin-left: var(--zaui-space-size-sm, 8px);
             padding: 0;
             cursor: pointer;
             color: var(--zaui-brand);

package/package.json

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