@kdcloudjs/kdesign 1.6.27 → 1.6.28

package/lib/select/select.js

@@ -441,25 +441,27 @@ var InternalSelect = function InternalSelect(props, ref) {
         selectedVal = _multipleRef$current3.selectedVal,
         selectMulOpts = _multipleRef$current3.selectMulOpts;
 
-    if ((filledOptions === null || filledOptions === void 0 ? void 0 : filledOptions.length) !== selectedVal.length) {
-      (0, _map.default)(filledOptions).call(filledOptions, function (child) {
-        var _ref = child.props || child,
-            value = _ref.value;
-
-        if (!(0, _includes.default)(selectedVal).call(selectedVal, value)) {
-          selectedVal.push(value);
-          selectMulOpts.push({
-            value: value,
-            label: getOptionLabel(child)
-          });
-        }
-      });
-      setMulOptions((0, _toConsumableArray2.default)(selectMulOpts));
-      setSearchValue('');
-    } else {
-      multipleRef.current.selectedVal = selectedVal = [];
-      multipleRef.current.selectMulOpts = selectMulOpts = [];
-      setMulOptions([]);
+    if (!('value' in selectProps)) {
+      if ((filledOptions === null || filledOptions === void 0 ? void 0 : filledOptions.length) !== selectedVal.length) {
+        (0, _map.default)(filledOptions).call(filledOptions, function (child) {
+          var _ref = child.props || child,
+              value = _ref.value;
+
+          if (!(0, _includes.default)(selectedVal).call(selectedVal, value)) {
+            selectedVal.push(value);
+            selectMulOpts.push({
+              value: value,
+              label: getOptionLabel(child)
+            });
+          }
+        });
+        setMulOptions((0, _toConsumableArray2.default)(selectMulOpts));
+        setSearchValue('');
+      } else {
+        multipleRef.current.selectedVal = selectedVal = [];
+        multipleRef.current.selectMulOpts = selectMulOpts = [];
+        setMulOptions([]);
+      }
     }
 
     onChange && onChange(labelInValue ? selectMulOpts : selectedVal, selectMulOpts);
@@ -491,6 +493,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     }
 
     onClear && onClear('');
+    setSearchValue('');
     onChange && onChange(isMultiple ? '' : undefined);
   }; // 多选模式下清除某一项
 
@@ -516,7 +519,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     var selectedVal = multipleRef.current.selectedVal; // 选择器下拉icon样式
 
     var arrowIconCls = (0, _classnames.default)((_classNames7 = {}, (0, _defineProperty2.default)(_classNames7, "".concat(selectPrefixCls, "-icon-arrow"), true), (0, _defineProperty2.default)(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-up"), optionShow), (0, _defineProperty2.default)(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-down"), !optionShow), (0, _defineProperty2.default)(_classNames7, "".concat(selectPrefixCls, "-icon-arrow-focus"), optionShow), _classNames7));
-    var iconShow = allowClear && !disabled && (isMultiple ? mulOptions.length > 0 : (selectedVal !== null && selectedVal !== void 0 ? selectedVal : '') !== '');
+    var iconShow = allowClear && !disabled && ((isMultiple ? mulOptions.length > 0 : (selectedVal !== null && selectedVal !== void 0 ? selectedVal : '') !== '') || searchValue);
     var clearIconCls = (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(selectPrefixCls, "-icon-clear"), true));
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, iconShow && /*#__PURE__*/_react.default.createElement("span", {
       onClick: handleReset,

package/lib/upload/interface.d.ts

@@ -145,6 +145,7 @@ export interface IFileItem {
     file: UploadFile;
     prefixCls: string;
     listType: string;
+    disabled: boolean;
     handleReUpload: (file: UploadFile, e: React.MouseEvent) => void;
     handleRemove: (file: UploadFile, e: React.MouseEvent) => void;
 }

package/lib/upload/upload.js

@@ -186,7 +186,9 @@ var InternalUpload = function InternalUpload(props, ref) {
     var _context2;
 
     files.forEach(function (file) {
-      file.originFileObj = new File([file], file.type);
+      file.originFileObj = new File([file], file.name, {
+        type: file.type
+      });
       file.uid = getUid();
       file.status = 'notStart';
       file.fileName = allProps.name || file.name;
@@ -492,7 +494,8 @@ var InternalUpload = function InternalUpload(props, ref) {
       prefixCls: prefixCls,
       listType: listType,
       handleReUpload: handleReUpload,
-      handleRemove: handleRemove
+      handleRemove: handleRemove,
+      disabled: disabled
     })), file, setFileList) : /*#__PURE__*/React.createElement(Item, (0, _extends2.default)({
       key: file.uid
     }, {
@@ -500,7 +503,8 @@ var InternalUpload = function InternalUpload(props, ref) {
       prefixCls: prefixCls,
       listType: listType,
       handleReUpload: handleReUpload,
-      handleRemove: handleRemove
+      handleRemove: handleRemove,
+      disabled: disabled
     }));
   })));
 };
@@ -512,7 +516,8 @@ var Item = function Item(_ref3) {
       prefixCls = _ref3.prefixCls,
       listType = _ref3.listType,
       handleReUpload = _ref3.handleReUpload,
-      handleRemove = _ref3.handleRemove;
+      handleRemove = _ref3.handleRemove,
+      disabled = _ref3.disabled;
   var mapStatus = {
     uploading: 'loadding',
     error: 'warning-solid',
@@ -540,7 +545,7 @@ var Item = function Item(_ref3) {
     href: "true",
     className: (0, _concat.default)(_context13 = "".concat(prefixCls, "-")).call(_context13, listType, "-list-item-reupload"),
     onClick: handleReUpload.bind(_this, file)
-  }, "\u91CD\u65B0\u4E0A\u4F20"), /*#__PURE__*/React.createElement("a", {
+  }, "\u91CD\u65B0\u4E0A\u4F20"), !disabled && /*#__PURE__*/React.createElement("a", {
     href: "true",
     className: (0, _concat.default)(_context14 = "".concat(prefixCls, "-")).call(_context14, listType, "-list-item-delete"),
     onClick: handleRemove.bind(_this, file)
@@ -559,7 +564,7 @@ var Item = function Item(_ref3) {
     style: {
       verticalAlign: 'top'
     }
-  }), "\u4E0A\u4F20\u5931\u8D25"), /*#__PURE__*/React.createElement("div", {
+  }), "\u4E0A\u4F20\u5931\u8D25"), !disabled && /*#__PURE__*/React.createElement("div", {
     className: (0, _concat.default)(_context18 = "".concat(prefixCls, "-")).call(_context18, listType, "-list-item-action")
   }, /*#__PURE__*/React.createElement("a", {
     href: "true",

package/package.json

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