@ccs-ui/rc-pro 1.2.1-beta-5 → 2.0.1

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

@@ -58,13 +58,10 @@ export default function KeepAliveTabs(_ref) {
   // 菜单改变，更新用户权限信息
   useUpdateEffect(function () {
     components.current.forEach(function (component) {
-      var _menu$children;
       var menu = menus.find(function (m) {
-        return m.nodeData.menuUrl === component.key;
+        return m.menuUrl === component.key;
       });
-      component.urlAuthList = (menu === null || menu === void 0 || (_menu$children = menu.children) === null || _menu$children === void 0 ? void 0 : _menu$children.map(function (m) {
-        return m.nodeData.menuUrl;
-      })) || [];
+      component.urlAuthList = (menu === null || menu === void 0 ? void 0 : menu.urlAuthList) || [];
       component.timestamp = new Date().getTime();
     });
     update();
@@ -73,7 +70,7 @@ export default function KeepAliveTabs(_ref) {
   // 当前菜单
   var curMenu = useMemo(function () {
     var menu = menus.find(function (m) {
-      var menuUrl = m.nodeData.menuUrl;
+      var menuUrl = m.menuUrl;
       if (menuUrl.includes('?')) {
         return menuUrl.split('?')[0] === pathname;
       }
@@ -82,7 +79,7 @@ export default function KeepAliveTabs(_ref) {
 
     // add document title
     setTimeout(function () {
-      document.title = "".concat(appName, " - ").concat((menu === null || menu === void 0 ? void 0 : menu.nodeName) || (menu === null || menu === void 0 ? void 0 : menu.nodeData.menuUrl));
+      document.title = "".concat((menu === null || menu === void 0 ? void 0 : menu.menuName) || (menu === null || menu === void 0 ? void 0 : menu.menuUrl), " - ").concat(appName);
     }, 10);
 
     // save history route
@@ -116,7 +113,7 @@ export default function KeepAliveTabs(_ref) {
               }
               RouteHistorys.unshift({
                 pathName: pathname,
-                menuName: (menu === null || menu === void 0 ? void 0 : menu.nodeData.menuName) || '',
+                menuName: (menu === null || menu === void 0 ? void 0 : menu.menuName) || '',
                 time: new Date()
               });
               CcsUtils.setStroage('_ROUTE_HISTORY', RouteHistorys);
@@ -137,15 +134,14 @@ export default function KeepAliveTabs(_ref) {
     return c.key === pathname;
   });
   if (!component) {
-    var _curMenu$children;
-    var urlAuthList = (curMenu === null || curMenu === void 0 || (_curMenu$children = curMenu.children) === null || _curMenu$children === void 0 ? void 0 : _curMenu$children.map(function (m) {
-      return m.nodeData.menuUrl;
-    })) || [];
+    var _ref3 = curMenu || {},
+      _ref3$urlAuthList = _ref3.urlAuthList,
+      urlAuthList = _ref3$urlAuthList === void 0 ? [] : _ref3$urlAuthList;
     components.current = [].concat(_toConsumableArray(components.current), [{
       locationKey: locationKey,
       key: pathname,
       timestamp: new Date().getTime(),
-      label: curMenu ? curMenu.nodeName : '未知',
+      label: curMenu ? curMenu.menuName : '未知',
       outlet: curMenu ? outlet : /*#__PURE__*/_jsx(Empty, {
         description: "\u672A\u77E5\u9875\u9762"
       }),
@@ -224,11 +220,11 @@ export default function KeepAliveTabs(_ref) {
       },
       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;
+    }), components.current.map(function (_ref4) {
+      var key = _ref4.key,
+        urlAuthList = _ref4.urlAuthList,
+        timestamp = _ref4.timestamp,
+        outlet = _ref4.outlet;
       return /*#__PURE__*/_jsx(Page, {
         active: key === pathname,
         location: location,

package/es/layout-keep-alive/page.d.ts

@@ -9,6 +9,7 @@ export type CachePageProps = {
     timestamp: number;
     /** 按钮权限列表 */
     urlAuthList: string[];
+    /** children */
     children: ReactElement<any, string | JSXElementConstructor<any>> | null;
     /** 销毁页面 */
     onDestroy: (path: string) => void;

package/es/layout-single-page/index.d.ts

@@ -2,7 +2,7 @@ import CCS from "..";
 import './index.less';
 type PropsType = {
     appName: string;
-    menus: CCS.MenuTreeNode[];
+    menus: CCS.MenuType[];
     className?: string;
 };
 export default function SinglePage({ appName, menus, className, }: PropsType): import("react/jsx-runtime").JSX.Element;

package/es/layout-single-page/index.js

@@ -29,13 +29,10 @@ export default function SinglePage(_ref) {
   // 菜单改变，更新用户权限信息
   useUpdateEffect(function () {
     components.current.forEach(function (component) {
-      var _menu$children;
       var menu = menus.find(function (m) {
-        return m.nodeData.menuUrl === component.key;
+        return m.menuUrl === component.key;
       });
-      component.urlAuthList = (menu === null || menu === void 0 || (_menu$children = menu.children) === null || _menu$children === void 0 ? void 0 : _menu$children.map(function (m) {
-        return m.nodeData.menuUrl;
-      })) || [];
+      component.urlAuthList = (menu === null || menu === void 0 ? void 0 : menu.urlAuthList) || [];
       component.timestamp = new Date().getTime();
     });
     update();
@@ -43,9 +40,8 @@ export default function SinglePage(_ref) {
 
   // 当前菜单
   var menuInfo = useMemo(function () {
-    var _menu$children2;
-    var menu = menus.find(function (m) {
-      var menuUrl = m.nodeData.menuUrl;
+    var menu = menus.find(function (_ref2) {
+      var menuUrl = _ref2.menuUrl;
       if (menuUrl.includes('?')) {
         return menuUrl.split('?')[0] === pathname;
       }
@@ -55,23 +51,11 @@ export default function SinglePage(_ref) {
 
     // add document title
     setTimeout(function () {
-      document.title = "".concat(appName, " - ").concat((menu === null || menu === void 0 ? void 0 : menu.nodeName) || (menu === null || menu === void 0 ? void 0 : menu.nodeData.menuUrl));
+      document.title = "".concat((menu === null || menu === void 0 ? void 0 : menu.menuName) || (menu === null || menu === void 0 ? void 0 : menu.menuUrl), " - ").concat(appName);
     }, 10);
-    var breadcrumbs = [{
-      title: '首页',
-      href: '/'
-    }].concat(_toConsumableArray(menu.parents.map(function (m) {
-      return {
-        title: m.name
-      };
-    })), [{
-      title: menu.nodeData.menuName
-    }]);
     return {
-      auth: (menu === null || menu === void 0 || (_menu$children2 = menu.children) === null || _menu$children2 === void 0 ? void 0 : _menu$children2.map(function (btn) {
-        return btn.nodeData.menuUrl;
-      })) || [],
-      breadcrumbs: breadcrumbs,
+      auth: menu.urlAuthList || [],
+      breadcrumbs: menu.breadcrumb,
       menu: menu
     };
   }, [pathname, menus]);

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

@@ -1,17 +1,12 @@
 import { CardProps } from 'antd';
-import { CSSProperties, FC, ReactNode } from 'react';
+import { FC } from 'react';
+import { PropsWithCss, PropsWithNodeChildren } from '../ccs';
 import './index.less';
-type ClassProps = {
-    className?: string;
-    style?: CSSProperties;
-};
-type CcsProGridProps = ClassProps & {
+type CcsProGridProps = PropsWithCss & PropsWithNodeChildren & {
     gutter?: number;
-    children?: ReactNode;
 };
-type ColProps = CardProps & {
+type ColProps = CardProps & PropsWithNodeChildren & {
     colWidth?: number;
-    children?: ReactNode;
 };
 type GridInstance = FC<CcsProGridProps> & {
     Col: typeof GridCol;

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

@@ -1,11 +1,11 @@
 import { FormInstance } from 'antd/lib/form';
 import { ReactElement } from 'react';
+import { PropsWithElementChildren } from '../ccs';
 import { CcsProTableProps } from './table';
-type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formInitValues' | 'expandForm' | 'title' | 'formItemLabelWidth'> & {
+type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formInitValues' | 'expandForm' | 'title' | 'formItemLabelWidth'> & PropsWithElementChildren & {
     /** 更多查询条件 */
     hasMore?: boolean;
     form: FormInstance<any>;
-    children?: ReactElement;
     /** table 操作栏 */
     tableOperation: ReactElement;
     onSearch: () => void;

package/es/pro-table/index.less

@@ -37,12 +37,6 @@
     // margin: 10px;
     // background: #fff;
     position: relative;
-
-    &.tradition {
-      .ant-table-title {
-        border-radius: 0;
-      }
-    }
   }
 
   &-adaptation {
@@ -112,27 +106,6 @@
         margin-inline-end: 0;
       }
     }
-
-    &.tradition {
-      flex-wrap: wrap;
-
-      & > .ant-form-inline {
-        flex-wrap: wrap;
-        justify-content: flex-start;
-        gap: 10px;
-      }
-    }
-
-    &.vertical {
-      .ant-form-item-row {
-        flex-direction: row;
-        align-items: center;
-      }
-
-      .ant-form-item .ant-form-item-control {
-        width: auto;
-      }
-    }
   }
 
   .ant-form-item-control {

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

@@ -1,9 +1,9 @@
-import { ColProps, TableProps } from 'antd';
+import { TableProps } from 'antd';
 import { ColumnGroupType, ColumnType } from 'antd/es/table';
 import { TableSticky } from 'rc-table/lib/interface';
 import React, { CSSProperties, ReactElement, ReactNode } from 'react';
 import CCS from '..';
-import { HttpPageResult, TableColumns } from '../ccs';
+import { HttpPageResult, PropsWithCss, PropsWithNodeChildren, TableColumns } from '../ccs';
 import './index.less';
 type ParamType = Record<string, any>;
 export type ShowDependType = {
@@ -41,8 +41,7 @@ export type CcsTableProps<T> = Omit<TableProps<T>, 'columns' | 'title'> & {
     /** table title  */
     title?: ({ selectedRows, data, onClear }: TableTitleType<T>) => ReactNode;
 };
-type FormLayout = 'horizontal' | 'inline' | 'vertical' | 'adaptation';
-export type CcsProTableProps<RecordType> = {
+export type CcsProTableProps<RecordType> = Pick<PropsWithCss, 'className'> & PropsWithNodeChildren & {
     /** api权限标识 */
     auth?: string | 'ignore';
     /** 是否初始查询，默认true */
@@ -51,10 +50,6 @@ export type CcsProTableProps<RecordType> = {
     title?: string;
     /** 查询条件集合 */
     formItems?: CCS.TableFormItems;
-    /** @deprecated 查询条件布局模式，默认：horizontal */
-    formItemLayout?: FormLayout;
-    /** @deprecated 查询条件栅格配置，默认：{ xs: 24, sm: 12, md: 8, lg: 8, xl: 6 } */
-    formItemCol?: ColProps | ColProps[];
     /** form item label 宽度 */
     formItemLabelWidth?: number | string;
     /** 查询form 初始值 */
@@ -67,8 +62,11 @@ export type CcsProTableProps<RecordType> = {
     expandForm?: boolean;
     /** table 数据区域 */
     table?: CcsTableProps<RecordType>;
-    /** table style */
-    tableStyle?: CSSProperties;
+    /** 语义化styles */
+    styles?: {
+        root?: CSSProperties;
+        table?: CSSProperties;
+    };
     /** 父级值字段 */
     parentFieldName?: string;
     /** 水印文字 */
@@ -77,12 +75,6 @@ export type CcsProTableProps<RecordType> = {
     proRef?: CCS.TableInstanceRef<RecordType>;
     /** 显示序号 */
     showNumber?: boolean;
-    /** class */
-    className?: string;
-    /** style */
-    style?: CSSProperties;
-    /** children */
-    children?: ReactNode;
     /** 执行search 后回调函数 */
     searchEvent?: () => void;
     /** 请求前格式化参数 */

package/es/pro-table/table.js

@@ -25,10 +25,7 @@ import { getAllChildrenId, getDataById, onTableInModalOrDrawer, onTableInTabItem
 import HeadComponent from "./head";
 import "./index.less";
 import TableOperation from "./operation";
-import SearchComponent from "./search";
 import TableTree from "./tree";
-
-// 同 antd FormLayout; adaptation为自适应布局
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -47,15 +44,14 @@ var InternalProTable = function InternalProTable(props) {
   var init = props.init,
     auth = props.auth,
     table = props.table,
-    title = props.title,
-    style = props.style,
+    _props$styles = props.styles,
+    styles = _props$styles === void 0 ? {} : _props$styles,
     proRef = props.proRef,
     toolbar = props.toolbar,
     children = props.children,
     watermark = props.watermark,
     className = props.className,
     expandForm = props.expandForm,
-    tableStyle = props.tableStyle,
     searchEvent = props.searchEvent,
     toolbarExtra = props.toolbarExtra,
     _props$formItems = props.formItems,
@@ -507,7 +503,7 @@ var InternalProTable = function InternalProTable(props) {
     },
     children: toolbarExtra
   });
-  var rootStyle = style || {};
+  var rootStyle = styles.root || {};
   if (table !== null && table !== void 0 && table.bordered) {
     rootStyle = _objectSpread({
       border: "1px solid ".concat(token.colorBorderSecondary),
@@ -518,30 +514,7 @@ var InternalProTable = function InternalProTable(props) {
     className: classNames(classPrefix, className, _defineProperty({}, 'dark-table', isDark)),
     style: rootStyle,
     ref: containerRef,
-    children: [!(!formItems.length && !toolbar) && isAuth && props.formItemLayout !== 'adaptation' ? /*#__PURE__*/_jsx(SearchComponent, {
-      form: form,
-      title: title,
-      titleBordered: table === null || table === void 0 ? void 0 : table.bordered,
-      toolbar: newToolbar,
-      formItems: formItems,
-      expandForm: expandForm,
-      formInitValues: formInitValues,
-      formItemLabelWidth: props.formItemLabelWidth,
-      formItemLayout: props.formItemLayout,
-      formItemCol: props.formItemCol,
-      onSearch: _onSearch,
-      tableOperation: (table === null || table === void 0 ? void 0 : table.isEnableToolbar) !== false ? /*#__PURE__*/_jsx(TableOperation, {
-        tableRowSize: tableRowSize,
-        columns: columns,
-        tableRef: tableRef,
-        isInModalOrDrawer: isInModalOrDrawer,
-        onReset: _onReset,
-        onChangeRowSize: function onChangeRowSize(e) {
-          return setTableRowSize(e);
-        }
-      }) : /*#__PURE__*/_jsx(_Fragment, {}),
-      children: newToolbarExtra
-    }) : /*#__PURE__*/_jsx(HeadComponent, {
+    children: [!(!formItems.length && !toolbar) && isAuth && /*#__PURE__*/_jsx(HeadComponent, {
       form: form,
       toolbar: newToolbar,
       formItems: formItems,
@@ -561,8 +534,8 @@ var InternalProTable = function InternalProTable(props) {
       }) : /*#__PURE__*/_jsx(_Fragment, {}),
       children: newToolbarExtra
     }), /*#__PURE__*/_jsxs("div", {
-      className: "".concat(classPrefix, "-table-content ").concat(props.formItemLayout),
-      style: tableStyle,
+      className: "".concat(classPrefix, "-table-content"),
+      style: styles === null || styles === void 0 ? void 0 : styles.table,
       ref: tableContentRef,
       children: [renderTable(), children]
     })]

package/es/trigger/index.d.ts

@@ -1,7 +1,7 @@
 import { SizeType } from 'antd/es/config-provider/SizeContext';
-import { CSSProperties, ReactElement } from 'react';
+import { PropsWithCss, PropsWithElementChildren } from '../ccs';
 import './index.less';
-export type CcsTriggerProps = {
+export type CcsTriggerProps = PropsWithCss & PropsWithElementChildren & {
     /** 下拉框宽度 */
     width?: number;
     /** 下拉框高度 */
@@ -16,14 +16,8 @@ export type CcsTriggerProps = {
      * @default false
      */
     disabled?: boolean;
-    /** 选择内容 */
-    children?: ReactElement;
     /** Form.Item value */
     value?: any;
-    /** style */
-    style?: CSSProperties;
-    /** class */
-    className?: string;
     /** input placeholder */
     placeholder?: string;
     /**

package/es/upload/index.d.ts

@@ -1,7 +1,7 @@
 import { UploadProps } from 'antd';
 import { RecordType } from '../ccs';
 import { ImageUpload } from './upload-image';
-export type CcsUploadProps = Pick<UploadProps, 'maxCount' | 'data' | 'multiple' | 'accept' | 'action' | 'name' | 'headers'> & {
+export type CcsUploadProps = Pick<UploadProps, 'maxCount' | 'data' | 'multiple' | 'accept' | 'name' | 'headers'> & {
     maxFileSize?: number;
     uploadText?: string;
     onChange?: (value: any) => void;

package/es/virtual-list/index.d.ts

@@ -1,4 +1,5 @@
-import { CSSProperties, ReactNode, RefObject } from 'react';
+import { ReactNode, RefObject } from 'react';
+import { PropsWithCss } from '../ccs';
 type Position = {
     left: number;
     top: number;
@@ -10,7 +11,7 @@ export type RowRendererProps = {
 export type VirtualInstance = {
     scrollTop: (top: number) => void;
 };
-export type VirtualListProps = {
+export type VirtualListProps = PropsWithCss & {
     /** 容器高度 */
     height?: number;
     /** 记录条数 */
@@ -28,8 +29,6 @@ export type VirtualListProps = {
     rowCountChangeScrollTop?: boolean;
     /** instance */
     virtualRef?: RefObject<VirtualInstance>;
-    style?: CSSProperties;
-    className?: string;
     /** 渲染row */
     rowRenderer: ({ rowHeight, index }: RowRendererProps) => ReactNode;
     /** scroll event */

package/es/water-mark/index.d.ts

@@ -1,11 +1,8 @@
-import React, { ReactNode } from 'react';
-export type WaterMarkProps = {
+import React from 'react';
+import { PropsWithCss, PropsWithNodeChildren } from '../ccs';
+export type WaterMarkProps = PropsWithNodeChildren & PropsWithCss & {
     /** 水印文字内容 */
     content?: string;
-    /** 类名 */
-    className?: string;
-    /** 样式 */
-    style?: React.CSSProperties;
     /** 水印样式 */
     markStyle?: React.CSSProperties;
     /** 水印类名 */
@@ -55,10 +52,6 @@ export type WaterMarkProps = {
      * @default 16
      */
     fontSize?: number | string;
-    /**
-     * 组件 children
-     */
-    children?: ReactNode;
 };
 /**
  * 水印组件

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.2.1-beta-5",
-  "description": "验证码组件兼容暗黑模式;proTable封装rowselection代码;proTable添加自适应布局模式;CcsDialog不适应contextHolder也能打开;移除utils,独立存在@ccs-ui/utils;添加属性isEnableToolbar;table可以隐藏toolbar; CcsDialog 添加异步关闭确认方法;",
+  "version": "2.0.1",
+  "description": "",
   "license": "MIT",
   "author": {
-    "name": "Hong",
-    "url": "https://xz7.gitee.io/rc-pro"
+    "name": "Hong"
   },
   "module": "es/index.js",
   "types": "es/index.d.ts",
@@ -93,7 +92,7 @@
     "@types/shortid": "^0.0.29",
     "@umijs/lint": "^4.0.0",
     "ahooks": "^3.7.7",
-    "antd": "^5.20.0",
+    "antd": "^5.22.7",
     "classnames": "^2.3.2",
     "cross-env": "^7.0.3",
     "dayjs": "^1.11.7",
@@ -120,7 +119,7 @@
     "@ant-design/icons": "^5.1.4",
     "@ccs-ui/utils": "^0.0.2",
     "ahooks": "^3.7.7",
-    "antd": "^5.20.0",
+    "antd": "^5.22.0",
     "classnames": "^2.3.2",
     "dayjs": "^1.11.7",
     "rc-menu": "^9.15.1",

package/es/hooks/use-global.d.ts

@@ -1,4 +0,0 @@
-declare const useGlobal: () => {
-    userDetail: import("../ccs").UserDetail;
-};
-export default useGlobal;

package/es/hooks/use-global.js

@@ -1,10 +0,0 @@
-import { useContext } from 'react';
-import { GlobalContext } from "../context";
-var useGlobal = function useGlobal() {
-  var context = useContext(GlobalContext);
-  if (context === undefined) {
-    throw new Error('GlobalContext not found');
-  }
-  return context;
-};
-export default useGlobal;

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

@@ -1,17 +0,0 @@
-import { FormInstance } from 'antd/lib/form';
-import { ReactElement } from 'react';
-import { CcsProTableProps } from './table';
-type PropsType<T> = Pick<CcsProTableProps<T>, 'toolbar' | 'formItems' | 'formInitValues' | 'expandForm' | 'formItemLabelWidth' | 'formItemLayout' | 'formItemCol' | 'title'> & {
-    /** 更多查询条件 */
-    hasMore?: boolean;
-    /** 标题边框 */
-    titleBordered?: boolean;
-    form: FormInstance<any>;
-    children?: ReactElement;
-    /** table 操作栏 */
-    tableOperation: ReactElement;
-    onSearch: () => void;
-};
-/** 操作按钮、查询，重置、列筛选、 */
-declare function SearchComponent<T>(props: PropsType<T>): import("react/jsx-runtime").JSX.Element;
-export default SearchComponent;