amis 2.0.0-rc.14 → 2.0.0-rc.15

package/lib/renderers/Table/ItemActionsWrapper.js

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

package/lib/renderers/Table/TableBody.js

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

package/lib/renderers/Table/TableCell.js

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

package/lib/renderers/Table/TableContent.js

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

package/lib/renderers/Table/TableRow.js

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

package/lib/renderers/Table/exportExcel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.14
+ * amis v2.0.0-rc.15
  * Copyright 2018-2022 baidu
  */
 
@@ -149,7 +149,7 @@ function exportExcel(ExcelJS, props, toolbar) {
                         }
                     }
                     type = column.type || 'plain';
-                    if (!(type === 'image' && value)) return [3 /*break*/, 11];
+                    if (!((type === 'image' || type === 'static-image') && value)) return [3 /*break*/, 11];
                     _h.label = 6;
                 case 6:
                     _h.trys.push([6, 9, , 10]);
@@ -207,7 +207,7 @@ function exportExcel(ExcelJS, props, toolbar) {
                     return [3 /*break*/, 10];
                 case 10: return [3 /*break*/, 17];
                 case 11:
-                    if (!(type == 'link')) return [3 /*break*/, 12];
+                    if (!(type == 'link' || type === 'static-link')) return [3 /*break*/, 12];
                     href = column.pristine.href;
                     linkURL = (typeof href === 'string' && href
                         ? amisCore.filter(href, rowData, '| raw')
@@ -223,7 +223,7 @@ function exportExcel(ExcelJS, props, toolbar) {
                     };
                     return [3 /*break*/, 17];
                 case 12:
-                    if (!(type === 'mapping')) return [3 /*break*/, 16];
+                    if (!(type === 'mapping' || type === 'static-mapping')) return [3 /*break*/, 16];
                     map = column.pristine.map;
                     source = column.pristine.source;
                     if (!source) return [3 /*break*/, 15];
@@ -257,7 +257,7 @@ function exportExcel(ExcelJS, props, toolbar) {
                     }
                     return [3 /*break*/, 17];
                 case 16:
-                    if (type === 'date') {
+                    if (type === 'date' || type === 'static-date') {
                         viewValue = void 0;
                         _e = column.pristine, fromNow = _e.fromNow, _f = _e.format, format = _f === void 0 ? 'YYYY-MM-DD' : _f, _g = _e.valueFormat, valueFormat = _g === void 0 ? 'X' : _g;
                         if (value) {

package/lib/renderers/Table/index.js

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

package/lib/renderers/Table-v2/ColumnToggler.d.ts

@@ -1,3 +1,19 @@
-import ColumnToggler from '../Table/ColumnToggler';
-export declare class ColumnTogglerRenderer extends ColumnToggler {
+import React from 'react';
+import { ColumnTogglerProps } from '../Table/ColumnToggler';
+import { BaseSchema } from '../../Schema';
+export interface ColumnTogglerSchema extends BaseSchema {
+    label?: string;
+    tooltip?: string;
+    size?: string;
+    icon?: string;
+    draggable?: boolean;
+    align?: string;
+}
+export interface ColumnTogglerRendererProps extends ColumnTogglerProps {
+    toggleAllColumns?: Function;
+    toggleToggle?: Function;
+    cols: Array<any>;
+}
+export declare class ColumnTogglerRenderer extends React.Component<ColumnTogglerRendererProps> {
+    render(): JSX.Element | null;
 }

package/lib/renderers/Table-v2/ColumnToggler.js

@@ -1,19 +1,89 @@
 /**
- * amis v2.0.0-rc.14
+ * amis v2.0.0-rc.15
  * Copyright 2018-2022 baidu
  */
 
 'use strict';
 
 var tslib = require('tslib');
+var React = require('react');
 var amisCore = require('amis-core');
+var amisUi = require('amis-ui');
 var ColumnToggler = require('../Table/ColumnToggler.js');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
+
 /** @class */ ((function (_super) {
     tslib.__extends(ColumnTogglerRenderer, _super);
     function ColumnTogglerRenderer() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
+    ColumnTogglerRenderer.prototype.render = function () {
+        var _this = this;
+        var _a = this.props; _a.className; _a.store; var render = _a.render, ns = _a.classPrefix, cx = _a.classnames, tooltip = _a.tooltip, align = _a.align, cols = _a.cols, toggleAllColumns = _a.toggleAllColumns, toggleToggle = _a.toggleToggle, data = _a.data, rest = tslib.__rest(_a, ["className", "store", "render", "classPrefix", "classnames", "tooltip", "align", "cols", "toggleAllColumns", "toggleToggle", "data"]);
+        var __ = rest.translate;
+        var env = rest.env;
+        if (!cols) {
+            return null;
+        }
+        var toggableColumns = cols.filter(function (item) { return amisCore.isVisible(item.pristine || item, data) && item.toggable !== false; });
+        var activeToggaleColumns = toggableColumns.filter(function (item) { return item.toggled !== false; });
+        return (React__default["default"].createElement(ColumnToggler["default"], tslib.__assign({}, rest, { render: render, tooltip: tooltip || __('Table.columnsVisibility'), tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined, isActived: cols.findIndex(function (column) { return !column.toggled; }) !== -1, align: align !== null && align !== void 0 ? align : 'right', classnames: cx, classPrefix: ns, key: "columns-toggable", columns: cols, activeToggaleColumns: activeToggaleColumns, data: data }),
+            (toggableColumns === null || toggableColumns === void 0 ? void 0 : toggableColumns.length) ? (React__default["default"].createElement("li", { className: cx('ColumnToggler-menuItem'), key: 'selectAll', onClick: function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+                    var _a, data, dispatchEvent, allToggled, rendererEvent;
+                    return tslib.__generator(this, function (_b) {
+                        switch (_b.label) {
+                            case 0:
+                                _a = this.props, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                                allToggled = !((activeToggaleColumns === null || activeToggaleColumns === void 0 ? void 0 : activeToggaleColumns.length) ===
+                                    (toggableColumns === null || toggableColumns === void 0 ? void 0 : toggableColumns.length));
+                                return [4 /*yield*/, dispatchEvent('columnToggled', amisCore.createObject(data, {
+                                        columns: allToggled
+                                            ? toggableColumns === null || toggableColumns === void 0 ? void 0 : toggableColumns.map(function (column) { return column; })
+                                            : []
+                                    }))];
+                            case 1:
+                                rendererEvent = _b.sent();
+                                if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                                    return [2 /*return*/];
+                                }
+                                toggleAllColumns && toggleAllColumns(allToggled);
+                                return [2 /*return*/];
+                        }
+                    });
+                }); } },
+                React__default["default"].createElement(amisUi.Checkbox, { size: "sm", classPrefix: ns, key: "checkall", checked: !!(activeToggaleColumns === null || activeToggaleColumns === void 0 ? void 0 : activeToggaleColumns.length), partial: !!((activeToggaleColumns === null || activeToggaleColumns === void 0 ? void 0 : activeToggaleColumns.length) &&
+                        (activeToggaleColumns === null || activeToggaleColumns === void 0 ? void 0 : activeToggaleColumns.length) !== (toggableColumns === null || toggableColumns === void 0 ? void 0 : toggableColumns.length)) }, __('Checkboxes.selectAll')))) : null, toggableColumns === null || toggableColumns === void 0 ? void 0 :
+            toggableColumns.map(function (column, index) { return (React__default["default"].createElement("li", { className: cx('ColumnToggler-menuItem'), key: 'item' + (column.index || index), onClick: function () { return tslib.__awaiter(_this, void 0, void 0, function () {
+                    var _a, data, dispatchEvent, columns, rendererEvent;
+                    return tslib.__generator(this, function (_b) {
+                        switch (_b.label) {
+                            case 0:
+                                _a = this.props, data = _a.data, dispatchEvent = _a.dispatchEvent;
+                                columns = activeToggaleColumns.map(function (item) { return item; });
+                                if (!column.toggled) {
+                                    columns.push(column);
+                                }
+                                else {
+                                    columns = columns.filter(function (c) { return c.name !== column.name; });
+                                }
+                                return [4 /*yield*/, dispatchEvent('columnToggled', amisCore.createObject(data, {
+                                        columns: columns
+                                    }))];
+                            case 1:
+                                rendererEvent = _b.sent();
+                                if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
+                                    return [2 /*return*/];
+                                }
+                                toggleToggle && toggleToggle(!column.toggled, index);
+                                return [2 /*return*/];
+                        }
+                    });
+                }); } },
+                React__default["default"].createElement(amisUi.Checkbox, { size: "sm", classPrefix: ns, checked: column.toggled !== false }, column.title ? render('tpl', column.title) : null))); })));
+    };
     ColumnTogglerRenderer = tslib.__decorate([
         amisCore.Renderer({
             type: 'column-toggler',
@@ -21,4 +91,4 @@ var ColumnToggler = require('../Table/ColumnToggler.js');
         })
     ], ColumnTogglerRenderer);
     return ColumnTogglerRenderer;
-})(ColumnToggler["default"]));
+})(React__default["default"].Component));

