fan-standard-comp 4.1.2 → 4.1.4

package/es/StandardTablePro/useFetchData.js

@@ -0,0 +1,275 @@
+// import {
+//   runFunction,
+//   useDebounceFn,
+//   useDeepCompareEffect,
+//   useMountMergeState,
+//   usePrevious,
+//   useRefFunction,
+// } from '@ant-design/pro-utils';
+// import { useEffect, useLayoutEffect, useRef } from 'react';
+// import type { PageInfo, RequestData, UseFetchDataAction, UseFetchProps } from './typing';
+// import { postDataPipeline } from './utils/index';
+//
+// /**
+//  * 组合用户的配置和默认值
+//  *
+//  * @param param0
+//  */
+// const mergeOptionAndPageInfo = ({ pageInfo }: UseFetchProps) => {
+//   if (pageInfo) {
+//     const { current, defaultCurrent, pageSize, defaultPageSize } = pageInfo;
+//     return {
+//       current: current || defaultCurrent || 1,
+//       total: 0,
+//       pageSize: pageSize || defaultPageSize || 20,
+//     };
+//   }
+//   return { current: 1, total: 0, pageSize: 20 };
+// };
+//
+// const useFetchData = <T extends RequestData<any>>(
+//   getData: undefined | ((params?: { pageSize: number; current: number }) => Promise<T>),
+//   defaultData: any[] | undefined,
+//   options: UseFetchProps,
+// ): UseFetchDataAction => {
+//   const umountRef = useRef<boolean>(false);
+//   const { onLoad, manual, polling, onRequestError, debounceTime = 20 } = options || {};
+//
+//   /** 是否首次加载的指示器 */
+//   const manualRequestRef = useRef<boolean>(manual);
+//
+//   /** 轮询的setTime ID 存储 */
+//   const pollingSetTimeRef = useRef<any>();
+//   const [list, setList] = useMountMergeState<any[] | undefined>(defaultData, {
+//     value: options?.dataSource,
+//     onChange: options?.onDataSourceChange,
+//   });
+//
+//   const [tableLoading, setTableLoading] = useMountMergeState<UseFetchDataAction['loading']>(false, {
+//     value: options?.loading,
+//     onChange: options?.onLoadingChange,
+//   });
+//
+//   const requesting = useRef(false);
+//
+//   const [pageInfo, setPageInfoState] = useMountMergeState<PageInfo>(
+//     () => mergeOptionAndPageInfo(options),
+//     {
+//       onChange: options?.onPageInfoChange,
+//     },
+//   );
+//   const setPageInfo = useRefFunction((changePageInfo: PageInfo) => {
+//     if (
+//       changePageInfo.current !== pageInfo.current ||
+//       changePageInfo.pageSize !== pageInfo.pageSize ||
+//       changePageInfo.total !== pageInfo.total
+//     ) {
+//       setPageInfoState(changePageInfo);
+//     }
+//   });
+//
+//   const [pollingLoading, setPollingLoading] = useMountMergeState(false);
+//
+//   // Batching update  https://github.com/facebook/react/issues/14259
+//   const setDataAndLoading = (newData: T[], dataTotal: number) => {
+//     setList(newData);
+//
+//     if (pageInfo?.total !== dataTotal) {
+//       setPageInfo({
+//         ...pageInfo,
+//         total: dataTotal || newData.length,
+//       });
+//     }
+//   };
+//
+//   // pre state
+//   const prePage = usePrevious(pageInfo?.current);
+//   const prePageSize = usePrevious(pageInfo?.pageSize);
+//   const prePolling = usePrevious(polling);
+//
+//   const { effects = [] } = options || {};
+//
+//   /**
+//    * 不这样做会导致状态不更新
+//    *
+//    * https://github.com/ant-design/pro-components/issues/4390
+//    */
+//   const requestFinally = useRefFunction(() => {
+//     if (typeof tableLoading === 'object') {
+//       setTableLoading({ ...tableLoading, spinning: false });
+//     } else {
+//       setTableLoading(false);
+//     }
+//     setPollingLoading(false);
+//   });
+//   /** 请求数据 */
+//   const fetchList = async (isPolling: boolean) => {
+//     if ((tableLoading && typeof tableLoading === 'boolean') || requesting.current || !getData) {
+//       return [];
+//     }
+//
+//     // 需要手动触发的首次请求
+//     if (manualRequestRef.current) {
+//       manualRequestRef.current = false;
+//       return [];
+//     }
+//     if (!isPolling) {
+//       if (typeof tableLoading === 'object') {
+//         setTableLoading({ ...tableLoading, spinning: true });
+//       } else {
+//         setTableLoading(true);
+//       }
+//     } else {
+//       setPollingLoading(true);
+//     }
+//
+//     requesting.current = true;
+//     const { pageSize, current } = pageInfo || {};
+//     try {
+//       const pageParams =
+//         options?.pageInfo !== false
+//           ? {
+//               current,
+//               pageSize,
+//             }
+//           : undefined;
+//
+//       const { data = [], success, total = 0, ...rest } = (await getData(pageParams)) || {};
+//       // 如果失败了，直接返回，不走剩下的逻辑了
+//       if (success === false) return [];
+//
+//       const responseData = postDataPipeline<T[]>(
+//         data!,
+//         [options.postData].filter((item) => item) as any,
+//       );
+//       setDataAndLoading(responseData, total);
+//       onLoad?.(responseData, rest);
+//       return responseData;
+//     } catch (e) {
+//       // 如果没有传递这个方法的话，需要把错误抛出去，以免吞掉错误
+//       if (onRequestError === undefined) throw new Error(e as string);
+//       if (list === undefined) setList([]);
+//       onRequestError(e as Error);
+//     } finally {
+//       requesting.current = false;
+//       requestFinally();
+//     }
+//
+//     return [];
+//   };
+//
+//   const fetchListDebounce = useDebounceFn(async (isPolling: boolean) => {
+//     if (pollingSetTimeRef.current) {
+//       clearTimeout(pollingSetTimeRef.current);
+//     }
+//     const msg = await fetchList(isPolling);
+//
+//     // 把判断要不要轮询的逻辑放到后面来这样可以保证数据是根据当前来
+//     // 放到请求前面会导致数据是上一次的
+//     const needPolling = runFunction(polling, msg);
+//
+//     // 如果需要轮询，搞个一段时间后执行
+//     // 如果解除了挂载，删除一下
+//     if (needPolling && !umountRef.current) {
+//       pollingSetTimeRef.current = setTimeout(() => {
+//         fetchListDebounce.run(needPolling);
+//         // 这里判断最小要2000ms，不然一直loading
+//       }, Math.max(needPolling, 2000));
+//     }
+//     return msg;
+//   }, debounceTime || 10);
+//
+//   // 如果轮询结束了，直接销毁定时器
+//   useEffect(() => {
+//     if (!polling) {
+//       clearTimeout(pollingSetTimeRef.current);
+//     }
+//     if (!prePolling && polling) {
+//       fetchListDebounce.run(true);
+//     }
+//     return () => {
+//       clearTimeout(pollingSetTimeRef.current);
+//     };
+//     // eslint-disable-next-line react-hooks/exhaustive-deps
+//   }, [polling]);
+//
+//   useLayoutEffect(() => {
+//     umountRef.current = false;
+//
+//     return () => {
+//       umountRef.current = true;
+//     };
+//   }, []);
+//
+//   /** PageIndex 改变的时候自动刷新 */
+//   useEffect(() => {
+//     const { current, pageSize } = pageInfo || {};
+//     // 如果上次的页码为空或者两次页码等于是没必要查询的
+//     // 如果 pageSize 发生变化是需要查询的，所以又加了 prePageSize
+//     if ((!prePage || prePage === current) && (!prePageSize || prePageSize === pageSize)) {
+//       return;
+//     }
+//
+//     if ((options.pageInfo && list && list?.length > pageSize) || 0) {
+//       return;
+//     }
+//
+//     // 如果 list 的长度大于 pageSize 的长度
+//     // 说明是一个假分页
+//     // (pageIndex - 1 || 1) 至少要第一页
+//     // 在第一页大于 10
+//     // 第二页也应该是大于 10
+//     if (current !== undefined && list && list.length <= pageSize) {
+//       fetchListDebounce.run(false);
+//     }
+//     // eslint-disable-next-line react-hooks/exhaustive-deps
+//   }, [pageInfo?.current]);
+//
+//   // pageSize 修改后返回第一页
+//   useEffect(() => {
+//     if (!prePageSize) {
+//       return;
+//     }
+//     fetchListDebounce.run(false);
+//     // eslint-disable-next-line react-hooks/exhaustive-deps
+//   }, [pageInfo?.pageSize]);
+//
+//   useDeepCompareEffect(() => {
+//     fetchListDebounce.run(false);
+//     if (!manual) {
+//       manualRequestRef.current = false;
+//     }
+//     return () => {
+//       fetchListDebounce.cancel();
+//     };
+//   }, [...effects, manual]);
+//
+//   return {
+//     dataSource: list!,
+//     setDataSource: setList,
+//     loading: tableLoading,
+//     reload: async () => {
+//       await fetchListDebounce.run(false);
+//     },
+//     pageInfo,
+//     pollingLoading,
+//     reset: async () => {
+//       const { pageInfo: optionPageInfo } = options || {};
+//       const { defaultCurrent = 1, defaultPageSize = 20 } = optionPageInfo || {};
+//       const initialPageInfo = {
+//         current: defaultCurrent,
+//         total: 0,
+//         pageSize: defaultPageSize,
+//       };
+//       setPageInfo(initialPageInfo);
+//     },
+//     setPageInfo: async (info) => {
+//       setPageInfo({
+//         ...pageInfo,
+//         ...info,
+//       });
+//     },
+//   };
+// };
+//
+// export default useFetchData;

