@kdcloudjs/kdesign 1.7.61 → 1.7.63

package/es/cascader/cascader.js

@@ -271,12 +271,12 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     var arrowIconCls = classNames((_classNames = {}, _defineProperty(_classNames, "".concat(prefixCls, "-icon-arrow"), true), _defineProperty(_classNames, "".concat(prefixCls, "-icon-arrow-up"), visible), _defineProperty(_classNames, "".concat(prefixCls, "-icon-arrow-down"), !visible), _defineProperty(_classNames, "".concat(prefixCls, "-icon-arrow-focus"), visible), _classNames));
     var iconShow = allowClear && !disabled && currentOptions.length > 0;
     var clearIconCls = classNames(_defineProperty({}, "".concat(prefixCls, "-icon-clear"), true));
-    return /*#__PURE__*/React.createElement(React.Fragment, null, iconShow && /*#__PURE__*/React.createElement("span", {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, iconShow ? /*#__PURE__*/React.createElement("span", {
       onClick: handleClear,
       className: clearIconCls
     }, /*#__PURE__*/React.createElement(Icon, {
       type: "close-solid"
-    }) || clearIcon), /*#__PURE__*/React.createElement("span", {
+    }) || clearIcon) : null, /*#__PURE__*/React.createElement("span", {
       className: arrowIconCls
     }, suffixIcon || /*#__PURE__*/React.createElement(Icon, {
       type: "arrow-down"
@@ -316,11 +316,11 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }), /*#__PURE__*/React.createElement("div", {
       className: "".concat(prefixCls, "-multiple-wrapper"),
       ref: wrapperRef
-    }, Array.isArray(currentOptions) && /*#__PURE__*/React.createElement(React.Fragment, null, _mapInstanceProperty(currentOptions).call(currentOptions, function (option, index) {
+    }, Array.isArray(currentOptions) ? /*#__PURE__*/React.createElement(React.Fragment, null, _mapInstanceProperty(currentOptions).call(currentOptions, function (option, index) {
       return /*#__PURE__*/React.createElement("span", {
         key: _JSON$stringify(values[index]),
         className: classNames("".concat(prefixCls, "-selection-tag"))
-      }, (!maxTagCount || index <= maxTagCount - 1) && /*#__PURE__*/React.createElement(Tag, {
+      }, !maxTagCount || index <= maxTagCount - 1 ? /*#__PURE__*/React.createElement(Tag, {
         type: "edit",
         disabled: disabled,
         style: TagStyle,
@@ -328,14 +328,14 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
         onClose: function onClose(e) {
           return handleRemove(e, option);
         }
-      }, displayRender(labels[index], option)));
+      }, displayRender(labels[index], option)) : null);
     }), maxTagCount && currentOptions.length > maxTagCount ? maxTagPlaceholder ? handleMaxTagHolder() : /*#__PURE__*/React.createElement("span", {
       className: itemCls
     }, /*#__PURE__*/React.createElement("span", {
       className: "".concat(prefixCls, "-tag-describe-content")
-    }, "\u5171", currentOptions.length, "\u9879")) : null), /*#__PURE__*/React.createElement("span", {
+    }, "\u5171", currentOptions.length, "\u9879")) : null) : null, /*#__PURE__*/React.createElement("span", {
       className: "".concat(prefixCls, "-placeholder")
-    }, !currentOptions.length && placeholder)), /*#__PURE__*/React.createElement("span", {
+    }, !currentOptions.length ? placeholder : null)), /*#__PURE__*/React.createElement("span", {
       ref: suffixRef,
       className: "".concat(prefixCls, "-suffix")
     }, renderSuffix()));
