@ccs-ui/rc-pro 1.1.0 → 1.1.1-rc10

package/es/dialog/button.js

@@ -6,21 +6,26 @@ 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 { CcsAuth } from "./..";
 import { Button, Form } from 'antd';
-import React, { useEffect } from 'react';
+import { useEffect } from 'react';
 import CcsDialog from '.';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 export default function CcsDialogButtons(_ref) {
   var okText = _ref.okText,
     okAuth = _ref.okAuth,
     loading = _ref.loading,
     children = _ref.children,
+    hideCancel = _ref.hideCancel,
+    cancelText = _ref.cancelText,
     onOk = _ref.onOk;
-  var _CcsDialog$useContext = CcsDialog.useContext(),
-    closeDialog = _CcsDialog$useContext.closeDialog,
-    onHasButtons = _CcsDialog$useContext.onHasButtons,
-    formInitialValues = _CcsDialog$useContext.formInitialValues;
+  var _CcsDialog$useInstanc = CcsDialog.useInstance(),
+    closeDialog = _CcsDialog$useInstanc.closeDialog,
+    onHasModalButtons = _CcsDialog$useInstanc.onHasModalButtons,
+    formInitialValues = _CcsDialog$useInstanc.formInitialValues;
   var form = Form.useFormInstance();
   useEffect(function () {
-    onHasButtons();
+    if (onHasModalButtons) onHasModalButtons();
   }, []);
   var onOkClick = function onOkClick() {
     if (!onOk) return;
@@ -34,14 +39,21 @@ export default function CcsDialogButtons(_ref) {
     }
     onOk();
   };
-  return onOk ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
-    className: "ccs-dialog-buttons"
-  }, /*#__PURE__*/React.createElement(Button, {
-    onClick: closeDialog
-  }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement(CcsAuth.Button, {
-    auth: okAuth || '',
-    type: "primary",
-    loading: loading,
-    onClick: onOkClick
-  }, okText || '确定'), children)) : null;
+  return onOk || children ? /*#__PURE__*/_jsx(_Fragment, {
+    children: /*#__PURE__*/_jsxs("div", {
+      className: "ccs-dialog-buttons",
+      children: [children, onOk && /*#__PURE__*/_jsxs(_Fragment, {
+        children: [!hideCancel && /*#__PURE__*/_jsx(Button, {
+          onClick: closeDialog,
+          children: cancelText || '取消'
+        }), /*#__PURE__*/_jsx(CcsAuth.Button, {
+          auth: okAuth || '',
+          type: "primary",
+          loading: loading,
+          onClick: onOkClick,
+          children: okText || '确定'
+        })]
+      })]
+    })
+  }) : null;
 }

package/es/dialog/context.d.ts

@@ -1,11 +1,12 @@
 import { Store } from 'antd/es/form/interface';
 import React from 'react';
-interface ContentContextType<T = Store> {
-    locationKey: string;
+export interface DialogContextType<T = Store> {
+    /** 表单初始值 */
     formInitialValues: T;
-    closeDialog: () => void;
-    onHasButtons: () => void;
+    /** 关闭弹框，可以设置返回值 */
+    closeDialog: (e?: any) => void;
+    onHasModalButtons?: () => void;
 }
-declare const ModalContentContext: React.Context<ContentContextType<any>>;
-declare const useDialogContext: <T = Store>() => ContentContextType<T>;
-export { useDialogContext, ModalContentContext };
+declare const DialogContentContext: React.Context<DialogContextType<any>>;
+declare const useDialogContext: <T = Store>() => DialogContextType<T>;
+export { useDialogContext, DialogContentContext };

package/es/dialog/context.js

@@ -1,10 +1,10 @@
 import React, { useContext } from 'react';
-var ModalContentContext = /*#__PURE__*/React.createContext({});
+var DialogContentContext = /*#__PURE__*/React.createContext({});
 var useDialogContext = function useDialogContext() {
-  var context = useContext(ModalContentContext);
+  var context = useContext(DialogContentContext);
   if (context === undefined) {
-    throw new Error('ModalContentContext not found');
+    throw new Error('DialogContentContext not found');
   }
   return context;
 };
-export { useDialogContext, ModalContentContext };
+export { useDialogContext, DialogContentContext };

package/es/dialog/form.d.ts

@@ -3,11 +3,11 @@ import { CSSProperties, ReactNode } from 'react';
 interface PropsType {
     children: ReactNode;
     formProps: FormProps;
-    bodyStyle?: CSSProperties;
+    styles?: CSSProperties;
 }
 /**
  * 添加form实例
  * @returns
  */
-export default function DialogForm({ children, bodyStyle, formProps: { labelCol, wrapperCol, ...restProps }, }: PropsType): import("react/jsx-runtime").JSX.Element;
+export default function DialogForm({ children, styles, formProps: { labelCol, wrapperCol, ...restProps }, }: PropsType): import("react/jsx-runtime").JSX.Element;
 export {};

package/es/dialog/form.js

@@ -21,7 +21,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
  */
 export default function DialogForm(_ref) {
   var children = _ref.children,
-    bodyStyle = _ref.bodyStyle,
+    styles = _ref.styles,
     _ref$formProps = _ref.formProps,
     labelCol = _ref$formProps.labelCol,
     wrapperCol = _ref$formProps.wrapperCol,
@@ -36,12 +36,13 @@ export default function DialogForm(_ref) {
     },
     wrapperCol: wrapperCol || {
       span: 14
-    }
+    },
+    preserve: false
   }, restProps), {}, {
     style: _objectSpread(_objectSpread({
       height: '100%',
       overflow: 'auto'
-    }, bodyStyle), restProps.style),
+    }, styles), restProps.style),
     children: children
   }));
 }

