amis 1.8.0-beta.0 → 1.8.0-beta.1

package/package.json

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

package/schema.json

@@ -4327,6 +4327,10 @@
           "type": "boolean",
           "description": "是否显示错误信息"
         },
+        "showLoading": {
+          "type": "boolean",
+          "description": "是否显示 spinner"
+        },
         "className": {
           "$ref": "#/definitions/SchemaClassName",
           "description": "容器 css 类名"
@@ -5082,6 +5086,10 @@
           "type": "boolean",
           "description": "是否显示错误信息"
         },
+        "showLoading": {
+          "type": "boolean",
+          "description": "是否显示 spinner"
+        },
         "className": {
           "$ref": "#/definitions/SchemaClassName",
           "description": "容器 css 类名"
@@ -11338,6 +11346,10 @@
         "showErrorMsg": {
           "type": "boolean",
           "description": "是否显示错误信息"
+        },
+        "showLoading": {
+          "type": "boolean",
+          "description": "是否显示 spinner"
         }
       },
       "required": [
@@ -16047,7 +16059,7 @@
         },
         "strokeWidth": {
           "type": "number",
-          "description": "圆形进度条线的宽度"
+          "description": "进度条线的宽度"
         },
         "gapDegree": {
           "type": "number",
@@ -60411,7 +60423,7 @@
           "$ref": "#/definitions/DialogSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|actions|body|bodyClassName|closeOnEsc|closeOnOutside|name|size|title|header|headerClassName|footer|confirm|showCloseButton|showErrorMsg|label|labelClassName|popOver|quickEdit|copyable)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|actions|body|bodyClassName|closeOnEsc|closeOnOutside|name|size|title|header|headerClassName|footer|confirm|showCloseButton|showErrorMsg|showLoading|label|labelClassName|popOver|quickEdit|copyable)$": {}
           }
         },
         {
@@ -61219,7 +61231,7 @@
           "$ref": "#/definitions/DialogSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|actions|body|bodyClassName|closeOnEsc|closeOnOutside|name|size|title|header|headerClassName|footer|confirm|showCloseButton|showErrorMsg|label|labelClassName|popOver|quickEdit|copyable)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|actions|body|bodyClassName|closeOnEsc|closeOnOutside|name|size|title|header|headerClassName|footer|confirm|showCloseButton|showErrorMsg|showLoading|label|labelClassName|popOver|quickEdit|copyable)$": {}
           }
         },
         {
@@ -62027,7 +62039,7 @@
           "$ref": "#/definitions/DialogSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|actions|body|bodyClassName|closeOnEsc|closeOnOutside|name|size|title|header|headerClassName|footer|confirm|showCloseButton|showErrorMsg|label|fixed|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|labelClassName|filterable|breakpoint|remark|value|unique)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|actions|body|bodyClassName|closeOnEsc|closeOnOutside|name|size|title|header|headerClassName|footer|confirm|showCloseButton|showErrorMsg|showLoading|label|fixed|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|labelClassName|filterable|breakpoint|remark|value|unique)$": {}
           }
         },
         {
@@ -62835,7 +62847,7 @@
           "$ref": "#/definitions/DialogSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|actions|body|bodyClassName|closeOnEsc|closeOnOutside|name|size|title|header|headerClassName|footer|confirm|showCloseButton|showErrorMsg|x|y|w|h|width|height|align|valign|gridClassName)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|actions|body|bodyClassName|closeOnEsc|closeOnOutside|name|size|title|header|headerClassName|footer|confirm|showCloseButton|showErrorMsg|showLoading|x|y|w|h|width|height|align|valign|gridClassName)$": {}
           }
         },
         {
@@ -63643,7 +63655,7 @@
           "$ref": "#/definitions/DialogSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|actions|body|bodyClassName|closeOnEsc|closeOnOutside|name|size|title|header|headerClassName|footer|confirm|showCloseButton|showErrorMsg|rowClassName|cellClassName)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|actions|body|bodyClassName|closeOnEsc|closeOnOutside|name|size|title|header|headerClassName|footer|confirm|showCloseButton|showErrorMsg|showLoading|rowClassName|cellClassName)$": {}
           }
         },
         {
@@ -64451,7 +64463,7 @@
           "$ref": "#/definitions/DialogSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|actions|body|bodyClassName|closeOnEsc|closeOnOutside|name|size|title|header|headerClassName|footer|confirm|showCloseButton|showErrorMsg|unique|columnClassName)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|actions|body|bodyClassName|closeOnEsc|closeOnOutside|name|size|title|header|headerClassName|footer|confirm|showCloseButton|showErrorMsg|showLoading|unique|columnClassName)$": {}
           }
         },
         {
@@ -65259,7 +65271,7 @@
           "$ref": "#/definitions/DialogSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|actions|body|bodyClassName|closeOnEsc|closeOnOutside|name|size|title|header|headerClassName|footer|confirm|showCloseButton|showErrorMsg|columnClassName|columnRatio)$": {}
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|actions|body|bodyClassName|closeOnEsc|closeOnOutside|name|size|title|header|headerClassName|footer|confirm|showCloseButton|showErrorMsg|showLoading|columnClassName|columnRatio)$": {}
           }
         },
         {

package/scss/components/_formula.scss

@@ -316,4 +316,22 @@
       color: var(--InputFormula-icon-color-onActive);
     }
   }
