assui 3.2.105 → 3.2.106

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

@@ -12,7 +12,7 @@ export interface ComplexValSelectOptionType extends Omit<DefaultOptionType, 'val
 export declare const isReferenceTypeOption: (options?: ComplexValSelectOptionType[]) => boolean;
 export interface ComplexValSelectProps<T> extends Omit<SelectProps, 'value' | 'onChange' | 'options'> {
     value?: T;
-    onChange?: (val: T, opt?: ComplexValSelectOptionType[]) => void;
+    onChange?: (val: T, opt?: ComplexValSelectOptionType | ComplexValSelectOptionType[]) => void;
     options?: ComplexValSelectOptionType[];
 }
 declare const ComplexValSelect: React.ForwardRefExoticComponent<ComplexValSelectProps<ComplexValSelectValueType> & React.RefAttributes<unknown>>;

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

@@ -32,10 +32,10 @@ var __read = this && this.__read || function (o, n) {
 };
 import * as React from 'react';
 import omit from 'lodash/omit';
-import find from 'lodash/find';
 import some from 'lodash/some';
 import isArray from 'lodash/isArray';
 import isObject from 'lodash/isObject';
+import isUndefined from 'lodash/isUndefined';
 import Select from "antd/es/select";
 import classNames from 'classnames';
 import ArrowDownOutlined from "a-icons/es/ArrowDownOutlined";
@@ -50,7 +50,7 @@ var _formatOptions = function formatOptions(dateSource) {
       } : {};
       return __assign(__assign(__assign({}, item), {
         label: item.label,
-        value: item.value ? JSON.stringify(item.value) : undefined
+        value: isUndefined(item.value) ? undefined : JSON.stringify(item.value)
       }), otherProps);
     });
     return options;
@@ -85,25 +85,35 @@ var ComplexValSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
   // 判断是否需要将optionValue转为JSON字符串
   var isReferenceTypeVal = isReferenceTypeOption(options);
   var finalOptions = isReferenceTypeVal ? _formatOptions(options) : options;
-  var handleChange = function handleChange(val) {
-    var nextVal = val && isReferenceTypeVal ? JSON.parse(val) : val;
-    setValue(nextVal, options);
+  var handleChange = function handleChange(val, option) {
+    var nextVal = val;
+    if (val && isReferenceTypeVal) {
+      nextVal = isArray(val) ? val.map(function (item) {
+        return JSON.parse(item);
+      }) : JSON.parse(val);
+    }
+    setValue(nextVal, option);
   };
-  var handleSelect = function handleSelect(val) {
+  var handleSelect = function handleSelect(val, option) {
     var nextVal = val && isReferenceTypeVal ? JSON.parse(val) : val;
-    var selectOption = find(finalOptions, {
-      value: val
-    });
-    onSelect === null || onSelect === void 0 ? void 0 : onSelect(nextVal, selectOption);
+    onSelect === null || onSelect === void 0 ? void 0 : onSelect(nextVal, option);
   };
+  var displayValue = React.useMemo(function () {
+    if (value && isReferenceTypeVal) {
+      return isArray(value) ? value.map(function (v) {
+        return JSON.stringify(v);
+      }) : JSON.stringify(value);
+    }
+    return value;
+  }, [value, isReferenceTypeVal]);
   return /*#__PURE__*/React.createElement(Select, __assign({
     ref: selectRef,
     className: classNames('complex-val-select', props === null || props === void 0 ? void 0 : props.className),
     suffixIcon: /*#__PURE__*/React.createElement(ArrowDownOutlined, null),
-    value: value && isReferenceTypeVal ? JSON.stringify(value) : value,
+    value: displayValue,
     options: finalOptions,
     onChange: handleChange,
     onSelect: handleSelect
-  }, omit(props, ['value', 'onChange', 'options', 'onSelect', 'className'])));
+  }, omit(props, ['value', 'defaultValue', 'onChange', 'options', 'onSelect', 'className'])));
 });
 export default ComplexValSelect;

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