@@ -371,11 +371,11 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
       ref: wrapperRef
     }, /*#__PURE__*/React.createElement(Input, _extends({}, inputProps)), /*#__PURE__*/React.createElement("span", {
       className: "".concat(prefixCls, "-picker-label")
-    }, (labels === null || labels === void 0 ? void 0 : labels.length) ? displayRender(labels, currentOptions) : ''), allowClear && /*#__PURE__*/React.createElement(Icon, {
+    }, (labels === null || labels === void 0 ? void 0 : labels.length) ? displayRender(labels, currentOptions) : ''), allowClear ? /*#__PURE__*/React.createElement(Icon, {
       type: "close-solid",
       className: "".concat(prefixCls, "-picker-close"),
       onClick: handleClear
-    }))));
+    }) : null)));
   };
   var cascaderLocator = isMultiple ? renderMultiple() : renderSingle();
   var onExpend = function onExpend(index, opt, opts) {
@@ -433,11 +433,11 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onPopperVisibleChange && onPopperVisibleChange(v);
     v && setSelectedOptions(_sliceInstanceProperty(currentOptions).call(currentOptions, 0));
   };
-  var cascaderMenus = /*#__PURE__*/React.createElement(React.Fragment, null, (options === null || options === void 0 ? void 0 : options.length) ? (menus === null || menus === void 0 ? void 0 : menus.length) && _mapInstanceProperty(menus).call(menus, function (opts, index) {
+  var cascaderMenus = /*#__PURE__*/React.createElement(React.Fragment, null, (options === null || options === void 0 ? void 0 : options.length) ? (menus === null || menus === void 0 ? void 0 : menus.length) ? _mapInstanceProperty(menus).call(menus, function (opts, index) {
     return /*#__PURE__*/React.createElement("ul", {
       key: index,
       className: "".concat(prefixCls, "-menu")
-    }, (opts === null || opts === void 0 ? void 0 : opts.length) && _mapInstanceProperty(opts).call(opts, function (opt) {
+    }, (opts === null || opts === void 0 ? void 0 : opts.length) ? _mapInstanceProperty(opts).call(opts, function (opt) {
       var isLeaf = opt.isLeaf,
         loading = opt.loading,
         value = opt[fieldNames.value],
@@ -461,9 +461,9 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }, label), loading ? /*#__PURE__*/React.createElement(Icon, {
         type: "loadding-circle",
         spin: true
-      }) : ((children === null || children === void 0 ? void 0 : children.length) || isLeaf === false) && (props.expandIcon || /*#__PURE__*/React.createElement(Icon, {
+      }) : (children === null || children === void 0 ? void 0 : children.length) || isLeaf === false ? props.expandIcon || /*#__PURE__*/React.createElement(Icon, {
         type: "arrow-right"
-      })));
+      }) : null);
       return /*#__PURE__*/React.createElement(CascaderMenuSubmenu, _extends({
         key: value
       }, {
@@ -480,8 +480,8 @@ var Cascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
         },
         className: "".concat(prefixCls, "-checkbox")
       }), node) : node);
-    }));
-  }) : /*#__PURE__*/React.createElement(Empty, {
+    }) : null);
+  }) : null : /*#__PURE__*/React.createElement(Empty, {
     description: notFoundContent
   }));
   var cascaderPopper = dropdownRender(cascaderMenus);

package/es/cascader/style/index.css

@@ -330,8 +330,8 @@
   display: -ms-flexbox;
   display: flex;
   -webkit-box-flex: 0;
-      -ms-flex: 0;
-          flex: 0;
+      -ms-flex: 0 0 auto;
+          flex: 0 0 auto;
   -ms-flex-wrap: wrap;
       flex-wrap: wrap;
   -webkit-box-align: center;

package/es/cascader/style/index.less

@@ -227,7 +227,7 @@
     right: 0;
     position: absolute;
     display: flex;
-    flex: 0;
+    flex: 0 0 auto;
     flex-wrap: wrap;
     align-items: center;
     justify-content: center;

package/es/city-picker/city-picker.js

@@ -464,10 +464,6 @@ var InternalSelect = function InternalSelect(props, ref) {
         var _a;
         return (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.focus();
       },
-      onBlur: function onBlur() {
-        var _a;
-        return (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.blur();
-      },
       onKeyDown: onInternalKeyDown
     }, renderSingle()));
   };

package/es/tree-select/tree-select.js

@@ -215,7 +215,7 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
   // 输入框变化搜索内容
   var handleSearchChange = useCallback(function (event) {
     var val = event.currentTarget.value;
-    setOptionShow(true);
+    handleVisibleChange(true);
     setSearchValue(val);
     onSearch === null || onSearch === void 0 ? void 0 : onSearch(val);
   }, [onSearch]);
@@ -263,7 +263,7 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(keys, state);
     !isMultiple && (onChange === null || onChange === void 0 ? void 0 : onChange(keys[0], [TreeMap.get(keys[0])]));
     if (!isMultiple) {
-      setOptionShow(false);
+      handleVisibleChange(false);
     }
   };
   var handleCheck = function handleCheck(keys, state) {
@@ -357,6 +357,9 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
   useEffect(function () {
     setSelectedKeys(initValue);
   }, [initValue]);
+  useEffect(function () {
+    setOptionShow(props.visible);
+  }, [props.visible]);
   // 渲染下拉列表框
   var renderContent = function renderContent() {
     var dropDownStyle = _extends({
@@ -394,7 +397,7 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: singleCls,
       ref: selectionRef,
-      title: label
+      title: typeof label === 'string' ? label : ''
     }, /*#__PURE__*/React.createElement("span", {
       className: "".concat(selectPrefixCls, "-selection-search")
     }, /*#__PURE__*/React.createElement("input", {
@@ -449,7 +452,7 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
           return handleRemove(e, key);
         },
         "data-tag": key,
-        title: label
+        title: typeof label === 'string' ? label : ''
       }, label));
     }), maxTagCount && selectTreeNodes.length > maxTagCount ? maxTagPlaceholder ? handleMaxTagHolder() : /*#__PURE__*/React.createElement("span", {
       className: itemCls
@@ -513,9 +516,10 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
       onVisibleChange === null || onVisibleChange === void 0 ? void 0 : onVisibleChange(visible);
     }
   };
-  var popperProps = _extends(_extends({}, treeSelectProps), {
+  var popperProps = _extends(_extends({
+    placement: 'bottomLeft'
+  }, treeSelectProps), {
     prefixCls: "".concat(selectPrefixCls, "-panel"),
-    placement: 'bottomLeft',
     popperStyle: catchStyle(),
     defaultVisible: optionShow,
     visible: optionShow,

package/lib/cascader/cascader.js

@@ -284,12 +284,12 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     var arrowIconCls = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-icon-arrow"), true), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-icon-arrow-up"), visible), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-icon-arrow-down"), !visible), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-icon-arrow-focus"), visible), _classNames));
     var iconShow = allowClear && !disabled && currentOptions.length > 0;
     var clearIconCls = (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(prefixCls, "-icon-clear"), true));
-    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, iconShow && /*#__PURE__*/_react.default.createElement("span", {
+    return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, iconShow ? /*#__PURE__*/_react.default.createElement("span", {
       onClick: handleClear,
       className: clearIconCls
     }, /*#__PURE__*/_react.default.createElement(_icon.default, {
       type: "close-solid"
-    }) || clearIcon), /*#__PURE__*/_react.default.createElement("span", {
+    }) || clearIcon) : null, /*#__PURE__*/_react.default.createElement("span", {
       className: arrowIconCls
     }, suffixIcon || /*#__PURE__*/_react.default.createElement(_icon.default, {
       type: "arrow-down"
@@ -329,11 +329,11 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     }), /*#__PURE__*/_react.default.createElement("div", {
       className: "".concat(prefixCls, "-multiple-wrapper"),
       ref: wrapperRef
-    }, Array.isArray(currentOptions) && /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _map.default)(currentOptions).call(currentOptions, function (option, index) {
+    }, Array.isArray(currentOptions) ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _map.default)(currentOptions).call(currentOptions, function (option, index) {
       return /*#__PURE__*/_react.default.createElement("span", {
         key: (0, _stringify.default)(values[index]),
         className: (0, _classnames.default)("".concat(prefixCls, "-selection-tag"))
-      }, (!maxTagCount || index <= maxTagCount - 1) && /*#__PURE__*/_react.default.createElement(_tag.default, {
+      }, !maxTagCount || index <= maxTagCount - 1 ? /*#__PURE__*/_react.default.createElement(_tag.default, {
         type: "edit",
         disabled: disabled,
         style: TagStyle,
@@ -341,14 +341,14 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
         onClose: function onClose(e) {
           return handleRemove(e, option);
         }
-      }, displayRender(labels[index], option)));
+      }, displayRender(labels[index], option)) : null);
     }), maxTagCount && currentOptions.length > maxTagCount ? maxTagPlaceholder ? handleMaxTagHolder() : /*#__PURE__*/_react.default.createElement("span", {
       className: itemCls
     }, /*#__PURE__*/_react.default.createElement("span", {
       className: "".concat(prefixCls, "-tag-describe-content")
-    }, "\u5171", currentOptions.length, "\u9879")) : null), /*#__PURE__*/_react.default.createElement("span", {
+    }, "\u5171", currentOptions.length, "\u9879")) : null) : null, /*#__PURE__*/_react.default.createElement("span", {
       className: "".concat(prefixCls, "-placeholder")
-    }, !currentOptions.length && placeholder)), /*#__PURE__*/_react.default.createElement("span", {
+    }, !currentOptions.length ? placeholder : null)), /*#__PURE__*/_react.default.createElement("span", {
       ref: suffixRef,
       className: "".concat(prefixCls, "-suffix")
     }, renderSuffix()));
