@kdcloudjs/kdesign 1.5.8 → 1.5.11

package/lib/tabs/style/mixin.less

@@ -5,11 +5,6 @@
   flex-direction: column;
   flex-wrap: nowrap;
   height: 100%;
-  // box-sizing: border-box;
-  // width: 100%;
-  // height: @tabs-height;
-  // color: @tabs-font-color;
-  // border-bottom: @tabs-border-width solid @tabs-border-color;
 }
 .tabNavs() {
   position: relative;
@@ -29,6 +24,5 @@
   color: @tabs-font-color;
   height: @tab-pane-height;
   line-height: @tab-pane-line-height;
-  margin-right: @tab-pane-margin-right;
   cursor: pointer;
 }

package/lib/tabs/style/token.less

@@ -6,7 +6,7 @@
 @tabs-border-color: var(~'@{tabs-custom-prefix}-color-border', @color-border-strong);
 @tab-line-color-active: var(~'@{tabs-custom-prefix}-line-color-active', @color-theme);
 @tabs-card-bg: var(~'@{tabs-custom-prefix}-card-color-background', @color-background-contain-disabled);
-@tab-disabled-bg: var(~'@{tabs-custom-prefix}-color-background-disabled', @color-background-2);
+@tab-disabled-bg: var(~'@{tabs-custom-prefix}-color-background-disabled', transparent);
 @tabs-font-color: var(~'@{tabs-custom-prefix}-color-text', @color-text-secondary);
 @tabPane-font-color-active: var(~'@{tabs-custom-prefix}-color-text-active', @color-theme);
 @tabPane-font-color-hover: var(~'@{tabs-custom-prefix}-color-text-hover', @color-theme);
@@ -16,7 +16,7 @@
 @tabPane-font-size: var(~'@{tabs-custom-prefix}-pane-font-size', @font-size-middle);
 
 // line-height
-@tab-pane-line-height: var(~'@{tabs-custom-prefix}-pane-line-height', 48px);
+@tab-pane-line-height: var(~'@{tabs-custom-prefix}-pane-height', 48px);
 
 // motion
 @tab-transition-fn: var(~'@{tabs-custom-prefix}-motion-timing-function', cubic-bezier(0.42, 0, 1, 1));
@@ -26,7 +26,12 @@
 @tabs-height: var(~'@{tabs-custom-prefix}-sizing-height', 48px);
 @tabs-border-width: var(~'@{tabs-custom-prefix}-sizing-border', 1px);
 @tab-pane-height: var(~'@{tabs-custom-prefix}-pane-sizing-height', 48px);
+@tab-pane-type-line-height-small: var(~'@{tabs-custom-prefix}-pane-type-line-sizing-height-small', 32px);
+@tab-pane-type-line-height-middle: var(~'@{tabs-custom-prefix}-pane-type-line-sizing-height-middle', 32px);
+@tab-pane-type-dynamic-height: var(~'@{tabs-custom-prefix}-pane-type-dynamic-sizing-height', 32px);
 
 
 // spacing
-@tab-pane-margin-right: var(~'@{tabs-custom-prefix}-pane-spacing-margin-right', 24px);
+@tab-pane-line-paddinng-horizontal: var(~'@{tabs-custom-prefix}-pane-line-paddinng-horizontal', 20px);
+@tab-pane-card-paddinng-horizontal: var(~'@{tabs-custom-prefix}-pane-card-paddinng-horizontal', 18px);
+@tab-pane-grid-paddinng-horizontal: var(~'@{tabs-custom-prefix}-pane-grid-paddinng-horizontal', 20px);

package/lib/transfer/style/index.css

@@ -352,6 +352,3 @@
 .kd-transfer-operation .kd-btn + .kd-btn {
   margin-top: 20px;
 }
-.kd-transfer-operation .kd-btn .kd-btn-iconWrapper-left {
-  float: none;
-}

package/lib/transfer/style/index.less

@@ -182,9 +182,6 @@
       & + .@{kd-prefix}-btn {
         margin-top: 20px;
       }
-      .@{kd-prefix}-btn-iconWrapper-left {
-        float: none;
-      }
     }
   }
 }

package/lib/tree/style/index.css

