amis 1.6.2 → 1.6.3

package/schema.json

@@ -688,6 +688,20 @@
             "$ref": "#/definitions/ButtonToolbarSchema"
           }
         },
+        {
+          "if": {
+            "properties": {
+              "type": {
+                "type": "string",
+                "const": "calendar",
+                "description": "指定为日历选择控件"
+              }
+            }
+          },
+          "then": {
+            "$ref": "#/definitions/CalendarSchema"
+          }
+        },
         {
           "if": {
             "properties": {
@@ -1830,6 +1844,14 @@
                   "horizontal"
                 ],
                 "description": "配置当前表单项展示模式"
+              },
+              "builderMode": {
+                "type": "string",
+                "enum": [
+                  "simple",
+                  "full"
+                ],
+                "description": "展现模式"
               }
             }
           },
@@ -6857,6 +6879,95 @@
       "additionalProperties": false,
       "description": "Button Toolar 渲染器。 文档：https://baidu.gitee.io/amis/docs/components/button-toolbar"
     },
+    "CalendarSchema": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "const": "calendar",
+          "description": "指定为日历选择控件"
+        },
+        "className": {
+          "$ref": "#/definitions/SchemaClassName",
+          "description": "容器 css 类名"
+        },
+        "$ref": {
+          "type": "string",
+          "description": "配合 definitions 一起使用，可以实现无限循环的渲染器。"
+        },
+        "disabled": {
+          "type": "boolean",
+          "description": "是否禁用"
+        },
+        "disabledOn": {
+          "$ref": "#/definitions/SchemaExpression",
+          "description": "是否禁用表达式"
+        },
+        "hidden": {
+          "type": "boolean",
+          "description": "是否隐藏"
+        },
+        "hiddenOn": {
+          "$ref": "#/definitions/SchemaExpression",
+          "description": "是否隐藏表达式"
+        },
+        "visible": {
+          "type": "boolean",
+          "description": "是否显示"
+        },
+        "visibleOn": {
+          "$ref": "#/definitions/SchemaExpression",
+          "description": "是否显示表达式"
+        },
+        "schedules": {
+          "anyOf": [
+            {
+              "type": "array",
+              "items": {
+                "type": "object",
+                "properties": {
+                  "startTime": {
+                    "type": "string"
+                  },
+                  "endTime": {
+                    "type": "string"
+                  },
+                  "content": {},
+                  "className": {
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "startTime",
+                  "endTime",
+                  "content"
+                ],
+                "additionalProperties": false
+              }
+            },
+            {
+              "type": "string"
+            }
+          ],
+          "description": "日程"
+        },
+        "scheduleClassNames": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "日程显示颜色自定义"
+        },
+        "scheduleAction": {
+          "$ref": "#/definitions/SchemaObject",
+          "description": "日程点击展示"
+        }
+      },
+      "required": [
+        "type"
+      ],
+      "additionalProperties": false
+    },
     "CardSchema": {
       "type": "object",
       "properties": {
@@ -21713,6 +21824,18 @@
             }
           ],
           "description": "通过远程拉取配置项"
