@ccs-ui/rc-pro 2.3.6-alpha-1 → 2.3.6-alpha-2

package/es/dialog/button.d.ts

@@ -16,7 +16,7 @@ export type DialogButtonsProps<T> = Pick<CcsDialogModalProps, 'okText' | 'onClos
 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<CcsDialogModalProps<TParams, TData>, "auth" | "request" | "onClose" | "onOk" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "onClose" | "auth" | "request" | "onOk" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/hooks/use-selection.js

@@ -41,14 +41,17 @@ export default function useTableSelection(props) {
     }
   });
   var handleOnChange = useMemoizedFn(function () {
-    var _selectionRef$current = selectionRef.current.selectedRowKeys,
-      selectedRowKeys = _selectionRef$current === void 0 ? [] : _selectionRef$current;
+    var _selectionRef$current = selectionRef.current,
+      _selectionRef$current2 = _selectionRef$current.selectedRowKeys,
+      selectedRowKeys = _selectionRef$current2 === void 0 ? [] : _selectionRef$current2,
+      selectedRows = _selectionRef$current.selectedRows;
     if (multiple) {
       // 受控调用onChange
       onChangeValue === null || onChangeValue === void 0 || onChangeValue(selectedRowKeys);
     } else {
       onChangeValue === null || onChangeValue === void 0 || onChangeValue(selectedRowKeys[0]);
     }
+    onChangeRows === null || onChangeRows === void 0 || onChangeRows(selectedRows || []);
     if (!onChangeValue) setUpdate({});
   });
 
@@ -66,8 +69,8 @@ export default function useTableSelection(props) {
   // value 变更,与当前选中数据不匹配
   useUpdateEffect(function () {
     if (isEq(value, selectionRef.current.selectedRowKeys)) {
-      var _selectionRef$current2;
-      var rows = (_selectionRef$current2 = selectionRef.current.selectedRows) === null || _selectionRef$current2 === void 0 ? void 0 : _selectionRef$current2.filter(function () {
+      var _selectionRef$current3;
+      var rows = (_selectionRef$current3 = selectionRef.current.selectedRows) === null || _selectionRef$current3 === void 0 ? void 0 : _selectionRef$current3.filter(function () {
         var _ref2;
         var row = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         return (_ref2 = value || []) === null || _ref2 === void 0 ? void 0 : _ref2.includes(row[keyField]);
@@ -101,7 +104,6 @@ export default function useTableSelection(props) {
         }
       });
     }
-    onChangeRows === null || onChangeRows === void 0 || onChangeRows(rows);
     handleOnChange();
   });
 
@@ -117,11 +119,11 @@ export default function useTableSelection(props) {
         }
       };
     } else {
-      var _selectionRef$current3 = selectionRef.current,
-        _selectionRef$current4 = _selectionRef$current3.selectedRowKeys,
-        selectedRowKeys = _selectionRef$current4 === void 0 ? [] : _selectionRef$current4,
-        _selectionRef$current5 = _selectionRef$current3.selectedRows,
-        selectedRows = _selectionRef$current5 === void 0 ? [] : _selectionRef$current5;
+      var _selectionRef$current4 = selectionRef.current,
+        _selectionRef$current5 = _selectionRef$current4.selectedRowKeys,
+        selectedRowKeys = _selectionRef$current5 === void 0 ? [] : _selectionRef$current5,
+        _selectionRef$current6 = _selectionRef$current4.selectedRows,
+        selectedRows = _selectionRef$current6 === void 0 ? [] : _selectionRef$current6;
       var newRows = selectedRows.filter(function () {
         var r = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         return r[keyField] !== key;

package/es/select/customize.d.ts

@@ -12,13 +12,15 @@ export type SelectChildrenProps = {
     /** 更改select options */
     onChangeOptions?: (options: any[]) => void;
     /** 自定义显示选中详情 */
-    onChangeLabel?: (labelText: string) => void;
+    onChangeLabel?: (labelText?: string) => void;
 };
 export interface CustomizeSelectProps extends Omit<SelectProps, 'children'> {
     /** 选择触发器宽度 */
     width?: number;
     /** 内容宽度 */
     contentWidth?: number;
+    /** 单选自动关闭弹框 */
+    autoClose?: boolean;
     /** 自定义内容 */
     children: ReactElement | ((props: SelectChildrenProps) => ReactNode);
     /** form item value */
@@ -31,5 +33,5 @@ export interface CustomizeSelectProps extends Omit<SelectProps, 'children'> {
  * @param SelectCustomizeProps
  * @returns
  */
-declare function SelectIndex({ width, title, value, style, mode, children, contentWidth, onChange, ...otherProps }: CustomizeSelectProps): import("react/jsx-runtime").JSX.Element;
+declare function SelectIndex({ width, title, value, style, mode, children, autoClose, contentWidth, onChange, ...otherProps }: CustomizeSelectProps): import("react/jsx-runtime").JSX.Element;
 export default SelectIndex;

package/es/select/customize.js

@@ -1,5 +1,5 @@
 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 = ["width", "title", "value", "style", "mode", "children", "contentWidth", "onChange"];
+var _excluded = ["width", "title", "value", "style", "mode", "children", "autoClose", "contentWidth", "onChange"];
 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; }
@@ -31,6 +31,7 @@ function SelectIndex(_ref) {
     style = _ref.style,
     mode = _ref.mode,
     children = _ref.children,
+    autoClose = _ref.autoClose,
     contentWidth = _ref.contentWidth,
     _onChange = _ref.onChange,
     otherProps = _objectWithoutProperties(_ref, _excluded);
@@ -66,7 +67,8 @@ function SelectIndex(_ref) {
     onClose: onClose,
     onChange: function onChange(e) {
       _onChange === null || _onChange === void 0 || _onChange(e);
-      if (!isMulti) setOpen(false);
+      // 单选关闭弹框
+      if (!isMulti && autoClose !== false) setOpen(false);
     },
     onChangeLabel: setLabelText,
     multiple: isMulti,
@@ -111,7 +113,11 @@ function SelectIndex(_ref) {
     }
   }, [open]);
   var renderValueText = function renderValueText() {
-    if (value === undefined) return value;
+    if (value === undefined || Array.isArray(value) && value.length === 0) {
+      return undefined;
+    }
+
+    // 优先显示 labelText
     if (!!labelText) return labelText;
     return value;
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.3.6-alpha-1",
+  "version": "2.3.6-alpha-2",
   "description": "",
   "license": "MIT",
   "author": {