@ccs-ui/rc-pro 2.1.1 → 2.1.3

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.
@@ -1,4 +1,4 @@
1
- import { CascaderAutoProps } from 'antd';
1
+ import { CascaderProps } from 'antd/lib';
2
2
  import CCS from '..';
3
3
  type CacheType = {
4
4
  /** 缓存key,同一个key将共享数据 */
@@ -8,17 +8,23 @@ type CacheType = {
8
8
  /** 设置数据缓存时间,超过该时间,我们会清空该条缓存数据 */
9
9
  cacheTime?: number;
10
10
  };
11
- type ApiCascaderProps = CascaderAutoProps & {
11
+ type ApiCascaderProps = Omit<CascaderProps, 'fieldNames'> & {
12
12
  cache?: CacheType;
13
13
  /** 依赖参数 */
14
14
  defaultParams?: CCS.RecordType;
15
+ /** 接口数据字段 */
16
+ fieldNames?: {
17
+ label?: string[] | string;
18
+ value?: string[] | string;
19
+ children?: string[] | string;
20
+ };
15
21
  /** 查询请求 */
16
- onQuery?: (params?: any) => Promise<CCS.HttpResult<any[]>>;
22
+ onQuery?: (params?: any) => Promise<any>;
17
23
  };
18
24
  /**
19
25
  * 基于接口查询的select组件
20
26
  * @param CcsSelectProps
21
27
  * @returns
22
28
  */
23
- export default function CcsApiCascader({ onQuery, cache, defaultParams, ...restProps }: ApiCascaderProps): import("react/jsx-runtime").JSX.Element;
29
+ export default function CcsApiCascader({ onQuery, cache, fieldNames, defaultParams, ...restProps }: ApiCascaderProps): import("react/jsx-runtime").JSX.Element;
24
30
  export {};
@@ -1,5 +1,5 @@
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
- var _excluded = ["onQuery", "cache", "defaultParams"];
2
+ var _excluded = ["onQuery", "cache", "fieldNames", "defaultParams"];
3
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; }
4
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; }
5
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; }
@@ -8,13 +8,24 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
8
8
  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; }
9
9
  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); } }
10
10
  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); }); }; }
11
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
12
+ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
13
+ 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); }
14
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
15
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
16
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
11
17
  function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
12
18
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
13
19
  import { useRequest } from 'ahooks';
14
20
  import { Cascader } from 'antd';
15
- import _isArray from 'lodash.isarray';
16
21
  import { useEffect } from 'react';
22
+ import { getDataFromArrayField } from "../select";
17
23
  import { jsx as _jsx } from "react/jsx-runtime";
