@pisell/materials 1.0.615 → 1.0.616

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/dataSourceTable/hooks/useTableProps.js

@@ -166,7 +166,8 @@ var useTableProps = function useTableProps(props) {
           var label = item.label,
             actionType = item.actionType,
             show = item.show;
-          var handleClick = function handleClick() {
+          var handleClick = function handleClick(e) {
+            e.stopPropagation();
             if (actionType === 'delete') {
               PisellModal.confirm({
                 title: getText('pisell-delete-confirm-title'),

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

@@ -3,13 +3,55 @@ 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 from 'react';
+import React, { useEffect } from 'react';
 import classNames from 'classnames';
 import PcModal from "../PcModal";
 import "./index.less";
 var MobileModal = function MobileModal(props) {
   var wrapClassName = props.wrapClassName,
     mobileModalHeight = props.mobileModalHeight;
+  var ref = React.useRef(null);
+
+  // 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();
+  //   }
+  // }, []);
+
+  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) {
+      document.body.style.overflow = 'hidden';
+    } else {
+      document.body.style.overflow = 'auto';
+    }
+  }, [props.open]);
   return /*#__PURE__*/React.createElement(PcModal, _extends({}, props, {
     transitionName: "pisell-move-down",
     width: "100%",
@@ -19,7 +61,8 @@ var MobileModal = function MobileModal(props) {
         className: classNames(_defineProperty({}, 'pisell-mobile-modal-render', mobileModalHeight)),
         style: {
           height: mobileModalHeight || '100%'
-        }
+        },
+        ref: ref
       }, node);
     }
   }));

package/es/components/table/Table/utils.d.ts

@@ -167,7 +167,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

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/dataSourceTable/hooks/useTableProps.js

@@ -148,7 +148,8 @@ var useTableProps = (props) => {
         render: (_, record) => {
           return /* @__PURE__ */ import_react.default.createElement(import_antd.Space, null, items == null ? void 0 : items.map((item) => {
             const { label, actionType, show: show2 } = item;
-            const handleClick = () => {
+            const handleClick = (e) => {
+              e.stopPropagation();
               if (actionType === "delete") {
                 import_pisellModal.default.confirm({
                   title: (0, import_locales.getText)("pisell-delete-confirm-title"),

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

@@ -38,6 +38,15 @@ var import_PcModal = __toESM(require("../PcModal"));
 var import_index = require("./index.less");
 var MobileModal = (props) => {
   const { wrapClassName, mobileModalHeight } = props;
+  const ref = import_react.default.useRef(null);
+  (0, import_react.useEffect)(() => {
+    console.log(ref.current, "ref.current");
+    if (props.open) {
+      document.body.style.overflow = "hidden";
+    } else {
+      document.body.style.overflow = "auto";
+    }
+  }, [props.open]);
   return /* @__PURE__ */ import_react.default.createElement(
     import_PcModal.default,
     {
@@ -56,7 +65,8 @@ var MobileModal = (props) => {
             }),
             style: {
               height: mobileModalHeight || "100%"
-            }
+            },
+            ref
           },
           node
         );

package/lib/components/table/Table/utils.d.ts

@@ -167,7 +167,7 @@ export declare const getSettingKeyArrByMode: ({ filter, columnSetting, dataSourc
     sort?: SortType | undefined;
     mode: "" | "localStorage" | "remote";
     currentViewMode: ModeType;
-}) => ("filter_setting" | "column_setting" | "gallery_setting" | "view_mode" | "group_by" | "order_by")[];
+}) => ("view_mode" | "column_setting" | "order_by" | "group_by" | "gallery_setting" | "filter_setting")[];
 export declare const omit: (obj: Record<string, any>, keys: string[]) => Record<string, any>;
 export declare const stringify: (obj: Record<string, any>) => string;
 export {};

package/package.json

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