@kdcloudjs/kdesign 1.7.62 → 1.7.64

package/es/base-data/base-data.js

@@ -130,12 +130,12 @@ var InternalBaseData = function InternalBaseData(props, ref) {
     searchInfo.current.editOptions = _toConsumableArray(seletedItems);
   }, [value, isMultiple]);
   useEffect(function () {
-    var _a;
+    var _a, _b;
     if (!searchInfo.current.previousEditValue) return;
     var posList = setValIndxPosition();
     var preValueArr = getStrToArr(searchInfo.current.previousEditValue, delimiter);
     var valueArr = getStrToArr(inputValue, delimiter);
-    var selectionStart = ((_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.selectionStart) || 0;
+    var selectionStart = ((_b = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.input) === null || _b === void 0 ? void 0 : _b.selectionStart) || 0;
     var index = findSelectionIndex(selectionStart, posList);
     searchInfo.current.searchIndex = index;
     // 新增一个
@@ -172,8 +172,10 @@ var InternalBaseData = function InternalBaseData(props, ref) {
   };
   // 当选中项文字超出输入框时，显示共多少项
   useLayoutEffect(function () {
-    if (!inputRef.current) return;
-    if (inputRef.current.scrollWidth - inputRef.current.offsetWidth > 0) {
+    var _a;
+    var inputDom = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.input;
+    if (!inputDom) return;
+    if (inputDom.scrollWidth - inputDom.offsetWidth > 0) {
       setShowTotal(true);
     } else {
       setShowTotal(false);
@@ -194,17 +196,19 @@ var InternalBaseData = function InternalBaseData(props, ref) {
     setValueBySeleted();
   }, [setValueBySeleted]);
   var changeInputText = function changeInputText(e) {
+    var _a;
     setOptionShow(true);
     var textValue = e.target.value;
     var val = textValue;
-    if (isMultiple && inputRef.current && textValue && textValue.length > inputValue.length) {
-      var selectionStart = inputRef.current.selectionStart || 0; // selectionStart: 光标前面有几个字符
+    var inputDom = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.input;
+    if (isMultiple && inputDom && textValue && textValue.length > inputValue.length) {
+      var selectionStart = inputDom.selectionStart || 0; // selectionStart: 光标前面有几个字符
       searchInfo.current.selectionStart = selectionStart;
       var isInHead = selectionStart === 1 && textValue[1] !== delimiter && textValue.length !== 1; // 在首部添加
       var isInMid = selectionStart !== textValue.length && textValue[selectionStart - 2] === delimiter && textValue[selectionStart] !== delimiter;
       if (isInHead || isInMid) {
-        inputRef.current.value = val = textValue.substring(0, selectionStart) + delimiter + textValue.substring(selectionStart, textValue.length);
-        setCursorPosition(inputRef.current, selectionStart);
+        inputDom.value = val = textValue.substring(0, selectionStart) + delimiter + textValue.substring(selectionStart, textValue.length);
+        setCursorPosition(inputDom, selectionStart);
       }
     }
     setInputValue(val);
@@ -216,6 +220,7 @@ var InternalBaseData = function InternalBaseData(props, ref) {
     onSearch === null || onSearch === void 0 ? void 0 : onSearch(str);
   };
   var getQueryStr = function getQueryStr(queryStr) {
+    var _a, _b;
     if (!isMultiple) {
       return queryStr;
     }
@@ -224,7 +229,7 @@ var InternalBaseData = function InternalBaseData(props, ref) {
         // 只有一条记录
         return queryStr;
       }
-      var selectionStart = inputRef.current.selectionStart || 0;
+      var selectionStart = ((_b = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.input) === null || _b === void 0 ? void 0 : _b.selectionStart) || 0;
       var startIndex = _sliceInstanceProperty(queryStr).call(queryStr, 0, selectionStart).lastIndexOf(delimiter) + 1; // 光标前面最近分隔符index
       var endIndex = _sliceInstanceProperty(queryStr).call(queryStr, selectionStart).indexOf(delimiter);
       endIndex = endIndex === -1 ? queryStr.length : selectionStart + endIndex; // 光标后面最近分隔符index
@@ -265,12 +270,14 @@ var InternalBaseData = function InternalBaseData(props, ref) {
     setSeletedOptions(list);
   };
   var showInputTotal = function showInputTotal() {
+    var _a;
     if (disabled) return;
-    if (inputRef.current) {
-      var scrollToWidth = inputRef.current.scrollWidth - inputRef.current.offsetWidth;
-      inputRef.current.scrollLeft = scrollToWidth;
+    var inputDom = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.input;
+    if (inputDom) {
+      var scrollToWidth = inputDom.scrollWidth - inputDom.offsetWidth;
+      inputDom.scrollLeft = scrollToWidth;
       setTimeout(function () {
-        setCursorPosition(inputRef.current, inputValue.length + 1);
+        setCursorPosition(inputDom, inputValue.length + 1);
       }, 0);
     }
   };
@@ -299,11 +306,12 @@ var InternalBaseData = function InternalBaseData(props, ref) {
   };
   // 双击选中当前项
   var handleDoubleClick = function handleDoubleClick() {
-    var _a, _b;
-    var _findDbClickSelectedP = findDbClickSelectedPos(((_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.selectionStart) || 0, ((_b = inputRef.current) === null || _b === void 0 ? void 0 : _b.selectionEnd) || 0),
+    var _a;
+    var inputDom = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.input;
+    var _findDbClickSelectedP = findDbClickSelectedPos((inputDom === null || inputDom === void 0 ? void 0 : inputDom.selectionStart) || 0, (inputDom === null || inputDom === void 0 ? void 0 : inputDom.selectionEnd) || 0),
       start = _findDbClickSelectedP.start,
       end = _findDbClickSelectedP.end;
-    handleSeletedText(inputRef.current, start, end);
+    handleSeletedText(inputDom, start, end);
   };
   var findDbClickSelectedPos = function findDbClickSelectedPos(selectionStart, selectionEnd) {
     for (var index = 0; index < indxPosList.length; index++) {

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/base-data/base-data.js

@@ -142,12 +142,12 @@ var InternalBaseData = function InternalBaseData(props, ref) {
     searchInfo.current.editOptions = (0, _toConsumableArray2.default)(seletedItems);
   }, [value, isMultiple]);
   (0, _react.useEffect)(function () {
-    var _a;
+    var _a, _b;
     if (!searchInfo.current.previousEditValue) return;
     var posList = setValIndxPosition();
     var preValueArr = getStrToArr(searchInfo.current.previousEditValue, delimiter);
     var valueArr = getStrToArr(inputValue, delimiter);
-    var selectionStart = ((_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.selectionStart) || 0;
+    var selectionStart = ((_b = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.input) === null || _b === void 0 ? void 0 : _b.selectionStart) || 0;
     var index = findSelectionIndex(selectionStart, posList);
     searchInfo.current.searchIndex = index;
     // 新增一个
@@ -184,8 +184,10 @@ var InternalBaseData = function InternalBaseData(props, ref) {
   };
   // 当选中项文字超出输入框时，显示共多少项
   (0, _react.useLayoutEffect)(function () {
-    if (!inputRef.current) return;
-    if (inputRef.current.scrollWidth - inputRef.current.offsetWidth > 0) {
+    var _a;
+    var inputDom = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.input;
+    if (!inputDom) return;
+    if (inputDom.scrollWidth - inputDom.offsetWidth > 0) {
       setShowTotal(true);
     } else {
       setShowTotal(false);
@@ -206,17 +208,19 @@ var InternalBaseData = function InternalBaseData(props, ref) {
     setValueBySeleted();
   }, [setValueBySeleted]);
   var changeInputText = function changeInputText(e) {
+    var _a;
     setOptionShow(true);
     var textValue = e.target.value;
     var val = textValue;
-    if (isMultiple && inputRef.current && textValue && textValue.length > inputValue.length) {
-      var selectionStart = inputRef.current.selectionStart || 0; // selectionStart: 光标前面有几个字符
+    var inputDom = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.input;
+    if (isMultiple && inputDom && textValue && textValue.length > inputValue.length) {
+      var selectionStart = inputDom.selectionStart || 0; // selectionStart: 光标前面有几个字符
       searchInfo.current.selectionStart = selectionStart;
       var isInHead = selectionStart === 1 && textValue[1] !== delimiter && textValue.length !== 1; // 在首部添加
       var isInMid = selectionStart !== textValue.length && textValue[selectionStart - 2] === delimiter && textValue[selectionStart] !== delimiter;
       if (isInHead || isInMid) {
-        inputRef.current.value = val = textValue.substring(0, selectionStart) + delimiter + textValue.substring(selectionStart, textValue.length);
-        setCursorPosition(inputRef.current, selectionStart);
+        inputDom.value = val = textValue.substring(0, selectionStart) + delimiter + textValue.substring(selectionStart, textValue.length);
+        setCursorPosition(inputDom, selectionStart);
       }
     }
     setInputValue(val);
@@ -228,6 +232,7 @@ var InternalBaseData = function InternalBaseData(props, ref) {
     onSearch === null || onSearch === void 0 ? void 0 : onSearch(str);
   };
   var getQueryStr = function getQueryStr(queryStr) {
+    var _a, _b;
     if (!isMultiple) {
       return queryStr;
     }
@@ -236,7 +241,7 @@ var InternalBaseData = function InternalBaseData(props, ref) {
         // 只有一条记录
         return queryStr;
       }
-      var selectionStart = inputRef.current.selectionStart || 0;
+      var selectionStart = ((_b = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.input) === null || _b === void 0 ? void 0 : _b.selectionStart) || 0;
       var startIndex = (0, _slice.default)(queryStr).call(queryStr, 0, selectionStart).lastIndexOf(delimiter) + 1; // 光标前面最近分隔符index
       var endIndex = (0, _slice.default)(queryStr).call(queryStr, selectionStart).indexOf(delimiter);
       endIndex = endIndex === -1 ? queryStr.length : selectionStart + endIndex; // 光标后面最近分隔符index
@@ -277,12 +282,14 @@ var InternalBaseData = function InternalBaseData(props, ref) {
     setSeletedOptions(list);
   };
   var showInputTotal = function showInputTotal() {
+    var _a;
     if (disabled) return;
-    if (inputRef.current) {
-      var scrollToWidth = inputRef.current.scrollWidth - inputRef.current.offsetWidth;
-      inputRef.current.scrollLeft = scrollToWidth;
+    var inputDom = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.input;
+    if (inputDom) {
+      var scrollToWidth = inputDom.scrollWidth - inputDom.offsetWidth;
+      inputDom.scrollLeft = scrollToWidth;
       setTimeout(function () {
-        setCursorPosition(inputRef.current, inputValue.length + 1);
+        setCursorPosition(inputDom, inputValue.length + 1);
       }, 0);
     }
   };
@@ -311,11 +318,12 @@ var InternalBaseData = function InternalBaseData(props, ref) {
   };
   // 双击选中当前项
   var handleDoubleClick = function handleDoubleClick() {
-    var _a, _b;
-    var _findDbClickSelectedP = findDbClickSelectedPos(((_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.selectionStart) || 0, ((_b = inputRef.current) === null || _b === void 0 ? void 0 : _b.selectionEnd) || 0),
+    var _a;
+    var inputDom = (_a = inputRef.current) === null || _a === void 0 ? void 0 : _a.input;
+    var _findDbClickSelectedP = findDbClickSelectedPos((inputDom === null || inputDom === void 0 ? void 0 : inputDom.selectionStart) || 0, (inputDom === null || inputDom === void 0 ? void 0 : inputDom.selectionEnd) || 0),
       start = _findDbClickSelectedP.start,
       end = _findDbClickSelectedP.end;
-    handleSeletedText(inputRef.current, start, end);
+    handleSeletedText(inputDom, start, end);
   };
   var findDbClickSelectedPos = function findDbClickSelectedPos(selectionStart, selectionEnd) {
     for (var index = 0; index < indxPosList.length; index++) {

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.62",
+  "version": "1.7.64",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [