amis-ui 6.11.0-beta.7 → 6.11.0-beta.9

package/lib/components/formula/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.7
+ * amis-ui v6.11.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/lib/components/formula/VariableList.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.7
+ * amis-ui v6.11.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/lib/components/formula/plugin.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.7
+ * amis-ui v6.11.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/lib/components/icons.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.7
+ * amis-ui v6.11.0-beta.9
  * Copyright 2018-2025 fex
  */
 
@@ -256,14 +256,13 @@ registerIcon('rotate-right', rotateRight["default"]);
 registerIcon('scale-origin', scaleOrigin["default"]);
 registerIcon('if', _if["default"]);
 registerIcon('rotate-screen', rotateScreen["default"]);
-function svgString2Dom(icon, _a, vendor) {
+function svgString2Dom(icon, _a, vendorFn) {
     var className = _a.className, classNameProp = _a.classNameProp, style = _a.style, cx = _a.cx, events = _a.events, extra = _a.extra;
     icon = icon.replace(/\n/g, ' ').replace(/\s+/g, ' ');
-    var fn = amisCore.getCustomVendor(vendor);
-    if (fn) {
-        var _b = fn(icon, tslib.__assign(tslib.__assign({}, extra), { width: style.width, height: style.height })), newIcon = _b.icon, newStyle = _b.style;
+    if (vendorFn) {
+        var _b = vendorFn(icon, tslib.__assign(tslib.__assign({}, extra), { width: style === null || style === void 0 ? void 0 : style.width, height: style === null || style === void 0 ? void 0 : style.height })), newIcon = _b.icon, newStyle = _b.style;
         icon = newIcon;
-        style = Object.assign(style, newStyle);
+        style = tslib.__assign(tslib.__assign({}, (style || {})), newStyle);
     }
     var svgStr = /<svg .*?>(.*?)<\/svg>/.exec(icon);
     var viewBox = /viewBox="(.*?)"/.exec(icon);
@@ -271,51 +270,45 @@ function svgString2Dom(icon, _a, vendor) {
     return svgHTML;
 }
 function LinkIcon(_a) {
-    var icon = _a.icon, vendor = _a.vendor, _b = _a.options, className = _b.className, classNameProp = _b.classNameProp, style = _b.style, cx = _b.cx, classPrefix = _b.classPrefix, events = _b.events, extra = _b.extra;
-    var _c = tslib.__read(React__default["default"].useState(undefined), 2), svgIcon = _c[0], setSvgIcon = _c[1];
-    if (icon.endsWith('.svg')) {
-        React.useEffect(function () {
+    var icon = _a.icon, vendorFn = _a.vendorFn, _b = _a.options, className = _b.className, classNameProp = _b.classNameProp, style = _b.style, cx = _b.cx, classPrefix = _b.classPrefix, events = _b.events, extra = _b.extra;
+    var _c = tslib.__read(React__default["default"].useState(icon), 2), svgIcon = _c[0], setSvgIcon = _c[1];
+    var _d = tslib.__read(React__default["default"].useState('img'), 2), svgType = _d[0], setSvgType = _d[1];
+    React.useEffect(function () {
+        if (icon.endsWith('.svg') && vendorFn) {
             try {
                 fetch(icon)
                     .then(function (res) { return res.text(); })
                     .then(function (svg) {
+                    setSvgType('svg');
                     setSvgIcon(svg);
                 })
-                    .catch(function () {
-                    setSvgIcon('error');
+                    .catch(function (e) {
+                    console.warn(e);
+                    setSvgType('img');
+                    setSvgIcon(icon);
                 });
             }
-            catch (error) {
-                setSvgIcon('error');
+            catch (warn) {
+                console.warn(warn);
+                setSvgType('img');
+                setSvgIcon(icon);
             }
-        }, [icon]);
-        if (svgIcon) {
-            if (svgIcon === 'error') {
-                return (_J$X_("img", tslib.__assign({}, events, { className: cx("".concat(classPrefix, "Icon"), className, classNameProp), src: icon, style: style })));
-            }
-            else {
-                return svgString2Dom(svgIcon, {
-                    className: className,
-                    classNameProp: classNameProp,
-                    style: style,
-                    cx: cx,
-                    events: events,
-                    extra: extra
-                }, vendor);
-            }
-        }
-        else {
-            return null;
         }
-    }
-    else {
-        return (_J$X_("img", tslib.__assign({}, events, { className: cx("".concat(classPrefix, "Icon"), className, classNameProp), src: icon, style: style })));
-    }
+    }, [icon, vendorFn]);
+    return svgType === 'img' ? (_J$X_("img", tslib.__assign({}, events, { className: cx("".concat(classPrefix, "Icon"), className, classNameProp), src: icon, style: style }))) : (svgString2Dom(svgIcon, {
+        className: className,
+        classNameProp: classNameProp,
+        style: style,
+        cx: cx,
+        events: events,
+        extra: extra
+    }, vendorFn));
 }
 function Icon(_a) {
     var _b;
     var icon = _a.icon, className = _a.className, _c = _a.classPrefix, classPrefix = _c === void 0 ? '' : _c, classNameProp = _a.classNameProp, iconContent = _a.iconContent, vendor = _a.vendor, iconCx = _a.cx, onClick = _a.onClick, onMouseEnter = _a.onMouseEnter, onMouseLeave = _a.onMouseLeave, onMouseOver = _a.onMouseOver, onMouseOut = _a.onMouseOut, onMouseDown = _a.onMouseDown, onMouseUp = _a.onMouseUp, onMouseMove = _a.onMouseMove, onBlur = _a.onBlur, onFocus = _a.onFocus, onTouchStart = _a.onTouchStart, onTouchMove = _a.onTouchMove, onTouchEnd = _a.onTouchEnd, onTouchCancel = _a.onTouchCancel, style = _a.style, width = _a.width, height = _a.height, extra = _a.extra, testIdBuilder = _a.testIdBuilder;
     var cx = iconCx || cx__default["default"];
+    var vendorFn = React.useMemo(function () { return amisCore.getCustomVendor(vendor); }, [vendor]);
     // style = {
     //   ...(style || {}),
     //   width: width || style?.width,
@@ -411,12 +404,12 @@ function Icon(_a) {
             cx: cx,
             events: events,
             extra: extra
-        }, vendor);
+        }, vendorFn);
     }
     // icon是链接
     var isURLIcon = typeof icon === 'string' && (icon === null || icon === void 0 ? void 0 : icon.indexOf('.')) !== -1;
     if (isURLIcon) {
-        return (_J$X_(LinkIcon, { icon: icon, vendor: vendor, options: {
+        return (_J$X_(LinkIcon, { icon: icon, vendorFn: vendorFn, options: {
                 className: className,
                 classNameProp: classNameProp,
                 style: style,

package/lib/components/index.d.ts

@@ -128,4 +128,5 @@ import VerificationCode from './VerificationCode';
 import Shape from './Shape';
 import type { IShapeType } from './Shape';
 import MobileDevTool from './MobileDevTool';
-export { NotFound, Alert as AlertComponent, alert, Avatar, confirm, prompt, setRenderSchemaFn, ContextMenu, openContextMenus, closeContextMenus, Alert2, AsideNav, Button, Breadcrumb, Checkbox, Selection as Checkboxes, Collapse, CollapseGroup, DatePicker, DateRangePicker, Drawer, Tabs, Tab, Editor, DiffEditor, Html, Icons, Layout, LazyComponent, Modal, Overlay, PopOver, Radios, Range, Rating, Select, value2array, SparkLine, Spinner, SpinnerExtraProps, Switch, Textarea, TitleBar, ToastComponent, ToastComponent as Toast, toast, Tooltip, TooltipWrapper, Tree, Transfer, TabsTransfer, Selection, GroupedSelection, ChainedSelection, TableSelection, TreeSelection, AssociatedSelection, ResultBox, InputBox, InputBoxWithSuggestion, SearchBox, ListGroup, NumberInput, ArrayInput, PullRefresh, Table, SchemaVariableListPicker, SchemaVariableList, VariableList, PickerContainer, ConfirmBox, FormulaPicker, FormulaCodeEditor, VariableItem, FuncGroup, FormulaEditor, InputJSONSchema, withBadge, BadgeObject, Icon, withRemoteConfig, RemoteOptionsProps, ConditionBuilder, ConditionBuilderFuncs, ConditionBuilderFields, ConditionBuilderConfig, CityArea, PresetColor, ListMenu, Input, JSONSchemaEditor, LocationPicker, PopUp, Cascader, TransferDropDown, TabsTransferPicker, ResultList, TransferPicker, UserSelect, UserTabSelect, getIcon, getIconNames, registerIcon, Badge, HeadCellDropDown, AnchorNav, AnchorNavSection, Card, GridNavDirection, GridNav, GridNavItem, Link, VirtualList, AutoSizer, withStore, PopOverContainer, Pagination, Progress, Steps, StepStatus, Tag, Timeline, ImageGallery, BaiduMapPicker, MultilineText, Form, FormField, Controller, Combo, InputTable, InputTableColumnProps, DndContainer, Menu, CodeMirror, CodeMirrorEditor, OverflowTpl, Signature, VerificationCode, Shape, IShapeType, MobileDevTool };
+import DropdownContextMenus from './DropdownContextMenus';
+export { NotFound, Alert as AlertComponent, alert, Avatar, confirm, prompt, setRenderSchemaFn, ContextMenu, openContextMenus, closeContextMenus, Alert2, AsideNav, Button, Breadcrumb, Checkbox, Selection as Checkboxes, Collapse, CollapseGroup, DatePicker, DateRangePicker, Drawer, Tabs, Tab, Editor, DiffEditor, Html, Icons, Layout, LazyComponent, Modal, Overlay, PopOver, Radios, Range, Rating, Select, value2array, SparkLine, Spinner, SpinnerExtraProps, Switch, Textarea, TitleBar, ToastComponent, ToastComponent as Toast, toast, Tooltip, TooltipWrapper, Tree, Transfer, TabsTransfer, Selection, GroupedSelection, ChainedSelection, TableSelection, TreeSelection, AssociatedSelection, ResultBox, InputBox, InputBoxWithSuggestion, SearchBox, ListGroup, NumberInput, ArrayInput, PullRefresh, Table, SchemaVariableListPicker, SchemaVariableList, VariableList, PickerContainer, ConfirmBox, FormulaPicker, FormulaCodeEditor, VariableItem, FuncGroup, FormulaEditor, InputJSONSchema, withBadge, BadgeObject, Icon, withRemoteConfig, RemoteOptionsProps, ConditionBuilder, ConditionBuilderFuncs, ConditionBuilderFields, ConditionBuilderConfig, CityArea, PresetColor, ListMenu, Input, JSONSchemaEditor, LocationPicker, PopUp, Cascader, TransferDropDown, TabsTransferPicker, ResultList, TransferPicker, UserSelect, UserTabSelect, getIcon, getIconNames, registerIcon, Badge, HeadCellDropDown, AnchorNav, AnchorNavSection, Card, GridNavDirection, GridNav, GridNavItem, Link, VirtualList, AutoSizer, withStore, PopOverContainer, Pagination, Progress, Steps, StepStatus, Tag, Timeline, ImageGallery, BaiduMapPicker, MultilineText, Form, FormField, Controller, Combo, InputTable, InputTableColumnProps, DndContainer, Menu, CodeMirror, CodeMirrorEditor, OverflowTpl, Signature, VerificationCode, Shape, IShapeType, MobileDevTool, DropdownContextMenus };

package/lib/components/json-schema/Array.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.7
+ * amis-ui v6.11.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/lib/components/json-schema/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.7
+ * amis-ui v6.11.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/lib/components/json-schema/Object.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.7
+ * amis-ui v6.11.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/lib/components/json-schema/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.7
+ * amis-ui v6.11.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/lib/components/menu/MenuContext.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.7
+ * amis-ui v6.11.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/lib/components/menu/MenuItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.7
+ * amis-ui v6.11.0-beta.9
  * Copyright 2018-2025 fex
  */
 

package/lib/components/menu/SubMenu.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.11.0-beta.7
+ * amis-ui v6.11.0-beta.9
  * Copyright 2018-2025 fex
  */