@kdcloudjs/kdesign 1.7.2 → 1.7.4

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.7.1
+ *   @kdcloudjs/kdesign v1.7.3
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -9936,6 +9936,7 @@ var compDefaultProps = {
     placeholder: '请输入需要搜索的内容',
     optionLabelProp: 'title',
     treeNodeFilterProp: 'title',
+    treeExpandOnClickNode: true,
     showSearch: true,
     switcherIcon: function switcherIcon() {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1__["createElement"](_index__WEBPACK_IMPORTED_MODULE_2__["Icon"], {
@@ -28409,10 +28410,11 @@ var InternalSelect = function InternalSelect(props, ref) {
     _useState4 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState3, 2),
     singleVal = _useState4[0],
     setSingleVal = _useState4[1];
-  var _useState5 = Object(react__WEBPACK_IMPORTED_MODULE_18__["useState"])(!!props.visible || defaultOpen),
+  var _useState5 = Object(react__WEBPACK_IMPORTED_MODULE_18__["useState"])(typeof props.visible === 'undefined' ? !!defaultOpen : !!props.visible),
     _useState6 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState5, 2),
     optionShow = _useState6[0],
-    setOptionShow = _useState6[1]; // 下拉列表是否展示
+    setOptionShow = _useState6[1];
+  // 下拉列表是否展示
   // const [searchInput, setSearchInput] = useState<string>('') // 搜索框值
   var _useState7 = Object(react__WEBPACK_IMPORTED_MODULE_18__["useState"])(''),
     _useState8 = _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_3___default()(_useState7, 2),
@@ -28443,7 +28445,9 @@ var InternalSelect = function InternalSelect(props, ref) {
   // 多选，单选公共样式
   var commCls = classnames__WEBPACK_IMPORTED_MODULE_21___default()((_classNames6 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames6, "".concat(selectPrefixCls, "-bordered"), borderType === 'bordered'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames6, "".concat(selectPrefixCls, "-underline"), borderType === 'underline'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames6, "".concat(selectPrefixCls, "-borderless"), borderType === 'none'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames6, "".concat(selectPrefixCls, "-size-").concat(size), size), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_2___default()(_classNames6, "".concat(selectPrefixCls, "-wrapper"), true), _classNames6));
   Object(react__WEBPACK_IMPORTED_MODULE_18__["useEffect"])(function () {
-    setOptionShow(!!props.visible);
+    if (typeof props.visible !== 'undefined') {
+      setOptionShow(props.visible);
+    }
   }, [props.visible]);
 
   // realchildren更新时数据处理---待解决
@@ -35080,6 +35084,7 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
       icon: treeIcon,
       showIcon: showTreeIcon,
       switcherIcon: switcherIcon,
+      onlyExpandOnClickIcon: true,
       notFoundContent: renderNotContent(),
       filterTreeNode: defFilterTreeNode,
       onSelect: handleSelect,
@@ -35457,6 +35462,8 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_13___default.a.fo
     filterTreeNode = TreeProps.filterTreeNode,
     filterValue = TreeProps.filterValue,
     expandOnClickNode = TreeProps.expandOnClickNode,
+    _TreeProps$onlyExpand = TreeProps.onlyExpandOnClickIcon,
+    onlyExpandOnClickIcon = _TreeProps$onlyExpand === void 0 ? false : _TreeProps$onlyExpand,
     loadData = TreeProps.loadData,
     notFoundContent = TreeProps.notFoundContent;
   var treePrefixCls = getPrefixCls(prefixCls, 'tree', customPrefixcls); // 树样式前缀
@@ -35794,6 +35801,7 @@ var InternalTree = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_13___default.a.fo
     item.dragOver = dragOverNodeKey === item.key && dropPosition === 0;
     item.dropPosition = dropPosition;
     item.expandOnClickNode = expandOnClickNode;
+    item.onlyExpandOnClickIcon = onlyExpandOnClickIcon;
     item.loading = loadingKeys.has(item.key) && !loadedKeys.has(item.key);
     item.loadData = loadData;
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_13___default.a.createElement(_treeNode__WEBPACK_IMPORTED_MODULE_18__["default"], _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({}, item, {
@@ -35950,7 +35958,7 @@ var useSelect = function useSelect(selectedKeysProps, defaultSelectedKeys) {
     selectedKeys = _useState2[0],
     setSelectedKeys = _useState2[1];
   Object(react__WEBPACK_IMPORTED_MODULE_3__["useEffect"])(function () {
-    setSelectedKeys(selectedKeysProps);
+    selectedKeysProps && setSelectedKeys(selectedKeysProps);
   }, [selectedKeysProps]);
   return [selectedKeys, setSelectedKeys];
 };
@@ -36007,7 +36015,7 @@ __webpack_require__.r(__webpack_exports__);
 
 
 
-var _excluded = ["nodeKey", "prefixCls", "selectable", "checkable", "className", "icon", "switcherIcon", "disabled", "draggable", "pos", "checked", "level", "getDragNode", "hasChildNode", "expand", "title", "showLine", "showIcon", "selected", "setDragNode", "style", "indeterminate", "estimatedItemSize", "dragOver", "dropPosition", "expandOnClickNode", "loading", "onExpand", "onCheck", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect"];
+var _excluded = ["nodeKey", "prefixCls", "selectable", "checkable", "className", "icon", "switcherIcon", "disabled", "draggable", "pos", "checked", "level", "getDragNode", "hasChildNode", "expand", "title", "showLine", "showIcon", "selected", "setDragNode", "style", "indeterminate", "estimatedItemSize", "dragOver", "dropPosition", "expandOnClickNode", "onlyExpandOnClickIcon", "loading", "onExpand", "onCheck", "onDragStart", "onDragOver", "onDragLeave", "onDragEnter", "onDragEnd", "onDrop", "onSelect"];
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -36050,6 +36058,7 @@ var TreeNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwar
     dragOver = TreeNodeProps.dragOver,
     dropPosition = TreeNodeProps.dropPosition,
     expandOnClickNode = TreeNodeProps.expandOnClickNode,
+    onlyExpandOnClickIcon = TreeNodeProps.onlyExpandOnClickIcon,
     loading = TreeNodeProps.loading,
     onExpand = TreeNodeProps.onExpand,
     onCheck = TreeNodeProps.onCheck,
@@ -36169,12 +36178,12 @@ var TreeNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwar
       if (Array.isArray(switcherIcon) && switcherIcon.length === 2) {
         return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("span", {
           className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(treeNodePrefixCls, "-icon"), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()({}, "".concat(treeNodePrefixCls, "-icon-hover"), !expandOnClickNode)),
-          onClick: expandOnClickNode ? undefined : handleExpandIconClick
+          onClick: expandOnClickNode ? onlyExpandOnClickIcon ? handleExpandIconClick : undefined : handleExpandIconClick
         }, expandState ? renderIcon(switcherIcon[1]) : renderIcon(switcherIcon[0]));
       }
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement("span", {
         className: classnames__WEBPACK_IMPORTED_MODULE_12___default()("".concat(treeNodePrefixCls, "-icon"), (_classNames3 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames3, "".concat(treeNodePrefixCls, "-animation-expand"), expandState), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames3, "".concat(treeNodePrefixCls, "-animation-collapse"), !expandState), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_8___default()(_classNames3, "".concat(treeNodePrefixCls, "-icon-hover"), !expandOnClickNode), _classNames3)),
-        onClick: expandOnClickNode ? undefined : handleExpandIconClick
+        onClick: expandOnClickNode ? onlyExpandOnClickIcon ? handleExpandIconClick : undefined : handleExpandIconClick
       }, renderIcon(switcherIcon || /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.createElement(_icon__WEBPACK_IMPORTED_MODULE_16__["default"], {
         type: "arrow-right-solid"
       })));
@@ -36242,9 +36251,11 @@ var TreeNode = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_11___default.a.forwar
   }, [expandState, nodeData, nodeKey, onExpand, setExpandState]);
   var handleClick = react__WEBPACK_IMPORTED_MODULE_11___default.a.useCallback(function (e) {
     e.stopPropagation();
-    expandOnClickNode && handleExpandIconClick();
+    if (expandOnClickNode) {
+      !onlyExpandOnClickIcon && handleExpandIconClick();
+    }
     handleSelect(e);
-  }, [expandOnClickNode, handleExpandIconClick, handleSelect]);
+  }, [expandOnClickNode, handleExpandIconClick, handleSelect, onlyExpandOnClickIcon]);
   var handleDragStart = react__WEBPACK_IMPORTED_MODULE_11___default.a.useCallback(function (e) {
     if (!draggable) return;
     setDragNode(nodeData);