amis-ui 3.6.2 → 6.0.0

package/esm/components/formula/Input.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -7,7 +7,7 @@ import { __assign } from 'tslib';
 import React__default, { useCallback } from 'react';
 import moment from 'moment';
 import pick from 'lodash/pick';
-import { themeable, localeable, uncontrollable, findTree, isExpression, noop } from 'amis-core';
+import { themeable, localeable, uncontrollable, findTree, isExpression, isObject, noop } from 'amis-core';
 import { FormulaEditor } from './Editor.js';
 import ResultBox from '../ResultBox.js';
 import EnhancedSelect from '../Select.js';
@@ -16,8 +16,8 @@ import DatePicker from '../DatePicker.js';
 import Tag from '../Tag.js';
 
 var FormulaInput = function (props) {
-    var _a, _b, _c, _d, _e;
-    var __ = props.translate, className = props.className, cx = props.classnames, allowInput = props.allowInput, placeholder = props.placeholder, borderMode = props.borderMode, evalMode = props.evalMode, mixedMode = props.mixedMode, value = props.value, variables = props.variables, _f = props.inputSettings, inputSettings = _f === void 0 ? { type: 'text' } : _f, popOverContainer = props.popOverContainer, onChange = props.onChange, itemRender = props.itemRender;
+    var _a, _b, _c, _d;
+    var __ = props.translate, className = props.className, cx = props.classnames, allowInput = props.allowInput, placeholder = props.placeholder, borderMode = props.borderMode, evalMode = props.evalMode, mixedMode = props.mixedMode, value = props.value, variables = props.variables, _e = props.inputSettings, inputSettings = _e === void 0 ? { type: 'text' } : _e, popOverContainer = props.popOverContainer, onChange = props.onChange, itemRender = props.itemRender;
     var schemaType = inputSettings.type;
     /** 自上层共享的属性 */
     var sharedProps = pick(props, ['disabled', 'clearable']);
@@ -34,9 +34,31 @@ var FormulaInput = function (props) {
             result = origin.value;
         }
         else if (schemaType === 'select') {
-            result = Array.isArray(origin)
-                ? origin.map(function (item) { return item.value; })
-                : origin.value;
+            var joinValues = inputSettings.joinValues, extractValue = inputSettings.extractValue, delimiter = inputSettings.delimiter, multiple = inputSettings.multiple, _a = inputSettings.valueField, valueField_1 = _a === void 0 ? 'value' : _a;
+            if (joinValues) {
+                if (multiple) {
+                    result = Array.isArray(origin)
+                        ? origin.map(function (item) { return item[valueField_1]; }).join(delimiter)
+                        : origin
+                            ? origin[valueField_1]
+                            : '';
+                }
+                else {
+                    result = origin ? origin[valueField_1] : '';
+                }
+            }
+            else if (extractValue) {
+                if (multiple) {
+                    result = Array.isArray(origin)
+                        ? origin.map(function (item) { return item[valueField_1]; })
+                        : origin
+                            ? [origin[valueField_1 || 'value']]
+                            : [];
+                }
+                else {
+                    result = origin ? origin[valueField_1] : '';
+                }
+            }
         }
         onChange === null || onChange === void 0 ? void 0 : onChange(result);
     }, ['onChange']);
@@ -56,24 +78,56 @@ var FormulaInput = function (props) {
                 : cmptValue === (item === null || item === void 0 ? void 0 : item.value);
         })
         : null;
