amis 2.0.0 → 2.1.0

package/esm/renderers/Property.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __decorate } from 'tslib';
 import React from 'react';
-import { resolveVariableAndFilter, visibilityFilter, buildStyle, Renderer } from 'amis-core';
+import { visibilityFilter, buildStyle, Renderer } from 'amis-core';
 
 /**
  * @file 表格的方式显示只读信息，比如产品详情
@@ -20,9 +20,7 @@ var Property = /** @class */ (function (_super) {
      */
     Property.prototype.prepareRows = function () {
         var _a = this.props, _b = _a.column, column = _b === void 0 ? 3 : _b, items = _a.items, source = _a.source, data = _a.data;
-        var propertyItems = (items
-            ? items
-            : resolveVariableAndFilter(source, data, '| raw')) || [];
+        var propertyItems = items ? items : source || [];
         var rows = [];
         var row = [];
         var columnLeft = column;
@@ -86,7 +84,8 @@ var Property = /** @class */ (function (_super) {
     }
     PropertyRenderer = __decorate([
         Renderer({
-            type: 'property'
+            type: 'property',
+            autoVar: true
         })
     ], PropertyRenderer);
     return PropertyRenderer;

package/esm/renderers/QRCode.js

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

package/esm/renderers/QuickEdit.js

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

package/esm/renderers/Remark.js

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

package/esm/renderers/SearchBox.js

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

package/esm/renderers/Service.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -411,6 +411,7 @@ var Service = /** @class */ (function (_super) {
         return _super.prototype.receive.call(this, values);
     };
     ServiceRenderer.prototype.componentWillUnmount = function () {
+        _super.prototype.componentWillUnmount.call(this);
         var scoped = this.context;
         scoped.unRegisterComponent(this);
     };

package/esm/renderers/SparkLine.js

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

package/esm/renderers/Spinner.js

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

package/esm/renderers/Status.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -51,8 +51,8 @@ var StatusField = /** @class */ (function (_super) {
         placeholder: '-',
         map: {
             0: 'svg-fail',
-            1: 'svg-success',
-            success: 'svg-success',
+            1: 'svg-check-circle',
+            success: 'svg-check-circle',
             pending: 'rolling',
             fail: 'svg-fail',
             queue: 'svg-warning',

package/esm/renderers/Steps.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import { RendererProps } from 'amis-core';
 import { BaseSchema, SchemaCollection } from '../Schema';
 import { StepStatus } from 'amis-ui';
+import type { SchemaExpression } from 'amis-core';
 export declare type StepSchema = {
     /**
      * 标题
@@ -44,7 +45,7 @@ export interface StepsSchema extends BaseSchema {
     name?: string;
     status?: StepStatus | {
         [propName: string]: StepStatus;
-    };
+    } | SchemaExpression;
     /**
      * 展示模式
      */

package/esm/renderers/Steps.js

@@ -1,21 +1,26 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __rest, __assign, __decorate } from 'tslib';
 import React from 'react';
-import { Renderer, resolveVariableAndFilter, getPropValue, resolveVariable, filter } from 'amis-core';
+import { Renderer, resolveVariableAndFilter, isPureVariable, getPropValue, resolveVariable, filter } from 'amis-core';
 import { withRemoteConfig, StepStatus, Steps } from 'amis-ui';
 
 function StepsCmpt(props) {
     var _a;
     var className = props.className, steps = props.steps, status = props.status, mode = props.mode, labelPlacement = props.labelPlacement, progressDot = props.progressDot, data = props.data, source = props.source, config = props.config, render = props.render, useMobileUI = props.useMobileUI;
     var sourceResult = resolveVariableAndFilter(source, data, '| raw');
+    /** 步骤数据源 */
     var stepsRow = (Array.isArray(sourceResult) ? sourceResult : undefined) ||
         config ||
         steps ||
         [];
+    /** 状态数据源 */
+    var statusValue = isPureVariable(status)
+        ? resolveVariableAndFilter(status, data, '| raw')
+        : status;
     var resolveRender = function (val) {
         return typeof val === 'string' ? filter(val, data) : val && render('inner', val);
     };
@@ -31,19 +36,18 @@ function StepsCmpt(props) {
     });
     function getStepStatus(step, i) {
         var stepStatus;
-        if (typeof status === 'string') {
+        if (typeof statusValue === 'string') {
             if (i === currentValue) {
-                var resolveStatus = resolveVariable(status, data);
-                stepStatus = resolveStatus || status || StepStatus.process;
+                stepStatus = statusValue || status || StepStatus.process;
             }
         }
-        else if (typeof status === 'object') {
+        else if (typeof statusValue === 'object') {
             var key = step.value;
-            key && status[key] && (stepStatus = status[key]);
+            key && statusValue[key] && (stepStatus = statusValue[key]);
         }
         return stepStatus;
     }
-    return (React.createElement(Steps, { current: currentValue, steps: resolveSteps, className: className, status: status, mode: mode, progressDot: progressDot, labelPlacement: labelPlacement, useMobileUI: useMobileUI }));
+    return (React.createElement(Steps, { current: currentValue, steps: resolveSteps, className: className, status: statusValue, mode: mode, progressDot: progressDot, labelPlacement: labelPlacement, useMobileUI: useMobileUI }));
 }
 var StepsWithRemoteConfig = withRemoteConfig({
     adaptor: function (data) { return data.steps || data; }

package/esm/renderers/Table/ColumnToggler.js

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

package/esm/renderers/Table/HeadCellFilterDropdown.js

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

package/esm/renderers/Table/HeadCellSearchDropdown.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -177,7 +177,7 @@ var HeadCellSearchDropDown = /** @class */ (function (_super) {
         var _a = this.props, render = _a.render, name = _a.name, data = _a.data, searchable = _a.searchable, store = _a.store, orderBy = _a.orderBy, popOverContainer = _a.popOverContainer, ns = _a.classPrefix, cx = _a.classnames;
         var formSchema = this.buildSchema();
         var isActive = this.isActive();
-        return (React.createElement("span", { className: cx("".concat(ns, "TableCell-searchBtn"), isActive ? 'is-active' : '') },
+        return (React.createElement("span", { className: cx("".concat(ns, "TableCell-searchBtn"), isActive ? 'is-active' : '', this.state.isOpened ? 'is-opened' : '') },
             React.createElement("span", { onClick: this.open },
                 React.createElement(Icon, { icon: "search", className: "icon" })),
             this.state.isOpened ? (React.createElement(Overlay, { container: popOverContainer || (function () { return findDOMNode(_this); }), placement: "left-bottom-left-top right-bottom-right-top", target: popOverContainer ? function () { return findDOMNode(_this).parentNode; } : null, show: true },

package/esm/renderers/Table/ItemActionsWrapper.js

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

package/esm/renderers/Table/TableBody.js

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

package/esm/renderers/Table/TableCell.js

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

package/esm/renderers/Table/TableContent.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -41,7 +41,14 @@ var TableContent = /** @class */ (function (_super) {
             store.hoverRow ? this.renderItemActions() : null,
             React.createElement("table", { ref: tableRef, className: tableClassName },
                 React.createElement("thead", null,
-                    columnsGroup.length ? (React.createElement("tr", null, columnsGroup.map(function (item, index) { return (React.createElement("th", { key: index, "data-index": item.index, colSpan: item.colSpan, rowSpan: item.rowSpan }, item.label ? render('tpl', item.label) : null)); }))) : null,
+                    columnsGroup.length ? (React.createElement("tr", null, columnsGroup.map(function (item, index) {
+                        return item.has[0].type === '__checkme' ? (renderHeadCell(item.has[0], {
+                            'data-index': item.has[0].index,
+                            'key': item.has[0].index,
+                            'colSpan': item.colSpan,
+                            'rowSpan': item.rowSpan
+                        })) : (React.createElement("th", { key: index, "data-index": item.index, colSpan: item.colSpan, rowSpan: item.rowSpan }, item.label ? render('tpl', item.label) : null));
+                    }))) : null,
                     React.createElement("tr", { className: hideHeader ? 'fake-hide' : '' }, columns.map(function (column) {
                         var _a;
                         return ((_a = columnsGroup.find(function (group) { return ~group.has.indexOf(column); })) === null || _a === void 0 ? void 0 : _a.rowSpan) === 2

package/esm/renderers/Table/TableRow.js

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

package/esm/renderers/Table/exportExcel.js

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

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

@@ -277,6 +277,7 @@ export default class Table extends React.Component<TableProps, object> {
     affixedTable?: HTMLTableElement;
     parentNode?: HTMLElement | Window;
     lastScrollLeft: number;
+    lastScrollTop: number;
     totalWidth: number;
     totalHeight: number;
     outterWidth: number;
@@ -316,9 +317,13 @@ export default class Table extends React.Component<TableProps, object> {
     reset(): void;
     bulkUpdate(value: any, items: Array<object>): void;
     getSelected(): any[];
+    /**
+     * 滚动重新定位Table-fixedTop
+     */
     affixDetect(): void;
     updateTableInfo(): void;
     handleOutterScroll(): void;
+    handleFixedColumnsScroll(event: React.UIEvent<any>): void;
     tableRef(ref: HTMLTableElement): void;
     dragTipRef(ref: any): void;
     affixedTableRef(ref: HTMLTableElement): void;