+        },
+        "builderMode": {
+          "type": "string",
+          "enum": [
+            "simple",
+            "full"
+          ],
+          "description": "展现模式"
+        },
+        "showANDOR": {
+          "type": "boolean",
+          "description": "是否显示并或切换键按钮，只在简单模式下有用"
         }
       },
       "required": [
@@ -22740,51 +22863,6 @@
         "maxDate": {
           "type": "string",
           "description": "限制最大日期"
-        },
-        "schedules": {
-          "anyOf": [
-            {
-              "type": "array",
-              "items": {
-                "type": "object",
-                "properties": {
-                  "startTime": {
-                    "type": "string",
-                    "format": "date-time"
-                  },
-                  "endTime": {
-                    "type": "string",
-                    "format": "date-time"
-                  },
-                  "content": {},
-                  "className": {
-                    "type": "string"
-                  }
-                },
-                "required": [
-                  "startTime",
-                  "endTime",
-                  "content"
-                ],
-                "additionalProperties": false
-              }
-            },
-            {
-              "type": "string"
-            }
-          ],
-          "description": "日程"
-        },
-        "scheduleClassNames": {
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "日程显示颜色自定义"
-        },
-        "scheduleAction": {
-          "$ref": "#/definitions/SchemaObject",
-          "description": "日程点击展示"
         }
       },
       "required": [
@@ -40032,6 +40110,14 @@
         "showCounter": {
           "type": "boolean",
           "description": "是否显示计数"
+        },
+        "clearable": {
+          "type": "boolean",
+          "description": "输入内容是否可清除"
+        },
+        "resetValue": {
+          "type": "string",
+          "description": "重置值"
         }
       },
       "required": [
@@ -42635,6 +42721,13 @@
             "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|buttons|label|labelClassName|name|popOver|quickEdit|copyable)$": {}
           }
         },
+        {
+          "$ref": "#/definitions/CalendarSchema",
+          "additionalProperties": false,
+          "patternProperties": {
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|schedules|scheduleClassNames|scheduleAction|label|labelClassName|name|popOver|quickEdit|copyable)$": {}
+          }
+        },
         {
           "$ref": "#/definitions/CardSchema",
           "additionalProperties": false,
@@ -43048,14 +43141,14 @@
           "$ref": "#/definitions/ConditionBuilderControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|funcs|fields|config|source|popOver|quickEdit|copyable)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|funcs|fields|config|source|builderMode|showANDOR|popOver|quickEdit|copyable)$": {}
           }
         },
         {
           "$ref": "#/definitions/DateControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|clearable|format|inputFormat|utc|emebed|borderMode|closeOnSelect|minDate|maxDate|schedules|scheduleClassNames|scheduleAction|popOver|quickEdit|copyable)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|clearable|format|inputFormat|utc|emebed|borderMode|closeOnSelect|minDate|maxDate|popOver|quickEdit|copyable)$": {}
           }
         },
         {
@@ -43328,7 +43421,7 @@
           "$ref": "#/definitions/TextareaControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|maxRows|minRows|borderMode|maxLength|showCounter|popOver|quickEdit|copyable)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|maxRows|minRows|borderMode|maxLength|showCounter|clearable|resetValue|popOver|quickEdit|copyable)$": {}
           }
         },
         {
@@ -43429,6 +43522,13 @@
             "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|buttons|label|labelClassName|name|popOver|quickEdit|copyable)$": {}
           }
         },
+        {
+          "$ref": "#/definitions/CalendarSchema",
+          "additionalProperties": false,
+          "patternProperties": {
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|schedules|scheduleClassNames|scheduleAction|label|labelClassName|name|popOver|quickEdit|copyable)$": {}
+          }
+        },
         {
           "$ref": "#/definitions/CardSchema",
           "additionalProperties": false,
@@ -43842,14 +43942,14 @@
           "$ref": "#/definitions/ConditionBuilderControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|funcs|fields|config|source|popOver|quickEdit|copyable)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|funcs|fields|config|source|builderMode|showANDOR|popOver|quickEdit|copyable)$": {}
           }
         },
         {
           "$ref": "#/definitions/DateControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|clearable|format|inputFormat|utc|emebed|borderMode|closeOnSelect|minDate|maxDate|schedules|scheduleClassNames|scheduleAction|popOver|quickEdit|copyable)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|clearable|format|inputFormat|utc|emebed|borderMode|closeOnSelect|minDate|maxDate|popOver|quickEdit|copyable)$": {}
           }
         },
         {
@@ -44122,7 +44222,7 @@
           "$ref": "#/definitions/TextareaControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|maxRows|minRows|borderMode|maxLength|showCounter|popOver|quickEdit|copyable)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|maxRows|minRows|borderMode|maxLength|showCounter|clearable|resetValue|popOver|quickEdit|copyable)$": {}
           }
         },
         {
@@ -44223,6 +44323,13 @@
             "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|buttons|label|fixed|name|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|labelClassName|filterable|breakpoint|remark|value|unique)$": {}
           }
         },
