amis-ui 3.5.2 → 3.6.0

package/lib/components/calendar/DaysView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -346,7 +346,7 @@ var CustomDaysView = /** @class */ (function (_super) {
                 var selectDate = amisCore.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
                 });
             }
@@ -372,7 +372,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()
@@ -393,6 +393,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
@@ -421,8 +422,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(_J$X_('tr', { key: prevMonth.format('M_D') }, days));
@@ -433,14 +444,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__default["default"].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'
@@ -450,10 +473,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/lib/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/lib/components/calendar/MonthsView.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -79,7 +79,10 @@ var CustomMonthsView = /** @class */ (function (_super) {
                         };
                     })
                 };
-                _this.setState({ columns: columns, pickerValue: value });
+                _this.setState({
+                    columns: _this.getColumnsWithUnit(columns),
+                    pickerValue: value
+                });
             }
         };
         _this.renderPicker = function () {
@@ -92,7 +95,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);
@@ -143,6 +146,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/lib/components/calendar/QuartersView.js

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

package/lib/components/calendar/TimeView.js

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

package/lib/components/calendar/YearsView.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -49,7 +49,11 @@ var ConditionItem = /** @class */ (function (_super) {
         onChange(value, this.props.index);
     };
     ConditionItem.prototype.handleLeftChange = function (leftValue) {
-        var value = tslib.__assign(tslib.__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 = amisCore.findTree(fields, function (f) { return f.name === leftValue.field; });
+        var value = tslib.__assign(tslib.__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/lib/components/condition-builder/Value.js

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

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.5.2
+ * amis-ui v3.6.0
  * Copyright 2018-2023 fex
  */
 
@@ -45,6 +45,7 @@ var defaultConfig = {
             ]
         },
         number: {
+            defaultOp: 'equal',
             operators: [
                 'equal',
                 'not_equal',
@@ -59,6 +60,7 @@ var defaultConfig = {
             ]
         },
         date: {
+            defaultOp: 'equal',
             operators: [
                 'equal',
                 'not_equal',
@@ -73,6 +75,7 @@ var defaultConfig = {
             ]
         },
         time: {
+            defaultOp: 'equal',
             operators: [
                 'equal',
                 'not_equal',
@@ -87,6 +90,7 @@ var defaultConfig = {
             ]
         },
         datetime: {
+            defaultOp: 'equal',
             operators: [
                 'equal',
                 'not_equal',
@@ -101,6 +105,7 @@ var defaultConfig = {
             ]
         },
         select: {
+            defaultOp: 'select_equals',
             operators: [
                 'select_equals',
                 'select_not_equals',
@@ -110,6 +115,7 @@ var defaultConfig = {
             valueTypes: ['value']
         },
         boolean: {
+            defaultOp: 'equal',
             operators: ['equal', 'not_equal']
         }
     }

package/lib/components/condition-builder/index.d.ts

@@ -43,7 +43,7 @@ export interface ConditionBuilderState {
 }
 export declare class QueryBuilder extends React.Component<ConditionBuilderProps, ConditionBuilderState> {
     config: {
-        valueTypes?: ("value" | "func" | "field")[] | undefined;
+        valueTypes?: ("value" | "field" | "func")[] | undefined;
         fields?: ConditionBuilderFields | undefined;
         funcs?: ConditionBuilderFuncs | undefined;
         maxLevel?: number | undefined;

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

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