amis 2.1.1-beta.2 → 2.3.0

package/esm/renderers/CRUD2.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __rest, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { qsparse, getPropValue, isArrayChildrenModified, isObjectShallowModified, isApiOutdated, isPureVariable, resolveVariableAndFilter, qsstringify, createObject, isEffectiveApi, evalExpression, extendObject, filter, getVariable, autobind, ScopedContext, Renderer, CRUDStore } from 'amis-core';
+import { parseQuery, getPropValue, isArrayChildrenModified, isObjectShallowModified, isApiOutdated, isPureVariable, resolveVariableAndFilter, qsparse, qsstringify, createObject, isEffectiveApi, evalExpression, extendObject, filter, getVariable, autobind, ScopedContext, Renderer, CRUDStore } from 'amis-core';
 import pick from 'lodash/pick';
 import { findDOMNode } from 'react-dom';
 import findIndex from 'lodash/findIndex';
@@ -20,10 +20,10 @@ var CRUD2 = /** @class */ (function (_super) {
         var location = props.location, store = props.store, syncLocation = props.syncLocation, pageField = props.pageField, perPageField = props.perPageField;
         _this.mounted = true;
         if (syncLocation && location && (location.query || location.search)) {
-            store.updateQuery(qsparse(location.search.substring(1)), undefined, pageField, perPageField);
+            store.updateQuery(parseQuery(location), undefined, pageField, perPageField);
         }
         else if (syncLocation && !location && window.location.search) {
-            store.updateQuery(qsparse(window.location.search.substring(1)), undefined, pageField, perPageField);
+            store.updateQuery(parseQuery(window.location), undefined, pageField, perPageField);
         }
         // 如果有 api，data 里面先写个 空数组，面得继承外层的 items
         // 比如 crud 打开一个弹框，里面也是个 crud，默认一开始其实显示
@@ -37,7 +37,7 @@ var CRUD2 = /** @class */ (function (_super) {
         // 自定义列需要用store里的数据同步显示列
         // 所以需要先初始化一下
         var mode = props.mode, columns = props.columns;
-        if (mode === 'table-v2' && columns) {
+        if (mode === 'table2' && columns) {
             store.updateColumns(columns);
         }
         return _this;
@@ -60,6 +60,9 @@ var CRUD2 = /** @class */ (function (_super) {
     CRUD2.prototype.componentDidUpdate = function (prevProps) {
         var props = this.props;
         var store = prevProps.store;
+        if (prevProps.columns !== props.columns) {
+            store.updateColumns(props.columns);
+        }
         // picker外部引起的值变化处理
         var val;
         if (this.props.pickerMode &&
@@ -71,7 +74,7 @@ var CRUD2 = /** @class */ (function (_super) {
             prevProps.location &&
             prevProps.location.search !== props.location.search) {
             // 同步地址栏，那么直接检测 query 是否变了，变了就重新拉数据
-            store.updateQuery(qsparse(props.location.search.substring(1)), undefined, props.pageField, props.perPageField);
+            store.updateQuery(parseQuery(props.location), undefined, props.pageField, props.perPageField);
             dataInvalid = !!(props.api && isObjectShallowModified(store.query, this.lastQuery, false));
         }
         if (dataInvalid) ;
@@ -202,7 +205,7 @@ var CRUD2 = /** @class */ (function (_super) {
                 loadDataMode: loadDataMode,
                 syncResponse2Query: syncResponse2Query,
                 columns: (_a = store.columns) !== null && _a !== void 0 ? _a : columns,
-                isTableV2: true
+                isTable2: true
             })
                 .then(function (value) {
                 interval &&
@@ -237,7 +240,7 @@ var CRUD2 = /** @class */ (function (_super) {
             scrolledY && window.scroll(0, scrolledY - offsetTop);
         }
     };
-    CRUD2.prototype.handleSave = function (rows, diff, indexes, unModifiedItems, rowsOrigin, resetOnFailed) {
+    CRUD2.prototype.handleSave = function (rows, diff, indexes, unModifiedItems, rowsOrigin, options) {
         var _this = this;
         var _a = this.props, store = _a.store, quickSaveApi = _a.quickSaveApi, quickSaveItemApi = _a.quickSaveItemApi, primaryField = _a.primaryField, env = _a.env, messages = _a.messages, reload = _a.reload;
         if (Array.isArray(rows)) {
@@ -288,7 +291,7 @@ var CRUD2 = /** @class */ (function (_super) {
                 _this.getData(undefined, undefined, true, true);
             })
                 .catch(function () {
-                resetOnFailed && _this.control.reset();
+                (options === null || options === void 0 ? void 0 : options.resetOnFailed) && _this.control.reset();
             });
         }
     };
@@ -425,7 +428,7 @@ var CRUD2 = /** @class */ (function (_super) {
                 else {
                     oldUnselectedItems_1.push(item);
                 }
-                ~idx2 && oldItems_1.splice(idx2, 1);
+                !~idx && ~idx2 && oldItems_1.splice(idx2, 1);
             });
             newItems = oldItems_1;
             newUnSelectedItems = oldUnselectedItems_1;
@@ -568,7 +571,7 @@ var CRUD2 = /** @class */ (function (_super) {
             React.createElement("a", { onClick: this.clearSelection, className: cx('Crud-selectionClear') }, __('clear'))));
     };
     CRUD2.prototype.render = function () {
-        var _a = this.props, columns = _a.columns, className = _a.className, bodyClassName = _a.bodyClassName, filter = _a.filter, render = _a.render, store = _a.store, _b = _a.mode, mode = _b === void 0 ? 'table-v2' : _b; _a.syncLocation; _a.children; _a.bulkActions; var pickerMode = _a.pickerMode, selectable = _a.selectable, multiple = _a.multiple, valueField = _a.valueField, primaryField = _a.primaryField; _a.value; _a.hideQuickSaveBtn; var itemActions = _a.itemActions, cx = _a.classnames, keepItemSelectionOnPageChange = _a.keepItemSelectionOnPageChange, maxKeepItemSelectionLength = _a.maxKeepItemSelectionLength; _a.onAction; var popOverContainer = _a.popOverContainer; _a.translate; _a.onQuery; var autoGenerateFilter = _a.autoGenerateFilter; _a.onSelect; var autoFillHeight = _a.autoFillHeight, showSelection = _a.showSelection, headerToolbar = _a.headerToolbar, footerToolbar = _a.footerToolbar, rest = __rest(_a, ["columns", "className", "bodyClassName", "filter", "render", "store", "mode", "syncLocation", "children", "bulkActions", "pickerMode", "selectable", "multiple", "valueField", "primaryField", "value", "hideQuickSaveBtn", "itemActions", "classnames", "keepItemSelectionOnPageChange", "maxKeepItemSelectionLength", "onAction", "popOverContainer", "translate", "onQuery", "autoGenerateFilter", "onSelect", "autoFillHeight", "showSelection", "headerToolbar", "footerToolbar"]);
+        var _a = this.props, columns = _a.columns, className = _a.className, bodyClassName = _a.bodyClassName, filter = _a.filter, render = _a.render, store = _a.store, _b = _a.mode, mode = _b === void 0 ? 'table2' : _b; _a.syncLocation; _a.children; _a.bulkActions; var pickerMode = _a.pickerMode, selectable = _a.selectable, multiple = _a.multiple, valueField = _a.valueField, primaryField = _a.primaryField; _a.value; _a.hideQuickSaveBtn; var itemActions = _a.itemActions, cx = _a.classnames, keepItemSelectionOnPageChange = _a.keepItemSelectionOnPageChange, maxKeepItemSelectionLength = _a.maxKeepItemSelectionLength; _a.onAction; var popOverContainer = _a.popOverContainer; _a.translate; _a.onQuery; var autoGenerateFilter = _a.autoGenerateFilter; _a.onSelect; var autoFillHeight = _a.autoFillHeight, showSelection = _a.showSelection, headerToolbar = _a.headerToolbar, footerToolbar = _a.footerToolbar, rest = __rest(_a, ["columns", "className", "bodyClassName", "filter", "render", "store", "mode", "syncLocation", "children", "bulkActions", "pickerMode", "selectable", "multiple", "valueField", "primaryField", "value", "hideQuickSaveBtn", "itemActions", "classnames", "keepItemSelectionOnPageChange", "maxKeepItemSelectionLength", "onAction", "popOverContainer", "translate", "onQuery", "autoGenerateFilter", "onSelect", "autoFillHeight", "showSelection", "headerToolbar", "footerToolbar"]);
         return (React.createElement("div", { className: cx('Crud2', className, {
                 'is-loading': store.loading
             }) },

package/esm/renderers/Calendar.d.ts

@@ -23,6 +23,16 @@ export interface CalendarSchema extends BaseSchema {
      * 日程点击展示
      */
     scheduleAction?: SchemaObject;
+    /**
+     * 是否开启放大模式
+     */
+    largeMode?: boolean;
+    /**
+     * 今日激活时的自定义样式
+     */
+    todayActiveStyle?: {
+        [propName: string]: any;
+    };
 }
 export declare class CalendarRenderer extends DateControlRenderer {
     static defaultProps: {

package/esm/renderers/Calendar.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Card.d.ts

@@ -208,7 +208,10 @@ export declare class CardRenderer extends React.Component<CardProps> {
     handleAction(e: React.UIEvent<any>, action: ActionObject, ctx: object): void;
     handleCheck(e: React.MouseEvent<any>): void;
     getPopOverContainer(): Element | Text | null;
-    handleQuickChange(values: object, saveImmediately?: boolean, savePristine?: boolean, resetOnFailed?: boolean): void;
+    handleQuickChange(values: object, saveImmediately?: boolean, savePristine?: boolean, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }): void;
     renderToolbar(): JSX.Element | null;
     renderActions(): JSX.Element[] | undefined;
     renderChild(node: SchemaNode, region?: string, key?: any): React.ReactNode;

package/esm/renderers/Card.js

@@ -1,12 +1,11 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __rest, __decorate, __metadata, __spreadArray } from 'tslib';
 import React from 'react';
 import omit from 'lodash/omit';
-import merge from 'lodash/merge';
 import { filter, evalExpression, noop, padArr, isVisible, isDisabled, resolveVariable, hashCode, resolveVariableAndFilter, Renderer } from 'amis-core';
 import { Checkbox, Icon, Card } from 'amis-ui';
 import { HocQuickEdit } from './QuickEdit.js';
@@ -58,10 +57,10 @@ var CardRenderer = /** @class */ (function (_super) {
     CardRenderer.prototype.getPopOverContainer = function () {
         return findDOMNode(this);
     };
-    CardRenderer.prototype.handleQuickChange = function (values, saveImmediately, savePristine, resetOnFailed) {
+    CardRenderer.prototype.handleQuickChange = function (values, saveImmediately, savePristine, options) {
         var _a = this.props, onQuickChange = _a.onQuickChange, item = _a.item;
         onQuickChange &&
-            onQuickChange(item, values, saveImmediately, savePristine, resetOnFailed);
+            onQuickChange(item, values, saveImmediately, savePristine, options);
     };
     CardRenderer.prototype.renderToolbar = function () {
         var _a = this.props, selectable = _a.selectable, checkable = _a.checkable, selected = _a.selected, checkOnItemClick = _a.checkOnItemClick, multiple = _a.multiple, hideCheckToggler = _a.hideCheckToggler, cx = _a.classnames, toolbar = _a.toolbar, render = _a.render, dragging = _a.dragging, data = _a.data, header = _a.header;
@@ -130,7 +129,8 @@ var CardRenderer = /** @class */ (function (_super) {
         return this.renderFeild("column/".concat(index), field, index, props);
     };
     CardRenderer.prototype.renderFeild = function (region, field, key, props) {
-        var render = props.render, cx = props.classnames, itemIndex = props.itemIndex, useCardLabel = props.useCardLabel;
+        var render = props.render, cx = props.classnames, itemIndex = props.itemIndex;
+        var useCardLabel = (props === null || props === void 0 ? void 0 : props.useCardLabel) !== false;
         var data = this.props.data;
         if (!field || !isVisible(field, data)) {
             return;
@@ -138,9 +138,8 @@ var CardRenderer = /** @class */ (function (_super) {
         var $$id = field.$$id ? "".concat(field.$$id, "-field") : '';
         return (React.createElement("div", { className: cx('Card-field'), key: key },
             useCardLabel && field.label ? (React.createElement("label", { className: cx('Card-fieldLabel', field.labelClassName) }, field.label)) : null,
-            render(region, merge(__assign(__assign({}, field), { field: field, $$id: $$id, type: 'card-item-field' }), useCardLabel
-                ? { label: false, field: __assign(__assign({}, field), { label: false }) }
-                : {}), {
+            render(region, __assign(__assign({}, field), { field: field, $$id: $$id, type: 'card-item-field' }), {
+                useCardLabel: useCardLabel,
                 className: cx('Card-fieldValue', field.className),
                 rowIndex: itemIndex,
                 colIndex: key,
@@ -339,8 +338,10 @@ var CardRenderer = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     CardItemFieldRenderer.prototype.render = function () {
-        var _a = this.props; _a.type; var className = _a.className, render = _a.render, style = _a.style, Component = _a.wrapperComponent; _a.labelClassName; var value = _a.value, data = _a.data, children = _a.children, width = _a.width, innerClassName = _a.innerClassName; _a.label; var tabIndex = _a.tabIndex, onKeyUp = _a.onKeyUp, field = _a.field, rest = __rest(_a, ["type", "className", "render", "style", "wrapperComponent", "labelClassName", "value", "data", "children", "width", "innerClassName", "label", "tabIndex", "onKeyUp", "field"]);
-        var schema = __assign(__assign({}, field), { className: innerClassName, type: (field && field.type) || 'plain' });
+        var _a = this.props; _a.type; var className = _a.className, render = _a.render, style = _a.style, Component = _a.wrapperComponent; _a.labelClassName; var value = _a.value, data = _a.data, children = _a.children, width = _a.width, innerClassName = _a.innerClassName; _a.label; var tabIndex = _a.tabIndex, onKeyUp = _a.onKeyUp, field = _a.field, useCardLabel = _a.useCardLabel, rest = __rest(_a, ["type", "className", "render", "style", "wrapperComponent", "labelClassName", "value", "data", "children", "width", "innerClassName", "label", "tabIndex", "onKeyUp", "field", "useCardLabel"]);
+        var schema = __assign(__assign({}, field), { 
+            /** 针对带有label的表单项组件，默认不渲染组件自带的label，否则会出现重复的label */
+            renderLabel: !useCardLabel, className: innerClassName, type: (field && field.type) || 'plain' });
         var body = children
             ? children
             : render('field', schema, __assign(__assign({}, omit(rest, Object.keys(schema))), { value: value, data: data }));

package/esm/renderers/Card2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Cards.d.ts

@@ -109,7 +109,10 @@ export interface GridProps extends RendererProps, Omit<CardsSchema, 'className'
     draggable?: boolean;
     dragIcon?: SVGAElement;
     onSelect: (selectedItems: Array<object>, unSelectedItems: Array<object>) => void;
-    onSave?: (items: Array<object> | object, diff: Array<object> | object, rowIndexes: Array<number> | number, unModifiedItems?: Array<object>, rowOrigins?: Array<object> | object, resetOnFailed?: boolean) => void;
+    onSave?: (items: Array<object> | object, diff: Array<object> | object, rowIndexes: Array<number> | number, unModifiedItems?: Array<object>, rowOrigins?: Array<object> | object, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }) => void;
     onSaveOrder?: (moved: Array<object>, items: Array<object>) => void;
     onQuery: (values: object) => void;
 }
@@ -137,7 +140,10 @@ export default class Cards extends React.Component<GridProps, object> {
     handleSelectAll(): void;
     handleClearAll(): void;
     syncSelected(): void;
-    handleQuickChange(item: IItem, values: object, saveImmediately?: boolean | any, saveSilent?: boolean, resetOnFailed?: boolean): void;
+    handleQuickChange(item: IItem, values: object, saveImmediately?: boolean | any, savePristine?: boolean, options?: {
+        resetOnFailed?: boolean;
+        reload?: string;
+    }): void;
     handleSave(): void;
     handleSaveOrder(): void;
     reset(): void;

package/esm/renderers/Cards.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -214,15 +214,16 @@ var Cards = /** @class */ (function (_super) {
         }));
         onSelect && onSelect(selectItems, unSelectItems);
     };
-    Cards.prototype.handleQuickChange = function (item, values, saveImmediately, saveSilent, resetOnFailed) {
-        item.change(values, saveSilent);
-        if (!saveImmediately || saveSilent) {
+    Cards.prototype.handleQuickChange = function (item, values, saveImmediately, savePristine, options) {
+        item.change(values, savePristine);
+        if (!saveImmediately || savePristine) {
             return;
         }
         if (saveImmediately && saveImmediately.api) {
             this.props.onAction(null, {
                 actionType: 'ajax',
-                api: saveImmediately.api
+                api: saveImmediately.api,
+                reload: options === null || options === void 0 ? void 0 : options.reload
             }, values);
             return;
         }
@@ -230,7 +231,7 @@ var Cards = /** @class */ (function (_super) {
         if (!onSave) {
             return;
         }
-        onSave(item.data, difference(item.data, item.pristine, ['id', primaryField]), item.index, undefined, item.pristine, resetOnFailed);
+        onSave(item.data, difference(item.data, item.pristine, ['id', primaryField]), item.index, undefined, item.pristine, options);
     };
     Cards.prototype.handleSave = function () {
         var _a = this.props, store = _a.store, onSave = _a.onSave, primaryField = _a.primaryField;

package/esm/renderers/Carousel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Chart.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Code.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Collapse.d.ts

@@ -77,6 +77,7 @@ export interface CollapseProps extends RendererProps, Omit<CollapseSchema, 'type
     children?: JSX.Element | ((props?: any) => JSX.Element);
 }
 export default class Collapse extends React.Component<CollapseProps, {}> {
+    static propsList: Array<string>;
     render(): JSX.Element;
 }
 export declare class CollapseRenderer extends Collapse {

package/esm/renderers/Collapse.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 
@@ -29,6 +29,17 @@ var Collapse = /** @class */ (function (_super) {
                     ? render('body', body)
                     : null, onCollapse: onCollapse }));
     };
+    Collapse.propsList = [
+        'collapsable',
+        'collapsed',
+        'collapseTitle',
+        'showArrow',
+        'headerPosition',
+        'bodyClassName',
+        'headingClassName',
+        'collapseHeader',
+        'size'
+    ];
     return Collapse;
 }(React.Component));
 /** @class */ ((function (_super) {

package/esm/renderers/CollapseGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Color.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Container.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Copyable.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Custom.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */
 

package/esm/renderers/Date.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.1.1-beta.2
+ * amis v2.3.0
  * Copyright 2018-2022 baidu
  */