@kdcloudjs/kdesign 1.7.4 → 1.7.6

package/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [1.7.4](https://github.com/kdcloudone/kdesign/compare/v1.7.3...v1.7.4) (2023-04-21)
+
+
+### Bug Fixes
+
+* [cli] 修复由于postcss升级导致的ts报错 ([74dee75](https://github.com/kdcloudone/kdesign/commit/74dee75525c688a824eae607a6f6f1ec7716024c))
+* [table] 修复筛选条件等于\&不等于不生效的问题 fix [#310](https://github.com/kdcloudone/kdesign/issues/310) ([ed889ef](https://github.com/kdcloudone/kdesign/commit/ed889ef31bbbd29e3696d0c6274554ff32f4e2e2))
+
+
+
 ## [1.7.3](https://github.com/kdcloudone/kdesign/compare/v1.7.2...v1.7.3) (2023-04-13)
 
 

package/dist/kdesign-complete.less

@@ -2894,257 +2894,305 @@
 @color-picker-prefix-cls: ~'@{kd-prefix}-color-picker';
 
 .@{color-picker-prefix-cls}-container {
-    position: relative;
+  position: relative;
 
-    .@{color-picker-prefix-cls}-input {
-        width: @color-picker-input-sizing-width;
-        height: @color-picker-input-sizing-height;
-        border-bottom: 1px solid rgba(217, 217, 217, 1);
-        font-size: @color-picker-input-font-size;
-    }
+  .@{color-picker-prefix-cls}-input {
+    width: @color-picker-input-sizing-width;
+    height: @color-picker-input-sizing-height;
+    border-bottom: 1px solid rgba(217, 217, 217, 1);
+    font-size: @color-picker-input-font-size;
+  }
 
-    .@{color-picker-prefix-cls}-icon-container {
-        position: absolute;
-        top: 3px;
-        right: 6px;
-        cursor: pointer;
+  .@{color-picker-prefix-cls}-icon-container {
+    position: absolute;
+    top: 3px;
+    right: 6px;
+    cursor: pointer;
 
-        .@{color-picker-prefix-cls}-icon {
-            width: @color-picker-input-suffix-sizing-width;
-            height: @color-picker-input-suffix-sizing-height;
-            border: 1px solid rgba(0, 0, 0, 0.05);
-            border-radius: 2px;
-            line-height: 18px;
-            text-align: center;
-            color: @bg;
+    .@{color-picker-prefix-cls}-icon {
+      width: @color-picker-input-suffix-sizing-width;
+      height: @color-picker-input-suffix-sizing-height;
+      border: 1px solid rgba(0, 0, 0, 0.05);
+      border-radius: 2px;
+      line-height: 18px;
+      text-align: center;
+      color: @bg;
 
-            &-underline {
-                margin-right: -6px;
-            }
+      &-underline {
+        margin-right: -6px;
+      }
 
-            &-up {
-                .kdicon-arrow-down {
-                    transform: rotate(180deg);
-                    transition: transform @transition-duration-quickly ease-in-out;
-                }
-            }
+      &-up {
+        .kdicon-arrow-down {
+          transform: rotate(180deg);
+          transition: transform @transition-duration-quickly ease-in-out;
+        }
+      }
 
-            &-down {
-                .kdicon-arrow-down {
-                    transform: rotate(0deg);
-                    transition: transform @transition-duration-quickly ease-in-out;
-                }
-            }
+      &-down {
+        .kdicon-arrow-down {
+          transform: rotate(0deg);
+          transition: transform @transition-duration-quickly ease-in-out;
         }
+      }
     }
+  }
 
 }
 
 .@{color-picker-prefix-cls}-pop {
 
-    &.topLeft.hidden,
-    &.bottomLeft.hidden,
-    &.topRight.hidden,
-    &.bottomRight.hidden {
-        opacity: 0;
-        visibility: hidden;
-        transition: all calc(@transition-duration - 0.1s) @ease;
-    }
+  &.topLeft.hidden,
+  &.bottomLeft.hidden,
+  &.topRight.hidden,
+  &.bottomRight.hidden {
+    opacity: 0;
+    visibility: hidden;
+    transition: all calc(@transition-duration - 0.1s) @ease;
+  }
 
-    .@{color-picker-prefix-cls}-panel {
-        box-sizing: border-box;
-        width: @color-picker-panel-sizing-width;
-        padding: 4px 12px 16px;
-        background: #FFFFFF;
-        box-shadow: 0 4px 12px 0 rgba(0, 0, 0, 0.15);
-        border-radius: 2px;
-        transform-origin: top left;
-        z-index: @color-picker-panel-z-index;
+  .@{color-picker-prefix-cls}-panel {
+    box-sizing: border-box;
+    width: @color-picker-panel-sizing-width;
+    padding: 4px 12px 16px;
+    background: #FFFFFF;
+    box-shadow: 0 4px 12px 0 rgba(0, 0, 0, 0.15);
+    border-radius: 2px;
+    transform-origin: top left;
+    z-index: @color-picker-panel-z-index;
+
+    &-chrome {
+      width: 278px !important;
+      margin-top: 12px;
+      box-shadow: none !important;
+
+      &>div:last-child {
+        padding: 9px 0 4px !important;
+
+        .flexbox-fix:first-child {
+          display: flex;
+          flex-direction: row-reverse;
+
+          &>div:first-child {
+            &>div {
+              width: 28px !important;
+              height: 28px !important;
+              border-radius: 50% !important;
+              margin-top: -1px !important;
+              margin-left: 4px !important;
+            }
+          }
 
-        &-chrome {
-            width: 278px !important;
-            margin-top: 12px;
-            box-shadow: none !important;
+          &>div:last-child {
+
+            .hue-horizontal {
+              width: 240px !important;
+              height: 12px !important;
+              border-radius: 6px !important;
+              padding: unset !important;
+
+              &>div>div {
+                margin-top: 1px;
+              }
+            }
 
             &>div:last-child {
-                padding: 9px 0 4px !important;
-
-                .flexbox-fix:first-child {
-                    display: flex;
-                    flex-direction: row-reverse;
-
-                    &>div:first-child {
-                        &>div {
-                            width: 28px !important;
-                            height: 28px !important;
-                            border-radius: 50% !important;
-                            margin-top: -1px !important;
-                            margin-left: 4px !important;
-                        }
-                    }
-
-                    &>div:last-child {
-
-                        .hue-horizontal {
-                            width: 240px !important;
-                            height: 12px !important;
-                            border-radius: 6px !important;
-                            padding: unset !important;
-
-                            &>div>div {
-                                margin-top: 1px;
-                            }
-                        }
-
-                        &>div:last-child {
-                            &>div {
-                                width: 240px !important;
-                                height: 12px !important;
-                                margin: unset;
-
-                                &>div:first-child {
-                                    border-radius: 6px !important;
-                                }
-
-                                &>div:nth-child(2) {
-                                    border-radius: 6px !important;
-                                }
-
-                                &>div:last-child {
-                                    margin: unset !important;
-
-                                    &>div>div {
-                                        margin-top: 1px;
-                                    }
-                                }
-                            }
-                        }
-                    }
+              &>div {
+                width: 240px !important;
+                height: 12px !important;
+                margin: unset;
 
+                &>div:first-child {
+                  border-radius: 6px !important;
                 }
 
-                .flexbox-fix:last-child {
-                    display: none !important;
+                &>div:nth-child(2) {
+                  border-radius: 6px !important;
+                }
+
+                &>div:last-child {
+                  margin: unset !important;
+
+                  &>div>div {
+                    margin-top: 1px;
+                  }
                 }
+              }
             }
+          }
 
         }
 
-        &-switch {
-            margin: 12px 0 0;
-            font-size: 12px;
-            color: #666666;
-            letter-spacing: 0;
-            line-height: 16px;
-            font-weight: 400;
-
-            span {
-                vertical-align: middle;
-                margin-right: 9px;
-            }
+        .flexbox-fix:last-child {
+          display: none !important;
         }
+      }
 
-        &-input {
-            display: inline-block;
-            position: relative;
-            margin-top: 12px;
-            font-size: @color-picker-panel-select-font-size;
+      &-no-box {
+        &>div:first-child {
+          display: none;
+        }
+      }
+
+      &-no-hue {
+        &>div:last-child {
+          .flexbox-fix:first-child {
+            &>div:last-child {
+              &>div:first-child {
+                display: none;
+              }
 
-            &-no-recommend {
-                margin-bottom: 8px;
+              &>div:last-child {
+                margin-top: 8px;
+              }
             }
+          }
+        }
+      }
 
-            .@{kd-prefix}-select {
-
-                &.bottomLeft,
-                &.topLeft {
-                    position: absolute;
-                    width: 60px !important;
-                    background: #FFFFFF;
-                    right: 0;
-                    left: unset !important;
-                    box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.20);
-                    border-radius: 2px;
-                }
+      &-no-opacity {
+        &>div:last-child {
+          .flexbox-fix:first-child {
+            &>div:last-child {
+              &>div:last-child {
+                display: none;
+              }
 
-                .@{kd-prefix}-select-dropdown {
-                    .@{kd-prefix}-select-item-option {
-                        display: flex;
-                        justify-content: center;
-                        min-width: unset;
-                    }
-                }
+              &>div:first-child {
+                margin-top: 8px;
+              }
             }
+          }
+        }
+      }
+    }
 
-            .@{kd-prefix}-select-bordered {
-                border-radius: 2px;
-                width: @color-picker-panel-select-sizing-width;
-                height: @color-picker-panel-select-sizing-height;
-                min-height: 28px;
-                margin-top: -2px;
+    .@{color-picker-prefix-cls}-panel-chrome-no-box.@{color-picker-prefix-cls}-panel-chrome-no-hue.@{color-picker-prefix-cls}-panel-chrome-no-opacity {
+      display: none;
+    }
 
-                .@{kd-prefix}-select-placeholder {
-                    left: 8px;
-                }
-            }
+    .@{color-picker-prefix-cls}-panel-chrome-no-hue.@{color-picker-prefix-cls}-panel-chrome-no-opacity {
+      &>div:last-child {
+        display: none;
+      }
+    }
 
-            .active-option {
-                background-color: #E3EBFF;
-            }
+    &-switch {
+      margin: 12px 0 0;
+      font-size: 12px;
+      color: #666666;
+      letter-spacing: 0;
+      line-height: 16px;
+      font-weight: 400;
+
+      span {
+        vertical-align: middle;
+        margin-right: 9px;
+      }
+    }
+
+    &-input {
+      display: inline-block;
+      position: relative;
+      margin-top: 12px;
+      font-size: @color-picker-panel-select-font-size;
+
+      &-no-recommend {
+        margin-bottom: 8px;
+      }
+
+      .@{kd-prefix}-select {
+
+        &.bottomLeft,
+        &.topLeft {
+          position: absolute;
+          width: 60px !important;
+          background: #FFFFFF;
+          right: 0;
+          left: unset !important;
+          box-shadow: 0 4px 10px 0 rgba(0, 0, 0, 0.20);
+          border-radius: 2px;
         }
 
-        &-transparent {
-            width: 60px;
-            height: 28px;
-            margin-left: 8px;
-            text-align: center;
-            font-size: @color-picker-panel-alpha-font-size;
-        }
-
-        &-colorDivContainer {
-            display: grid;
-            grid-template-columns: repeat(12, 1fr);
-            grid-column-gap: 8px;
-            grid-row-gap: 8px;
-            margin-top: 12px;
-
-            li {
-                position: relative;
-                box-sizing: border-box;
-                width: @color-picker-panel-preset-sizing-width;
-                height: @color-picker-panel-preset-sizing-height;
-                border: 1px solid rgba(0, 0, 0, 0.05);
-                border-radius: 2px;
-                list-style: none;
-                cursor: pointer;
-
-                .square {
-                    display: none;
-                    position: absolute;
-                    box-sizing: inherit;
-                    top: -3px;
-                    left: -3px;
-                    width: calc(@color-picker-panel-preset-sizing-width + 4px);
-                    height: calc(@color-picker-panel-preset-sizing-height + 4px);
-                    border: 1px solid rgba(178, 178, 176, 1);
-                    border-radius: 4px;
-
-                    &-click {
-                        display: block;
-                        box-shadow: 0 0 0 1px #e5e5e5 !important;
-                    }
-                }
+        .@{kd-prefix}-select-dropdown {
+          .@{kd-prefix}-select-item-option {
+            display: flex;
+            justify-content: center;
+            min-width: unset;
+          }
+        }
+      }
 
-                &:hover {
-                    .square {
-                        display: block;
-                    }
-                }
-            }
+      .@{kd-prefix}-select-bordered {
+        border-radius: 2px;
+        width: @color-picker-panel-select-sizing-width;
+        height: @color-picker-panel-select-sizing-height;
+        min-height: 28px;
+        margin-top: -2px;
+
+        .@{kd-prefix}-select-placeholder {
+          left: 8px;
+        }
+      }
+
+      .active-option {
+        background-color: #E3EBFF;
+      }
+    }
+
+    &-transparent {
+      width: 60px;
+      height: 28px;
+      margin-left: 8px;
+      text-align: center;
+      font-size: @color-picker-panel-alpha-font-size;
+    }
+
+    &-colorDivContainer {
+      display: grid;
+      grid-template-columns: repeat(12, 1fr);
+      grid-column-gap: 8px;
+      grid-row-gap: 8px;
+      margin-top: 12px;
+
+      li {
+        position: relative;
+        box-sizing: border-box;
+        width: @color-picker-panel-preset-sizing-width;
+        height: @color-picker-panel-preset-sizing-height;
+        border: 1px solid rgba(0, 0, 0, 0.05);
+        border-radius: 2px;
+        list-style: none;
+        cursor: pointer;
+
+        .square {
+          display: none;
+          position: absolute;
+          box-sizing: inherit;
+          top: -3px;
+          left: -3px;
+          width: calc(@color-picker-panel-preset-sizing-width + 4px);
+          height: calc(@color-picker-panel-preset-sizing-height + 4px);
+          border: 1px solid rgba(178, 178, 176, 1);
+          border-radius: 4px;
+
+          &-click {
+            display: block;
+            box-shadow: 0 0 0 1px #e5e5e5 !important;
+          }
         }
+
+        &:hover {
+          .square {
+            display: block;
+          }
+        }
+      }
     }
+  }
 }
 
+
 // code component mixin here
 .test() {
   display: inline;
@@ -5654,7 +5702,7 @@ textarea {
       .underline;
     }
 
-    &-focused {
+    &-focused:not(.@{input-prefix-cls}-error) {
       border-color: @input-border-color-focused;
     }
 
@@ -5810,13 +5858,20 @@ textarea {
   &-input-mark-inner {
     color: @input-placeholder-color-inner;
   }
+
+  &-error:not(.@{input-prefix-cls}-disabled):not(.@{input-prefix-cls}-wrapper-disabled):not(.@{input-prefix-cls}-group-addon-disabled) {
+    border-color: @input-error-color;
+  }
 }
 
 
 
+@input-prefix-cls: ~'@{kd-prefix}-input';
+
 // 输入框默认样式Mixins
 .input(@prefix) {
   @disabled-prefix-cls: ~'@{prefix}-disabled';
+  @error-prefix-cls: ~'@{input-prefix-cls}-error';
   width: 100%;
   min-width: 0;
   border: @input-border-width-inner solid @input-border-color-disabled-inner;
@@ -5843,10 +5898,10 @@ textarea {
     box-shadow: none;
     outline: none;
   }
-  &:not(.@{disabled-prefix-cls}):hover {
+  &:not(.@{disabled-prefix-cls}):not(.@{error-prefix-cls}):hover {
     border-color: @input-border-color-focused;
   }
-  &:not(.@{disabled-prefix-cls}):focus {
+  &:not(.@{disabled-prefix-cls}):not(.@{error-prefix-cls}):focus {
     color: @input-focus-color;
     border-color: @input-border-color-focused;
   }
@@ -5908,6 +5963,7 @@ textarea {
 );
 @input-color-disabled-inner: var(~'@{input-prefix}-color-disabled', @color-disabled);
 @input-affix-color: var(~'@{input-prefix}-affix-color-text', #666);
+@input-error-color: var(~'@{input-prefix}-color-error', @color-error);
 
 // font
 @input-small-font-size-inner: var(~'@{input-prefix}-font-size-small', @font-size-small);

package/dist/kdesign.css

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.7.3
+ *   @kdcloudjs/kdesign v1.7.5
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -6108,6 +6108,27 @@ template {
 .kd-color-picker-pop .kd-color-picker-panel-chrome > div:last-child .flexbox-fix:last-child {
   display: none !important;
 }
+.kd-color-picker-pop .kd-color-picker-panel-chrome-no-box > div:first-child {
+  display: none;
+}
+.kd-color-picker-pop .kd-color-picker-panel-chrome-no-hue > div:last-child .flexbox-fix:first-child > div:last-child > div:first-child {
+  display: none;
+}
+.kd-color-picker-pop .kd-color-picker-panel-chrome-no-hue > div:last-child .flexbox-fix:first-child > div:last-child > div:last-child {
+  margin-top: 8px;
+}
+.kd-color-picker-pop .kd-color-picker-panel-chrome-no-opacity > div:last-child .flexbox-fix:first-child > div:last-child > div:last-child {
+  display: none;
+}
+.kd-color-picker-pop .kd-color-picker-panel-chrome-no-opacity > div:last-child .flexbox-fix:first-child > div:last-child > div:first-child {
+  margin-top: 8px;
+}
+.kd-color-picker-pop .kd-color-picker-panel .kd-color-picker-panel-chrome-no-box.kd-color-picker-panel-chrome-no-hue.kd-color-picker-panel-chrome-no-opacity {
+  display: none;
+}
+.kd-color-picker-pop .kd-color-picker-panel .kd-color-picker-panel-chrome-no-hue.kd-color-picker-panel-chrome-no-opacity > div:last-child {
+  display: none;
+}
 .kd-color-picker-pop .kd-color-picker-panel-switch {
   margin: 12px 0 0;
   font-size: 12px;
@@ -9693,10 +9714,10 @@ textarea {
           box-shadow: none;
   outline: none;
 }
-.kd-input:not(.kd-input-disabled):hover {
+.kd-input:not(.kd-input-disabled):not(.kd-input-error):hover {
   border-color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
 }
-.kd-input:not(.kd-input-disabled):focus {
+.kd-input:not(.kd-input-disabled):not(.kd-input-error):focus {
   color: #212121;
   border-color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
 }
@@ -9740,10 +9761,10 @@ textarea {
           box-shadow: none;
   outline: none;
 }
-.kd-input-textarea:not(.kd-input-disabled):hover {
+.kd-input-textarea:not(.kd-input-disabled):not(.kd-input-error):hover {
   border-color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
 }
-.kd-input-textarea:not(.kd-input-disabled):focus {
+.kd-input-textarea:not(.kd-input-disabled):not(.kd-input-error):focus {
   color: #212121;
   border-color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
 }
@@ -9847,10 +9868,10 @@ textarea {
           box-shadow: none;
   outline: none;
 }
-.kd-input-wrapper:not(.kd-input-wrapper-disabled):hover {
+.kd-input-wrapper:not(.kd-input-wrapper-disabled):not(.kd-input-error):hover {
   border-color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
 }
-.kd-input-wrapper:not(.kd-input-wrapper-disabled):focus {
+.kd-input-wrapper:not(.kd-input-wrapper-disabled):not(.kd-input-error):focus {
   color: #212121;
   border-color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
 }
@@ -9910,7 +9931,7 @@ textarea {
   border-radius: 0 !important;
   padding-left: 0;
 }
-.kd-input-wrapper-focused {
+.kd-input-wrapper-focused:not(.kd-input-error) {
   border-color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
 }
 .kd-input-wrapper-disabled {
@@ -9955,10 +9976,10 @@ textarea {
           box-shadow: none;
   outline: none;
 }
-.kd-input-wrapper-textarea:not(.kd-input-disabled):hover {
+.kd-input-wrapper-textarea:not(.kd-input-disabled):not(.kd-input-error):hover {
   border-color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
 }
-.kd-input-wrapper-textarea:not(.kd-input-disabled):focus {
+.kd-input-wrapper-textarea:not(.kd-input-disabled):not(.kd-input-error):focus {
   color: #212121;
   border-color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
 }
@@ -10084,6 +10105,9 @@ textarea {
 .kd-input-input-mark-inner {
   color: var(--kd-c-input-placeholder-color-text, var(--kd-g-color-text-placeholder, #ccc));
 }
+.kd-input-error:not(.kd-input-disabled):not(.kd-input-wrapper-disabled):not(.kd-input-group-addon-disabled) {
+  border-color: var(--kd-c-input-color-error, var(--kd-g-color-error, #fb2323));
+}
 
 /* -----------  color  ——————---- start */
 /* -----------  color  ——————---- end */