amis 1.8.0-beta.16 → 1.8.0-beta.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis",
-  "version": "1.8.0-beta.16",
+  "version": "1.8.0-beta.17",
   "description": "一种MIS页面生成工具",
   "main": "lib/index.js",
   "scripts": {

package/schema.json

@@ -48659,7 +48659,7 @@
         },
         "onlyLeaf": {
           "type": "boolean",
-          "description": "单选时只允许选择叶子节点"
+          "description": "只允许选择叶子节点"
         },
         "hideNodePathLabel": {
           "type": "boolean",

package/scss/_properties.scss

@@ -1492,6 +1492,9 @@
   --Transfer-title-bg: #f6f8f8;
   --Transfer-selection-maxHeight: #{px2rem(350px)};
 
+  --TabsTransfer-title-bg: #f7f7f9;
+  --TabsTransfer-border-color: #e8e9eb;
+
   --Tree-indent: var(--gap-md);
   --Tree-inputHeight: calc(var(--Form-input-height) * 0.85);
   --Tree-item-onHover-bg: rgba(0, 126, 255, 0.08);

package/scss/components/_formula.scss

@@ -23,8 +23,7 @@
     box-sizing: border-box;
     background: var(--InputFormula-header-bgColor);
     border-radius: var(--borderRadius) var(--borderRadius) 0 0;
-    border-bottom: var(--Form-input-borderWidth) solid
-      var(--Form-input-borderColor);
+    border-bottom: none;
     font-weight: 500;
   }
 
@@ -68,11 +67,11 @@
 
   &-panel {
     display: flex;
+    flex: 1;
     flex-flow: column nowrap;
     justify-content: space-between;
     align-items: stretch;
     height: #{px2rem(250px)};
-    width: #{px2rem(220px)};
     border-radius: var(--borderRadius);
     border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
 
@@ -93,38 +92,100 @@
       display: flex;
       flex-flow: column nowrap;
       max-height: #{px2rem(220px)};
+
+      &--tabs {
+        max-height: #{px2rem(250px)};
+      }
     }
   }
 
   /* 变量列表 */
   &-VariableList {
     &-root {
-      max-height: #{px2rem(220px)};
+      max-height: 100%;
+    }
+
+    &-body {
+      display: flex;
+      flex-flow: column nowrap;
+      max-height: 100%;
+    }
+
+    &-base {
+      --Form-input-fontSize: var(--fontSizeSm);
+      --gap-sm: #{px2rem(10px)};
+      flex: 1;
+      max-height: 100%;
     }
 
-    &-root.is-scrollable {
+    &-base.is-scrollable {
       @include scrollbar();
       overflow-x: hidden;
       overflow-y: auto;
     }
 
-    &-base {
-      --Form-input-fontSize: var(--fontSizeSm);
-      max-width: inherit;
-      overflow: hidden;
+    &-searchBox {
+      display: flex;
+      width: auto;
+      flex-shrink: 0;
+      padding: #{px2rem(8px)};
+
+      & > div {
+        flex: 1;
+        font-size: var(--fontSizeSm);
+        height: var(--gap-xl);
+      }
     }
 
     &-tabs {
       --Tabs-linkFontSize: var(--fontSizeSm);
       --Tabs--card-linkPadding: #{px2rem(5px)};
 
-      max-height: #{px2rem(220px)};
+      max-height: 100%;
       display: flex;
       flex-flow: column nowrap;
       justify-content: space-between;
 
-      & > ul {
-        border-top: none;
+      .#{$ns}Tabs {
+        &-content {
+          padding: 0;
+          .#{$ns}FormulaEditor-VariableList {
+            &-sub {
+              .#{$ns}FormulaEditor-VariableList-body {
+                max-height: #{px2rem(220px)};
+                overflow-y: hidden;
+              }
+              &-FormulaEditor-VariableList-base {
+                @include scrollbar();
+                overflow-x: hidden;
+                overflow-y: auto;
+              }
+            }
+          }
+        }
+        &-linksContainer {
+          &-wrapper {
+            @include panel-header();
+            max-height: px2rem(30px);
+            min-height: px2rem(30px);
+            ul.#{$ns}Tabs-links {
+              > li {
+                height: 30px;
+                line-height: 30px;
+                > a {
+                  margin: 0;
+                  padding: 0;
+                }
+              }
+            }
+          }
+
+          &--overflow {
+            > div {
+              margin: 0;
+            }
+          }
+        }
       }
 
       & > div {
@@ -170,6 +231,10 @@
     align-items: stretch;
     flex: 1;
 
+    .#{$ns}FormulaEditor-panel {
+      width: #{px2rem(188px)};
+    }
+
     &:not(:last-child) {
       margin-right: #{px2rem(10px)};
     }

package/scss/components/form/_transfer.scss

@@ -115,6 +115,27 @@
   .#{$ns}Transfer-title {
     height: 40px;
   }
