listpage-next 0.0.235 → 0.0.236

package/dist/components/PageLayout/components/PageModal/useActions.js

@@ -71,12 +71,20 @@ function useActions(props) {
                 })
             ]
         });
-        return /*#__PURE__*/ jsxs(FlexContainer, {
+        if ('bottom' === actionPosition) return /*#__PURE__*/ jsxs(HeaderContainer, {
             children: [
-                icon,
-                title
+                /*#__PURE__*/ jsxs(FlexContainer, {
+                    children: [
+                        icon,
+                        title
+                    ]
+                }),
+                /*#__PURE__*/ jsx(ExtraContainer, {
+                    children: closeButton
+                })
             ]
         });
+        return /*#__PURE__*/ jsx(Fragment, {});
     }, [
         actionPosition,
         icon,

package/dist/components/PageLayout/components/PageModal/useCloseButton.d.ts

@@ -1,8 +1,4 @@
 import type { PageModalProps } from '.';
 export declare function useCloseButton(props: PageModalProps): {
     closeButton: import("react/jsx-runtime").JSX.Element | null;
-    closable: boolean;
-} | {
-    closeButton: import("react/jsx-runtime").JSX.Element | null;
-    closable?: undefined;
 };

package/dist/components/PageLayout/components/PageModal/useCloseButton.js

@@ -4,7 +4,7 @@ import { CloseOutlined } from "@ant-design/icons";
 import { styled } from "styled-components";
 import { Button } from "antd";
 function useCloseButton(props) {
-    const { actionPosition, onCancel, closable = true } = props;
+    const { onCancel, closable = true } = props;
     const closeButton = useMemo(()=>{
         if (true === closable) return /*#__PURE__*/ jsx(CloseButton, {
             type: "text",
@@ -23,10 +23,6 @@ function useCloseButton(props) {
         closable,
         onCancel
     ]);
-    if ('top' === actionPosition) return {
-        closeButton,
-        closable: false
-    };
     return {
         closeButton
     };

package/dist/components/PageLayout/components/PageProvider/float.d.ts

@@ -12,7 +12,7 @@ export declare const FloatProvider: (props: {
 export type FloatComponentProps<T extends Record<string, any> = any> = {
     record: T;
     visible: boolean;
-    onClose: () => void;
+    onClose: (code?: number) => void;
 };
 export type PageFloatProps<T extends Record<string, any> = any> = {
     key: string;

package/dist/features/ChatClient/ui/ConversationDropdownMenu/index.d.ts

@@ -1,12 +1,15 @@
 type BaseConversation = {
     id: string;
     title: string;
+    updatedAt?: string | number | Date;
+    createdAt?: string | number | Date;
 };
 export interface ConversationDropdownMenuProps<T extends BaseConversation = BaseConversation> {
     request: () => Promise<{
         list: T[];
     }>;
     onSelect?: (item: T) => void;
+    onDelete?: (item: T) => void | Promise<void>;
     activeKey?: string;
 }
 export declare const ConversationDropdownMenu: <T extends BaseConversation = any>(props: ConversationDropdownMenuProps<T>) => import("react/jsx-runtime").JSX.Element;

package/dist/features/ChatClient/ui/ConversationDropdownMenu/index.js

@@ -1,28 +1,94 @@
-import { jsx } from "react/jsx-runtime";
-import { HistoryOutlined } from "@ant-design/icons";
+import { jsx, jsxs } from "react/jsx-runtime";
+import { DeleteOutlined, HistoryOutlined } from "@ant-design/icons";
 import { PageLoading } from "../../../../components/index.js";
 import { useRequest } from "ahooks";
 import { Button, Dropdown, Tooltip } from "antd";
 import styled_components from "styled-components";
+import dayjs from "dayjs";
 const ConversationDropdownMenu = (props)=>{
-    const { request, onSelect, activeKey } = props;
-    const { data, run: refresh, loading } = useRequest(()=>request(), {
+    const { request, onSelect, onDelete, activeKey } = props;
+    const { data, run: refresh, loading, mutate } = useRequest(()=>request(), {
         manual: true
     });
-    const menus = [
-        {
-            label: '历史会话',
-            type: 'group'
-        },
-        ...(data?.list ?? []).map((item)=>({
-                key: item.id,
-                label: item.title || item,
-                type: 'item',
-                onClick: ()=>{
-                    if (item.id !== activeKey) onSelect?.(item);
-                }
-            }))
-    ];
+    const toMenuItem = (item)=>({
+            key: item.id,
+            label: /*#__PURE__*/ jsxs(MenuItemLabel, {
+                children: [
+                    /*#__PURE__*/ jsx("span", {
+                        children: item.title || item
+                    }),
+                    /*#__PURE__*/ jsx(Button, {
+                        type: "text",
+                        size: "small",
+                        danger: true,
+                        icon: /*#__PURE__*/ jsx(DeleteOutlined, {}),
+                        onClick: async (e)=>{
+                            e.preventDefault();
+                            e.stopPropagation();
+                            await onDelete?.(item);
+                            const list = (data?.list ?? []).filter((x)=>x.id !== item.id);
+                            mutate?.({
+                                list
+                            });
+                        },
+                        className: "delete-btn"
+                    })
+                ]
+            }),
+            type: 'item',
+            onClick: ()=>{
+                if (item.id !== activeKey) onSelect?.(item);
+            }
+        });
+    const now = dayjs();
+    const startOfWeek = now.startOf('day').subtract(now.day(), 'day');
+    const getTime = (it)=>it.updatedAt || it.createdAt || it.time || it.date || void 0;
+    const list = data?.list ?? [];
+    const isToday = (t)=>dayjs(t).isSame(now, 'day');
+    const isYesterday = (t)=>dayjs(t).isSame(now.clone().subtract(1, 'day'), 'day');
+    const inWeek = (t)=>{
+        const d = dayjs(t);
+        return d.isAfter(startOfWeek) || d.isSame(startOfWeek, 'day');
+    };
+    const inMonth = (t)=>dayjs(t).isSame(now, 'month');
+    const today = list.filter((it)=>{
+        const t = getTime(it);
+        if (!t) return false;
+        return isToday(t);
+    });
+    const yesterday = list.filter((it)=>{
+        const t = getTime(it);
+        if (!t) return false;
+        return isYesterday(t);
+    });
+    const week = list.filter((it)=>{
+        const t = getTime(it);
+        if (!t) return false;
+        return inWeek(t) && !isToday(t) && !isYesterday(t);
+    });
+    const month = list.filter((it)=>{
+        const t = getTime(it);
+        if (!t) return false;
+        return inMonth(t) && !inWeek(t) && !isToday(t) && !isYesterday(t);
+    });
+    const groups = {
+        今天: today,
+        昨天: yesterday,
+        本周内: week,
+        本月内: month
+    };
+    const groupEntries = Object.entries(groups).filter(([_, arr])=>arr.length);
+    const menus = [];
+    groupEntries.forEach(([label, arr], index)=>{
+        menus.push({
+            type: 'group',
+            label,
+            children: arr.map((it)=>toMenuItem(it))
+        });
+        if (index < groupEntries.length - 1) menus.push({
+            type: 'divider'
+        });
+    });
     return /*#__PURE__*/ jsx(Tooltip, {
         title: "历史会话",
         children: /*#__PURE__*/ jsx(Dropdown, {
@@ -36,11 +102,15 @@ const ConversationDropdownMenu = (props)=>{
             popupRender: (originNode)=>{
                 if (loading || !data?.list?.length) {
                     const content = loading ? /*#__PURE__*/ jsx(PageLoading, {}) : '暂无历史会话';
-                    return /*#__PURE__*/ jsx(DefaultPanelContainer, {
-                        children: content
+                    return /*#__PURE__*/ jsx(MenuPanelContainer, {
+                        children: /*#__PURE__*/ jsx(DefaultPanelContainer, {
+                            children: content
+                        })
                     });
                 }
-                return originNode;
+                return /*#__PURE__*/ jsx(MenuPanelContainer, {
+                    children: originNode
+                });
             },
             children: /*#__PURE__*/ jsx(Button, {
                 onClick: refresh,
@@ -59,6 +129,36 @@ const DefaultPanelContainer = styled_components.div`
   border-radius: 8px;
   min-height: 100px;
   min-width: 200px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow:
+    0px 0px 4px 0px rgba(0, 0, 0, 0.02),
+    0px 6px 12px 0px rgba(47, 53, 64, 0.12);
+`;
+const MenuItemLabel = styled_components.div`
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  width: 100%;
+  .delete-btn {
+    opacity: 0;
+    visibility: hidden;
+    transition: opacity 0.2s ease;
+  }
+  &:hover .delete-btn {
+    opacity: 1;
+    visibility: visible;
+  }
+`;
+const MenuPanelContainer = styled_components.div`
+  max-height: 450px;
+  overflow: auto;
+  min-width: 200px;
+  background: #fff;
+  border: 1px solid rgba(5, 5, 5, 0.06);
+  border-radius: 8px;
   box-shadow:
     0px 0px 4px 0px rgba(0, 0, 0, 0.02),
     0px 6px 12px 0px rgba(47, 53, 64, 0.12);

package/dist/features/ListPage/hooks/useFloat.js

@@ -8,10 +8,11 @@ function useFloat() {
         const Component = store.floats.find((f)=>f.key === visibleFloat?.key)?.render;
         const props = {
             record: visibleFloat?.record,
-            onClose: ()=>{
+            onClose: (code)=>{
                 store.hideFloat();
-                if (visibleFloat?.onCloseCallback === true) store.refreshTable();
-                else visibleFloat?.onCloseCallback?.();
+                if (visibleFloat?.onCloseCallback === true) {
+                    if (-1 !== code) store.refreshTable();
+                } else visibleFloat?.onCloseCallback?.();
             },
             visible: true
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "listpage-next",
-  "version": "0.0.235",
+  "version": "0.0.236",
   "description": "A React component library for creating filter forms with Ant Design",
   "type": "module",
   "main": "./dist/index.js",