amis 2.6.0 → 2.7.0

package/lib/renderers/Form/ChartRadios.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Form/Checkbox.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Form/Checkboxes.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Form/Combo.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Form/ConditionBuilder.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Form/Control.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

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

@@ -3834,12 +3834,12 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
             loadAutoUpdateData: (api: import("amis-core").Api, data?: object | undefined, silent?: boolean | undefined) => Promise<import("amis-core").Payload>;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         formInited?: boolean | undefined;
-        formMode?: "horizontal" | "inline" | "normal" | "row" | "default" | undefined;
+        formMode?: "horizontal" | "default" | "inline" | "row" | "normal" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
-        defaultSize?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
-        size?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
+        defaultSize?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
+        size?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
         labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         labelWidth?: string | number | undefined;
         disabled?: boolean | undefined;
@@ -3875,20 +3875,34 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         error?: string | undefined;
         showErrorMsg?: boolean | undefined;
+        placeholder?: string | undefined;
+        $ref?: string | undefined;
+        disabledOn?: string | undefined;
+        hidden?: boolean | undefined;
+        hiddenOn?: string | undefined;
+        visible?: boolean | undefined;
+        visibleOn?: string | undefined;
+        id?: string | undefined;
+        static?: boolean | undefined;
+        staticOn?: string | undefined;
+        staticPlaceholder?: string | undefined;
+        staticClassName?: import("amis-core").SchemaClassName | undefined;
+        staticLabelClassName?: import("amis-core").SchemaClassName | undefined;
+        staticInputClassName?: import("amis-core").SchemaClassName | undefined;
+        staticSchema?: any;
+        label?: string | false | undefined;
         remark?: import("../Remark").SchemaRemark | undefined;
+        desc?: string | undefined;
+        mode?: "horizontal" | "inline" | "normal" | undefined;
+        horizontal?: import("amis-core").FormHorizontal | undefined;
+        labelClassName?: string | undefined;
+        inline?: boolean | undefined;
+        readOnly?: boolean | undefined;
         labelRemark?: import("../Remark").SchemaRemark | undefined;
         options?: any;
-        label?: string | false | undefined;
-        labelClassName?: string | undefined;
         submitOnChange?: boolean | undefined;
-        readOnly?: boolean | undefined;
         readOnlyOn?: string | undefined;
         validateOnChange?: boolean | undefined;
-        desc?: string | undefined;
-        mode?: "horizontal" | "inline" | "normal" | undefined;
-        horizontal?: import("amis-core").FormHorizontal | undefined;
-        inline?: boolean | undefined;
-        placeholder?: string | undefined;
         required?: boolean | undefined;
         validationErrors?: {
             [propName: string]: any;
@@ -3961,20 +3975,6 @@ export declare class DiffEditorControlRenderer extends DiffEditor {
         } | undefined;
         clearValueOnHidden?: boolean | undefined;
         validateApi?: string | import("amis-core").BaseApiObject | undefined;
-        $ref?: string | undefined;
-        disabledOn?: string | undefined;
-        hidden?: boolean | undefined;
-        hiddenOn?: string | undefined;
-        visible?: boolean | undefined;
-        visibleOn?: string | undefined;
-        id?: string | undefined;
-        static?: boolean | undefined;
-        staticOn?: string | undefined;
-        staticPlaceholder?: string | undefined;
-        staticClassName?: import("amis-core").SchemaClassName | undefined;
-        staticLabelClassName?: import("amis-core").SchemaClassName | undefined;
-        staticInputClassName?: import("amis-core").SchemaClassName | undefined;
-        staticSchema?: any;
         diffValue?: string | undefined;
         language?: string | undefined;
     };

package/lib/renderers/Form/DiffEditor.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

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

@@ -3831,12 +3831,12 @@ export declare class EditorControlRenderer extends EditorControl {
             loadAutoUpdateData: (api: import("amis-core").Api, data?: object | undefined, silent?: boolean | undefined) => Promise<import("amis-core").Payload>;
         }, import("mobx-state-tree")._NotCustomized, import("mobx-state-tree")._NotCustomized>>) | undefined;
         formInited?: boolean | undefined;
-        formMode?: "horizontal" | "inline" | "normal" | "row" | "default" | undefined;
+        formMode?: "horizontal" | "default" | "inline" | "row" | "normal" | undefined;
         formHorizontal?: import("amis-core").FormHorizontal | undefined;
         formLabelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         formLabelWidth?: string | number | undefined;
-        defaultSize?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
-        size?: "full" | "xs" | "sm" | "md" | "lg" | undefined;
+        defaultSize?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
+        size?: "xs" | "sm" | "md" | "lg" | "full" | undefined;
         labelAlign?: import("amis-core/lib/renderers/Item").LabelAlign | undefined;
         labelWidth?: string | number | undefined;
         disabled?: boolean | undefined;