+  &-tabs {
+    .#{$ns}Tabs-linksContainer {
+      padding-left: px2rem(20px);
+      padding-top: px2rem(8px);
+      background-color: var(--TabsTransfer-title-bg);
+    }
+  }
+
+  &-search {
+    margin: var(--gap-sm) var(--gap-sm);
+    .#{$ns}InputBox {
+      border: 1px solid var(--TabsTransfer-border-color);
+    }
+  }
+
+  .#{$ns}Transfer-result {
+    .#{$ns}Transfer-title {
+      height: px2rem(40px);
+      line-height: px2rem(40px);
+    }
+  }
 
   // .#{$ns}Transfer-result {
   //   flex-grow: unset;

package/sdk/ang-ie11.css

@@ -43005,6 +43005,25 @@ readers do not read off random characters that represent icons */
   height: 40px;
 }
 
+.amis-scope .a-TabsTransfer-tabs .a-Tabs-linksContainer {
+  padding-left: 1.25rem;
+  padding-top: 0.5rem;
+  background-color: #f7f7f9;
+}
+
+.amis-scope .a-TabsTransfer-search {
+  margin: 0.5rem 0.5rem;
+}
+
+.amis-scope .a-TabsTransfer-search .a-InputBox {
+  border: 1px solid #e8e9eb;
+}
+
+.amis-scope .a-TabsTransfer .a-Transfer-result .a-Transfer-title {
+  height: 2.5rem;
+  line-height: 2.5rem;
+}
+
 .amis-scope .a-TabsTransfer-placeholder {
   height: 1.875rem;
   line-height: 1.4285714286;
@@ -44701,7 +44720,7 @@ readers do not read off random characters that represent icons */
   box-sizing: border-box;
   background: #fafafa;
   border-radius: 0.142rem 0.142rem 0 0;
-  border-bottom: 0.0625rem solid #d1d5db;
+  border-bottom: none;
   font-weight: 500;
 }
 
@@ -44745,11 +44764,11 @@ readers do not read off random characters that represent icons */
 
 .amis-scope .a-FormulaEditor-panel {
   display: flex;
+  flex: 1;
   flex-flow: column nowrap;
   justify-content: space-between;
   align-items: stretch;
   height: 15.625rem;
-  width: 13.75rem;
   border-radius: 0.142rem;
   border: 0.0625rem solid #d1d5db;
 }
@@ -44770,7 +44789,7 @@ readers do not read off random characters that represent icons */
   box-sizing: border-box;
   background: #fafafa;
   border-radius: 0.142rem 0.142rem 0 0;
-  border-bottom: 0.0625rem solid #d1d5db;
+  border-bottom: none;
   font-weight: 500;
 }
 
@@ -44781,42 +44800,114 @@ readers do not read off random characters that represent icons */
   max-height: 13.75rem;
 }
 
+.amis-scope .a-FormulaEditor-panel-body--tabs {
+  max-height: 15.625rem;
+}
+
 .amis-scope .a-FormulaEditor-VariableList-root {
-  max-height: 13.75rem;
+  max-height: 100%;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-body {
+  display: flex;
+  flex-flow: column nowrap;
+  max-height: 100%;
 }
 
-.amis-scope .a-FormulaEditor-VariableList-root.is-scrollable {
+.amis-scope .a-FormulaEditor-VariableList-base {
+  --Form-input-fontSize: var(--fontSizeSm);
+  --gap-sm: 0.625rem;
+  flex: 1;
+  max-height: 100%;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-base.is-scrollable {
   overflow-x: hidden;
   overflow-y: auto;
 }
 
-.amis-scope .a-FormulaEditor-VariableList-root.is-scrollable::-webkit-scrollbar {
+.amis-scope .a-FormulaEditor-VariableList-base.is-scrollable::-webkit-scrollbar {
   width: 6px;
   height: 6px;
 }
 
-.amis-scope .a-FormulaEditor-VariableList-root.is-scrollable::-webkit-scrollbar-thumb {
+.amis-scope .a-FormulaEditor-VariableList-base.is-scrollable::-webkit-scrollbar-thumb {
   border-radius: 3px;
   background: rgba(0, 0, 0, 0.3);
 }
 
-.amis-scope .a-FormulaEditor-VariableList-base {
-  --Form-input-fontSize: var(--fontSizeSm);
-  max-width: inherit;
-  overflow: hidden;
+.amis-scope .a-FormulaEditor-VariableList-searchBox {
+  display: flex;
+  width: auto;
+  flex-shrink: 0;
+  padding: 0.5rem;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-searchBox > div {
+  flex: 1;
+  font-size: 0.75rem;
+  height: 1.5rem;
 }
 
 .amis-scope .a-FormulaEditor-VariableList-tabs {
   --Tabs-linkFontSize: var(--fontSizeSm);
   --Tabs--card-linkPadding: 0.3125rem;
-  max-height: 13.75rem;
+  max-height: 100%;
   display: flex;
   flex-flow: column nowrap;
   justify-content: space-between;
 }
 
-.amis-scope .a-FormulaEditor-VariableList-tabs > ul {
-  border-top: none;
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-content {
+  padding: 0;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-content .a-FormulaEditor-VariableList-sub .a-FormulaEditor-VariableList-body {
+  max-height: 13.75rem;
+  overflow-y: hidden;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-content .a-FormulaEditor-VariableList-sub-FormulaEditor-VariableList-base {
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-content .a-FormulaEditor-VariableList-sub-FormulaEditor-VariableList-base::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-content .a-FormulaEditor-VariableList-sub-FormulaEditor-VariableList-base::-webkit-scrollbar-thumb {
+  border-radius: 3px;
+  background: rgba(0, 0, 0, 0.3);
+}
+
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-linksContainer-wrapper {
+  width: 100%;
+  height: 1.875rem;
+  line-height: 1.875rem;
+  padding: 0 0.625rem;
+  box-sizing: border-box;
+  background: #fafafa;
+  border-radius: 0.142rem 0.142rem 0 0;
+  border-bottom: none;
+  font-weight: 500;
+  max-height: 1.875rem;
+  min-height: 1.875rem;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-linksContainer-wrapper ul.a-Tabs-links > li {
+  height: 30px;
+  line-height: 30px;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-linksContainer-wrapper ul.a-Tabs-links > li > a {
+  margin: 0;
+  padding: 0;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-linksContainer--overflow > div {
+  margin: 0;
 }
 
 .amis-scope .a-FormulaEditor-VariableList-tabs > div {
@@ -44869,6 +44960,10 @@ readers do not read off random characters that represent icons */
   flex: 1;
 }
 
+.amis-scope .a-FormulaEditor-FuncList .a-FormulaEditor-panel {
+  width: 11.75rem;
+}
+
 .amis-scope .a-FormulaEditor-FuncList:not(:last-child) {
   margin-right: 0.625rem;
 }

package/sdk/ang.css

@@ -13442,6 +13442,8 @@ readers do not read off random characters that represent icons */
   --Tooltip-title-paddingY: var(--gap-sm);
   --Transfer-title-bg: #f6f8f8;
   --Transfer-selection-maxHeight: 21.875rem;
+  --TabsTransfer-title-bg: #f7f7f9;
+  --TabsTransfer-border-color: #e8e9eb;
   --Tree-indent: var(--gap-md);
   --Tree-inputHeight: calc(var(--Form-input-height) * 0.85);
   --Tree-item-onHover-bg: rgba(0, 126, 255, 0.08);
@@ -44220,6 +44222,25 @@ readers do not read off random characters that represent icons */
   height: 40px;
 }
 
+.amis-scope .a-TabsTransfer-tabs .a-Tabs-linksContainer {
+  padding-left: 1.25rem;
+  padding-top: 0.5rem;
+  background-color: var(--TabsTransfer-title-bg);
+}
+
+.amis-scope .a-TabsTransfer-search {
+  margin: var(--gap-sm) var(--gap-sm);
+}
+
+.amis-scope .a-TabsTransfer-search .a-InputBox {
+  border: 1px solid var(--TabsTransfer-border-color);
+}
+
+.amis-scope .a-TabsTransfer .a-Transfer-result .a-Transfer-title {
+  height: 2.5rem;
+  line-height: 2.5rem;
+}
+
 .amis-scope .a-TabsTransfer-placeholder {
   height: var(--Form-input-height);
   line-height: var(--Form-input-lineHeight);
@@ -45851,7 +45872,7 @@ readers do not read off random characters that represent icons */
   box-sizing: border-box;
   background: var(--InputFormula-header-bgColor);
   border-radius: var(--borderRadius) var(--borderRadius) 0 0;
-  border-bottom: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
+  border-bottom: none;
   font-weight: 500;
 }
 
@@ -45895,11 +45916,11 @@ readers do not read off random characters that represent icons */
 
 .amis-scope .a-FormulaEditor-panel {
   display: flex;
+  flex: 1;
   flex-flow: column nowrap;
   justify-content: space-between;
   align-items: stretch;
   height: 15.625rem;
-  width: 13.75rem;
   border-radius: var(--borderRadius);
   border: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
 }
@@ -45920,7 +45941,7 @@ readers do not read off random characters that represent icons */
   box-sizing: border-box;
   background: var(--InputFormula-header-bgColor);
   border-radius: var(--borderRadius) var(--borderRadius) 0 0;
-  border-bottom: var(--Form-input-borderWidth) solid var(--Form-input-borderColor);
+  border-bottom: none;
   font-weight: 500;
 }
 
@@ -45931,42 +45952,114 @@ readers do not read off random characters that represent icons */
   max-height: 13.75rem;
 }
 
+.amis-scope .a-FormulaEditor-panel-body--tabs {
+  max-height: 15.625rem;
+}
+
 .amis-scope .a-FormulaEditor-VariableList-root {
-  max-height: 13.75rem;
+  max-height: 100%;
 }
 
-.amis-scope .a-FormulaEditor-VariableList-root.is-scrollable {
+.amis-scope .a-FormulaEditor-VariableList-body {
+  display: flex;
+  flex-flow: column nowrap;
+  max-height: 100%;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-base {
+  --Form-input-fontSize: var(--fontSizeSm);
+  --gap-sm: 0.625rem;
+  flex: 1;
+  max-height: 100%;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-base.is-scrollable {
   overflow-x: hidden;
   overflow-y: auto;
 }
 
-.amis-scope .a-FormulaEditor-VariableList-root.is-scrollable::-webkit-scrollbar {
+.amis-scope .a-FormulaEditor-VariableList-base.is-scrollable::-webkit-scrollbar {
   width: 6px;
   height: 6px;
 }
 
-.amis-scope .a-FormulaEditor-VariableList-root.is-scrollable::-webkit-scrollbar-thumb {
+.amis-scope .a-FormulaEditor-VariableList-base.is-scrollable::-webkit-scrollbar-thumb {
   border-radius: 3px;
   background: rgba(0, 0, 0, 0.3);
 }
 
-.amis-scope .a-FormulaEditor-VariableList-base {
-  --Form-input-fontSize: var(--fontSizeSm);
-  max-width: inherit;
-  overflow: hidden;
+.amis-scope .a-FormulaEditor-VariableList-searchBox {
+  display: flex;
+  width: auto;
+  flex-shrink: 0;
+  padding: 0.5rem;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-searchBox > div {
+  flex: 1;
+  font-size: var(--fontSizeSm);
+  height: var(--gap-xl);
 }
 
 .amis-scope .a-FormulaEditor-VariableList-tabs {
   --Tabs-linkFontSize: var(--fontSizeSm);
   --Tabs--card-linkPadding: 0.3125rem;
-  max-height: 13.75rem;
+  max-height: 100%;
   display: flex;
   flex-flow: column nowrap;
   justify-content: space-between;
 }
 
-.amis-scope .a-FormulaEditor-VariableList-tabs > ul {
-  border-top: none;
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-content {
+  padding: 0;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-content .a-FormulaEditor-VariableList-sub .a-FormulaEditor-VariableList-body {
+  max-height: 13.75rem;
+  overflow-y: hidden;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-content .a-FormulaEditor-VariableList-sub-FormulaEditor-VariableList-base {
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-content .a-FormulaEditor-VariableList-sub-FormulaEditor-VariableList-base::-webkit-scrollbar {
+  width: 6px;
+  height: 6px;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-content .a-FormulaEditor-VariableList-sub-FormulaEditor-VariableList-base::-webkit-scrollbar-thumb {
+  border-radius: 3px;
+  background: rgba(0, 0, 0, 0.3);
+}
+
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-linksContainer-wrapper {
+  width: 100%;
+  height: 1.875rem;
+  line-height: 1.875rem;
+  padding: 0 0.625rem;
+  box-sizing: border-box;
+  background: var(--InputFormula-header-bgColor);
+  border-radius: var(--borderRadius) var(--borderRadius) 0 0;
+  border-bottom: none;
+  font-weight: 500;
+  max-height: 1.875rem;
+  min-height: 1.875rem;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-linksContainer-wrapper ul.a-Tabs-links > li {
+  height: 30px;
+  line-height: 30px;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-linksContainer-wrapper ul.a-Tabs-links > li > a {
+  margin: 0;
+  padding: 0;
+}
+
+.amis-scope .a-FormulaEditor-VariableList-tabs .a-Tabs-linksContainer--overflow > div {
+  margin: 0;
 }
 
 .amis-scope .a-FormulaEditor-VariableList-tabs > div {
@@ -46019,6 +46112,10 @@ readers do not read off random characters that represent icons */
   flex: 1;
 }
 
+.amis-scope .a-FormulaEditor-FuncList .a-FormulaEditor-panel {
+  width: 11.75rem;
+}
+
 .amis-scope .a-FormulaEditor-FuncList:not(:last-child) {
   margin-right: 0.625rem;
 }