assui 3.1.41 → 3.1.43

package/es/condition-select-input/index.js

@@ -77,7 +77,7 @@ var ConditionSelectInput = function ConditionSelectInput(props) {
   /** 子选择器是否多选 */
   var isSubSelectMultiple = (conditionSelectProps === null || conditionSelectProps === void 0 ? void 0 : conditionSelectProps.mode) === 'multiple';
   useEffect(function () {
-    if (value && value.selectValue && optionsList.length) {
+    if (value && !isNil(value.selectValue) && optionsList.length) {
       var _a = __read(optionsList.filter(function (item) {
           return item.value === value.selectValue;
         }), 1),
@@ -95,7 +95,7 @@ var ConditionSelectInput = function ConditionSelectInput(props) {
     };
     if (isSubSelectMultiple) {
       finalSelectInputValue = __assign(__assign({}, finalSelectInputValue), {
-        finalSelectValue: selectValue ? findAllSubSelectItems(optionsList, selectValue) : undefined
+        finalSelectValue: !isNil(selectValue) ? findAllSubSelectItems(optionsList, selectValue) : undefined
       });
     }
     setSelectInputValue(finalSelectInputValue);

package/es/label-condition-select-input/index.js

@@ -37,7 +37,7 @@ var __read = this && this.__read || function (o, n) {
 import isNil from 'lodash/isNil';
 import isEmpty from 'lodash/isEmpty';
 import classNames from 'classnames';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import useControllableValue from "ahooks/es/useControllableValue";
 import LabelConditionInput from '../label-condition-input';
 import LabelSelect from '../label-select';
@@ -76,10 +76,11 @@ var LabelConditionSelect = function LabelConditionSelect(props) {
   var _e = __read(useState([]), 2),
     subSelectOptions = _e[0],
     setSubSelectOptions = _e[1];
+  var subSelectRef = useRef();
   /** 子选择器是否多选 */
   var isSubSelectMultiple = (conditionSelectProps === null || conditionSelectProps === void 0 ? void 0 : conditionSelectProps.mode) === 'multiple';
   useEffect(function () {
-    if (value && value.selectValue && optionsList.length) {
+    if (value && !isNil(value.selectValue) && optionsList.length) {
       var _a = __read(optionsList.filter(function (item) {
           return item.value === value.selectValue;
         }), 1),
@@ -97,7 +98,7 @@ var LabelConditionSelect = function LabelConditionSelect(props) {
     };
     if (isSubSelectMultiple) {
       finalSelectInputValue = __assign(__assign({}, finalSelectInputValue), {
-        finalSelectValue: selectValue ? findAllSubSelectItems(optionsList, selectValue) : undefined
+        finalSelectValue: !isNil(selectValue) ? findAllSubSelectItems(optionsList, selectValue) : undefined
       });
     }
     setSelectInputValue(finalSelectInputValue);
@@ -166,9 +167,14 @@ var LabelConditionSelect = function LabelConditionSelect(props) {
   })) : /*#__PURE__*/React.createElement("div", {
     className: "label-condition-select-second-select"
   }, /*#__PURE__*/React.createElement(LabelSelect, __assign({}, conditionSelectProps, {
+    ref: subSelectRef,
     onChange: onTypeSelectChange,
     value: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.inputValue,
     options: subSelectOptions,
+    onDeselect: function onDeselect() {
+      var _a;
+      (_a = subSelectRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    },
     onBlur: onLabelConditionSelectInputBlur,
     onClear: onTypeSelectClear
   })));

package/es/label-select/index.d.ts

@@ -5,8 +5,5 @@ export { Option };
 export interface LabelSelectProps extends SelectProps {
     label?: React.ReactNode;
 }
-declare const LabelSelect: {
-    (props: LabelSelectProps): JSX.Element;
-    Option: import("rc-select/lib/Option").OptionFC;
-};
-export default LabelSelect;
+declare const ForwardRefLabelSelect: React.ForwardRefExoticComponent<LabelSelectProps & React.RefAttributes<unknown>>;
+export default ForwardRefLabelSelect;

package/es/label-select/index.js

@@ -43,7 +43,7 @@ import ArrowDropDownFilled from "a-icons/es/ArrowDropDownFilled";
 import omit from 'lodash/omit';
 var Option = Select.Option;
 export { Option };
-var LabelSelect = function LabelSelect(props) {
+var LabelSelect = function LabelSelect(props, ref) {
   var className = props.className,
     label = props.label;
   var selectRef = React.useRef(null);
@@ -56,6 +56,9 @@ var LabelSelect = function LabelSelect(props) {
   var _b = __read(useControllableValue(props), 2),
     value = _b[0],
     setValue = _b[1];
+  React.useImperativeHandle(ref, function () {
+    return selectRef.current;
+  });
   var handleChange = function handleChange(nextValue) {
     setValue(nextValue);
   };
@@ -76,7 +79,7 @@ var LabelSelect = function LabelSelect(props) {
   }, /*#__PURE__*/React.createElement(Select, __assign({
     maxTagCount: 3,
     showSearch: false
-  }, omit(props, ['open', 'onChange', 'className', 'label', 'setOpen']), {
+  }, omit(props, ['open', 'onChange', 'className', 'label', 'setOpen', 'isFocus']), {
     open: open,
     ref: selectRef,
     size: "large",
@@ -89,5 +92,6 @@ var LabelSelect = function LabelSelect(props) {
     onClick: handleLabelClick
   }, label));
 };
-export default LabelSelect;
-LabelSelect.Option = Option;
+// export default LabelSelect;
+var ForwardRefLabelSelect = /*#__PURE__*/React.forwardRef(LabelSelect);
+export default ForwardRefLabelSelect;

package/lib/condition-select-input/index.js

@@ -121,7 +121,7 @@ var ConditionSelectInput = function ConditionSelectInput(props) {
   /** 子选择器是否多选 */
   var isSubSelectMultiple = (conditionSelectProps === null || conditionSelectProps === void 0 ? void 0 : conditionSelectProps.mode) === 'multiple';
   (0, react_1.useEffect)(function () {
-    if (value && value.selectValue && optionsList.length) {
+    if (value && !(0, isNil_1["default"])(value.selectValue) && optionsList.length) {
       var _a = __read(optionsList.filter(function (item) {
           return item.value === value.selectValue;
         }), 1),
@@ -139,7 +139,7 @@ var ConditionSelectInput = function ConditionSelectInput(props) {
     };
     if (isSubSelectMultiple) {
       finalSelectInputValue = __assign(__assign({}, finalSelectInputValue), {
-        finalSelectValue: selectValue ? findAllSubSelectItems(optionsList, selectValue) : undefined
+        finalSelectValue: !(0, isNil_1["default"])(selectValue) ? findAllSubSelectItems(optionsList, selectValue) : undefined
       });
     }
     setSelectInputValue(finalSelectInputValue);

package/lib/label-condition-select-input/index.js

@@ -120,10 +120,11 @@ var LabelConditionSelect = function LabelConditionSelect(props) {
   var _e = __read((0, react_1.useState)([]), 2),
     subSelectOptions = _e[0],
     setSubSelectOptions = _e[1];
+  var subSelectRef = (0, react_1.useRef)();
   /** 子选择器是否多选 */
   var isSubSelectMultiple = (conditionSelectProps === null || conditionSelectProps === void 0 ? void 0 : conditionSelectProps.mode) === 'multiple';
   (0, react_1.useEffect)(function () {
-    if (value && value.selectValue && optionsList.length) {
+    if (value && !(0, isNil_1["default"])(value.selectValue) && optionsList.length) {
       var _a = __read(optionsList.filter(function (item) {
           return item.value === value.selectValue;
         }), 1),
@@ -141,7 +142,7 @@ var LabelConditionSelect = function LabelConditionSelect(props) {
     };
     if (isSubSelectMultiple) {
       finalSelectInputValue = __assign(__assign({}, finalSelectInputValue), {
-        finalSelectValue: selectValue ? findAllSubSelectItems(optionsList, selectValue) : undefined
+        finalSelectValue: !(0, isNil_1["default"])(selectValue) ? findAllSubSelectItems(optionsList, selectValue) : undefined
       });
     }
     setSelectInputValue(finalSelectInputValue);
@@ -210,9 +211,14 @@ var LabelConditionSelect = function LabelConditionSelect(props) {
   })) : react_1["default"].createElement("div", {
     className: "label-condition-select-second-select"
   }, react_1["default"].createElement(label_select_1["default"], __assign({}, conditionSelectProps, {
+    ref: subSelectRef,
     onChange: onTypeSelectChange,
     value: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.inputValue,
     options: subSelectOptions,
+    onDeselect: function onDeselect() {
+      var _a;
+      (_a = subSelectRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    },
     onBlur: onLabelConditionSelectInputBlur,
     onClear: onTypeSelectClear
   })));

package/lib/label-select/index.d.ts

@@ -5,8 +5,5 @@ export { Option };
 export interface LabelSelectProps extends SelectProps {
     label?: React.ReactNode;
 }
-declare const LabelSelect: {
-    (props: LabelSelectProps): JSX.Element;
-    Option: import("rc-select/lib/Option").OptionFC;
-};
-export default LabelSelect;
+declare const ForwardRefLabelSelect: React.ForwardRefExoticComponent<LabelSelectProps & React.RefAttributes<unknown>>;
+export default ForwardRefLabelSelect;

package/lib/label-select/index.js

@@ -54,7 +54,7 @@ var ArrowDropDownFilled_1 = __importDefault(require("a-icons/lib/ArrowDropDownFi
 var omit_1 = __importDefault(require("lodash/omit"));
 var Option = select_1["default"].Option;
 exports.Option = Option;
-var LabelSelect = function LabelSelect(props) {
+var LabelSelect = function LabelSelect(props, ref) {
   var className = props.className,
     label = props.label;
   var selectRef = react_1["default"].useRef(null);
@@ -67,6 +67,9 @@ var LabelSelect = function LabelSelect(props) {
   var _b = __read((0, useControllableValue_1["default"])(props), 2),
     value = _b[0],
     setValue = _b[1];
+  react_1["default"].useImperativeHandle(ref, function () {
+    return selectRef.current;
+  });
   var handleChange = function handleChange(nextValue) {
     setValue(nextValue);
   };
@@ -87,7 +90,7 @@ var LabelSelect = function LabelSelect(props) {
   }, react_1["default"].createElement(select_1["default"], __assign({
     maxTagCount: 3,
     showSearch: false
-  }, (0, omit_1["default"])(props, ['open', 'onChange', 'className', 'label', 'setOpen']), {
+  }, (0, omit_1["default"])(props, ['open', 'onChange', 'className', 'label', 'setOpen', 'isFocus']), {
     open: open,
     ref: selectRef,
     size: "large",
@@ -100,5 +103,6 @@ var LabelSelect = function LabelSelect(props) {
     onClick: handleLabelClick
   }, label));
 };
-exports["default"] = LabelSelect;
-LabelSelect.Option = Option;
+// export default LabelSelect;
+var ForwardRefLabelSelect = react_1["default"].forwardRef(LabelSelect);
+exports["default"] = ForwardRefLabelSelect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "3.1.41",
+  "version": "3.1.43",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -80,5 +80,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "743a32b19ad5f38ae8332a67fef0a01aab6d46d5"
+  "gitHead": "802b8d8e9a21335b93a4ac0872e70fdd228fa3d3"
 }