amis-ui 3.5.2 → 3.6.0

package/esm/components/calendar/DaysView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -328,7 +328,7 @@ var CustomDaysView = /** @class */ (function (_super) {
                 var selectDate = convertArrayValueToMoment(value, ['year', 'month'], currentDate);
                 var dateBoundary = _this.props.getDateBoundary(selectDate);
                 _this.setState({
-                    columns: _this.props.getColumns(_this.state.types, dateBoundary),
+                    columns: _this.getColumnsWithUnit(_this.props.getColumns(_this.state.types, dateBoundary)),
                     pickerValue: value
                 });
             }
@@ -354,7 +354,7 @@ var CustomDaysView = /** @class */ (function (_super) {
         var dateBoundary = _this.props.getDateBoundary(currentDate);
         var columns = _this.props.getColumns(types, dateBoundary);
         _this.state = {
-            columns: columns,
+            columns: _this.getColumnsWithUnit(columns),
             types: types,
             pickerValue: currentDate.toArray(),
             uniqueTag: new Date().valueOf()
@@ -375,6 +375,7 @@ var CustomDaysView = /** @class */ (function (_super) {
         return 1;
     };
     CustomDaysView.prototype.renderDays = function () {
+        var _this = this;
         var date = this.props.viewDate, selected = this.props.selectedDate && this.props.selectedDate.clone(), prevMonth = date.clone().subtract(1, 'months'), currentYear = date.year(), currentMonth = date.month(), weeks = [], days = [], renderer = this.props.renderDay || this.renderDay, isValid = this.props.isValidDate || this.alwaysValidDate, classes, isDisabled, dayProps, currentDate;
         var _a = this.props.todayActiveStyle, todayActiveStyle = _a === void 0 ? {} : _a;
         // Go to the last week of the previous month
@@ -403,8 +404,18 @@ var CustomDaysView = /** @class */ (function (_super) {
                 'data-value': prevMonth.date(),
                 'className': classes
             }, classes.includes('rdtToday') ? { todayActiveStyle: todayActiveStyle } : {});
-            if (!isDisabled)
-                dayProps.onClick = this.updateSelectedDate;
+            if (!isDisabled) {
+                dayProps.onClick = function (event) {
+                    _this.props.onClick(event);
+                    _this.updateSelectedDate(event);
+                };
+                dayProps.onMouseEnter = function (event) {
+                    _this.props.onMouseEnter(event);
+                };
+                dayProps.onMouseLeave = function (event) {
+                    _this.props.onMouseLeave(event);
+                };
+            }
             days.push(renderer(dayProps, currentDate, selected));
             if (days.length === 7) {
                 weeks.push(React__default.createElement('tr', { key: prevMonth.format('M_D') }, days));
@@ -415,14 +426,26 @@ var CustomDaysView = /** @class */ (function (_super) {
         return weeks;
     };
     CustomDaysView.prototype.componentDidMount = function () {
-        var _this = this;
         var _a = this.props, timeFormat = _a.timeFormat, selectedDate = _a.selectedDate, viewDate = _a.viewDate, isEndDate = _a.isEndDate;
+        var date = selectedDate || (isEndDate ? viewDate.endOf('day') : viewDate);
+        this.setupTime(date, timeFormat, 'init');
+    };
+    CustomDaysView.prototype.componentDidUpdate = function (prevProps, prevState, snapshot) {
+        var currentDate = this.props.selectedDate;
+        if (moment.isMoment(currentDate) &&
+            currentDate.isValid() &&
+            !currentDate.isSame(prevProps.selectedDate)) {
+            var timeFormat = this.props.timeFormat;
+            this.setupTime(currentDate, timeFormat);
+        }
+    };
+    CustomDaysView.prototype.setupTime = function (date, timeFormat, mode) {
+        var _this = this;
         var formatMap = {
             hours: 'HH',
             minutes: 'mm',
             seconds: 'ss'
         };
-        var date = selectedDate || (isEndDate ? viewDate.endOf('day') : viewDate);
         timeFormat.split(':').forEach(function (format, i) {
             var type = /h/i.test(format)
                 ? 'hours'
@@ -432,10 +455,23 @@ var CustomDaysView = /** @class */ (function (_super) {
                         ? 'seconds'
                         : '';
             if (type) {
-                _this.scrollToTop(type, parseInt(date.format(formatMap[type]), 10), i, 'init');
+                _this.scrollToTop(type, parseInt(date.format(formatMap[type]), 10), i, mode);
             }
         });
     };
+    CustomDaysView.prototype.getColumnsWithUnit = function (columns) {
+        return this.props.locale === 'zh-CN' && columns.length === 3
+            ? columns.map(function (item, index) {
+                var _a;
+                (_a = item.options) === null || _a === void 0 ? void 0 : _a.map(function (option) {
+                    option.text =
+                        option.text + (index === 0 ? '年' : index === 1 ? '月' : '日');
+                    return option;
+                });
+                return item;
+            })
+            : columns;
+    };
     /** 时间选择器数据源 */
     CustomDaysView.prototype.computedTimeOptions = function (timeScale) {
         var _a;

package/esm/components/calendar/MonthsView.d.ts

@@ -53,6 +53,11 @@ export declare class CustomMonthsView extends React.Component<CustomMonthsViewPr
     constructor(props: any);
     renderMonths(): React.DetailedReactHTMLElement<React.HTMLAttributes<HTMLElement>, HTMLElement>[];
     updateSelectedMonth(event: any): void;
+    getColumnsWithUnit(columns: {
+        options: PickerOption[];
+    }[]): {
+        options: PickerOption[];
+    }[];
     renderMonth: (props: any, month: number, year: number, date: moment.Moment) => React.JSX.Element;
     onConfirm: (value: number[], types?: string[]) => void;
     onPickerChange: (value: number[], index: number) => void;

package/esm/components/calendar/MonthsView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -67,7 +67,10 @@ var CustomMonthsView = /** @class */ (function (_super) {
                         };
                     })
                 };
-                _this.setState({ columns: columns, pickerValue: value });
+                _this.setState({
+                    columns: _this.getColumnsWithUnit(columns),
+                    pickerValue: value
+                });
             }
         };
         _this.renderPicker = function () {
@@ -80,7 +83,7 @@ var CustomMonthsView = /** @class */ (function (_super) {
         var dateBoundary = _this.props.getDateBoundary(currentDate);
         var columns = _this.props.getColumns(['year', 'month'], dateBoundary);
         _this.state = {
-            columns: columns,
+            columns: _this.getColumnsWithUnit(columns),
             pickerValue: currentDate.toArray()
         };
         _this.updateSelectedMonth = _this.updateSelectedMonth.bind(_this);
@@ -131,6 +134,18 @@ var CustomMonthsView = /** @class */ (function (_super) {
     CustomMonthsView.prototype.updateSelectedMonth = function (event) {
         this.props.updateSelectedDate(event);
     };
+    CustomMonthsView.prototype.getColumnsWithUnit = function (columns) {
+        return this.props.locale === 'zh-CN' && columns.length === 2
+            ? columns.map(function (item, index) {
+                var _a;
+                (_a = item.options) === null || _a === void 0 ? void 0 : _a.map(function (option) {
+                    option.text = option.text + (index === 0 ? '年' : '月');
+                    return option;
+                });
+                return item;
+            })
+            : columns;
+    };
     CustomMonthsView.prototype.alwaysValidDate = function () {
         return true;
     };

package/esm/components/calendar/QuartersView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/calendar/TimeView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/calendar/YearsView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/condition-builder/Expression.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/condition-builder/Field.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/condition-builder/Func.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/condition-builder/Group.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/condition-builder/GroupOrItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/condition-builder/InputSwitch.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/condition-builder/Item.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -38,7 +38,11 @@ var ConditionItem = /** @class */ (function (_super) {
         onChange(value, this.props.index);
     };
     ConditionItem.prototype.handleLeftChange = function (leftValue) {
-        var value = __assign(__assign({}, this.props.value), { left: leftValue, op: undefined, right: undefined });
+        var _a;
+        var _b = this.props, fields = _b.fields, config = _b.config;
+        // 获取默认Op
+        var field = findTree(fields, function (f) { return f.name === leftValue.field; });
+        var value = __assign(__assign({}, this.props.value), { left: leftValue, op: (field === null || field === void 0 ? void 0 : field.defaultOp) || ((_a = config.types[field === null || field === void 0 ? void 0 : field.type]) === null || _a === void 0 ? void 0 : _a.defaultOp) || undefined, right: undefined });
         var onChange = this.props.onChange;
         onChange(value, this.props.index);
     };

package/esm/components/condition-builder/Value.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/condition-builder/config.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -41,6 +41,7 @@ var defaultConfig = {
             ]
         },
         number: {
+            defaultOp: 'equal',
             operators: [
                 'equal',
                 'not_equal',
@@ -55,6 +56,7 @@ var defaultConfig = {
             ]
         },
         date: {
+            defaultOp: 'equal',
             operators: [
                 'equal',
                 'not_equal',
@@ -69,6 +71,7 @@ var defaultConfig = {
             ]
         },
         time: {
+            defaultOp: 'equal',
             operators: [
                 'equal',
                 'not_equal',
@@ -83,6 +86,7 @@ var defaultConfig = {
             ]
         },
         datetime: {
+            defaultOp: 'equal',
             operators: [
                 'equal',
                 'not_equal',
@@ -97,6 +101,7 @@ var defaultConfig = {
             ]
         },
         select: {
+            defaultOp: 'select_equals',
             operators: [
                 'select_equals',
                 'select_not_equals',
@@ -106,6 +111,7 @@ var defaultConfig = {
             valueTypes: ['value']
         },
         boolean: {
+            defaultOp: 'equal',
             operators: ['equal', 'not_equal']
         }
     }

package/esm/components/condition-builder/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/formula/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/formula/FuncList.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/formula/Input.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -20,7 +20,7 @@ var FormulaInput = function (props) {
     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 schemaType = inputSettings.type;
     /** 自上层共享的属性 */
-    var sharedProps = pick(props, ['disabeld', 'clearable']);
+    var sharedProps = pick(props, ['disabled', 'clearable']);
     var pipInValue = useCallback(function (value) {
         return value;
     }, ['value']);

package/esm/components/formula/Picker.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/formula/VariableList.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/formula/plugin.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/icons.js

@@ -1,10 +1,10 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
 import { __assign } from 'tslib';
-import React__default from 'react';
+import React__default, { createElement } from 'react';
 import cx from 'classnames';
 import SvgClose from '../icons/close.svg.js';
 export { default as CloseIcon } from '../icons/close.svg.js';
@@ -253,7 +253,8 @@ registerIcon('rotate-right', SvgRotateRight);
 registerIcon('scale-origin', SvgScaleOrigin);
 registerIcon('if', SvgIf);
 function Icon(_a) {
-    var icon = _a.icon, className = _a.className, _b = _a.classPrefix, classPrefix = _b === void 0 ? '' : _b, classNameProp = _a.classNameProp, iconContent = _a.iconContent, vendor = _a.vendor, iconCx = _a.cx, _c = _a.onClick, onClick = _c === void 0 ? function () { } : _c, style = _a.style;
+    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 cx$1 = iconCx || cx;
     if (typeof jest !== 'undefined' && icon) {
         iconContent = '';
@@ -302,12 +303,28 @@ function Icon(_a) {
     if (isObject(icon) &&
         typeof icon.id === 'string' &&
         icon.id.startsWith('svg-')) {
-        return (React__default.createElement("svg", { onClick: onClick, className: cx$1('icon', 'icon-object', className, classNameProp), style: style },
-            React__default.createElement("use", { xlinkHref: "#".concat(icon.id.replace(/^svg-/, '')) })));
+        var svg = icon;
+        var id = "".concat(svg.id.replace(/^svg-/, ''));
+        if (!document.getElementById(id)) {
+            // 如果svg symbol不存在，则尝试将svg字符串赋值给icon，走svg字符串的逻辑
+            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 },
+                React__default.createElement("use", { xlinkHref: '#' + id })));
+        }
     }
     // 直接传入svg字符串
     if (typeof icon === 'string' && icon.startsWith('<svg')) {
-        return React__default.createElement("i", { dangerouslySetInnerHTML: { __html: icon } });
+        var svgStr = /<svg .*?>(.*?)<\/svg>/.exec(icon);
+        var svgHTML = createElement('svg', {
+            onClick: onClick,
+            className: cx$1('icon', className, classNameProp),
+            style: style,
+            dangerouslySetInnerHTML: { __html: svgStr ? svgStr[1] : '' },
+            viewBox: '0 0 16 16'
+        });
+        return svgHTML;
     }
     // icon是链接
     var isURLIcon = typeof icon === 'string' && (icon === null || icon === void 0 ? void 0 : icon.indexOf('.')) !== -1;

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/menu/MenuContext.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/menu/MenuItem.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 

package/esm/components/menu/SubMenu.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */