@ccs-ui/rc-pro 2.1.3 → 2.1.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -19,7 +19,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
19
19
  import { useRequest } from 'ahooks';
20
20
  import { Cascader } from 'antd';
21
21
  import { useEffect } from 'react';
22
- import { getDataFromArrayField } from "../select";
22
+ import { getDataFromFields } from "../select";
23
23
  import { jsx as _jsx } from "react/jsx-runtime";
24
24
  function onIsArray(data) {
25
25
  if (Array.isArray(data)) return data;
@@ -47,37 +47,43 @@ export default function CcsApiCascader(_ref) {
47
47
  return _regeneratorRuntime().wrap(function _callee$(_context) {
48
48
  while (1) switch (_context.prev = _context.next) {
49
49
  case 0:
50
- _context.next = 2;
51
- return onQuery(params);
50
+ if (onQuery) {
51
+ _context.next = 2;
52
+ break;
53
+ }
54
+ return _context.abrupt("return", []);
52
55
  case 2:
56
+ _context.next = 4;
57
+ return onQuery(params);
58
+ case 4:
53
59
  result = _context.sent;
54
- case 3:
60
+ case 5:
55
61
  if (!(labelField.length > 0 || valueField.length > 0)) {
56
- _context.next = 13;
62
+ _context.next = 15;
57
63
  break;
58
64
  }
59
65
  if (!Array.isArray(result)) {
60
- _context.next = 7;
66
+ _context.next = 9;
61
67
  break;
62
68
  }
63
69
  result.forEach(function (r) {
64
- r.label = getDataFromArrayField(r, labelField);
65
- r.value = getDataFromArrayField(r, valueField);
66
- r.children = getDataFromArrayField(r, childrenField);
70
+ r.label = getDataFromFields(r, labelField);
71
+ r.value = getDataFromFields(r, valueField);
72
+ r.children = getDataFromFields(r, childrenField);
67
73
  });
68
- return _context.abrupt("break", 13);
69
- case 7:
74
+ return _context.abrupt("break", 15);
75
+ case 9:
70
76
  labelField.shift();
71
77
  childrenField.shift();
72
78
  value = valueField.shift();
73
79
  if (value) {
74
80
  result = result[value];
75
81
  }
76
- _context.next = 3;
82
+ _context.next = 5;
77
83
  break;
78
- case 13:
84
+ case 15:
79
85
  return _context.abrupt("return", result);
80
- case 14:
86
+ case 16:
81
87
  case "end":
82
88
  return _context.stop();
83
89
  }
package/es/ccs.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import { ButtonProps } from 'antd';
1
+ import { ButtonProps, PaginationProps } from 'antd';
2
2
  import { Rule } from 'antd/es/form';
3
3
  import { CSSProperties, MutableRefObject, ReactElement, ReactNode } from 'react';
4
4
  import { TableColumn } from './pro-table/table';
@@ -21,64 +21,9 @@ type MenuType = {
21
21
  type TableData<T> = {
22
22
  /** loading */
23
23
  loading?: boolean;
24
- /** 总条数 */
25
- totalNum?: number;
26
- /** 单页记录数 */
27
- pageSize?: number;
28
- /** 页码 */
29
- pageNo?: number;
30
24
  /** Array List 数据 */
31
- result?: T[];
32
- };
33
- type HttpResult<T = any> = {
34
- code?: string;
35
- success?: boolean;
36
- data?: T;
37
- msg?: string;
38
- };
39
- type PageType<T> = {
40
- hasNext: boolean;
41
- totalNum: number;
42
- pageNo: number;
43
- pageSize: number;
44
- result: T[];
45
- };
46
- type HttpPageResult<T = any> = Omit<HttpResult<T>, 'data'> & {
47
- data: PageType<T>;
48
- };
49
- type HttpListResult<T = any> = Omit<HttpResult<T>, 'data'> & {
50
- data: T[];
51
- };
52
- type OrderProp = {
53
- ascending: boolean;
54
- prop: string;
55
- };
56
- type QueryLimit = {
57
- fetchSize: number;
58
- startIndex: number;
59
- };
60
- type PageQuery<T = any> = {
61
- /** 查询的开始行数和取多少行,从0开始 */
62
- limit?: QueryLimit;
63
- /** 排序字段,一般前端不传,由后端指定 */
64
- orderProps?: OrderProp[];
65
- /** 过滤字段 */
66
- filters?: Record<string, any[]>;
67
- /** 页码 */
68
- pageNo?: number;
69
- /** 页长 */
70
- pageSize?: number;
71
- /** 查询条件 */
72
- query: T;
73
- };
74
- type ListQuery<T = any> = {
75
- /** 查询的开始行数和取多少行,从0开始 */
76
- limit?: QueryLimit;
77
- /** 排序字段,一般前端不传,由后端指定 */
78
- orderProps?: OrderProp[];
79
- /** 查询条件 */
80
- query: T;
81
- };
25
+ dataSource?: T[];
26
+ } & PaginationProps;
82
27
  type RecordType = Record<string, any>;
83
28
  type RouteHistory = {
84
29
  menuName: string;
@@ -185,4 +130,4 @@ type PropsWithNodeChildren = {
185
130
  type PropsWithElementChildren = {
186
131
  children?: ReactElement;
187
132
  };
188
- export type { AuthButtonItem, HttpListResult, HttpPageResult, HttpResult, ListQuery, MenuType, PageQuery, PageType, PropsWithCss, PropsWithElementChildren, PropsWithNodeChildren, RecordType, RouteHistory, TableColumns, TableData, TableFormItems, TableInstance, TableInstanceRef, TriggerChildrenProps, };
133
+ export type { AuthButtonItem, MenuType, PropsWithCss, PropsWithElementChildren, PropsWithNodeChildren, RecordType, RouteHistory, TableColumns, TableData, TableFormItems, TableInstance, TableInstanceRef, TriggerChildrenProps, };
package/es/config.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import { PropsWithElementChildren } from './ccs';
2
2
  import { CssAppConfigType } from './context';
3
+ export declare function onDefaultFormat(data: any): any;
3
4
  type AppConfigProps = PropsWithElementChildren & CssAppConfigType;
4
5
  export default function CssAppConfig(props: AppConfigProps): import("react/jsx-runtime").JSX.Element;
5
6
  export {};
package/es/config.js CHANGED
@@ -56,6 +56,9 @@ function AppDialog() {
56
56
  children: [contextMsgHolder, contextNotifHolder, contextModalHolder]
57
57
  });
58
58
  }
59
+ export function onDefaultFormat(data) {
60
+ return data;
61
+ }
59
62
 
60
63
  /** 主题设置 */
61
64
  function AppConfig(_ref) {
@@ -64,7 +67,8 @@ function AppConfig(_ref) {
64
67
  theme = _ref$theme === void 0 ? 'light' : _ref$theme,
65
68
  isCompact = _ref.isCompact,
66
69
  watermark = _ref.watermark,
67
- themeConfig = _ref.themeConfig;
70
+ themeConfig = _ref.themeConfig,
71
+ CcsProTableFieldNames = _ref.CcsProTableFieldNames;
68
72
  var holderRef = React.useRef(null);
69
73
  // 主题
70
74
  var appTheme = theme === 'dark' ? darkTheme : defaultTheme;
@@ -92,7 +96,8 @@ function AppConfig(_ref) {
92
96
  value: {
93
97
  theme: theme,
94
98
  themeConfig: themeConfig,
95
- holderRef: holderRef
99
+ holderRef: holderRef,
100
+ CcsProTableFieldNames: CcsProTableFieldNames
96
101
  },
97
102
  children: [children, /*#__PURE__*/_jsx(AppDialog, {}), /*#__PURE__*/_jsx(ElementsHolder, {
98
103
  ref: holderRef
@@ -59,6 +59,13 @@ type CssAppConfigType = {
59
59
  watermark?: WaterMarkProps;
60
60
  /** modal or drawer holder */
61
61
  holderRef?: React.RefObject<ElementsHolderRef>;
62
+ /** CcsProTable 组件字段全局指定 */
63
+ CcsProTableFieldNames?: {
64
+ dataSource: string[];
65
+ total: string[];
66
+ current: string[];
67
+ pageSize: string[];
68
+ };
62
69
  };
63
70
  declare const DrawerAndModalContext: React.Context<FnContextType<any>>;
64
71
  declare const PageContext: React.Context<PageContextType>;
@@ -1,9 +1,12 @@
1
1
  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); }
2
+ 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; }
2
3
  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; }
3
4
  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; }
4
5
  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; }
5
6
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
6
7
  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); }
8
+ 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); } }
9
+ 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); }); }; }
7
10
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
8
11
  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."); }