-    if (isExpression(cmptValue) ||
-        targetVariable ||
-        (schemaType === 'number' &&
-            cmptValue != null &&
-            typeof cmptValue !== 'number') ||
-        (['date', 'time', 'datetime'].includes(schemaType) &&
-            !moment(cmptValue).isValid()) ||
-        (schemaType === 'select' &&
-            cmptValue != null &&
-            !((_a = inputSettings === null || inputSettings === void 0 ? void 0 : inputSettings.options) !== null && _a !== void 0 ? _a : []).some(function (item) { return (item === null || item === void 0 ? void 0 : item.value) === cmptValue; })) ||
-        (schemaType === 'boolean' &&
-            cmptValue != null &&
-            typeof cmptValue !== 'boolean')) {
-        var varName = cmptValue && mixedMode
+    var useVariable = !!(isExpression(cmptValue) || targetVariable);
+    /** 判断value是否为变量，如果是变量，使用ResultBox渲染 */
+    if (!useVariable) {
+        if (schemaType === 'number') {
+            useVariable = cmptValue != null && typeof cmptValue !== 'number';
+        }
+        else if (['date', 'time', 'datetime'].includes(schemaType)) {
+            useVariable = !moment(cmptValue).isValid();
+        }
+        else if (schemaType === 'select') {
+            var options = inputSettings.options, joinValues = inputSettings.joinValues, extractValue = inputSettings.extractValue, delimiter = inputSettings.delimiter, multiple = inputSettings.multiple, _f = inputSettings.valueField, valueField_2 = _f === void 0 ? 'value' : _f;
+            var selctedValue_1 = [];
+            if (multiple) {
+                if (joinValues) {
+                    selctedValue_1 =
+                        typeof cmptValue === 'string' ? cmptValue.split(delimiter) : [];
+                }
+                else {
+                    selctedValue_1 = Array.isArray(cmptValue)
+                        ? extractValue
+                            ? cmptValue
+                            : cmptValue.map(function (i) { return i === null || i === void 0 ? void 0 : i[valueField_2]; })
+                        : [];
+                }
+            }
+            else {
+                if (joinValues) {
+                    selctedValue_1 = typeof cmptValue === 'string' ? [cmptValue] : [];
+                }
+                else {
+                    selctedValue_1 = isObject(cmptValue) ? [cmptValue === null || cmptValue === void 0 ? void 0 : cmptValue[valueField_2]] : [];
+                }
+            }
+            /** 选项类型清空后是空字符串， */
+            useVariable =
+                cmptValue &&
+                    !(options !== null && options !== void 0 ? options : []).some(function (item) {
+                        return selctedValue_1.includes(item === null || item === void 0 ? void 0 : item.value);
+                    });
+        }
+        else if (schemaType === 'boolean') {
+            useVariable = cmptValue != null && typeof cmptValue !== 'boolean';
+        }
+    }
+    if (useVariable) {
+        var varName = typeof cmptValue === 'string' && cmptValue && mixedMode
             ? cmptValue.replace(/^\$\{/, '').replace(/\}$/, '')
             : cmptValue;
-        var resultValue = (_b = targetVariable === null || targetVariable === void 0 ? void 0 : targetVariable.value) !== null && _b !== void 0 ? _b : varName;
-        return (React__default.createElement(ResultBox, { className: cx("FormulaPicker-input-variable"), allowInput: false, value: resultValue, result: resultValue == null
+        var resultValue = (_a = targetVariable === null || targetVariable === void 0 ? void 0 : targetVariable.value) !== null && _a !== void 0 ? _a : varName;
+        return (React__default.createElement(ResultBox, { className: cx("FormulaPicker-input-variable"), allowInput: allowInput, value: resultValue, result: resultValue == null
                 ? void 0
                 : FormulaEditor.highlightValue(resultValue, variables, evalMode), itemRender: function (item) {
                 return (React__default.createElement("div", { className: cx('FormulaPicker-ResultBox'), dangerouslySetInnerHTML: { __html: item.html } }));
@@ -96,15 +150,15 @@ var FormulaInput = function (props) {
         return (React__default.createElement(EnhancedSelect, __assign({}, sharedProps, { className: cx(className, "FormulaPicker-input-".concat(schemaType)), borderMode: "none", multiple: schemaType === 'boolean' ? false : inputSettings.multiple, options: schemaType === 'boolean'
                 ? [
                     {
-                        label: __((_c = inputSettings === null || inputSettings === void 0 ? void 0 : inputSettings.trueLabel) !== null && _c !== void 0 ? _c : 'FormulaInput.True'),
+                        label: __((_b = inputSettings === null || inputSettings === void 0 ? void 0 : inputSettings.trueLabel) !== null && _b !== void 0 ? _b : 'FormulaInput.True'),
                         value: true
                     },
                     {
-                        label: __((_d = inputSettings === null || inputSettings === void 0 ? void 0 : inputSettings.falseLabel) !== null && _d !== void 0 ? _d : 'FormulaInput.False'),
+                        label: __((_c = inputSettings === null || inputSettings === void 0 ? void 0 : inputSettings.falseLabel) !== null && _c !== void 0 ? _c : 'FormulaInput.False'),
                         value: false
                     }
                 ]
-                : (_e = inputSettings.options) !== null && _e !== void 0 ? _e : [], value: pipInValue(value), renderValueLabel: function (option) {
+                : (_d = inputSettings.options) !== null && _d !== void 0 ? _d : [], value: pipInValue(value), renderValueLabel: function (option) {
                 var _a, _b;
                 var label = (_b = (_a = option.label) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '';
                 return schemaType === 'boolean' || !inputSettings.multiple ? (React__default.createElement(Tag, { label: label, className: cx('rounded') })) : (React__default.createElement(React__default.Fragment, null, label));

package/esm/components/formula/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/formula/VariableList.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -78,7 +78,7 @@ function VariableList(props) {
         ? props.itemRender
         : function (option, states) {
             var _a;
-            return (React__default.createElement("div", null,
+            return (React__default.createElement("div", { key: states.index },
                 React__default.createElement("div", { className: cx("".concat(classPrefix, "-item"), itemClassName) },
                     option.label &&
                         selfVariableName &&
@@ -99,7 +99,7 @@ function VariableList(props) {
                         }, popOverRender: function (_a) {
                             var onClose = _a.onClose;
                             return (React__default.createElement("ul", { className: cx("".concat(classPrefix, "-item-oper")) }, memberOpers.map(function (item, i) {
-                                return (React__default.createElement(TooltipWrapper, { tooltip: item.description, tooltipTheme: "dark" },
+                                return (React__default.createElement(TooltipWrapper, { key: i, tooltip: item.description, tooltipTheme: "dark" },
                                     React__default.createElement("li", { key: i, onClick: function () {
                                             return handleMemberClick(__assign(__assign({}, item), { isMember: true }), option, onClose);
                                         } },

package/esm/components/formula/plugin.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/icons.d.ts

@@ -51,7 +51,7 @@ export interface IconCheckedSchemaNew {
     type: 'icon';
     icon: IconCheckedSchema;
 }
-export declare function Icon({ icon, className, classPrefix, classNameProp, iconContent, vendor, cx: iconCx, onClick, style }: {
+export declare function Icon({ icon, className, classPrefix, classNameProp, iconContent, vendor, cx: iconCx, onClick, onMouseEnter, onMouseLeave, style }: {
     icon: string;
     iconContent?: string;
 } & React.ComponentProps<any>): React.JSX.Element | null;

package/esm/components/icons.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -28,6 +28,8 @@ import SvgLeftArrow from '../icons/left-arrow.svg.js';
 export { default as LeftArrowIcon } from '../icons/left-arrow.svg.js';
 import SvgRightArrow from '../icons/right-arrow.svg.js';
 export { default as RightArrowIcon } from '../icons/right-arrow.svg.js';
+import SvgArrowDoubleLeft from '../icons/arrow-double-left.svg.js';
+import SvgArrowDoubleRight from '../icons/arrow-double-right.svg.js';
 import SvgCheck from '../icons/check.svg.js';
 export { default as CheckIcon } from '../icons/check.svg.js';
 import SvgPlus from '../icons/plus.svg.js';
@@ -247,6 +249,8 @@ registerIcon('remove', SvgRemove);
 registerIcon('invisible', SvgInvisible);
 registerIcon('down', SvgDown);
 registerIcon('right-double-arrow', SvgRightDoubleArrow);
+registerIcon('arrow-double-left', SvgArrowDoubleLeft);
+registerIcon('arrow-double-right', SvgArrowDoubleRight);
 registerIcon('new-edit', SvgNewEdit);
 registerIcon('rotate-left', SvgRotateLeft);
 registerIcon('rotate-right', SvgRotateRight);
@@ -254,7 +258,7 @@ registerIcon('scale-origin', SvgScaleOrigin);
 registerIcon('if', SvgIf);
 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, _d = _a.onClick, onClick = _d === void 0 ? function () { } : _d, style = _a.style;
+    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, _d = _a.onClick, onClick = _d === void 0 ? function () { } : _d, _e = _a.onMouseEnter, onMouseEnter = _e === void 0 ? function () { } : _e, _f = _a.onMouseLeave, onMouseLeave = _f === void 0 ? function () { } : _f, style = _a.style;
     var cx$1 = iconCx || cx;
     if (typeof jest !== 'undefined' && icon) {
         iconContent = '';
@@ -264,7 +268,7 @@ function Icon(_a) {
     }
     // 直接的icon dom
     if (React__default.isValidElement(icon)) {
-        return React__default.cloneElement(icon, __assign(__assign({}, (icon.props || {})), { className: cx(cx$1(className, classNameProp), icon.props.className), style: style, onClick: onClick }));
+        return React__default.cloneElement(icon, __assign(__assign({}, (icon.props || {})), { className: cx(cx$1(className, classNameProp), icon.props.className), style: style, onClick: onClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave }));
     }
     if (iconContent) {
         // 从css变量中获取icon
@@ -284,12 +288,12 @@ function Icon(_a) {
                 }
             }
         };
-        return (React__default.createElement("div", { onClick: onClick, className: cx$1(iconContent, className, classNameProp), ref: refFn, style: style }));
+        return (React__default.createElement("div", { onClick: onClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, className: cx$1(iconContent, className, classNameProp), ref: refFn, style: style }));
     }
     // 获取注册的icon
     var Component = getIcon(icon);
     if (Component) {
-        return (React__default.createElement(Component, { onClick: onClick, className: cx$1(className, "icon-".concat(icon), classNameProp), 
+        return (React__default.createElement(Component, { onClick: onClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, className: cx$1(className, "icon-".concat(icon), classNameProp), 
             // @ts-ignore
             icon: icon, style: style }));
     }
@@ -310,7 +314,7 @@ function Icon(_a) {
             icon = (_b = svg.svg) === null || _b === void 0 ? void 0 : _b.replace(/'/g, '');
         }
         else {
-            return (React__default.createElement("svg", { onClick: onClick, className: cx$1('icon', 'icon-object', className, classNameProp), style: style },
+            return (React__default.createElement("svg", { onClick: onClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, className: cx$1('icon', 'icon-object', className, classNameProp), style: style },
                 React__default.createElement("use", { xlinkHref: '#' + id })));
         }
     }
@@ -319,6 +323,8 @@ function Icon(_a) {
         var svgStr = /<svg .*?>(.*?)<\/svg>/.exec(icon);
         var svgHTML = createElement('svg', {
             onClick: onClick,
+            onMouseEnter: onMouseEnter,
+            onMouseLeave: onMouseLeave,
             className: cx$1('icon', className, classNameProp),
             style: style,
             dangerouslySetInnerHTML: { __html: svgStr ? svgStr[1] : '' },
@@ -329,7 +335,7 @@ function Icon(_a) {
     // icon是链接
     var isURLIcon = typeof icon === 'string' && (icon === null || icon === void 0 ? void 0 : icon.indexOf('.')) !== -1;
     if (isURLIcon) {
-        return (React__default.createElement("img", { onClick: onClick, className: cx$1("".concat(classPrefix, "Icon"), className, classNameProp), src: icon, style: style }));
+        return (React__default.createElement("img", { onClick: onClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, className: cx$1("".concat(classPrefix, "Icon"), className, classNameProp), src: icon, style: style }));
     }
     // icon是普通字符串
     var isIconfont = typeof icon === 'string';
@@ -346,7 +352,7 @@ function Icon(_a) {
         iconPrefix = icon;
     }
     if (isIconfont) {
-        return (React__default.createElement("i", { onClick: onClick, className: cx$1(icon, className, classNameProp, iconPrefix), style: style }));
+        return (React__default.createElement("i", { onClick: onClick, onMouseEnter: onMouseEnter, onMouseLeave: onMouseLeave, className: cx$1(icon, className, classNameProp, iconPrefix), style: style }));
     }
     // 没有合适的图标
     return React__default.createElement("span", { className: "text-danger" },

package/esm/components/index.d.ts

@@ -114,4 +114,5 @@ import Menu from './menu';
 import InputBoxWithSuggestion from './InputBoxWithSuggestion';
 import { CodeMirrorEditor } from './CodeMirror';
 import type CodeMirror from 'codemirror';
-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, Html, Icons, Layout, LazyComponent, Modal, Overlay, PopOver, Radios, Range, Rating, Select, SparkLine, Spinner, SpinnerExtraProps, Switch, Textarea, TitleBar, ToastComponent, 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, VariableItem, 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 };
+import OverflowTpl from './OverflowTpl';
+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, Html, Icons, Layout, LazyComponent, Modal, Overlay, PopOver, Radios, Range, Rating, Select, SparkLine, Spinner, SpinnerExtraProps, Switch, Textarea, TitleBar, ToastComponent, 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, VariableItem, 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 };

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/menu/MenuContext.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/menu/MenuItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/menu/SubMenu.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */