amis 2.0.0-rc.9 → 2.0.2

package/lib/renderers/Calendar.js

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

package/lib/renderers/Card.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
-import { SchemaNode, ActionObject, PlainObject } from 'amis-core';
+import { SchemaNode, Schema, ActionObject, PlainObject } from 'amis-core';
 import { SchemaQuickEdit } from './QuickEdit';
 import { SchemaPopOver } from './PopOver';
 import { TableCell } from './Table';
@@ -158,6 +158,10 @@ export interface CardSchema extends BaseSchema {
      * 次要说明
      */
     secondary?: SchemaTpl;
+    /**
+     * 卡片内容区的表单项label是否使用Card内部的样式，默认为true
+     */
+    useCardLabel?: boolean;
 }
 export interface CardProps extends RendererProps, Omit<CardSchema, 'className'> {
     onCheck: (item: IItem) => void;
@@ -195,6 +199,7 @@ export declare class CardRenderer extends React.Component<CardProps> {
         checkable: boolean;
         selected: boolean;
         hideCheckToggler: boolean;
+        useCardLabel: boolean;
     };
     static propsList: Array<string>;
     constructor(props: CardProps);
@@ -208,7 +213,7 @@ export declare class CardRenderer extends React.Component<CardProps> {
     renderActions(): JSX.Element[] | undefined;
     renderChild(node: SchemaNode, region?: string, key?: any): React.ReactNode;
     itemRender(field: any, index: number, props: any): JSX.Element | undefined;
-    renderFeild(region: string, field: any, key: any, props: any): JSX.Element | undefined;
+    renderFeild(region: string, field: Schema, key: any, props: any): JSX.Element | undefined;
     renderBody(): React.ReactNode;
     rederTitle(): JSX.Element | undefined;
     renderSubTitle(): JSX.Element | undefined;

package/lib/renderers/Card.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -9,13 +9,14 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var tslib = require('tslib');
 var React = require('react');
+var omit = require('lodash/omit');
+var merge = require('lodash/merge');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 var QuickEdit = require('./QuickEdit.js');
 var PopOver = require('./PopOver.js');
 require('./Table/index.js');
 var Copyable = require('./Copyable.js');
-var omit = require('lodash/omit');
 var ReactDOM = require('react-dom');
 var TableCell = require('./Table/TableCell.js');
 
@@ -23,6 +24,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
+var merge__default = /*#__PURE__*/_interopDefaultLegacy(merge);
 
 var CardRenderer = /** @class */ (function (_super) {
     tslib.__extends(CardRenderer, _super);
@@ -138,15 +140,17 @@ 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;
+        var render = props.render, cx = props.classnames, itemIndex = props.itemIndex, useCardLabel = props.useCardLabel;
         var data = this.props.data;
-        if (!amisCore.isVisible(field, data)) {
+        if (!field || !amisCore.isVisible(field, data)) {
             return;
         }
         var $$id = field.$$id ? "".concat(field.$$id, "-field") : '';
         return (React__default["default"].createElement("div", { className: cx('Card-field'), key: key },
-            field && field.label ? (React__default["default"].createElement("label", { className: cx('Card-fieldLabel', field.labelClassName) }, field.label)) : null,
-            render(region, tslib.__assign(tslib.__assign({}, field), { field: field, $$id: $$id, type: 'card-item-field' }), {
+            useCardLabel && field.label ? (React__default["default"].createElement("label", { className: cx('Card-fieldLabel', field.labelClassName) }, field.label)) : null,
+            render(region, merge__default["default"](tslib.__assign(tslib.__assign({}, field), { field: field, $$id: $$id, type: 'card-item-field' }), useCardLabel
+                ? { label: false, field: tslib.__assign(tslib.__assign({}, field), { label: false }) }
+                : {}), {
                 className: cx('Card-fieldValue', field.className),
                 rowIndex: itemIndex,
                 colIndex: key,
@@ -315,7 +319,8 @@ var CardRenderer = /** @class */ (function (_super) {
         selectable: false,
         checkable: true,
         selected: false,
-        hideCheckToggler: false
+        hideCheckToggler: false,
+        useCardLabel: true
     };
     CardRenderer.propsList = [
         'avatarClassName',

package/lib/renderers/Card2.d.ts

@@ -41,7 +41,7 @@ export interface Card2Props extends RendererProps, Omit<Card2Schema, 'type' | 'c
     /**
      * 选择事件
      */
-    onCheck: (checked: boolean, data: any) => void;
+    onCheck: () => void;
     /**
      * 数据
      */

package/lib/renderers/Card2.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -30,8 +30,8 @@ var Card2 = /** @class */ (function (_super) {
         // TODO 触发事件动作
     };
     Card2.prototype.handleCheck = function () {
-        var _a = this.props, item = _a.item, selected = _a.selected;
-        this.props.onCheck && this.props.onCheck(!selected, item);
+        var _a, _b;
+        (_b = (_a = this.props).onCheck) === null || _b === void 0 ? void 0 : _b.call(_a);
     };
     Card2.prototype.renderCheckbox = function () {
         var _a = this.props, selectable = _a.selectable, cx = _a.classnames, multiple = _a.multiple, disabled = _a.disabled, selected = _a.selected, hideCheckToggler = _a.hideCheckToggler, checkOnItemClick = _a.checkOnItemClick, checkboxClassname = _a.checkboxClassname;

package/lib/renderers/Cards.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import { RendererProps } from 'amis-core';
 import { SchemaNode, ActionObject } from 'amis-core';
 import { IListStore } from 'amis-core';
+import { Action } from '../types';
 import Sortable from 'sortablejs';
 import { BaseSchema, SchemaClassName, SchemaCollection, SchemaExpression, SchemaTpl, SchemaTokenizeableString } from '../Schema';
 import { CardSchema } from './Card';
@@ -128,9 +129,12 @@ export default class Cards extends React.Component<GridProps, object> {
     bodyRef(ref: HTMLDivElement): void;
     itemsRef(ref: HTMLDivElement): void;
     affixDetect(): void;
+    doAction(action: Action, data: object, throwErrors?: boolean): void;
     handleAction(e: React.UIEvent<any>, action: ActionObject, ctx: object): void;
     handleCheck(item: IItem): void;
     handleCheckAll(): void;
+    handleSelectAll(): void;
+    handleClearAll(): void;
     syncSelected(): void;
     handleQuickChange(item: IItem, values: object, saveImmediately?: boolean | any, saveSilent?: boolean, resetOnFailed?: boolean): void;
     handleSave(): void;

package/lib/renderers/Cards.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -171,6 +171,24 @@ var Cards = /** @class */ (function (_super) {
         affixed ? afixedDom.classList.add('in') : afixedDom.classList.remove('in');
         // store.markHeaderAffix(clip.top < offsetY && (clip.top + clip.height - 40) > offsetY);
     };
+    Cards.prototype.doAction = function (action, data, throwErrors) {
+        if (action.actionType) {
+            switch (action.actionType) {
+                case 'toggleSelectAll':
+                    this.handleCheckAll();
+                    break;
+                case 'selectAll':
+                    this.handleSelectAll();
+                    break;
+                case 'clearAll':
+                    this.handleClearAll();
+                    break;
+                // case 'dragStart':
+                //   this.initDragging();
+                // case 'dragStop':
+            }
+        }
+    };
     Cards.prototype.handleAction = function (e, action, ctx) {
         var onAction = this.props.onAction;
         // 需要支持特殊事件吗？
@@ -185,10 +203,25 @@ var Cards = /** @class */ (function (_super) {
         store.toggleAll();
         this.syncSelected();
     };
+    Cards.prototype.handleSelectAll = function () {
+        var store = this.props.store;
+        store.selectAll();
+        this.syncSelected();
+    };
+    Cards.prototype.handleClearAll = function () {
+        var store = this.props.store;
+        store.clearAll();
+        this.syncSelected();
+    };
     Cards.prototype.syncSelected = function () {
-        var _a = this.props, store = _a.store, onSelect = _a.onSelect;
-        onSelect &&
-            onSelect(store.selectedItems.map(function (item) { return item.data; }), store.unSelectedItems.map(function (item) { return item.data; }));
+        var _a = this.props, store = _a.store, onSelect = _a.onSelect, dispatchEvent = _a.dispatchEvent;
+        var selectItems = store.selectedItems.map(function (item) { return item.data; });
+        var unSelectItems = store.unSelectedItems.map(function (item) { return item.data; });
+        dispatchEvent('selected', amisCore.createObject(store.data, {
+            selectItems: selectItems,
+            unSelectItems: unSelectItems
+        }));
+        onSelect && onSelect(selectItems, unSelectItems);
     };
     Cards.prototype.handleQuickChange = function (item, values, saveImmediately, saveSilent, resetOnFailed) {
         item.change(values, saveSilent);
@@ -253,6 +286,8 @@ var Cards = /** @class */ (function (_super) {
         this.dragTip = ref;
     };
     Cards.prototype.initDragging = function () {
+        if (this.sortable)
+            return;
         var store = this.props.store;
         var dom = ReactDOM.findDOMNode(this);
         var ns = this.props.classPrefix;
@@ -400,6 +435,7 @@ var Cards = /** @class */ (function (_super) {
     };
     // editor中重写，请勿更改前两个参数
     Cards.prototype.renderCard = function (index, card, item, itemClassName) {
+        var _this = this;
         var _a = this.props, render = _a.render, cx = _a.classnames, store = _a.store, multiple = _a.multiple, checkOnItemClick = _a.checkOnItemClick, hideCheckToggler = _a.hideCheckToggler;
         var cardProps = {
             className: cx((card && card.className) || '', {
@@ -414,7 +450,6 @@ var Cards = /** @class */ (function (_super) {
             checkable: item.checkable,
             draggable: item.draggable,
             selected: item.checked,
-            onSelect: item.toggle,
             dragging: store.dragging,
             data: item.locals,
             onAction: this.handleAction,
@@ -423,7 +458,9 @@ var Cards = /** @class */ (function (_super) {
         };
         // card2属性与card有区别
         if ((card === null || card === void 0 ? void 0 : card.type) === 'card2') {
-            cardProps = tslib.__assign(tslib.__assign({}, cardProps), { item: item.locals, onCheck: item.toggle });
+            cardProps = tslib.__assign(tslib.__assign({}, cardProps), { item: item.locals, onCheck: function () {
+                    _this.handleCheck(item);
+                } });
         }
         return (React__default["default"].createElement("div", { key: item.index, className: cx(itemClassName) }, render("card/".concat(index), tslib.__assign({ 
             // @ts-ignore
@@ -500,6 +537,12 @@ var Cards = /** @class */ (function (_super) {
         itemsClassName: '',
         checkAll: true
     };
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object, Object, Boolean]),
+        tslib.__metadata("design:returntype", void 0)
+    ], Cards.prototype, "doAction", null);
     return Cards;
 }(React__default["default"].Component));
 /** @class */ ((function (_super) {

package/lib/renderers/Carousel.js

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

package/lib/renderers/Chart.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -24,11 +24,27 @@ var EVAL_CACHE = {};
 /**
  * ECharts 中有些配置项可以写函数，但 JSON 中无法支持，为了实现这个功能，需要将看起来像函数的字符串转成函数类型
  * 目前 ECharts 中可能有函数的配置项有如下：interval、formatter、color、min、max、labelFormatter、pageFormatter、optionToContent、contentToOption、animationDelay、animationDurationUpdate、animationDelayUpdate、animationDuration、position、sort
- * 其中用得最多的是 formatter、sort，所以目前先只支持它们
  * @param config ECharts 配置
  */
 function recoverFunctionType(config) {
-    ['formatter', 'sort', 'renderItem'].forEach(function (key) {
+    [
+        'interval',
+        'formatter',
+        'color',
+        'min',
+        'max',
+        'labelFormatter',
+        'pageFormatter',
+        'optionToContent',
+        'contentToOption',
+        'animationDelay',
+        'animationDurationUpdate',
+        'animationDelayUpdate',
+        'animationDuration',
+        'position',
+        'sort',
+        'renderItem'
+    ].forEach(function (key) {
         var objects = amisCore.findObjectsWithKey(config, key);
         for (var _i = 0, objects_1 = objects; _i < objects_1.length; _i++) {
             var object = objects_1[_i];

package/lib/renderers/Code.js

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

package/lib/renderers/Collapse.js

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

package/lib/renderers/CollapseGroup.js

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

package/lib/renderers/Color.js

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

package/lib/renderers/Container.js

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

package/lib/renderers/Copyable.js

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

package/lib/renderers/Custom.js

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

package/lib/renderers/Date.js

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