+        {
+          "$ref": "#/definitions/CalendarSchema",
+          "additionalProperties": false,
+          "patternProperties": {
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|schedules|scheduleClassNames|scheduleAction|label|fixed|name|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|labelClassName|filterable|breakpoint|remark|value|unique)$": {}
+          }
+        },
         {
           "$ref": "#/definitions/CardSchema",
           "additionalProperties": false,
@@ -44636,14 +44743,14 @@
           "$ref": "#/definitions/ConditionBuilderControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|funcs|fields|config|source|fixed|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|filterable|breakpoint|unique)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|funcs|fields|config|source|builderMode|showANDOR|fixed|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|filterable|breakpoint|unique)$": {}
           }
         },
         {
           "$ref": "#/definitions/DateControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|clearable|format|inputFormat|utc|emebed|borderMode|closeOnSelect|minDate|maxDate|schedules|scheduleClassNames|scheduleAction|fixed|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|filterable|breakpoint|unique)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|clearable|format|inputFormat|utc|emebed|borderMode|closeOnSelect|minDate|maxDate|fixed|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|filterable|breakpoint|unique)$": {}
           }
         },
         {
@@ -44916,7 +45023,7 @@
           "$ref": "#/definitions/TextareaControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|maxRows|minRows|borderMode|maxLength|showCounter|fixed|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|filterable|breakpoint|unique)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|maxRows|minRows|borderMode|maxLength|showCounter|clearable|resetValue|fixed|popOver|quickEdit|quickEditOnUpdate|copyable|sortable|searchable|toggled|width|align|classNameExpr|filterable|breakpoint|unique)$": {}
           }
         },
         {
@@ -45017,6 +45124,13 @@
             "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|buttons|x|y|w|h|width|height|align|valign|gridClassName)$": {}
           }
         },
+        {
+          "$ref": "#/definitions/CalendarSchema",
+          "additionalProperties": false,
+          "patternProperties": {
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|schedules|scheduleClassNames|scheduleAction|x|y|w|h|width|height|align|valign|gridClassName)$": {}
+          }
+        },
         {
           "$ref": "#/definitions/CardSchema",
           "additionalProperties": false,
@@ -45430,14 +45544,14 @@
           "$ref": "#/definitions/ConditionBuilderControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|funcs|fields|config|source|x|y|w|h|width|height|align|valign|gridClassName)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|funcs|fields|config|source|builderMode|showANDOR|x|y|w|h|width|height|align|valign|gridClassName)$": {}
           }
         },
         {
           "$ref": "#/definitions/DateControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|clearable|format|inputFormat|utc|emebed|borderMode|closeOnSelect|minDate|maxDate|schedules|scheduleClassNames|scheduleAction|x|y|w|h|width|height|align|valign|gridClassName)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|clearable|format|inputFormat|utc|emebed|borderMode|closeOnSelect|minDate|maxDate|x|y|w|h|width|height|align|valign|gridClassName)$": {}
           }
         },
         {
@@ -45710,7 +45824,7 @@
           "$ref": "#/definitions/TextareaControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|maxRows|minRows|borderMode|maxLength|showCounter|x|y|w|h|width|height|align|valign|gridClassName)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|maxRows|minRows|borderMode|maxLength|showCounter|clearable|resetValue|x|y|w|h|width|height|align|valign|gridClassName)$": {}
           }
         },
         {
@@ -45811,6 +45925,13 @@
             "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|buttons|rowClassName|cellClassName)$": {}
           }
         },
