@pisell/materials 1.0.272 → 1.0.274

package/es/components/drawer/index.js

@@ -14,7 +14,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import React, { useLayoutEffect, useMemo } from "react";
 import { Drawer as OriginalDrawer } from "antd";
-import { useControllableValue } from "ahooks";
+import { useControllableValue, useUpdateEffect } from "ahooks";
 import classNames from "classnames";
 import { isBoolean, isUndefined } from "@pisell/utils";
 import XClose from "@pisell/icon/es/XClose";
@@ -57,13 +57,15 @@ var Drawer = function Drawer(props) {
     _useControllableValue2 = _slicedToArray(_useControllableValue, 2),
     persistentState = _useControllableValue2[0],
     setPersistentState = _useControllableValue2[1];
+  var currentDrawerId = props.__id;
+  var storageKey = "drawer-".concat(currentDrawerId);
   var innerProps = {};
   if (props.__designMode === "design") {
     // 低代码编辑态中强制显示，将控制权交给引擎侧
     innerProps.open = true;
   }
   useLayoutEffect(function () {
-    if (isBoolean(persistentState) && isUndefined(getContainer)) {
+    if (isBoolean(persistentState) && isUndefined(getContainer) && showPin) {
       document.body.style.transition = 'all 0.3s';
       document.body.style["padding-".concat(placement)] = persistentState && open ? "".concat(width || 378, "px") : "0";
     }
@@ -72,6 +74,16 @@ var Drawer = function Drawer(props) {
       document.body.style.transition = 'none';
     };
   }, [persistentState, width, showPin, placement, open]);
+  useUpdateEffect(function () {
+    if (isBoolean(persistentState) && showPin) {
+      localStorage.setItem(storageKey, "".concat(persistentState));
+    }
+  }, [persistentState, storageKey, showPin]);
+  useLayoutEffect(function () {
+    if (!isBoolean(persistentState) && showPin) {
+      setPersistentState(localStorage.getItem(storageKey) === "true");
+    }
+  }, [persistentState, storageKey, showPin]);
   var otherProps = useMemo(function () {
     if (operateMode === "outside") {
       return {

package/es/components/table/hooks/useTransColumns.js

@@ -108,16 +108,27 @@ var useTransColumns = function useTransColumns(params) {
         position = "end";
       }
       var groupObj = {};
+      if (groupField) {
+        groupObj = {
+          render: function render(text, record) {
+            var _col$render;
+            if (record.__is_group) {
+              return null;
+            }
+            return (col === null || col === void 0 ? void 0 : (_col$render = col.render) === null || _col$render === void 0 ? void 0 : _col$render.call(col, text, record)) || text;
+          }
+        };
+      }
       if (position === "start" && groupField) {
         groupObj = {
           fixed: "left",
           width: 350,
           render: function render(text, record) {
-            var _col$render;
+            var _col$render2;
             if (record.__is_group && groupFieldRender) {
               return groupFieldRender(text, record);
             }
-            return (col === null || col === void 0 ? void 0 : (_col$render = col.render) === null || _col$render === void 0 ? void 0 : _col$render.call(col, text, record)) || text;
+            return (col === null || col === void 0 ? void 0 : (_col$render2 = col.render) === null || _col$render2 === void 0 ? void 0 : _col$render2.call(col, text, record)) || text;
           }
         };
       }

package/lib/components/drawer/index.js

@@ -80,12 +80,14 @@ var Drawer = (props) => {
       valuePropName: "persistent"
     }
   );
+  const currentDrawerId = props.__id;
+  const storageKey = `drawer-${currentDrawerId}`;
   const innerProps = {};
   if (props.__designMode === "design") {
     innerProps.open = true;
   }
   (0, import_react.useLayoutEffect)(() => {
-    if ((0, import_utils.isBoolean)(persistentState) && (0, import_utils.isUndefined)(getContainer)) {
+    if ((0, import_utils.isBoolean)(persistentState) && (0, import_utils.isUndefined)(getContainer) && showPin) {
       document.body.style.transition = "all 0.3s";
       document.body.style[`padding-${placement}`] = persistentState && open ? `${width || 378}px` : "0";
     }
@@ -94,6 +96,16 @@ var Drawer = (props) => {
       document.body.style.transition = "none";
     };
   }, [persistentState, width, showPin, placement, open]);
+  (0, import_ahooks.useUpdateEffect)(() => {
+    if ((0, import_utils.isBoolean)(persistentState) && showPin) {
+      localStorage.setItem(storageKey, `${persistentState}`);
+    }
+  }, [persistentState, storageKey, showPin]);
+  (0, import_react.useLayoutEffect)(() => {
+    if (!(0, import_utils.isBoolean)(persistentState) && showPin) {
+      setPersistentState(localStorage.getItem(storageKey) === "true");
+    }
+  }, [persistentState, storageKey, showPin]);
   const otherProps = (0, import_react.useMemo)(() => {
     if (operateMode === "outside") {
       return {

package/lib/components/table/hooks/useTransColumns.js

@@ -130,6 +130,17 @@ var useTransColumns = (params) => {
         position = "end";
       }
       let groupObj = {};
+      if (groupField) {
+        groupObj = {
+          render: (text, record) => {
+            var _a4;
+            if (record.__is_group) {
+              return null;
+            }
+            return ((_a4 = col == null ? void 0 : col.render) == null ? void 0 : _a4.call(col, text, record)) || text;
+          }
+        };
+      }
       if (position === "start" && groupField) {
         groupObj = {
           fixed: "left",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.272",
+  "version": "1.0.274",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",