@pisell/materials 1.0.617 → 1.0.618

package/es/components/Pagination/index.d.ts

@@ -5,7 +5,7 @@ export declare const paginationConfig: {
     className: string;
     defaultCurrent: number;
     showTotal: (total: number, range: [number, number]) => string;
-    itemRender: (page: number, type: "next" | "page" | "prev" | "jump-prev" | "jump-next", element: React.ReactNode) => React.ReactNode;
+    itemRender: (page: number, type: "page" | "next" | "prev" | "jump-prev" | "jump-next", element: React.ReactNode) => React.ReactNode;
     responsive: boolean;
     size: string;
 };

package/es/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -17,7 +17,7 @@ interface UseTablePropsProps {
  * @returns
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
-    title: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    title: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -26,7 +26,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    subTitle: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
     filter: React.JSX.Element | null;
     onRow: (record: any) => any;
@@ -47,7 +47,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         width: number;
         align: "center" | "left" | "right";
         fixed: false | "left" | "right";
-        type: "button" | "link";
+        type: "link" | "button";
         items: OperationItem[];
     } | undefined;
     operationContent?: {

package/es/components/dataSourceComponents/fields/index.d.ts

@@ -59,7 +59,7 @@ declare const formFieldMap: {
     FormItemTranslation: import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     FormItemIconSelect: import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 };
-declare const getFieldComponent: (fieldComponent: string) => import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<any> | (import("react").FC<{}> & {
+declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;

package/es/components/pisellModal/components/MobileModal/index.js

@@ -3,55 +3,52 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 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, { useEffect } from 'react';
+import React, { useEffect, useRef } from 'react';
 import classNames from 'classnames';
 import PcModal from "../PcModal";
 import "./index.less";
+var modalCount = 0;
 var MobileModal = function MobileModal(props) {
   var wrapClassName = props.wrapClassName,
     mobileModalHeight = props.mobileModalHeight;
   var ref = React.useRef(null);
+  var prevOpenRef = useRef(props.open);
+  var isFirstRender = useRef(true);
 
-  // const targetY = useRef<null | number>(null);
-
-  // const touchStart = useCallback((e: React.TouchEvent<HTMLDivElement>) => {
-  //   targetY.current = Math.floor(e.targetTouches[0].clientY);
-  // }, []);
-
-  // const touchmove = useCallback((e: React.TouchEvent<HTMLDivElement>) => {
-  //   e.preventDefault();
-
-  //   console.log(e.targetTouches[0].clientY, 'e.targetTouches[0].clientY');
-  //   const NewTargetY = Math.floor(e.targetTouches[0].clientY),
-  //     sTop = ref.current?.scrollTop || 0,
-  //     sH = ref.current?.scrollHeight || 0,
-  //     lyBoxH = ref.current?.clientHeight || 0;
-  //   // 到顶部阻止
-  //   if (sTop <= 0 && NewTargetY - targetY.current! > 0) {
-  //     e.preventDefault();
-  //     // 到底部阻止
-  //   } else if (sTop >= sH - lyBoxH && NewTargetY - targetY.current! < 0) {
-  //     e.preventDefault();
-  //   }
-  // }, []);
-
+  // 处理初始化时的open状态
   useEffect(function () {
-    console.log(ref.current, 'ref.current');
-    // if (ref.current) {
-    //   ref.current?.addEventListener('touchstart', touchStart);
-    //   ref.current?.addEventListener('touchmove', touchmove);
-    //   return () => {
-    //     ref.current?.removeEventListener('touchstart', touchStart);
-    //     ref.current?.removeEventListener('touchmove', touchmove);
-    //   };
-    // }
-
-    if (props.open) {
+    if (isFirstRender.current && props.open) {
+      modalCount++;
       document.body.style.overflow = 'hidden';
-    } else {
-      document.body.style.overflow = 'auto';
+    }
+    isFirstRender.current = false;
+  }, []);
+  useEffect(function () {
+    if (!isFirstRender.current && props.open !== prevOpenRef.current) {
+      if (props.open) {
+        modalCount++;
+        document.body.style.overflow = 'hidden';
+      } else {
+        modalCount--;
+        if (modalCount <= 0) {
+          modalCount = 0;
+          document.body.style.overflow = '';
+        }
+      }
+      prevOpenRef.current = props.open;
     }
   }, [props.open]);
+  useEffect(function () {
+    return function () {
+      if (prevOpenRef.current) {
+        modalCount--;
+        if (modalCount <= 0) {
+          modalCount = 0;
+          document.body.style.overflow = '';
+        }
+      }
+    };
+  }, []);
   return /*#__PURE__*/React.createElement(PcModal, _extends({}, props, {
     transitionName: "pisell-move-down",
     width: "100%",

package/es/components/pisellNavigationMenu/types.d.ts

@@ -48,7 +48,7 @@ export interface PisellNavigationMenuProps {
     /** 添加页面回调 */
     onAddPage?: (item?: NavigationMenuItem) => void;
     /** 编辑回调 */
-    onEdit?: (item?: NavigationMenuItem) => void;
+    onEdit?: (item: NavigationMenuItem) => void;
     /** 删除回调 */
-    onDelete?: (item?: NavigationMenuItem) => void;
+    onDelete?: (item: NavigationMenuItem) => void;
 }

package/lib/components/Pagination/index.d.ts

@@ -5,7 +5,7 @@ export declare const paginationConfig: {
     className: string;
     defaultCurrent: number;
     showTotal: (total: number, range: [number, number]) => string;
-    itemRender: (page: number, type: "next" | "page" | "prev" | "jump-prev" | "jump-next", element: React.ReactNode) => React.ReactNode;
+    itemRender: (page: number, type: "page" | "next" | "prev" | "jump-prev" | "jump-next", element: React.ReactNode) => React.ReactNode;
     responsive: boolean;
     size: string;
 };

package/lib/components/dataSourceComponents/dataSourceTable/hooks/useTableProps.d.ts

@@ -17,7 +17,7 @@ interface UseTablePropsProps {
  * @returns
  */
 declare const useTableProps: (props: UseTablePropsProps) => {
-    title: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    title: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     pagination: {
         total: number;
         current: number;
@@ -26,7 +26,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         showSizeChanger: boolean;
     };
     columns: import("./useColumns").Column[];
-    subTitle: number | boolean | Iterable<React.ReactNode> | React.JSX.Element | (() => React.ReactNode) | null | undefined;
+    subTitle: number | boolean | React.JSX.Element | Iterable<React.ReactNode> | (() => React.ReactNode) | null | undefined;
     buttons: any[] | null;
     filter: React.JSX.Element | null;
     onRow: (record: any) => any;
@@ -47,7 +47,7 @@ declare const useTableProps: (props: UseTablePropsProps) => {
         width: number;
         align: "center" | "left" | "right";
         fixed: false | "left" | "right";
-        type: "button" | "link";
+        type: "link" | "button";
         items: OperationItem[];
     } | undefined;
     operationContent?: {

package/lib/components/dataSourceComponents/fields/index.d.ts

@@ -59,7 +59,7 @@ declare const formFieldMap: {
     FormItemTranslation: import("react").FC<import("./Translation/type").TranslationProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
     FormItemIconSelect: import("react").FC<import("./IconSelect/type").IconSelectProps & import("../dataSourceForm/utils").WithModeProps & import("../dataSourceForm/utils").WithFormItemProps>;
 };
-declare const getFieldComponent: (fieldComponent: string) => import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | import("react").FC<any> | (import("react").FC<{}> & {
+declare const getFieldComponent: (fieldComponent: string) => import("react").FC<any> | import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps> | (import("react").FC<{}> & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;
 } & {
     Group: import("react").FC<import("./Checkbox/type").CheckboxGroupProps & import("../dataSourceForm/utils").WithModeProps>;

package/lib/components/pisellModal/components/MobileModal/index.js

@@ -36,17 +36,45 @@ var import_react = __toESM(require("react"));
 var import_classnames = __toESM(require("classnames"));
 var import_PcModal = __toESM(require("../PcModal"));
 var import_index = require("./index.less");
+var modalCount = 0;
 var MobileModal = (props) => {
   const { wrapClassName, mobileModalHeight } = props;
   const ref = import_react.default.useRef(null);
+  const prevOpenRef = (0, import_react.useRef)(props.open);
+  const isFirstRender = (0, import_react.useRef)(true);
   (0, import_react.useEffect)(() => {
-    console.log(ref.current, "ref.current");
-    if (props.open) {
+    if (isFirstRender.current && props.open) {
+      modalCount++;
       document.body.style.overflow = "hidden";
-    } else {
-      document.body.style.overflow = "auto";
+    }
+    isFirstRender.current = false;
+  }, []);
+  (0, import_react.useEffect)(() => {
+    if (!isFirstRender.current && props.open !== prevOpenRef.current) {
+      if (props.open) {
+        modalCount++;
+        document.body.style.overflow = "hidden";
+      } else {
+        modalCount--;
+        if (modalCount <= 0) {
+          modalCount = 0;
+          document.body.style.overflow = "";
+        }
+      }
+      prevOpenRef.current = props.open;
     }
   }, [props.open]);
+  (0, import_react.useEffect)(() => {
+    return () => {
+      if (prevOpenRef.current) {
+        modalCount--;
+        if (modalCount <= 0) {
+          modalCount = 0;
+          document.body.style.overflow = "";
+        }
+      }
+    };
+  }, []);
   return /* @__PURE__ */ import_react.default.createElement(
     import_PcModal.default,
     {

package/lib/components/pisellNavigationMenu/types.d.ts

@@ -48,7 +48,7 @@ export interface PisellNavigationMenuProps {
     /** 添加页面回调 */
     onAddPage?: (item?: NavigationMenuItem) => void;
     /** 编辑回调 */
-    onEdit?: (item?: NavigationMenuItem) => void;
+    onEdit?: (item: NavigationMenuItem) => void;
     /** 删除回调 */
-    onDelete?: (item?: NavigationMenuItem) => void;
+    onDelete?: (item: NavigationMenuItem) => void;
 }

package/package.json

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