+        {
+          "$ref": "#/definitions/CalendarSchema",
+          "additionalProperties": false,
+          "patternProperties": {
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|schedules|scheduleClassNames|scheduleAction|rowClassName|cellClassName)$": {}
+          }
+        },
         {
           "$ref": "#/definitions/CardSchema",
           "additionalProperties": false,
@@ -46224,14 +46345,14 @@
           "$ref": "#/definitions/ConditionBuilderControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|funcs|fields|config|source|rowClassName|cellClassName)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|funcs|fields|config|source|builderMode|showANDOR|rowClassName|cellClassName)$": {}
           }
         },
         {
           "$ref": "#/definitions/DateControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|clearable|format|inputFormat|utc|emebed|borderMode|closeOnSelect|minDate|maxDate|schedules|scheduleClassNames|scheduleAction|rowClassName|cellClassName)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|clearable|format|inputFormat|utc|emebed|borderMode|closeOnSelect|minDate|maxDate|rowClassName|cellClassName)$": {}
           }
         },
         {
@@ -46504,7 +46625,7 @@
           "$ref": "#/definitions/TextareaControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|maxRows|minRows|borderMode|maxLength|showCounter|rowClassName|cellClassName)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|maxRows|minRows|borderMode|maxLength|showCounter|clearable|resetValue|rowClassName|cellClassName)$": {}
           }
         },
         {
@@ -46605,6 +46726,13 @@
             "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|buttons|unique|columnClassName)$": {}
           }
         },
+        {
+          "$ref": "#/definitions/CalendarSchema",
+          "additionalProperties": false,
+          "patternProperties": {
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|schedules|scheduleClassNames|scheduleAction|unique|columnClassName)$": {}
+          }
+        },
         {
           "$ref": "#/definitions/CardSchema",
           "additionalProperties": false,
@@ -47018,14 +47146,14 @@
           "$ref": "#/definitions/ConditionBuilderControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|funcs|fields|config|source|unique|columnClassName)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|funcs|fields|config|source|builderMode|showANDOR|unique|columnClassName)$": {}
           }
         },
         {
           "$ref": "#/definitions/DateControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|clearable|format|inputFormat|utc|emebed|borderMode|closeOnSelect|minDate|maxDate|schedules|scheduleClassNames|scheduleAction|unique|columnClassName)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|clearable|format|inputFormat|utc|emebed|borderMode|closeOnSelect|minDate|maxDate|unique|columnClassName)$": {}
           }
         },
         {
@@ -47298,7 +47426,7 @@
           "$ref": "#/definitions/TextareaControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|maxRows|minRows|borderMode|maxLength|showCounter|unique|columnClassName)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|maxRows|minRows|borderMode|maxLength|showCounter|clearable|resetValue|unique|columnClassName)$": {}
           }
         },
         {
@@ -47399,6 +47527,13 @@
             "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|buttons|columnClassName|columnRatio)$": {}
           }
         },
