@ccs-ui/rc-pro 2.2.3 → 2.2.4-beta-2

package/es/button/index.js

@@ -84,7 +84,6 @@ function CcsButton(_ref2) {
           okText: '确认',
           cancelText: '取消',
           onOk: function onOk() {
-            console.log('inputConfirm', inputConfirm);
             if (inputConfirm) {
               return new Promise(function (resolve, reject) {
                 var _ref$current;

package/es/color-picker/index.d.ts

@@ -1,16 +1,3 @@
-import { RGBColor } from 'react-color';
-import { PropsWithCss } from '../ccs';
+import { ColorPickerProps } from 'antd';
 import './index.less';
-export type PropsType = PropsWithCss & {
-    /** 指定选中项 */
-    value?: RGBColor;
-    /** 占位 */
-    placeholder?: string;
-    /** 选择完成后的回调 */
-    onChange?: (value: RGBColor) => void;
-};
-/**
- * 颜色选择组件
- */
-declare const ColorPicker: ({ onChange, value, style }: PropsType) => import("react/jsx-runtime").JSX.Element;
-export default ColorPicker;
+export default function CcsColorPicker({ mode, children, onChange, ...otherProps }: ColorPickerProps): import("react/jsx-runtime").JSX.Element;

package/es/color-picker/index.js

@@ -1,67 +1,122 @@
 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 = ["mode", "children", "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 _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 _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); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-/* eslint-disable @typescript-eslint/ban-types */
-import { Popover } from 'antd';
-import { useState } from 'react';
-import { SketchPicker } from 'react-color';
+import { blue, cyan, gray, green, magenta, orange, presetPalettes, red } from '@ant-design/colors';
+import { Col, ColorPicker, Divider, Row, Select } from 'antd';
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
-/**
- * 颜色选择组件
- */
-var ColorPicker = function ColorPicker(_ref) {
-  var onChange = _ref.onChange,
-    value = _ref.value,
-    style = _ref.style;
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    open = _useState2[0],
-    setOpen = _useState2[1];
-  var handleChange = function handleChange(e) {
-    if (onChange) onChange(e.rgb);
-    setOpen(false);
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
+function genPresets() {
+  var presets = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : presetPalettes;
+  return Object.entries(presets).map(function (_ref) {
+    var _ref2 = _slicedToArray(_ref, 2),
+      label = _ref2[0],
+      colors = _ref2[1];
+    return {
+      label: label,
+      colors: colors,
+      key: label
+    };
+  });
+}
+var presets = genPresets({
+  blue: blue,
+  red: red,
+  green: green,
+  cyan: cyan,
+  orange: orange,
+  magenta: magenta,
+  gray: gray
+});
+presets.forEach(function (f) {
+  f.colors = f.colors.slice(0, 6);
+});
+export default function CcsColorPicker(_ref3) {
+  var _ref3$mode = _ref3.mode,
+    mode = _ref3$mode === void 0 ? 'single' : _ref3$mode,
+    children = _ref3.children,
+    _onChange = _ref3.onChange,
+    otherProps = _objectWithoutProperties(_ref3, _excluded);
+  var customPanelRender = function customPanelRender(_, _ref4) {
+    var _ref4$components = _ref4.components,
+      Picker = _ref4$components.Picker,
+      Presets = _ref4$components.Presets;
+    return /*#__PURE__*/_jsxs(Row, {
+      justify: "space-between",
+      wrap: false,
+      style: {
+        width: 360
+      },
+      children: [/*#__PURE__*/_jsx(Col, {
+        span: 12,
+        children: /*#__PURE__*/_jsx(Presets, {})
+      }), /*#__PURE__*/_jsx(Divider, {
+        type: "vertical",
+        style: {
+          height: 'auto'
+        }
+      }), /*#__PURE__*/_jsx(Col, {
+        flex: "auto",
+        children: /*#__PURE__*/_jsx(Picker, {})
+      })]
+    });
+  };
+  var renderValue = function renderValue() {
+    if (!otherProps.value) {
+      return /*#__PURE__*/_jsx(Select, {
+        popupClassName: "ccs-color-picker-select",
+        placeholder: "\u8BF7\u9009\u62E9",
+        dropdownRender: function dropdownRender() {
+          return /*#__PURE__*/_jsx(_Fragment, {});
+        }
+      });
+    }
+    return undefined;
   };
-  return /*#__PURE__*/_jsx("div", {
-    style: {
-      position: 'relative'
+  return /*#__PURE__*/_jsx(ColorPicker, _objectSpread(_objectSpread({
+    className: "ccs-color-picker",
+    allowClear: true,
+    showText: true,
+    mode: mode,
+    onChange: function onChange(value, css) {
+      if (!_onChange) return;
+      var colors = value.getColors();
+
+      // 渐变色
+      if (colors.length > 1) {
+        var gradientColors = colors.map(function (c) {
+          return {
+            color: c.color.toRgbString(),
+            percent: c.percent
+          };
+        });
+        _onChange(gradientColors, css);
+        return;
+      }
+      if (colors.length === 1) {
+        _onChange(value.toCssString(), css);
+        return;
+      }
     },
-    children: /*#__PURE__*/_jsx(Popover, {
-      open: open,
-      content: /*#__PURE__*/_jsx(SketchPicker, {
-        color: value,
-        onChange: handleChange
-      }),
-      children: /*#__PURE__*/_jsx("div", {
-        style: _objectSpread({
-          height: 32,
-          padding: '4px 11px',
-          border: '1px solid #d9d9d9',
-          borderRadius: 3,
-          display: 'flex'
-        }, style),
-        children: /*#__PURE__*/_jsx("div", {
-          onClick: function onClick() {
-            return setOpen(!open);
-          },
-          style: {
-            border: '1px solid #777',
-            background: "rgb(".concat(value === null || value === void 0 ? void 0 : value.r, ",").concat(value === null || value === void 0 ? void 0 : value.g, ",").concat(value === null || value === void 0 ? void 0 : value.b, ",").concat(value === null || value === void 0 ? void 0 : value.a, ")"),
-            width: '100%',
-            margin: '4px 0'
-          }
-        })
-      })
-    })
-  });
-};
-export default ColorPicker;
+    onClear: function onClear() {
+      if (_onChange) _onChange(undefined, '');
+    },
+    presets: presets,
+    panelRender: customPanelRender
+  }, otherProps), {}, {
+    children: children || renderValue()
+  }));
+}

package/es/color-picker/index.less

@@ -1,9 +1,8 @@
-.sketch-picker {
-  width: 250px !important;
-  box-shadow: none !important;
-  padding: 0 !important;
+.ccs-color-picker {
+  display: flex;
+  justify-content: start;
 }
 
-.flexbox-fix div {
-  padding-left: 0 !important;
+.ccs-color-picker-select {
+  display: none !important;
 }

package/es/dialog/HookModal.js

@@ -1,4 +1,4 @@
-var _excluded = ["auth", "form", "title", "content", "extraBtn", "className", "hideFooter", "preventRequestHandle", "requestFieldNames", "onOk", "request", "onClose"];
+var _excluded = ["auth", "form", "title", "content", "extraBtn", "className", "footer", "preventRequestHandle", "requestFieldNames", "onOk", "request", "onClose"];
 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); }
 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); } }
@@ -100,7 +100,7 @@ var HookModal = function HookModal(props) {
     content = innerConfig.content,
     extraBtn = innerConfig.extraBtn,
     className = innerConfig.className,
-    hideFooter = innerConfig.hideFooter,
+    footer = innerConfig.footer,
     preventRequestHandle = innerConfig.preventRequestHandle,
     requestFieldNames = innerConfig.requestFieldNames,
     onOk = innerConfig.onOk,
@@ -160,7 +160,7 @@ var HookModal = function HookModal(props) {
     afterClose: afterClose
   }, otherInnerConfig), {}, {
     className: classNames('ccs-dialog-modal', className),
-    footer: hideFooter ? undefined : renderFooter,
+    footer: footer === null ? null : renderFooter,
     title: /*#__PURE__*/_jsx("div", {
       style: {
         width: '100%',

package/es/dialog/button.d.ts

@@ -16,7 +16,7 @@ export type DialogButtonsProps<T> = Pick<CcsDialogModalProps, 'okText' | 'onClos
 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<CcsDialogModalProps<TParams, TData>, "onOk" | "onClose" | "auth" | "extraBtn" | "request" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "onOk" | "onClose" | "auth" | "extraBtn" | "preventRequestHandle" | "requestFieldNames" | "request"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/dialog/hook.d.ts

@@ -47,10 +47,9 @@ type DialogProps<TParams, TData> = {
     /** 弹框关闭回调 */
     onClose?: () => void;
 };
-export type CcsDialogModalProps<TParams = any, TData = any> = DialogProps<TParams, TData> & Omit<ModalFuncProps, 'onCancel' | 'afterOpenChange' | 'onOk' | 'footer'> & {
+export type CcsDialogModalProps<TParams = any, TData = any> = DialogProps<TParams, TData> & Omit<ModalFuncProps, 'onCancel' | 'afterOpenChange' | 'onOk'> & {
     /** 关闭后销毁组件，默认true */
     destroyOnClose?: boolean;
-    hideFooter?: boolean;
 };
 export type CcsDialogDrawerProps<TParams = any, TData = any> = DialogProps<TParams, TData> & Omit<DrawerProps, 'onClose' | 'onOk' | 'afterOpenChange' | 'footer'> & {
     /** 抽屉内容 */

package/es/upload/index.d.ts

@@ -1,13 +1,33 @@
 import { UploadProps } from 'antd';
+import { UploadChangeParam } from 'antd/es/upload';
 import { RecordType } from '../ccs';
 import { ImageUpload } from './upload-image';
+type FileValue = {
+    /** 文件ID */
+    fileId: string;
+    /** 文件名称 */
+    name: string;
+};
 export type CcsUploadProps = Pick<UploadProps, 'maxCount' | 'data' | 'multiple' | 'accept' | 'name' | 'headers'> & {
+    /** 最大文件数 */
     maxFileSize?: number;
+    /** 上传按钮文本 */
     uploadText?: string;
+    /** 图片下载地址 */
+    fileDownloadUrl?: string;
+    /** 文件id */
+    value?: string | string[] | FileValue[];
+    /** 上传change事件 */
     onChange?: (value: any) => void;
+    /** 上传请求 */
     uploadRequest: <T = any>(file: File, options?: RecordType) => Promise<T>;
 };
-declare function CcsUpload({ uploadText, maxCount, maxFileSize, uploadRequest, onChange, ...otherProps }: CcsUploadProps): import("react/jsx-runtime").JSX.Element;
+export type FileUploadList = UploadChangeParam['fileList'][0] & {
+    fileId?: string;
+};
+/** 生成图片默认值 */
+export declare function uploadDefaultFlies(value: CcsUploadProps['value'], fileDownloadUrl: string): FileUploadList[];
+declare function CcsUpload({ value, uploadText, maxCount, maxFileSize, fileDownloadUrl, uploadRequest, onChange, ...otherProps }: CcsUploadProps): import("react/jsx-runtime").JSX.Element;
 declare namespace CcsUpload {
     var Image: typeof ImageUpload;
 }

package/es/upload/index.js

@@ -1,5 +1,4 @@
-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 = ["uploadText", "maxCount", "maxFileSize", "uploadRequest", "onChange"];
+var _excluded = ["value", "uploadText", "maxCount", "maxFileSize", "fileDownloadUrl", "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; }
@@ -16,27 +15,73 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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 _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); }
 import { UploadOutlined } from '@ant-design/icons';
 import { Button, Upload, message } from 'antd';
 import { useState } from 'react';
 import { ImageUpload } from "./upload-image";
 import { jsx as _jsx } from "react/jsx-runtime";
+/** 生成图片默认值 */
+export function uploadDefaultFlies(value, fileDownloadUrl) {
+  if (Array.isArray(value)) {
+    return value.map(function (v) {
+      if (typeof v === 'string') {
+        return {
+          uid: v,
+          name: v,
+          url: "".concat(fileDownloadUrl).concat(v),
+          fileId: v
+        };
+      }
+
+      // 文件列表
+      if (_typeof(v) === 'object') {
+        return {
+          uid: v.fileId,
+          name: v.name,
+          url: "".concat(fileDownloadUrl).concat(v.fileId),
+          fileId: v.fileId
+        };
+      }
+      return undefined;
+    }).filter(function (f) {
+      return f;
+    });
+  }
+  if (typeof value === 'string') {
+    return [{
+      uid: value,
+      name: value,
+      url: "".concat(fileDownloadUrl).concat(value),
+      fileId: value
+    }];
+  }
+  return [];
+}
 function CcsUpload(_ref) {
-  var uploadText = _ref.uploadText,
+  var _ref$value = _ref.value,
+    value = _ref$value === void 0 ? [{
+      fileId: 'aaaa',
+      name: 'daaaa.txt'
+    }] : _ref$value,
+    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,
+    _ref$fileDownloadUrl = _ref.fileDownloadUrl,
+    fileDownloadUrl = _ref$fileDownloadUrl === void 0 ? '' : _ref$fileDownloadUrl,
     uploadRequest = _ref.uploadRequest,
     onChange = _ref.onChange,
     otherProps = _objectWithoutProperties(_ref, _excluded);
-  var _useState = useState([]),
+  var _useState = useState(function () {
+      return uploadDefaultFlies(value, fileDownloadUrl);
+    }),
     _useState2 = _slicedToArray(_useState, 2),
     files = _useState2[0],
     setFiles = _useState2[1];
   var handleOnChange = function handleOnChange(_ref2) {
     var fileList = _ref2.fileList;
-    console.log('fileList', fileList);
     setFiles(fileList);
     if (!onChange) return;
 
@@ -44,17 +89,16 @@ function CcsUpload(_ref) {
     if (fileList.find(function (f) {
       return f.status === 'uploading';
     })) return;
-    if (maxFileSize === 1) {
+    if (maxCount === 1) {
       var _fileList$;
       // 只能上传一个文件
-      onChange((_fileList$ = fileList[0]) === null || _fileList$ === void 0 || (_fileList$ = _fileList$.response) === null || _fileList$ === void 0 ? void 0 : _fileList$.data);
+      onChange((_fileList$ = fileList[0]) === null || _fileList$ === void 0 ? void 0 : _fileList$.fileId);
     } else {
       // 上传完成的文件,返回上传结果集
       onChange(fileList.filter(function (f) {
-        return f.status === 'done';
+        return !!f.fileId;
       }).map(function (f) {
-        var _f$response;
-        return (_f$response = f.response) === null || _f$response === void 0 ? void 0 : _f$response.data;
+        return f.fileId;
       }));
     }
   };
@@ -67,6 +111,8 @@ function CcsUpload(_ref) {
     }
     return isLt2M;
   };
+
+  // 自定义上传
   var onCustomRequest = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref3) {
       var file, onSuccess, onError, result;

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

@@ -1,7 +1,6 @@
 import { CcsUploadProps } from './index';
 type CcsImageUploadProps = CcsUploadProps & {
     crop?: boolean;
-    tokenKey?: string;
 };
-export declare function ImageUpload({ uploadText, maxCount, maxFileSize, crop, uploadRequest, onChange, ...otherProps }: CcsImageUploadProps): import("react/jsx-runtime").JSX.Element;
+export declare function ImageUpload({ uploadText, maxCount, maxFileSize, crop, value, fileDownloadUrl, uploadRequest, onChange, ...otherProps }: CcsImageUploadProps): import("react/jsx-runtime").JSX.Element;
 export {};

package/es/upload/upload-image.js

@@ -1,5 +1,5 @@
 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 = ["uploadText", "maxCount", "maxFileSize", "crop", "uploadRequest", "onChange"];
+var _excluded = ["uploadText", "maxCount", "maxFileSize", "crop", "value", "fileDownloadUrl", "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; }
@@ -21,6 +21,7 @@ import { message, Upload } from 'antd';
 import ImgCrop from 'antd-img-crop';
 import { useState } from 'react';
 import CcsDialog from "../dialog";
+import { uploadDefaultFlies } from "./index";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -37,27 +38,35 @@ var getBase64 = function getBase64(file) {
   });
 };
 export function ImageUpload(_ref) {
-  var uploadText = _ref.uploadText,
+  var _ref$uploadText = _ref.uploadText,
+    uploadText = _ref$uploadText === void 0 ? '上传' : _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,
     crop = _ref.crop,
+    value = _ref.value,
+    _ref$fileDownloadUrl = _ref.fileDownloadUrl,
+    fileDownloadUrl = _ref$fileDownloadUrl === void 0 ? '' : _ref$fileDownloadUrl,
     uploadRequest = _ref.uploadRequest,
     onChange = _ref.onChange,
     otherProps = _objectWithoutProperties(_ref, _excluded);
-  var _useState = useState([]),
+  var _useState = useState(function () {
+      return uploadDefaultFlies(value, fileDownloadUrl);
+    }),
     _useState2 = _slicedToArray(_useState, 2),
     files = _useState2[0],
     setFiles = _useState2[1];
   var _CcsDialog$useDialog = CcsDialog.useDialog(),
-    contextHolder = _CcsDialog$useDialog.contextHolder,
     openModal = _CcsDialog$useDialog.openModal;
   var handleOnChange = function handleOnChange(_ref2) {
     var fileList = _ref2.fileList;
-    setFiles(fileList.filter(function (f) {
-      return f.status;
-    }));
+    fileList.forEach(function (f) {
+      if (!f.fileId && f.response) {
+        f.fileId = f.response.data;
+      }
+    });
+    setFiles(fileList);
     if (!onChange) return;
 
     // 文件上传中，不更新结果
@@ -67,14 +76,13 @@ export function ImageUpload(_ref) {
     if (maxCount === 1) {
       var _fileList$;
       // 只能上传一个文件
-      onChange((_fileList$ = fileList[0]) === null || _fileList$ === void 0 || (_fileList$ = _fileList$.response) === null || _fileList$ === void 0 ? void 0 : _fileList$.data);
+      onChange((_fileList$ = fileList[0]) === null || _fileList$ === void 0 ? void 0 : _fileList$.fileId);
     } else {
       // 上传完成的文件,返回上传结果集
       onChange(fileList.filter(function (f) {
-        return f.status === 'done';
+        return !!f.fileId;
       }).map(function (f) {
-        var _f$response;
-        return (_f$response = f.response) === null || _f$response === void 0 ? void 0 : _f$response.data;
+        return f.fileId;
       }));
     }
   };
@@ -87,31 +95,42 @@ export function ImageUpload(_ref) {
     }
     return isLt2M;
   };
+
+  // 预览
   var handlePreview = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (file.preview) {
-              _context.next = 4;
+              _context.next = 8;
+              break;
+            }
+            if (!file.originFileObj) {
+              _context.next = 7;
               break;
             }
-            _context.next = 3;
+            _context.next = 4;
             return getBase64(file.originFileObj);
-          case 3:
-            file.preview = _context.sent;
           case 4:
+            file.preview = _context.sent;
+            _context.next = 8;
+            break;
+          case 7:
+            file.preview = "".concat(fileDownloadUrl).concat(file.fileId);
+          case 8:
             openModal({
               title: file.name || file.url.substring(file.url.lastIndexOf('/') + 1),
               content: /*#__PURE__*/_jsx("img", {
-                alt: "example",
+                alt: file.name,
                 style: {
                   width: '100%'
                 },
                 src: file.preview
-              })
+              }),
+              footer: null
             });
-          case 5:
+          case 9:
           case "end":
             return _context.stop();
         }
@@ -121,6 +140,8 @@ export function ImageUpload(_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
+
+  // 自定义上传
   var onCustomRequest = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref4) {
       var file, onSuccess, onError, result;
@@ -173,11 +194,11 @@ export function ImageUpload(_ref) {
       })]
     })
   }));
-  return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [contextHolder, crop ? /*#__PURE__*/_jsx(ImgCrop, {
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: crop ? /*#__PURE__*/_jsx(ImgCrop, {
       minZoom: 0.5,
       rotationSlider: true,
       children: renderUpload
-    }) : renderUpload]
+    }) : renderUpload
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.2.3",
+  "version": "2.2.4-beta-2",
   "description": "",
   "license": "MIT",
   "author": {
@@ -65,12 +65,12 @@
     "lodash.isarray": "^4.0.0",
     "lodash.isnil": "^4.0.0",
     "lodash.uniqueid": "^4.0.1",
-    "react-color": "^2.19.3",
     "react-custom-scrollbars": "^4.2.1",
     "react-draggable": "^4.4.5",
     "react-error-overlay": "^6.0.11",
     "react-lines-ellipsis": "^0.15.4",
-    "react-resizable": "^3.0.5"
+    "react-resizable": "^3.0.5",
+    "@ant-design/colors": "^8.0.0"
   },
   "devDependencies": {
     "@ant-design/compatible": "^5.1.2",
@@ -84,7 +84,6 @@
     "@types/lodash.isnil": "^4.0.9",
     "@types/lodash.uniqueid": "^4.0.9",
     "@types/react": "^18.0.0",
-    "@types/react-color": "^3.0.6",
     "@types/react-custom-scrollbars": "^4.0.10",
     "@types/react-dom": "^18.0.0",
     "@types/react-lines-ellipsis": "^0.15.6",