amis 1.5.1 → 1.5.5

package/src/components/calendar/TimeView.tsx

@@ -5,6 +5,9 @@ import React from 'react';
 import {LocaleProps, localeable} from '../../locale';
 import {Icon} from '../icons';
 import {ClassNamesFn} from '../../theme';
+import Picker from '../Picker';
+import {PickerColumnItem} from '../PickerColumn';
+import {getRange, isMobile} from "../../utils/helper";
 
 export class CustomTimeView extends TimeView {
   props: {
@@ -23,6 +26,9 @@ export class CustomTimeView extends TimeView {
     timeFormat: string;
     classnames: ClassNamesFn;
     setTime: (type: string, value: any) => void;
+    onClose?: () => void;
+    onConfirm?: (value: number[], types: string[]) => void;
+    useMobileUI: boolean;
   } & LocaleProps;
   onStartClicking: any;
   disableContextMenu: any;
@@ -68,10 +74,9 @@ export class CustomTimeView extends TimeView {
     );
   };
 
-  renderCounter = (type: string) => {
-    const cx = this.props.classnames;
+  getCounterValue = (type: string) => {
     if (type !== 'daypart') {
-      var value = this.state[type];
+      let value = this.state[type];
       if (
         type === 'hours' &&
         this.props.timeFormat.toLowerCase().indexOf(' a') !== -1
@@ -82,6 +87,15 @@ export class CustomTimeView extends TimeView {
           value = 12;
         }
       }
+      return parseInt(value);
+    }
+    return 0;
+  }
+
+  renderCounter = (type: string) => {
+    const cx = this.props.classnames;
+    if (type !== 'daypart') {
+      const value = this.getCounterValue(type);
 
       const {min, max, step} = this.timeConstraints[type];
 
@@ -134,10 +148,71 @@ export class CustomTimeView extends TimeView {
     return null;
   };
 
+  onConfirm = (value: number[]) => {
+    this.props.onConfirm && this.props.onConfirm(value, this.state.counters);
+  }
+
+  getDayPartOptions = () => {
+    const {translate: __} = this.props;
+    let options = ['am', 'pm'];
+    if ( this.props.timeFormat.indexOf( ' A' ) !== -1 ) {
+      options = ['AM', 'PM'];
+    }
+
+    return options.map(daypart => ({
+      text: __(daypart),
+      value: daypart
+    }));
+  }
+
+  renderTimeViewPicker = () => {
+    const columns: PickerColumnItem[] = [];
+    const values = [];
+
+    this.state.counters.forEach(type => {
+      if (type !== 'daypart') {
+        const counterValue: number = this.getCounterValue(type);
+        let {min, max, step} = this.timeConstraints[type];
+        // 修正am pm时hours可选最大值
+        if (type === 'hours'
+          && this.state.daypart !== false
+          && this.props.timeFormat.toLowerCase().indexOf(' a') !== -1) {
+            max = max > 12 ? 12 : max;
+        }
+        columns.push({
+          options: getRange(min, max, step)
+        });
+        values.push(counterValue);
+      }
+    });
+    if (this.state.daypart !== false) {
+      columns.push({
+        options: this.getDayPartOptions()
+      });
+      values.push(this.state.daypart)
+    }
+
+    return (
+      <Picker
+        translate={this.props.translate}
+        locale={this.props.locale}
+        columns={columns}
+        value={values} 
+        onConfirm={this.onConfirm}
+        onClose={this.props.onClose}
+        />
+    );
+  }
+
   render() {
-    const counters: Array<JSX.Element | null> = [];
+    let counters: Array<JSX.Element | null> = [];
     const cx = this.props.classnames;
-
+    
+    if (isMobile() && this.props.useMobileUI) {
+      return <div className={cx('CalendarTime')}>
+          {this.renderTimeViewPicker()}
+        </div>
+    }
     this.state.counters.forEach(c => {
       if (counters.length) {
         counters.push(

package/src/components/calendar/YearsView.tsx

@@ -3,10 +3,13 @@ import YearsView from 'react-datetime/src/YearsView';
 import moment from 'moment';
 import React from 'react';
 import {LocaleProps, localeable} from '../../locale';
+import Picker from '../Picker';
+import {convertDateToObject, getRange, isMobile} from "../../utils/helper";
 
 export class CustomYearsView extends YearsView {
   props: {
     viewDate: moment.Moment;
+    selectedDate: moment.Moment;
     subtractTime: (
       amount: number,
       type: string,
@@ -18,6 +21,12 @@ export class CustomYearsView extends YearsView {
       toSelected?: moment.Moment
     ) => () => void;
     showView: (view: string) => () => void;
+    minDate?: moment.Moment;
+    maxDate?: moment.Moment;
+    onChange?: () => void;
+    onClose?: () => void;
+    onConfirm?: (value: number[], types: string[]) => void;
+    useMobileUI: boolean;
   } & LocaleProps;
   renderYears: (year: number) => JSX.Element;
   renderYear = (props: any, year: number) => {
@@ -27,11 +36,45 @@ export class CustomYearsView extends YearsView {
       </td>
     );
   };
+
+  onConfirm = (value: number[]) => {
+    this.props.onConfirm && this.props.onConfirm(value, ["year"])
+  }
+
+  renderYearPicker = () => {
+    const {minDate, maxDate, selectedDate, viewDate} =  this.props;
+    const year = (selectedDate || viewDate || moment()).year();
+    const maxYear = maxDate ? convertDateToObject(maxDate)!.year : year + 100;
+    const minYear = minDate ? convertDateToObject(minDate)!.year : year - 100;
+    
+    const columns = [{
+      options: getRange(minYear, maxYear, 1)
+    }];
+
+    return (
+      <Picker
+        translate={this.props.translate}
+        locale={this.props.locale}
+        columns={columns}
+        value={[year]} 
+        onConfirm={this.onConfirm}
+        onClose={this.props.onClose}
+        />
+    );
+  };
+
   render() {
     let year = this.props.viewDate.year();
     year = year - (year % 10);
     const __ = this.props.translate;
-
+    
+    if (isMobile() && this.props.useMobileUI) {
+      return (
+        <div className="rdtYears">
+          {this.renderYearPicker()}
+        </div>
+      );
+    }
     return (
       <div className="rdtYears">
         <table>

package/src/renderers/CRUD.tsx

@@ -885,7 +885,7 @@ export default class CRUD extends React.Component<CRUDProps, any> {
       env
     } = this.props;
 
-    store.closeDialog();
+    store.closeDialog(true);
     const dialogAction = store.action as Action;
 
     if (stopAutoRefreshWhenModalIsOpen && interval) {
@@ -968,10 +968,10 @@ export default class CRUD extends React.Component<CRUDProps, any> {
     redirect && env.jumpTo(redirect, dialogAction);
   }
 
-  handleDialogClose() {
+  handleDialogClose(confirmed = false) {
     const {store, stopAutoRefreshWhenModalIsOpen, silentPolling, interval} =
       this.props;
-    store.closeDialog();
+    store.closeDialog(confirmed);
 
     if (stopAutoRefreshWhenModalIsOpen && interval) {
       this.timer = setTimeout(
@@ -2050,7 +2050,6 @@ export default class CRUD extends React.Component<CRUDProps, any> {
                   'Crud-filter',
                   filter.panelClassName || 'Panel--default'
                 ),
-                api: undefined,
                 data: store.filterData,
                 onReset: this.handleFilterReset,
                 onSubmit: this.handleFilterSubmit,