@@ -12,7 +12,7 @@ export interface ComplexValSelectOptionType extends Omit<DefaultOptionType, 'val
 export declare const isReferenceTypeOption: (options?: ComplexValSelectOptionType[]) => boolean;
 export interface ComplexValSelectProps<T> extends Omit<SelectProps, 'value' | 'onChange' | 'options'> {
     value?: T;
-    onChange?: (val: T, opt?: ComplexValSelectOptionType[]) => void;
+    onChange?: (val: T, opt?: ComplexValSelectOptionType | ComplexValSelectOptionType[]) => void;
     options?: ComplexValSelectOptionType[];
 }
 declare const ComplexValSelect: React.ForwardRefExoticComponent<ComplexValSelectProps<ComplexValSelectValueType> & React.RefAttributes<unknown>>;

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

@@ -74,10 +74,10 @@ Object.defineProperty(exports, "__esModule", {
 exports.isReferenceTypeOption = exports.Option = void 0;
 var React = __importStar(require("react"));
 var omit_1 = __importDefault(require("lodash/omit"));
-var find_1 = __importDefault(require("lodash/find"));
 var some_1 = __importDefault(require("lodash/some"));
 var isArray_1 = __importDefault(require("lodash/isArray"));
 var isObject_1 = __importDefault(require("lodash/isObject"));
+var isUndefined_1 = __importDefault(require("lodash/isUndefined"));
 var select_1 = __importDefault(require("antd/lib/select"));
 var classnames_1 = __importDefault(require("classnames"));
 var ArrowDownOutlined_1 = __importDefault(require("a-icons/lib/ArrowDownOutlined"));
@@ -92,7 +92,7 @@ var _formatOptions = function formatOptions(dateSource) {
       } : {};
       return __assign(__assign(__assign({}, item), {
         label: item.label,
-        value: item.value ? JSON.stringify(item.value) : undefined
+        value: (0, isUndefined_1["default"])(item.value) ? undefined : JSON.stringify(item.value)
       }), otherProps);
     });
     return options;
@@ -128,25 +128,35 @@ var ComplexValSelect = React.forwardRef(function (props, ref) {
   // 判断是否需要将optionValue转为JSON字符串
   var isReferenceTypeVal = (0, exports.isReferenceTypeOption)(options);
   var finalOptions = isReferenceTypeVal ? _formatOptions(options) : options;
-  var handleChange = function handleChange(val) {
-    var nextVal = val && isReferenceTypeVal ? JSON.parse(val) : val;
-    setValue(nextVal, options);
+  var handleChange = function handleChange(val, option) {
+    var nextVal = val;
+    if (val && isReferenceTypeVal) {
+      nextVal = (0, isArray_1["default"])(val) ? val.map(function (item) {
+        return JSON.parse(item);
+      }) : JSON.parse(val);
+    }
+    setValue(nextVal, option);
   };
-  var handleSelect = function handleSelect(val) {
+  var handleSelect = function handleSelect(val, option) {
     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, selectOption);
+    onSelect === null || onSelect === void 0 ? void 0 : onSelect(nextVal, option);
   };
+  var displayValue = React.useMemo(function () {
+    if (value && isReferenceTypeVal) {
+      return (0, isArray_1["default"])(value) ? value.map(function (v) {
+        return JSON.stringify(v);
+      }) : JSON.stringify(value);
+    }
+    return value;
+  }, [value, isReferenceTypeVal]);
   return React.createElement(select_1["default"], __assign({
     ref: selectRef,
     className: (0, classnames_1["default"])('complex-val-select', props === null || props === void 0 ? void 0 : props.className),
     suffixIcon: React.createElement(ArrowDownOutlined_1["default"], null),
-    value: value && isReferenceTypeVal ? JSON.stringify(value) : value,
+    value: displayValue,
     options: finalOptions,
     onChange: handleChange,
     onSelect: handleSelect
-  }, (0, omit_1["default"])(props, ['value', 'onChange', 'options', 'onSelect', 'className'])));
+  }, (0, omit_1["default"])(props, ['value', 'defaultValue', 'onChange', 'options', 'onSelect', 'className'])));
 });
 exports["default"] = ComplexValSelect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "3.2.105",
+  "version": "3.2.106",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -87,5 +87,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "339f0ad113cd267b75bf7ae54131dd66e0034a28"
+  "gitHead": "a733655570b6114592c403f0a0e9df03f438e686"
 }