@@ -384,11 +384,11 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       ref: wrapperRef
     }, /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({}, inputProps)), /*#__PURE__*/_react.default.createElement("span", {
       className: "".concat(prefixCls, "-picker-label")
-    }, (labels === null || labels === void 0 ? void 0 : labels.length) ? displayRender(labels, currentOptions) : ''), allowClear && /*#__PURE__*/_react.default.createElement(_icon.default, {
+    }, (labels === null || labels === void 0 ? void 0 : labels.length) ? displayRender(labels, currentOptions) : ''), allowClear ? /*#__PURE__*/_react.default.createElement(_icon.default, {
       type: "close-solid",
       className: "".concat(prefixCls, "-picker-close"),
       onClick: handleClear
-    }))));
+    }) : null)));
   };
   var cascaderLocator = isMultiple ? renderMultiple() : renderSingle();
   var onExpend = function onExpend(index, opt, opts) {
@@ -446,11 +446,11 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     onPopperVisibleChange && onPopperVisibleChange(v);
     v && setSelectedOptions((0, _slice.default)(currentOptions).call(currentOptions, 0));
   };
-  var cascaderMenus = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (options === null || options === void 0 ? void 0 : options.length) ? (menus === null || menus === void 0 ? void 0 : menus.length) && (0, _map.default)(menus).call(menus, function (opts, index) {
+  var cascaderMenus = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (options === null || options === void 0 ? void 0 : options.length) ? (menus === null || menus === void 0 ? void 0 : menus.length) ? (0, _map.default)(menus).call(menus, function (opts, index) {
     return /*#__PURE__*/_react.default.createElement("ul", {
       key: index,
       className: "".concat(prefixCls, "-menu")
-    }, (opts === null || opts === void 0 ? void 0 : opts.length) && (0, _map.default)(opts).call(opts, function (opt) {
+    }, (opts === null || opts === void 0 ? void 0 : opts.length) ? (0, _map.default)(opts).call(opts, function (opt) {
       var isLeaf = opt.isLeaf,
         loading = opt.loading,
         value = opt[fieldNames.value],
@@ -474,9 +474,9 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       }, label), loading ? /*#__PURE__*/_react.default.createElement(_icon.default, {
         type: "loadding-circle",
         spin: true
-      }) : ((children === null || children === void 0 ? void 0 : children.length) || isLeaf === false) && (props.expandIcon || /*#__PURE__*/_react.default.createElement(_icon.default, {
+      }) : (children === null || children === void 0 ? void 0 : children.length) || isLeaf === false ? props.expandIcon || /*#__PURE__*/_react.default.createElement(_icon.default, {
         type: "arrow-right"
-      })));
+      }) : null);
       return /*#__PURE__*/_react.default.createElement(CascaderMenuSubmenu, (0, _extends2.default)({
         key: value
       }, {
@@ -493,8 +493,8 @@ var Cascader = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
         },
         className: "".concat(prefixCls, "-checkbox")
       }), node) : node);