package/es/StandardTablePro/utils.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+import { ActionType, UseFetchDataAction } from './types';
+export declare function useActionType<T>(ref: React.MutableRefObject<ActionType | undefined>, action: UseFetchDataAction<T>): void;

package/es/StandardTablePro/utils.js

@@ -0,0 +1,49 @@
+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); } }
+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); }); }; }
+// /**
+//  * 获取用户的 action 信息
+//  *
+//  * @param actionRef
+//  * @param counter
+//  * @param onCleanSelected
+//  */
+
+export function useActionType(ref, action
+// props: {
+//   // fullScreen: () => void;
+//   // onCleanSelected: () => void;
+//   // resetAll: () => void;
+//   // editableUtils: UseEditableUtilType;
+// },
+) {
+  /** 这里生成action的映射，保证 action 总是使用的最新 只需要渲染一次即可 */
+  var userAction = {
+    // ...props.editableUtils,
+    pageInfo: action.pageInfo,
+    pagination: action.pagination,
+    dataSource: action.dataSource,
+    keywords: action.keywords,
+    reload: function () {
+      var _reload = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(resetPageIndex) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.next = 2;
+              return action === null || action === void 0 ? void 0 : action.reload();
+            case 2:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      function reload(_x) {
+        return _reload.apply(this, arguments);
+      }
+      return reload;
+    }()
+  };
+  // eslint-disable-next-line no-param-reassign
+  ref.current = userAction;
+}

