@ccs-ui/rc-pro 2.4.9 → 2.5.0

package/es/atom/_api.d.ts

@@ -3,7 +3,7 @@ import { ButtonProps, FormInstance, FormProps, PopoverProps, TableProps } from '
 import { CheckboxGroupProps } from 'antd/es/checkbox';
 import { SizeType } from 'antd/es/config-provider/SizeContext';
 import { ReactElement, ReactNode } from 'react';
-import { FormItemProps, PageFieldNames, PropsWithChildren, PropsWithCss } from '../ccs';
+import { ApiRequestProps, FormItemProps, PageFieldNames, PropsWithChildren, PropsWithCss, SelectFieldNames } from '../ccs';
 export type AtomOperationProps<T> = PropsWithChildren<T> & PropsWithCss & {
     /** 左侧扩展按钮 */
     extraLeft?: ReactNode;
@@ -69,20 +69,27 @@ export interface AtomFullScreenProps {
     /** 全屏父节点ID */
     parentHtmlId?: string;
 }
-export interface AtomCheckboxProps {
-    /** 按钮样式 */
-    btnProps?: ButtonProps;
-    /** 全选 */
-    isAll?: boolean;
+export interface AtomCheckboxProps extends PropsWithCss {
+    popoverMode?: Omit<PopoverProps, 'content'>;
+    /** 全选, @default true */
+    showAll?: boolean;
+    /** 字段名配置 */
+    fieldNames?: SelectFieldNames;
     /** 选项 */
     options?: CheckboxGroupProps['options'];
-    /** 位置 */
-    placement?: PopoverProps['placement'];
     /** 默认选中项 */
-    defaultCheckedKeys?: string[];
+    defaultCheckedKeys?: React.Key[];
+    /** 是否加载中 */
+    loading?: boolean;
+    /** 选中项引用 */
+    selectedRef?: React.MutableRefObject<any>;
+    /** 选中项 */
+    value?: React.Key[];
     /** 选中改变 */
     onChange?: (keys: string[]) => void;
 }
+export interface AtomCheckboxApiProps extends AtomCheckboxProps, ApiRequestProps {
+}
 export type AtomTitleProps = PropsWithCss & PropsWithChildren;
 /** 请求事件类型 */
 export declare enum DataEvent {

package/es/atom/check-api.d.ts

@@ -0,0 +1,2 @@
+import { AtomCheckboxApiProps } from './_api';
+export default function AtomCheckboxApi(props: AtomCheckboxApiProps): import("react/jsx-runtime").JSX.Element;

package/es/atom/check-api.js

@@ -0,0 +1,34 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["request", "defaultParams", "cache"];
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import CcsUtils from '@ccs-ui/utils';
+import AtomCheckbox from "./check";
+import useApiRequest from "./useApiRequest";
+import { jsx as _jsx } from "react/jsx-runtime";
+export default function AtomCheckboxApi(props) {
+  var request = props.request,
+    defaultParams = props.defaultParams,
+    cache = props.cache,
+    checkProps = _objectWithoutProperties(props, _excluded);
+  var apiProps = CcsUtils.isFunction(request) ? {
+    service: request,
+    defaultParams: defaultParams,
+    cache: cache
+  } : request;
+  var _useApiRequest = useApiRequest(apiProps),
+    _useApiRequest$data = _useApiRequest.data,
+    data = _useApiRequest$data === void 0 ? [] : _useApiRequest$data,
+    loading = _useApiRequest.loading;
+
+  // 全选事
+  return /*#__PURE__*/_jsx(AtomCheckbox, _objectSpread({
+    options: data,
+    loading: loading
+  }, checkProps));
+}

package/es/atom/check.js

@@ -10,49 +10,84 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { SettingOutlined } from '@ant-design/icons';
-import { Button, Checkbox, Divider, Popover } from 'antd';
-import { useState } from 'react';
+import { Checkbox, Divider, Popover } from 'antd';
+import classNames from 'classnames';
+import { useEffect, useState } from 'react';
 import { classAtomPrefix } from '.';
+import { CcsAtom } from '..';
+import useFieldOptions from "./useFieldOptions";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var CheckboxGroup = Checkbox.Group;
 export default function AtomCheckbox(props) {
-  var isAll = props.isAll,
-    btnProps = props.btnProps,
+  var style = props.style,
+    value = props.value,
+    className = props.className,
+    loading = props.loading,
+    showAll = props.showAll,
+    popoverMode = props.popoverMode,
     _props$options = props.options,
     options = _props$options === void 0 ? [] : _props$options,
     _props$defaultChecked = props.defaultCheckedKeys,
-    defaultCheckedKeys = _props$defaultChecked === void 0 ? [] : _props$defaultChecked;
+    defaultCheckedKeys = _props$defaultChecked === void 0 ? [] : _props$defaultChecked,
+    fieldNames = props.fieldNames,
+    selectedRef = props.selectedRef;
+
+  // 是否受控
+  var hasValue = ('value' in props);
   var _useState = useState(defaultCheckedKeys),
     _useState2 = _slicedToArray(_useState, 2),
     checkedList = _useState2[0],
     setCheckedList = _useState2[1];
 
+  // 当前选中项
+  var checkedKeys = hasValue ? value : checkedList;
+
+  // 选项
+  var selectOptions = useFieldOptions(options, {
+    fieldNames: fieldNames
+  }) || [];
+
   // 选中改变事件
   var onChange = function onChange(keys) {
     var _props$onChange;
-    setCheckedList(keys);
+    if (!hasValue) setCheckedList(keys);
     (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, keys);
+    if (selectedRef) selectedRef.current = selectOptions.filter(function (option) {
+      var value = _typeof(option) === 'object' ? option.value : option;
+      return keys.includes(value);
+    });
   };
 
+  // selectedRef 默认已选择的数据
+  useEffect(function () {
+    if (!selectedRef) return;
+    var defaultKeys = hasValue ? value : defaultCheckedKeys;
+    if (defaultKeys && defaultKeys.length > 0) {
+      selectedRef.current = selectOptions.filter(function (option) {
+        var value = _typeof(option) === 'object' ? option.value : option;
+        return defaultKeys.includes(value);
+      });
+    }
+  }, [selectOptions]);
+
   // 全选事件
   var onCheckAllChange = function onCheckAllChange(e) {
-    var _props$onChange2;
-    var keys = e.target.checked ? options.map(function (o) {
+    var keys = e.target.checked ? selectOptions.map(function (o) {
       return _typeof(o) === 'object' ? o.value : o;
     }) : [];
-    setCheckedList(keys);
-    (_props$onChange2 = props.onChange) === null || _props$onChange2 === void 0 || _props$onChange2.call(props, keys);
+    onChange(keys);
   };
-  var renderCheckAll = function renderCheckAll() {
-    if (isAll === false || !(options !== null && options !== void 0 && options.length)) return;
+
+  // 渲染全选
+  var renderAll = function renderAll() {
+    if (showAll === false || !(selectOptions !== null && selectOptions !== void 0 && selectOptions.length)) return;
 
     // 全选
-    var checkAll = options.length === checkedList.length;
+    var checkAll = selectOptions.length === checkedKeys.length;
     // 半选
-    var indeterminate = checkedList.length > 0 && checkedList.length < options.length;
+    var indeterminate = checkedKeys.length > 0 && checkedKeys.length < selectOptions.length;
     return /*#__PURE__*/_jsxs(_Fragment, {
       children: [/*#__PURE__*/_jsx(Checkbox, {
         indeterminate: indeterminate,
@@ -66,21 +101,20 @@ export default function AtomCheckbox(props) {
       })]
     });
   };
-  return /*#__PURE__*/_jsx(_Fragment, {
-    children: /*#__PURE__*/_jsx(Popover, {
-      placement: props.placement,
-      content: /*#__PURE__*/_jsxs(_Fragment, {
-        children: [renderCheckAll(), /*#__PURE__*/_jsx(CheckboxGroup, {
-          className: "".concat(classAtomPrefix, "-check"),
-          options: options,
-          value: checkedList,
-          onChange: onChange
-        })]
-      }),
-      children: /*#__PURE__*/_jsx(Button, _objectSpread({
-        type: "text",
-        icon: /*#__PURE__*/_jsx(SettingOutlined, {})
-      }, btnProps))
-    })
+  var content = /*#__PURE__*/_jsxs(CcsAtom.Spin, {
+    spinning: loading === true,
+    children: [renderAll(), /*#__PURE__*/_jsx(CheckboxGroup, {
+      style: style,
+      className: classNames("".concat(classAtomPrefix, "-check-group"), className),
+      options: selectOptions,
+      value: checkedKeys,
+      onChange: onChange
+    })]
   });
+  if (popoverMode) {
+    return /*#__PURE__*/_jsx(Popover, _objectSpread(_objectSpread({}, popoverMode), {}, {
+      content: content
+    }));
+  }
+  return content;
 }

package/es/atom/ellipsis.js

@@ -118,6 +118,7 @@ function Ellipsis(_ref2) {
       // 二分量
       var newStepNum = Math.round(dataRef.current.step / 2);
       dataRef.current.step = newStepNum;
+      if (!walkingContentRef.current) return;
       var dom = walkingContentRef.current;
       // 内容没有超出最大高度
       if (dom.offsetHeight === dom.scrollHeight) {

package/es/atom/index.d.ts

@@ -1,11 +1,15 @@
 /// <reference types="react" />
 import AtomCheckbox from './check';
+import AtomCheckboxApi from './check-api';
 import AtomFullScreen from './full-screen';
 import './index.less';
 import AtomOperation from './operation';
 import AtomResize from './resize-observer';
+import AtomSpin from './spin';
 import AtomTitle from './title';
+import useApiRequest from './useApiRequest';
 import useComplexState from './useComplexState';
+import useFieldOptions from './useFieldOptions';
 import usePageRequest from './usePageRequest';
 export declare const classAtomPrefix = "ccs-atom";
 /**
@@ -28,6 +32,8 @@ declare const Atom: {
     Operation: typeof AtomOperation;
     /** Checkbox */
     Checkbox: typeof AtomCheckbox;
+    /** Checkbox - API方式 */
+    CheckboxApi: typeof AtomCheckboxApi;
     /** 全屏 */
     FullScreen: typeof AtomFullScreen;
     /** 标题 */
@@ -45,15 +51,21 @@ declare const Atom: {
         (props: import("../ccs").AtomEllipsisProps): import("react/jsx-runtime").JSX.Element | "";
         displayName: string;
     }>;
-    /** 分页请求hooks */
-    usePageRequest: typeof usePageRequest;
-    /** 多状态管理 */
-    useComplexState: typeof useComplexState;
     /** 相对loading */
     Loading: {
         ({ loading, loadingTip }: import("../ccs").AtomLoadingProps): import("react/jsx-runtime").JSX.Element | null;
         displayName: string;
     };
+    /** Spin */
+    Spin: typeof AtomSpin;
+    /** 分页请求hooks */
+    usePageRequest: typeof usePageRequest;
+    /** 多状态管理 */
+    useComplexState: typeof useComplexState;
+    /** 根据字段名获取选项 */
+    useFieldOptions: typeof useFieldOptions;
+    /** API请求hooks */
+    useApiRequest: typeof useApiRequest;
     displayName: string;
 };
 export default Atom;

package/es/atom/index.js

@@ -1,4 +1,5 @@
 import AtomCheckbox from "./check";
+import AtomCheckboxApi from "./check-api";
 import AtomCountdown from "./count-down";
 import AtomEllipsis from "./ellipsis";
 import AtomFilter from "./filter";
@@ -7,8 +8,11 @@ import "./index.less";
 import AtomLoading from "./loading";
 import AtomOperation from "./operation";
 import AtomResize from "./resize-observer";
+import AtomSpin from "./spin";
 import AtomTitle from "./title";
+import useApiRequest from "./useApiRequest";
 import useComplexState from "./useComplexState";
+import useFieldOptions from "./useFieldOptions";
 import usePageRequest from "./usePageRequest";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -30,6 +34,9 @@ Atom.Operation = AtomOperation;
 /** Checkbox */
 Atom.Checkbox = AtomCheckbox;
 
+/** Checkbox - API方式 */
+Atom.CheckboxApi = AtomCheckboxApi;
+
 /** 全屏 */
 Atom.FullScreen = AtomFullScreen;
 
@@ -45,14 +52,23 @@ Atom.Countdown = AtomCountdown;
 /** 文本缩略 */
 Atom.Ellipsis = AtomEllipsis;
 
+/** 相对loading */
+Atom.Loading = AtomLoading;
+
+/** Spin */
+Atom.Spin = AtomSpin;
+
 /** 分页请求hooks */
 Atom.usePageRequest = usePageRequest;
 
 /** 多状态管理 */
 Atom.useComplexState = useComplexState;
 
-/** 相对loading */
-Atom.Loading = AtomLoading;
+/** 根据字段名获取选项 */
+Atom.useFieldOptions = useFieldOptions;
+
+/** API请求hooks */
+Atom.useApiRequest = useApiRequest;
 if (process.env.NODE_ENV !== 'production') {
   Atom.displayName = 'CcsAtom';
 }

package/es/atom/index.less

@@ -56,11 +56,35 @@
   z-index: 9999;
 }
 
-.ccs-atom-check {
+.ccs-atom-check-header {
   display: flex;
-  max-height: 300px;
-  overflow: auto;
-  flex-flow: column nowrap;
+  justify-content: space-between;
+  align-items: center;
+  gap: 16px;
+
+  :first-child {
+    flex: 0 0 auto;
+  }
+  :last-child {
+    max-width: 200px;
+    flex: 1 1 auto;
+  }
+}
+
+.ccs-atom-check-group {
+  display: flex;
+  flex-flow: column;
+  > label {
+    > span:first-child {
+      flex: 0 0 auto;
+    }
+    > span:last-child {
+      flex: 1 1 auto;
+      text-overflow: ellipsis;
+      overflow: hidden;
+      white-space: nowrap;
+    }
+  }
 }
 
 .ccs-ellipsis {

package/es/atom/spin.d.ts

@@ -0,0 +1,2 @@
+import { SpinProps } from 'antd';
+export default function AtomSpin(props: SpinProps): import("react/jsx-runtime").JSX.Element;

package/es/atom/spin.js

@@ -0,0 +1,16 @@
+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); }
+import { LoadingOutlined } from '@ant-design/icons';
+import { Spin } from 'antd';
+import { jsx as _jsx } from "react/jsx-runtime";
+export default function AtomSpin(props) {
+  return /*#__PURE__*/_jsx(Spin, _objectSpread({
+    indicator: /*#__PURE__*/_jsx(LoadingOutlined, {
+      spin: true
+    })
+  }, props));
+}

package/es/atom/useApiRequest.d.ts

@@ -0,0 +1,5 @@
+import { RequestType } from '../ccs';
+export default function useApiRequest(props: RequestType): {
+    loading: boolean;
+    data: any;
+};

package/es/atom/useApiRequest.js

@@ -0,0 +1,55 @@
+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); }
+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); }); }; }
+import { useRequest } from 'ahooks';
+import { useEffect } from 'react';
+export default function useApiRequest(props) {
+  var _ref = props || {},
+    service = _ref.service,
+    defaultParams = _ref.defaultParams,
+    _ref$cache = _ref.cache,
+    cache = _ref$cache === void 0 ? {} : _ref$cache;
+  var _useRequest = useRequest( /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              if (service) {
+                _context.next = 2;
+                break;
+              }
+              return _context.abrupt("return", undefined);
+            case 2:
+              _context.next = 4;
+              return service(params);
+            case 4:
+              return _context.abrupt("return", _context.sent);
+            case 5:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
+      }));
+      return function (_x) {
+        return _ref2.apply(this, arguments);
+      };
+    }(), _objectSpread({
+      manual: true
+    }, cache)),
+    loading = _useRequest.loading,
+    data = _useRequest.data,
+    run = _useRequest.run;
+  useEffect(function () {
+    if (service) run(defaultParams);
+  }, [JSON.stringify(defaultParams)]);
+  return {
+    loading: loading,
+    data: data
+  };
+}

