@kdcloudjs/kdesign 1.6.28 → 1.6.30

package/lib/form/Field.js

@@ -317,16 +317,18 @@ var Field = function Field(props) {
         evt[_key] = arguments[_key];
       }
 
+      var iv = getInputValueFormProp(evt[0], evt);
+
       if (chValue === undefined) {
-        var iv = getInputValueFormProp(evt[0], evt);
         setFieldValue(iv);
-        dispatch({
-          type: 'updateValue',
-          namePath: name,
-          value: iv
-        });
       }
 
+      dispatch({
+        type: 'updateValue',
+        namePath: name,
+        value: iv
+      });
+
       if (typeof chChange === 'function') {
         chChange.apply(void 0, evt);
       }

package/lib/input/ClearableLabeledInput.d.ts

@@ -13,6 +13,7 @@ interface ClearableInputProps {
     style?: CSSProperties;
     disabled?: boolean;
     focused?: boolean;
+    count?: boolean;
     borderType?: BorderType;
     size?: InputSiteType;
     suffix?: React.ReactNode;

package/lib/input/ClearableLabeledInput.js

@@ -56,7 +56,8 @@ var ClearableInput = function ClearableInput(props) {
       addonAfter = props.addonAfter,
       focused = props.focused,
       numberMark = props.numberMark,
-      inputCount = props.inputCount;
+      inputCount = props.inputCount,
+      count = props.count;
 
   var _useState = (0, _react.useState)(false),
       _useState2 = (0, _slicedToArray2.default)(_useState, 2),
@@ -105,7 +106,7 @@ var ClearableInput = function ClearableInput(props) {
   var renderInputWithFixNode = function renderInputWithFixNode(originElement) {
     var _context, _classNames2;
 
-    if (!hasPrefixSuffix(props)) {
+    if (!hasPrefixSuffix(props) && !count) {
       return originElement;
     }
 
@@ -127,7 +128,7 @@ var ClearableInput = function ClearableInput(props) {
   var renderInputWithLabel = function renderInputWithLabel(originElement) {
     var _classNames4, _context2, _classNames5;
 
-    if (!addonBefore && !addonAfter) {
+    if (!addonBefore && !addonAfter && !count) {
       return originElement;
     }
 

package/lib/input/input.js

@@ -183,7 +183,11 @@ var InternalInput = function InternalInput(props, ref) {
 
     if (count && showNumberMark && !disabled) {
       return /*#__PURE__*/_react.default.createElement("div", {
-        className: (0, _classnames.default)("".concat(inputPrefixCls, "-input-mark-inner"))
+        className: (0, _classnames.default)("".concat(inputPrefixCls, "-input-mark-inner")),
+        onMouseDown: function onMouseDown(e) {
+          e.stopPropagation();
+          e.preventDefault();
+        }
       }, enteredLength, maxLength !== undefined ? "/".concat(maxLength) : null);
     }
 
@@ -222,6 +226,7 @@ var InternalInput = function InternalInput(props, ref) {
     prefixCls: inputPrefixCls,
     element: renderInput(),
     focused: focused,
+    count: count,
     inputCount: renderCount()
   }));
 };

package/lib/input-number/inputNumber.js

@@ -192,29 +192,42 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
         _numerical$split2$ = _numerical$split2[1],
         decimalValue = _numerical$split2$ === void 0 ? '' : _numerical$split2$;
 
+    var sign = '';
+
+    if ((0, _includes.default)(integerValue).call(integerValue, '-')) {
+      integerValue = integerValue.replace('-', '');
+      sign = '-';
+    }
+
     var integerValueLength = integerValue.length;
     var decimalValueLength = decimalValue.length;
 
     if (typeof decimalLength === 'number' && typeof digitLength === 'number') {
-      if (integerValueLength > digitLength - decimalLength) {
-        resultNumerical = integerValue.substr(0, digitLength - decimalLength);
-      } else if (decimalValueLength > decimalLength) {
+      if (decimalValueLength <= decimalLength && integerValueLength <= digitLength - decimalLength) {
+        resultNumerical = numerical;
+      } else if (integerValueLength > digitLength - decimalLength) {
         var _context;
 
-        resultNumerical = (0, _concat.default)(_context = "".concat(integerValue, ".")).call(_context, decimalValue.substr(0, decimalLength));
+        resultNumerical = (0, _concat.default)(_context = "".concat(sign)).call(_context, integerValue.substr(0, digitLength - decimalLength));
+      } else if (decimalValueLength > decimalLength) {
+        var _context2, _context3;
+
+        resultNumerical = (0, _concat.default)(_context2 = (0, _concat.default)(_context3 = "".concat(sign)).call(_context3, integerValue, ".")).call(_context2, decimalValue.substr(0, decimalLength));
       }
     } else if (typeof decimalLength !== 'number' && typeof digitLength === 'number') {
       if (integerValueLength >= digitLength) {
-        resultNumerical = integerValue.substr(0, digitLength);
+        var _context4;
+
+        resultNumerical = (0, _concat.default)(_context4 = "".concat(sign)).call(_context4, integerValue.substr(0, digitLength));
       } else {
-        var _context2;
+        var _context5, _context6, _context7;
 
-        resultNumerical = decimalValueLength ? (0, _concat.default)(_context2 = "".concat(integerValue, ".")).call(_context2, decimalValue.substr(0, digitLength - integerValueLength)) : integerValue;
+        resultNumerical = decimalValueLength ? (0, _concat.default)(_context5 = (0, _concat.default)(_context6 = "".concat(sign)).call(_context6, integerValue, ".")).call(_context5, decimalValue.substr(0, digitLength - integerValueLength)) : (0, _concat.default)(_context7 = "".concat(sign)).call(_context7, integerValue);
       }
     } else if (typeof decimalLength === 'number' && typeof digitLength !== 'number') {
-      var _context3;
+      var _context8, _context9, _context10;
 
-      resultNumerical = decimalValueLength ? (0, _concat.default)(_context3 = "".concat(integerValue, ".")).call(_context3, decimalValue.substr(0, decimalLength)) : integerValue;
+      resultNumerical = decimalValueLength ? (0, _concat.default)(_context8 = (0, _concat.default)(_context9 = "".concat(sign)).call(_context9, integerValue, ".")).call(_context8, decimalValue.substr(0, decimalLength)) : (0, _concat.default)(_context10 = "".concat(sign)).call(_context10, integerValue);
     } else {
       resultNumerical = numerical;
     }
@@ -251,7 +264,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
   };
 
   var handleKeyDown = function handleKeyDown(event) {
-    var _context4;
+    var _context11;
 
     if (!stepOption || props.disabled || props.readOnly) {
       return;
@@ -259,7 +272,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
 
     var keyCode = event.keyCode;
 
-    if ((0, _includes.default)(_context4 = [38, 40]).call(_context4, keyCode)) {
+    if ((0, _includes.default)(_context11 = [38, 40]).call(_context11, keyCode)) {
       event.preventDefault();
       handleStepChang(keyCode === 38 ? 'plus' : 'minus');
     }

package/lib/tree/tree.js

@@ -278,6 +278,11 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
 
   var handleExpand = _react.default.useCallback(function (key, expanded, node) {
     var newExpandedKeys = expanded ? (0, _treeUtils.addKeys)(expandedKeys, [key]) : (0, _treeUtils.delKey)(expandedKeys, [key]);
+
+    if (expandedKeysProps === undefined) {
+      setExpandedKeys(newExpandedKeys);
+    }
+
     onExpand && onExpand(newExpandedKeys, {
       node: node,
       expanded: expanded
@@ -458,8 +463,6 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     if (scrollToKey) {
       setSelectedKeys([scrollToKey]);
       setScrollKey(scrollToKey);
-    } else {
-      setSelectedKeys([]);
     }
   }, [scrollToKey]);
   (0, _react.useEffect)(function () {
@@ -493,7 +496,7 @@ var InternalTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
     item.onDrop = handleDrop;
     item.onSelect = handleSelect;
     item.checked = checked;
-    item.selected = (0, _treeUtils.getSelected)(selectedKeys, item.key);
+    item.selected = (0, _treeUtils.getSelected)(Array.isArray(selectedKeys) && selectedKeys[0] ? [selectedKeys[0]] : selectedKeys, item.key);
     item.indeterminate = indeterminate;
     item.disabled = getDisabled(disabled, item.disabled);
     item.showIcon = showIcon || false;

package/lib/tree/treeHooks.js

@@ -113,12 +113,8 @@ var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExp
   }
 
   var initialExpandedKeys = _react.default.useMemo(function () {
-    return (0, _treeUtils.getInitExpandedKeys)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching, keysData, searchExpandedKeys);
-  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData, searchExpandedKeys]);
-
-  var newExpandedKeys = _react.default.useMemo(function () {
-    return (0, _treeUtils.getExpandedKeys)(expandedKeysProps, expandScrollkeys);
-  }, [expandedKeysProps]);
+    return (0, _treeUtils.getInitExpandedKeys)(flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, expandScrollkeys, filterTreeNode, isSearching, keysData, searchExpandedKeys, isInit);
+  }, [flattenAllData, expandedKeysProps, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent, scrollKey, filterTreeNode, isSearching, keysData, searchExpandedKeys, isInit]);
 
   var _React$useState7 = _react.default.useState(initialExpandedKeys),
       _React$useState8 = (0, _slicedToArray2.default)(_React$useState7, 2),
@@ -126,9 +122,8 @@ var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExp
       setExpandedKeys = _React$useState8[1];
 
   _react.default.useEffect(function () {
-    var keys = isInit || isSearching ? initialExpandedKeys : newExpandedKeys;
-    setExpandedKeys(keys);
-  }, [newExpandedKeys, initialExpandedKeys, isSearching, isInit]);
+    setExpandedKeys(initialExpandedKeys);
+  }, [expandedKeysProps, searchExpandedKeys, defaultExpandAll, defaultExpandedKeys, defaultExpandRoot, defaultExpandParent]);
 
   return [expandedKeys, setExpandedKeys];
 };

package/lib/tree/utils/treeUtils.d.ts

@@ -60,6 +60,6 @@ export declare const getDataCheckededStateStrictly: (checkedKeys: string[]) => {
 };
 export declare const delKey: (prevKeys: string[], delKeys: string[]) => never[] & string[];
 export declare const getAllNodeKeys: (data: any[]) => string[];
-export declare const getInitExpandedKeys: (data: any[], expandedKeys: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, expandScrollkeys: string[] | undefined, filterTreeNode: FunctionConstructor, isSearching: boolean, keysData: KeysDataType, searchExpandedKeys: string[]) => string[];
+export declare const getInitExpandedKeys: (data: any[], expandedKeys: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, expandScrollkeys: string[] | undefined, filterTreeNode: FunctionConstructor, isSearching: boolean, keysData: KeysDataType, searchExpandedKeys: string[], isInit: boolean) => string[];
 export declare const getExpandedKeys: (expandedKeys: string[], expandScrollkeys?: string[]) => string[];
 export declare const calcDropPosition: (event: React.MouseEvent, dropNode: HTMLElement) => 0 | 1 | -1;

package/lib/tree/utils/treeUtils.js

@@ -776,25 +776,28 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
   var isSearching = arguments.length > 8 ? arguments[8] : undefined;
   var keysData = arguments.length > 9 ? arguments[9] : undefined;
   var searchExpandedKeys = arguments.length > 10 ? arguments[10] : undefined;
+  var isInit = arguments.length > 11 ? arguments[11] : undefined;
   var keys = (expandedKeys === null || expandedKeys === void 0 ? void 0 : (0, _concat.default)(expandedKeys).call(expandedKeys, expandScrollkeys)) || (defaultExpandedKeys === null || defaultExpandedKeys === void 0 ? void 0 : (0, _concat.default)(defaultExpandedKeys).call(defaultExpandedKeys, expandScrollkeys)) || [];
 
-  if (defaultExpandAll) {
-    keys = getAllNodeKeys(data);
-  } else {
-    if (defaultExpandRoot) {
-      var rootKey = getRootKeys(data);
+  if (isInit) {
+    if (defaultExpandAll) {
+      keys = getAllNodeKeys(data);
+    } else {
+      if (defaultExpandRoot) {
+        var rootKey = getRootKeys(data);
 
-      if (rootKey) {
-        keys = (0, _concat.default)(keys).call(keys, rootKey);
+        if (rootKey) {
+          keys = (0, _concat.default)(keys).call(keys, rootKey);
+        }
       }
-    }
 
-    if (defaultExpandParent) {
-      var parentKeys = [];
-      keys.forEach(function (key) {
-        parentKeys.push.apply(parentKeys, (0, _toConsumableArray2.default)(getAllParentKeys(data, key)));
-      });
-      keys = (0, _concat.default)(keys).call(keys, parentKeys);
+      if (defaultExpandParent) {
+        var parentKeys = [];
+        keys.forEach(function (key) {
+          parentKeys.push.apply(parentKeys, (0, _toConsumableArray2.default)(getAllParentKeys(data, key)));
+        });
+        keys = (0, _concat.default)(keys).call(keys, parentKeys);
+      }
     }
   }
 

package/lib/upload/upload.js

@@ -583,7 +583,7 @@ var Item = function Item(_ref3) {
       width: '100%',
       height: '100%'
     },
-    operations: [/*#__PURE__*/React.createElement(_icon.default, {
+    operations: disabled ? [] : [/*#__PURE__*/React.createElement(_icon.default, {
       key: "1",
       type: "delete",
       onClick: handleRemove.bind(_this, file)

package/package.json

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