amis 2.0.0 → 2.1.0

package/esm/renderers/Form/ButtonGroupSelect.js

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

package/esm/renderers/Form/ButtonToolbar.js

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

package/esm/renderers/Form/ChainedSelect.d.ts

@@ -3,7 +3,7 @@ import { OptionsControlProps, Option } from 'amis-core';
 import { ActionObject } from 'amis-core';
 import { FormOptionsSchema } from '../../Schema';
 /**
- * 级联选择框
+ * 链式下拉框
  * 文档：https://baidu.gitee.io/amis/docs/components/form/chained-select
  */
 export interface ChainedSelectControlSchema extends FormOptionsSchema {

package/esm/renderers/Form/ChainedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -96,12 +96,17 @@ var ChainedSelectControl = /** @class */ (function (_super) {
                 .fetcher(source, __assign(__assign({}, data), { value: arr, level: idx + 1, parentId: parentId, parent: arr[idx] }))
                 .then(function (ret) { return __awaiter(_this, void 0, void 0, function () {
                 var stack, remoteValue, options, valueRes, rendererEvent;
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
+                var _a, _b, _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             stack = this.state.stack.concat();
                             remoteValue = ret.data ? ret.data.value : undefined;
-                            options = (ret.data && ret.data.options) || ret.data;
+                            options = ((_a = ret === null || ret === void 0 ? void 0 : ret.data) === null || _a === void 0 ? void 0 : _a.options) ||
+                                ((_b = ret === null || ret === void 0 ? void 0 : ret.data) === null || _b === void 0 ? void 0 : _b.items) ||
+                                ((_c = ret === null || ret === void 0 ? void 0 : ret.data) === null || _c === void 0 ? void 0 : _c.rows) ||
+                                ret.data ||
+                                [];
                             stack.splice(idx, stack.length - idx);
                             if (!(typeof remoteValue !== 'undefined')) return [3 /*break*/, 2];
                             arr.splice(idx + 1, value.length - idx - 1);
@@ -111,12 +116,12 @@ var ChainedSelectControl = /** @class */ (function (_super) {
                                     value: valueRes
                                 }))];
                         case 1:
-                            rendererEvent = _a.sent();
+                            rendererEvent = _d.sent();
                             if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
                                 return [2 /*return*/];
                             }
                             onChange(valueRes);
-                            _a.label = 2;
+                            _d.label = 2;
                         case 2:
                             stack.push({
                                 options: options,
@@ -181,12 +186,12 @@ var ChainedSelectControl = /** @class */ (function (_super) {
         return (React.createElement("div", { className: cx("".concat(ns, "ChainedSelectControl"), className) },
             React.createElement(Select, __assign({}, rest, { useMobileUI: useMobileUI, popOverContainer: mobileUI && env && env.getModalContainer
                     ? env.getModalContainer
-                    : rest.popOverContainer, classPrefix: ns, key: "base", options: options, value: arr[0], onChange: this.handleChange.bind(this, 0), loading: loading, inline: true })),
+                    : rest.popOverContainer, classPrefix: ns, key: "base", options: Array.isArray(options) ? options : [], value: arr[0], onChange: this.handleChange.bind(this, 0), loading: loading, inline: true })),
             this.state.stack.map(function (_a, index) {
                 var options = _a.options, loading = _a.loading, visible = _a.visible;
                 return visible === false ? null : (React.createElement(Select, __assign({}, rest, { useMobileUI: useMobileUI, popOverContainer: mobileUI && env && env.getModalContainer
                         ? env.getModalContainer
-                        : rest.popOverContainer, classPrefix: ns, key: "x-".concat(index + 1), options: options, value: arr[index + 1], onChange: _this.handleChange.bind(_this, index + 1), loading: loading, inline: true })));
+                        : rest.popOverContainer, classPrefix: ns, key: "x-".concat(index + 1), options: Array.isArray(options) ? options : [], value: arr[index + 1], onChange: _this.handleChange.bind(_this, index + 1), loading: loading, inline: true })));
             })));
     };
     ChainedSelectControl.defaultProps = {

package/esm/renderers/Form/ChartRadios.js

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

package/esm/renderers/Form/Checkbox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -48,9 +48,9 @@ var CheckboxControl = /** @class */ (function (_super) {
     };
     CheckboxControl.prototype.render = function () {
         var _this = this;
-        var _a = this.props, className = _a.className, value = _a.value, trueValue = _a.trueValue, falseValue = _a.falseValue, option = _a.option; _a.onChange; var disabled = _a.disabled, render = _a.render, partial = _a.partial, optionType = _a.optionType, checked = _a.checked, ns = _a.classPrefix;
+        var _a = this.props, className = _a.className, value = _a.value, trueValue = _a.trueValue, falseValue = _a.falseValue, option = _a.option; _a.onChange; var disabled = _a.disabled, render = _a.render, partial = _a.partial, optionType = _a.optionType, checked = _a.checked, labelClassName = _a.labelClassName, ns = _a.classPrefix;
         return (React.createElement("div", { className: cx("".concat(ns, "CheckboxControl"), className) },
-            React.createElement(Checkbox, { inline: true, value: value || '', trueValue: trueValue, falseValue: falseValue, disabled: disabled, onChange: function (value) { return _this.dispatchChangeEvent(value); }, partial: partial, optionType: optionType, checked: checked }, option ? render('option', option) : null)));
+            React.createElement(Checkbox, { inline: true, value: value || '', trueValue: trueValue, falseValue: falseValue, disabled: disabled, onChange: function (value) { return _this.dispatchChangeEvent(value); }, partial: partial, optionType: optionType, checked: checked, labelClassName: labelClassName }, option ? render('option', option) : null)));
     };
     CheckboxControl.defaultProps = {
         trueValue: true,

package/esm/renderers/Form/Checkboxes.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
-import { OptionsControlProps, Option } from 'amis-core';
-import { ActionObject, Api } from 'amis-core';
+import type { ActionObject, Api, OptionsControlProps, Option } from 'amis-core';
 import { FormOptionsSchema } from '../../Schema';
 /**
  * 复选框

package/esm/renderers/Form/Checkboxes.js

@@ -1,11 +1,12 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __decorate, __metadata } from 'tslib';
 import React from 'react';
-import { createObject, hasAbility, columnsSplit, autobind, OptionsControl } from 'amis-core';
+import inRange from 'lodash/inRange';
+import { createObject, hasAbility, flattenTreeWithLeafNodes, columnsSplit, autobind, OptionsControl } from 'amis-core';
 import { Checkbox, Icon } from 'amis-ui';
 
 var CheckboxesControl = /** @class */ (function (_super) {
@@ -145,7 +146,8 @@ var CheckboxesControl = /** @class */ (function (_super) {
         }
         var _a = this.props, render = _a.render, itemClassName = _a.itemClassName, onToggle = _a.onToggle, selectedOptions = _a.selectedOptions, disabled = _a.disabled, inline = _a.inline, labelClassName = _a.labelClassName, labelField = _a.labelField, removable = _a.removable, editable = _a.editable, __ = _a.translate, optionType = _a.optionType, menuTpl = _a.menuTpl, data = _a.data;
         var labelText = String(option[labelField || 'label']);
-        return (React.createElement(Checkbox, { className: itemClassName, key: index, onChange: function () { return onToggle(option); }, checked: !!~selectedOptions.indexOf(option), disabled: disabled || option.disabled, inline: inline, labelClassName: labelClassName, description: option.description, optionType: optionType },
+        var optionLabelClassName = option['labelClassName'];
+        return (React.createElement(Checkbox, { className: itemClassName, key: index, onChange: function () { return onToggle(option); }, checked: !!~selectedOptions.indexOf(option), disabled: disabled || option.disabled, inline: inline, labelClassName: optionLabelClassName || labelClassName, description: option.description, optionType: optionType },
             menuTpl
                 ? render("checkboxes/".concat(index), menuTpl, {
                     data: createObject(data, option)
@@ -164,8 +166,7 @@ var CheckboxesControl = /** @class */ (function (_super) {
             body = options.map(function (option, key) { return _this.renderItem(option, key); });
         }
         if (checkAll && body.length && optionType === 'default') {
-            body.unshift(React.createElement(Checkbox, { key: "checkall", className: itemClassName, onChange: onToggleAll, checked: !!selectedOptions.length, partial: !!(selectedOptions.length &&
-                    selectedOptions.length !== options.length), disabled: disabled, inline: inline, labelClassName: labelClassName }, __('Checkboxes.selectAll')));
+            body.unshift(React.createElement(Checkbox, { key: "checkall", className: itemClassName, onChange: onToggleAll, checked: !!selectedOptions.length, partial: inRange(selectedOptions.length, 0, flattenTreeWithLeafNodes(options).length), disabled: disabled, inline: inline, labelClassName: labelClassName }, __('Checkboxes.selectAll')));
         }
         body = columnsSplit(body, cx, columnsCount);
         return (React.createElement("div", { className: cx("CheckboxesControl", className), ref: "checkboxRef" },

package/esm/renderers/Form/Combo.d.ts

@@ -249,3 +249,5 @@ export declare class ComboControlRenderer extends ComboControl {
 }
 export declare class KVControlRenderer extends ComboControl {
 }
+export declare class KVSControlRenderer extends ComboControl {
+}

package/esm/renderers/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -245,6 +245,26 @@ var ComboControl = /** @class */ (function (_super) {
                 this.props.onChange(value, submitOnChange, true);
             }
         }
+        else if (type === 'input-kvs') {
+            // input-kvs 为了避免冲突 key 改成了 _key
+            var hasDuplicateKey = false;
+            var keys = {};
+            for (var _c = 0, value_2 = value; _c < value_2.length; _c++) {
+                var item = value_2[_c];
+                if ('_key' in item) {
+                    if (keys[item._key]) {
+                        hasDuplicateKey = true;
+                    }
+                    else {
+                        keys[item._key] = true;
+                    }
+                }
+            }
+            // 有重复值就不触发修改，因为 KV 模式下无法支持重复值
+            if (!hasDuplicateKey) {
+                this.props.onChange(value, submitOnChange, true);
+            }
+        }
         else {
             this.props.onChange(value, submitOnChange, true);
         }
@@ -818,5 +838,19 @@ var ComboControl = /** @class */ (function (_super) {
     ], KVControlRenderer);
     return KVControlRenderer;
 })(ComboControl));
+/** @class */ ((function (_super) {
+    __extends(KVSControlRenderer, _super);
+    function KVSControlRenderer() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    KVSControlRenderer = __decorate([
+        FormItem({
+            type: 'input-kvs',
+            storeType: ComboStore.name,
+            extendsData: false
+        })
+    ], KVSControlRenderer);
+    return KVSControlRenderer;
+})(ComboControl));
 
 export { ComboControl as default };

package/esm/renderers/Form/ConditionBuilder.js

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

package/esm/renderers/Form/Control.js

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

package/esm/renderers/Form/DiffEditor.js

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

package/esm/renderers/Form/Editor.js

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

package/esm/renderers/Form/FieldSet.js

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

package/esm/renderers/Form/Formula.js

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

package/esm/renderers/Form/Group.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -60,8 +60,9 @@ import { isVisible, makeHorizontalDeeper, getWidthRate, FormItemWrap, Renderer }
                 return null;
             }
             var controlMode = (control === null || control === void 0 ? void 0 : control.mode) || formMode;
-            if (controlMode === 'inline' ||
-                (control && control.type === 'formula')) {
+            if (controlMode === 'inline'
+                // hidden 直接渲染，否则会有个空 Form-groupColumn 层
+                || (control === null || control === void 0 ? void 0 : control.type) && ['formula', 'hidden'].includes(control.type)) {
                 return _this.renderControl(control, index, {
                     key: index,
                     className: cx(control.className, control.columnClassName)

package/esm/renderers/Form/Hidden.js

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

package/esm/renderers/Form/IconPicker.js

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

package/esm/renderers/Form/IconPickerIcons.js

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

package/esm/renderers/Form/InputArray.js

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

package/esm/renderers/Form/InputCity.js

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

package/esm/renderers/Form/InputColor.js

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

package/esm/renderers/Form/InputDate.js

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

package/esm/renderers/Form/InputDateRange.js

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

package/esm/renderers/Form/InputExcel.d.ts

@@ -38,6 +38,7 @@ export default class ExcelControl extends React.PureComponent<ExcelProps, ExcelC
     static defaultProps: Partial<ExcelProps>;
     state: ExcelControlState;
     ExcelJS: any;
+    componentDidUpdate(prevProps: ExcelProps): void;
     handleDrop(files: File[]): void;
     dispatchEvent(eventName: string, eventData?: Record<string, any>): Promise<any>;
     /**

package/esm/renderers/Form/InputExcel.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
@@ -17,6 +17,11 @@ var ExcelControl = /** @class */ (function (_super) {
         };
         return _this;
     }
+    ExcelControl.prototype.componentDidUpdate = function (prevProps) {
+        if (prevProps.value !== this.props.value && !this.props.value) {
+            this.setState({ filename: '' });
+        }
+    };
     ExcelControl.prototype.handleDrop = function (files) {
         var _this = this;
         var _a = this.props, allSheets = _a.allSheets, onChange = _a.onChange; _a.dispatchEvent; _a.data;

package/esm/renderers/Form/InputFile.js

@@ -1,11 +1,11 @@
 /**
- * amis v2.0.0
+ * amis v2.1.0
  * Copyright 2018-2022 baidu
  */
 
 import { __extends, __assign, __awaiter, __generator, __decorate } from 'tslib';
 import React from 'react';
-import { guid, createObject, normalizeApi, buildApi, isEmpty, dataMapping, qsstringify, FormItem, isEffectiveApi, isApiOutdated } from 'amis-core';
+import { guid, createObject, normalizeApi, buildApi, isEmpty, dataMapping, qsstringify, FormItem, isEffectiveApi, isApiOutdated, isApiOutdatedWithData } from 'amis-core';
 import find from 'lodash/find';
 import isPlainObject from 'lodash/isPlainObject';
 import ImageControl from './InputImage.js';
@@ -207,12 +207,14 @@ var FileControl = /** @class */ (function (_super) {
         var valueField = this.props.valueField || 'value';
         var fileUrl = file[urlField] ||
             file[valueField];
-        var api = typeof downloadUrl === 'string' && !~downloadUrl.indexOf('$')
+        var api = typeof downloadUrl === 'string' &&
+            !~downloadUrl.indexOf('$') &&
+            typeof fileUrl === 'string'
             ? "".concat(downloadUrl).concat(fileUrl)
             : downloadUrl
                 ? downloadUrl
-                : "".concat(fileUrl);
-        this.handleApi(api, file);
+                : undefined;
+        api && this.handleApi(api, file);
     };
     FileControl.prototype.downloadTpl = function (e) {
         e.preventDefault();
@@ -493,7 +495,6 @@ var FileControl = /** @class */ (function (_super) {
                             return [2 /*return*/];
                         }
                         onChange((this.emitValue = value), undefined, changeImmediately);
-                        console.log('onChange', changeImmediately);
                         this.syncAutoFill();
                         return [2 /*return*/];
                 }
@@ -926,8 +927,8 @@ var FileControlRenderer = /** @class */ (function (_super) {
             sizeMutable: false,
             renderDescription: false,
             shouldComponentUpdate: function (props, prevProps) {
-                return !!isEffectiveApi(props.receiver, props.data) &&
-                    isApiOutdated(props.receiver, prevProps.receiver, props.data, prevProps.data);
+                return !!isEffectiveApi(props.receiver, props.data) && (isApiOutdated(props.receiver, prevProps.receiver, props.data, prevProps.data) ||
+                    isApiOutdatedWithData(props.receiver, prevProps.receiver, props.data, prevProps.data));
             }
         })
     ], FileControlRenderer);

package/esm/renderers/Form/InputFormula.js

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

package/esm/renderers/Form/InputGroup.js

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

package/esm/renderers/Form/InputImage.js

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

package/esm/renderers/Form/InputMonthRange.js

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

package/esm/renderers/Form/InputNumber.js

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

package/esm/renderers/Form/InputQuarterRange.js

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

package/esm/renderers/Form/InputRange.js

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

package/esm/renderers/Form/InputRating.js

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

package/esm/renderers/Form/InputRepeat.js

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

package/esm/renderers/Form/InputRichText.js

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

package/esm/renderers/Form/InputSubForm.js

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

package/esm/renderers/Form/InputTable.d.ts

@@ -1,7 +1,5 @@
 import React from 'react';
-import { FormControlProps, FormBaseControl } from 'amis-core';
-import { RendererData, ActionObject } from 'amis-core';
-import { SimpleMap } from 'amis-core';
+import { FormControlProps, FormBaseControl, SimpleMap, RendererData, ActionObject } from 'amis-core';
 import { TableSchema } from '../Table';
 import { SchemaApi } from '../../Schema';
 export interface TableControlSchema extends FormBaseControl, Omit<TableSchema, 'type'> {
@@ -172,6 +170,14 @@ export default class FormTable extends React.Component<TableProps, TableState> {
     handleTableSave(rows: Array<object> | object, diff: Array<object> | object, rowIndexes: Array<string> | string): void;
     handleSaveTableOrder(moved: Array<object>, rows: Array<object>): void;
     handlePageChange(page: number): void;
+    /**
+     * Table Row中数据更新到InputTable中
+     * 解决columns形如[{name: 'a'}, {name: 'c', value: '${a}'}]时，使用默认值的列数据无法更新到数据域的问题
+     *
+     * @param data 行数据
+     * @param rowIndex 行索引值
+     */
+    handlePristineChange(data: Record<string, any>, rowIndex: string): void;
     removeEntry(entry: any): void;
     getEntryId(entry: any): string;
     render(): JSX.Element | null;