+        {
+          "$ref": "#/definitions/CalendarSchema",
+          "additionalProperties": false,
+          "patternProperties": {
+            "^(type|className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|schedules|scheduleClassNames|scheduleAction|columnClassName|columnRatio)$": {}
+          }
+        },
         {
           "$ref": "#/definitions/CardSchema",
           "additionalProperties": false,
@@ -47812,14 +47947,14 @@
           "$ref": "#/definitions/ConditionBuilderControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|funcs|fields|config|source|columnClassName|columnRatio)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|funcs|fields|config|source|builderMode|showANDOR|columnClassName|columnRatio)$": {}
           }
         },
         {
           "$ref": "#/definitions/DateControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|clearable|format|inputFormat|utc|emebed|borderMode|closeOnSelect|minDate|maxDate|schedules|scheduleClassNames|scheduleAction|columnClassName|columnRatio)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|clearable|format|inputFormat|utc|emebed|borderMode|closeOnSelect|minDate|maxDate|columnClassName|columnRatio)$": {}
           }
         },
         {
@@ -48092,7 +48227,7 @@
           "$ref": "#/definitions/TextareaControlSchema",
           "additionalProperties": false,
           "patternProperties": {
-            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|maxRows|minRows|borderMode|maxLength|showCounter|columnClassName|columnRatio)$": {}
+            "^(className|$ref|disabled|disabledOn|hidden|hiddenOn|visible|visibleOn|type|size|label|labelClassName|name|remark|labelRemark|hint|submitOnChange|readOnly|validateOnChange|description|desc|descriptionClassName|mode|horizontal|inline|inputClassName|placeholder|required|validationErrors|validations|value|clearValueOnHidden|validateApi|maxRows|minRows|borderMode|maxLength|showCounter|clearable|resetValue|columnClassName|columnRatio)$": {}
           }
         },
         {

package/scss/_mixins.scss

@@ -303,22 +303,27 @@
 }
 
 @mixin input-clear {
-  padding: px2rem(3px);
+  padding: var(--Form-input-clearBtn-padding);
   cursor: pointer;
   display: flex;
   align-items: center;
   justify-content: center;
   margin-left: auto;
+  text-decoration: none;
 
   svg {
-    fill: var(--Form-input-iconColor);
+    fill: var(--Form-input-clearBtn-color);
     top: 0;
-    width: px2rem(10px);
-    height: px2rem(10px);
+    width: var(--Form-input-clearBtn-size);
+    height: var(--Form-input-clearBtn-size);
   }
 
   &:hover svg {
-    fill: var(--Form-input-onHover-iconColor);
+    fill: var(--Form-input-clearBtn-color-onHover);
+  }
+
+  &:active svg {
+    fill: var(--Form-input-clearBtn-color-onActive);
   }
 }
 

package/scss/_properties.scss

@@ -703,6 +703,12 @@
   --Form-input-placeholderColor: var(--text--muted-color);
   --Form-input-onDisabled-color: var(--text--muted-color);
 
+  --Form-input-clearBtn-size: var(--fontSizeMd);
+  --Form-input-clearBtn-padding: #{px2rem(3px)};
+  --Form-input-clearBtn-color: #cecfd1;
+  --Form-input-clearBtn-color-onHover: #5e626a;
+  --Form-input-clearBtn-color-onActive: #2d323c;
+
   --Form-item-gap: var(--gap-base);
 
   --Form-label-paddingTop: calc(
@@ -1443,4 +1449,9 @@
   --ColumnToggler-fontColor: #151a26;
   --ColumnToggler-item-backgroundColor: #f6f7f8;
   --ColumnToggler-item-backgroundColor-onHover: rgba(36, 104, 242, 0.1);
+
+  --InputFormula-header-bgColor: #fafafa;
+  --InputFormula-icon-size: #{px2rem(24px)};
+  --InputFormula-icon-color-onActive: var(--primary);
+  --InputFormula-code-bgColor: #f2f2f4;
 }

package/scss/components/_collapse-group.scss

@@ -8,6 +8,10 @@
       .#{$ns}Collapse-arrow {
         float: right;
       }
+
+      .#{$ns}Collapse-icon-tranform {
+        float: right;
+      }
     }
   }
 }

package/scss/components/_condition-builder.scss

@@ -33,7 +33,6 @@
       transition: opacity var(--animation-duration);
       display: flex;
       align-items: center;
-      margin-left: var(--gap-base);
 
       .#{$ns}CBDelete {
         margin-left: var(--gap-xs);
@@ -124,6 +123,10 @@
       }
     }
   }
+
+  &-toolbarCondition {
+    margin-right: var(--gap-base);
+  }
 }
 
 .#{$ns}CBDelete {
@@ -228,6 +231,10 @@
       display: none;
     }
   }
+
+  &-simple {
+    margin-bottom: var(--gap-sm);
+  }
 }
 
 .#{$ns}CBInputSwitch {