amis 2.8.0 → 3.0.0

package/lib/renderers/Form/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -66,7 +66,7 @@ var EditorControl = /** @class */ (function (_super) {
                         this.setState({
                             focused: true
                         });
-                        return [4 /*yield*/, dispatchEvent('focus', amisCore.resolveEventData(this.props, { value: value }, 'value'))];
+                        return [4 /*yield*/, dispatchEvent('focus', amisCore.resolveEventData(this.props, { value: value }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -88,7 +88,7 @@ var EditorControl = /** @class */ (function (_super) {
                         this.setState({
                             focused: false
                         });
-                        return [4 /*yield*/, dispatchEvent('blur', amisCore.resolveEventData(this.props, { value: value }, 'value'))];
+                        return [4 /*yield*/, dispatchEvent('blur', amisCore.resolveEventData(this.props, { value: value }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -107,7 +107,7 @@ var EditorControl = /** @class */ (function (_super) {
                 switch (_b.label) {
                     case 0:
                         _a = this.props, dispatchEvent = _a.dispatchEvent, onChange = _a.onChange;
-                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: e }, 'value'))];
+                        return [4 /*yield*/, dispatchEvent('change', amisCore.resolveEventData(this.props, { value: e }))];
                     case 1:
                         rendererEvent = _b.sent();
                         if (rendererEvent === null || rendererEvent === void 0 ? void 0 : rendererEvent.prevented) {
@@ -129,7 +129,7 @@ var EditorControl = /** @class */ (function (_super) {
         if (this.props.editorDidMount) {
             var editorDidMount = this.props.editorDidMount;
             if (typeof editorDidMount === 'string') {
-                editorDidMount = new Function('editor', 'monaco');
+                editorDidMount = new Function('editor', 'monaco', editorDidMount);
             }
             var dispose = editorDidMount(editor, monaco);
             if (typeof dispose === 'function') {

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

@@ -6,7 +6,7 @@ import { FormBaseControl } from 'amis-core';
 import type { FormHorizontal } from 'amis-core';
 /**
  * FieldSet 表单项集合
- * 文档：https://baidu.gitee.io/amis/docs/components/form/fieldset
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/fieldset
  */
 export interface FieldSetControlSchema extends Omit<FormBaseControl, 'size'>, Omit<CollapseSchema, 'type' | 'body'> {
     /**

package/lib/renderers/Form/FieldSet.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -27,7 +27,7 @@ var FieldSetControl = /** @class */ (function (_super) {
         var _a = this.props, body = _a.body; _a.collapsable; var horizontal = _a.horizontal, render = _a.render, mode = _a.mode, formMode = _a.formMode, cx = _a.classnames, store = _a.store, formClassName = _a.formClassName, disabled = _a.disabled, formHorizontal = _a.formHorizontal, subFormMode = _a.subFormMode, subFormHorizontal = _a.subFormHorizontal;
         var props = {
             store: store,
-            data: store.data,
+            data: store === null || store === void 0 ? void 0 : store.data,
             render: render,
             disabled: disabled,
             formMode: subFormMode || formMode,

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

@@ -3,7 +3,7 @@ import { FormControlProps } from 'amis-core';
 import { FormBaseControlSchema } from '../../Schema';
 /**
  * 公式功能控件。
- * 文档：https://baidu.gitee.io/amis/docs/components/form/formula
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/formula
  */
 export interface FormulaControlSchema extends FormBaseControlSchema {
     /**

package/lib/renderers/Form/Formula.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -11,10 +11,14 @@ export type GroupSubControl = SchemaObject & {
      * 宽度占用比率。在某些容器里面有用比如 group
      */
     columnRatio?: number | 'auto';
+    /**
+     * 列名称
+     */
+    name?: string;
 };
 /**
  * Group 表单集合渲染器，能让多个表单在一行显示
- * 文档：https://baidu.gitee.io/amis/docs/components/form/group
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/group
  */
 export interface GroupControlSchema extends FormBaseControlSchema {
     type: 'group';
@@ -44,14 +48,8 @@ export interface InputGroupProps extends RendererProps, Omit<GroupControlSchema,
 export declare class ControlGroupRenderer extends React.Component<InputGroupProps> {
     constructor(props: InputGroupProps);
     renderControl(control: any, index: any, otherProps?: any): JSX.Element | null;
-    renderVertical(props?: Readonly<InputGroupProps> & Readonly<{
-        children?: React.ReactNode;
-    }>): JSX.Element | null;
-    renderHorizontal(props?: Readonly<InputGroupProps> & Readonly<{
-        children?: React.ReactNode;
-    }>): JSX.Element | null;
-    renderInput(props?: Readonly<InputGroupProps> & Readonly<{
-        children?: React.ReactNode;
-    }>): JSX.Element | null;
+    renderVertical(props?: Readonly<InputGroupProps>): JSX.Element | null;
+    renderHorizontal(props?: Readonly<InputGroupProps>): JSX.Element | null;
+    renderInput(props?: Readonly<InputGroupProps>): JSX.Element | null;
     render(): JSX.Element | null;
 }

package/lib/renderers/Form/Group.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -37,11 +37,12 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
             return null;
         }
         return (React__default["default"].createElement("div", { className: cx("Form-group Form-group--ver Form-group--".concat(formMode), className) }, body.map(function (control, index) {
+            var _a;
             if (!amisCore.isVisible(control, data)) {
                 return null;
             }
             return _this.renderControl(control, index, {
-                key: index
+                key: "".concat((_a = control.name) !== null && _a !== void 0 ? _a : '', "-").concat(index)
             });
         })));
     };
@@ -62,6 +63,7 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
                 }).length)
                 : undefined);
         return (React__default["default"].createElement("div", { className: cx("Form-group Form-group--hor Form-group--".concat(formMode), gap ? "Form-group--".concat(gap) : '', className) }, body.map(function (control, index) {
+            var _a, _b;
             if (!amisCore.isVisible(control, data)) {
                 return null;
             }
@@ -71,13 +73,14 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
                 ((control === null || control === void 0 ? void 0 : control.type) &&
                     ['formula', 'hidden'].includes(control.type))) {
                 return _this.renderControl(control, index, {
-                    key: index,
+                    key: "".concat((_a = control.name) !== null && _a !== void 0 ? _a : '', "-").concat(index),
                     className: cx(control.className, control.columnClassName)
                 });
             }
             var columnWidth = control.columnRatio ||
                 amisCore.getWidthRate(control && control.columnClassName, true);
             return (React__default["default"].createElement("div", { key: index, className: cx("".concat(ns, "Form-groupColumn"), columnWidth ? "".concat(ns, "Form-groupColumn--").concat(columnWidth) : '', control && control.columnClassName) }, _this.renderControl(control, index, {
+                key: "".concat((_b = control.name) !== null && _b !== void 0 ? _b : '', "-").concat(index),
                 formHorizontal: horizontalDeeper,
                 formMode: controlMode
             })));

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

@@ -3,7 +3,7 @@ import { FormControlProps } from 'amis-core';
 import { FormBaseControlSchema } from '../../Schema';
 /**
  * Hidden 隐藏域。功能性组件
- * 文档：https://baidu.gitee.io/amis/docs/components/form/hidden
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/hidden
  */
 export interface HiddenControlSchema extends FormBaseControlSchema {
     type: 'hidden';

package/lib/renderers/Form/Hidden.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -4,7 +4,7 @@ import { FormControlProps } from 'amis-core';
 import { FormBaseControlSchema } from '../../Schema';
 /**
  * 图标选择器
- * 文档：https://baidu.gitee.io/amis/docs/components/form/icon-picker
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/icon-picker
  */
 export interface IconPickerControlSchema extends FormBaseControlSchema {
     type: 'icon-picker';

package/lib/renderers/Form/IconPicker.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

package/lib/renderers/Form/IconPickerIcons.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -42,6 +42,7 @@ export default class IconSelectControl extends React.PureComponent<IconSelectPro
     handleIconTypeClick(item: any, index: number): void;
     renderIconTypes(): JSX.Element;
     handleConfirm(): void;
+    handleLocalUpload(icon: string): Promise<void>;
     handleClickIconInModal(icon: IconChecked): void;
     renderIconList(icons: IconSelectStore.SvgIcon[]): JSX.Element;
     handleSearchValueChange(e: string): void;

package/lib/renderers/Form/IconSelect.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 
@@ -54,7 +54,7 @@ var IconSelectControl = /** @class */ (function (_super) {
                 }
             }
         }
-        return findItem || null;
+        return findItem || { name: svg, id: '', svg: '' };
     };
     IconSelectControl.prototype.handleClick = function () {
         if (this.props.disabled) {
@@ -70,14 +70,15 @@ var IconSelectControl = /** @class */ (function (_super) {
     IconSelectControl.prototype.renderInputArea = function () {
         var _a = this.props, ns = _a.classPrefix, disabled = _a.disabled, valueTemp = _a.value, placeholder = _a.placeholder, clearable = _a.clearable;
         var value = typeof valueTemp === 'string' ? this.getValueBySvg(valueTemp) : valueTemp;
+        var SvgStr = typeof valueTemp === 'string' && valueTemp.match(/(<svg.{1,}\/svg>)/);
         var pureValue = ((value === null || value === void 0 ? void 0 : value.id) && String(value.id).replace(/^svg-/, '')) || '';
         var iconName = (value === null || value === void 0 ? void 0 : value.name) || pureValue;
         return (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "IconSelectControl-input-area")) },
-            pureValue && (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "IconSelectControl-input-icon-show")) },
+            pureValue ? (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "IconSelectControl-input-icon-show")) },
                 React__default["default"].createElement("svg", null,
-                    React__default["default"].createElement("use", { xlinkHref: "#".concat(pureValue) })))),
+                    React__default["default"].createElement("use", { xlinkHref: "#".concat(pureValue) })))) : valueTemp ? (SvgStr ? (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "IconSelectControl-input-area-str-svg")), dangerouslySetInnerHTML: { __html: SvgStr[0].replace(/\\"/g, '"') } })) : (React__default["default"].createElement(amisUi.Icon, { icon: valueTemp, className: "icon" }))) : null,
             React__default["default"].createElement("span", { className: cx__default["default"]("".concat(ns, "IconSelectControl-input-icon-id")) }, iconName),
-            clearable && !disabled && pureValue ? (React__default["default"].createElement("a", { onClick: this.handleClear, className: cx__default["default"]("".concat(ns, "IconSelectControl-clear")) },
+            clearable && !disabled && (pureValue || valueTemp) ? (React__default["default"].createElement("a", { onClick: this.handleClear, className: cx__default["default"]("".concat(ns, "IconSelectControl-clear")) },
                 React__default["default"].createElement(amisUi.Icon, { icon: "input-clear", className: "icon" }))) : null,
             (!value && placeholder && (React__default["default"].createElement("span", { className: cx__default["default"]("".concat(ns, "IconSelectControl-input-icon-placeholder")) }, placeholder))) ||
                 null));
@@ -102,7 +103,7 @@ var IconSelectControl = /** @class */ (function (_super) {
         var checkedIcon = this.state.tmpCheckIconId;
         if (this.props.returnSvg) {
             this.props.onChange &&
-                this.props.onChange(checkedIcon && checkedIcon.svg || '');
+                this.props.onChange((checkedIcon && checkedIcon.svg) || '');
         }
         else {
             this.props.onChange &&
@@ -111,6 +112,15 @@ var IconSelectControl = /** @class */ (function (_super) {
         }
         this.toggleModel(false);
     };
+    IconSelectControl.prototype.handleLocalUpload = function (icon) {
+        return tslib.__awaiter(this, void 0, void 0, function () {
+            return tslib.__generator(this, function (_a) {
+                this.props.onChange && this.props.onChange(icon);
+                this.toggleModel(false);
+                return [2 /*return*/];
+            });
+        });
+    };
     IconSelectControl.prototype.handleClickIconInModal = function (icon) {
         var _a;
         this.setState({
@@ -173,7 +183,7 @@ var IconSelectControl = /** @class */ (function (_super) {
         });
     };
     IconSelectControl.prototype.renderModalContent = function () {
-        var _a = this.props, render = _a.render, ns = _a.classPrefix, loadingConfig = _a.loadingConfig;
+        var _a = this.props, render = _a.render, ns = _a.classPrefix, loadingConfig = _a.loadingConfig; _a.funcSchema; var FuncCom = _a.funcCom;
         var icons = this.getIconsByType();
         var inputValue = this.state.searchValue;
         var filteredIcons = inputValue
@@ -190,6 +200,8 @@ var IconSelectControl = /** @class */ (function (_super) {
                     onClick: this.handleRefreshIconList
                 })) ||
                 null,
+            FuncCom ? (React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "IconSelectControl-Modal-func")) },
+                React__default["default"].createElement(FuncCom, { onUpload: this.handleLocalUpload }))) : null,
             React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "IconSelectControl-Modal-content")) },
                 React__default["default"].createElement(amisUi.Spinner, { size: "lg", loadingConfig: loadingConfig, overlay: true, key: "info", show: this.state.isRefreshLoading }),
                 React__default["default"].createElement("div", { className: cx__default["default"]("".concat(ns, "IconSelectControl-Modal-content-aside")) }, this.renderIconTypes()),
@@ -274,6 +286,12 @@ var IconSelectControl = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
     ], IconSelectControl.prototype, "handleConfirm", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [String]),
+        tslib.__metadata("design:returntype", Promise)
+    ], IconSelectControl.prototype, "handleLocalUpload", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),

package/lib/renderers/Form/IconSelectStore.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */
 

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

@@ -5,7 +5,7 @@ import { ComboControlSchema } from './Combo';
 import { SchemaCollection } from '../../Schema';
 /**
  * InputArray 数组输入框。 combo 的别名。
- * 文档：https://baidu.gitee.io/amis/docs/components/form/array
+ * 文档：https://aisuda.bce.baidu.com/amis/zh-CN/components/form/array
  */
 export interface ArrayControlSchema extends Omit<ComboControlSchema, 'type' | 'controls' | 'conditions' | 'items'> {
     /**

package/lib/renderers/Form/InputArray.js

@@ -1,5 +1,5 @@
 /**
- * amis v2.8.0
+ * amis v3.0.0
  * Copyright 2018-2023 baidu
  */