amis 1.10.0 → 1.10.1-beta.0

package/src/components/Checkbox.tsx

@@ -74,7 +74,12 @@ export class Checkbox extends React.Component<CheckboxProps, any> {
       labelClassName,
       optionType
     } = this.props;
-
+    const _checked = typeof checked !== 'undefined'
+      ? checked
+      : typeof value === 'undefined'
+      ? value
+      : value == trueValue;
+    
     return (
       <label
         className={cx(`Checkbox Checkbox--${type}`, className, {
@@ -82,9 +87,11 @@ export class Checkbox extends React.Component<CheckboxProps, any> {
           // 'Checkbox--partial': partial
           [`Checkbox--${size}`]: size,
           'Checkbox--button': optionType === 'button',
-          'Checkbox--button--checked': optionType === 'button' && checked,
+          'Checkbox--button--checked': optionType === 'button' && _checked,
           'Checkbox--button--disabled--unchecked':
-            optionType === 'button' && disabled && !checked
+            optionType === 'button' && disabled && !_checked,
+          'Checkbox--button--disabled--checked':
+            optionType === 'button' && disabled && _checked
         })}
       >
         <input

package/src/components/Select.tsx

@@ -411,7 +411,7 @@ export class Select extends React.Component<SelectProps, SelectState> {
       inputValue: '',
       highlightedIndex: -1,
       selection: value2array(props.value, props),
-      itemHeight: 35,
+      itemHeight: 32 /** Select选项高度保持一致 */,
       pickerSelectItem: ''
     };
   }
@@ -726,7 +726,9 @@ export class Select extends React.Component<SelectProps, SelectState> {
 
   @autobind
   menuItemRef(ref: any) {
-    ref && this.setState({itemHeight: ref.offsetHeight});
+    if (ref && typeof ref.offsetHeight === 'number' && ref > 0) {
+      this.setState({itemHeight: ref.offsetHeight});
+    }
   }
 
   renderValue({inputValue, isOpen}: ControllerStateAndHelpers<any>) {

package/src/components/formula/Picker.tsx

@@ -174,12 +174,6 @@ export class FormulaPicker extends React.Component<
     this.setState({value}, () => this.handleConfirm());
   }
 
-  @autobind
-  handleInputGroupChange(e: React.ChangeEvent<HTMLInputElement>) {
-    const onChange = this.props.onChange;
-    onChange && onChange(e.currentTarget.value);
-  }
-
   @autobind
   handleEditorChange(value: string) {
     this.setState({
@@ -248,10 +242,11 @@ export class FormulaPicker extends React.Component<
     const {translate: __} = this.props;
 
     try {
-      parse(value, {
-        evalMode: this.props.evalMode,
-        allowFilter: false
-      });
+      value &&
+        parse(value, {
+          evalMode: this.props.evalMode,
+          allowFilter: false
+        });
 
       return true;
     } catch (e) {
@@ -380,14 +375,30 @@ export class FormulaPicker extends React.Component<
             )}
             {mode === 'input-group' && (
               <>
-                <Input
-                  className={cx('FormulaPicker-input')}
-                  onChange={this.handleInputGroupChange}
-                  placeholder={allowInput ? placeholder : ''}
-                  autoComplete="off"
+                <ResultBox
+                  className={cx(
+                    'FormulaPicker-input',
+                    isOpened ? 'is-active' : '',
+                    !!isError ? 'is-error' : ''
+                  )}
+                  allowInput={allowInput}
+                  clearable={clearable}
                   value={value}
+                  result={
+                    allowInput
+                      ? void 0
+                      : FormulaEditor.highlightValue(
+                          value,
+                          variables!,
+                          this.props.evalMode
+                        )
+                  }
+                  itemRender={this.renderFormulaValue}
+                  onResultChange={noop}
+                  onChange={this.handleInputChange}
                   disabled={disabled}
-                  readOnly={!allowInput}
+                  borderMode={borderMode}
+                  placeholder={placeholder}
                 />
 
                 <a

package/src/renderers/Form/InputFormula.tsx

@@ -152,7 +152,7 @@ export class InputFormulaRenderer extends React.Component<InputFormulaProps> {
   validate() {
     const {translate: __, value} = this.props;
 
-    if (this.ref?.validate) {
+    if (this.ref?.validate && value) {
       const res = this.ref.validate(value);
       if (res !== true) {
         return __('FormulaEditor.invalidData', {err: res});

package/src/renderers/Form/InputImage.tsx

@@ -703,7 +703,7 @@ export default class ImageControl extends React.Component<
           locked: false
         },
         () => {
-          this.onChange(!!this.resolve);
+          this.onChange(!!this.resolve, false);
 
           if (this.resolve) {
             this.resolve(
@@ -773,7 +773,7 @@ export default class ImageControl extends React.Component<
     });
   }
 
-  async onChange(changeImmediately?: boolean) {
+  async onChange(changeImmediately?: boolean, changeEvent: boolean = true) {
     const {
       multiple,
       onChange,
@@ -807,9 +807,11 @@ export default class ImageControl extends React.Component<
         : newValue;
     }
 
-    const dispatcher = await this.dispatchEvent('change');
-    if (dispatcher?.prevented) {
-      return;
+    if (changeEvent) {
+      const dispatcher = await this.dispatchEvent('change');
+      if (dispatcher?.prevented) {
+        return;
+      }
     }
 
     onChange((this.emitValue = newValue || ''), undefined, changeImmediately);