amis-ui 6.2.2 → 6.4.0

package/package.json

@@ -3,7 +3,7 @@
   "main": "lib/index.js",
   "module": "esm/index.js",
   "types": "lib/index.d.ts",
-  "version": "6.2.2",
+  "version": "6.4.0",
   "description": "",
   "scripts": {
     "build": "npm run clean-dist && NODE_ENV=production rollup -c ",
@@ -36,8 +36,8 @@
   },
   "dependencies": {
     "@rc-component/mini-decimal": "^1.0.1",
-    "amis-core": "^6.2.2",
-    "amis-formula": "^6.2.2",
+    "amis-core": "^6.4.0",
+    "amis-formula": "^6.4.0",
     "classnames": "2.3.2",
     "codemirror": "^5.63.0",
     "downshift": "6.1.12",
@@ -65,6 +65,7 @@
     "react-intersection-observer": "9.5.2",
     "react-json-view": "1.21.3",
     "react-overlays": "5.1.1",
+    "react-pdf": "^7.7.1",
     "react-textarea-autosize": "8.3.3",
     "react-transition-group": "4.4.2",
     "react-visibility-sensor": "5.1.1",

package/scss/_components.scss

@@ -2040,6 +2040,7 @@
   --Collapse-content-color: var(--collapse-default-content-color);
   --Collapse-content-fontSize: var(--collapse-default-content-fontSize);
   --Collapse-content-fontWeight: var(--collapse-default-content-fontWeight);
+  --Collapse-mobile-marginBottom: var(--sizes-size-9);
 
   // 选项卡
   --Tabs-borderColor: var(--colors-neutral-line-8);
@@ -3177,6 +3178,12 @@
   --inputTime-active-color: var(--colors-neutral-text-2);
   --inputTime-active-bg-color: var(--colors-brand-10);
 
+  // Signature
+  --signature-tool-height: #{px2rem(40px)};
+  --signature-tool-margin-top: #{px2rem(8px)};
+  --signature-placeholder-gap: #{px2rem(10px)};
+  --signature-placeholder-color: var(--colors-neutral-line-6);
+
   --steps-base-color: var(--colors-neutral-text-2);
   --steps-base-fontSize: var(--fonts-size-7);
   --steps-base-fontWeight: var(--fonts-weight-6);

package/scss/_mixins.scss

@@ -452,6 +452,7 @@
     fill: var(--Form-input-clearBtn-color);
     width: var(--Form-input-clearBtn-size);
     height: var(--Form-input-clearBtn-size);
+    top: 0;
   }
 
   &:hover svg {

package/scss/_thirds.scss

@@ -1,8 +1,11 @@
 @import '../../../node_modules/codemirror/lib/codemirror';
+@import '../../../node_modules/codemirror/theme/base16-dark';
+@import '../../../node_modules/codemirror/theme/idea';
 @import '../../../node_modules/froala-editor/css/froala_style.min';
 @import '../../../node_modules/froala-editor/css/froala_editor.pkgd.min';
 @import '../../../node_modules/tinymce/skins/ui/oxide/skin';
 @import '../../../node_modules/video-react/dist/video-react';
 @import '../../../node_modules/cropperjs/dist/cropper';
+@import '../../../node_modules/office-viewer/dist/office';
 
 @import './components/react-datetime';

package/scss/components/_collapse.scss

@@ -223,7 +223,7 @@
   .#{$ns}Collapse {
     border: none;
     position: relative;
-
+    margin-bottom: var(--Collapse-mobile-marginBottom);
     &::before {
       @include hairline-bottom(var(--collapse-default-bottom-border-color));
     }

package/scss/components/_condition-builder.scss

@@ -112,6 +112,7 @@
     position: relative;
     &-wrapper {
       flex: 1;
+      min-width: 0;
     }
 
     &-collapse {
@@ -139,6 +140,7 @@
 
   &-body-wrapper {
     flex: 1;
+    min-width: 0;
   }
 
   &-toolbar {
@@ -323,6 +325,8 @@
       display: flex;
       flex-direction: row;
       align-items: center;
+      flex: 1;
+      min-width: 0;
       > .#{$ns}CBGroupOrItem-dragbar {
         left: px2rem(10px);
         position: absolute;
@@ -431,11 +435,24 @@
   }
 }
 
+.#{$ns}CBItem {
+  display: flex;
+  flex: 1;
+  min-width: 0;
+  flex-wrap: wrap;
+
+  > * {
+    flex-shrink: 0;
+  }
+}
+
 .#{$ns}CBValue {
   position: relative;
   display: inline-block;
   vertical-align: middle;
   margin: px2rem(3px);
