@kdcloudjs/kdesign 1.7.7 → 1.7.9

package/es/input/ClearableLabeledInput.js

@@ -59,11 +59,11 @@ var ClearableInput = function ClearableInput(props) {
     }) : allowClear);
   };
   var renderSuffix = function renderSuffix() {
-    if (suffix || !disabled && !!allowClear || inputCount) {
+    if (suffix || inputCount) {
       return /*#__PURE__*/React.createElement("span", {
         className: "".concat(prefixCls, "-suffix"),
         onMouseDown: mouseDownHandle
-      }, renderClearIcon(), inputCount && /*#__PURE__*/React.createElement("span", {
+      }, inputCount && /*#__PURE__*/React.createElement("span", {
         style: {
           marginRight: suffix ? 9 : 0
         }
@@ -89,7 +89,7 @@ var ClearableInput = function ClearableInput(props) {
       onMouseLeave: mouseLeaveHandle
     }, prefixNode, /*#__PURE__*/React.cloneElement(originElement, {
       style: null
-    }), suffixNode);
+    }), renderClearIcon(), suffixNode);
   };
   var renderInputWithLabel = function renderInputWithLabel(originElement) {
     var _classNames4, _context2, _classNames5;

package/es/input/style/index.css

@@ -367,10 +367,12 @@ textarea {
   border-color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
 }
 .kd-input-wrapper-disabled {
-  background-color: var(--kd-c-input-color-background-disabled, var(--kd-g-color-background-contain-disabled, #f5f5f5));
   border-color: var(--kd-c-input-color-border-disabled, var(--kd-g-color-border-strong, #d9d9d9));
   cursor: not-allowed;
 }
+.kd-input-wrapper-disabled:not(.kd-input-wrapper-underline) {
+  background-color: var(--kd-c-input-color-background-disabled, var(--kd-g-color-background-contain-disabled, #f5f5f5));
+}
 .kd-input-wrapper-disabled .kd-input-suffix,
 .kd-input-wrapper-disabled .kd-input-prefix {
   color: var(--kd-c-input-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
@@ -425,6 +427,15 @@ textarea {
 .kd-input-textarea-clear-icon {
   cursor: pointer;
   color: var(--kd-c-input-clear-color, #d9d9d9);
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-box-pack: center;
+      -ms-flex-pack: center;
+          justify-content: center;
 }
 .kd-input-clear-icon:hover,
 .kd-input-textarea-clear-icon:hover {
@@ -437,6 +448,7 @@ textarea {
 }
 .kd-input-clear-icon-hidden {
   visibility: hidden;
+  display: none;
 }
 .kd-input-clear-icon-rightSpace {
   margin-right: 4px;

package/es/input/style/index.less

@@ -157,10 +157,13 @@ textarea {
     }
 
     &-disabled {
-      background-color: @input-background-color-disabled-inner;
       border-color: @input-border-color-disabled-inner;
       cursor: not-allowed;
 
+      &:not(.@{input-prefix-cls}-wrapper-underline) {
+        background-color: @input-background-color-disabled-inner;
+      }
+
       .@{input-prefix-cls}-suffix,
       .@{input-prefix-cls}-prefix {
         color: @input-color-disabled-inner;
@@ -192,6 +195,7 @@ textarea {
 
   &-clear-icon-hidden {
     visibility: hidden;
+    display: none;
   }
 
   &-clear-icon-rightSpace {

package/es/input/style/mixin.less

@@ -51,6 +51,9 @@
 .input-clear-icon() {
   cursor: pointer;
   color: @input-clear-color;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
 
   &:hover {
     color: @input-clear-color-hover;

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

@@ -94,7 +94,8 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
     treeLoadData = treeSelectProps.treeLoadData,
     onTreeExpand = treeSelectProps.onTreeExpand,
     onSelect = treeSelectProps.onSelect,
-    onCheck = treeSelectProps.onCheck;
+    onCheck = treeSelectProps.onCheck,
+    dropdownRender = treeSelectProps.dropdownRender;
   var isMultiple = mode === 'multiple'; // 是否多选
   var _useMergedState = useMergedState(isMultiple ? [] : undefined, {
       value: value,
@@ -253,7 +254,6 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
   };
   var handleCheck = function handleCheck(keys, state) {
     onCheck === null || onCheck === void 0 ? void 0 : onCheck(keys, state);
-    console.log(1111, state);
     onChange === null || onChange === void 0 ? void 0 : onChange(keys);
     !Object.hasOwnProperty.call(treeSelectProps, 'value') && setInitValue(keys);
   };
@@ -346,7 +346,7 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
       className: dropDownCls,
       style: dropDownStyle,
       ref: dropDownRef
-    }, dropRender()));
+    }, dropdownRender ? dropdownRender === null || dropdownRender === void 0 ? void 0 : dropdownRender(dropRender()) : dropRender()));
   };
   // 处理多选tag
   var handleMaxTagHolder = useCallback(function () {

package/lib/input/ClearableLabeledInput.js

@@ -72,11 +72,11 @@ var ClearableInput = function ClearableInput(props) {
     }) : allowClear);
   };
   var renderSuffix = function renderSuffix() {
-    if (suffix || !disabled && !!allowClear || inputCount) {
+    if (suffix || inputCount) {
       return /*#__PURE__*/_react.default.createElement("span", {
         className: "".concat(prefixCls, "-suffix"),
         onMouseDown: mouseDownHandle
-      }, renderClearIcon(), inputCount && /*#__PURE__*/_react.default.createElement("span", {
+      }, inputCount && /*#__PURE__*/_react.default.createElement("span", {
         style: {
           marginRight: suffix ? 9 : 0
         }
@@ -102,7 +102,7 @@ var ClearableInput = function ClearableInput(props) {
       onMouseLeave: mouseLeaveHandle
     }, prefixNode, /*#__PURE__*/_react.default.cloneElement(originElement, {
       style: null
-    }), suffixNode);
+    }), renderClearIcon(), suffixNode);
   };
   var renderInputWithLabel = function renderInputWithLabel(originElement) {
     var _classNames4, _context2, _classNames5;

package/lib/input/style/index.css

@@ -367,10 +367,12 @@ textarea {
   border-color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
 }
 .kd-input-wrapper-disabled {
-  background-color: var(--kd-c-input-color-background-disabled, var(--kd-g-color-background-contain-disabled, #f5f5f5));
   border-color: var(--kd-c-input-color-border-disabled, var(--kd-g-color-border-strong, #d9d9d9));
   cursor: not-allowed;
 }
+.kd-input-wrapper-disabled:not(.kd-input-wrapper-underline) {
+  background-color: var(--kd-c-input-color-background-disabled, var(--kd-g-color-background-contain-disabled, #f5f5f5));
+}
 .kd-input-wrapper-disabled .kd-input-suffix,
 .kd-input-wrapper-disabled .kd-input-prefix {
   color: var(--kd-c-input-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
@@ -425,6 +427,15 @@ textarea {
 .kd-input-textarea-clear-icon {
   cursor: pointer;
   color: var(--kd-c-input-clear-color, #d9d9d9);
+  display: -webkit-inline-box;
+  display: -ms-inline-flexbox;
+  display: inline-flex;
+  -webkit-box-align: center;
+      -ms-flex-align: center;
+          align-items: center;
+  -webkit-box-pack: center;
+      -ms-flex-pack: center;
+          justify-content: center;
 }
 .kd-input-clear-icon:hover,
 .kd-input-textarea-clear-icon:hover {
@@ -437,6 +448,7 @@ textarea {
 }
 .kd-input-clear-icon-hidden {
   visibility: hidden;
+  display: none;
 }
 .kd-input-clear-icon-rightSpace {
   margin-right: 4px;

package/lib/input/style/index.less

@@ -157,10 +157,13 @@ textarea {
     }
 
     &-disabled {
-      background-color: @input-background-color-disabled-inner;
       border-color: @input-border-color-disabled-inner;
       cursor: not-allowed;
 
+      &:not(.@{input-prefix-cls}-wrapper-underline) {
+        background-color: @input-background-color-disabled-inner;
+      }
+
       .@{input-prefix-cls}-suffix,
       .@{input-prefix-cls}-prefix {
         color: @input-color-disabled-inner;
@@ -192,6 +195,7 @@ textarea {
 
   &-clear-icon-hidden {
     visibility: hidden;
+    display: none;
   }
 
   &-clear-icon-rightSpace {

package/lib/input/style/mixin.less

@@ -51,6 +51,9 @@
 .input-clear-icon() {
   cursor: pointer;
   color: @input-clear-color;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
 
   &:hover {
     color: @input-clear-color-hover;

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

@@ -106,7 +106,8 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
     treeLoadData = treeSelectProps.treeLoadData,
     onTreeExpand = treeSelectProps.onTreeExpand,
     onSelect = treeSelectProps.onSelect,
-    onCheck = treeSelectProps.onCheck;
+    onCheck = treeSelectProps.onCheck,
+    dropdownRender = treeSelectProps.dropdownRender;
   var isMultiple = mode === 'multiple'; // 是否多选
   var _useMergedState = (0, _hooks.useMergedState)(isMultiple ? [] : undefined, {
       value: value,
@@ -265,7 +266,6 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
   };
   var handleCheck = function handleCheck(keys, state) {
     onCheck === null || onCheck === void 0 ? void 0 : onCheck(keys, state);
-    console.log(1111, state);
     onChange === null || onChange === void 0 ? void 0 : onChange(keys);
     !Object.hasOwnProperty.call(treeSelectProps, 'value') && setInitValue(keys);
   };
@@ -358,7 +358,7 @@ var InternalTreeSelect = function InternalTreeSelect(props, ref) {
       className: dropDownCls,
       style: dropDownStyle,
       ref: dropDownRef
-    }, dropRender()));
+    }, dropdownRender ? dropdownRender === null || dropdownRender === void 0 ? void 0 : dropdownRender(dropRender()) : dropRender()));
   };
   // 处理多选tag
   var handleMaxTagHolder = (0, _react.useCallback)(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.7.7",
+  "version": "1.7.9",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [
@@ -77,7 +77,7 @@
     "@babel/runtime": "^7.10.4",
     "@babel/runtime-corejs3": "^7.11.2",
     "@babel/standalone": "^7.14.3",
-    "@kdcloudjs/table": "1.1.6-canary.1",
+    "@kdcloudjs/table": "1.1.6-canary.2",
     "@popperjs/core": "^2.5.4",
     "@types/js-cookie": "^3.0.3",
     "async-validator": "^3.5.1",