package/es/atom/useFieldOptions.d.ts

@@ -0,0 +1,12 @@
+import { SelectFieldNames } from '../ccs';
+/** 根据字段名获取选项 */
+export default function useFieldOptions(
+/** 选项数据 */
+options: any[], 
+/** 额外配置 */
+extra: {
+    /** 字段名配置 */
+    fieldNames?: SelectFieldNames;
+    /** 默认选项 */
+    defaultOptions?: any;
+}): any[];

package/es/atom/useFieldOptions.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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+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."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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; }
+import { useMemo } from 'react';
+import { getDataByNamePath } from "../utils";
+function onIsArray(data) {
+  if (Array.isArray(data)) return data;
+  return [data];
+}
+
+/** 根据字段名获取选项 */
+export default function useFieldOptions( /** 选项数据 */
+options, /** 额外配置 */
+extra) {
+  var _extra$fieldNames, _extra$fieldNames2;
+  var labelField = _toConsumableArray(onIsArray((extra === null || extra === void 0 || (_extra$fieldNames = extra.fieldNames) === null || _extra$fieldNames === void 0 ? void 0 : _extra$fieldNames.label) || ['label']));
+  var valueField = _toConsumableArray(onIsArray((extra === null || extra === void 0 || (_extra$fieldNames2 = extra.fieldNames) === null || _extra$fieldNames2 === void 0 ? void 0 : _extra$fieldNames2.value) || ['value']));
+
+  // 选项
+  var selectOptions = useMemo(function () {
+    var ops = options || [];
+    while (labelField.length > 0 || valueField.length > 0) {
+      if (Array.isArray(ops)) {
+        ops.forEach(function (r) {
+          if (_typeof(r) !== 'object') return;
+          r.label = getDataByNamePath(r, labelField);
+          r.value = getDataByNamePath(r, valueField);
+        });
+        break;
+      }
+      labelField.shift();
+      var value = valueField.shift();
+      if (value && ops !== undefined) {
+        ops = ops[value];
+      }
+    }
+
+    // 默认选项
+    if (extra !== null && extra !== void 0 && extra.defaultOptions) {
+      return Array.isArray(extra === null || extra === void 0 ? void 0 : extra.defaultOptions) ? extra.defaultOptions.concat(ops) : [extra.defaultOptions].concat(ops);
+    }
+    return ops;
+  }, [options]);
+  return selectOptions;
+}