+  flex: 1;
+  min-width: px2rem(100px);
 }
 
 .#{$ns}CBFormula {
@@ -461,6 +478,7 @@
   width: 20px;
   text-align: center;
   display: inline-block;
+  align-self: center;
   user-select: none;
 }
 

package/scss/components/_crud2.scss

@@ -7,6 +7,10 @@
     margin-bottom: var(--gap-base);
   }
 
+  .#{$ns}Table-render-wrapper {
+    position: relative;
+  }
+
   &-selectionLabel {
     display: inline-block;
     vertical-align: top;

package/scss/components/_formula.scss

@@ -2,6 +2,7 @@
   overflow: visible;
   max-width: 100%;
   box-sizing: content-box;
+  min-height: px2rem(450px);
 
   @mixin scrollbar {
     &::-webkit-scrollbar {
@@ -31,10 +32,59 @@
     flex: 1;
     height: 100%;
     max-width: #{px2rem(530px)};
+    min-width: 0;
     border-top: var(--Form-input-borderWidth) solid
       var(--Form-input-borderColor);
     border-bottom: var(--Form-input-borderWidth) solid
       var(--Form-input-borderColor);
+    display: flex;
+    flex-direction: column;
+  }
+
+  &-runPanel {
+    &.in {
+      height: 0;
+      overflow: hidden;
+    }
+    height: px2rem(200px);
+    transition: height 0.1s ease-out;
+    border-top: 1px solid var(--Form-input-borderColor);
+    display: flex;
+    flex-wrap: nowrap;
+    flex-direction: row;
+
+    &-context,
+    &-result {
+      flex: 1;
+      min-width: 0;
+      display: flex;
+      flex-direction: column;
+
+      > header {
+        @include panel-header();
+        margin: 0;
+      }
+
+      > div {
+        flex: 1;
+        min-height: 0;
+        font-size: 12px;
+      }
+    }
+
+    &-context {
+      border-right: 1px solid var(--Form-input-borderColor);
+    }
+
+    &-result {
+      > div {
+        padding: 0 px2rem(10px);
+      }
+
+      &.is-error {
+        color: var(--Form-input-onError-borderColor);
+      }
+    }
   }
 
   &-header {
@@ -51,8 +101,8 @@
 
   &-editor {
     @include scrollbar();
-    min-height: px2rem(200px);
-    height: calc(100% - 35px);
+    flex: 1;
+    min-height: 0;
     padding: #{px2rem(5px)};
     padding-right: 0;
 
@@ -418,27 +468,6 @@
     overflow: hidden;
     background: var(--InputFormula-code-bgColor);
   }
-
-  .cm-field,
-  .cm-func {
-    border-radius: 3px;
-    color: #fff;
-    margin: 0 1px;
-    padding: 0 2px;
-  }
-
-  .cm-field {
-    padding: 2px 5px;
-  }
-
-  .cm-field {
-    background: #007bff;
-  }
-  .cm-func {
-    color: #ae4597;
-    font-weight: bold;
-    line-height: 14px;
-  }
 }
 
 .#{$ns}FormulaPicker {
@@ -459,8 +488,9 @@
 
   &-input {
     flex: 1;
+    min-width: 0;
     margin-right: #{px2rem(10px)};
-    padding-right: 0;
+    padding-right: px2rem(4px);
     max-width: calc(100% - #{px2rem(42px)});
   }
 
@@ -515,7 +545,8 @@
   height: var(--Form-input-height);
 
   &.#{$ns}FormulaPicker--text {
-    padding: var(--Form-input-paddingY) var(--Form-input-paddingX);
+    padding: var(--Form-input-paddingY) var(--Form-input-paddingX)
+      var(--Form-input-paddingY) px2rem(5px);
   }
 
   .#{$ns}FormulaPicker-input {
@@ -534,8 +565,8 @@
       box-sizing: none;
     }
 
-    &-number,
     &-select,
+    &-number,
     &-boolean,
     &-date,
     &-time,
@@ -548,6 +579,20 @@
       .#{$ns}Number-handler-wrap {
         height: unset; /* 避免调节器超出Input框 */
       }
+      padding-left: 0;
+    }
+
+    &-custom {
+      border: 0;
+      flex: 1;
+      min-width: 0;
+
+      > div {
+        border: 0;
+        padding: 0 0 0 var(--Form-input-paddingX);
+        align-items: center;
+        height: var(--InputFormula-input-schema-height);
+      }
     }
 
     &-variable {
@@ -575,3 +620,80 @@
     }
   }
 }
