assui 3.1.69 → 3.1.70

package/es/complex-val-select/index.d.ts

@@ -1,11 +1,17 @@
 import * as React from 'react';
-import type { SelectProps } from 'antd/lib/select';
+import type { BaseOptionType, SelectProps } from 'antd/lib/select';
 declare const Option: import("rc-select/lib/Option").OptionFC;
 export { Option };
-export declare type ValueType = string | number | any[] | Record<string, any> | null | undefined;
-export interface ComplexValSelectProps<T> extends Omit<SelectProps, 'value' | 'onChange'> {
+export declare type ComplexValSelectValueType = string | number | any[] | Record<string, any> | null | undefined;
+export interface ComplexValSelectOptionType extends BaseOptionType {
+    label: React.ReactNode;
+    value?: ComplexValSelectValueType;
+    children?: Omit<ComplexValSelectOptionType, 'children'>[];
+}
+export interface ComplexValSelectProps<T> extends Omit<SelectProps, 'value' | 'onChange' | 'options'> {
     value?: T;
-    onChange?: (val: T, opt: SelectProps['options']) => void;
+    onChange?: (val: T, opt?: ComplexValSelectOptionType[]) => void;
+    options?: ComplexValSelectOptionType[];
 }
-declare const ComplexValSelect: React.ForwardRefExoticComponent<ComplexValSelectProps<ValueType> & React.RefAttributes<unknown>>;
+declare const ComplexValSelect: React.ForwardRefExoticComponent<ComplexValSelectProps<ComplexValSelectValueType> & React.RefAttributes<unknown>>;
 export default ComplexValSelect;

package/es/complex-val-select/index.js

@@ -65,23 +65,20 @@ var ComplexValSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
     });
   }) : options;
   var handleChange = function handleChange(val) {
-    var nextVal = isReferenceTypeVal ? JSON.parse(val) : val;
+    var nextVal = val && isReferenceTypeVal ? JSON.parse(val) : val;
     setValue(nextVal);
     onChange === null || onChange === void 0 ? void 0 : onChange(nextVal, options);
   };
   var handleSelect = function handleSelect(val) {
-    var nextVal = isReferenceTypeVal ? JSON.parse(val) : val;
+    var nextVal = val && isReferenceTypeVal ? JSON.parse(val) : val;
     var selectOption = find(finalOptions, {
       value: val
     });
-    onSelect === null || onSelect === void 0 ? void 0 : onSelect(nextVal, {
-      label: selectOption.label,
-      value: nextVal
-    });
+    onSelect === null || onSelect === void 0 ? void 0 : onSelect(nextVal, selectOption);
   };
   return /*#__PURE__*/React.createElement(Select, __assign({
     ref: selectRef,
-    value: isReferenceTypeVal ? JSON.stringify(value) : value,
+    value: value && isReferenceTypeVal ? JSON.stringify(value) : value,
     options: finalOptions,
     onChange: handleChange,
     onSelect: handleSelect

package/es/condition-select-input/index.d.ts

@@ -1,3 +1,4 @@
+import { ComplexValSelectProps, ComplexValSelectValueType } from '../complex-val-select';
 import type { SelectProps } from 'antd/lib/select';
 import type { ConditionInputProps } from '../condition-input';
 export declare enum InputTypeEnum {
@@ -10,16 +11,16 @@ export declare enum EntryTypeEnum {
 }
 export declare type ChangedEntryType = typeof EntryTypeEnum[keyof typeof EntryTypeEnum];
 declare type SelectOptionsType = {
-    value: number;
+    value: ComplexValSelectValueType;
     label: string;
 };
 export interface MainSelectOptionsType extends SelectOptionsType {
     children?: SelectOptionsType[];
 }
 export interface ValueType {
-    selectValue?: number | string | null;
+    selectValue?: ComplexValSelectValueType;
     inputValue?: SelectProps['value'] | ConditionInputProps['value'];
-    finalSelectValue?: SelectProps['value'] | ConditionInputProps['value'][];
+    finalSelectValue?: ComplexValSelectProps<any>['value'] | ConditionInputProps['value'][];
     changedEntryType?: ChangedEntryType;
 }
 export interface ConditionSelectInputProps {
@@ -27,11 +28,11 @@ export interface ConditionSelectInputProps {
     /** 不需要展示联动输入框的字段值 */
     hiddenInputKeys?: ValueType['selectValue'][];
     /** selectProps */
-    selectProps?: SelectProps;
+    selectProps?: ComplexValSelectProps<any>;
     /** 联动inputProps */
     conditionInputProps?: ConditionInputProps;
     /** 联动selectProps */
-    conditionSelectProps?: SelectProps;
+    conditionSelectProps?: ComplexValSelectProps<any>;
     /** onChange */
     onChange?: (value: ValueType) => void;
     /** onBlur */

package/lib/complex-val-select/index.d.ts

@@ -1,11 +1,17 @@
 import * as React from 'react';
-import type { SelectProps } from 'antd/lib/select';
+import type { BaseOptionType, SelectProps } from 'antd/lib/select';
 declare const Option: import("rc-select/lib/Option").OptionFC;
 export { Option };
-export declare type ValueType = string | number | any[] | Record<string, any> | null | undefined;
-export interface ComplexValSelectProps<T> extends Omit<SelectProps, 'value' | 'onChange'> {
+export declare type ComplexValSelectValueType = string | number | any[] | Record<string, any> | null | undefined;
+export interface ComplexValSelectOptionType extends BaseOptionType {
+    label: React.ReactNode;
+    value?: ComplexValSelectValueType;
+    children?: Omit<ComplexValSelectOptionType, 'children'>[];
+}
+export interface ComplexValSelectProps<T> extends Omit<SelectProps, 'value' | 'onChange' | 'options'> {
     value?: T;
-    onChange?: (val: T, opt: SelectProps['options']) => void;
+    onChange?: (val: T, opt?: ComplexValSelectOptionType[]) => void;
+    options?: ComplexValSelectOptionType[];
 }
-declare const ComplexValSelect: React.ForwardRefExoticComponent<ComplexValSelectProps<ValueType> & React.RefAttributes<unknown>>;
+declare const ComplexValSelect: React.ForwardRefExoticComponent<ComplexValSelectProps<ComplexValSelectValueType> & React.RefAttributes<unknown>>;
 export default ComplexValSelect;

package/lib/complex-val-select/index.js

@@ -109,23 +109,20 @@ var ComplexValSelect = React.forwardRef(function (props, ref) {
     });
   }) : options;
   var handleChange = function handleChange(val) {
-    var nextVal = isReferenceTypeVal ? JSON.parse(val) : val;
+    var nextVal = val && isReferenceTypeVal ? JSON.parse(val) : val;
     setValue(nextVal);
     onChange === null || onChange === void 0 ? void 0 : onChange(nextVal, options);
   };
   var handleSelect = function handleSelect(val) {
-    var nextVal = isReferenceTypeVal ? JSON.parse(val) : val;
+    var nextVal = val && isReferenceTypeVal ? JSON.parse(val) : val;
     var selectOption = (0, find_1["default"])(finalOptions, {
       value: val
     });
-    onSelect === null || onSelect === void 0 ? void 0 : onSelect(nextVal, {
-      label: selectOption.label,
-      value: nextVal
-    });
+    onSelect === null || onSelect === void 0 ? void 0 : onSelect(nextVal, selectOption);
   };
   return React.createElement(select_1["default"], __assign({
     ref: selectRef,
-    value: isReferenceTypeVal ? JSON.stringify(value) : value,
+    value: value && isReferenceTypeVal ? JSON.stringify(value) : value,
     options: finalOptions,
     onChange: handleChange,
     onSelect: handleSelect

package/lib/condition-select-input/index.d.ts

@@ -1,3 +1,4 @@
+import { ComplexValSelectProps, ComplexValSelectValueType } from '../complex-val-select';
 import type { SelectProps } from 'antd/lib/select';
 import type { ConditionInputProps } from '../condition-input';
 export declare enum InputTypeEnum {
@@ -10,16 +11,16 @@ export declare enum EntryTypeEnum {
 }
 export declare type ChangedEntryType = typeof EntryTypeEnum[keyof typeof EntryTypeEnum];
 declare type SelectOptionsType = {
-    value: number;
+    value: ComplexValSelectValueType;
     label: string;
 };
 export interface MainSelectOptionsType extends SelectOptionsType {
     children?: SelectOptionsType[];
 }
 export interface ValueType {
-    selectValue?: number | string | null;
+    selectValue?: ComplexValSelectValueType;
     inputValue?: SelectProps['value'] | ConditionInputProps['value'];
-    finalSelectValue?: SelectProps['value'] | ConditionInputProps['value'][];
+    finalSelectValue?: ComplexValSelectProps<any>['value'] | ConditionInputProps['value'][];
     changedEntryType?: ChangedEntryType;
 }
 export interface ConditionSelectInputProps {
@@ -27,11 +28,11 @@ export interface ConditionSelectInputProps {
     /** 不需要展示联动输入框的字段值 */
     hiddenInputKeys?: ValueType['selectValue'][];
     /** selectProps */
-    selectProps?: SelectProps;
+    selectProps?: ComplexValSelectProps<any>;
     /** 联动inputProps */
     conditionInputProps?: ConditionInputProps;
     /** 联动selectProps */
-    conditionSelectProps?: SelectProps;
+    conditionSelectProps?: ComplexValSelectProps<any>;
     /** onChange */
     onChange?: (value: ValueType) => void;
     /** onBlur */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "3.1.69",
+  "version": "3.1.70",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -80,5 +80,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "7093234ad09208aa396990803c7dcc52514eeda8"
+  "gitHead": "760171432a518656cf071adf933e1a64541b94bc"
 }