@@ -131,6 +131,7 @@
           flex-grow: 1;
   font-size: var(--kd-c-tree-font-size, var(--kd-g-font-size-small, 12px));
   color: var(--kd-c-tree-color-text, var(--kd-g-color-text-primary, #212121));
+  margin-left: var(--kd-c-tree-spacing-margin-left, 16px);
 }
 .kd-tree-root {
   min-width: 100%;
@@ -155,7 +156,7 @@
           align-items: center;
 }
 .kd-tree-node-root .kd-spin-dot-spin {
-  border: none;
+  border: 2px solid transparent;
   width: var(--kd-c-tree-expand-icon-loading-sizing-width, 16px);
   height: var(--kd-c-tree-expand-icon-loading-sizing-height, 16px);
 }

package/lib/tree/style/index.less

@@ -11,6 +11,7 @@
   flex-grow: 1;
   font-size: @tree-font-size;
   color: @tree-color-text;
+  margin-left: @tree-margin-left;
   &-root {
     min-width: 100%;
     flex-shrink: 0;
@@ -30,7 +31,7 @@
     align-items: center;
 
     .@{kd-prefix}-spin-dot-spin {
-      border: none;
+      border: 2px solid transparent;
       width: @tree-expand-icon-loading-width;
       height: @tree-expand-icon-loading-height;
 
@@ -47,7 +48,7 @@
     display: flex;
     align-items: center;
 
-    .node-hover()
+    .node-hover();
   }
 
   &-indent {
@@ -115,14 +116,14 @@
     .node-hover();
 
     &-selected {
-      .node-selected()
+      .node-selected();
     }
   }
   &-title {
     white-space: nowrap;
   }
   &-selected {
-    .node-selected()
+    .node-selected();
   }
 
   &-draggabled {

package/lib/tree/style/token.less

@@ -22,10 +22,11 @@
 @tree-expand-icon-loading-width: var(~'@{tree-prefix}-expand-icon-loading-sizing-width', 16px);
 @tree-node-icon-height: var(~'@{tree-prefix}-node-icon-sizing-height', 16px);
 @tree-node-icon-width: var(~'@{tree-prefix}-node-icon-sizing-width', 16px);
+@tree-margin-left: var(~'@{tree-prefix}-spacing-margin-left', 16px);
 
 // font
 @tree-font-size: var(~'@{tree-prefix}-font-size', @font-size-small);
 @tree-node-icon-size: var(~'@{tree-prefix}-node-icon-font-size', 16px);
 
 // motion
-@tree-transition-duration: var(~'@{tree-prefix}-motion-duration', @duration-promptly);
+@tree-transition-duration: var(~'@{tree-prefix}-motion-duration', @duration-promptly);

package/lib/tree/treeNode.js

@@ -271,7 +271,10 @@ var TreeNode = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
       onChange: handleOnchange,
       checked: checked,
       indeterminate: !disabled && indeterminate,
-      disabled: disabled
+      disabled: disabled,
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      }
     }, /*#__PURE__*/_react.default.createElement("span", {
       className: (0, _classnames.default)("".concat(treeNodePrefixCls, "-title"), (0, _defineProperty2.default)({}, "".concat(treeNodePrefixCls, "-title-disabled"), disabled))
     }, title)) : /*#__PURE__*/_react.default.createElement("span", {

package/lib/upload/style/index.css

@@ -180,13 +180,14 @@
   list-style: none;
   -webkit-font-feature-settings: 'tnum';
           font-feature-settings: 'tnum';
-  margin-top: 16px;
+  margin-top: var(--kd-c-upload-text-list-margin-top, 16px);
   font-size: var(--kd-c-upload-font-size, var(--kd-g-font-size-middle, 14px));
   border-top: 1px dashed var(--kd-c-upload-division-color, var(--kd-g-color-border-strong, #d9d9d9));
 }
 .kd-upload .kd-upload-text-list-item {
   position: relative;
-  padding: 12px 20px;
+  padding: 0 var(--kd-c-upload-text-list-item-padding-horizontal, 20px);
+  height: var(--kd-c-upload-list-item-height, 44px);
   overflow: hidden;
   white-space: nowrap;
   display: -webkit-box;
@@ -212,9 +213,12 @@
 .kd-upload .kd-upload-text-list-item.error .kd-upload-text-list-item-name {
   color: var(--kd-c-upload-error-color, var(--kd-g-color-error, #fb2323));
 }
+.kd-upload .kd-upload-text-list-item-icon > i {
+  font-size: var(--kd-c-upload-font-size, var(--kd-g-font-size-middle, 14px));
+}
 .kd-upload .kd-upload-text-list-item-name {
   display: inline-block;
-  margin: 0 5px;
+  margin: 0 var(--kd-c-upload-text-list-item-name-padding-right, 8px) 0 var(--kd-c-upload-text-list-item-name-padding-left, 4px);
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -227,7 +231,9 @@
   position: absolute;
   top: 0;
   right: 0;
-  padding: 12px 20px;
+  padding: 0 var(--kd-c-upload-text-list-item-padding-horizontal, 20px);
+  height: var(--kd-c-upload-list-item-height, 44px);
+  line-height: var(--kd-c-upload-list-item-height, 44px);
   background-color: transparent;
   opacity: 0;
   visibility: hidden;
@@ -321,7 +327,8 @@
   max-height: 100%;
 }
 .kd-upload .kd-upload-picture-list-item.error {
-  border-color: var(--kd-c-upload-color-border-error, var(--kd-g-color-border-error, #ff8088));
+  border-color: var(--kd-c-upload-color-border-error, var(--kd-g-color-border-error, #fc808B));
+  background-color: var(--kd-c-upload-color-background-error, var(--kd-g-color-background-error, #fff2f4));
 }
 .kd-upload .kd-upload-picture-list-item-loading {
   width: 100%;
@@ -361,7 +368,7 @@
           justify-content: center;
 }
 .kd-upload .kd-upload-picture-list-item-error-text {
-  margin-bottom: 5px;
+  margin-bottom: 4px;
   color: var(--kd-c-upload-error-color, var(--kd-g-color-error, #fb2323));
 }
 .kd-upload .kd-upload-picture-list-item-error a {
@@ -370,3 +377,7 @@
 .kd-upload .kd-upload-picture-list-item-error a:not(:first-child) {
   margin-left: 10px;
 }
+.kd-upload .kd-upload-picture-list-item-action > a {
+  color: var(--kd-c-upload-panel-button-color, #0E5FD8);
+  font-size: var(--kd-c-upload-picture-action-font-size, var(--kd-g-font-size-small, 12px));
+}

package/lib/upload/style/index.less

@@ -59,13 +59,14 @@
 
   .@{upload-prefix-text-list-cls} {
     .reset-component;
-    margin-top: 16px;
+    margin-top: @upload-text-list-margin-top;
     font-size: @upload-font-size;
     border-top: 1px dashed @upload-border-color-strong;
 
     &-item {
       position: relative;
-      padding: 12px 20px;
+      padding: 0 @upload-text-list-item-padding-horizontal;
+      height: @upload-list-item-height;
       overflow: hidden;
       white-space: nowrap;
       display: flex;
@@ -90,9 +91,13 @@
         }
       }
 
+      &-icon > i {
+        font-size: @upload-font-size;
+      }
+
       &-name {
         display: inline-block;
-        margin: 0 5px;
+        margin: 0 @upload-text-list-item-name-padding-right 0 @upload-text-list-item-name-padding-left;
         .ellipsis;
         color: @upload-panel-color;
       }
@@ -105,7 +110,9 @@
         position: absolute;
         top: 0;
         right: 0;
-        padding: 12px 20px;
+        padding: 0 @upload-text-list-item-padding-horizontal;
+        height: @upload-list-item-height;
+        line-height: @upload-list-item-height;
         background-color: transparent;
         opacity: 0;
         visibility: hidden;
@@ -185,6 +192,7 @@
 
       &.error {
         border-color: @upload-border-error-color;
+        background-color: @upload-background-error-color;
       }
 
       &-loading {
@@ -209,7 +217,7 @@
         justify-content: center;
 
         &-text {
-          margin-bottom: 5px;
+          margin-bottom: 4px;
           color: @upload-text-error-color;
         }
 
@@ -220,6 +228,11 @@
           }
         }
       }
+
+      &-action > a {
+        color: @upload-panel-button-color;
+        font-size: @upload-picture-action-font-size;
+      }
     }
   }
 }

package/lib/upload/style/token.less

@@ -6,6 +6,7 @@
 @upload-text-color: var(~'@{upload-prefix}-color', @color-text-third);
 
 @upload-text-error-color: var(~'@{upload-prefix}-error-color', @color-error);
+@upload-background-error-color: var(~'@{upload-prefix}-color-background-error', @color-background-error);
 @upload-border-error-color: var(~'@{upload-prefix}-color-border-error', @color-border-error);
 @upload-border-color: var(~'@{upload-prefix}-color-border', @color-border-weak);
 @upload-border-color-strong: var(~'@{upload-prefix}-division-color', @color-border-strong);
@@ -22,7 +23,17 @@
 
 // font
 @upload-font-size: var(~'@{upload-prefix}-font-size', @font-size-middle);
+@upload-picture-action-font-size: var(~'@{upload-prefix}-picture-action-font-size', @font-size-small);
 
 // radius
 @upload-border-radius: var(~'@{upload-prefix}-radius-border', @radius-border);
 
+// sizing
+@upload-list-item-height: var(~'@{upload-prefix}-list-item-height', 44px);
+
+//spacing
+@upload-text-list-margin-top: var(~'@{upload-prefix}-text-list-margin-top', 16px);
+@upload-text-list-item-padding-horizontal: var(~'@{upload-prefix}-text-list-item-padding-horizontal', 20px);
+@upload-text-list-item-name-padding-left: var(~'@{upload-prefix}-text-list-item-name-padding-left', 4px);
+@upload-text-list-item-name-padding-right: var(~'@{upload-prefix}-text-list-item-name-padding-right', 8px);
+

package/lib/upload/upload.js

@@ -493,7 +493,7 @@ var InternalUpload = function InternalUpload(props, ref) {
   }, inputFileProps, {
     ref: mergedRef
   }))))), showUploadList && (0, _map.default)(fileList).call(fileList, function (file) {
-    var _context8, _context9, _context10, _context11, _context12, _context13, _context14, _context15, _context16, _context17, _context18, _context19;
+    var _context8, _context9, _context10, _context11, _context12, _context13, _context14, _context15, _context16, _context17, _context18, _context19, _context20;
 
     return /*#__PURE__*/React.createElement("li", {
       key: file.uid,
@@ -535,13 +535,15 @@ var InternalUpload = function InternalUpload(props, ref) {
       style: {
         verticalAlign: 'top'
       }
-    }), "\u4E0A\u4F20\u5931\u8D25"), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("a", {
+    }), "\u4E0A\u4F20\u5931\u8D25"), /*#__PURE__*/React.createElement("div", {
+      className: (0, _concat.default)(_context18 = "".concat(prefixCls, "-")).call(_context18, listType, "-list-item-action")
+    }, /*#__PURE__*/React.createElement("a", {
       href: "true",
-      className: (0, _concat.default)(_context18 = "".concat(prefixCls, "-")).call(_context18, listType, "-list-item-reupload"),
+      className: (0, _concat.default)(_context19 = "".concat(prefixCls, "-")).call(_context19, listType, "-list-item-reupload"),
       onClick: handleReUpload.bind(_this, file)
     }, "\u91CD\u65B0\u4E0A\u4F20"), /*#__PURE__*/React.createElement("a", {
       href: "true",
-      className: (0, _concat.default)(_context19 = "".concat(prefixCls, "-")).call(_context19, listType, "-list-item-delete"),
+      className: (0, _concat.default)(_context20 = "".concat(prefixCls, "-")).call(_context20, listType, "-list-item-delete"),
       onClick: handleRemove.bind(_this, file)
     }, "\u5220\u9664"))) : /*#__PURE__*/React.createElement(_image.default, {
       previewType: "upload",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.5.8",
+  "version": "1.5.11",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [
@@ -76,7 +76,7 @@
     "@babel/runtime": "^7.10.4",
     "@babel/runtime-corejs3": "^7.11.2",
     "@babel/standalone": "^7.14.3",
-    "@kdcloudjs/table": "^1.1.2",
+    "@kdcloudjs/table": "canary",
     "@popperjs/core": "^2.5.4",
     "async-validator": "^3.5.1",
     "axios": "^0.21.1",