+
+.#{$ns}FormulaCodeEditor {
+  .cm-field,
+  .cm-func {
+    border-radius: 3px;
+    color: #fff;
+  }
+
+  .cm-field {
+    padding: 2px 5px;
+  }
+
+  .cm-field {
+    background: #28a745;
+  }
+  .cm-func {
+    color: #ae4597;
+    font-weight: bold;
+    line-height: 14px;
+  }
+  .cm-expression {
+    background-color: #007bff;
+    border-radius: 4px;
+    color: #fff;
+  }
+
+  .cm-error-token {
+    background-position: left bottom;
+    background-repeat: repeat-x;
+    background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAQAAAADCAYAAAC09K7GAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB9sJDw4cOCW1/KIAAAAZdEVYdENvbW1lbnQAQ3JlYXRlZCB3aXRoIEdJTVBXgQ4XAAAAHElEQVQI12NggIL/DAz/GdA5/xkY/qPKMDAwAADLZwf5rvm+LQAAAABJRU5ErkJggg==);
+  }
+
+  .CodeMirror-placeholder {
+    color: var(--Form-input-placeholderColor) !important;
+  }
+
+  .lint-error {
+    color: var(--Form-input-onError-borderColor);
+  }
+
+  &--singleLine {
+    max-width: 100%;
+    line-height: 20px;
+    > .CodeMirror {
+      height: 20px;
+
+      .CodeMirror-hscrollbar,
+      .CodeMirror-vscrollbar {
+        display: none !important;
+      }
+
+      .CodeMirror-sizer {
+        min-height: 20px !important;
+        min-width: auto !important;
+        border-right-width: 0 !important;
+      }
+      .CodeMirror-scroll {
+        height: 20px;
+        margin: 0;
+        padding: 0;
+        overflow: hidden !important;
+      }
+      .CodeMirror-sizer + div {
+        // 不设置可以用触摸板滚动，将代码滚不见了
+        height: 0 !important;
+      }
+      .CodeMirror-lines {
+        padding: 0;
+      }
+    }
+  }
+}
+
+.#{$ns}InputBox > .#{$ns}FormulaCodeEditor {
+  flex: 1;
+  min-width: 0;
+}

package/scss/components/_image-gallery.scss

@@ -36,7 +36,8 @@
     }
   }
 
-  &-title {
+  &-title,
+  &-caption {
     height: px2rem(18px);
     vertical-align: top;
     line-height: px2rem(18px);
@@ -46,6 +47,11 @@
     margin-bottom: 18px;
   }
 
+  &-caption {
+    text-align: left;
+    margin-bottom: 4px;
+  }
+
   &-main {
     background: #000;
     flex-basis: 0;

package/scss/components/_input-box.scss

@@ -39,9 +39,15 @@
   }
 
   &-clear {
+    visibility: hidden;
     @include input-clear();
   }
 
+  &.is-focused &-clear,
+  &:hover &-clear {
+    visibility: visible;
+  }
+
   > svg {
     display: inline-block;
     width: 14px;

package/scss/components/_json-schema-editor.scss

@@ -61,10 +61,17 @@
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
-    gap: var(--gap-sm);
+    gap: var(--gap-xs);
+    font-size: var(--fonts-size-8);
 
     align-items: stretch;
     position: relative;
+
+    &--mini {
+      > button {
+        padding: 0 4px;
+      }
+    }
   }
 
   &Item + &Item {
@@ -76,13 +83,13 @@
     display: flex;
     flex-direction: row;
     flex-wrap: wrap;
-    gap: var(--gap-sm);
+    gap: var(--gap-xs);
     align-items: flex-start;
     width: 100%;
   }
 
   &-itemsLabel {
-    margin-top: calc((var(--Form-input-height) - var(--Switch-height)) / 2);
+    line-height: px2rem(32px);
   }
 
   &-caret {
@@ -123,4 +130,18 @@
       flex-basis: 0;
     }
   }
+
+  &-info {
+    @include input-input();
+    @include input-border();
+
+    flex: 1;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+  &-typeLabel {
+    color: var(--Form-input-placeholderColor);
+  }
 }

package/scss/components/_json-schema.scss

@@ -8,6 +8,7 @@
     min-width: 80px;
     max-width: 150px;
     flex: 1;
+    display: flex;
 
     & > span {
       display: flex;
@@ -25,6 +26,10 @@
       color: var(--Form-input-color);
     }
 
