@ccs-ui/rc-pro 1.2.1-beta-4 → 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/result/index.js

@@ -19,7 +19,9 @@ function Basic(_ref) {
     token = _theme$useToken.token;
   return /*#__PURE__*/_jsxs("div", {
     style: _objectSpread({
-      textAlign: 'center',
+      display: 'flex',
+      flexDirection: 'column',
+      alignItems: 'center',
       padding: 16
     }, style),
     children: [/*#__PURE__*/_jsx("img", {

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,12 +1,13 @@
 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'> & {
-    tokenKey?: string;
+export type CcsUploadProps = Pick<UploadProps, 'maxCount' | 'data' | 'multiple' | 'accept' | 'name' | 'headers'> & {
     maxFileSize?: number;
     uploadText?: string;
     onChange?: (value: any) => void;
+    uploadRequest: <T = any>(file: File, options?: RecordType) => Promise<T>;
 };
-declare function CcsUpload({ tokenKey, uploadText, maxCount, maxFileSize, onChange, ...otherProps }: CcsUploadProps): import("react/jsx-runtime").JSX.Element;
+declare function CcsUpload({ uploadText, maxCount, maxFileSize, uploadRequest, onChange, ...otherProps }: CcsUploadProps): import("react/jsx-runtime").JSX.Element;
 declare namespace CcsUpload {
     var Image: typeof ImageUpload;
 }

package/es/upload/index.js

@@ -1,10 +1,13 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["tokenKey", "uploadText", "maxCount", "maxFileSize", "onChange"];
+var _excluded = ["uploadText", "maxCount", "maxFileSize", "uploadRequest", "onChange"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
+function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -19,12 +22,12 @@ import { useState } from 'react';
 import { ImageUpload } from "./upload-image";
 import { jsx as _jsx } from "react/jsx-runtime";
 function CcsUpload(_ref) {
-  var tokenKey = _ref.tokenKey,
-    uploadText = _ref.uploadText,
+  var uploadText = _ref.uploadText,
     _ref$maxCount = _ref.maxCount,
     maxCount = _ref$maxCount === void 0 ? 1 : _ref$maxCount,
     _ref$maxFileSize = _ref.maxFileSize,
     maxFileSize = _ref$maxFileSize === void 0 ? 10 : _ref$maxFileSize,
+    uploadRequest = _ref.uploadRequest,
     onChange = _ref.onChange,
     otherProps = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState([]),
@@ -33,8 +36,14 @@ function CcsUpload(_ref) {
     setFiles = _useState2[1];
   var handleOnChange = function handleOnChange(_ref2) {
     var fileList = _ref2.fileList;
+    console.log('fileList', fileList);
     setFiles(fileList);
     if (!onChange) return;
+
+    // 文件上传中，不更新结果
+    if (fileList.find(function (f) {
+      return f.status === 'uploading';
+    })) return;
     if (maxFileSize === 1) {
       var _fileList$;
       // 只能上传一个文件
@@ -58,13 +67,42 @@ function CcsUpload(_ref) {
     }
     return isLt2M;
   };
-  var uploadProps = {
-    name: 'fileName',
-    headers: {
-      token: tokenKey ? sessionStorage.getItem(tokenKey) : ''
-    }
-  };
-  return /*#__PURE__*/_jsx(Upload, _objectSpread(_objectSpread(_objectSpread({}, uploadProps), {}, {
+  var onCustomRequest = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
+      var file, onSuccess, onError, result;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            file = _ref3.file, onSuccess = _ref3.onSuccess, onError = _ref3.onError;
+            _context.next = 3;
+            return uploadRequest(file);
+          case 3:
+            result = _context.sent;
+            // 上传成功
+            if (result.success && onSuccess) {
+              onSuccess(result);
+            }
+            // 上传失败
+            if (!result.success && onError) {
+              onError({
+                status: 500,
+                name: '出错了',
+                message: result.msg || '上传失败'
+              });
+            }
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onCustomRequest(_x) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  return /*#__PURE__*/_jsx(Upload, _objectSpread(_objectSpread({
+    customRequest: onCustomRequest,
+    name: "fileName",
     onChange: handleOnChange,
     beforeUpload: beforeUpload,
     fileList: files,

package/es/upload/upload-image.d.ts

@@ -3,5 +3,5 @@ type CcsImageUploadProps = CcsUploadProps & {
     crop?: boolean;
     tokenKey?: string;
 };
-export declare function ImageUpload({ crop, tokenKey, uploadText, maxCount, maxFileSize, onChange, ...otherProps }: CcsImageUploadProps): import("react/jsx-runtime").JSX.Element;
+export declare function ImageUpload({ uploadText, maxCount, maxFileSize, crop, uploadRequest, onChange, ...otherProps }: CcsImageUploadProps): import("react/jsx-runtime").JSX.Element;
 export {};