24
+ function onIsArray(data) {
25
+ if (Array.isArray(data)) return data;
26
+ return [data];
27
+ }
28
+
18
29
  /**
19
30
  * 基于接口查询的select组件
20
31
  * @param CcsSelectProps
@@ -23,12 +34,16 @@ import { jsx as _jsx } from "react/jsx-runtime";
23
34
  export default function CcsApiCascader(_ref) {
24
35
  var onQuery = _ref.onQuery,
25
36
  cache = _ref.cache,
37
+ fieldNames = _ref.fieldNames,
26
38
  _ref$defaultParams = _ref.defaultParams,
27
39
  defaultParams = _ref$defaultParams === void 0 ? {} : _ref$defaultParams,
28
40
  restProps = _objectWithoutProperties(_ref, _excluded);
41
+ var labelField = _toConsumableArray(onIsArray((fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) || ['data', 'label']));
42
+ var valueField = _toConsumableArray(onIsArray((fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || ['data', 'value']));
43
+ var childrenField = _toConsumableArray(onIsArray((fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || ['data', 'children']));
29
44
  var _useRequest = useRequest( /*#__PURE__*/function () {
30
45
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
31
- var result;
46
+ var result, value;
32
47
  return _regeneratorRuntime().wrap(function _callee$(_context) {
33
48
  while (1) switch (_context.prev = _context.next) {
34
49
  case 0:
@@ -36,14 +51,33 @@ export default function CcsApiCascader(_ref) {
36
51
  return onQuery(params);
37
52
  case 2:
38
53
  result = _context.sent;
39
- if (!(result !== null && result !== void 0 && result.success && result.data && _isArray(result.data))) {
40
- _context.next = 5;
54
+ case 3:
55
+ if (!(labelField.length > 0 || valueField.length > 0)) {
56
+ _context.next = 13;
41
57
  break;
42
58
  }
43
- return _context.abrupt("return", result.data);
44
- case 5:
45
- return _context.abrupt("return", []);
46
- case 6:
59
+ if (!Array.isArray(result)) {
60
+ _context.next = 7;
61
+ break;
62
+ }
63
+ result.forEach(function (r) {
64
+ r.label = getDataFromArrayField(r, labelField);
65
+ r.value = getDataFromArrayField(r, valueField);
66
+ r.children = getDataFromArrayField(r, childrenField);
67
+ });
68
+ return _context.abrupt("break", 13);
69
+ case 7:
70
+ labelField.shift();
71
+ childrenField.shift();
72
+ value = valueField.shift();
73
+ if (value) {
74
+ result = result[value];
75
+ }
76
+ _context.next = 3;
77
+ break;
78
+ case 13:
79
+ return _context.abrupt("return", result);
80
+ case 14:
47
81
  case "end":
48
82
  return _context.stop();
49
83
  }
@@ -62,11 +96,15 @@ export default function CcsApiCascader(_ref) {
62
96
  useEffect(function () {
63
97
  if (onQuery) run(defaultParams);
64
98
  }, [JSON.stringify(defaultParams)]);
65
- return /*#__PURE__*/_jsx(Cascader, _objectSpread({
66
- options: data,
67
- loading: loading,
68
- style: {
69
- width: '100%'
70
- }
71
- }, restProps));
99
+ return (
100
+ /*#__PURE__*/
101
+ // @ts-ignore
102
+ _jsx(Cascader, _objectSpread({
103
+ options: data,
104
+ loading: loading,
105
+ style: {
106
+ width: '100%'
107
+ }
108
+ }, restProps))
109
+ );
72
110
  }
package/es/ccs.d.ts CHANGED
@@ -33,7 +33,7 @@ type TableData<T> = {
33
33
  type HttpResult<T = any> = {
34
34
  code?: string;
35
35
  success?: boolean;
36
- data: T;
36
+ data?: T;
37
37
  msg?: string;
38
38
  };
39
39
  type PageType<T> = {
@@ -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 DialogRequestButton: ({ auth, formRef, extraBtn, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "request" | "onCancel" | "extraBtn" | "onRequestBefore"> & {
4
+ declare const DialogRequestButton: ({ auth, formRef, extraBtn, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "onCancel" | "extraBtn" | "request" | "onRequestBefore"> & {
5
5
  formRef: React.RefObject<DialogFormRef>;
6
6
  formInitialValues: FormProps['initialValues'];
7
7
  }) => import("react/jsx-runtime").JSX.Element;
@@ -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" | "onCancel" | "onOk" | "extraBtn"> & {
4
+ declare const DialogSelfOkButton: ({ auth, formRef, extraBtn, formInitialValues, onCancel, onOk, }: Pick<CcsDialogModalProps, "auth" | "onOk" | "onCancel" | "extraBtn"> & {
5
5
  formRef: React.RefObject<DialogFormRef>;
6
6
  formInitialValues: FormProps['initialValues'];
7
7
  }) => import("react/jsx-runtime").JSX.Element;
@@ -8,17 +8,23 @@ type CacheType = {
8
8
  /** 设置数据缓存时间,超过该时间,我们会清空该条缓存数据 */
9
9
  cacheTime?: number;
10
10
  };
11
- type ApiSelectProps = SelectProps & {
11
+ type ApiSelectProps = Omit<SelectProps, 'fieldNames'> & {
12
12
  cache?: CacheType;
13
13
  /** 依赖参数 */
14
14
  defaultParams?: CCS.RecordType;
15
+ /** 接口数据字段 */
16
+ fieldNames?: {
17
+ label?: string[] | string;
18
+ value?: string[] | string;
19
+ };
15
20
  /** 查询请求 */
16
- onQuery?: (params?: any) => Promise<CCS.HttpResult<any[]>>;
21
+ onQuery?: (params?: any) => Promise<any>;
17
22
  };
23
+ export declare function getDataFromArrayField(data: Record<string, any>, fields: string[]): any;
18
24
  /**
19
25
  * 基于接口查询的select组件
20
26
  * @param CcsSelectProps
21
27
  * @returns
22
28
  */
23
- export default function CcsApiSelect({ onQuery, cache, defaultParams, ...restProps }: ApiSelectProps): import("react/jsx-runtime").JSX.Element;
29
+ export default function CcsApiSelect({ onQuery, cache, fieldNames, defaultParams, ...restProps }: ApiSelectProps): import("react/jsx-runtime").JSX.Element;
24
30
  export {};
@@ -1,5 +1,4 @@
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
- var _excluded = ["onQuery", "cache", "defaultParams"];
1
+ var _excluded = ["onQuery", "cache", "fieldNames", "defaultParams"];
3
2
  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; }
4
3
  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; }
5
4
  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; }
@@ -10,11 +9,32 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
10
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); }); }; }
11
10
  function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
12
11
  function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
12
+ 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); }
13
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
14
+ function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
15
+ 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); }
16
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
17
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
18
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
13
19
  import { useRequest } from 'ahooks';