package/es/dialog/{dialog.d.ts → hook.d.ts}

@@ -23,12 +23,20 @@ export type CcsDialogModalProps = ModalFuncProps & {
     form?: FormProps;
     /** 关闭后销毁组件，默认true */
     destroyOnClose?: boolean;
+    /** 通过closeDialog方法关闭dialog */
+    afterCloseByOk?: (e: any) => void;
+    /** 通过点击关闭按钮或取消按钮关闭 */
+    afterCloseByCancel?: (e: any) => void;
 };
-export type CcsDialogDrawerProps = DrawerProps & {
+export type CcsDialogDrawerProps = Omit<DrawerProps, 'extra'> & {
     /** antd form */
     form?: FormProps;
     /** 抽屉内容 */
     content?: ReactNode;
+    /** 通过closeDialog方法关闭dialog */
+    afterCloseByOk?: (e: any) => void;
+    /** 通过点击关闭按钮或取消按钮关闭 */
+    afterCloseByCancel?: (e: any) => void;
 };
 export type ModalDialog = (...args: Parameters<ModalFunc>) => ReturnType<ModalFunc>;
 export type DrawerDialog = (...args: Parameters<ModalFunc>) => ReturnType<DrawerFunc>;

package/es/dialog/{dialog.js → hook.js}

@@ -16,7 +16,8 @@ import HookModal from "./HookModal";
 import usePatchElement from "./usePatchElement";
 
 // Add `then` field for `ModalFunc` return instance.
-
+import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 var ElementsHolder = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (_props, ref) {
   var _usePatchElement = usePatchElement(),
     _usePatchElement2 = _slicedToArray(_usePatchElement, 2),
@@ -28,7 +29,9 @@ var ElementsHolder = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(func
     };
   }, []);
   // eslint-disable-next-line react/jsx-no-useless-fragment
-  return /*#__PURE__*/React.createElement(React.Fragment, null, elements);
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: elements
+  });
 }));
 var modalUuid = 0;
 var drawerUuid = 0;