+
+  &-ResultBox {
+    padding-right: 10px;
+    span.c-field {
+      background: #007bff;
+      padding: 3px 5px;
+      margin: 0 1px;
+      color: #fff;
+      font-size: 12px;
+      border-radius: 4px;
+    }
+    span.c-func {
+      color: #ae4597;
+      font-weight: bold;
+      line-height: 14px;
+      padding: 0 2px;
+    }
+  }
 }

package/scss/components/_progress.scss

@@ -1,9 +1,9 @@
 .#{$ns}Progress {
+  display: flex;
+  align-items: center;
   &-line {
     display: inline-block;
     width: 100%;
-    margin-right: calc(-2em + -8px);
-    padding-right: calc(2em + 8px);
 
     &-inter {
       height: 10px;
@@ -12,14 +12,9 @@
       border-radius: var(--Progress-borderRadius);
     }
 
-    &-no-label {
-      padding-right: 0;
-      margin-right: 0;
-    }
-
     &-text {
       display: inline-block;
-      width: 2em;
+      flex-grow: 1;
       margin-left: 8px;
       color: var(--text-color);
       font-size: var(--fontSizeXs);

package/scss/components/form/_date.scss

@@ -12,6 +12,19 @@
   background: var(--DatePicker-bg);
   border-radius: var(--DatePicker-borderRadius);
 
+  input {
+    display: inline-block;
+    width: 100%;
+    background: none;
+    padding: 0;
+    border: 0;
+    &:focus {
+      border: none;
+      outline: none;
+      box-sizing: none;
+    }
+  }
+
   @include input-border();
 
   &:not(.is-disabled) {

package/sdk/ang-ie11.css

@@ -34140,11 +34140,14 @@ readers do not read off random characters that represent icons */
   right: 0;
 }
 
+.amis-scope .a-Progress {
+  display: flex;
+  align-items: center;
+}
+
 .amis-scope .a-Progress-line {
   display: inline-block;
   width: 100%;
-  margin-right: calc(-2em + -8px);
-  padding-right: calc(2em + 8px);
 }
 
 .amis-scope .a-Progress-line-inter {
@@ -34154,14 +34157,9 @@ readers do not read off random characters that represent icons */
   border-radius: 0.142rem;
 }
 
-.amis-scope .a-Progress-line-no-label {
-  padding-right: 0;
-  margin-right: 0;
-}
-
 .amis-scope .a-Progress-line-text {
   display: inline-block;
-  width: 2em;
+  flex-grow: 1;
   margin-left: 8px;
   color: #58666e;
   font-size: 0.6875rem;
@@ -39047,6 +39045,20 @@ readers do not read off random characters that represent icons */
   border-radius: 0.142rem;
 }
 
+.amis-scope .a-DatePicker input {
+  display: inline-block;
+  width: 100%;
+  background: none;
+  padding: 0;
+  border: 0;
+}
+
+.amis-scope .a-DatePicker input:focus {
+  border: none;
+  outline: none;
+  box-sizing: none;
+}
+
 .amis-scope .a-DatePicker--borderHalf {
   border-left-color: transparent !important;
   border-right-color: transparent !important;
@@ -44407,6 +44419,26 @@ readers do not read off random characters that represent icons */
   color: #7266ba;
 }
 
+.amis-scope .a-FormulaPicker-ResultBox {
+  padding-right: 10px;
+}
+
+.amis-scope .a-FormulaPicker-ResultBox span.c-field {
+  background: #007bff;
+  padding: 3px 5px;
+  margin: 0 1px;
+  color: #fff;
+  font-size: 12px;
+  border-radius: 4px;
+}
+
+.amis-scope .a-FormulaPicker-ResultBox span.c-func {
+  color: #ae4597;
+  font-weight: bold;
+  line-height: 14px;
+  padding: 0 2px;
+}
+
 .amis-scope .a-Timeline-vertical {
   display: flex;
   flex-flow: column;

package/sdk/ang.css

@@ -35496,11 +35496,14 @@ readers do not read off random characters that represent icons */
   right: 0;
 }
 
+.amis-scope .a-Progress {
+  display: flex;
+  align-items: center;
+}
+
 .amis-scope .a-Progress-line {
   display: inline-block;
   width: 100%;
-  margin-right: calc(-2em + -8px);
-  padding-right: calc(2em + 8px);
 }
 
 .amis-scope .a-Progress-line-inter {
@@ -35510,14 +35513,9 @@ readers do not read off random characters that represent icons */
   border-radius: var(--Progress-borderRadius);
 }
 
-.amis-scope .a-Progress-line-no-label {
-  padding-right: 0;
-  margin-right: 0;
-}
-
 .amis-scope .a-Progress-line-text {
   display: inline-block;
-  width: 2em;
+  flex-grow: 1;
   margin-left: 8px;
   color: var(--text-color);
   font-size: var(--fontSizeXs);
@@ -40322,6 +40320,20 @@ readers do not read off random characters that represent icons */
   border-radius: var(--DatePicker-borderRadius);
 }
 
+.amis-scope .a-DatePicker input {
+  display: inline-block;
+  width: 100%;
+  background: none;
+  padding: 0;
+  border: 0;
+}
+
+.amis-scope .a-DatePicker input:focus {
+  border: none;
+  outline: none;
+  box-sizing: none;
+}
+
 .amis-scope .a-DatePicker--borderHalf {
   border-left-color: transparent !important;
   border-right-color: transparent !important;
@@ -45544,6 +45556,26 @@ readers do not read off random characters that represent icons */
   color: var(--InputFormula-icon-color-onActive);
 }
 
+.amis-scope .a-FormulaPicker-ResultBox {
+  padding-right: 10px;
+}
+
+.amis-scope .a-FormulaPicker-ResultBox span.c-field {
+  background: #007bff;
+  padding: 3px 5px;
+  margin: 0 1px;
+  color: #fff;
+  font-size: 12px;
+  border-radius: 4px;
+}
+
+.amis-scope .a-FormulaPicker-ResultBox span.c-func {
+  color: #ae4597;
+  font-weight: bold;
+  line-height: 14px;
+  padding: 0 2px;
+}
+
 .amis-scope .a-Timeline-vertical {
   display: flex;
   flex-flow: column;

package/sdk/antd-ie11.css

@@ -34118,11 +34118,14 @@ readers do not read off random characters that represent icons */
   right: 0;
 }
 
+.amis-scope .antd-Progress {
+  display: flex;
+  align-items: center;
+}
+
 .amis-scope .antd-Progress-line {
   display: inline-block;
   width: 100%;
-  margin-right: calc(-2em + -8px);
-  padding-right: calc(2em + 8px);
 }
 
 .amis-scope .antd-Progress-line-inter {
@@ -34132,14 +34135,9 @@ readers do not read off random characters that represent icons */
   border-radius: 2px;
 }
 
-.amis-scope .antd-Progress-line-no-label {
-  padding-right: 0;
-  margin-right: 0;
-}
-
 .amis-scope .antd-Progress-line-text {
   display: inline-block;
-  width: 2em;
+  flex-grow: 1;
   margin-left: 8px;
   color: rgba(0, 0, 0, 0.85);
   font-size: 0.6875rem;
@@ -39026,6 +39024,20 @@ readers do not read off random characters that represent icons */
   border-radius: 2px;
 }
 
+.amis-scope .antd-DatePicker input {
+  display: inline-block;
+  width: 100%;
+  background: none;
+  padding: 0;
+  border: 0;
+}
+
+.amis-scope .antd-DatePicker input:focus {
+  border: none;
+  outline: none;
+  box-sizing: none;
+}
+
 .amis-scope .antd-DatePicker--borderHalf {
   border-left-color: transparent !important;
   border-right-color: transparent !important;
@@ -44377,6 +44389,26 @@ readers do not read off random characters that represent icons */
   color: #1890ff;
 }
 
+.amis-scope .antd-FormulaPicker-ResultBox {
+  padding-right: 10px;
+}
+
+.amis-scope .antd-FormulaPicker-ResultBox span.c-field {
+  background: #007bff;
+  padding: 3px 5px;
+  margin: 0 1px;
+  color: #fff;
+  font-size: 12px;
+  border-radius: 4px;
+}
+
+.amis-scope .antd-FormulaPicker-ResultBox span.c-func {
+  color: #ae4597;
+  font-weight: bold;
+  line-height: 14px;
+  padding: 0 2px;
+}
+
 .amis-scope .antd-Timeline-vertical {
   display: flex;
   flex-flow: column;

package/sdk/antd.css

@@ -35605,11 +35605,14 @@ readers do not read off random characters that represent icons */
   right: 0;
 }
 
+.amis-scope .antd-Progress {
+  display: flex;
+  align-items: center;
+}
+
 .amis-scope .antd-Progress-line {
   display: inline-block;
   width: 100%;
-  margin-right: calc(-2em + -8px);
-  padding-right: calc(2em + 8px);
 }
 
 .amis-scope .antd-Progress-line-inter {
@@ -35619,14 +35622,9 @@ readers do not read off random characters that represent icons */
   border-radius: var(--Progress-borderRadius);
 }
 
-.amis-scope .antd-Progress-line-no-label {
-  padding-right: 0;
-  margin-right: 0;
-}
-
 .amis-scope .antd-Progress-line-text {
   display: inline-block;
-  width: 2em;
+  flex-grow: 1;
   margin-left: 8px;
   color: var(--text-color);
   font-size: var(--fontSizeXs);
@@ -40431,6 +40429,20 @@ readers do not read off random characters that represent icons */
   border-radius: var(--DatePicker-borderRadius);
 }
 
+.amis-scope .antd-DatePicker input {
+  display: inline-block;
+  width: 100%;
+  background: none;
+  padding: 0;
+  border: 0;
+}
+
+.amis-scope .antd-DatePicker input:focus {
+  border: none;
+  outline: none;
+  box-sizing: none;
+}
+
 .amis-scope .antd-DatePicker--borderHalf {
   border-left-color: transparent !important;
   border-right-color: transparent !important;
@@ -45653,6 +45665,26 @@ readers do not read off random characters that represent icons */
   color: var(--InputFormula-icon-color-onActive);
 }
 
+.amis-scope .antd-FormulaPicker-ResultBox {
+  padding-right: 10px;
+}
+
+.amis-scope .antd-FormulaPicker-ResultBox span.c-field {
+  background: #007bff;
+  padding: 3px 5px;
+  margin: 0 1px;
+  color: #fff;
+  font-size: 12px;
+  border-radius: 4px;
+}
+
+.amis-scope .antd-FormulaPicker-ResultBox span.c-func {
+  color: #ae4597;
+  font-weight: bold;
+  line-height: 14px;
+  padding: 0 2px;
+}
+
 .amis-scope .antd-Timeline-vertical {
   display: flex;
   flex-flow: column;