14
20
  import { Select } from 'antd';
15
- import _isArray from 'lodash.isarray';
16
21
  import { useEffect } from 'react';
17
22
  import { jsx as _jsx } from "react/jsx-runtime";
23
+ export function getDataFromArrayField(data, fields) {
24
+ if (!data || fields.length === 0) return;
25
+ var newFields = _toConsumableArray(fields);
26
+ var field = newFields.shift();
27
+ var newData = data[field];
28
+ if (_typeof(newData) === 'object' && newFields.length > 0) {
29
+ return getDataFromArrayField(newData, newFields);
30
+ }
31
+ return newData;
32
+ }
33
+ function onIsArray(data) {
34
+ if (Array.isArray(data)) return data;
35
+ return [data];
36
+ }
37
+
18
38
  /**
19
39
  * 基于接口查询的select组件
20
40
  * @param CcsSelectProps
@@ -23,12 +43,15 @@ import { jsx as _jsx } from "react/jsx-runtime";
23
43
  export default function CcsApiSelect(_ref) {
24
44
  var onQuery = _ref.onQuery,
25
45
  cache = _ref.cache,
46
+ fieldNames = _ref.fieldNames,
26
47
  _ref$defaultParams = _ref.defaultParams,
27
48
  defaultParams = _ref$defaultParams === void 0 ? {} : _ref$defaultParams,
28
49
  restProps = _objectWithoutProperties(_ref, _excluded);
50
+ var labelField = _toConsumableArray(onIsArray((fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) || ['data', 'label']));
51
+ var valueField = _toConsumableArray(onIsArray((fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) || ['data', 'value']));
29
52
  var _useRequest = useRequest( /*#__PURE__*/function () {
30
53
  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
31
- var result;
54
+ var result, value;
32
55
  return _regeneratorRuntime().wrap(function _callee$(_context) {
33
56
  while (1) switch (_context.prev = _context.next) {
34
57
  case 0:
@@ -36,14 +59,31 @@ export default function CcsApiSelect(_ref) {
36
59
  return onQuery(params);
37
60
  case 2:
38
61
  result = _context.sent;
39
- if (!(result !== null && result !== void 0 && result.success && result.data && _isArray(result.data))) {
40
- _context.next = 5;
62
+ case 3:
63
+ if (!(labelField.length > 0 || valueField.length > 0)) {
64
+ _context.next = 12;
41
65
  break;
42
66
  }
43
- return _context.abrupt("return", result.data);
44
- case 5:
45
- return _context.abrupt("return", []);
46
- case 6:
67
+ if (!Array.isArray(result)) {
68
+ _context.next = 7;
69
+ break;
70
+ }
71
+ result.forEach(function (r) {
72
+ r.label = getDataFromArrayField(r, labelField);
73
+ r.value = getDataFromArrayField(r, valueField);
74
+ });
75
+ return _context.abrupt("break", 12);
76
+ case 7:
77
+ labelField.shift();
78
+ value = valueField.shift();
79
+ if (value) {
80
+ result = result[value];
81
+ }
82
+ _context.next = 3;
83
+ break;
84
+ case 12:
85
+ return _context.abrupt("return", result);
86
+ case 13:
47
87
  case "end":
48
88
  return _context.stop();
49
89
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ccs-ui/rc-pro",
3
- "version": "2.1.1",
3
+ "version": "2.1.3",
4
4
  "description": "",
5
5
  "license": "MIT",
6
6
  "author": {