package/es/index.d.ts

@@ -8,6 +8,7 @@ export { default as SplitterLayout } from './StandardContent/SplitterLayout';
 export { default as RefactorTree } from './RefactorTree';
 export { default as StandardPanel } from './StandardPanel';
 export { default as StandardTable } from './StandardTable';
+export { default as StandardTablePro } from './StandardTablePro';
 export { default as StandardForm } from './StandardForm';
 export { default as StepForm } from './StandardForm/StepForm';
 export { default as TabForm } from './StandardForm/TabForm';
@@ -25,5 +26,6 @@ export * from './components';
 export * from './utils';
 export * from './data';
 export * from './ConfigContext';
+export * from './types';
 export { default as ImageGallery } from './ImageGallery/index';
 export { default as ImagePreview } from './ImageGallery/ImagePreview';

package/es/index.js

@@ -13,6 +13,7 @@ export { default as RefactorTree } from "./RefactorTree";
 // // 通用组件
 export { default as StandardPanel } from "./StandardPanel";
 export { default as StandardTable } from "./StandardTable";
+export { default as StandardTablePro } from "./StandardTablePro";
 export { default as StandardForm } from "./StandardForm";
 export { default as StepForm } from "./StandardForm/StepForm";
 export { default as TabForm } from "./StandardForm/TabForm";
@@ -38,6 +39,8 @@ export * from "./utils";
 export * from "./data";
 // 上下文
 export * from "./ConfigContext";
+// 类型
+export * from "./types";
 
 // 图集
 export { default as ImageGallery } from "./ImageGallery/index";

package/es/types.d.ts