package/lib/renderers/Form/Editor.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Form/FieldSet.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Form/Formula.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Form/Group.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Form/Hidden.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Form/IconPicker.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Form/IconPickerIcons.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

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

@@ -18,6 +18,7 @@ export interface IconSelectProps extends FormControlProps, SpinnerExtraProps {
 export interface IconChecked {
     id: string;
     name?: string;
+    svg?: string;
 }
 export interface IconSelectState {
     showModal: boolean;
@@ -34,6 +35,7 @@ export default class IconSelectControl extends React.PureComponent<IconSelectPro
     static defaultProps: Pick<IconSelectProps, 'noDataTip' | 'clearable'>;
     state: IconSelectState;
     constructor(props: IconSelectProps);
+    getValueBySvg(svg: string | undefined): IconSelectStore.SvgIcon | null;
     handleClick(): void;
     handleClear(e: React.MouseEvent): void;
     renderInputArea(): JSX.Element;

package/lib/renderers/Form/IconSelect.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';
@@ -14,6 +14,7 @@ var matchSorter = require('match-sorter');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
 var debouce = require('lodash/debounce');
+var find = require('lodash/find');
 var IconSelectStore = require('./IconSelectStore.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -21,6 +22,7 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
 var debouce__default = /*#__PURE__*/_interopDefaultLegacy(debouce);
+var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
 
 /**
  * 新图标选择器
@@ -39,6 +41,21 @@ var IconSelectControl = /** @class */ (function (_super) {
         _this.handleSearchValueChange = debouce__default["default"](_this.handleSearchValueChange.bind(_this), 300);
         return _this;
     }
+    IconSelectControl.prototype.getValueBySvg = function (svg) {
+        if (!svg || typeof svg !== 'string') {
+            return null;
+        }
+        var findItem = undefined;
+        if (IconSelectStore.svgIcons && IconSelectStore.svgIcons.length) {
+            for (var i = 0; i < IconSelectStore.svgIcons.length; i++) {
+                findItem = find__default["default"](IconSelectStore.svgIcons[i].children, function (i) { return i.svg === svg; });
+                if (findItem) {
+                    break;
+                }
+            }
+        }
+        return findItem || null;
+    };
     IconSelectControl.prototype.handleClick = function () {
         if (this.props.disabled) {
             return;
@@ -51,7 +68,8 @@ var IconSelectControl = /** @class */ (function (_super) {
         this.props.onChange && this.props.onChange('');
     };
     IconSelectControl.prototype.renderInputArea = function () {
-        var _a = this.props, ns = _a.classPrefix, disabled = _a.disabled, value = _a.value, placeholder = _a.placeholder, clearable = _a.clearable;
+        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 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")) },
@@ -82,9 +100,15 @@ var IconSelectControl = /** @class */ (function (_super) {
     };
     IconSelectControl.prototype.handleConfirm = function () {
         var checkedIcon = this.state.tmpCheckIconId;
-        this.props.onChange &&
-            this.props.onChange(checkedIcon && checkedIcon.id
-                ? tslib.__assign(tslib.__assign({}, checkedIcon), { id: 'svg-' + checkedIcon.id }) : '');
+        if (this.props.returnSvg) {
+            this.props.onChange &&
+                this.props.onChange(checkedIcon && checkedIcon.svg || '');
+        }
+        else {
+            this.props.onChange &&
+                this.props.onChange(checkedIcon && checkedIcon.id
+                    ? tslib.__assign(tslib.__assign({}, checkedIcon), { id: 'svg-' + checkedIcon.id }) : '');
+        }
         this.toggleModel(false);
     };
     IconSelectControl.prototype.handleClickIconInModal = function (icon) {
@@ -178,7 +202,8 @@ var IconSelectControl = /** @class */ (function (_super) {
             []);
     };
     IconSelectControl.prototype.toggleModel = function (isShow) {
-        var value = this.props.value;
+        var valueTemp = this.props.value;
+        var value = typeof valueTemp === 'string' ? this.getValueBySvg(valueTemp) : valueTemp;
         if (isShow === undefined) {
             this.setState({
                 showModal: !this.state.showModal,

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

@@ -1,6 +1,7 @@
 export interface SvgIcon {
     name: string;
     id: string;
+    svg?: string;
 }
 export interface SvgIconGroup {
     name: string;

package/lib/renderers/Form/IconSelectStore.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';

package/lib/renderers/Form/InputArray.js

@@ -1,6 +1,6 @@
 /**
- * amis v2.6.0
- * Copyright 2018-2022 baidu
+ * amis v2.7.0
+ * Copyright 2018-2023 baidu
  */
 
 'use strict';