@ccs-ui/rc-pro 2.5.2 → 2.5.3-alpha.1

package/es/pro-table/table.js

@@ -87,6 +87,9 @@ var InternalProTable = function InternalProTable(props) {
     parentFieldName = props.parentFieldName,
     _props$formInitValues = props.formInitValues,
     formInitValues = _props$formInitValues === void 0 ? {} : _props$formInitValues,
+    hideOperation = props.hideOperation,
+    hideSearchBtn = props.hideSearchBtn,
+    formLayout = props.formLayout,
     onEvent = props.onEvent;
   // antd config
   var config = useContext(ConfigContext);
@@ -169,7 +172,9 @@ var InternalProTable = function InternalProTable(props) {
     var treeNode = getDataById(data.dataSource || [], rowKey, id);
     // 没有查找到、全部刷新
     if (!treeNode) {
-      onRequest(DataEvent.Search);
+      onRequest({
+        eventType: DataEvent.Search
+      });
       return;
     }
     // 获取所有下级ID
@@ -204,7 +209,9 @@ var InternalProTable = function InternalProTable(props) {
   // 初始查询
   useEffect(function () {
     if (init !== false && httpRequest) {
-      onRequest(DataEvent.InitSearch);
+      onRequest({
+        eventType: DataEvent.InitSearch
+      });
     }
   }, [Object.keys(requestParam || {}).toString(), Object.values(requestParam || {}).toString()]);
 
@@ -212,7 +219,9 @@ var InternalProTable = function InternalProTable(props) {
   var onSearch = function onSearch() {
     // @ts-ignore
     // table?.rowSelection?.onClearByProTable?.();
-    onRequest(DataEvent.Search);
+    onRequest({
+      eventType: DataEvent.Search
+    });
   };
 
   // 重置
@@ -233,7 +242,9 @@ var InternalProTable = function InternalProTable(props) {
     });
     // 清空filter请求值
     filterOrderRef.current = defaultColumnValues;
-    onRequest(DataEvent.Reset);
+    onRequest({
+      eventType: DataEvent.Reset
+    });
   };
 
   // 刷新
@@ -241,7 +252,11 @@ var InternalProTable = function InternalProTable(props) {
     var _table$rowSelection2, _table$rowSelection2$;
     // @ts-ignore
     table === null || table === void 0 || (_table$rowSelection2 = table.rowSelection) === null || _table$rowSelection2 === void 0 || (_table$rowSelection2$ = _table$rowSelection2.onClearByProTable) === null || _table$rowSelection2$ === void 0 || _table$rowSelection2$.call(_table$rowSelection2);
-    onRequest(DataEvent.Reload, data.current, data.pageSize);
+    onRequest({
+      eventType: DataEvent.Reload,
+      pageNo: data.current,
+      pageSize: data.pageSize
+    });
   };
 
   // form 数据 查询，重载，重置方法
@@ -316,7 +331,11 @@ var InternalProTable = function InternalProTable(props) {
         orderProps: orderProps
       });
     }
-    onRequest(DataEvent.ChangePage, paginationTable.current || 0, paginationTable.pageSize || 10);
+    onRequest({
+      eventType: DataEvent.ChangePage,
+      pageNo: paginationTable.current || 0,
+      pageSize: paginationTable.pageSize || 10
+    });
   };
   var renderTable = function renderTable() {
     if (!table) return null;
@@ -435,7 +454,7 @@ var InternalProTable = function InternalProTable(props) {
   });
 
   // table 操作按钮
