amis 2.4.0 → 2.5.0-rc.0

package/lib/renderers/Table/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
@@ -25,6 +25,7 @@ var TableBody = require('./TableBody.js');
 var mobxStateTree = require('mobx-state-tree');
 var ColumnToggler = require('./ColumnToggler.js');
 var exportExcel = require('./exportExcel.js');
+var intersection = require('lodash/intersection');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -34,6 +35,7 @@ var forEach__default = /*#__PURE__*/_interopDefaultLegacy(forEach);
 var debouce__default = /*#__PURE__*/_interopDefaultLegacy(debouce);
 var Sortable__default = /*#__PURE__*/_interopDefaultLegacy(Sortable);
 var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
+var intersection__default = /*#__PURE__*/_interopDefaultLegacy(intersection);
 
 var Table = /** @class */ (function (_super) {
     tslib.__extends(Table, _super);
@@ -980,14 +982,28 @@ var Table = /** @class */ (function (_super) {
         });
     };
     Table.prototype.renderHeading = function () {
-        var _a = this.props, title = _a.title, store = _a.store, hideQuickSaveBtn = _a.hideQuickSaveBtn, data = _a.data, cx = _a.classnames, saveImmediately = _a.saveImmediately, headingClassName = _a.headingClassName, quickSaveApi = _a.quickSaveApi, __ = _a.translate;
+        var _a = this.props, title = _a.title, store = _a.store, hideQuickSaveBtn = _a.hideQuickSaveBtn, data = _a.data, cx = _a.classnames, saveImmediately = _a.saveImmediately, headingClassName = _a.headingClassName, quickSaveApi = _a.quickSaveApi, __ = _a.translate, columns = _a.columns;
+        // 当被修改列的 column 开启 quickEdit.saveImmediately 时，不展示提交、放弃按钮
+        var isModifiedColumnSaveImmediately = false;
+        if (store.modifiedRows.length === 1) {
+            var saveImmediatelyColumnNames = (columns === null || columns === void 0 ? void 0 : columns.map(function (column) { var _a; return ((_a = column === null || column === void 0 ? void 0 : column.quickEdit) === null || _a === void 0 ? void 0 : _a.saveImmediately) ? column === null || column === void 0 ? void 0 : column.name : ''; }).filter(function (a) { return a; })) || [];
+            var item = store.modifiedRows[0];
+            var diff = amisCore.difference(item.data, item.pristine);
+            if (intersection__default["default"](saveImmediatelyColumnNames, Object.keys(diff)).length) {
+                isModifiedColumnSaveImmediately = true;
+            }
+        }
         if (title ||
             (quickSaveApi &&
                 !saveImmediately &&
+                !isModifiedColumnSaveImmediately &&
                 store.modified &&
                 !hideQuickSaveBtn) ||
             store.moved) {
-            return (React__default["default"].createElement("div", { className: cx('Table-heading', headingClassName), key: "heading" }, !saveImmediately && store.modified && !hideQuickSaveBtn ? (React__default["default"].createElement("span", null,
+            return (React__default["default"].createElement("div", { className: cx('Table-heading', headingClassName), key: "heading" }, !saveImmediately &&
+                store.modified &&
+                !hideQuickSaveBtn &&
+                !isModifiedColumnSaveImmediately ? (React__default["default"].createElement("span", null,
                 __('Table.modified', {
                     modified: store.modified
                 }),
@@ -1013,7 +1029,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__default["default"].createElement("th", tslib.__assign({}, props, { className: cx(column.pristine.className) }), store.rows.length && multiple ? (React__default["default"].createElement(amisUi.Checkbox, { classPrefix: ns, partial: store.someChecked && !store.allChecked, checked: store.someChecked, disabled: store.disabledHeadCheckbox, onChange: this.handleCheckAll })) : ('\u00A0')));
+            return (React__default["default"].createElement("th", tslib.__assign({}, props, { className: cx(column.pristine.className) }), store.rows.length && multiple ? (React__default["default"].createElement(amisUi.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__default["default"].createElement("th", tslib.__assign({}, props, { className: cx(column.pristine.className) }));
@@ -1415,6 +1431,12 @@ var Table = /** @class */ (function (_super) {
         // 不过目前看来只有这样写它才会重新更新视图
         store.rows.length;
         return (React__default["default"].createElement(React__default["default"].Fragment, null,
+            TableContent.TableContent.renderItemActions({
+                store: store,
+                classnames: cx,
+                render: render,
+                itemActions: itemActions
+            }),
             React__default["default"].createElement(TableContent.TableContent, { tableClassName: cx({
                     'Table-table--checkOnItemClick': checkOnItemClick,
                     'Table-table--withCombine': store.combineNum > 0

package/lib/renderers/Table2/ColumnToggler.js

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

package/lib/renderers/Table2/HeadCellSearchDropdown.js

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

package/lib/renderers/Table2/TableCell.js

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

package/lib/renderers/Table2/index.d.ts

@@ -267,8 +267,8 @@ export interface TableSchema2 extends BaseSchema {
      */
     keepItemSelectionOnPageChange?: boolean;
 }
-export declare type Table2RendererEvent = 'selected' | 'columnSort' | 'columnFilter' | 'columnSearch' | 'columnToggled' | 'dragOver';
-export declare type Table2RendererAction = 'selectAll' | 'clearAll' | 'select' | 'expand';
+export type Table2RendererEvent = 'selected' | 'columnSort' | 'columnFilter' | 'columnSearch' | 'columnToggled' | 'dragOver';
+export type Table2RendererAction = 'selectAll' | 'clearAll' | 'select' | 'expand';
 export interface Table2Props extends RendererProps {
     title?: string;
     columns: Array<ColumnSchema | ColumnProps>;

package/lib/renderers/Table2/index.js

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

package/lib/renderers/TableView.d.ts

@@ -4,7 +4,7 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
 import { BaseSchema, SchemaObject } from '../Schema';
-export declare type TdObject = {
+export type TdObject = {
     /**
      * 单元格背景色
      */
@@ -53,7 +53,7 @@ export declare type TdObject = {
 /**
  * 行设置
  */
-export declare type TrObject = {
+export type TrObject = {
     /**
      * 行背景色
      */
@@ -71,7 +71,7 @@ export declare type TrObject = {
 /**
  * 列设置
  */
-export declare type ColObject = {
+export type ColObject = {
     span?: number;
     style?: Object;
 };

package/lib/renderers/TableView.js

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

package/lib/renderers/Tabs.d.ts

@@ -175,8 +175,8 @@ export interface TabsState {
     localTabs: Array<TabSource>;
     isFromSource: boolean;
 }
-export declare type TabsRendererEvent = 'change';
-export declare type TabsRendererAction = 'changeActiveKey';
+export type TabsRendererEvent = 'change';
+export type TabsRendererAction = 'changeActiveKey';
 export default class Tabs extends React.Component<TabsProps, TabsState> {
     static defaultProps: Partial<TabsProps>;
     renderTab?: (tab: TabSchema, props: TabsProps, index: number) => JSX.Element;

package/lib/renderers/Tabs.js

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

package/lib/renderers/Tag.js

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

package/lib/renderers/Tasks.js

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

package/lib/renderers/Timeline.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import { RendererProps } from 'amis-core';
-import { BaseSchema, SchemaApi, SchemaCollection, SchemaTokenizeableString } from '../Schema';
+import type { BaseSchema, SchemaApi, SchemaCollection, SchemaTokenizeableString } from '../Schema';
+import type { IconCheckedSchema } from 'amis-core';
 export interface TimelineItemSchema extends Omit<BaseSchema, 'type'> {
     /**
      * 时间点
@@ -29,7 +30,11 @@ export interface TimelineItemSchema extends Omit<BaseSchema, 'type'> {
     /**
      * 图标
      */
-    icon?: SchemaCollection;
+    icon?: string | IconCheckedSchema;
+    /**
+     * 图标的CSS类名
+     */
+    iconClassName?: string;
 }
 export interface TimelineSchema extends BaseSchema {
     /**

package/lib/renderers/Timeline.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
@@ -26,7 +26,10 @@ function TimelineCmpt(props) {
     };
     // 处理源数据
     var resolveTimelineItems = timelineItemsRow === null || timelineItemsRow === void 0 ? void 0 : timelineItemsRow.map(function (timelineItem) {
-        return tslib.__assign(tslib.__assign({}, timelineItem), { icon: resolveRender('icon', timelineItem.icon), title: resolveRender('title', timelineItem.title) });
+        var icon = timelineItem.icon, iconClassName = timelineItem.iconClassName, title = timelineItem.title;
+        return tslib.__assign(tslib.__assign({}, timelineItem), { iconClassName: iconClassName, icon: amisCore.isPureVariable(icon)
+                ? amisCore.resolveVariableAndFilter(icon, data, '| raw')
+                : icon, title: resolveRender('title', title) });
     });
     return (React__default["default"].createElement(amisUi.Timeline, { items: resolveTimelineItems, direction: direction, reverse: reverse, mode: mode }));
 }

package/lib/renderers/TooltipWrapper.js

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

package/lib/renderers/Tpl.d.ts

@@ -42,6 +42,10 @@ export declare class Tpl extends React.Component<TplProps, object> {
     dom: any;
     constructor(props: TplProps);
     getContent(): string;
+    /**
+     * 过滤掉HTML标签, 仅提取文本内容, 用于HTML标签的title属性
+     */
+    getTitle(content: string): string;
     render(): JSX.Element;
 }
 export declare class TplRenderer extends Tpl {

package/lib/renderers/Tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.4.0
+ * amis v2.5.0-rc.0
  * Copyright 2018-2022 baidu
  */
 
@@ -44,14 +44,28 @@ var Tpl = /** @class */ (function (_super) {
                     : JSON.stringify(value);
         }
     };
+    /**
+     * 过滤掉HTML标签, 仅提取文本内容, 用于HTML标签的title属性
+     */
+    Tpl.prototype.getTitle = function (content) {
+        var _a;
+        var showNativeTitle = this.props.showNativeTitle;
+        if (!showNativeTitle) {
+            return '';
+        }
+        var title = typeof content === 'string' ? content : '';
+        var tempDom = new DOMParser().parseFromString(this.getContent(), 'text/html');
+        if ((_a = tempDom === null || tempDom === void 0 ? void 0 : tempDom.body) === null || _a === void 0 ? void 0 : _a.textContent) {
+            title = tempDom.body.textContent;
+        }
+        return title;
+    };
     Tpl.prototype.render = function () {
         var _a = this.props, className = _a.className, wrapperComponent = _a.wrapperComponent, inline = _a.inline, cx = _a.classnames, style = _a.style, showNativeTitle = _a.showNativeTitle, data = _a.data, env = _a.env;
         var Component = wrapperComponent || (inline ? 'span' : 'div');
-        var content = env.filterHtml(this.getContent());
-        return (React__default["default"].createElement(Component, tslib.__assign({ className: cx('TplField', className), style: amisCore.buildStyle(style, data) }, (showNativeTitle
-            ? { title: typeof content === 'string' ? content : '' }
-            : {})),
-            React__default["default"].createElement("span", { dangerouslySetInnerHTML: { __html: content } })));
+        var content = this.getContent();
+        return (React__default["default"].createElement(Component, tslib.__assign({ className: cx('TplField', className), style: amisCore.buildStyle(style, data) }, (showNativeTitle ? { title: this.getTitle(content) } : {})),
+            React__default["default"].createElement("span", { dangerouslySetInnerHTML: { __html: env.filterHtml(content) } })));
     };
     Tpl.defaultProps = {
         inline: true,

package/lib/renderers/VBox.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import { RendererProps } from 'amis-core';
 import { Schema } from 'amis-core';
 import { BaseSchema, SchemaObject } from '../Schema';
-export declare type HboxRow = SchemaObject & {
+export type HboxRow = SchemaObject & {
     rowClassName?: string;
     cellClassName?: string;
 };

package/lib/renderers/VBox.js

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

package/lib/renderers/Video.js

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

package/lib/renderers/WebComponent.js

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

package/lib/renderers/Wizard.d.ts

@@ -5,7 +5,7 @@ import { IServiceStore } from 'amis-core';
 import { ActionObject } from 'amis-core';
 import { BaseSchema, FormSchema, SchemaApi, SchemaClassName, SchemaExpression, SchemaName, SchemaReload } from '../Schema';
 import { ActionSchema } from './Action';
-export declare type WizardStepSchema = Omit<FormSchema, 'type'> & {
+export type WizardStepSchema = Omit<FormSchema, 'type'> & {
     /**
      * 当前步骤用来保存数据的 api。
      */

package/lib/renderers/Wizard.js

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

package/lib/renderers/Words.d.ts

@@ -5,7 +5,7 @@ import React from 'react';
 import { RendererProps } from 'amis-core';
 import { BaseSchema, SchemaObject } from '../Schema';
 import { TagSchema } from './Tag';
-declare type Words = string | string[];
+type Words = string | string[];
 /**
  * Words
  */

package/lib/renderers/Words.js

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

package/lib/renderers/Wrapper.js

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

package/lib/schemaExtend.js

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