amis 2.0.0-rc.9 → 2.0.2

package/lib/renderers/Form/ChainedSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -105,12 +105,17 @@ var ChainedSelectControl = /** @class */ (function (_super) {
                 .fetcher(source, tslib.__assign(tslib.__assign({}, data), { value: arr, level: idx + 1, parentId: parentId, parent: arr[idx] }))
                 .then(function (ret) { return tslib.__awaiter(_this, void 0, void 0, function () {
                 var stack, remoteValue, options, valueRes, rendererEvent;
-                return tslib.__generator(this, function (_a) {
-                    switch (_a.label) {
+                var _a, _b, _c;
+                return tslib.__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);
@@ -120,12 +125,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,
@@ -151,7 +156,7 @@ var ChainedSelectControl = /** @class */ (function (_super) {
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, value = _a.value, delimiter = _a.delimiter, onChange = _a.onChange, joinValues = _a.joinValues, dispatchEvent = _a.dispatchEvent, data = _a.data;
+                        _a = this.props, value = _a.value, delimiter = _a.delimiter, onChange = _a.onChange, joinValues = _a.joinValues, _a.extractValue, dispatchEvent = _a.dispatchEvent, data = _a.data;
                         arr = Array.isArray(value)
                             ? value.concat()
                             : value && typeof value === 'string'
@@ -190,12 +195,12 @@ var ChainedSelectControl = /** @class */ (function (_super) {
         return (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "ChainedSelectControl"), className) },
             React__default["default"].createElement(amisUi.Select, tslib.__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__default["default"].createElement(amisUi.Select, tslib.__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/lib/renderers/Form/ChartRadios.js

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

package/lib/renderers/Form/Checkbox.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -57,9 +57,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__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "CheckboxControl"), className) },
-            React__default["default"].createElement(amisUi.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__default["default"].createElement(amisUi.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/lib/renderers/Form/Checkboxes.d.ts

@@ -20,6 +20,10 @@ export interface CheckboxesControlSchema extends FormOptionsSchema {
      * 每行显示多少个
      */
     columnsCount?: number | number[];
+    /**
+     * 自定义选项展示
+     */
+    menuTpl?: string;
 }
 export interface CheckboxesProps extends OptionsControlProps, Omit<CheckboxesControlSchema, 'options' | 'type' | 'className' | 'descriptionClassName' | 'inputClassName'> {
     placeholder?: any;
@@ -33,6 +37,7 @@ export interface CheckboxesProps extends OptionsControlProps, Omit<CheckboxesCon
     editable?: boolean;
     removable?: boolean;
     optionType?: 'default' | 'button';
+    menuTpl?: string;
 }
 export default class CheckboxesControl extends React.Component<CheckboxesProps, any> {
     static defaultProps: {

package/lib/renderers/Form/Checkboxes.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -151,9 +151,15 @@ var CheckboxesControl = /** @class */ (function (_super) {
         if (option.children) {
             return this.renderGroup(option, index);
         }
-        var _a = this.props, 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;
-        return (React__default["default"].createElement(amisUi.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 },
-            String(option[labelField || 'label']),
+        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']);
+        var optionLabelClassName = option['labelClassName'];
+        return (React__default["default"].createElement(amisUi.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: amisCore.createObject(data, option)
+                })
+                : labelText,
             removable && amisCore.hasAbility(option, 'removable') ? (React__default["default"].createElement("a", { "data-tooltip": __('Select.clear'), "data-position": "left" },
                 React__default["default"].createElement(amisUi.Icon, { icon: "minus", className: "icon", onClick: function (e) { return _this.handleDeleteClick(e, option); } }))) : null,
             editable && amisCore.hasAbility(option, 'editable') ? (React__default["default"].createElement("a", { "data-tooltip": "\u7F16\u8F91", "data-position": "left" },

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

@@ -219,7 +219,7 @@ export default class ComboControl extends React.Component<ComboProps> {
     handleSingleFormChange(values: object): void;
     handleFormInit(values: any, { index }: any): void;
     handleSingleFormInit(values: any): void;
-    handleAction(action: ActionObject): any;
+    handleAction(e: React.UIEvent<any> | undefined, action: ActionObject): any;
     validate(): any;
     flush(): void;
     dragTipRef(ref: any): void;
@@ -249,3 +249,5 @@ export declare class ComboControlRenderer extends ComboControl {
 }
 export declare class KVControlRenderer extends ComboControl {
 }
+export declare class KVSControlRenderer extends ComboControl {
+}

package/lib/renderers/Form/Combo.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -257,6 +257,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);
         }
@@ -314,7 +334,7 @@ var ComboControl = /** @class */ (function (_super) {
             setPrinstineValue(tslib.__assign({}, values));
         }
     };
-    ComboControl.prototype.handleAction = function (action) {
+    ComboControl.prototype.handleAction = function (e, action) {
         var onAction = this.props.onAction;
         if (action.actionType === 'delete') {
             action.index !== void 0 && this.deleteItem(action.index);
@@ -323,7 +343,8 @@ var ComboControl = /** @class */ (function (_super) {
         onAction && onAction.apply(null, arguments);
     };
     ComboControl.prototype.validate = function () {
-        var _a = this.props, value = _a.value, minLength = _a.minLength, maxLength = _a.maxLength, messages = _a.messages, nullable = _a.nullable, __ = _a.translate;
+        var _a = this.props, minLength = _a.minLength, maxLength = _a.maxLength, messages = _a.messages, nullable = _a.nullable, __ = _a.translate;
+        var value = this.getValueAsArray();
         if (minLength && (!Array.isArray(value) || value.length < minLength)) {
             return __((messages && messages.minLengthValidateFailed) || 'Combo.minLength', { minLength: minLength });
         }
@@ -829,5 +850,19 @@ var ComboControl = /** @class */ (function (_super) {
     ], KVControlRenderer);
     return KVControlRenderer;
 })(ComboControl));
+/** @class */ ((function (_super) {
+    tslib.__extends(KVSControlRenderer, _super);
+    function KVSControlRenderer() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    KVSControlRenderer = tslib.__decorate([
+        amisCore.FormItem({
+            type: 'input-kvs',
+            storeType: amisCore.ComboStore.name,
+            extendsData: false
+        })
+    ], KVSControlRenderer);
+    return KVSControlRenderer;
+})(ComboControl));
 
 exports["default"] = ComboControl;

package/lib/renderers/Form/ConditionBuilder.d.ts

@@ -2,6 +2,7 @@ import React from 'react';
 import { FormControlProps, Schema } from 'amis-core';
 import { FormBaseControlSchema, SchemaApi, SchemaTokenizeableString } from '../../Schema';
 import { ConditionBuilderFields, ConditionBuilderFuncs, ConditionBuilderConfig } from 'amis-ui';
+import { IconSchema } from '../Icon';
 /**
  * 条件组合控件
  * 文档：https://baidu.gitee.io/amis/docs/components/form/condition-builder
@@ -11,6 +12,14 @@ export interface ConditionBuilderControlSchema extends FormBaseControlSchema {
      * 指定为
      */
     type: 'condition-builder';
+    /**
+     * 内嵌模式，默认为 true
+     */
+    embed?: boolean;
+    /**
+     * 非内嵌模式时 弹窗触发icon
+     */
+    pickerIcon?: IconSchema;
     /**
      * 函数集合
      */
@@ -40,6 +49,7 @@ export interface ConditionBuilderProps extends FormControlProps, Omit<ConditionB
 }
 export default class ConditionBuilderControl extends React.PureComponent<ConditionBuilderProps> {
     renderEtrValue(schema: Schema, data: any): JSX.Element;
+    renderPickerIcon(): JSX.Element | undefined;
     render(): JSX.Element;
 }
 export declare class ConditionBuilderRenderer extends ConditionBuilderControl {

package/lib/renderers/Form/ConditionBuilder.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.0.0-rc.9
+ * amis v2.0.2
  * Copyright 2018-2022 baidu
  */
 
@@ -24,8 +24,12 @@ var ConditionBuilderControl = /** @class */ (function (_super) {
     ConditionBuilderControl.prototype.renderEtrValue = function (schema, data) {
         return this.props.render('inline', Object.assign(schema, { label: false }), data);
     };
+    ConditionBuilderControl.prototype.renderPickerIcon = function () {
+        var _a = this.props, render = _a.render, pickerIcon = _a.pickerIcon;
+        return pickerIcon ? render('picker-icon', pickerIcon) : undefined;
+    };
     ConditionBuilderControl.prototype.render = function () {
-        var _a = this.props, className = _a.className, cx = _a.classnames, rest = tslib.__rest(_a, ["className", "classnames"]);
+        var _a = this.props, className = _a.className, cx = _a.classnames; _a.pickerIcon; var rest = tslib.__rest(_a, ["className", "classnames", "pickerIcon"]);
         // 处理一下formula类型值的变量列表
         var formula = this.props.formula ? tslib.__assign({}, this.props.formula) : undefined;
         if (formula && formula.variables && amisCore.isPureVariable(formula.variables)) {
@@ -33,7 +37,7 @@ var ConditionBuilderControl = /** @class */ (function (_super) {
             formula.variables = amisCore.resolveVariableAndFilter(formula.variables, this.props.data, '| raw');
         }
         return (React__default["default"].createElement("div", { className: cx("ConditionBuilderControl", className) },
-            React__default["default"].createElement(ConditionBuilderWithRemoteOptions, tslib.__assign({ renderEtrValue: this.renderEtrValue }, rest, { formula: formula }))));
+            React__default["default"].createElement(ConditionBuilderWithRemoteOptions, tslib.__assign({ renderEtrValue: this.renderEtrValue, pickerIcon: this.renderPickerIcon() }, rest, { formula: formula }))));
     };
     tslib.__decorate([
         amisCore.autobind,

package/lib/renderers/Form/Control.js

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