amis-ui 6.9.0 → 6.10.0-beta.0

package/esm/components/Radios.d.ts

@@ -21,7 +21,7 @@ import { TestIdBuilder } from 'amis-core';
 interface RadioProps extends OptionProps {
     id?: string;
     type: string;
-    optionType?: string;
+    optionType?: 'default' | 'button';
     value?: string;
     className?: string;
     style?: React.CSSProperties;
@@ -42,7 +42,6 @@ interface RadioProps extends OptionProps {
 export declare class Radios extends React.Component<RadioProps, any> {
     static defaultProps: {
         type: string;
-        optionType: string;
         btnActiveLevel: string;
         resetValue: string;
         inline: boolean;
@@ -56,13 +55,12 @@ export declare class Radios extends React.Component<RadioProps, any> {
     render(): React.JSX.Element;
 }
 declare const _default: {
-    new (props: Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "renderLabel"> & {
+    new (props: Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "optionType" | "renderLabel"> & {
         type?: string | undefined;
         clearable?: boolean | undefined;
         inline?: boolean | undefined;
         joinValues?: boolean | undefined;
         resetValue?: any;
-        optionType?: string | undefined;
         btnActiveLevel?: string | undefined;
         columnsCount?: number | number[] | undefined;
     } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps): {
@@ -71,24 +69,22 @@ declare const _default: {
         getWrappedInstance(): any;
         render(): React.JSX.Element;
         context: unknown;
-        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "renderLabel"> & {
+        setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "optionType" | "renderLabel"> & {
             type?: string | undefined;
             clearable?: boolean | undefined;
             inline?: boolean | undefined;
             joinValues?: boolean | undefined;
             resetValue?: any;
-            optionType?: string | undefined;
             btnActiveLevel?: string | undefined;
             columnsCount?: number | number[] | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
-        readonly props: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "renderLabel"> & {
+        readonly props: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "optionType" | "renderLabel"> & {
             type?: string | undefined;
             clearable?: boolean | undefined;
             inline?: boolean | undefined;
             joinValues?: boolean | undefined;
             resetValue?: any;
-            optionType?: string | undefined;
             btnActiveLevel?: string | undefined;
             columnsCount?: number | number[] | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>;
@@ -97,77 +93,70 @@ declare const _default: {
             [key: string]: React.ReactInstance;
         };
         componentDidMount?(): void;
-        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "renderLabel"> & {
+        shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "optionType" | "renderLabel"> & {
             type?: string | undefined;
             clearable?: boolean | undefined;
             inline?: boolean | undefined;
             joinValues?: boolean | undefined;
             resetValue?: any;
-            optionType?: string | undefined;
             btnActiveLevel?: string | undefined;
             columnsCount?: number | number[] | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
-        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "renderLabel"> & {
+        getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "optionType" | "renderLabel"> & {
             type?: string | undefined;
             clearable?: boolean | undefined;
             inline?: boolean | undefined;
             joinValues?: boolean | undefined;
             resetValue?: any;
-            optionType?: string | undefined;
             btnActiveLevel?: string | undefined;
             columnsCount?: number | number[] | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>): any;
-        componentDidUpdate?(prevProps: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "renderLabel"> & {
+        componentDidUpdate?(prevProps: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "optionType" | "renderLabel"> & {
             type?: string | undefined;
             clearable?: boolean | undefined;
             inline?: boolean | undefined;
             joinValues?: boolean | undefined;
             resetValue?: any;
-            optionType?: string | undefined;
             btnActiveLevel?: string | undefined;
             columnsCount?: number | number[] | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
-        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "renderLabel"> & {
+        componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "optionType" | "renderLabel"> & {
             type?: string | undefined;
             clearable?: boolean | undefined;
             inline?: boolean | undefined;
             joinValues?: boolean | undefined;
             resetValue?: any;
-            optionType?: string | undefined;
             btnActiveLevel?: string | undefined;
             columnsCount?: number | number[] | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
-        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "renderLabel"> & {
+        UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "optionType" | "renderLabel"> & {
             type?: string | undefined;
             clearable?: boolean | undefined;
             inline?: boolean | undefined;
             joinValues?: boolean | undefined;
             resetValue?: any;
-            optionType?: string | undefined;
             btnActiveLevel?: string | undefined;
             columnsCount?: number | number[] | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
-        componentWillUpdate?(nextProps: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "renderLabel"> & {
+        componentWillUpdate?(nextProps: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "optionType" | "renderLabel"> & {
             type?: string | undefined;
             clearable?: boolean | undefined;
             inline?: boolean | undefined;
             joinValues?: boolean | undefined;
             resetValue?: any;
-            optionType?: string | undefined;
             btnActiveLevel?: string | undefined;
             columnsCount?: number | number[] | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
-        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "renderLabel"> & {
+        UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<RadioProps, keyof import("amis-core").ThemeProps>, "onChange" | "creatable" | "multiple" | "valueField" | "labelField" | "options" | "value" | "placeholder" | "disabled" | "simpleValue" | "multi" | "loading" | "extractValue" | "delimiter" | "pathSeparator" | "itemHeight" | "virtualThreshold" | "hasError" | "block" | "controlStyle" | "onAdd" | "editable" | "onEdit" | "removable" | "onDelete" | "testIdBuilder" | "id" | "level" | "itemClassName" | "labelClassName" | "optionType" | "renderLabel"> & {
             type?: string | undefined;
             clearable?: boolean | undefined;
             inline?: boolean | undefined;
             joinValues?: boolean | undefined;
             resetValue?: any;
-            optionType?: string | undefined;
             btnActiveLevel?: string | undefined;
             columnsCount?: number | number[] | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;

package/esm/components/Radios.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.9.0
+ * amis-ui v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 
@@ -7,7 +7,6 @@ import { __extends } from 'tslib';
 import React__default from 'react';
 import { columnsSplit, themeable, uncontrollable } from 'amis-core';
 import Checkbox from './Checkbox.js';
-import Button from './Button.js';
 import { value2array } from './Select.js';
 
 /**
@@ -62,17 +61,28 @@ var Radios = /** @class */ (function (_super) {
     };
     Radios.prototype.renderItem = function (option, index, valueArray) {
         var _this = this;
-        if (option.children) {
+        var _a;
+        if ((_a = option.children) === null || _a === void 0 ? void 0 : _a.length) {
             return this.renderGroup(option, index, valueArray);
         }
-        var _a = this.props, disabled = _a.disabled, inline = _a.inline, itemClassName = _a.itemClassName, cx = _a.classnames, labelClassName = _a.labelClassName; _a.labelField; var optionType = _a.optionType, level = _a.level, btnActiveLevel = _a.btnActiveLevel; _a.classPrefix; var testIdBuilder = _a.testIdBuilder, _b = _a.renderLabel, renderLabel = _b === void 0 ? defaultLabelRender : _b;
+        var _b = this.props, disabled = _b.disabled, inline = _b.inline, itemClassName = _b.itemClassName, cx = _b.classnames, labelClassName = _b.labelClassName; _b.labelField; var optionType = _b.optionType; _b.level; _b.btnActiveLevel; _b.classPrefix; var testIdBuilder = _b.testIdBuilder, _c = _b.renderLabel, renderLabel = _c === void 0 ? defaultLabelRender : _c;
         var itemTestIdBuilder = testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild(option.value || index);
-        if (optionType === 'button') {
-            var active = !!~valueArray.indexOf(option);
-            return (React__default.createElement(Button, { key: index, active: active, onClick: function () { return _this.toggleOption(option); }, className: cx(itemClassName, option.className), disabled: disabled || option.disabled, level: (active ? btnActiveLevel : '') || level },
-                React__default.createElement("span", null, renderLabel(option, this.props))));
-        }
-        return (React__default.createElement(Checkbox, { type: "radio", key: index, onChange: function () { return _this.toggleOption(option); }, checked: !!~valueArray.indexOf(option), className: cx(itemClassName, option.className), disabled: disabled || option.disabled, description: option.description, inline: inline, labelClassName: labelClassName, testIdBuilder: itemTestIdBuilder }, renderLabel(option, this.props)));
+        // if (optionType === 'button') {
+        //   const active = !!~valueArray.indexOf(option);
+        //   return (
+        //     <Button
+        //       key={index}
+        //       active={active}
+        //       onClick={() => this.toggleOption(option)}
+        //       className={cx(itemClassName, option.className)}
+        //       disabled={disabled || option.disabled}
+        //       level={(active ? btnActiveLevel : '') || level}
+        //     >
+        //       <span>{renderLabel(option, this.props)}</span>
+        //     </Button>
+        //   );
+        // }
+        return (React__default.createElement(Checkbox, { type: "radio", key: index, onChange: function () { return _this.toggleOption(option); }, checked: !!~valueArray.indexOf(option), className: cx(itemClassName, option.className), disabled: disabled || option.disabled, description: option.description, inline: inline, labelClassName: labelClassName, testIdBuilder: itemTestIdBuilder, optionType: optionType }, renderLabel(option, this.props)));
     };
     Radios.prototype.render = function () {
         var _this = this;
@@ -96,7 +106,6 @@ var Radios = /** @class */ (function (_super) {
     };
     Radios.defaultProps = {
         type: 'radio',
-        optionType: 'default',
         btnActiveLevel: 'primary',
         resetValue: '',
         inline: true,

package/esm/components/Range.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.9.0
+ * amis-ui v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */
 

package/esm/components/Rating.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.9.0
+ * amis-ui v6.10.0-beta.0
  * Copyright 2018-2024 fex
  */