amis 2.0.0 → 2.0.1

package/lib/renderers/Table/index.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 
@@ -38,6 +38,7 @@ var Table = /** @class */ (function (_super) {
     function Table(props, context) {
         var _this = _super.call(this, props) || this;
         _this.lastScrollLeft = -1;
+        _this.lastScrollTop = 0;
         _this.totalWidth = 0;
         _this.totalHeight = 0;
         _this.outterWidth = 0;
@@ -170,6 +171,8 @@ var Table = /** @class */ (function (_super) {
         var tableContent = table.querySelector(".".concat(ns, "Table-content"));
         var tableContentWrap = table.querySelector(".".concat(ns, "Table-contentWrap"));
         var footToolbar = table.querySelector(".".concat(ns, "Table-footToolbar"));
+        var leftFixedColumns = table.querySelector(".".concat(ns, "Table-fixedLeft"));
+        var rightFixedColumns = table.querySelector(".".concat(ns, "Table-fixedRight"));
         if (!tableContent) {
             return;
         }
@@ -196,11 +199,21 @@ var Table = /** @class */ (function (_super) {
                 allParentPaddingButtom + paddingButtom + borderBottom;
             parentNode = parentNode.parentElement;
         }
-        tableContent.style.height = "".concat(viewportHeight -
+        var tableContentHeight = "".concat(viewportHeight -
             tableContentTop -
             tableContentWrapMarginButtom -
             footToolbarHeight -
             allParentPaddingButtom, "px");
+        tableContent.style.height = tableContentHeight;
+        /**autoFillHeight开启后固定列会溢出Table高度，需要同步一下 */
+        if (leftFixedColumns) {
+            leftFixedColumns.style.height = tableContentHeight;
+            leftFixedColumns.style.overflowY = 'auto';
+        }
+        if (rightFixedColumns) {
+            rightFixedColumns.style.height = tableContentHeight;
+            rightFixedColumns.style.overflowY = 'auto';
+        }
     };
     Table.prototype.componentDidUpdate = function (prevProps) {
         var props = this.props;
@@ -555,34 +568,55 @@ var Table = /** @class */ (function (_super) {
     Table.prototype.handleOutterScroll = function () {
         var outter = this.table.parentNode;
         var scrollLeft = outter.scrollLeft;
-        if (scrollLeft === this.lastScrollLeft) {
-            return;
-        }
-        this.lastScrollLeft = scrollLeft;
-        var leading = scrollLeft === 0;
-        var trailing = Math.ceil(scrollLeft) + this.outterWidth >= this.totalWidth;
-        // console.log(scrollLeft, store.outterWidth, store.totalWidth, (scrollLeft + store.outterWidth) === store.totalWidth);
-        // store.setLeading(leading);
-        // store.setTrailing(trailing);
         var ns = this.props.classPrefix;
         var dom = ReactDOM.findDOMNode(this);
         var fixedLeft = dom.querySelectorAll(".".concat(ns, "Table-fixedLeft"));
-        if (fixedLeft && fixedLeft.length) {
-            for (var i = 0, len = fixedLeft.length; i < len; i++) {
-                var node = fixedLeft[i];
-                leading ? node.classList.remove('in') : node.classList.add('in');
+        var fixedRight = dom.querySelectorAll(".".concat(ns, "Table-fixedRight"));
+        if (scrollLeft !== this.lastScrollLeft) {
+            this.lastScrollLeft = scrollLeft;
+            var leading = scrollLeft === 0;
+            var trailing = Math.ceil(scrollLeft) + this.outterWidth >= this.totalWidth;
+            // console.log(scrollLeft, store.outterWidth, store.totalWidth, (scrollLeft + store.outterWidth) === store.totalWidth);
+            // store.setLeading(leading);
+            // store.setTrailing(trailing);
+            if (fixedLeft && fixedLeft.length) {
+                for (var i = 0, len = fixedLeft.length; i < len; i++) {
+                    var node = fixedLeft[i];
+                    leading ? node.classList.remove('in') : node.classList.add('in');
+                }
+            }
+            if (fixedRight && fixedRight.length) {
+                for (var i = 0, len = fixedRight.length; i < len; i++) {
+                    var node = fixedRight[i];
+                    trailing ? node.classList.remove('in') : node.classList.add('in');
+                }
+            }
+            var table = this.affixedTable;
+            if (table) {
+                table.style.cssText += "transform: translateX(-".concat(scrollLeft, "px)");
             }
         }
-        var fixedRight = dom.querySelectorAll(".".concat(ns, "Table-fixedRight"));
-        if (fixedRight && fixedRight.length) {
-            for (var i = 0, len = fixedRight.length; i < len; i++) {
-                var node = fixedRight[i];
-                trailing ? node.classList.remove('in') : node.classList.add('in');
+        /* 同步固定列内容的垂直滚动 */
+        if (outter.scrollTop !== this.lastScrollTop) {
+            this.lastScrollTop = outter.scrollTop;
+            if (fixedLeft && fixedLeft.length) {
+                forEach__default["default"](fixedLeft, function (node) { return node.scrollTo({ top: outter.scrollTop }); });
+            }
+            if (fixedRight && fixedRight.length) {
+                forEach__default["default"](fixedRight, function (node) { return node.scrollTo({ top: outter.scrollTop }); });
             }
         }
-        var table = this.affixedTable;
-        if (table) {
-            table.style.cssText += "transform: translateX(-".concat(scrollLeft, "px)");
+    };
+    Table.prototype.handleFixedColumnsScroll = function (event) {
+        /** table内容区当前Top */
+        var currentScrollTop = this.lastScrollTop;
+        /** 固定列的新Top */
+        var fixedScrollTop = event.currentTarget.scrollTop;
+        if (currentScrollTop !== fixedScrollTop) {
+            this.lastScrollTop = fixedScrollTop;
+            var tableContentDom = this.table
+                .parentNode;
+            tableContentDom.scrollTo({ top: fixedScrollTop });
         }
     };
     Table.prototype.tableRef = function (ref) {
@@ -1039,7 +1073,7 @@ var Table = /** @class */ (function (_super) {
         }
         if (column.type === '__checkme') {
             return (React__default["default"].createElement("td", { key: props.key, className: cx(column.pristine.className) },
-                React__default["default"].createElement(amisUi.Checkbox, { classPrefix: ns, type: multiple ? 'checkbox' : 'radio', checked: item.checked, disabled: item.checkdisable, onChange: checkOnItemClick ? amisCore.noop : this.handleCheck.bind(this, item) })));
+                React__default["default"].createElement(amisUi.Checkbox, { classPrefix: ns, type: multiple ? 'checkbox' : 'radio', checked: item.checked, disabled: item.checkdisable || item.checkable, onChange: checkOnItemClick ? amisCore.noop : this.handleCheck.bind(this, item) })));
         }
         else if (column.type === '__dragme') {
             return (React__default["default"].createElement("td", { key: props.key, className: cx(column.pristine.className, {
@@ -1373,10 +1407,14 @@ var Table = /** @class */ (function (_super) {
             header,
             heading,
             React__default["default"].createElement("div", { className: cx('Table-contentWrap'), onMouseLeave: this.handleMouseLeave },
-                React__default["default"].createElement("div", { className: cx('Table-fixedLeft'), onMouseMove: this.handleMouseMove }, affixColumns !== false && store.leftFixedColumns.length
+                React__default["default"].createElement("div", { className: cx('Table-fixedLeft', {
+                        'Table-fixedLeft--autoFillHeight': autoFillHeight
+                    }), onMouseMove: this.handleMouseMove, onScroll: this.handleFixedColumnsScroll }, affixColumns !== false && store.leftFixedColumns.length
                     ? this.renderFixedColumns(store.rows, store.leftFixedColumns, false, tableClassName)
                     : null),
-                React__default["default"].createElement("div", { className: cx('Table-fixedRight'), onMouseMove: this.handleMouseMove }, affixColumns !== false && store.rightFixedColumns.length
+                React__default["default"].createElement("div", { className: cx('Table-fixedRight', {
+                        'Table-fixedLeft--autoFillHeight': autoFillHeight
+                    }), onMouseMove: this.handleMouseMove, onScroll: this.handleFixedColumnsScroll }, affixColumns !== false && store.rightFixedColumns.length
                     ? this.renderFixedColumns(store.rows, store.rightFixedColumns, false, tableClassName)
                     : null),
                 this.renderTableContent()),
@@ -1451,6 +1489,12 @@ var Table = /** @class */ (function (_super) {
         canAccessSuperData: false,
         resizable: true
     };
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object]),
+        tslib.__metadata("design:returntype", void 0)
+    ], Table.prototype, "handleFixedColumnsScroll", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),

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

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

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

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

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

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

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

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

package/lib/renderers/TableView.js

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

package/lib/renderers/Tabs.js

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

package/lib/renderers/Tag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 
@@ -22,7 +22,7 @@ var TagField = /** @class */ (function (_super) {
         return _super !== null && _super.apply(this, arguments) || this;
     }
     TagField.prototype.render = function () {
-        var _a = this.props, label = _a.label, icon = _a.icon, displayMode = _a.displayMode, color = _a.color, className = _a.className, data = _a.data, _b = _a.style, style = _b === void 0 ? {} : _b;
+        var _a = this.props, label = _a.label, icon = _a.icon, displayMode = _a.displayMode, color = _a.color, className = _a.className, closable = _a.closable, data = _a.data, _b = _a.style, style = _b === void 0 ? {} : _b;
         label =
             amisCore.getPropValue(this.props) ||
                 (label ? amisCore.resolveVariableAndFilter(label, data, '| raw') : null);
@@ -35,7 +35,7 @@ var TagField = /** @class */ (function (_super) {
         if (amisCore.isPureVariable(color)) {
             color = amisCore.resolveVariableAndFilter(color, data);
         }
-        return (React__default["default"].createElement(amisUi.Tag, { className: className, displayMode: displayMode, color: color, icon: icon, style: style }, label));
+        return (React__default["default"].createElement(amisUi.Tag, { className: className, displayMode: displayMode, color: color, icon: icon, closable: closable, style: style }, label));
     };
     TagField.defaultProps = {
         displayMode: 'normal'

package/lib/renderers/Tasks.js

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

package/lib/renderers/Timeline.js

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

package/lib/renderers/TooltipWrapper.js

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

package/lib/renderers/Tpl.js

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

package/lib/renderers/VBox.js

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

package/lib/renderers/Video.js

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

package/lib/renderers/WebComponent.js

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

package/lib/renderers/Wizard.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 
@@ -482,7 +482,9 @@ var Wizard = /** @class */ (function (_super) {
                                     var dispatcher;
                                     return tslib.__generator(this, function (_a) {
                                         switch (_a.label) {
-                                            case 0: return [4 /*yield*/, this.dispatchEvent('submitFail', amisCore.createObject(this.props.data, { error: error }))];
+                                            case 0:
+                                                store.markSaving(false);
+                                                return [4 /*yield*/, this.dispatchEvent('submitFail', amisCore.createObject(this.props.data, { error: error }))];
                                             case 1:
                                                 dispatcher = _a.sent();
                                                 return [2 /*return*/, {

package/lib/renderers/Wrapper.js

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

package/lib/schemaExtend.js

@@ -1,13 +1,18 @@
 /**
- * amis v2.0.0
+ * amis v2.0.1
  * Copyright 2018-2022 baidu
  */
 
 'use strict';
 
 var tslib = require('tslib');
+var isEqual = require('lodash/isEqual');
 var amisCore = require('amis-core');
 
+function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
+
+var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
+
 // input-kv 实际上是 combo 的一种扩展
 amisCore.addSchemaFilter(function (schema, renderer, props) {
     var _a, _b, _c;
@@ -72,3 +77,74 @@ amisCore.addSchemaFilter(function (schema, renderer, props) {
     }
     return schema;
 });
+/**
+ * 之前 input-kv 的 value 值不支持对象或数组
+ * 很多属性是给单个值设置的，比如 valuePlaceholder 导致
+ * 耦合在一起会导致配置项混乱，所以新增了这个组件专门支持 value 是对象或数组的场景
+ */
+amisCore.addSchemaFilter(function (schema, renderer, props) {
+    if (schema && schema.type === 'input-kvs') {
+        var keyItem = schema.keyItem || {};
+        var valueItems = schema.valueItems || [];
+        // value 直接放在 key 下的情况
+        var flatValue_1 = false;
+        if (valueItems.length == 1) {
+            if (valueItems[0].name === '_value') {
+                flatValue_1 = true;
+            }
+        }
+        var newSchema = tslib.__assign(tslib.__assign({ draggable: true, multiple: true, multiLine: true }, schema), { pipeIn: function (data) {
+                if (!amisCore.isObject(data)) {
+                    return [];
+                }
+                var arr = [];
+                Object.keys(data).forEach(function (key) {
+                    var value = data[key];
+                    if (flatValue_1) {
+                        arr.push({
+                            _key: key || '',
+                            _value: value
+                        });
+                    }
+                    else if (typeof value === 'object') {
+                        arr.push(tslib.__assign(tslib.__assign({}, value), { _key: key || '' }));
+                    }
+                });
+                return arr;
+            }, pipeOut: function (value) {
+                if (!Array.isArray(value)) {
+                    return value;
+                }
+                var obj = {};
+                value.forEach(function (item) {
+                    var _key = item._key, rest = tslib.__rest(item, ["_key"]);
+                    _key = _key !== null && _key !== void 0 ? _key : '';
+                    if (flatValue_1) {
+                        if (schema.valueIsArray) {
+                            obj[_key] = item['_value'] || [];
+                        }
+                        else {
+                            obj[_key] = item['_value'] || {};
+                        }
+                        // 数组的时候初始化会生成 [{}]，还不确定是哪生成的，先修正为 []
+                        if (isEqual__default["default"](obj[_key], [{}])) {
+                            obj[_key] = [];
+                        }
+                    }
+                    else {
+                        if (schema.valueIsArray) {
+                            obj[_key] = rest || [];
+                        }
+                        else {
+                            obj[_key] = rest || {};
+                        }
+                    }
+                });
+                return obj;
+            }, items: tslib.__spreadArray([
+                tslib.__assign({ type: 'input-text', unique: true, name: '_key', required: true, validateOnChange: true }, keyItem)
+            ], valueItems, true) });
+        return newSchema;
+    }
+    return schema;
+});