-    }));
-  }) : /*#__PURE__*/_react.default.createElement(_empty.default, {
+    }) : null);
+  }) : null : /*#__PURE__*/_react.default.createElement(_empty.default, {
     description: notFoundContent
   }));
   var cascaderPopper = dropdownRender(cascaderMenus);

package/lib/cascader/style/index.css

@@ -330,8 +330,8 @@
   display: -ms-flexbox;
   display: flex;
   -webkit-box-flex: 0;
-      -ms-flex: 0;
-          flex: 0;
+      -ms-flex: 0 0 auto;
+          flex: 0 0 auto;
   -ms-flex-wrap: wrap;
       flex-wrap: wrap;
   -webkit-box-align: center;

package/lib/cascader/style/index.less

@@ -227,7 +227,7 @@
     right: 0;
     position: absolute;
     display: flex;
-    flex: 0;
+    flex: 0 0 auto;
     flex-wrap: wrap;
     align-items: center;
     justify-content: center;

package/lib/city-picker/city-picker.js

@@ -476,10 +476,6 @@ var InternalSelect = function InternalSelect(props, ref) {
         var _a;
         return (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.focus();
       },
-      onBlur: function onBlur() {
-        var _a;
-        return (_a = searchRef.current) === null || _a === void 0 ? void 0 : _a.blur();
-      },
       onKeyDown: onInternalKeyDown
     }, renderSingle()));
   };

package/lib/tree-select/tree-select.js

@@ -227,7 +227,7 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
   // 输入框变化搜索内容
   var handleSearchChange = (0, _react.useCallback)(function (event) {
     var val = event.currentTarget.value;
-    setOptionShow(true);
+    handleVisibleChange(true);
     setSearchValue(val);
     onSearch === null || onSearch === void 0 ? void 0 : onSearch(val);
   }, [onSearch]);
@@ -275,7 +275,7 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
     onSelect === null || onSelect === void 0 ? void 0 : onSelect(keys, state);
     !isMultiple && (onChange === null || onChange === void 0 ? void 0 : onChange(keys[0], [TreeMap.get(keys[0])]));
     if (!isMultiple) {
-      setOptionShow(false);
+      handleVisibleChange(false);
     }
   };
   var handleCheck = function handleCheck(keys, state) {
@@ -369,6 +369,9 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
   (0, _react.useEffect)(function () {
     setSelectedKeys(initValue);
   }, [initValue]);
+  (0, _react.useEffect)(function () {
+    setOptionShow(props.visible);
+  }, [props.visible]);
   // 渲染下拉列表框
   var renderContent = function renderContent() {
     var dropDownStyle = (0, _extends2.default)({
@@ -406,7 +409,7 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
       className: singleCls,
       ref: selectionRef,
-      title: label
+      title: typeof label === 'string' ? label : ''
     }, /*#__PURE__*/_react.default.createElement("span", {
       className: "".concat(selectPrefixCls, "-selection-search")
     }, /*#__PURE__*/_react.default.createElement("input", {
@@ -461,7 +464,7 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
           return handleRemove(e, key);
         },
         "data-tag": key,
-        title: label
+        title: typeof label === 'string' ? label : ''
       }, label));
     }), maxTagCount && selectTreeNodes.length > maxTagCount ? maxTagPlaceholder ? handleMaxTagHolder() : /*#__PURE__*/_react.default.createElement("span", {
       className: itemCls
@@ -525,9 +528,10 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
       onVisibleChange === null || onVisibleChange === void 0 ? void 0 : onVisibleChange(visible);
     }
   };
-  var popperProps = (0, _extends2.default)((0, _extends2.default)({}, treeSelectProps), {
+  var popperProps = (0, _extends2.default)((0, _extends2.default)({
+    placement: 'bottomLeft'
+  }, treeSelectProps), {
     prefixCls: "".concat(selectPrefixCls, "-panel"),
-    placement: 'bottomLeft',
     popperStyle: catchStyle(),
     defaultVisible: optionShow,
     visible: optionShow,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.7.61",
+  "version": "1.7.63",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [