amis 2.3.0 → 2.3.2-beta.1

package/lib/themes/dark-ie11.css

@@ -5823,8 +5823,6 @@ body.tox-dialog__disable-scroll {
   overflow: hidden;
 }
 .tox .tox-editor-header {
-  display: grid;
-  grid-template-columns: 1fr min-content;
   z-index: 1;
 }
 .tox:not(.tox-tinymce-inline) .tox-editor-header {
@@ -6415,47 +6413,16 @@ body.tox-dialog__disable-scroll {
   margin: 0;
 }
 .tox .tox-menubar {
-  background: repeating-linear-gradient(transparent 0px 1px, transparent 1px 39px) center top 39px/100% calc(100% - 39px) no-repeat;
+  background: url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='transparent'/%3E%3C/svg%3E") left 0 top 0 #fff;
   background-color: #fff;
   display: flex;
   flex: 0 0 auto;
   flex-shrink: 0;
   flex-wrap: wrap;
-  grid-column: 1/-1;
-  grid-row: 1;
   padding: 0 11px 0 12px;
 }
-.tox .tox-promotion + .tox-menubar {
-  grid-column: 1;
-}
-.tox .tox-promotion {
-  background: repeating-linear-gradient(transparent 0px 1px, transparent 1px 39px) center top 39px/100% calc(100% - 39px) no-repeat;
-  background-color: #fff;
-  grid-column: 2;
-  grid-row: 1;
-  -webkit-padding-end: 8px;
-          padding-inline-end: 8px;
-  -webkit-padding-start: 4px;
-          padding-inline-start: 4px;
-  padding-top: 5px;
-}
-.tox .tox-promotion-link {
-  align-items: unsafe center;
-  background-color: #E8F1F8;
-  border-radius: 5px;
-  color: #086BE6;
-  cursor: pointer;
-  display: flex;
-  font-size: 14px;
-  height: 26.6px;
-  padding: 4px 8px;
-  white-space: nowrap;
-}
-.tox .tox-promotion-link:hover {
-  background-color: #B4D7FF;
-}
-.tox .tox-promotion-link:focus {
-  background-color: #D9EDF7;
+.tox.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar {
+  border-top: 1px solid transparent;
 }
 /* Deprecated. Remove in next major release */
 .tox .tox-mbtn {
@@ -7237,14 +7204,10 @@ body.tox-dialog__disable-scroll {
 .tox .tox-toolbar__overflow--shrinking {
   transition: opacity 0.3s ease, height 0.2s linear 0.1s, visibility 0s linear 0.3s;
 }
-.tox .tox-toolbar-overlord,
-.tox .tox-anchorbar {
-  grid-column: 1/-1;
-}
 .tox .tox-menubar + .tox-toolbar,
 .tox .tox-menubar + .tox-toolbar-overlord {
   border-top: 1px solid transparent;
-  margin-top: -1px;
+  margin-top: 0px;
   padding-bottom: 1px;
   padding-top: 1px;
 }
@@ -12878,7 +12841,7 @@ input[type=button].dark-Button--block {
           18 / 12 * 0.75rem
       ) / 2
   ) 0.5rem;
-  font-size: var(--Combo-addBtn-fontSize);
+  font-size: 0.75rem;
   line-height: 18 / 12;
   border-radius: 0.142rem;
   height: 1.625rem;
@@ -21035,6 +20998,9 @@ input[type=button].dark-Button--block {
 .dark-Image-image {
   display: block;
 }
+.dark-Image-image--loading {
+  visibility: hidden;
+}
 .dark-Image--original .dark-Image-image {
   max-width: 100%;
   max-height: 100%;
@@ -22854,7 +22820,7 @@ fieldset.dark-Collapse--lg:after {
   }
   .dark-Form-group--lg > * {
     padding-left: calc(2.5rem / 2);
-    padding-left: calc(var(--Form-group--lg-gutterWidth) / 2);
+    padding-left: calc(2.5rem / 2);
   }
   .dark-Form-group--md {
     margin-left: calc(1.875rem / -2);
@@ -24885,7 +24851,7 @@ input.dark-TextControl-input-password {
      -moz-user-select: none;
           user-select: none;
   white-space: nowrap;
-  color: var(--Form-select-placeholderColor);
+  color: white;
 }
 .dark-Select-value {
   line-height: calc( 1.4285714286 * 0.875rem );
@@ -26687,7 +26653,7 @@ td.rdtQuarter.rdtDisabled:hover {
   border-color: #b4bbc5;
   background: #ececec;
   color: #f3f1f1;
-  border-color: var(--ImageControl-addBtn-onHover-border);
+  border-color: #b4bbc5;
 }
 .dark-ImageControl-dropzone:hover .dark-ImageControl-addBtn-text {
   color: #f3f1f1;
@@ -27947,7 +27913,7 @@ td.rdtQuarter.rdtDisabled:hover {
           18 / 12 * 0.75rem
       ) / 2
   ) 0.5rem;
-  font-size: var(--Combo-addBtn-fontSize);
+  font-size: 0.75rem;
   line-height: 18 / 12;
   border-radius: 0.142rem;
   height: 1.625rem;
@@ -28607,7 +28573,7 @@ td.rdtQuarter.rdtDisabled:hover {
           0.75rem
       ) / 2
   ) 0.5rem;
-  font-size: var(--TagControl-sugBtn-fontSize);
+  font-size: 0.75rem;
   line-height: 18 / 12;
   border-radius: 0.142rem;
   height: 1.875rem;

package/lib/themes/dark.css

@@ -7568,8 +7568,6 @@ body.tox-dialog__disable-scroll {
   overflow: hidden;
 }
 .tox .tox-editor-header {
-  display: grid;
-  grid-template-columns: 1fr min-content;
   z-index: 1;
 }
 .tox:not(.tox-tinymce-inline) .tox-editor-header {
@@ -8160,47 +8158,16 @@ body.tox-dialog__disable-scroll {
   margin: 0;
 }
 .tox .tox-menubar {
-  background: repeating-linear-gradient(transparent 0px 1px, transparent 1px 39px) center top 39px/100% calc(100% - 39px) no-repeat;
+  background: url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='transparent'/%3E%3C/svg%3E") left 0 top 0 #fff;
   background-color: #fff;
   display: flex;
   flex: 0 0 auto;
   flex-shrink: 0;
   flex-wrap: wrap;
-  grid-column: 1/-1;
-  grid-row: 1;
   padding: 0 11px 0 12px;
 }
-.tox .tox-promotion + .tox-menubar {
-  grid-column: 1;
-}
-.tox .tox-promotion {
-  background: repeating-linear-gradient(transparent 0px 1px, transparent 1px 39px) center top 39px/100% calc(100% - 39px) no-repeat;
-  background-color: #fff;
-  grid-column: 2;
-  grid-row: 1;
-  -webkit-padding-end: 8px;
-          padding-inline-end: 8px;
-  -webkit-padding-start: 4px;
-          padding-inline-start: 4px;
-  padding-top: 5px;
-}
-.tox .tox-promotion-link {
-  align-items: unsafe center;
-  background-color: #E8F1F8;
-  border-radius: 5px;
-  color: #086BE6;
-  cursor: pointer;
-  display: flex;
-  font-size: 14px;
-  height: 26.6px;
-  padding: 4px 8px;
-  white-space: nowrap;
-}
-.tox .tox-promotion-link:hover {
-  background-color: #B4D7FF;
-}
-.tox .tox-promotion-link:focus {
-  background-color: #D9EDF7;
+.tox.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar {
+  border-top: 1px solid transparent;
 }
 /* Deprecated. Remove in next major release */
 .tox .tox-mbtn {
@@ -8982,14 +8949,10 @@ body.tox-dialog__disable-scroll {
 .tox .tox-toolbar__overflow--shrinking {
   transition: opacity 0.3s ease, height 0.2s linear 0.1s, visibility 0s linear 0.3s;
 }
-.tox .tox-toolbar-overlord,
-.tox .tox-anchorbar {
-  grid-column: 1/-1;
-}
 .tox .tox-menubar + .tox-toolbar,
 .tox .tox-menubar + .tox-toolbar-overlord {
   border-top: 1px solid transparent;
-  margin-top: -1px;
+  margin-top: 0px;
   padding-bottom: 1px;
   padding-top: 1px;
 }
@@ -22638,6 +22601,9 @@ input[type=button].dark-Button--block {
 .dark-Image-image {
   display: block;
 }
+.dark-Image-image--loading {
+  visibility: hidden;
+}
 .dark-Image--original .dark-Image-image {
   max-width: 100%;
   max-height: 100%;

package/lib/themes/default-ie11.css

@@ -5828,8 +5828,6 @@ body.tox-dialog__disable-scroll {
   overflow: hidden;
 }
 .tox .tox-editor-header {
-  display: grid;
-  grid-template-columns: 1fr min-content;
   z-index: 1;
 }
 .tox:not(.tox-tinymce-inline) .tox-editor-header {
@@ -6420,47 +6418,16 @@ body.tox-dialog__disable-scroll {
   margin: 0;
 }
 .tox .tox-menubar {
-  background: repeating-linear-gradient(transparent 0px 1px, transparent 1px 39px) center top 39px/100% calc(100% - 39px) no-repeat;
+  background: url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='transparent'/%3E%3C/svg%3E") left 0 top 0 #fff;
   background-color: #fff;
   display: flex;
   flex: 0 0 auto;
   flex-shrink: 0;
   flex-wrap: wrap;
-  grid-column: 1/-1;
-  grid-row: 1;
   padding: 0 11px 0 12px;
 }
-.tox .tox-promotion + .tox-menubar {
-  grid-column: 1;
-}
-.tox .tox-promotion {
-  background: repeating-linear-gradient(transparent 0px 1px, transparent 1px 39px) center top 39px/100% calc(100% - 39px) no-repeat;
-  background-color: #fff;
-  grid-column: 2;
-  grid-row: 1;
-  -webkit-padding-end: 8px;
-          padding-inline-end: 8px;
-  -webkit-padding-start: 4px;
-          padding-inline-start: 4px;
-  padding-top: 5px;
-}
-.tox .tox-promotion-link {
-  align-items: unsafe center;
-  background-color: #E8F1F8;
-  border-radius: 5px;
-  color: #086BE6;
-  cursor: pointer;
-  display: flex;
-  font-size: 14px;
-  height: 26.6px;
-  padding: 4px 8px;
-  white-space: nowrap;
-}
-.tox .tox-promotion-link:hover {
-  background-color: #B4D7FF;
-}
-.tox .tox-promotion-link:focus {
-  background-color: #D9EDF7;
+.tox.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar {
+  border-top: 1px solid transparent;
 }
 /* Deprecated. Remove in next major release */
 .tox .tox-mbtn {
@@ -7242,14 +7209,10 @@ body.tox-dialog__disable-scroll {
 .tox .tox-toolbar__overflow--shrinking {
   transition: opacity 0.3s ease, height 0.2s linear 0.1s, visibility 0s linear 0.3s;
 }
-.tox .tox-toolbar-overlord,
-.tox .tox-anchorbar {
-  grid-column: 1/-1;
-}
 .tox .tox-menubar + .tox-toolbar,
 .tox .tox-menubar + .tox-toolbar-overlord {
   border-top: 1px solid transparent;
-  margin-top: -1px;
+  margin-top: 0px;
   padding-bottom: 1px;
   padding-top: 1px;
 }
@@ -12857,7 +12820,7 @@ input[type=button].cxd-Button--block {
           18 / 12 * 12px
       ) / 2
   ) 0.5rem;
-  font-size: var(--Combo-addBtn-fontSize);
+  font-size: 12px;
   line-height: 18 / 12;
   border-radius: 0.25rem;
   height: 1.625rem;
@@ -21004,6 +20967,9 @@ input[type=button].cxd-Button--block {
 .cxd-Image-image {
   display: block;
 }
+.cxd-Image-image--loading {
+  visibility: hidden;
+}
 .cxd-Image--original .cxd-Image-image {
   max-width: 100%;
   max-height: 100%;
@@ -21564,7 +21530,7 @@ input[type=button].cxd-Button--block {
   background: #f7f7f9;
   border-color: #e8e9eb;
   pointer-events: none;
-  background: var(--TabsTransfer-title-bg);
+  background: #f7f7f9;
 }
 .cxd-ResultBox.is-disabled div.cxd-ResultBox-value {
   background: #e8e9eb;
@@ -22823,7 +22789,7 @@ fieldset.cxd-Collapse--lg:after {
   }
   .cxd-Form-group--lg > * {
     padding-left: calc(2.5rem / 2);
-    padding-left: calc(var(--Form-group--lg-gutterWidth) / 2);
+    padding-left: calc(2.5rem / 2);
   }
   .cxd-Form-group--md {
     margin-left: calc(1.875rem / -2);
@@ -24854,7 +24820,7 @@ input.cxd-TextControl-input-password {
      -moz-user-select: none;
           user-select: none;
   white-space: nowrap;
-  color: var(--Form-select-placeholderColor);
+  color: #999;
 }
 .cxd-Select-value {
   line-height: calc( 1.4285714286 * 14px );
@@ -26650,7 +26616,7 @@ td.rdtQuarter.rdtDisabled:hover {
   border-color: #2468f2;
   background: #fff;
   color: #2468f2;
-  border-color: var(--ImageControl-addBtn-onHover-border);
+  border-color: #2468f2;
 }
 .cxd-ImageControl-dropzone:hover .cxd-ImageControl-addBtn-text {
   color: #2468f2;
@@ -27910,7 +27876,7 @@ td.rdtQuarter.rdtDisabled:hover {
           18 / 12 * 12px
       ) / 2
   ) 0.5rem;
-  font-size: var(--Combo-addBtn-fontSize);
+  font-size: 12px;
   line-height: 18 / 12;
   border-radius: 0.25rem;
   height: 1.625rem;
@@ -28558,7 +28524,7 @@ td.rdtQuarter.rdtDisabled:hover {
           12px
       ) / 2
   ) 0.5rem;
-  font-size: var(--TagControl-sugBtn-fontSize);
+  font-size: 12px;
   line-height: 18 / 12;
   border-radius: 0.25rem;
   height: 1.875rem;

package/lib/themes/default.css

@@ -7979,8 +7979,6 @@ body.tox-dialog__disable-scroll {
   overflow: hidden;
 }
 .tox .tox-editor-header {
-  display: grid;
-  grid-template-columns: 1fr min-content;
   z-index: 1;
 }
 .tox:not(.tox-tinymce-inline) .tox-editor-header {
@@ -8571,47 +8569,16 @@ body.tox-dialog__disable-scroll {
   margin: 0;
 }
 .tox .tox-menubar {
-  background: repeating-linear-gradient(transparent 0px 1px, transparent 1px 39px) center top 39px/100% calc(100% - 39px) no-repeat;
+  background: url("data:image/svg+xml;charset=utf8,%3Csvg height='39px' viewBox='0 0 40 39px' width='40' xmlns='http://www.w3.org/2000/svg'%3E%3Crect x='0' y='38px' width='100' height='1' fill='transparent'/%3E%3C/svg%3E") left 0 top 0 #fff;
   background-color: #fff;
   display: flex;
   flex: 0 0 auto;
   flex-shrink: 0;
   flex-wrap: wrap;
-  grid-column: 1/-1;
-  grid-row: 1;
   padding: 0 11px 0 12px;
 }
-.tox .tox-promotion + .tox-menubar {
-  grid-column: 1;
-}
-.tox .tox-promotion {
-  background: repeating-linear-gradient(transparent 0px 1px, transparent 1px 39px) center top 39px/100% calc(100% - 39px) no-repeat;
-  background-color: #fff;
-  grid-column: 2;
-  grid-row: 1;
-  -webkit-padding-end: 8px;
-          padding-inline-end: 8px;
-  -webkit-padding-start: 4px;
-          padding-inline-start: 4px;
-  padding-top: 5px;
-}
-.tox .tox-promotion-link {
-  align-items: unsafe center;
-  background-color: #E8F1F8;
-  border-radius: 5px;
-  color: #086BE6;
-  cursor: pointer;
-  display: flex;
-  font-size: 14px;
-  height: 26.6px;
-  padding: 4px 8px;
-  white-space: nowrap;
-}
-.tox .tox-promotion-link:hover {
-  background-color: #B4D7FF;
-}
-.tox .tox-promotion-link:focus {
-  background-color: #D9EDF7;
+.tox.tox-tinymce:not(.tox-tinymce-inline) .tox-editor-header:not(:first-child) .tox-menubar {
+  border-top: 1px solid transparent;
 }
 /* Deprecated. Remove in next major release */
 .tox .tox-mbtn {
@@ -9393,14 +9360,10 @@ body.tox-dialog__disable-scroll {
 .tox .tox-toolbar__overflow--shrinking {
   transition: opacity 0.3s ease, height 0.2s linear 0.1s, visibility 0s linear 0.3s;
 }
-.tox .tox-toolbar-overlord,
-.tox .tox-anchorbar {
-  grid-column: 1/-1;
-}
 .tox .tox-menubar + .tox-toolbar,
 .tox .tox-menubar + .tox-toolbar-overlord {
   border-top: 1px solid transparent;
-  margin-top: -1px;
+  margin-top: 0px;
   padding-bottom: 1px;
   padding-top: 1px;
 }
@@ -23042,6 +23005,9 @@ input[type=button].cxd-Button--block {
 .cxd-Image-image {
   display: block;
 }
+.cxd-Image-image--loading {
+  visibility: hidden;
+}
 .cxd-Image--original .cxd-Image-image {
   max-width: 100%;
   max-height: 100%;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "amis",
-  "version": "2.3.0",
+  "version": "2.3.2-beta.1",
   "description": "一种MIS页面生成工具",
   "main": "lib/index.js",
   "module": "esm/index.js",
@@ -40,8 +40,8 @@
     ]
   },
   "dependencies": {
-    "amis-core": "^2.3.0",
-    "amis-ui": "^2.3.0",
+    "amis-core": "^2.3.2-beta.1",
+    "amis-ui": "^2.3.2-beta.1",
     "attr-accept": "2.2.2",
     "blueimp-canvastoblob": "2.1.0",
     "classnames": "2.3.1",
@@ -83,7 +83,7 @@
     "@rollup/plugin-typescript": "^8.3.4",
     "@svgr/rollup": "^6.2.1",
     "@testing-library/jest-dom": "^5.16.4",
-    "@testing-library/react": "^13.0.0",
+    "@testing-library/react": "^13.4.0",
     "@types/async": "^2.0.45",
     "@types/codemirror": "^5.60.3",
     "@types/echarts": "^4.9.2",
@@ -179,6 +179,14 @@
       "import": [
         "./sdk/*"
       ]
+    },
+    "./schema.json": {
+      "require": [
+        "./schema.json"
+      ],
+      "import": [
+        "./schema.json"
+      ]
     }
   },
   "jest": {
@@ -227,5 +235,5 @@
     "react": ">=16.8.6",
     "react-dom": ">=16.8.6"
   },
-  "gitHead": "b68c3c583c6744b1538a1a6865d3a33e51cddd5d"
+  "gitHead": "31a7b87a507f289e1390102c2aebcb12da9aba13"
 }