amis 2.0.0-rc.9 → 2.0.2

package/lib/renderers/TableView.js

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

package/lib/renderers/Tabs.js

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

package/lib/renderers/Tag.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * 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-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 

package/lib/renderers/Timeline.js

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

package/lib/renderers/TooltipWrapper.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -30,7 +30,7 @@ var TooltipWrapper = /** @class */ (function (_super) {
             }), style: amisCore.buildStyle(style, data) }, render('body', body)));
     };
     TooltipWrapper.prototype.render = function () {
-        var _a = this.props, ns = _a.classPrefix, cx = _a.classnames, tooltipClassName = _a.tooltipClassName, tooltipTheme = _a.tooltipTheme, container = _a.container, placement = _a.placement, rootClose = _a.rootClose, tooltipStyle = _a.tooltipStyle, title = _a.title, content = _a.content, tooltip = _a.tooltip, mouseEnterDelay = _a.mouseEnterDelay, mouseLeaveDelay = _a.mouseLeaveDelay, trigger = _a.trigger, offset = _a.offset, showArrow = _a.showArrow, disabled = _a.disabled, enterable = _a.enterable, data = _a.data;
+        var _a = this.props, ns = _a.classPrefix, cx = _a.classnames, tooltipClassName = _a.tooltipClassName, tooltipTheme = _a.tooltipTheme, container = _a.container, placement = _a.placement, rootClose = _a.rootClose, tooltipStyle = _a.tooltipStyle, title = _a.title, content = _a.content, tooltip = _a.tooltip, mouseEnterDelay = _a.mouseEnterDelay, mouseLeaveDelay = _a.mouseLeaveDelay, trigger = _a.trigger, offset = _a.offset, showArrow = _a.showArrow, disabled = _a.disabled, enterable = _a.enterable, data = _a.data, env = _a.env;
         var tooltipObj = {
             title: amisCore.filter(title, data),
             content: amisCore.filter(content || tooltip, data),
@@ -38,7 +38,7 @@ var TooltipWrapper = /** @class */ (function (_super) {
             placement: placement,
             trigger: trigger,
             rootClose: rootClose,
-            container: container,
+            container: container !== undefined ? container : (env && env.getModalContainer ? env.getModalContainer : undefined),
             tooltipTheme: tooltipTheme,
             tooltipClassName: tooltipClassName,
             mouseEnterDelay: mouseEnterDelay,

package/lib/renderers/Tpl.js

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

package/lib/renderers/VBox.js

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

package/lib/renderers/Video.js

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

package/lib/renderers/WebComponent.js

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

package/lib/renderers/Wizard.d.ts

@@ -158,7 +158,7 @@ export default class Wizard extends React.Component<WizardProps, WizardState> {
     handleInit(values: any): void;
     handleReset(values: any): void;
     finalSubmit(values?: object, action?: ActionObject): Promise<void>;
-    handleSubmit(values: object, action: ActionObject): Promise<boolean>;
+    handleSubmit(values: object, action: ActionObject): boolean;
     handleDialogConfirm(values: object[], action: ActionObject, targets: Array<any>): void;
     handleDialogClose(confirmed?: boolean): void;
     renderSteps(): JSX.Element;

package/lib/renderers/Wizard.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * 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*/, {
@@ -546,82 +548,77 @@ var Wizard = /** @class */ (function (_super) {
     };
     // 接管里面 form 的提交，不能直接让 form 提交，因为 wizard 自己需要知道进度。
     Wizard.prototype.handleSubmit = function (values, action) {
-        return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, store, steps, finishedField, step, finnalAsyncApi_2;
-            var _b;
-            var _this = this;
-            return tslib.__generator(this, function (_c) {
-                _a = this.props, store = _a.store, steps = _a.steps, finishedField = _a.finishedField;
-                if (this.state.currentStep < steps.length) {
-                    step = steps[this.state.currentStep - 1];
-                    store.updateData(values);
-                    finnalAsyncApi_2 = action.asyncApi || step.asyncApi;
-                    amisCore.isEffectiveApi(finnalAsyncApi_2, store.data) &&
-                        store.updateData((_b = {},
-                            _b[finishedField || 'finished'] = false,
-                            _b));
-                    if (amisCore.isEffectiveApi(action.api || step.api, store.data)) {
-                        store
-                            .saveRemote(action.api || step.api, store.data, {
-                            onSuccess: function () {
-                                _this.dispatchEvent('stepSubmitSucc');
-                                if (!amisCore.isEffectiveApi(finnalAsyncApi_2, store.data) ||
-                                    store.data[finishedField || 'finished']) {
-                                    return;
-                                }
-                                return amisCore.until(function () { return store.checkRemote(finnalAsyncApi_2, store.data); }, function (ret) { return ret && ret[finishedField || 'finished']; }, function (cancel) { return (_this.asyncCancel = cancel); });
-                            },
-                            onFailed: function (json) {
-                                _this.dispatchEvent('stepSubmitFail', { error: json });
-                                if (json.status === 422 && json.errors && _this.form) {
-                                    _this.form.props.store.setFormItemErrors(json.errors);
+        var _a;
+        var _this = this;
+        var _b = this.props, store = _b.store, steps = _b.steps, finishedField = _b.finishedField;
+        if (this.state.currentStep < steps.length) {
+            var step = steps[this.state.currentStep - 1];
+            store.updateData(values);
+            var finnalAsyncApi_2 = action.asyncApi || step.asyncApi;
+            amisCore.isEffectiveApi(finnalAsyncApi_2, store.data) &&
+                store.updateData((_a = {},
+                    _a[finishedField || 'finished'] = false,
+                    _a));
+            if (amisCore.isEffectiveApi(action.api || step.api, store.data)) {
+                store
+                    .saveRemote(action.api || step.api, store.data, {
+                    onSuccess: function () {
+                        _this.dispatchEvent('stepSubmitSucc');
+                        if (!amisCore.isEffectiveApi(finnalAsyncApi_2, store.data) ||
+                            store.data[finishedField || 'finished']) {
+                            return;
+                        }
+                        return amisCore.until(function () { return store.checkRemote(finnalAsyncApi_2, store.data); }, function (ret) { return ret && ret[finishedField || 'finished']; }, function (cancel) { return (_this.asyncCancel = cancel); });
+                    },
+                    onFailed: function (json) {
+                        _this.dispatchEvent('stepSubmitFail', { error: json });
+                        if (json.status === 422 && json.errors && _this.form) {
+                            _this.form.props.store.setFormItemErrors(json.errors);
+                        }
+                    }
+                })
+                    .then(function (value) { return tslib.__awaiter(_this, void 0, void 0, function () {
+                    var feedback, confirmed;
+                    return tslib.__generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                feedback = action.feedback;
+                                if (!(feedback && amisCore.isVisible(feedback, value))) return [3 /*break*/, 2];
+                                return [4 /*yield*/, this.openFeedback(feedback, value)];
+                            case 1:
+                                confirmed = _a.sent();
+                                // 如果 feedback 配置了，取消就跳过原有逻辑。
+                                if (feedback.skipRestOnCancel && !confirmed) {
+                                    throw new amisCore.SkipOperation();
                                 }
-                            }
-                        })
-                            .then(function (value) { return tslib.__awaiter(_this, void 0, void 0, function () {
-                            var feedback, confirmed;
-                            return tslib.__generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0:
-                                        feedback = action.feedback;
-                                        if (!(feedback && amisCore.isVisible(feedback, value))) return [3 /*break*/, 2];
-                                        return [4 /*yield*/, this.openFeedback(feedback, value)];
-                                    case 1:
-                                        confirmed = _a.sent();
-                                        // 如果 feedback 配置了，取消就跳过原有逻辑。
-                                        if (feedback.skipRestOnCancel && !confirmed) {
-                                            throw new amisCore.SkipOperation();
-                                        }
-                                        else if (feedback.skipRestOnConfirm && confirmed) {
-                                            throw new amisCore.SkipOperation();
-                                        }
-                                        _a.label = 2;
-                                    case 2:
-                                        this.gotoStep(value && typeof value.step === 'number'
-                                            ? value.step
-                                            : this.state.currentStep + 1);
-                                        return [2 /*return*/];
+                                else if (feedback.skipRestOnConfirm && confirmed) {
+                                    throw new amisCore.SkipOperation();
                                 }
-                            });
-                        }); })
-                            .catch(function (reason) {
-                            _this.dispatchEvent('stepSubmitFail', { error: reason });
-                            if (reason instanceof amisCore.SkipOperation) {
-                                return;
-                            }
-                            // do nothing
-                        });
-                    }
-                    else {
-                        this.gotoStep(this.state.currentStep + 1);
+                                _a.label = 2;
+                            case 2:
+                                this.gotoStep(value && typeof value.step === 'number'
+                                    ? value.step
+                                    : this.state.currentStep + 1);
+                                return [2 /*return*/];
+                        }
+                    });
+                }); })
+                    .catch(function (reason) {
+                    _this.dispatchEvent('stepSubmitFail', { error: reason });
+                    if (reason instanceof amisCore.SkipOperation) {
+                        return;
                     }
-                }
-                else {
-                    this.finalSubmit(values, action);
-                }
-                return [2 /*return*/, false];
-            });
-        });
+                    // do nothing
+                });
+            }
+            else {
+                this.gotoStep(this.state.currentStep + 1);
+            }
+        }
+        else {
+            this.finalSubmit(values, action);
+        }
+        return false;
     };
     Wizard.prototype.handleDialogConfirm = function (values, action, targets) {
         var store = this.props.store;
@@ -844,7 +841,7 @@ var Wizard = /** @class */ (function (_super) {
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
         tslib.__metadata("design:paramtypes", [Object, Object]),
-        tslib.__metadata("design:returntype", Promise)
+        tslib.__metadata("design:returntype", void 0)
     ], Wizard.prototype, "handleSubmit", null);
     tslib.__decorate([
         amisCore.autobind,

package/lib/renderers/Wrapper.js

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

package/lib/schemaExtend.js

@@ -1,13 +1,18 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * 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;
+});