@@ -53,15 +56,14 @@ export default function useCcsDialog() {
     modalUuid += 1;
     var modalRef = /*#__PURE__*/React.createRef();
     var closeFunc;
-    var modal = /*#__PURE__*/React.createElement(HookModal, {
-      key: "modal-".concat(modalUuid),
+    var modal = /*#__PURE__*/_jsx(HookModal, {
       config: config,
       afterClose: function afterClose() {
         var _closeFunc;
         (_closeFunc = closeFunc) === null || _closeFunc === void 0 ? void 0 : _closeFunc();
       },
       ref: modalRef
-    });
+    }, "modal-".concat(modalUuid));
     closeFunc = (_holderRef$current = holderRef.current) === null || _holderRef$current === void 0 ? void 0 : _holderRef$current.patchElement(modal);
     if (closeFunc) {
       destroyFns.push(closeFunc);
@@ -101,15 +103,14 @@ export default function useCcsDialog() {
     drawerUuid += 1;
     var modalRef = /*#__PURE__*/React.createRef();
     var closeFunc;
-    var modal = /*#__PURE__*/React.createElement(HookDrawer, {
-      key: "drawer-".concat(drawerUuid),
+    var modal = /*#__PURE__*/_jsx(HookDrawer, {
       config: config,
       afterClose: function afterClose() {
         var _closeFunc2;
         (_closeFunc2 = closeFunc) === null || _closeFunc2 === void 0 ? void 0 : _closeFunc2();
       },
       ref: modalRef
-    });
+    }, "drawer-".concat(drawerUuid));
     closeFunc = (_holderRef$current2 = holderRef.current) === null || _holderRef$current2 === void 0 ? void 0 : _holderRef$current2.patchElement(modal);
     if (closeFunc) {
       destroyFns.push(closeFunc);
@@ -159,9 +160,8 @@ export default function useCcsDialog() {
   return {
     openDrawer: fns.openDrawer,
     openModal: fns.openModal,
-    contextHolder: /*#__PURE__*/React.createElement(ElementsHolder, {
-      key: "modal-holder",
+    contextHolder: /*#__PURE__*/_jsx(ElementsHolder, {
       ref: holderRef
-    })
+    }, "modal-holder")
   };
 }

package/es/dialog/index.d.ts

@@ -1,11 +1,11 @@
 import CcsDialogButtons from './button';
 import { useDialogContext } from './context';
-import useCcsDialog from './dialog';
+import useCcsDialog from './hook';
 import './index.less';
-interface ModalInterface {
+interface DialogInterface {
     Buttons: typeof CcsDialogButtons;
     useDialog: typeof useCcsDialog;
-    useContext: typeof useDialogContext;
+    useInstance: typeof useDialogContext;
 }
-declare const CcsDialog: ModalInterface;
+declare const CcsDialog: DialogInterface;
 export default CcsDialog;

package/es/dialog/index.js

@@ -1,9 +1,9 @@
 import CcsDialogButtons from "./button";
 import { useDialogContext } from "./context";
-import useCcsDialog from "./dialog";
+import useCcsDialog from "./hook";
 import "./index.less";
 var CcsDialog = {};
 CcsDialog.Buttons = CcsDialogButtons;
 CcsDialog.useDialog = useCcsDialog;
-CcsDialog.useContext = useDialogContext;
+CcsDialog.useInstance = useDialogContext;
 export default CcsDialog;

package/es/dialog/index.less

@@ -1,28 +1,25 @@
-.ccs-dialog {
-  &-buttons {
-    position: absolute;
-    bottom: 0;
-    right: 0;
-    z-index: 1;
+.ccs-dialog-buttons {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  z-index: 1;
 
-    .ant-btn + .ant-btn:not(.ant-dropdown-trigger) {
-      margin-bottom: 0;
-      margin-left: 8px;
-    }
+  .ant-btn + .ant-btn:not(.ant-dropdown-trigger) {
+    margin-bottom: 0;
+    margin-left: 8px;
   }
 }
 
 .ccs-dialog-drawer {
   .ccs-dialog-buttons {
-    height: 80px;
-    line-height: 79px;
-    background-color: #fff;
-    border-top: 1px solid rgba(5, 5, 5, 6%);
-    width: 100%;
-    text-align: center;
+    right: 16px;
+    top: 0;
+    bottom: auto;
+    height: 57px;
+    line-height: 56px;
   }
 
   .ant-drawer-header {
-    padding: 10px;
+    padding: 16px;
   }
 }

package/es/index.d.ts

@@ -1,5 +1,5 @@
-import { MenuProps } from 'antd';
-import { ConfigProviderProps } from 'antd/lib/config-provider';
+import { MenuProps, ThemeConfig } from 'antd';
+type ReactText = 'string' | 'number';
 interface MenuTreeNodeData {
     buttonUrlId: number;
     createTime: string;
@@ -37,11 +37,16 @@ interface CcsUserDetailType {
     /** 用户名 */
     workerName: string;
 }
+type ThemeType = ThemeConfig & {
+    token: {
+        isDark?: boolean;
+    };
+};
 export interface CcsGlobalConfigType {
     /** app名称 */
     AppName: string;
-    /** 主题色 */
-    BrandPrimary: string;
+    /** 主题 */
+    AppTheme: 'default' | 'dark';
     /** 菜单展开宽度 */
     MenuExpandWidth: number;
     /** 菜单收起宽度 */
@@ -51,7 +56,7 @@ export interface CcsGlobalConfigType {
     /** 启用按钮权限 */
     IsAuthButton: boolean;
     /** ant 主题 */
-    theme: ConfigProviderProps['theme'];
+    theme: ThemeType;
     /** 菜单类型，现在支持垂直、水平、和内嵌模式三种 */
     MenuExpandMode: MenuProps['mode'];
     /** 菜单始终收起状态？ */
@@ -135,7 +140,6 @@ export { default as CcsColorPicker } from './color-picker';
 export { default as CcsConfigProvider } from './config';
 export { default as CcsDatePicker } from './date-picker';
 export { default as CcsDialog } from './dialog';
-export { default as CcsDrawer } from './drawer';
 export { default as CcsFullScreenButton } from './full-screen';
 export { default as useCcsGlobal } from './hooks/use-global';
 export { default as useCcsOnceEvent } from './hooks/use-once-event';
@@ -145,7 +149,6 @@ export { default as useCcsWindow } from './hooks/use-window';
 export { default as CcsIntervalButton } from './interval-button';
 export { default as CcsKeepAliveTabs } from './keep-alive-tabs';
 export { default as CcsLoading } from './loading';
-export { default as CcsModal } from './modal';
 export { default as CcsProGrid } from './pro-grid';
 export { default as CcsProTable } from './pro-table';
 export { default as CcsProTabs } from './pro-tabs';
@@ -158,4 +161,4 @@ export { default as CcsUpload } from './upload';
 export { default as CcsUtils } from './utils';
 export { default as CcsVirtualList } from './virtual-list';
 export { default as CcsWaterMark } from './water-mark';
-export type { PageType, HttpResult, RecordType, MenuTreeNode, PageQueryType, TableDataType, ListQueryType, HttpListResult, HttpPageResult, MenuTreeNodeData, CcsUserDetailType, RouteHistoryType, };
+export type { PageType, ReactText, HttpResult, RecordType, MenuTreeNode, PageQueryType, TableDataType, ListQueryType, HttpListResult, HttpPageResult, MenuTreeNodeData, CcsUserDetailType, RouteHistoryType, };

package/es/index.js

@@ -7,7 +7,6 @@ export { default as CcsColorPicker } from "./color-picker";
 export { default as CcsConfigProvider } from "./config";
 export { default as CcsDatePicker } from "./date-picker";
 export { default as CcsDialog } from "./dialog";
-export { default as CcsDrawer } from "./drawer";
 export { default as CcsFullScreenButton } from "./full-screen";
 export { default as useCcsGlobal } from "./hooks/use-global";
 export { default as useCcsOnceEvent } from "./hooks/use-once-event";
@@ -17,7 +16,6 @@ export { default as useCcsWindow } from "./hooks/use-window";
 export { default as CcsIntervalButton } from "./interval-button";
 export { default as CcsKeepAliveTabs } from "./keep-alive-tabs";
 export { default as CcsLoading } from "./loading";
-export { default as CcsModal } from "./modal";
 export { default as CcsProGrid } from "./pro-grid";
 export { default as CcsProTable } from "./pro-table";
 export { default as CcsProTabs } from "./pro-tabs";

package/es/keep-alive-tabs/index.d.ts

@@ -1,4 +1,4 @@
-import { MenuTreeNode } from '../types';
+import { MenuTreeNode } from '../';
 import './index.less';
 interface PropsType {
     maxLen?: number;

package/es/keep-alive-tabs/index.js

@@ -14,12 +14,14 @@ import { Button, Dropdown, Empty, Tabs } from 'antd';
 import classnames from 'classnames';
 import _debounce from 'lodash/debounce';
 import ResizeObserver from 'rc-resize-observer';
-import React, { useEffect, useMemo, useRef } from 'react';
+import { useEffect, useMemo, useRef } from 'react';
 import { useLocation } from 'react-router';
 import { useOutlet } from 'react-router-dom';
 import { CCS, CcsUtils } from "../";
 import "./index.less";
 import Page from "./page";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var extraItems = [{
   key: '1',
   label: '关闭其他标签'
@@ -141,7 +143,7 @@ export default (function (_ref) {
       key: pathname,
       timestamp: new Date().getTime(),
       label: curMenu ? curMenu.nodeName : '未知',
-      outlet: curMenu ? outlet : /*#__PURE__*/React.createElement(Empty, {
+      outlet: curMenu ? outlet : /*#__PURE__*/_jsx(Empty, {
         description: "\u672A\u77E5\u9875\u9762"
       }),
       urlAuthList: urlAuthList
@@ -192,18 +194,19 @@ export default (function (_ref) {
       history.push('/');
     }
   };
-  var tabBarExtraContent = /*#__PURE__*/React.createElement(Dropdown, {
+  var tabBarExtraContent = /*#__PURE__*/_jsx(Dropdown, {
     menu: {
       items: extraItems,
       onClick: function onClick(e) {
         onCloseTab(e.key);
       }
     },
-    placement: "bottomRight"
-  }, /*#__PURE__*/React.createElement(Button, {
-    icon: /*#__PURE__*/React.createElement(MoreOutlined, null),
-    type: "text"
-  }));
+    placement: "bottomRight",
+    children: /*#__PURE__*/_jsx(Button, {
+      icon: /*#__PURE__*/_jsx(MoreOutlined, {}),
+      type: "text"
+    })
+  });
   var tabRef = useRef();
   var resizeFn = _debounce(function (width) {
     if (tabRef.current) tabRef.current.style.maxWidth = "".concat(width, "px");
@@ -214,37 +217,39 @@ export default (function (_ref) {
   var onResize = function onResize(size) {
     resizeFn(size.width);
   };
-  return /*#__PURE__*/React.createElement("div", {
-    className: classnames(className, "".concat(classPrefix, "-keep-alive"))
-  }, /*#__PURE__*/React.createElement(ResizeObserver, {
-    onResize: onResize
-  }, /*#__PURE__*/React.createElement("div", null)), /*#__PURE__*/React.createElement(Tabs, {
-    id: "keep-alive-tabs",
-    hideAdd: true,
-    size: "small",
-    onChange: function onChange(e) {
-      history.push(e);
-    },
-    className: "".concat(classPrefix, "-keep-alive-tabs"),
-    activeKey: pathname,
-    type: "editable-card",
-    onEdit: function onEdit(e) {
-      return onDestroy(e);
-    },
-    items: components.current,
-    tabBarExtraContent: components.current.length > 2 ? tabBarExtraContent : null
-  }), components.current.map(function (_ref3) {
-    var key = _ref3.key,
-      urlAuthList = _ref3.urlAuthList,
-      timestamp = _ref3.timestamp,
-      outlet = _ref3.outlet;
-    return /*#__PURE__*/React.createElement(Page, {
-      key: key,
-      active: key === pathname,
-      location: location,
-      onDestroy: onDestroy,
-      urlAuthList: urlAuthList,
-      timestamp: timestamp
-    }, outlet);
-  }));
+  return /*#__PURE__*/_jsxs("div", {
+    className: classnames(className, "".concat(classPrefix, "-keep-alive")),
+    children: [/*#__PURE__*/_jsx(ResizeObserver, {
+      onResize: onResize,
+      children: /*#__PURE__*/_jsx("div", {})
+    }), /*#__PURE__*/_jsx(Tabs, {
+      id: "keep-alive-tabs",
+      hideAdd: true,
+      size: "small",
+      onChange: function onChange(e) {
+        history.push(e);
+      },
+      className: "".concat(classPrefix, "-keep-alive-tabs"),
+      activeKey: pathname,
+      type: "editable-card",
+      onEdit: function onEdit(e) {
+        return onDestroy(e);
+      },
+      items: components.current,
+      tabBarExtraContent: components.current.length > 2 ? tabBarExtraContent : null
+    }), components.current.map(function (_ref3) {
+      var key = _ref3.key,
+        urlAuthList = _ref3.urlAuthList,
+        timestamp = _ref3.timestamp,
+        outlet = _ref3.outlet;
+      return /*#__PURE__*/_jsx(Page, {
+        active: key === pathname,
+        location: location,
+        onDestroy: onDestroy,
+        urlAuthList: urlAuthList,
+        timestamp: timestamp,
+        children: outlet
+      }, key);
+    })]
+  });
 });

package/es/keep-alive-tabs/index.less

@@ -1,11 +1,11 @@
 .ccs-keep-alive {
   flex: 1 1 auto;
-  background: #f0f2f5;
+  // background: #f0f2f5;
   display: flex;
   flex-direction: column;
 
   &-tabs {
-    background: rgb(240 242 245);
+    // background: rgb(240 242 245);
 
     & > .ant-tabs-nav {
       margin: 0;

package/es/pro-table/index.d.ts

@@ -1,6 +1,7 @@
 import { TableProps } from 'antd';
 import { Rule } from 'antd/es/form';
-import React, { CSSProperties, MutableRefObject, ReactElement, ReactNode, ReactText } from 'react';
+import React, { CSSProperties, MutableRefObject, ReactElement, ReactNode } from 'react';
+import { ReactText } from '..';
 import './index.less';
 type ParamType = Record<string, any>;
 export type ShowDependType = {
@@ -73,14 +74,13 @@ export interface CcsTableProps<T> extends TableProps<T> {
     className?: string;
     /** useEventEmitter事件 */
     event$?: any;
+    /** style */
     style?: CSSProperties;
 }
 export type ProTableInstanceRef<T = any> = MutableRefObject<ProTableInstance<T> | undefined> | React.RefObject<ProTableInstance<T>>;
 export interface CcsProTableProps<T> {
     /** api权限标识 */
     auth?: string | 'ignore';
-    /** 标题 */
-    title?: string;
     /** 是否初始查询，默认true */
     init?: boolean;
     /** loading */