+    & > * {
+      flex: 1;
+    }
+
     &.is-mobile {
       & > span {
         border-radius: 0;

package/scss/components/_menu.scss

@@ -230,6 +230,9 @@
     svg {
       float: left;
     }
+    svg {
+      top: 0;
+    }
   }
 
   &-item-icon {

package/scss/components/_pdf_viewer.scss

@@ -0,0 +1,47 @@
+.#{$ns}PdfViewer {
+  position: relative;
+  width: 100%;
+  min-width: 300px;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  padding: 50px 0;
+  &-Content {
+    width: max-content;
+    max-width: 100%;
+    &.is-loaded {
+      box-shadow: rgba(0, 0, 0, 0.2) 0px 2px 4px 0px;
+    }
+  }
+
+  &-Loading {
+    width: 100%;
+    text-align: center;
+  }
+
+  &-Tool {
+    position: absolute;
+    z-index: 10;
+    padding: 5px 15px;
+    bottom: 60px;
+    background-color: #444444;
+    border-radius: 10px;
+    color: #fff;
+    text-align: center;
+    user-select: none;
+    .gap {
+      margin: 0 4px;
+    }
+    .icon {
+      cursor: pointer;
+      width: 20px;
+      margin: 0 10px;
+      &:hover {
+        color: var(--colors-brand-5);
+      }
+    }
+    .page-input {
+      width: 40px;
+    }
+  }
+}

package/scss/components/_signature.scss

@@ -0,0 +1,97 @@
+.#{$ns}Signature {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  &-canvas {
+    border: 1px dashed #aaa;
+  }
+
+  &-Tool {
+    height: var(--signature-tool-height);
+    margin-top: var(--signature-tool-margin-top);
+    .actions {
+      display: flex;
+      justify-content: space-between;
+      .left-actions {
+        button {
+          margin-right: 5px;
+        }
+      }
+      .right-actions {
+        button {
+          margin-left: 5px;
+        }
+      }
+    }
+  }
+
+  &-placeholder {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: var(--signature-tool-height);
+    text-align: center;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    gap: var(--signature-placeholder-gap);
+    color: var(--signature-placeholder-color);
+  }
+
+  &-Embed {
+    display: flex;
+    gap: 10px;
+    &-Preview {
+      display: flex;
+      align-items: center;
+      gap: 4px;
+      margin-left: 10px;
+      height: 30px;
+      margin: 1px;
+      padding: 2px;
+      border: 1px dashed #aaa;
+      .preview-close {
+        cursor: pointer;
+        font-size: 14px;
+        color: #aaa;
+        &:hover {
+          color: #000;
+        }
+      }
+      img {
+        height: 24px;
+      }
+    }
+    &-Body {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+    }
+  }
+
+  &.is-fullScreen,
+  &-Embed-Body.is-fullScreen {
+    flex-direction: row-reverse;
+    justify-content: space-between;
+    align-items: stretch;
+    .#{$ns}Signature-Tool {
+      width: calc(
+        var(--signature-tool-height) - var(--signature-tool-margin-top)
+      );
+      height: auto;
+      margin-top: 0;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      .actions {
+        white-space: nowrap;
+        transform: rotate(90deg);
+      }
+    }
+  }
+}

package/scss/components/_table.scss

@@ -643,6 +643,11 @@
       > .#{$ns}Spinner {
         vertical-align: middle;
       }
+
+      > [data-role='form-item'] {
+        display: inline-block;
+        min-width: px2rem(160px);
+      }
     }
   }
 
@@ -744,7 +749,7 @@
     min-width: px2rem(320px);
     max-width: px2rem(640px);
 
-    .#{$ns}Panel {
+    > .#{$ns}Panel {
       margin: 0;
     }
   }

package/scss/components/_tabs.scss

@@ -191,11 +191,17 @@
         padding: var(--Tabs-linkPadding);
         text-decoration: none;
         cursor: pointer;
-        display: block;
-
-        text-overflow: ellipsis;
+        display: flex;
+        align-items: center;
+        max-width: 100%;
         overflow: hidden;
-        white-space: nowrap;
+
+        .#{$ns}Tabs-link-text {
+          text-overflow: ellipsis;
+          overflow: hidden;
+          white-space: nowrap;
+          width: 100%;
+        }
 
         > .#{$ns}Icon {
           margin-right: var(--Tabs-icon-gap);

package/scss/components/form/_combo.scss

@@ -382,6 +382,7 @@
   float: right;
   > a svg {
     margin-right: var(--gap-xs);
+    top: 0;
   }
 }