9
12
  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); }
@@ -30,27 +33,43 @@ var DialogRequestButton = function DialogRequestButton(_ref) {
30
33
  _useState2 = _slicedToArray(_useState, 2),
31
34
  loading = _useState2[0],
32
35
  setLoading = _useState2[1];
33
- var onOk = function onOk() {
34
- var _formRef$current;
35
- if (!((_formRef$current = formRef.current) !== null && _formRef$current !== void 0 && _formRef$current.formInstance)) {
36
- CcsUtils.showWarning(false, "\u672A\u5B9A\u4E49form");
37
- return;
38
- }
39
- formRef.current.formInstance.validateFields().then(function (values) {
40
- setLoading(true);
41
- var params = _objectSpread(_objectSpread({}, formInitialValues), onRequestBefore ? onRequestBefore(values) : values);
42
- request(params).then(function (d) {
43
- setLoading(false);
44
- if (d !== null && d !== void 0 && d.success && onCancel) {
45
- onCancel(params);
36
+ var onOk = /*#__PURE__*/function () {
37
+ var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
38
+ var _formRef$current;
39
+ return _regeneratorRuntime().wrap(function _callee$(_context) {
40
+ while (1) switch (_context.prev = _context.next) {
41
+ case 0:
42
+ if ((_formRef$current = formRef.current) !== null && _formRef$current !== void 0 && _formRef$current.formInstance) {
43
+ _context.next = 3;
44
+ break;
45
+ }
46
+ CcsUtils.showWarning(false, "\u672A\u5B9A\u4E49form");
47
+ return _context.abrupt("return");
48
+ case 3:
49
+ formRef.current.formInstance.validateFields().then(function (values) {
50
+ setLoading(true);
51
+ var params = _objectSpread(_objectSpread({}, formInitialValues), onRequestBefore ? onRequestBefore(values) : values);
52
+ request(params).then(function (result) {
53
+ setLoading(false);
54
+ if (result !== null && result !== void 0 && result.success && onCancel) {
55
+ onCancel(params);
56
+ }
57
+ CcsDialog.easyMessage(result);
58
+ }).catch(function (err) {
59
+ setLoading(false);
60
+ console.log('e', err);
61
+ });
62
+ });
63
+ case 4:
64
+ case "end":
65
+ return _context.stop();
46
66
  }
47
- CcsDialog.easyMessage(d);
48
- }).catch(function (err) {
49
- setLoading(false);
50
- console.log('e', err);
51
- });
52
- });
53
- };
67
+ }, _callee);
68
+ }));
69
+ return function onOk() {
70
+ return _ref2.apply(this, arguments);
71
+ };
72
+ }();
54
73
  return /*#__PURE__*/_jsxs(_Fragment, {
55
74
  children: [extraBtn, /*#__PURE__*/_jsx(Button, {
56
75
  onClick: onCancel,
@@ -1,7 +1,7 @@
1
1
  import { FormProps } from 'antd';
2
2
  import { DialogFormRef } from './form';
3
3
  import { CcsDialogModalProps } from './hook';
4
- declare const DialogSelfOkButton: ({ auth, formRef, extraBtn, formInitialValues, onCancel, onOk, }: Pick<CcsDialogModalProps, "auth" | "onOk" | "onCancel" | "extraBtn"> & {
4
+ declare const DialogSelfOkButton: ({ auth, formRef, extraBtn, formInitialValues, onCancel, onOk, }: Pick<CcsDialogModalProps, "auth" | "onCancel" | "onOk" | "extraBtn"> & {
5
5
  formRef: React.RefObject<DialogFormRef>;
6
6
  formInitialValues: FormProps['initialValues'];
7
7
  }) => import("react/jsx-runtime").JSX.Element;
@@ -17,6 +17,12 @@ type DrawerFunc = (props: CcsDialogDrawerProps) => {
17
17
  destroy: () => void;
18
18
  update: (configUpdate: CcsDialogDrawerProps) => void;
19
19
  };
20
+ export type DialogRequestData = {
21
+ /** 成功标识 */
22
+ success: boolean;
23
+ /** 失败消息 */
24
+ msg: string;
25
+ };
20
26
  export type CcsDialogModalProps = ModalFuncProps & {
21
27
  /** antd form */
22
28
  form?: FormProps;
@@ -27,7 +33,7 @@ export type CcsDialogModalProps = ModalFuncProps & {
27
33
  /** 通过参数传递的扩展按钮 */
28
34
  extraBtn?: ReactNode;
29
35
  /** 表单接口请求 */
30
- request?: (values: any) => Promise<any>;
36
+ request?: (values: any) => Promise<DialogRequestData>;
31
37
  /** request执行前参数处理 */
32
38
  onRequestBefore?: (values: any) => any;
33
39
  /** 通过closeDialog方法关闭dialog */
@@ -3,4 +3,10 @@
3
3
  * @returns
4
4
  */
5
5
  declare const useAppConfig: () => import("../context").CssAppConfigType;
6
+ export declare const useProTableFields: () => {
7
+ dataSource: string[];
8
+ total: string[];
9
+ current: string[];
10
+ pageSize: string[];
11
+ } | undefined;
6
12
  export default useAppConfig;
@@ -12,4 +12,8 @@ var useAppConfig = function useAppConfig() {
12
12
  }
13
13
  return context;
14
14
  };
15
+ export var useProTableFields = function useProTableFields() {
16
+ var context = useContext(AppConfigContext) || {};
17
+ return context === null || context === void 0 ? void 0 : context.CcsProTableFieldNames;
18
+ };
15
19
  export default useAppConfig;
@@ -1,17 +1,14 @@
1
- import { HttpPageResult, HttpResult } from '../ccs';
2
1
  import './index.less';
3
2
  import { CcsProTableProps, SearchEventType } from './table';
4
3
  type TableProps<T> = Omit<CcsProTableProps<T>, 'onSearchAfter' | 'parentFieldName'> & {
5
4
  /** 请求后格式化结果 */
6
- onSearchAfter?: (data: HttpPageResult<T>, eventType?: SearchEventType) => any;
5
+ onSearchAfter?: (data: any, eventType?: SearchEventType) => any;
7
6
  };
8
7
  type TableTreeProps<T> = Omit<CcsProTableProps<T>, 'onSearchAfter'> & {
9
8
  /** 父级值字段 */
10
9
  parentFieldName: string;
11
10
  /** 请求后格式化结果 */
12
- onSearchAfter?: (data: HttpResult<(T & {
13
- children?: T[];
14
- })[]>, eventType?: SearchEventType) => any;
11
+ onSearchAfter?: (data: any, eventType?: SearchEventType) => any;
15
12
  };
16
13
  /**
17
14
  * 查询表格组件
@@ -3,7 +3,8 @@ import { ColumnGroupType, ColumnType } from 'antd/es/table';
3
3
  import { TableSticky } from 'rc-table/lib/interface';
4
4
  import React, { CSSProperties, ReactElement, ReactNode } from 'react';
5
5
  import CCS from '..';
6
- import { HttpPageResult, PropsWithCss, PropsWithNodeChildren, TableColumns } from '../ccs';
6
+ import { PropsWithCss, PropsWithNodeChildren, TableColumns } from '../ccs';
7
+ import { CssAppConfigType } from '../context';
7
8
  import './index.less';
8
9
  type ParamType = Record<string, any>;
9
10
  export type ShowDependType = {
@@ -29,8 +30,10 @@ export type CcsTableProps<T> = Omit<TableProps<T>, 'columns' | 'title'> & {
29
30
  data?: CCS.TableData<T>;
30
31
  /** request 方法 */
31
32
  request?: (params: any) => Promise<any>;
32
- /** request 额外参数 */
33
+ /** request 额外参数 dataSource: ['data', 'result']; current: ['data', 'pageNo']; pageSize: ['data', 'pageSize']; total: ['data', 'totalNum'] */
33
34
  requestParam?: ParamType;
35
+ /** 接口字段指定,默认: */
36
+ fieldNames?: CssAppConfigType['CcsProTableFieldNames'];
34
37
  /** class name */
35
38
  className?: string;
36
39
  /** style */
@@ -78,7 +81,7 @@ export type CcsProTableProps<RecordType> = Pick<PropsWithCss, 'className'> & Pro
78
81
  /** 请求前格式化参数 */
79
82
  onSearchBefore?: (params: SearchBeforeType, eventType?: SearchEventType) => SearchBeforeType;
80
83
  /** 请求后格式化结果 */
81
- onSearchAfter?: (data: HttpPageResult<RecordType>, eventType?: SearchEventType) => any;
84
+ onSearchAfter?: (result: any, eventType?: SearchEventType) => any;
82
85
  };
83
86
  export type TableEventType = {
84
87
  key: 'columnFilter' | 'fullScreen';
@@ -20,6 +20,9 @@ import classNames from 'classnames';
20
20
  import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
21
21
  import { useAppConfig } from '..';
22
22
  import { useCcsPage } from "../";
23
+ import { onDefaultFormat } from "../config";
24
+ import { useProTableFields } from "../hooks/use-app";
25
+ import { getDataFromFields } from "../select";
23
26
  import CcsTable from "../table";
24
27
  import { getAllChildrenId, getDataById, onTableInModalOrDrawer, onTableInTabItem } from "./_utils";
25
28
  import HeadComponent from "./head";
@@ -41,7 +44,7 @@ export var TableSelectionContext = /*#__PURE__*/React.createContext({
41
44
  * @returns
42
45
  */
43
46
  var InternalProTable = function InternalProTable(props) {
44
- var _table$scroll2, _table$scroll3;
47
+ var _props$table, _table$scroll2, _table$scroll3;
45
48
  var init = props.init,
46
49
  auth = props.auth,
47
50
  table = props.table,
@@ -58,14 +61,12 @@ var InternalProTable = function InternalProTable(props) {
58
61
  formItems = _props$formItems === void 0 ? [] : _props$formItems,
59
62
  parentFieldName = props.parentFieldName,
60
63
  _props$formInitValues = props.formInitValues,
61
- formInitValues = _props$formInitValues === void 0 ? {} : _props$formInitValues,
62
- onSearchBefore = props.onSearchBefore,
63
- onSearchAfter = props.onSearchAfter;
64
+ formInitValues = _props$formInitValues === void 0 ? {} : _props$formInitValues;
64
65
  var _useCcsPage = useCcsPage(),
65
66
  onAuth = _useCcsPage.onAuth;
66
67
  var _ref = table || {},
67
68
  pagination = _ref.pagination,
68
- request = _ref.request,
69
+ httpRequest = _ref.request,
69
70
  _ref$requestParam = _ref.requestParam,
70
71
  requestParam = _ref$requestParam === void 0 ? {} : _ref$requestParam,
71
72
  columns = _ref.columns,
@@ -86,10 +87,10 @@ var InternalProTable = function InternalProTable(props) {
86
87
  form = _Form$useForm2[0];
87
88
  // table data
88
89
  var _useState = useState({
89
- totalNum: 0,
90
- result: [],
90
+ total: 0,
91
+ dataSource: [],
91
92
  pageSize: 10,
92
- pageNo: 1
93
+ current: 1
93
94
  }),
94
95
  _useState2 = _slicedToArray(_useState, 2),
95
96
  data = _useState2[0],
@@ -103,9 +104,22 @@ var InternalProTable = function InternalProTable(props) {
103
104
  _useState6 = _slicedToArray(_useState5, 2),
104
105
  tableRowSize = _useState6[0],
105
106
  setTableRowSize = _useState6[1];
106
- // 暗黑模式
107
+ // 上下文配置
107
108
  var _useAppConfig = useAppConfig(),
108
109
  theme = _useAppConfig.theme;
110
+ // 接口字段指定全局配置
111
+ var globalFieldNames = useProTableFields();
112
+ // 接口字段指定
113
+ var fieldNames = ((_props$table = props.table) === null || _props$table === void 0 ? void 0 : _props$table.fieldNames) || globalFieldNames || {
114
+ dataSource: ['data', 'result'],
115
+ current: ['data', 'pageNo'],
116
+ pageSize: ['data', 'pageSize'],
117
+ total: ['data', 'totalNum']
118
+ };
119
+ var onSearchBefore = props.onSearchBefore || onDefaultFormat;
120
+ var onSearchAfter = props.onSearchAfter || onDefaultFormat;
121
+
122
+ // 暗黑模式
109
123
  var isDark = theme === 'dark';
110
124
 
111
125
  // 权限判断
@@ -142,7 +156,7 @@ var InternalProTable = function InternalProTable(props) {
142
156
  pageNo = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : 1;
143
157
  pageSize = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : (pagination ? pagination.defaultPageSize : 10) || 10;
144
158
  record = _args2.length > 3 ? _args2[3] : undefined;
145
- if (!(!isAuth || !request)) {
159
+ if (!(!isAuth || !httpRequest)) {
146
160
  _context2.next = 5;
147
161
  break;
148
162
  }
@@ -156,12 +170,11 @@ var InternalProTable = function InternalProTable(props) {
156
170
  _treeRef$current,
157
171
  newParams,
158
172
  requestResult,
159
- newRequestResult,
160
- _newRequestResult$dat,
161
- totalNum,
162
- _size,
163
- no,
164
- result,
173
+ newReqResult,
174
+ dataSource,
175
+ _pageSize,
176
+ current,
177
+ total,
165
178
  _args = arguments;
166
179
  return _regeneratorRuntime().wrap(function _callee$(_context) {
167
180
  while (1) switch (_context.prev = _context.next) {
@@ -193,54 +206,61 @@ var InternalProTable = function InternalProTable(props) {
193
206
  return _context.abrupt("return");
194
207
  case 7:
195
208
  // onSearchBefore 请求前回传参数,可以在父组件进行修改
196
- newParams = onSearchBefore ? onSearchBefore(params, eventType) : params; // 发起请求
209
+ newParams = onSearchBefore(params, eventType); // 发起请求
197
210
  setData(function (d) {
198
211
  return _objectSpread(_objectSpread({}, d), {}, {
199
212
  loading: true
200
213
  });
201
214
  });
202
215
  _context.next = 11;
203
- return request(_objectSpread({}, newParams));
216
+ return httpRequest(_objectSpread({}, newParams));
204
217
  case 11:
205
218
  requestResult = _context.sent;
206
- if (!(requestResult && requestResult.success)) {
207
- _context.next = 22;
219
+ if (!requestResult) {
220
+ _context.next = 25;
208
221
  break;
209
222
  }
210
223
  // onSearchAfter 处理请求结果
211
- newRequestResult = onSearchAfter ? onSearchAfter(requestResult, eventType) : requestResult;
212
- _newRequestResult$dat = newRequestResult.data, totalNum = _newRequestResult$dat.totalNum, _size = _newRequestResult$dat.pageSize, no = _newRequestResult$dat.pageNo, result = _newRequestResult$dat.result;
213
- if (!(totalNum === undefined || pageSize === undefined || no === undefined || result === undefined)) {
214
- _context.next = 19;
224
+ newReqResult = onSearchAfter(requestResult, eventType); // 获取table数据
225
+ dataSource = getDataFromFields(newReqResult, fieldNames.dataSource);
226
+ _pageSize = getDataFromFields(newReqResult, fieldNames.pageSize);
227
+ current = getDataFromFields(newReqResult, fieldNames.current);
228
+ total = getDataFromFields(newReqResult, fieldNames.total);
229
+ if (!(total === undefined || _pageSize === undefined || current === undefined || dataSource === undefined)) {
230
+ _context.next = 22;
215
231
  break;
216
232
  }
217
- CcsUtils.showLogWarning('分页返回对象,totalNum,pageSize,no,result不能为空');
218
- setData(_objectSpread(_objectSpread({}, data), {}, {
233
+ CcsUtils.showLogWarning('分页返回对象,total,pageSize,current,dataSource不能为空');
234
+ setData({
235
+ dataSource: dataSource,
236
+ pageSize: _pageSize,
237
+ current: current,
238
+ total: total,
219
239
  loading: false
220
- }));
240
+ });
221
241
  return _context.abrupt("return");
222
- case 19:
242
+ case 22:
223
243
  // 当前页无数据,返回上一页
224
- if (!result.length && no !== 1 && no !== undefined) {
225
- onRequest('reload', no - 1);
244
+ if (!dataSource.length && current !== 1 && current !== undefined) {
245
+ onRequest('reload', current - 1);
226
246
  } else {
227
247
  setData({
228
- pageNo: no,
229
- pageSize: _size,
248
+ current: current,
249
+ pageSize: _pageSize,
230
250
  loading: false,
231
- result: result,
232
- totalNum: totalNum || 0
251
+ dataSource: dataSource,
252
+ total: total || 0
233
253
  });
234
254
  }
235
- _context.next = 23;
255
+ _context.next = 26;
236
256
  break;
237
- case 22:
257
+ case 25:
238
258
  setData(function (d) {
239
259
  return _objectSpread(_objectSpread({}, d), {}, {
240
260
  loading: false
241
261
  });
242
262
  });
243
- case 23:
263
+ case 26:
244
264
  case "end":
245
265
  return _context.stop();
246
266
  }
@@ -261,7 +281,7 @@ var InternalProTable = function InternalProTable(props) {
261
281
  var _onPartialReload = function onPartialReload(id) {
262
282
  var _treeRef$current2, _treeRef$current3;
263
283
  // 查找需要刷新的节点
264
- var treeNode = getDataById(data.result || [], rowKey, id);
284
+ var treeNode = getDataById(data.dataSource || [], rowKey, id);
265
285
  // 没有查找到、全部刷新
266
286
  if (!treeNode) {
267
287
  onRequest('search');
@@ -298,7 +318,7 @@ var InternalProTable = function InternalProTable(props) {
298
318
 
299
319
  // 初始查询
300
320
  useEffect(function () {
301
- if (init !== false && request) {
321
+ if (init !== false && httpRequest) {
302
322
  onRequest('initSearch');
303
323
  }
304
324
  }, [Object.keys(requestParam || {}).toString(), Object.values(requestParam || {}).toString()]);
@@ -328,7 +348,7 @@ var InternalProTable = function InternalProTable(props) {
328
348
 
329
349
  // 刷新
330
350
  var _onReload = function onReload() {
331
- onRequest('reload', data.pageNo, data.pageSize);
351
+ onRequest('reload', data.current, data.pageSize);
332
352
  };
333
353
 
334
354
  // form 数据 查询,重载,重置方法
@@ -447,7 +467,7 @@ var InternalProTable = function InternalProTable(props) {
447
467
  // table title
448
468
  var tableTitle = table.title ? table.title({
449
469
  selectedRows: selectedRows,
450
- data: data.result || [],
470
+ data: data.dataSource || [],
451
471
  onClear: function onClear() {
452
472
  return setSelectedRows([]);
453
473
  }
@@ -2,14 +2,13 @@ import { TableProps } from 'antd';
2
2
  import { TableSticky } from 'rc-table/lib/interface';
3
3
  import { RefObject } from 'react';
4
4
  import CCS from '..';
5
- import { HttpResult } from '../ccs';
6
5
  import { TableRefType } from '../table';
7
- import { CcsProTableProps, SearchEventType } from './table';
6
+ import { CcsProTableProps } from './table';
8
7
  export type TreeInstance<T> = {
9
8
  onRequestTree: (query: any, record: T | any) => void;
10
9
  onExpandKeys: (ids: string[]) => void;
11
10
  };
12
- type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'onSearchBefore' | 'parentFieldName'> & {
11
+ type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'onSearchBefore' | 'parentFieldName' | 'onSearchAfter'> & {
13
12
  data: CCS.TableData<T>;
14
13
  sticky: boolean | TableSticky;
15
14
  tableRowSize: TableProps['size'];
@@ -18,9 +17,6 @@ type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'onSearchBefore' |
18
17
  tableContentRef: React.RefObject<HTMLDivElement>;
19
18
  setData: React.Dispatch<React.SetStateAction<CCS.TableData<T>>>;
20
19
  handlePageChange: any;
21
- onSearchAfter: (data: HttpResult<T[]>, eventType?: SearchEventType) => HttpResult<(T & {
22
- children: T[];
23
- })[]>;
24
20
  };
25
- declare const TableTree: <T extends object = any>({ data, table, sticky, treeRef, tableRef, tableRowSize, tableContentRef, parentFieldName, handlePageChange, setData, onSearchAfter, onSearchBefore, }: TreeTableProps<T>) => import("react/jsx-runtime").JSX.Element;
21
+ declare const TableTree: <T extends object = any>(props: TreeTableProps<T>) => import("react/jsx-runtime").JSX.Element;
26
22
  export default TableTree;
@@ -20,42 +20,44 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
20
20
  import CcsUtils from '@ccs-ui/utils';
21
21
  import { useImperativeHandle, useState } from 'react';
22
22
  import { CcsTable } from '..';
23
+ import { getDataFromFields } from "../select";
23
24
  import { jsx as _jsx } from "react/jsx-runtime";
24
- var TableTree = function TableTree(_ref) {
25
- var data = _ref.data,
26
- table = _ref.table,
27
- sticky = _ref.sticky,
28
- treeRef = _ref.treeRef,
29
- tableRef = _ref.tableRef,
30
- tableRowSize = _ref.tableRowSize,
31
- tableContentRef = _ref.tableContentRef,
32
- parentFieldName = _ref.parentFieldName,
33
- handlePageChange = _ref.handlePageChange,
34
- setData = _ref.setData,
35
- onSearchAfter = _ref.onSearchAfter,
36
- onSearchBefore = _ref.onSearchBefore;
25
+ var TableTree = function TableTree(props) {
26
+ var data = props.data,
27
+ table = props.table,
28
+ sticky = props.sticky,
29
+ treeRef = props.treeRef,
30
+ tableRef = props.tableRef,
31
+ tableRowSize = props.tableRowSize,
32
+ tableContentRef = props.tableContentRef,
33
+ parentFieldName = props.parentFieldName,
34
+ handlePageChange = props.handlePageChange,
35
+ onSearchAfter = props.onSearchAfter,
36
+ onSearchBefore = props.onSearchBefore,
37
+ setData = props.setData;
37
38
  // async tree expand key
38
39
  var _useState = useState([]),
39
40
  _useState2 = _slicedToArray(_useState, 2),
40
41
  expandKeys = _useState2[0],
41
42
  setExpandKeys = _useState2[1];
42
- var _ref2 = table,
43
- rowKey = _ref2.rowKey,
44
- expandable = _ref2.expandable,
45
- columns = _ref2.columns,
46
- request = _ref2.request;
43
+ var _ref = table,
44
+ rowKey = _ref.rowKey,
45
+ expandable = _ref.expandable,
46
+ columns = _ref.columns,
47
+ httpRequest = _ref.request,
48
+ fieldNames = _ref.fieldNames;
47
49
  var childrenColumnName = (expandable === null || expandable === void 0 ? void 0 : expandable.childrenColumnName) || 'children';
48
50
 
49
51
  // 获取数据
50
52
  var _onRequestTree = /*#__PURE__*/function () {
51
- var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
53
+ var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
52
54
  var query,
53
55
  record,
54
56
  params,
55
57
  newParams,
56
58
  requestResult,
57
- newRequestResult,
58
- treeData,
59
+ newReqResult,
60
+ dataSource,
59
61
  _args = arguments;
60
62
  return _regeneratorRuntime().wrap(function _callee$(_context) {
61
63
  while (1) switch (_context.prev = _context.next) {
@@ -68,34 +70,34 @@ var TableTree = function TableTree(_ref) {
68
70
  }
69
71
 
70
72
  // onSearchBefore 请求前回传参数,可以在父组件进行修改
71
- newParams = onSearchBefore ? onSearchBefore(params) : params; // 发起请求
73
+ newParams = onSearchBefore(params); // 发起请求
72
74
  setData(function (d) {
73
75
  return _objectSpread(_objectSpread({}, d), {}, {
74
76
  loading: true
75
77
  });
76
78
  });
77
- _context.t0 = request;
79
+ _context.t0 = httpRequest;
78
80
  if (!_context.t0) {
79
81
  _context.next = 11;
80
82
  break;
81
83
  }
82
84
  _context.next = 10;
83
- return request(_objectSpread({}, newParams));
85
+ return httpRequest(_objectSpread({}, newParams));
84
86
  case 10:
85
87
  _context.t0 = _context.sent;
86
88
  case 11:
87
89
  requestResult = _context.t0;
88
90
  // 请求结果
89
- if (requestResult && requestResult.success) {
91
+ if (requestResult) {
90
92
  // onSearchAfter 处理请求结果
91
- newRequestResult = onSearchAfter ? onSearchAfter(requestResult) : requestResult;
92
- treeData = newRequestResult.data;
93
+ newReqResult = onSearchAfter(requestResult); // 获取table数据
94
+ dataSource = getDataFromFields(newReqResult, fieldNames.dataSource);
93
95
  if (record) {
94
96
  // 异步树
95
- record[childrenColumnName] = treeData;
97
+ record[childrenColumnName] = dataSource;
96
98
  setData(function (d) {
97
99
  return _objectSpread(_objectSpread({}, d), {}, {
98
- result: _toConsumableArray(d.result || []),
100
+ dataSource: _toConsumableArray(d.dataSource || []),
99
101
  loading: false
100
102
  });
101
103
  });
@@ -103,7 +105,7 @@ var TableTree = function TableTree(_ref) {
103
105
  setExpandKeys([]);
104
106
  setData({
105
107
  loading: false,
106
- result: treeData || []
108
+ dataSource: dataSource
107
109
  });
108
110
  }
109
111
  } else {
@@ -120,7 +122,7 @@ var TableTree = function TableTree(_ref) {
120
122
  }, _callee);
121
123
  }));
122
124
  return function onRequestTree() {
123
- return _ref3.apply(this, arguments);
125
+ return _ref2.apply(this, arguments);
124
126
  };
125
127
  }();
126
128
  useImperativeHandle(treeRef, function () {
@@ -20,7 +20,7 @@ type ApiSelectProps = Omit<SelectProps, 'fieldNames'> & {
20
20
  /** 查询请求 */
21
21
  onQuery?: (params?: any) => Promise<any>;
22
22
  };
23
- export declare function getDataFromArrayField(data: Record<string, any>, fields: string[]): any;
23
+ export declare function getDataFromFields(data: Record<string, any>, fields: string[]): any;
24
24
  /**
25
25
  * 基于接口查询的select组件
26
26
  * @param CcsSelectProps
@@ -20,13 +20,13 @@ import { useRequest } from 'ahooks';
20
20
  import { Select } from 'antd';
21
21
  import { useEffect } from 'react';
22
22
  import { jsx as _jsx } from "react/jsx-runtime";
23
- export function getDataFromArrayField(data, fields) {
23
+ export function getDataFromFields(data, fields) {
24
24
  if (!data || fields.length === 0) return;
25
25
  var newFields = _toConsumableArray(fields);
26
26
  var field = newFields.shift();
27
27
  var newData = data[field];
28
28
  if (_typeof(newData) === 'object' && newFields.length > 0) {
29
- return getDataFromArrayField(newData, newFields);
29
+ return getDataFromFields(newData, newFields);
30
30
  }
31
31
  return newData;
32
32
  }
@@ -55,35 +55,41 @@ export default function CcsApiSelect(_ref) {
55
55
  return _regeneratorRuntime().wrap(function _callee$(_context) {
56
56
  while (1) switch (_context.prev = _context.next) {
57
57
  case 0:
58
- _context.next = 2;
59
- return onQuery(params);
58
+ if (onQuery) {
59
+ _context.next = 2;
60
+ break;
61
+ }
62
+ return _context.abrupt("return", []);
60
63
  case 2:
64
+ _context.next = 4;
65
+ return onQuery(params);
66
+ case 4:
61
67
  result = _context.sent;
62
- case 3:
68
+ case 5:
63
69
  if (!(labelField.length > 0 || valueField.length > 0)) {
64
- _context.next = 12;
70
+ _context.next = 14;
65
71
  break;
66
72
  }
67
73
  if (!Array.isArray(result)) {
68
- _context.next = 7;
74
+ _context.next = 9;
69
75
  break;
70
76
  }
71
77
  result.forEach(function (r) {
72
- r.label = getDataFromArrayField(r, labelField);
73
- r.value = getDataFromArrayField(r, valueField);
78
+ r.label = getDataFromFields(r, labelField);
79
+ r.value = getDataFromFields(r, valueField);
74
80
  });
75
- return _context.abrupt("break", 12);
76
- case 7:
81
+ return _context.abrupt("break", 14);
82
+ case 9:
77
83
  labelField.shift();
78
84
  value = valueField.shift();
79
85
  if (value) {
80
86
  result = result[value];
81
87
  }
82
- _context.next = 3;
88
+ _context.next = 5;
83
89
  break;
84
- case 12:
90
+ case 14:
85
91
  return _context.abrupt("return", result);
86
- case 13:
92
+ case 15:
87
93
  case "end":
88
94
  return _context.stop();
89
95
  }
package/es/table/index.js CHANGED
@@ -15,12 +15,6 @@ import { useEffect, useImperativeHandle } from 'react';
15
15
  import { Resizable } from 'react-resizable';
16
16
  import "./index.less";
17
17
  import { jsx as _jsx } from "react/jsx-runtime";
18
- var DEFAULT_PAGE = {
19
- totalNum: 0,
20
- result: [],
21
- pageSize: 10,
22
- pageNo: 1
23
- };
24
18
  var ResizableTitle = function ResizableTitle(props) {
25
19
  var onResize = props.onResize,
26
20
  width = props.width,
@@ -58,11 +52,15 @@ var CustomTable = function CustomTable(props) {
58
52
  tableContentRef = props.tableContentRef,
59
53
  restProps = _objectWithoutProperties(props, _excluded2);
60
54
  var update = useUpdate();
61
- var _ref = data || DEFAULT_PAGE,
62
- totalNum = _ref.totalNum,
63
- result = _ref.result,
64
- pageNo = _ref.pageNo,
65
- pageSize = _ref.pageSize;
55
+ var _ref = data || {},
56
+ _ref$dataSource = _ref.dataSource,
57
+ dataSource = _ref$dataSource === void 0 ? [] : _ref$dataSource,
58
+ _ref$pageSize = _ref.pageSize,
59
+ pageSize = _ref$pageSize === void 0 ? 10 : _ref$pageSize,
60
+ _ref$current = _ref.current,
61
+ current = _ref$current === void 0 ? 1 : _ref$current,
62
+ _ref$total = _ref.total,
63
+ total = _ref$total === void 0 ? 0 : _ref$total;
66
64
 
67
65
  // table 固定表头,内容滚动
68
66
  var _useDebounceFn = useDebounceFn(function () {
@@ -101,7 +99,7 @@ var CustomTable = function CustomTable(props) {
101
99
  onFixedThead = _useDebounceFn.run;
102
100
  useEffect(function () {
103
101
  onFixedThead();
104
- }, [totalNum]);
102
+ }, [total]);
105
103
 
106
104
  // 监听窗口变化
107
105
  // useEventListener('resize', onFixedThead, { target: window });
@@ -169,7 +167,7 @@ var CustomTable = function CustomTable(props) {
169
167
  ellipsis: true,
170
168
  width: 60,
171
169
  render: function render(_value, _record, index) {
172
- return index + 1 + ((pageNo || 1) - 1) * (pageSize || 10);
170
+ return index + 1 + ((current || 1) - 1) * (pageSize || 10);
173
171
  }
174
172
  });
175
173
  }
@@ -184,15 +182,15 @@ var CustomTable = function CustomTable(props) {
184
182
  }),
185
183
  children: /*#__PURE__*/_jsx(Table, _objectSpread(_objectSpread({
186
184
  rowKey: rowKey,
187
- dataSource: result,
185
+ dataSource: dataSource,
188
186
  pagination: pagination === false ? false : _objectSpread({
189
- total: totalNum,
187
+ total: total,
190
188
  pageSize: pageSize,
191
- current: pageNo,
189
+ current: current,
192
190
  showSizeChanger: true,
193
191
  showQuickJumper: true,
194
192
  showTotal: function showTotal() {
195
- return "\u5171".concat(totalNum, "\u6761\u8BB0\u5F55");
193
+ return "\u5171".concat(total, "\u6761\u8BB0\u5F55");
196
194
  },
197
195
  pageSizeOptions: ['10', '20', '30', '50', '100'],
198
196
  size: restProps.size === 'small' ? 'small' : 'default',
@@ -209,7 +207,7 @@ var CustomTable = function CustomTable(props) {
209
207
  }
210
208
  }, restProps), {}, {
211
209
  size: restProps.size || 'middle',
212
- className: classNames(_defineProperty(_defineProperty(_defineProperty({}, 'ccs-table-nodata', !result || result.length === 0), 'ccs-table-wrapper', !rowSelection), "className", className)),
210
+ className: classNames(_defineProperty(_defineProperty(_defineProperty({}, 'ccs-table-nodata', !dataSource || dataSource.length === 0), 'ccs-table-wrapper', !rowSelection), "className", className)),
213
211
  scroll: scroll
214
212
  }))
215
213
  });
@@ -1,7 +1,6 @@
1
1
  import { MessageInstance } from 'antd/es/message/interface';
2
2
  import { HookAPI } from 'antd/es/modal/useModal';
3
3
  import { NotificationInstance } from 'antd/es/notification/interface';
4
- import CCS from '.';
5
4
  export default class ThemeDialog {
6
5
  static message: MessageInstance;
7
6
  static notice: NotificationInstance;
@@ -13,7 +12,12 @@ export default class ThemeDialog {
13
12
  * @param successText // 成功提示
14
13
  * @param failText // 失败提示
15
14
  */
16
- static easyMessage(result: CCS.HttpResult, successText?: string, failText?: string): void;
15
+ static easyMessage(result?: {
16
+ /** 成功标识 */
17
+ success?: boolean;
18
+ /** 失败信息 */
19
+ msg?: string;
20
+ }, successText?: string, failText?: string): void;
17
21
  static confirm(content?: string): Promise<boolean>;
18
22
  /**
19
23
  * 确认提示框
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ccs-ui/rc-pro",
3
- "version": "2.1.3",
3
+ "version": "2.1.5",
4
4
  "description": "",
5
5
  "license": "MIT",
6
6
  "author": {