amis 2.4.0 → 2.4.1-beta.0

package/esm/renderers/Remark.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __decorate, __metadata, __rest, __assign } from 'tslib';
 import React from 'react';
-import { isMobile, autobind, themeable, Renderer, filter } from 'amis-core';
+import { generateIcon, isMobile, autobind, themeable, Renderer, filter } from 'amis-core';
 import { hasIcon, Icon, TooltipWrapper } from 'amis-ui';
 
 function filterContents(tooltip, data) {
@@ -44,7 +44,7 @@ var Remark = /** @class */ (function (_super) {
         var shapeClass = shape ? "Remark-icon--".concat(shape) : undefined;
         return (React.createElement(React.Fragment, null,
             finalLabel ? React.createElement("span", null, finalLabel) : null,
-            finalIcon ? (hasIcon(finalIcon) ? (React.createElement("span", { className: cx('Remark-icon', shapeClass) },
+            finalIcon ? (typeof finalIcon === 'object' ? (generateIcon(cx, finalIcon)) : hasIcon(finalIcon) ? (React.createElement("span", { className: cx('Remark-icon', shapeClass) },
                 React.createElement(Icon, { icon: finalIcon }))) : (React.createElement("i", { className: cx('Remark-icon', finalIcon) }))) : finalIcon === false && finalLabel ? null : (React.createElement("span", { className: cx('Remark-icon icon', shapeClass) },
                 React.createElement(Icon, { icon: "question-mark" })))));
     };

package/esm/renderers/SearchBox.js

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

package/esm/renderers/Service.js

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

package/esm/renderers/SparkLine.js

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

package/esm/renderers/Spinner.js

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

package/esm/renderers/Status.js

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

package/esm/renderers/Steps.js

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

package/esm/renderers/Table/ColumnToggler.js

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

package/esm/renderers/Table/HeadCellFilterDropdown.js

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

package/esm/renderers/Table/HeadCellSearchDropdown.js

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

package/esm/renderers/Table/ItemActionsWrapper.js

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

package/esm/renderers/Table/TableBody.js

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

package/esm/renderers/Table/TableCell.js

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

package/esm/renderers/Table/TableContent.js

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

package/esm/renderers/Table/TableRow.d.ts

@@ -3,7 +3,7 @@ import type { IColumn, IRow } from 'amis-core/lib/store/table';
 import { RendererProps } from 'amis-core';
 import { Action } from '../Action';
 interface TableRowProps extends Pick<RendererProps, 'render'> {
-    onCheck: (item: IRow) => void;
+    onCheck: (item: IRow) => Promise<void>;
     classPrefix: string;
     renderCell: (region: string, column: IColumn, item: IRow, props: any) => React.ReactNode;
     columns: Array<IColumn>;

package/esm/renderers/Table/TableRow.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -22,14 +22,14 @@ var TableRow = /** @class */ (function (_super) {
     // 定义点击一行的行为，通过 itemAction配置
     TableRow.prototype.handleItemClick = function (e) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, itemAction, onAction, item, data, dispatchEvent, rendererEvent;
+            var _a, itemAction, onAction, item, data, dispatchEvent, onCheck, rendererEvent;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         if (isClickOnInput(e)) {
                             return [2 /*return*/];
                         }
-                        _a = this.props, itemAction = _a.itemAction, onAction = _a.onAction, item = _a.item, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                        _a = this.props, itemAction = _a.itemAction, onAction = _a.onAction, item = _a.item, data = _a.data, dispatchEvent = _a.dispatchEvent, onCheck = _a.onCheck;
                         return [4 /*yield*/, dispatchEvent('rowClick', createObject(data, {
                                 rowItem: item === null || item === void 0 ? void 0 : item.data
                             }))];
@@ -43,7 +43,9 @@ var TableRow = /** @class */ (function (_super) {
                             item.toggle();
                         }
                         else {
-                            this.props.onCheck(this.props.item);
+                            if (item.checkable && item.isCheckAvaiableOnClick) {
+                                onCheck === null || onCheck === void 0 ? void 0 : onCheck(item);
+                            }
                         }
                         return [2 /*return*/];
                 }

package/esm/renderers/Table/exportExcel.js

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

package/esm/renderers/Table/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -1000,7 +1000,7 @@ var Table = /** @class */ (function (_super) {
         var _this = this;
         var _a = this.props, store = _a.store, query = _a.query, onQuery = _a.onQuery, multiple = _a.multiple, env = _a.env, render = _a.render, ns = _a.classPrefix, resizable = _a.resizable, cx = _a.classnames, autoGenerateFilter = _a.autoGenerateFilter, dispatchEvent = _a.dispatchEvent, data = _a.data;
         if (column.type === '__checkme') {
-            return (React.createElement("th", __assign({}, props, { className: cx(column.pristine.className) }), store.rows.length && multiple ? (React.createElement(Checkbox, { classPrefix: ns, partial: store.someChecked && !store.allChecked, checked: store.someChecked, disabled: store.disabledHeadCheckbox, onChange: this.handleCheckAll })) : ('\u00A0')));
+            return (React.createElement("th", __assign({}, props, { className: cx(column.pristine.className) }), store.rows.length && multiple ? (React.createElement(Checkbox, { classPrefix: ns, partial: store.someChecked && !store.allChecked, checked: store.someChecked, disabled: store.isSelectionThresholdReached, onChange: this.handleCheckAll })) : ('\u00A0')));
         }
         else if (column.type === '__dragme') {
             return React.createElement("th", __assign({}, props, { className: cx(column.pristine.className) }));

package/esm/renderers/Table2/ColumnToggler.js

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

package/esm/renderers/Table2/HeadCellSearchDropdown.js

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

package/esm/renderers/Table2/TableCell.js

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

package/esm/renderers/Table2/index.js

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

package/esm/renderers/TableView.js

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

package/esm/renderers/Tabs.js

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

package/esm/renderers/Tag.js

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

package/esm/renderers/Tasks.js

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

package/esm/renderers/Timeline.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -18,7 +18,8 @@ function TimelineCmpt(props) {
     };
     // 处理源数据
     var resolveTimelineItems = timelineItemsRow === null || timelineItemsRow === void 0 ? void 0 : timelineItemsRow.map(function (timelineItem) {
-        return __assign(__assign({}, timelineItem), { icon: resolveRender('icon', timelineItem.icon), title: resolveRender('title', timelineItem.title) });
+        var icon = timelineItem.icon, title = timelineItem.title;
+        return __assign(__assign({}, timelineItem), { icon: typeof icon === 'string' ? filter(icon, data) : icon, title: resolveRender('title', title) });
     });
     return (React.createElement(Timeline, { items: resolveTimelineItems, direction: direction, reverse: reverse, mode: mode }));
 }

package/esm/renderers/TooltipWrapper.js

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

package/esm/renderers/Tpl.js

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

package/esm/renderers/VBox.js

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

package/esm/renderers/Video.js

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

package/esm/renderers/WebComponent.js

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

package/esm/renderers/Wizard.js

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

package/esm/renderers/Words.js

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

package/esm/renderers/Wrapper.js

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

package/esm/schemaExtend.js

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

package/lib/compat.js

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

package/lib/index.js

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

package/lib/preset.js

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

package/lib/renderers/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -322,7 +322,7 @@ var ActionRenderer = /** @class */ (function (_super) {
     };
     ActionRenderer.prototype.handleAction = function (e, action) {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, env, onAction, data, ignoreConfirm, dispatchEvent, $schema, mergedData, hasOnEvent, confirmed, rendererEvent, rendererEvent;
+            var _a, env, onAction, data, ignoreConfirm, dispatchEvent, $schema, mergedData, hasOnEvent, confirmText, confirmed, rendererEvent, rendererEvent;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -332,8 +332,12 @@ var ActionRenderer = /** @class */ (function (_super) {
                             mergedData = amisCore.createObject(data, action.args);
                         }
                         hasOnEvent = $schema.onEvent && Object.keys($schema.onEvent).length;
-                        if (!((!ignoreConfirm || hasOnEvent) && action.confirmText && env.confirm)) return [3 /*break*/, 5];
-                        return [4 /*yield*/, env.confirm(amisCore.filter(action.confirmText, mergedData))];
+                        confirmText = '';
+                        if (!((!ignoreConfirm || hasOnEvent) &&
+                            action.confirmText &&
+                            env.confirm &&
+                            (confirmText = amisCore.filter(action.confirmText, mergedData)))) return [3 /*break*/, 5];
+                        return [4 /*yield*/, env.confirm(confirmText)];
                     case 1:
                         confirmed = _b.sent();
                         if (!confirmed) return [3 /*break*/, 3];

package/lib/renderers/Alert.js

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

package/lib/renderers/AnchorNav.js

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

package/lib/renderers/App.js

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

package/lib/renderers/Audio.js

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

package/lib/renderers/Avatar.js

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

package/lib/renderers/BarCode.js

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

package/lib/renderers/Breadcrumb.js

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

package/lib/renderers/ButtonGroup.js

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

package/lib/renderers/CRUD.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.4.1-beta.0
  * Copyright 2018-2022 baidu
  */
 
@@ -293,10 +293,12 @@ var CRUD = /** @class */ (function (_super) {
             }
         };
         // Action如果配了事件动作也会处理二次确认，这里需要处理一下忽略
-        if (!action.ignoreConfirm && action.confirmText && env.confirm) {
-            env
-                .confirm(amisCore.filter(action.confirmText, ctx))
-                .then(function (confirmed) { return confirmed && fn(); });
+        var confirmText = '';
+        if (!action.ignoreConfirm &&
+            action.confirmText &&
+            env.confirm &&
+            (confirmText = amisCore.filter(action.confirmText, ctx))) {
+            env.confirm(confirmText).then(function (confirmed) { return confirmed && fn(); });
         }
         else {
             fn();
@@ -354,9 +356,11 @@ var CRUD = /** @class */ (function (_super) {
         var _this = this;
         var action = this.props.store.selectedAction;
         var env = this.props.env;
-        if (action.confirmText) {
+        var confirmText = '';
+        if (action.confirmText &&
+            (confirmText = amisCore.filter(action.confirmText, this.props.store.mergedData))) {
             return env
-                .confirm(action.confirmText)
+                .confirm(confirmText)
                 .then(function (confirmed) {
                 return confirmed &&
                     _this.handleBulkAction(selectedItems, unSelectedItems, e, action);

package/lib/renderers/CRUD2.js

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

package/lib/renderers/Calendar.js

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

package/lib/renderers/Card.js

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

package/lib/renderers/Card2.js

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

package/lib/renderers/Cards.js

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

package/lib/renderers/Carousel.js

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

package/lib/renderers/Chart.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { RendererProps } from 'amis-core';
+import { ActionObject, RendererProps } from 'amis-core';
 import { IServiceStore } from 'amis-core';
 import { IScopedContext } from 'amis-core';
 import { BaseSchema, SchemaApi, SchemaExpression, SchemaFunction, SchemaName, SchemaTokenizeableString } from '../Schema';
@@ -76,6 +76,18 @@ export interface ChartSchema extends BaseSchema {
      * 不可见的时候隐藏
      */
     unMountOnHidden?: boolean;
+    /**
+     * 获取 geo json 文件的地址
+     */
+    mapURL?: string;
+    /**
+     * 地图名称
+     */
+    mapName?: string;
+    /**
+     * 加载百度地图
+     */
+    loadBaiduMap?: boolean;
 }
 export interface ChartProps extends RendererProps, Omit<ChartSchema, 'type' | 'className'> {
     chartRef?: (echart: any) => void;
@@ -100,8 +112,10 @@ export declare class Chart extends React.Component<ChartProps> {
     componentDidMount(): void;
     componentDidUpdate(prevProps: ChartProps): void;
     componentWillUnmount(): void;
-    handleClick(ctx: object): void;
+    handleClick(ctx: object): Promise<void>;
+    dispatchEvent(ctx: any): void;
     refFn(ref: any): void;
+    doAction(action: ActionObject, data: object, throwErrors?: boolean): any;
     reload(subpath?: string, query?: any, ctx?: any, silent?: boolean, replace?: boolean): void;
     receive(data: object, subPath?: string, replace?: boolean): void;
     renderChart(config?: object, data?: any): void;