amis 2.0.2 → 2.1.0

package/lib/renderers/Form/ChartRadios.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Checkbox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Checkboxes.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
-import { OptionsControlProps, Option } from 'amis-core';
-import { ActionObject, Api } from 'amis-core';
+import type { ActionObject, Api, OptionsControlProps, Option } from 'amis-core';
 import { FormOptionsSchema } from '../../Schema';
 /**
  * 复选框

package/lib/renderers/Form/Checkboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -9,12 +9,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
+var inRange = require('lodash/inRange');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+var inRange__default = /*#__PURE__*/_interopDefaultLegacy(inRange);
 
 var CheckboxesControl = /** @class */ (function (_super) {
     tslib.__extends(CheckboxesControl, _super);
@@ -173,8 +175,7 @@ var CheckboxesControl = /** @class */ (function (_super) {
             body = options.map(function (option, key) { return _this.renderItem(option, key); });
         }
         if (checkAll && body.length && optionType === 'default') {
-            body.unshift(React__default["default"].createElement(amisUi.Checkbox, { key: "checkall", className: itemClassName, onChange: onToggleAll, checked: !!selectedOptions.length, partial: !!(selectedOptions.length &&
-                    selectedOptions.length !== options.length), disabled: disabled, inline: inline, labelClassName: labelClassName }, __('Checkboxes.selectAll')));
+            body.unshift(React__default["default"].createElement(amisUi.Checkbox, { key: "checkall", className: itemClassName, onChange: onToggleAll, checked: !!selectedOptions.length, partial: inRange__default["default"](selectedOptions.length, 0, amisCore.flattenTreeWithLeafNodes(options).length), disabled: disabled, inline: inline, labelClassName: labelClassName }, __('Checkboxes.selectAll')));
         }
         body = amisCore.columnsSplit(body, cx, columnsCount);
         return (React__default["default"].createElement("div", { className: cx("CheckboxesControl", className), ref: "checkboxRef" },

package/lib/renderers/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/ConditionBuilder.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Control.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/DiffEditor.d.ts

@@ -3809,12 +3809,12 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
             loadAutoUpdateData: (api: import("amis-core").Api, data?: object | undefined, silent?: boolean | undefined) => Promise<import("amis-core").Payload>;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         formInited?: boolean | undefined;
-        formMode?: "horizontal" | "inline" | "normal" | "row" | "default" | undefined;
+        formMode?: "normal" | "horizontal" | "default" | "inline" | "row" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
-        defaultSize?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
-        size?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
+        defaultSize?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
+        size?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
         labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         labelWidth?: string | number | undefined;
         disabled?: boolean | undefined;
@@ -3850,20 +3850,27 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         error?: string | undefined;
         showErrorMsg?: boolean | undefined;
+        placeholder?: string | undefined;
+        $ref?: string | undefined;
+        disabledOn?: string | undefined;
+        hidden?: boolean | undefined;
+        hiddenOn?: string | undefined;
+        visible?: boolean | undefined;
+        visibleOn?: string | undefined;
+        id?: string | undefined;
+        label?: string | false | undefined;
         remark?: import("../Remark").SchemaRemark | undefined;
+        desc?: string | undefined;
+        mode?: "normal" | "horizontal" | "inline" | undefined;
+        horizontal?: import("amis-core").FormHorizontal | undefined;
+        labelClassName?: string | undefined;
+        inline?: boolean | undefined;
+        readOnly?: boolean | undefined;
         labelRemark?: import("../Remark").SchemaRemark | undefined;
         options?: any;
-        label?: string | false | undefined;
-        labelClassName?: string | undefined;
         submitOnChange?: boolean | undefined;
-        readOnly?: boolean | undefined;
         readOnlyOn?: string | undefined;
         validateOnChange?: boolean | undefined;
-        desc?: string | undefined;
-        mode?: "horizontal" | "inline" | "normal" | undefined;
-        horizontal?: import("amis-core").FormHorizontal | undefined;
-        inline?: boolean | undefined;
-        placeholder?: string | undefined;
         required?: boolean | undefined;
         validationErrors?: {
             [propName: string]: any;
@@ -3912,13 +3919,6 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         clearValueOnHidden?: boolean | undefined;
         validateApi?: string | import("amis-core").BaseApiObject | undefined;
-        $ref?: string | undefined;
-        disabledOn?: string | undefined;
-        hidden?: boolean | undefined;
-        hiddenOn?: string | undefined;
-        visible?: boolean | undefined;
-        visibleOn?: string | undefined;
-        id?: string | undefined;
         diffValue?: string | undefined;
         language?: string | undefined;
     };

package/lib/renderers/Form/DiffEditor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Editor.d.ts

@@ -3811,12 +3811,12 @@ export declare class EditorControlRenderer extends EditorControl {
             loadAutoUpdateData: (api: import("amis-core").Api, data?: object | undefined, silent?: boolean | undefined) => Promise<import("amis-core").Payload>;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         formInited?: boolean | undefined;
-        formMode?: "horizontal" | "inline" | "normal" | "row" | "default" | undefined;
+        formMode?: "normal" | "horizontal" | "default" | "inline" | "row" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
-        defaultSize?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
-        size?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
+        defaultSize?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
+        size?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
         labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         labelWidth?: string | number | undefined;
         disabled?: boolean | undefined;

package/lib/renderers/Form/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/FieldSet.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Formula.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/Group.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -66,8 +66,9 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
                 return null;
             }
             var controlMode = (control === null || control === void 0 ? void 0 : control.mode) || formMode;
-            if (controlMode === 'inline' ||
-                (control && control.type === 'formula')) {
+            if (controlMode === 'inline'
+                // hidden 直接渲染，否则会有个空 Form-groupColumn 层
+                || (control === null || control === void 0 ? void 0 : control.type) && ['formula', 'hidden'].includes(control.type)) {
                 return _this.renderControl(control, index, {
                     key: index,
                     className: cx(control.className, control.columnClassName)

package/lib/renderers/Form/Hidden.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/IconPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/IconPickerIcons.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Form/InputArray.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.2
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */