amis 1.5.3 → 1.5.4

package/src/renderers/Form/InputFile.tsx

@@ -1185,6 +1185,7 @@ export default class FileControl extends React.Component<FileProps, FileState> {
       multiple,
       autoUpload,
       description,
+      descriptionClassName,
       hideUploadButton,
       className,
       btnClassName,
@@ -1224,7 +1225,7 @@ export default class FileControl extends React.Component<FileProps, FileState> {
             <Icon icon="download" className="icon" />
             <span>{__('File.downloadTpl')}</span>
           </a>
-          ) : null}
+        ) : null}
 
         <DropZone
           disabled={disabled}
@@ -1277,7 +1278,10 @@ export default class FileControl extends React.Component<FileProps, FileState> {
 
                   {description
                     ? render('desc', description!, {
-                        className: cx('FileControl-description')
+                        className: cx(
+                          'FileControl-description',
+                          descriptionClassName
+                        )
                       })
                     : null}
 

package/src/renderers/Form/index.tsx

@@ -866,6 +866,18 @@ export default class Form extends React.Component<FormProps, object> {
 
     store.updateData(values);
 
+    store.items.forEach(formItem => {
+      const updatedValue = getVariable(values, formItem.name, false);
+
+      if (updatedValue !== undefined) {
+        // 更新验证状态但保留错误信息
+        formItem.reset(true);
+        // 这里需要更新value，否则提交时不会使用新的字段值校验
+        formItem.changeTmpValue(updatedValue);
+        formItem.validateOnChange && formItem.validate(values);
+      }
+    });
+
     (formLazyChange === false ? this.emitChange : this.lazyEmitChange)(submit);
   }
 

package/src/renderers/Form/wrapControl.tsx

@@ -129,7 +129,8 @@ export function wrapControl<
                 clearValueOnHidden,
                 validateApi,
                 minLength,
-                maxLength
+                maxLength,
+                validateOnChange
               }
             } = this.props;
 
@@ -174,7 +175,8 @@ export function wrapControl<
               clearValueOnHidden,
               validateApi,
               minLength,
-              maxLength
+              maxLength,
+              validateOnChange
             });
 
             // issue 这个逻辑应该在 combo 里面自己实现。
@@ -465,6 +467,7 @@ export function wrapControl<
             }
 
             this.model.changeTmpValue(value);
+
             if (changeImmediately || conrolChangeImmediately || !formInited) {
               this.emitChange(submitOnChange);
             } else {

package/src/store/formItem.ts

@@ -14,6 +14,7 @@ import {str2rules, validate as doValidate} from '../utils/validations';
 import {Api, Payload, fetchOptions} from '../types';
 import {ComboStore, IComboStore, IUniqueGroup} from './combo';
 import {evalExpression} from '../utils/tpl';
+import {isEffectiveApi} from '../utils/api';
 import findIndex from 'lodash/findIndex';
 import {
   isArrayChildrenModified,
@@ -88,7 +89,8 @@ export const FormItemStore = StoreNode.named('FormItemStore')
     dialogSchema: types.frozen(),
     dialogOpen: false,
     dialogData: types.frozen(),
-    resetValue: types.optional(types.frozen(), '')
+    resetValue: types.optional(types.frozen(), ''),
+    validateOnChange: false
   })
   .views(self => {
     function getForm(): any {
@@ -233,7 +235,8 @@ export const FormItemStore = StoreNode.named('FormItemStore')
       clearValueOnHidden,
       validateApi,
       maxLength,
-      minLength
+      minLength,
+      validateOnChange
     }: {
       required?: boolean;
       unique?: boolean;
@@ -254,6 +257,7 @@ export const FormItemStore = StoreNode.named('FormItemStore')
       validateApi?: boolean;
       minLength?: number;
       maxLength?: number;
+      validateOnChange?: boolean;
     }) {
       if (typeof rules === 'string') {
         rules = str2rules(rules);
@@ -279,6 +283,8 @@ export const FormItemStore = StoreNode.named('FormItemStore')
       typeof clearValueOnHidden !== 'undefined' &&
         (self.clearValueOnHidden = !!clearValueOnHidden);
       typeof validateApi !== 'undefined' && (self.validateApi = validateApi);
+      typeof validateOnChange !== 'undefined' &&
+        (self.validateOnChange = !!validateOnChange);
 
       rules = {
         ...rules,
@@ -315,7 +321,7 @@ export const FormItemStore = StoreNode.named('FormItemStore')
     let validateCancel: Function | null = null;
     const validate: (data: Object, hook?: any) => Promise<boolean> = flow(
       function* validate(data: Object, hook?: any) {
-        if (self.validating && !self.validateApi) {
+        if (self.validating && !isEffectiveApi(self.validateApi, data)) {
           return self.valid;
         }
 
@@ -329,7 +335,7 @@ export const FormItemStore = StoreNode.named('FormItemStore')
           doValidate(self.tmpValue, data, self.rules, self.messages, self.__)
         );
 
-        if (!self.errors.length && self.validateApi) {
+        if (!self.errors.length && isEffectiveApi(self.validateApi, data)) {
           if (validateCancel) {
             validateCancel();
             validateCancel = null;
@@ -1029,7 +1035,7 @@ export const FormItemStore = StoreNode.named('FormItemStore')
       subStore = store;
     }
 
-    function reset() {
+    function reset(keepErrors: boolean = false) {
       self.validated = false;
 
       if (subStore && subStore.storeType === 'ComboStore') {
@@ -1037,7 +1043,7 @@ export const FormItemStore = StoreNode.named('FormItemStore')
         combo.forms.forEach(form => form.reset());
       }
 
-      clearError();
+      !keepErrors && clearError();
     }
 
     function openDialog(

package/src/utils/helper.ts

@@ -1592,3 +1592,37 @@ export function JSONTraverse(
     }
   });
 }
+
+
+export function convertDateArrayToDate(
+  value: number[],
+  types: string[],
+  date: moment.Moment
+): moment.Moment | null {
+  if (value.length === 0) return date
+  for (let i = 0; i < types.length; i++) {
+    const type = types[i];
+    // @ts-ignore
+    date[type](value[i]);
+  }
+  return date;
+}
+
+export function convertDateToObject(value: moment.Moment) {
+  if (value) {
+    return {
+      year: value.year(),
+      month: parseInt(value.format('MM'), 10),
+      day: parseInt(value.format('DD'), 10)
+    };
+  }
+  return null;
+}
+
+export function getRange(min: number, max: number, step: number = 1) {
+  const arr = [];
+  for (let i = min; i <= max; i += step) {
+      arr.push(i);
+  }
+  return arr;
+};