-  var renderTableOperation = table !== null && table !== void 0 && table.hideOperation ? /*#__PURE__*/_jsx(CcsAtom.Operation, {
+  var renderTableOperation = hideOperation || table !== null && table !== void 0 && table.hideOperation ? /*#__PURE__*/_jsx(CcsAtom.Operation, {
     extraLeft: toolbar
   }) : /*#__PURE__*/_jsx(CcsAtom.Operation, {
     extraLeft: toolbar,
@@ -469,8 +488,11 @@ var InternalProTable = function InternalProTable(props) {
         expandForm: expandForm,
         formInitValues: formInitValues,
         formItemLabelWidth: props.formItemLabelWidth,
+        formLayout: formLayout,
         onSearch: onSearch,
-        requestParam: table === null || table === void 0 ? void 0 : table.requestParam
+        requestParam: table === null || table === void 0 ? void 0 : table.requestParam,
+        onValuesChange: table !== null && table !== void 0 && table.requestByFilterChange ? onSearch : undefined,
+        hideSearchBtn: hideSearchBtn
       }), toolbar && renderTableOperation, /*#__PURE__*/_jsxs("div", {
         className: "".concat(classPrefix, "-table-content"),
         style: newStyles.table,

package/es/upload/_api.d.ts

@@ -1,4 +1,16 @@
 import { UploadProps as AntUploadProps, UploadChangeParam, UploadFile } from 'antd/es/upload';
+/**
+ * 上传请求
+ * @param {File} file - 文件
+ * @param {Record<string, any>} options - 上传参数
+ *
+ * // 返回值信息可通过全局字段参数RcProFieldNames.base设置，默认为：success，data，msg
+ * @returns { Promise<{
+ *  success: boolean, - 成功标识
+ *  data: string,     - 返回文件id
+ *  msg?: string}.    - 异常消息
+ *  >} - 上传结果
+ */
 export type UploadRequest = (file: File, options?: Record<string, any>) => Promise<{
     /** 成功标识 */
     success: boolean;
@@ -17,6 +29,7 @@ export type FileValue = Pick<UploadFile, 'uid' | 'name' | 'url'> & {
     /** @deprecated 文件ID, 请使用uid */
     fileId?: string;
 };
+type FileValueType = string | string[] | FileValue | Array<FileValue>;
 export type UploadProps = AntUploadProps & {
     /** 最大文件数 */
     maxFileSize?: number;
@@ -29,7 +42,7 @@ export type UploadProps = AntUploadProps & {
      * 3. 当value为FileValue时，为单个文件属性
      * 4. 当value为FileValue数组时，每个元素为文件属性
      */
-    value?: string | string[] | FileValue | Array<FileValue>;
+    value?: FileValueType;
     /**
      * 格式化返回值类型，默认返回value值为string数组，@default 'arrayId'
      * 1. 当valueType为id时，返回文件ID字符串
@@ -41,6 +54,8 @@ export type UploadProps = AntUploadProps & {
     onChange?: (value: any) => void;
     /** 上传请求 */
     uploadRequest?: UploadRequest;
+    /** 初始化时，将value值转成FileValue数组的自定义方法 */
+    onFormatFiles?: (file: any) => Array<FileValue>;
 };
 export type FileUploadList = UploadChangeParam['fileList'][0];
 export interface ImageInfo {
@@ -58,3 +73,4 @@ export type UploadImageProps = UploadProps & {
     /** 获取base64数据 */
     onImageInfo?: (info: ImageInfo) => void;
 };
+export {};

package/es/upload/index.d.ts

@@ -1,6 +1,6 @@
 import { UploadProps } from './_api';
 import { ImageUpload } from './upload-image';
-declare function CustomUpload({ value, uploadText, valueFormat, maxCount, maxFileSize, uploadRequest, onChange, ...props }: UploadProps): import("react/jsx-runtime").JSX.Element;
+declare function CustomUpload({ value, uploadText, valueFormat, maxCount, maxFileSize, uploadRequest, onChange, onFormatFiles, ...props }: UploadProps): import("react/jsx-runtime").JSX.Element;
 declare namespace CustomUpload {
     var Image: typeof ImageUpload;
     var displayName: string;

package/es/upload/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["value", "uploadText", "valueFormat", "maxCount", "maxFileSize", "uploadRequest", "onChange"];
+var _excluded = ["value", "uploadText", "valueFormat", "maxCount", "maxFileSize", "uploadRequest", "onChange", "onFormatFiles"];
 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); }); }; }
@@ -47,8 +47,17 @@ function CustomUpload(_ref) {
     maxFileSize = _ref$maxFileSize === void 0 ? 10 : _ref$maxFileSize,
     uploadRequest = _ref.uploadRequest,
     onChange = _ref.onChange,
+    onFormatFiles = _ref.onFormatFiles,
     props = _objectWithoutProperties(_ref, _excluded);
   function initValues() {
+    if (value === undefined || value === null || value === '') return [];
+
+    // 自定义格式化文件属性
+    if (onFormatFiles) {
+      return onFormatFiles(value);
+    }
+
+    // 根据value类型，生成FileValue数组
     if (typeof value === 'string') {
       return [{
         uid: value,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.5.2",
+  "version": "2.5.3-alpha.1",
   "description": "",
   "license": "MIT",
   "author": {
@@ -56,6 +56,7 @@
   },
   "dependencies": {
     "@ant-design/colors": "^8.0.0",
+    "@ant-design/icons": "^5.1.4",
     "@ccs-ui/utils": "workspace:*",
     "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/lang-json": "^6.0.1",
@@ -93,7 +94,6 @@
   },
   "devDependencies": {
     "@ant-design/compatible": "^5.1.2",
-    "@ant-design/icons": "^5.1.4",
     "@types/insert-css": "^2.0.3",
     "@types/lodash.clonedeep": "^4.5.9",
     "@types/lodash.debounce": "^4.0.9",
@@ -112,7 +112,6 @@
   "peerDependencies": {
     "@ant-design/compatible": "^5.1.2",
     "@ant-design/icons": "^5.1.4",
-    "@ccs-ui/utils": "^0.1.3",
     "ahooks": "^3.7.7",
     "antd": "^5.24.6",
     "classnames": "^2.3.2",