@@ -0,0 +1 @@
+export * from './StandardTable/types';

package/es/types.js

@@ -0,0 +1 @@
+export * from "./StandardTable/types";

package/es/utils/ValueFormat.d.ts

@@ -1,3 +1,3 @@
-export declare const UtilValueFormat: (fieldsValue: any, formItemGroup: any) => any;
+export declare const UtilValueFormat: (fieldsValue: any, formItemGroup: any, dateFormatter?: string) => any;
 export declare const dateOrTimeStringToDayjs: () => void;
 export declare const isDate: (value: any) => boolean;

package/es/utils/ValueFormat.js

@@ -1,3 +1,9 @@
+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 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); }
 // @ts-nocheck
 import dayjs from 'dayjs';
 /*
@@ -6,37 +12,46 @@ import dayjs from 'dayjs';
 * @params {Array} formItemGroup: 表单组
 * */
 var dateFieldTypes = ['datePicker', 'dateTimePicker', 'rangePicker', 'rangeTimePicker', 'timePicker', 'timePickerRange'];
-export var UtilValueFormat = function UtilValueFormat(fieldsValue, formItemGroup) {
+export var UtilValueFormat = function UtilValueFormat(fieldsValue, formItemGroup, dateFormatter) {
   formItemGroup && formItemGroup.forEach(function (item) {
     var _item$protoConfig, _fieldsValue, _item$protoConfig2, _fieldsValue$, _item$protoConfig3, _fieldsValue$2, _item$protoConfig4;
     if (!fieldsValue[item.filedName || item.fieldName]) return;
-    switch (item.type) {
-      case 'datePicker':
-      case 'dateTimePicker':
-      case 'rangePicker':
-      case 'rangeTimePicker':
-        var pickerFormatNew;
-        if (item !== null && item !== void 0 && (_item$protoConfig = item.protoConfig) !== null && _item$protoConfig !== void 0 && _item$protoConfig.picker) {
-          switch (item.protoConfig.picker) {
-            case 'week':
-              pickerFormatNew = 'YYYY-wo';
-              break;
-            case 'month':
-              pickerFormatNew = 'MM月';
-              break;
-            case 'year':
-              pickerFormatNew = 'YYYY';
-              break;
-            default:
-              break;
+    if (dateFormatter === 'string') {
+      // 默认转换成字符串格式返回
+      switch (item.type) {
+        case 'datePicker':
+        case 'dateTimePicker':
+        case 'rangePicker':
+        case 'rangeTimePicker':
+          var pickerFormatNew;
+          if (item !== null && item !== void 0 && (_item$protoConfig = item.protoConfig) !== null && _item$protoConfig !== void 0 && _item$protoConfig.picker) {
+            switch (item.protoConfig.picker) {
+              case 'week':
+                pickerFormatNew = 'YYYY-wo';
+                break;
+              case 'month':
+                pickerFormatNew = 'MM月';
+                break;
+              case 'year':
+                pickerFormatNew = 'YYYY';
+                break;
+              default:
+                break;
+            }
+          } else {
+            pickerFormatNew = item.type === 'datePicker' || item.type === 'rangePicker' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss';
           }
-        } else {
-          pickerFormatNew = item.type === 'datePicker' || item.type === 'rangePicker' ? 'YYYY-MM-DD' : 'YYYY-MM-DD HH:mm:ss';
-        }
-        fieldsValue[item.filedName || item.fieldName] = item.type === 'datePicker' || item.type === 'dateTimePicker' ? (_fieldsValue = fieldsValue[item.filedName || item.fieldName]) === null || _fieldsValue === void 0 ? void 0 : _fieldsValue.format((item === null || item === void 0 || (_item$protoConfig2 = item.protoConfig) === null || _item$protoConfig2 === void 0 ? void 0 : _item$protoConfig2.format) || pickerFormatNew) : [(_fieldsValue$ = fieldsValue[item.filedName || item.fieldName][0]) === null || _fieldsValue$ === void 0 ? void 0 : _fieldsValue$.format((item === null || item === void 0 || (_item$protoConfig3 = item.protoConfig) === null || _item$protoConfig3 === void 0 ? void 0 : _item$protoConfig3.format) || pickerFormatNew), (_fieldsValue$2 = fieldsValue[item.filedName || item.fieldName][1]) === null || _fieldsValue$2 === void 0 ? void 0 : _fieldsValue$2.format((item === null || item === void 0 || (_item$protoConfig4 = item.protoConfig) === null || _item$protoConfig4 === void 0 ? void 0 : _item$protoConfig4.format) || pickerFormatNew)];
-        break;
-      default:
-        break;
+          fieldsValue[item.filedName || item.fieldName] = item.type === 'datePicker' || item.type === 'dateTimePicker' ? (_fieldsValue = fieldsValue[item.filedName || item.fieldName]) === null || _fieldsValue === void 0 ? void 0 : _fieldsValue.format((item === null || item === void 0 || (_item$protoConfig2 = item.protoConfig) === null || _item$protoConfig2 === void 0 ? void 0 : _item$protoConfig2.format) || pickerFormatNew) : [(_fieldsValue$ = fieldsValue[item.filedName || item.fieldName][0]) === null || _fieldsValue$ === void 0 ? void 0 : _fieldsValue$.format((item === null || item === void 0 || (_item$protoConfig3 = item.protoConfig) === null || _item$protoConfig3 === void 0 ? void 0 : _item$protoConfig3.format) || pickerFormatNew), (_fieldsValue$2 = fieldsValue[item.filedName || item.fieldName][1]) === null || _fieldsValue$2 === void 0 ? void 0 : _fieldsValue$2.format((item === null || item === void 0 || (_item$protoConfig4 = item.protoConfig) === null || _item$protoConfig4 === void 0 ? void 0 : _item$protoConfig4.format) || pickerFormatNew)];
+          break;
+        default:
+          break;
+      }
+    }
+    if (item !== null && item !== void 0 && item.transform) {
+      var _item$transform;
+      var transValue = (item === null || item === void 0 || (_item$transform = item.transform) === null || _item$transform === void 0 ? void 0 : _item$transform.call(item, fieldsValue[item.filedName || item.fieldName])) || {};
+      fieldsValue = _objectSpread(_objectSpread({}, fieldsValue), transValue);
+      delete fieldsValue[item.filedName || item.fieldName]; // 删除转换的原参数名
     }
   });
   return fieldsValue;

package/es/utils/getParentNodes.js

@@ -233,7 +233,7 @@ export var getNode = function getNode(list, key) {
   // 深层过滤当前选中的节点
   var deepFilterMatchItem = function deepFilterMatchItem(treeData, targetId) {
     (treeData || []).some(function (item) {
-      if (Number(item[optionName.value]) === Number(targetId) || item[optionName.value] === targetId) {
+      if (item[optionName.value] == targetId) {
         matchCurrentItem = item;
         return true;
       }

package/es/utils/urlUtils.d.ts

@@ -16,3 +16,9 @@ export declare const isHttpUrl: (path: string) => boolean;
  *  是否是完整的URL
  * */
 export declare const isUrl: (path: string) => boolean;
+/***
+ * transSearchByColumn URL上带orders[xxx]=xxx相关参数值，转换成order排序数组
+ * @param searchParams     url上的search参数
+ * @param transOptionName = 'orders'               // 提交需要的字段名
+ */
+export declare const transSearchByColumn: (params?: any, transOptionName?: string) => any;

package/es/utils/urlUtils.js

@@ -1,3 +1,9 @@
+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 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); }
 // @ts-nocheck 文件忽略(添加到该文件的首行)
 import { parse } from "qs";
 
@@ -63,4 +69,24 @@ var reg = /(((^https?:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+(?::\d+)?|(?:
  * */
 export var isUrl = function isUrl(path) {
   return reg.test(path);
+};
+
+/***
+ * transSearchByColumn URL上带orders[xxx]=xxx相关参数值，转换成order排序数组
+ * @param searchParams     url上的search参数
+ * @param transOptionName = 'orders'               // 提交需要的字段名
+ */
+export var transSearchByColumn = function transSearchByColumn(params) {
+  var transOptionName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'orders';
+  var paramsKeys = _objectSpread({}, params);
+  var paramOrders = params[transOptionName || 'orders'] || {};
+  var orders = [];
+  Object.keys(paramOrders).forEach(function (oItem) {
+    orders.push({
+      column: oItem,
+      asc: paramOrders[oItem] === 'descend'
+    });
+  });
+  paramsKeys[transOptionName || 'orders'] = orders;
+  return paramsKeys;
 };