@ccs-ui/rc-pro 2.5.1-beta.4 → 2.5.2

package/es/atom/filter.js

@@ -2,11 +2,14 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 var _excluded = ["onFormat"];
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+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 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 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); }
@@ -71,33 +74,48 @@ function AtomFilter(props, ref) {
   }, [hasMore]);
 
   // 构建查询条件:表单数据、请求额外参数、分页参数、其他参数
-  var getFormValues = function getFormValues() {
-    // 表单值
-    var formValues = form.getFieldsValue();
+  var getFormValues = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var formValues, _delField;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return form.validateFields();
+          case 2:
+            formValues = _context.sent;
+            // 删除无意义字段
+            if (formValues) {
+              _delField = Object.keys(formValues).filter(function (k) {
+                return k.startsWith('_') && k.endsWith('_');
+              });
+              if (_delField.length > 0) {
+                _delField.forEach(function (d) {
+                  return delete formValues[d];
+                });
+              }
+            }
 
-    // 删除无意义字段
-    if (formValues) {
-      var _delField = Object.keys(formValues).filter(function (k) {
-        return k.startsWith('_') && k.endsWith('_');
-      });
-      if (_delField.length > 0) {
-        _delField.forEach(function (d) {
-          return delete formValues[d];
-        });
-      }
-    }
-
-    // 格式化条件，格式化结果数据
-    Object.keys(formValues).forEach(function (k) {
-      if (formValues[k] !== undefined) {
-        var s = formItems.find(function (f) {
-          return f.name === k;
-        });
-        if (s !== null && s !== void 0 && s.onFormat) formValues[k] = s.onFormat(formValues[k]);
-      }
-    });
-    return _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues);
-  };
+            // 格式化条件，格式化结果数据
+            Object.keys(formValues).forEach(function (k) {
+              if (formValues[k] !== undefined) {
+                var s = formItems.find(function (f) {
+                  return f.name === k;
+                });
+                if (s !== null && s !== void 0 && s.onFormat) formValues[k] = s.onFormat(formValues[k]);
+              }
+            });
+            return _context.abrupt("return", _objectSpread(_objectSpread(_objectSpread({}, requestParam), formInitValues), formValues));
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getFormValues() {
+      return _ref.apply(this, arguments);
+    };
+  }();
   useImperativeHandle(ref, function () {
     return {
       getFormValues: getFormValues,
@@ -196,9 +214,9 @@ function AtomFilter(props, ref) {
             ref: formItemsRef,
             children: [
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            formItems.map(function (_ref) {
-              var onFormat = _ref.onFormat,
-                item = _objectWithoutProperties(_ref, _excluded);
+            formItems.map(function (_ref2) {
+              var onFormat = _ref2.onFormat,
+                item = _objectWithoutProperties(_ref2, _excluded);
               return /*#__PURE__*/_jsx(CcsForm.Item, _objectSpread(_objectSpread(_objectSpread({}, item), formItemLabelWidth ? {
                 label: /*#__PURE__*/_jsx("div", {
                   style: {

package/es/atom/operation.js

@@ -44,7 +44,7 @@ function AtomOperation(props) {
           activeKey: size,
           items: [{
             key: 'large',
-            label: '默认'
+            label: '大号'
           }, {
             key: 'middle',
             label: '中等'

package/es/atom/usePageRequest.js

@@ -103,21 +103,22 @@ export default function usePageRequest(_ref) {
             pageSize = _args.length > 2 && _args[2] !== undefined ? _args[2] : (pagination ? pagination.defaultPageSize : 10) || 10;
             record = _args.length > 3 ? _args[3] : undefined;
             if (!(!isAuth || !httpRequest)) {
-              _context.next = 5;
+              _context.next = 6;
               break;
             }
+            onEvent === null || onEvent === void 0 || onEvent(eventType);
             return _context.abrupt("return");
-          case 5:
-            _context.next = 7;
+          case 6:
+            _context.next = 8;
             return getFormValues === null || getFormValues === void 0 ? void 0 : getFormValues();
-          case 7:
+          case 8:
             _context.t0 = _context.sent;
             if (_context.t0) {
-              _context.next = 10;
+              _context.next = 11;
               break;
             }
             _context.t0 = {};
-          case 10:
+          case 11:
             filterValues = _context.t0;
             // 接口字段指定
             fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), fieldNamesParams); // 请求字段
@@ -145,12 +146,12 @@ export default function usePageRequest(_ref) {
 
             // 异步树
             if (!onRequestCustom) {
-              _context.next = 22;
+              _context.next = 23;
               break;
             }
             onRequestCustom(eventType, params.query || params, record);
             return _context.abrupt("return");
-          case 22:
+          case 23:
             // 事件回调，请求中
             onEvent === null || onEvent === void 0 || onEvent(eventType, {
               loading: true,
@@ -163,9 +164,9 @@ export default function usePageRequest(_ref) {
                 loading: true
               });
             });
-            _context.next = 26;
+            _context.next = 27;
             return httpRequest(params);
-          case 26:
+          case 27:
             requestResult = _context.sent;
             // 事件回调，请求完成
             onEvent === null || onEvent === void 0 || onEvent(eventType, {
@@ -176,7 +177,7 @@ export default function usePageRequest(_ref) {
 
             // 请求结果
             if (!requestResult) {
-              _context.next = 38;
+              _context.next = 39;
               break;
             }
             // 获取table数据
@@ -187,7 +188,7 @@ export default function usePageRequest(_ref) {
             // 数据总数
             total = getDataByNamePath(requestResult, fieldNames.total);
             if (!(total === undefined || dataSource === undefined)) {
-              _context.next = 36;
+              _context.next = 37;
               break;
             }
             newData = {
@@ -199,7 +200,7 @@ export default function usePageRequest(_ref) {
             };
             setData(newData);
             return _context.abrupt("return");
-          case 36:
+          case 37:
             // 当前页无数据，返回上一页
             if (!dataSource.length && pageNo !== 1) {
               onRequest(DataEvent.Reload, pageNo - 1);
@@ -213,13 +214,13 @@ export default function usePageRequest(_ref) {
               });
             }
             return _context.abrupt("return");
-          case 38:
+          case 39:
             setData(function (d) {
               return _objectSpread(_objectSpread({}, d), {}, {
                 loading: false
               });
             });
-          case 39:
+          case 40:
           case "end":
             return _context.stop();
         }

package/es/config.js

@@ -120,11 +120,10 @@ function AppConfig(_ref) {
       },
       children: [children, /*#__PURE__*/_jsx(AppDialog, {}), /*#__PURE__*/_jsx(DialogElementsHolder, {
         ref: dialogHolderRef
-      }, "modal-drawer-holder"), (watermark === null || watermark === void 0 ? void 0 : watermark.content) && /*#__PURE__*/_jsx(WaterMarkRelative, {
-        content: watermark.content,
+      }, "modal-drawer-holder"), (watermark === null || watermark === void 0 ? void 0 : watermark.content) && /*#__PURE__*/_jsx(WaterMarkRelative, _objectSpread({
         fontColor: "rgba(0,0,0,.15)",
         zIndex: 105
-      })]
+      }, watermark))]
     })
   }));
 }

package/es/context/_api.d.ts

@@ -1,4 +1,4 @@
-import { ConfigProviderProps } from 'antd';
+import { BreadcrumbProps, ConfigProviderProps } from 'antd';
 import { Store } from 'antd/es/form/interface';
 import React from 'react';
 import { Location } from 'react-router';
@@ -11,6 +11,8 @@ export type PageContextType = {
     location: Location;
     /** 当前页面是否选中 */
     isActive: boolean;
+    /** 面包屑 */
+    breadcrumb?: BreadcrumbProps['items'];
     /** dialog holder */
     dialogHolderRef: React.RefObject<ElementsHolderRef>;
     /** 销毁页面 */

package/es/dialog/button.d.ts

@@ -5,7 +5,7 @@ import { DialogFormRef } from './form';
 export type DialogButtonRef = {
     onSetButtons: (e: React.ReactElement) => void;
 };
-export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<DialogModalProps<TParams, TData>, "onClose" | "onOk" | "request" | "auth" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<DialogModalProps<TParams, TData>, "auth" | "request" | "onOk" | "onClose" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/editor/_api.d.ts

@@ -20,7 +20,7 @@ export type EditorCodeProps = PropsWithCss & Omit<ReactCodeMirrorProps, 'height'
     onChange?: (e: string) => void;
 };
 export type RichImageUpload = CCS.UploadImageProps & {
-    imageUrl?: string;
+    renderImg?: string | ((fileId: string) => string);
 };
 export type LexicalEditorBaseProps = Pick<InputProps, 'disabled' | 'variant' | 'placeholder' | 'size'> & {
     /** 富文本值 */

package/es/editor/lexical/base/toolbar/upload.js

@@ -114,6 +114,7 @@ export default function UploadModal(_ref) {
       return _ref2.apply(this, arguments);
     };
   }();
+  console.log('imageProps.src', imageProps.src);
   return /*#__PURE__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsx(Modal, {
       open: true,
@@ -215,10 +216,11 @@ export default function UploadModal(_ref) {
             flex: '0 0 200px'
           },
           children: /*#__PURE__*/_jsx(CcsUpload.Image, _objectSpread(_objectSpread({
-            value: imageProps.src
+            value: imageProps.src,
+            valueFormat: "id"
           }, imageUpload), {}, {
             onImageInfo: function onImageInfo(info) {
-              var imageUrl = "".concat((imageUpload === null || imageUpload === void 0 ? void 0 : imageUpload.imageUrl) || '').concat(info.url);
+              var imageUrl = typeof (imageUpload === null || imageUpload === void 0 ? void 0 : imageUpload.renderImg) === 'function' ? imageUpload.renderImg(info.url) : "".concat((imageUpload === null || imageUpload === void 0 ? void 0 : imageUpload.renderImg) || '').concat(info.url);
               setImageInfo({
                 base64: info.base64,
                 url: imageUrl

package/es/page-layout/_api.d.ts

@@ -7,6 +7,8 @@ export type MenuType = {
     icon?: string;
     /** url地址 */
     url?: string;
+    /** 页签模式下是否可关闭 @default true */
+    canClose?: boolean;
     /** 菜单权限编码 */
     btnAuth?: {
         name: string;
@@ -15,16 +17,51 @@ export type MenuType = {
     /** 下级菜单 */
     children?: MenuType[];
 };
-export interface KeepAliveTabsProps {
+interface DefaultPage {
+    /** 默认页面菜单数据 */
+    menu: MenuType;
+    /** 默认页面内容 */
+    content: ReactNode;
+    /** 是否可关闭 @default true */
+    canClose?: boolean;
+}
+export type KeepAliveTabsProps = Omit<SinglePageProps, 'children'> & {
+    /** 缓存组件最大数量 */
     maxLen?: number;
-    appName: string;
-    menuItems: MenuType[];
+    /** 自定义类名 */
     className?: string;
+    /** umimax history */
     history: any;
-}
+    /** 默认页面,默认页面固定在第一个，不能被关闭 */
+    defaultPage?: DefaultPage;
+};
+export type LocalRouterProps = {
+    /** 路由路径 */
+    path: string;
+    /** 路由组件 */
+    component: string;
+    /** 路由元数据 */
+    meta?: {
+        /** 是否隐藏面包屑 */
+        hideBreadcrumb?: boolean;
+        /** 是否自定义布局,如果设置为true,将不会使用默认布局 */
+        isCustomLayout?: boolean;
+    };
+};
 export interface SinglePageProps {
+    /** 应用名称 */
     appName: string;
+    /** 菜单列表 */
     menuItems: MenuType[];
+    /** 面包屑样式 */
     breadcrumbStyle?: CSSProperties;
+    /** 是否隐藏面包屑 */
+    hideBreadcrumb?: boolean;
+    /** 子元素 */
     children?: ReactNode;
+    /** 基础路径 */
+    basePath?: string;
+    /** umi中使用useRouteProps，获取路由元数据hideBreadcrumb，根据路由配置判断是否隐藏面包屑 */
+    useRouteProps?: () => LocalRouterProps;
 }
+export {};

package/es/page-layout/index.less

@@ -49,12 +49,18 @@
     overflow: auto;
   }
 
-  .page-top {
+  .page-top-10 {
     height: 10px;
     background: transparent;
     flex: 0 0 10px;
   }
 
+  .page-top-16 {
+    height: 16px;
+    background: transparent;
+    flex: 0 0 16px;
+  }
+
   .page-bottom {
     height: 16px;
     background: transparent;

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

@@ -1,5 +1,5 @@
 import { BreadcrumbProps } from 'antd';
-import { JSXElementConstructor, ReactElement } from 'react';
+import { JSXElementConstructor, ReactElement, ReactNode } from 'react';
 import { Location } from 'react-router';
 import { KeepAliveTabsProps, MenuType } from '../_api';
 export type CacheRouter = {
@@ -11,9 +11,10 @@ export type CacheRouter = {
     children?: ReactElement<any, string | JSXElementConstructor<any>> | null;
     breadcrumb: BreadcrumbProps['items'];
     pageLocation: Location;
+    closeIcon?: ReactNode;
 };
 export declare function findMenusByUrl(tree: MenuType | MenuType[], targetUrl: string, parents?: MenuType[]): MenuType[] | null;
-declare function KeepAliveTabs({ maxLen, appName, history, menuItems, className, }: KeepAliveTabsProps): import("react/jsx-runtime").JSX.Element;
+declare function KeepAliveTabs({ maxLen, appName, history, menuItems, className, hideBreadcrumb, defaultPage, basePath, useRouteProps, breadcrumbStyle, }: KeepAliveTabsProps): import("react/jsx-runtime").JSX.Element;
 declare namespace KeepAliveTabs {
     var displayName: string;
 }

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

@@ -17,7 +17,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 import { MoreOutlined } from '@ant-design/icons';
 import CcsUtils from '@ccs-ui/utils';
 import { useMemoizedFn, useUpdate, useUpdateEffect } from 'ahooks';
-import { Button, Dropdown, Tabs } from 'antd';
+import { Breadcrumb, Button, Dropdown, Tabs } from 'antd';
 import classnames from 'classnames';
 import updateHelper from 'immutability-helper';
 import { useCallback, useMemo, useRef } from 'react';
@@ -126,15 +126,48 @@ export function findMenusByUrl(tree, targetUrl) {
   return null;
 }
 function KeepAliveTabs(_ref) {
+  var _defaultPage$menu, _routeProps$meta;
   var _ref$maxLen = _ref.maxLen,
     maxLen = _ref$maxLen === void 0 ? 10 : _ref$maxLen,
     appName = _ref.appName,
     history = _ref.history,
     _ref$menuItems = _ref.menuItems,
     menuItems = _ref$menuItems === void 0 ? [] : _ref$menuItems,
-    className = _ref.className;
-  var routers = useRef([]);
+    className = _ref.className,
+    hideBreadcrumb = _ref.hideBreadcrumb,
+    defaultPage = _ref.defaultPage,
+    basePath = _ref.basePath,
+    useRouteProps = _ref.useRouteProps,
+    breadcrumbStyle = _ref.breadcrumbStyle;
   var location = useLocation();
+  var routeProps = (useRouteProps === null || useRouteProps === void 0 ? void 0 : useRouteProps()) || {};
+
+  // 路由集合、添加默认页
+  var routers = useRef(defaultPage ? [{
+    closeIcon: false,
+    key: defaultPage.menu.key,
+    label: (defaultPage === null || defaultPage === void 0 ? void 0 : defaultPage.menu.label) || '默认页',
+    outlet: defaultPage.content,
+    urlAuthList: ((_defaultPage$menu = defaultPage.menu) === null || _defaultPage$menu === void 0 || (_defaultPage$menu = _defaultPage$menu.btnAuth) === null || _defaultPage$menu === void 0 ? void 0 : _defaultPage$menu.map(function (b) {
+      return b.code;
+    })) || [],
+    breadcrumb: hideBreadcrumb || (_routeProps$meta = routeProps.meta) !== null && _routeProps$meta !== void 0 && _routeProps$meta.hideBreadcrumb ? [] : [{
+      key: '-1',
+      title: '首页',
+      href: basePath || undefined
+    }, {
+      key: defaultPage.menu.key,
+      title: (defaultPage === null || defaultPage === void 0 ? void 0 : defaultPage.menu.label) || '默认页'
+    }],
+    pageLocation: {
+      pathname: defaultPage.menu.url || '',
+      key: defaultPage.menu.key,
+      state: {},
+      search: '',
+      hash: ''
+    },
+    menuKey: defaultPage.menu.key || ''
+  }] : []);
   var pathname = location.pathname;
   var outlet = useOutlet();
   var update = useUpdate();
@@ -166,6 +199,7 @@ function KeepAliveTabs(_ref) {
 
   // 当前菜单
   var curMenu = useMemo(function () {
+    var _routeProps$meta2;
     // 上下级菜单
     var menus = findMenusByUrl(menuItems, pathname) || [];
     // 当前菜单
@@ -222,18 +256,21 @@ function KeepAliveTabs(_ref) {
       };
     }();
     if (menu) saveHistory();
-
-    // 面包屑数据
-    var breadcrumb = menus.map(function (m) {
-      return {
-        key: m.key,
-        title: m.label
-      };
-    });
-    breadcrumb.unshift({
-      key: '-1',
-      title: '首页'
-    });
+    var breadcrumb = [];
+    if (!hideBreadcrumb && !((_routeProps$meta2 = routeProps.meta) !== null && _routeProps$meta2 !== void 0 && _routeProps$meta2.hideBreadcrumb)) {
+      // 面包屑数据
+      breadcrumb = menus.map(function (m) {
+        return {
+          key: m.key,
+          title: m.label
+        };
+      });
+      breadcrumb.unshift({
+        key: '-1',
+        title: '首页',
+        href: basePath || undefined
+      });
+    }
     return _objectSpread(_objectSpread({}, menu), {}, {
       breadcrumb: breadcrumb
     });
@@ -277,7 +314,8 @@ function KeepAliveTabs(_ref) {
         }),
         breadcrumb: isMenu ? breadcrumb : [],
         pageLocation: location,
-        menuKey: (curMenu === null || curMenu === void 0 ? void 0 : curMenu.key) || ''
+        menuKey: (curMenu === null || curMenu === void 0 ? void 0 : curMenu.key) || '',
+        closeIcon: (curMenu === null || curMenu === void 0 ? void 0 : curMenu.canClose) === false ? null : undefined
       }]
     });
   }
@@ -316,7 +354,7 @@ function KeepAliveTabs(_ref) {
 
       // 显示首页
       if (routers.current.length === 0) {
-        history.push('/');
+        history.push(basePath || '/');
         return;
       }
 
@@ -333,15 +371,17 @@ function KeepAliveTabs(_ref) {
 
   // 扩展操作
   var onCloseTab = useCallback(function (key) {
-    // 关闭其他标签
+    // 关闭其他标签, 保留关闭图标为false的标签
     if (key === '1') {
       routers.current = routers.current.filter(function (c) {
-        return c.key === pathname;
+        return c.key === pathname || c.closeIcon === false;
       });
       update();
     } else {
-      routers.current = [];
-      history.push('/');
+      routers.current = routers.current.filter(function (c) {
+        return c.closeIcon === false;
+      });
+      history.push(basePath || '/');
     }
   }, []);
   var tabBarExtraContent = /*#__PURE__*/_jsx(Dropdown, {
@@ -381,17 +421,26 @@ function KeepAliveTabs(_ref) {
         }));
       }
     }), routers.current.map(function (_ref4) {
+      var _routeProps$meta3;
       var key = _ref4.key,
         urlAuthList = _ref4.urlAuthList,
         outlet = _ref4.outlet,
-        breadcrumb = _ref4.breadcrumb,
+        _ref4$breadcrumb = _ref4.breadcrumb,
+        breadcrumb = _ref4$breadcrumb === void 0 ? [] : _ref4$breadcrumb,
         pageLocation = _ref4.pageLocation;
       return /*#__PURE__*/_jsx(Page, {
         active: pageLocation.pathname === pathname,
         location: pageLocation,
         onDestroy: onDestroy,
         urlAuthList: urlAuthList,
-        breadcrumb: breadcrumb,
+        isCustomLayout: (_routeProps$meta3 = routeProps.meta) === null || _routeProps$meta3 === void 0 ? void 0 : _routeProps$meta3.isCustomLayout,
+        breadcrumb: breadcrumb.length > 0 && /*#__PURE__*/_jsx(Breadcrumb, {
+          items: breadcrumb,
+          className: "ccs-breadcrumb",
+          style: _objectSpread({
+            marginTop: -6
+          }, breadcrumbStyle)
+        }),
         children: outlet
       }, key);
     })]

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

@@ -1,11 +1,15 @@
-/// <reference types="react" />
+import { ReactNode } from 'react';
 import { Location } from 'react-router';
 import { CacheRouter } from '.';
-export type CachePageProps = Pick<CacheRouter, 'breadcrumb' | 'urlAuthList' | 'children'> & {
+export type CachePageProps = Pick<CacheRouter, 'urlAuthList' | 'children'> & {
     /** 选中状态 */
     active: boolean;
     /** router location */
     location: Location;
+    /** 面包屑 */
+    breadcrumb?: ReactNode;
+    /** 是否自定义布局 */
+    isCustomLayout?: boolean;
     /** 销毁页面 */
     onDestroy: (path: string) => void;
 };