@pisell/materials 2.2.79 → 2.2.80

package/lib/components/pisellAdjustPrice/PisellAdjustPriceInputNumber.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InputNumberProps } from 'antd/es/input-number';
 export interface PisellAdjustPriceInputNumberProps extends Omit<InputNumberProps, 'onChange'> {
     value?: number;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export interface PisellAdjustPriceProps {
     value?: number;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { CardProps } from 'antd';
 import './index.less';
 export interface PisellCardProps extends CardProps {

package/lib/components/pisellDatePicker/datePickerCpt.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PickerDateProps } from 'antd/es/date-picker/generatePicker';
 import { Dayjs } from 'dayjs';
 import './detePickerCpt.less';

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

@@ -1,3 +1,2 @@
-/// <reference types="react" />
 declare const PisellDatePicker: (props: any) => JSX.Element;
 export default PisellDatePicker;

package/lib/components/pisellDraggable/components/TreeItem/SortableTreeItem.d.ts

@@ -1,9 +1,9 @@
-/// <reference types="react" />
 import type { UniqueIdentifier } from '@dnd-kit/core';
+import React from 'react';
 import { Props as TreeItemProps } from './TreeItem';
 interface Props extends TreeItemProps {
     id: UniqueIdentifier;
     __designMode?: string;
 }
-export declare function SortableTreeItem({ id, depth, ...props }: Props): JSX.Element;
-export {};
+declare const _default: React.MemoExoticComponent<({ id, depth, ...props }: Props) => JSX.Element>;
+export default _default;

package/lib/components/pisellDraggable/components/TreeItem/SortableTreeItem.js

@@ -29,7 +29,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/components/pisellDraggable/components/TreeItem/SortableTreeItem.tsx
 var SortableTreeItem_exports = {};
 __export(SortableTreeItem_exports, {
-  SortableTreeItem: () => SortableTreeItem
+  default: () => SortableTreeItem_default
 });
 module.exports = __toCommonJS(SortableTreeItem_exports);
 var import_sortable = require("@dnd-kit/sortable");
@@ -41,7 +41,7 @@ var animateLayoutChanges = ({
   isSorting,
   wasDragging
 }) => isSorting || wasDragging ? false : true;
-function SortableTreeItem({ id, depth, ...props }) {
+var SortableTreeItem = ({ id, depth, ...props }) => {
   const {
     attributes,
     isDragging,
@@ -76,8 +76,5 @@ function SortableTreeItem({ id, depth, ...props }) {
       ...props
     }
   );
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  SortableTreeItem
-});
+};
+var SortableTreeItem_default = (0, import_react.memo)(SortableTreeItem);

package/lib/components/pisellDraggable/components/TreeItem/TreeItem.d.ts

@@ -19,5 +19,6 @@ export interface Props extends Omit<HTMLAttributes<HTMLLIElement>, 'id'> {
     renderItem?(item: Props, ref: React.ForwardedRef<HTMLDivElement>): React.ReactNode;
     __designMode?: string;
     isBlocked?: boolean;
+    isError?: boolean;
 }
 export declare const TreeItem: React.ForwardRefExoticComponent<Props & React.RefAttributes<HTMLDivElement>>;

package/lib/components/pisellDraggable/components/TreeItem/index.d.ts

@@ -1,2 +1,2 @@
 export { TreeItem } from './TreeItem';
-export { SortableTreeItem } from './SortableTreeItem';
+export { default as SortableTreeItem } from './SortableTreeItem';

package/lib/components/pisellDraggable/components/TreeItem/index.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -14,17 +16,25 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/components/pisellDraggable/components/TreeItem/index.ts
 var TreeItem_exports = {};
 __export(TreeItem_exports, {
-  SortableTreeItem: () => import_SortableTreeItem.SortableTreeItem,
+  SortableTreeItem: () => import_SortableTreeItem.default,
   TreeItem: () => import_TreeItem.TreeItem
 });
 module.exports = __toCommonJS(TreeItem_exports);
 var import_TreeItem = require("./TreeItem");
-var import_SortableTreeItem = require("./SortableTreeItem");
+var import_SortableTreeItem = __toESM(require("./SortableTreeItem"));
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SortableTreeItem,

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

@@ -2,8 +2,9 @@
  * 可拖拽树形组件
  * 基于@dnd-kit库实现，支持拖拽排序、展开折叠、删除等功能
  */
+import { UniqueIdentifier } from '@dnd-kit/core';
 import React from 'react';
-import type { TreeItem, TreeItems } from './types';
+import type { FlattenedItem, TreeItem, TreeItems } from './types';
 import type { Props as TreeItemProps } from './components/TreeItem/TreeItem';
 interface Props {
     /** 是否支持折叠功能 */
@@ -26,7 +27,9 @@ interface Props {
     __designMode?: string;
     /** 最大层级 */
     maxLevel?: number;
+    /** 自定义拖拽判断函数，返回false时阻止拖拽 */
+    canDrop?: (dragItem: FlattenedItem, dropTarget: FlattenedItem, parentId: UniqueIdentifier | null, parentNode: any) => boolean;
 }
-export declare function SortableTree({ collapsible, value, indicator, indentationWidth, removable, renderItem, onChange, onRemoveBefore, __designMode, maxLevel, }: Props): JSX.Element;
+export declare function SortableTree({ collapsible, value, indicator, indentationWidth, removable, renderItem, onChange, onRemoveBefore, __designMode, maxLevel, canDrop, }: Props): JSX.Element;
 declare const Demo: (props: Props) => JSX.Element;
 export default Demo;

package/lib/components/pisellDraggable/index.js

@@ -37,6 +37,7 @@ var import_core = require("@dnd-kit/core");
 var import_sortable = require("@dnd-kit/sortable");
 var import_react = __toESM(require("react"));
 var import_react_dom = require("react-dom");
+var import_ahooks = require("ahooks");
 var import_utilities = require("@dnd-kit/utilities");
 var import_components = require("./components");
 var import_utilities2 = require("./utilities");
@@ -103,7 +104,8 @@ function SortableTree({
   onChange,
   onRemoveBefore,
   __designMode,
-  maxLevel = 3
+  maxLevel = 3,
+  canDrop
 }) {
   const [items, setItems] = (0, import_react.useState)([]);
   const [activeId, setActiveId] = (0, import_react.useState)(null);
@@ -143,7 +145,9 @@ function SortableTree({
     () => flattenedItems.map(({ id }) => id),
     [flattenedItems]
   );
-  const activeItem = activeId ? flattenedItems.find(({ id }) => id === activeId) : null;
+  const activeItem = (0, import_react.useMemo)(() => {
+    return activeId ? flattenedItems.find(({ id }) => id === activeId) : null;
+  }, [activeId, flattenedItems]);
   (0, import_react.useEffect)(() => {
     sensorContext.current = {
       items: flattenedItems,
@@ -164,68 +168,25 @@ function SortableTree({
       return childNewDepth >= maxLevel || checkSubtreeDepth(items2, child.id, childNewDepth);
     });
   }
-  return /* @__PURE__ */ import_react.default.createElement(
-    import_core.DndContext,
-    {
-      sensors,
-      collisionDetection: import_core.closestCenter,
-      measuring,
-      onDragStart: handleDragStart,
-      onDragMove: handleDragMove,
-      onDragOver: handleDragOver,
-      onDragEnd: handleDragEnd,
-      onDragCancel: handleDragCancel
-    },
-    /* @__PURE__ */ import_react.default.createElement(import_sortable.SortableContext, { items: sortedIds, strategy: import_sortable.verticalListSortingStrategy }, flattenedItems.map((item) => {
-      const { id, children, collapsed, depth } = item;
-      return /* @__PURE__ */ import_react.default.createElement(
-        import_components.SortableTreeItem,
-        {
-          key: id,
-          id,
-          item,
-          depth: id === activeId && projected ? projected.depth : depth,
-          indentationWidth,
-          indicator,
-          collapsed: Boolean(collapsed && (children == null ? void 0 : children.length)),
-          onCollapse: collapsible && (children == null ? void 0 : children.length) ? () => handleCollapse(id) : void 0,
-          onRemove: removable ? () => handleRemove(item) : void 0,
-          renderItem,
-          __designMode
-        }
-      );
-    }), (0, import_react_dom.createPortal)(
-      /* @__PURE__ */ import_react.default.createElement(
-        import_core.DragOverlay,
-        {
-          dropAnimation: dropAnimationConfig,
-          modifiers: indicator ? [adjustTranslate] : void 0
-        },
-        activeId && activeItem ? /* @__PURE__ */ import_react.default.createElement(
-          import_components.SortableTreeItem,
-          {
-            id: activeId,
-            depth: activeItem.depth,
-            clone: true,
-            childCount: (0, import_utilities2.getChildCount)(items, activeId) + 1,
-            item: activeItem,
-            indentationWidth,
-            renderItem
-          }
-        ) : null
-      ),
-      document.body
-    ))
-  );
-  function handleDragStart({ active: { id: activeId2 } }) {
+  const handleRemove = (0, import_ahooks.useMemoizedFn)(async (item) => {
+    if (onRemoveBefore) {
+      let res = await (onRemoveBefore == null ? void 0 : onRemoveBefore(item));
+      if (!res) {
+        return;
+      }
+    }
+    setItems((items2) => (0, import_utilities2.removeItem)(items2, item.id));
+    onChange == null ? void 0 : onChange(items);
+  });
+  const handleDragStart = (0, import_ahooks.useMemoizedFn)(({ active: { id: activeId2 } }) => {
     setActiveId(activeId2);
     setOverId(activeId2);
     document.body.style.setProperty("cursor", "grabbing");
-  }
-  function handleDragMove({ delta }) {
+  });
+  const handleDragMove = (0, import_ahooks.useMemoizedFn)(({ delta }) => {
     setOffsetLeft(delta.x);
-  }
-  function handleDragOver({ over }) {
+  });
+  const handleDragOver = (0, import_ahooks.useMemoizedFn)(({ over }) => {
     if (!projected || !over) {
       setOverId((over == null ? void 0 : over.id) ?? null);
       return;
@@ -246,8 +207,11 @@ function SortableTree({
       return;
     }
     setOverId(over.id);
-  }
-  function handleDragEnd({ active, over }) {
+  });
+  const parentNode = (0, import_react.useMemo)(() => {
+    return (projected == null ? void 0 : projected.parentId) ? flattenedItems.find((item) => item.id === projected.parentId) : null;
+  }, [flattenedItems, projected == null ? void 0 : projected.parentId]);
+  const handleDragEnd = (0, import_ahooks.useMemoizedFn)(({ active, over }) => {
     resetState();
     if (projected && over) {
       const { depth, parentId } = projected;
@@ -255,6 +219,14 @@ function SortableTree({
       if (targetParent == null ? void 0 : targetParent.disabledDrop) {
         return;
       }
+      const dragItem = flattenedItems.find((item) => item.id === active.id);
+      const dropTarget = flattenedItems.find((item) => item.id === over.id);
+      if (canDrop && dragItem && dropTarget) {
+        const canDropResult = canDrop(dragItem, dropTarget, parentId, targetParent);
+        if (!canDropResult) {
+          return;
+        }
+      }
       if (depth >= maxLevel) {
         return;
       }
@@ -278,7 +250,86 @@ function SortableTree({
       setItems(newItems);
       onChange == null ? void 0 : onChange(newItems);
     }
-  }
+  });
+  const handleCollapse = (0, import_ahooks.useMemoizedFn)((id) => {
+    setItems((items2) => {
+      const newVal = (0, import_utilities2.setProperty)(items2, id, "collapsed", (value2) => {
+        return !value2;
+      });
+      onChange == null ? void 0 : onChange(items2);
+      return newVal;
+    });
+  });
+  const isError = (0, import_react.useMemo)(() => {
+    return !(canDrop == null ? void 0 : canDrop(activeItem || {}, {}, projected == null ? void 0 : projected.parentId, parentNode));
+  }, [projected, activeItem, canDrop, parentNode]);
+  const renderTreeItems = (0, import_react.useMemo)(() => {
+    return flattenedItems.map((item) => {
+      const { id, children, collapsed, depth } = item;
+      return /* @__PURE__ */ import_react.default.createElement(
+        import_components.SortableTreeItem,
+        {
+          key: id,
+          id,
+          item,
+          depth: id === activeId && projected ? projected.depth : depth,
+          indentationWidth,
+          indicator,
+          collapsed: Boolean(collapsed && (children == null ? void 0 : children.length)),
+          onCollapse: collapsible && (children == null ? void 0 : children.length) ? () => handleCollapse(id) : void 0,
+          onRemove: removable ? () => handleRemove(item) : void 0,
+          renderItem,
+          __designMode
+        }
+      );
+    });
+  }, [
+    flattenedItems,
+    activeId,
+    projected == null ? void 0 : projected.depth,
+    indentationWidth,
+    indicator,
+    collapsible,
+    handleCollapse,
+    handleRemove,
+    renderItem,
+    __designMode
+  ]);
+  return /* @__PURE__ */ import_react.default.createElement(
+    import_core.DndContext,
+    {
+      sensors,
+      collisionDetection: import_core.closestCenter,
+      measuring,
+      onDragStart: handleDragStart,
+      onDragMove: handleDragMove,
+      onDragOver: handleDragOver,
+      onDragEnd: handleDragEnd,
+      onDragCancel: handleDragCancel
+    },
+    /* @__PURE__ */ import_react.default.createElement(import_sortable.SortableContext, { items: sortedIds, strategy: import_sortable.verticalListSortingStrategy }, renderTreeItems, (0, import_react_dom.createPortal)(
+      /* @__PURE__ */ import_react.default.createElement(
+        import_core.DragOverlay,
+        {
+          dropAnimation: dropAnimationConfig,
+          modifiers: indicator ? [adjustTranslate] : void 0
+        },
+        activeId && activeItem ? /* @__PURE__ */ import_react.default.createElement(
+          import_components.SortableTreeItem,
+          {
+            id: activeId,
+            depth: activeItem.depth,
+            clone: true,
+            childCount: (0, import_utilities2.getChildCount)(items, activeId) + 1,
+            item: activeItem,
+            indentationWidth,
+            renderItem: (props, ref) => renderItem == null ? void 0 : renderItem({ ...props, isError }, ref)
+          }
+        ) : null
+      ),
+      document.body
+    ))
+  );
   function handleDragCancel() {
     resetState();
   }
@@ -288,23 +339,6 @@ function SortableTree({
     setOffsetLeft(0);
     document.body.style.setProperty("cursor", "");
   }
-  async function handleRemove(item) {
-    if (onRemoveBefore) {
-      let res = await (onRemoveBefore == null ? void 0 : onRemoveBefore(item));
-      if (!res) {
-        return;
-      }
-    }
-    setItems((items2) => (0, import_utilities2.removeItem)(items2, item.id));
-    onChange == null ? void 0 : onChange(items);
-  }
-  function handleCollapse(id) {
-    setItems(
-      (items2) => (0, import_utilities2.setProperty)(items2, id, "collapsed", (value2) => {
-        return !value2;
-      })
-    );
-  }
 }
 var adjustTranslate = ({ transform }) => {
   return {

package/lib/components/pisellDropSort/PisellDropSort.js

@@ -46,6 +46,7 @@ var PisellDropSort = ({
   allowDelete = true,
   allowAddChild = true,
   allowAddRoot = true,
+  allowIsShow = false,
   disabled = false,
   spacing = 8,
   maxLevel = 3,
@@ -62,7 +63,9 @@ var PisellDropSort = ({
   __designMode,
   isCustomAction,
   emptyContent,
-  getItemStyle
+  getItemStyle,
+  canDrop,
+  indentationWidth
 }) => {
   const renderItem = (0, import_react.useCallback)(
     (itemProps, ref) => {
@@ -75,6 +78,7 @@ var PisellDropSort = ({
           allowAddChild,
           allowDelete,
           allowDrag,
+          allowIsShow,
           disabled,
           onAdd,
           onDelete,
@@ -132,10 +136,12 @@ var PisellDropSort = ({
         value,
         collapsible: true,
         indicator: false,
-        indentationWidth: 24,
+        indentationWidth,
         removable: allowDelete,
         renderItem,
-        onChange: handleChange
+        onChange: handleChange,
+        canDrop,
+        maxLevel
       }
     )
   ));

package/lib/components/pisellDropSort/components/SortableItem/index.d.ts

@@ -7,6 +7,7 @@ interface SortableItemProps {
     domRef: React.RefObject<HTMLDivElement>;
     allowAddChild?: boolean;
     allowDelete?: boolean;
+    allowIsShow?: boolean;
     allowDrag?: boolean;
     disabled?: boolean;
     onAdd?: (itemProps: TreeItem) => void;

package/lib/components/pisellDropSort/components/SortableItem/index.js

@@ -46,6 +46,7 @@ var SortableItem = (props) => {
     allowAddChild,
     allowDelete,
     allowDrag,
+    allowIsShow,
     disabled,
     onAdd,
     onDelete,
@@ -72,6 +73,7 @@ var SortableItem = (props) => {
     indentationWidth,
     handleProps,
     collapsed,
+    isError,
     ...otherProps
   } = itemProps;
   const itemStyle = (getItemStyle == null ? void 0 : getItemStyle(itemProps)) || {};
@@ -79,6 +81,9 @@ var SortableItem = (props) => {
     ...itemStyle,
     ...style
   };
+  if (isError) {
+    mergedStyle.backgroundColor = "#FECDCA";
+  }
   return /* @__PURE__ */ import_react.default.createElement(
     "li",
     {

package/lib/components/pisellDropSort/components/SortableItem/index.less

@@ -81,7 +81,6 @@
 
   .pisell-lowcode-drop-sort-item-content {
     flex: 1;
-    height: 48px;
   }
 
   .pisell-lowcode-drop-sort-item-button {

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

@@ -15,6 +15,8 @@ export interface PisellDropSortProps {
     allowAddChild?: boolean;
     /** 允许添加根节点 */
     allowAddRoot?: boolean;
+    /** 是否允许显示隐藏 */
+    allowIsShow?: boolean;
     /** 是否禁用 */
     disabled?: boolean;
     /** 节点间距 */
@@ -49,4 +51,8 @@ export interface PisellDropSortProps {
     isCustomAction?: boolean;
     /** 获取item样式 */
     getItemStyle?: (itemProps: TreeItem) => React.CSSProperties;
+    /** 自定义拖拽判断函数，返回false时阻止拖拽 */
+    canDrop?: (dragItem: DropSortItem, dropTarget: DropSortItem, parentId: string | number | null) => boolean;
+    /** 节点缩进宽度 */
+    indentationWidth?: number;
 }

package/lib/components/pisellInformationEntry/Scan/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 export interface ScanProps {
     onChange: (val: string) => void;

package/lib/components/pisellInput/components/BankCard/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InputProps } from 'antd';
 import { PisellContextType } from "../../../pisell-config-provider/context";
 import './index.less';

package/lib/components/pisellInput/components/Copy/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InputProps, ButtonProps } from 'antd';
 import { PisellContextType } from "../../../pisell-config-provider/context";
 export interface CopyProps extends InputProps {

package/lib/components/pisellInput/components/SecurityCode/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InputProps } from 'antd';
 import './index.less';
 import { PisellContextType } from "../../../pisell-config-provider/context";

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InputProps } from 'antd';
 import { PisellContextType } from '../pisell-config-provider/context';
 declare const PisellInput: {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { SpinProps } from 'antd';
 import './index.less';
 declare type MaskType = {

package/lib/components/pisellMenu/PisellMenu.d.ts

@@ -1,9 +1,11 @@
+import { Menu as AntdMenu } from 'antd';
 import React from 'react';
 import './PisellMenu.less';
 import type { PisellMenuProps } from './types';
-declare const PisellMenu: {
-    ({ className, style, mode, theme, defaultOpenKeys, defaultSelectedKeys, inlineCollapsed, openKeys, selectedKeys, onOpenChange, onSelect, dataSource, __designMode, children, other, ...restProps }: PisellMenuProps): JSX.Element;
-    Item: Omit<React.FunctionComponent<import("antd").MenuItemProps>, ""> & (<T extends import("antd").MenuItemProps>(props: T extends infer U extends import("antd").MenuItemProps ? unknown extends U ? import("antd").MenuItemProps : U : import("antd").MenuItemProps, context?: any) => React.ReactElement<any, any> | null);
-    SubMenu: React.FC<import("antd").SubMenuProps>;
+declare type PisellMenuComponent = React.FC<PisellMenuProps> & {
+    Item: typeof AntdMenu.Item;
+    SubMenu: typeof AntdMenu.SubMenu;
+    ItemGroup: typeof AntdMenu.ItemGroup;
 };
+declare const PisellMenu: PisellMenuComponent;
 export default PisellMenu;

package/lib/components/pisellMenu/PisellMenu.js

@@ -96,4 +96,5 @@ var PisellMenu = ({
 };
 PisellMenu.Item = import_antd.Menu.Item;
 PisellMenu.SubMenu = import_antd.Menu.SubMenu;
+PisellMenu.ItemGroup = import_antd.Menu.ItemGroup;
 var PisellMenu_default = PisellMenu;

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

@@ -23,4 +23,5 @@ export interface MenuItemType {
     icon?: string | React.ReactNode;
     hide?: boolean;
     type?: 'group' | 'divider';
+    isGroup?: boolean;
 }

package/lib/components/pisellModal/components/IpadModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PcModalProps } from '../PcModal';
 export interface IpadModalProps extends PcModalProps {
 }

package/lib/components/pisellModal/components/MobileModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { PcModalProps } from '../PcModal';
 import './index.less';
 export interface MobileModalProps extends PcModalProps {

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import IpadModal from './IpadModal';
 import MobileModal from './MobileModal';
 import PcModal from './PcModal';