@zat-design/sisyphus-react 4.6.3-beta.2 → 4.6.4-beta.1

package/es/ProEditTable/style/index.less

@@ -242,7 +242,15 @@
   .@{ant-prefix}-table-tbody
     .is-editing:not(.@{ant-prefix}-table-measure-row):not(.@{ant-prefix}-table-row-extra)
     .@{ant-prefix}-form-item.@{ant-prefix}-form-item-has-error {
-    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1)) !important;
+    margin-bottom: 0px !important;
+
+    .@{ant-prefix}-form-item-control {
+      min-height: calc(
+        var(--zaui-height-size-lg; 32px) * var(--zaui-size; 1) +
+          var(--zaui-space-size-md; 16px) * var(--zaui-line-height-base; 1.5) *
+          var(--zaui-size; 1)
+      ) !important;
+    }
   }
 
   .@{ant-prefix}-table.@{ant-prefix}-table-bordered > .@{ant-prefix}-table-container {

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/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/ProTable/components/RenderColumn/index.js

@@ -38,10 +38,6 @@ const RenderColumn = (props) => {
       tooltip: isEllipsisActive(e.target)
     });
   };
-  const tooltipProps = {
-    getPopupContainer: (triggerNode) => triggerNode.parentNode,
-    ...toolTipProps
-  };
   if (isBoolean(props == null ? void 0 : props.isChanged) || isInNewRowFlag) {
     let renderNode = value ? node : "-";
     const isXMaxContent = (scroll == null ? void 0 : scroll.x) === "max-content";
@@ -97,13 +93,16 @@ const RenderColumn = (props) => {
             Tooltip,
             {
               title: currentValue,
+              placement: "topLeft",
+              autoAdjustOverflow: false,
               onOpenChange: (open) => {
                 setState({
                   tooltip: false
                 });
               },
               open: tooltip,
-              ...tooltipProps,
+              ...toolTipProps,
+              getPopupContainer: () => document.body,
               children: /* @__PURE__ */ jsx(
                 Text,
                 {
@@ -154,6 +153,7 @@ const RenderColumn = (props) => {
             ] }) : null })
           ] }) : node }),
           ...toolTipProps,
+          getPopupContainer: () => document.body,
           children: /* @__PURE__ */ jsx("div", { className: cellDiffCls, children: renderNode })
         }
       );
@@ -193,7 +193,7 @@ const RenderColumn = (props) => {
           });
         },
         open: tooltip,
-        ...tooltipProps,
+        ...toolTipProps,
         getPopupContainer: () => document.body,
         children: /* @__PURE__ */ jsx(
           Text,

package/es/ProTree/components/ProTreeSelect/index.js

@@ -75,11 +75,30 @@ const ProTreeSelect = (props, ref) => {
       if (!data || !Array.isArray(data) || !data.length) {
         return data || [];
       }
-      return tools.transformDataName(data, {
+      const normalizedData = tools.transformDataName(data, {
         label: finalFieldNames.label,
         value: finalFieldNames.value,
         children: finalFieldNames.children
       });
+      if (!Array.isArray(normalizedData)) {
+        return normalizedData;
+      }
+      const mergeOriginalFields = (sourceNodes, normalizedNodes) => normalizedNodes.map((normalizedNode, index) => {
+        const sourceNode = typeof sourceNodes[index] === "object" && sourceNodes[index] !== null ? sourceNodes[index] : {};
+        const sourceChildren = sourceNode[finalFieldNames.children];
+        const normalizedChildren = normalizedNode.children;
+        const sourceFields = { ...sourceNode };
+        delete sourceFields[finalFieldNames.children];
+        return {
+          ...sourceFields,
+          ...normalizedNode,
+          children: Array.isArray(sourceChildren) && Array.isArray(normalizedChildren) ? mergeOriginalFields(
+            sourceChildren,
+            normalizedChildren
+          ) : normalizedChildren
+        };
+      });
+      return mergeOriginalFields(data, normalizedData);
     },
     [finalFieldNames]
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.6.3-beta.2",
+  "version": "4.6.4-beta.1",
   "license": "MIT",
   "publishConfig": {
     "access": "public",
@@ -18,8 +18,12 @@
   "typings": "es/index.d.ts",
   "typesVersions": {
     "*": {
-      "tokens": ["es/tokens.d.ts"],
-      "es/*": ["es/*"]
+      "tokens": [
+        "es/tokens.d.ts"
+      ],
+      "es/*": [
+        "es/*"
+      ]
     }
   },
   "exports": {
@@ -116,6 +120,7 @@
     "big.js": "^6.2.1",
     "classnames": "^2.3.1",
     "dayjs": "^1.11.13",
+    "i": "^0.3.7",
     "idb-keyval": "^6.2.2",
     "lodash": "^4.17.21",
     "react-intersection-observer": "^9.13.0",