npm - amis - Versions diffs - 2.4.0 → 2.5.0-rc.0 - Mend

@@ -2,7 +2,7 @@ import React from 'react';
 import { RendererProps } from 'amis-core';
 import { FormBaseControlSchema, SchemaClassName, SchemaObject } from '../../Schema';
 import { FormHorizontal } from 'amis-core';
-export declare type GroupSubControl = SchemaObject & {
+export type GroupSubControl = SchemaObject & {
     /**
      * 列类名
      */

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
@@ -60,9 +60,10 @@ import { isVisible, makeHorizontalDeeper, getWidthRate, FormItemWrap, Renderer }
                 return null;
             }
             var controlMode = (control === null || control === void 0 ? void 0 : control.mode) || formMode;
-            if (controlMode === 'inline'
+            if (controlMode === 'inline' ||
                 // hidden 直接渲染，否则会有个空 Form-groupColumn 层
-                || (control === null || control === void 0 ? void 0 : control.type) && ['formula', 'hidden'].includes(control.type)) {
+                ((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)

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */

@@ -9,7 +9,7 @@ export interface SvgIconGroup {
 }
 export declare let svgIcons: SvgIconGroup[];
 export declare function mountIconSpiriteToDom(spirite: string): void;
-declare type refreshIconListFunc = null | (() => any);
+type refreshIconListFunc = null | (() => any);
 export declare let refreshIconList: refreshIconListFunc;
 export declare function setRefreshSvgListAction(func: ({ setSvgIconList, mountIconSpiriteToDom }: {
     setSvgIconList: (arr: SvgIconGroup[]) => void;

@@ -16,6 +16,10 @@ export interface ArrayControlSchema extends Omit<ComboControlSchema, 'type' | 'c
      * 成员渲染器配置
      */
     items: SchemaCollection;
+    /**
+     * 新增成员时的默认值
+     */
+    scaffold?: any;
 }
 export interface InputArrayProps extends FormControlProps, Omit<ArrayControlSchema, 'type' | 'className' | 'descriptionClassName' | 'inputClassName'> {
     store: IComboStore;

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
@@ -22,8 +22,16 @@ var InputArrayControl = /** @class */ (function (_super) {
         return this.comboInstance ? this.comboInstance.validate() : null;
     };
     InputArrayControl.prototype.render = function () {
-        var _a = this.props, items = _a.items, rest = __rest(_a, ["items"]);
-        return (React.createElement(ComboControl, __assign({}, rest, { items: [items], flat: true, multiple: true, multiLine: false, ref: this.comboRef })));
+        var _a = this.props, items = _a.items, scaffold = _a.scaffold, rest = __rest(_a, ["items", "scaffold"]);
+        // 传入多个元素时只接受首个元素，因为input-array相当于打平的combo
+        var normalizedItems = Array.isArray(items)
+            ? items.length > 1
+                ? items.slice(0, 1)
+                : items
+            : items != null
+                ? [items]
+                : [];
+        return (React.createElement(ComboControl, __assign({}, rest, { scaffold: scaffold, items: normalizedItems, flat: true, multiple: true, multiLine: false, ref: this.comboRef })));
     };
     return InputArrayControl;
 }(React.Component));

amis 2.4.0 → 2.5.0-rc.0