package/es/dialog/button.d.ts

@@ -5,7 +5,7 @@ import { DialogFormRef } from './form';
 export type DialogButtonRef = {
     onSetButtons: (e: React.ReactElement) => void;
 };
-export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<DialogModalProps<TParams, TData>, "onClose" | "request" | "onOk" | "auth" | "extraBtn" | "preventRequestHandle" | "requestFieldNames"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<DialogModalProps<TParams, TData>, "auth" | "request" | "onOk" | "onClose" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/pro-table/table.js

@@ -10,8 +10,9 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+import { SettingOutlined } from '@ant-design/icons';
 import { useUpdateEffect } from 'ahooks';
-import { theme as antTheme, Empty } from 'antd';
+import { theme as antTheme, Button, Empty } from 'antd';
 import { ConfigContext } from 'antd/es/config-provider';
 import classNames from 'classnames';
 import React, { useContext, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
@@ -41,7 +42,7 @@ function onDefaultColumnValue(columns) {
         value: c.dataIndex
       });
     }
-    if (c.hidden !== true) {
+    if (c.hidden !== true && !!c.dataIndex) {
       defaultValue.columnShowKeys.push(c.dataIndex);
     }
 
@@ -411,9 +412,18 @@ var InternalProTable = function InternalProTable(props) {
     children: [/*#__PURE__*/_jsx(CcsAtom.FullScreen, {
       parentHtmlId: "ccs-pro-table"
     }), /*#__PURE__*/_jsx(CcsAtom.Checkbox, {
+      style: {
+        maxHeight: 300
+      },
       options: defaultColumnValues.columnOptions,
       defaultCheckedKeys: defaultColumnValues.columnShowKeys,
-      placement: "bottomRight",
+      popoverMode: {
+        placement: 'bottomRight',
+        children: /*#__PURE__*/_jsx(Button, {
+          type: "text",
+          icon: /*#__PURE__*/_jsx(SettingOutlined, {})
+        })
+      },
       onChange: function onChange(e) {
         var _tableRef$current2;
         var hideKeys = defaultColumnValues.columnShowKeys.filter(function (key) {