package/lib/renderers/Table-v2/HeadCellSearchDropdown.js

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

package/lib/renderers/Table-v2/TableCell.js

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

package/lib/renderers/Table-v2/index.d.ts

@@ -4,10 +4,11 @@ import { RendererProps } from 'amis-core';
 import { ActionObject } from 'amis-core';
 import { BaseSchema, SchemaObject, SchemaTokenizeableString } from '../../Schema';
 import { BadgeObject } from 'amis-ui';
-import { ITableStoreV2, IColumnV2, IRowV2 } from 'amis-core';
+import { ITableStoreV2, IRowV2 } from 'amis-core';
 import './TableCell';
 import './ColumnToggler';
 import type { SortProps } from 'amis-ui/lib/components/table';
+import { Action } from '../../types';
 /**
  * Table 表格v2渲染器。
  * 文档：https://baidu.gitee.io/amis/docs/components/table-v2
@@ -174,7 +175,7 @@ export interface TableSchemaV2 extends BaseSchema {
     /**
      * 表格可自定义列
      */
-    columnsTogglable?: boolean;
+    columnsTogglable?: boolean | string | SchemaObject;
     /**
      * 表格列配置
      */
@@ -262,9 +263,7 @@ export default class TableV2 extends React.Component<TableV2Props, object> {
     reloadTarget(target: string, data: any): void;
     handleSave(rows: Array<object> | object, diff: Array<object> | object, indexes: Array<string>, unModifiedItems?: Array<any>, rowsOrigin?: Array<object> | object, resetOnFailed?: boolean): void;
     handleQuickChange(item: IRowV2, values: object, saveImmediately?: boolean | any, savePristine?: boolean, resetOnFailed?: boolean): void;
-    handleColumnToggle(columns: Array<IColumnV2>): Promise<void>;
-    renderColumnsToggler(): JSX.Element | null;
-    handleAction(e: React.UIEvent<any>, action: ActionObject, ctx: object): void;
+    handleAction(e: React.UIEvent<any>, action: Action, ctx: object): void;
     renderActions(region: string): JSX.Element | null;
     handleSelected(selectedRows: Array<any>, selectedRowKeys: Array<string | number>, unSelectedRows: Array<string | number>): Promise<any>;
     handleSort(payload: SortProps): Promise<any>;

package/lib/renderers/Table-v2/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.14
+ * amis v2.0.0-rc.15
  * Copyright 2018-2022 baidu
  */
 
@@ -32,12 +32,6 @@ var TableV2 = /** @class */ (function (_super) {
         _this.renderedToolbars = [];
         var scoped = context;
         scoped.registerComponent(_this);
-        _this.handleColumnToggle = _this.handleColumnToggle.bind(_this);
-        _this.getPopOverContainer = _this.getPopOverContainer.bind(_this);
-        _this.handleAction = _this.handleAction.bind(_this);
-        _this.handleQuickChange = _this.handleQuickChange.bind(_this);
-        _this.handleSave = _this.handleSave.bind(_this);
-        _this.controlRef = _this.controlRef.bind(_this);
         var store = props.store, columnsTogglable = props.columnsTogglable, columns = props.columns;
         store.update({ columnsTogglable: columnsTogglable, columns: columns });
         TableV2.syncRows(store, props, undefined) && _this.syncSelected();
@@ -417,46 +411,6 @@ var TableV2 = /** @class */ (function (_super) {
             ? onSave(item.data, amisCore.difference(item.data, item.pristine, ['id', primaryField]), item.path, undefined, item.pristine, resetOnFailed)
             : this.handleSave(quickSaveItemApi ? item.data : [item.data], amisCore.difference(item.data, item.pristine, ['id', primaryField]), [item.path], undefined, item.pristine, resetOnFailed);
     };
-    TableV2.prototype.handleColumnToggle = function (columns) {
-        return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, dispatchEvent, data, store, rendererEvent;
-            return tslib.__generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        _a = this.props, dispatchEvent = _a.dispatchEvent, data = _a.data, store = _a.store;
-                        return [4 /*yield*/, dispatchEvent('columnToggled', amisCore.createObject(data, {
-                                columns: columns
-                            }))];
-                    case 1:
-                        rendererEvent = _b.sent();
-                        if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
-                            return [2 /*return*/];
-                        }
-                        store.update({ columns: columns });
-                        return [2 /*return*/];
-                }
-            });
-        });
-    };
-    TableV2.prototype.renderColumnsToggler = function () {
-        var _a = this.props; _a.className; var store = _a.store, render = _a.render, ns = _a.classPrefix, cx = _a.classnames, rest = tslib.__rest(_a, ["className", "store", "render", "classPrefix", "classnames"]);
-        rest.translate;
-        var env = rest.env;
-        if (!store.toggable) {
-            return null;
-        }
-        var children = store.toggableColumns.map(function (column, index) { return (React__default["default"].createElement("li", { className: cx('ColumnToggler-menuItem'), key: 'toggable-li-' + index, onClick: column.toggleToggle },
-            React__default["default"].createElement(amisUi.Checkbox, { key: 'toggable-select' + index, size: "sm", classPrefix: ns, checked: column.toggled }, column.title ? render('tpl', column.title) : null))); });
-        return render('column-toggler', {
-            type: 'column-toggler'
-        }, {
-            isActived: store.hasColumnHidden(),
-            columns: store.columnsData,
-            onColumnToggle: this.handleColumnToggle,
-            children: children,
-            tooltipContainer: env && env.getModalContainer ? env.getModalContainer : undefined
-        });
-    };
     TableV2.prototype.handleAction = function (e, action, ctx) {
         var onAction = this.props.onAction;
         // todo
@@ -464,14 +418,26 @@ var TableV2 = /** @class */ (function (_super) {
     };
     TableV2.prototype.renderActions = function (region) {
         var _this = this;
-        var _a = this.props, actions = _a.actions, render = _a.render, store = _a.store, cx = _a.classnames, data = _a.data;
+        var _a = this.props, actions = _a.actions, render = _a.render, store = _a.store, cx = _a.classnames, data = _a.data, columnsTogglable = _a.columnsTogglable, $path = _a.$path;
+        // 如果table是在crud里面，自定义显示列配置在grid里，这里就不需要渲染了
+        var isInCrud = /(?:\/|^)crud2\//.test($path);
         actions = Array.isArray(actions) ? actions.concat() : [];
-        if (store.toggable &&
+        // 现在默认从crud里传进来的columnsTogglable是boolean类型
+        // table单独配置的是SchemaNode类型
+        if (!isInCrud &&
+            store.toggable &&
             region === 'header' &&
             !~this.renderedToolbars.indexOf('columns-toggler')) {
             actions.push({
                 type: 'button',
-                children: this.renderColumnsToggler()
+                children: render('column-toggler', tslib.__assign(tslib.__assign({}, (amisCore.isObject(columnsTogglable) ? columnsTogglable : {})), { type: 'column-toggler' }), {
+                    cols: store.columnsData.map(function (item) { return item.pristine; }),
+                    toggleAllColumns: function () { return store.toggleAllColumns(); },
+                    toggleToggle: function (toggled, index) {
+                        var column = store.columnsData[index];
+                        column.toggleToggle();
+                    }
+                })
             });
         }
         return Array.isArray(actions) && actions.length ? (React__default["default"].createElement("div", { className: cx('Table-toolbar') }, actions.map(function (action, key) {
@@ -762,6 +728,37 @@ var TableV2 = /** @class */ (function (_super) {
             this.renderTable()));
     };
     TableV2.contextType = amisCore.ScopedContext;
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], TableV2.prototype, "controlRef", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", []),
+        tslib.__metadata("design:returntype", void 0)
+    ], TableV2.prototype, "getPopOverContainer", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object, Object, Array,
+            Array, Object, Boolean]),
+        tslib.__metadata("design:returntype", void 0)
+    ], TableV2.prototype, "handleSave", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object, Object, Object, Boolean, Boolean]),
+        tslib.__metadata("design:returntype", void 0)
+    ], TableV2.prototype, "handleQuickChange", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object, Object, Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], TableV2.prototype, "handleAction", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),

package/lib/renderers/TableView.js

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

package/lib/renderers/Tabs.js

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

package/lib/renderers/Tag.js

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

package/lib/renderers/Tasks.js

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

package/lib/renderers/Timeline.js

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

package/lib/renderers/TooltipWrapper.js

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

package/lib/renderers/Tpl.js

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

package/lib/renderers/VBox.js

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

package/lib/renderers/Video.js

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

package/lib/renderers/WebComponent.js

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

package/lib/renderers/Wizard.js

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

package/lib/renderers/Wrapper.js

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

package/lib/schemaExtend.js

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