amis 1.4.1 → 1.4.2-beta.13

package/lib/components/{TreeCheckboxes.js → TreeSelection.js}

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TreeCheckboxes = void 0;
+exports.TreeSelection = void 0;
 var tslib_1 = require("tslib");
-var Checkboxes_1 = require("./Checkboxes");
+var Selection_1 = require("./Selection");
 var theme_1 = require("../theme");
 var react_1 = (0, tslib_1.__importDefault)(require("react"));
 var uncontrollable_1 = require("uncontrollable");
@@ -11,26 +11,26 @@ var helper_1 = require("../utils/helper");
 var Spinner_1 = (0, tslib_1.__importDefault)(require("./Spinner"));
 var locale_1 = require("../locale");
 var icons_1 = require("./icons");
-var TreeCheckboxes = /** @class */ (function (_super) {
-    (0, tslib_1.__extends)(TreeCheckboxes, _super);
-    function TreeCheckboxes() {
+var TreeSelection = /** @class */ (function (_super) {
+    (0, tslib_1.__extends)(TreeSelection, _super);
+    function TreeSelection() {
         var _this = _super !== null && _super.apply(this, arguments) || this;
         _this.state = {
             expanded: []
         };
         return _this;
     }
-    TreeCheckboxes.prototype.componentDidMount = function () {
+    TreeSelection.prototype.componentDidMount = function () {
         this.syncExpanded();
     };
-    TreeCheckboxes.prototype.componentDidUpdate = function (prevProps) {
+    TreeSelection.prototype.componentDidUpdate = function (prevProps) {
         var props = this.props;
         if (!this.state.expanded.length &&
             (props.expand !== prevProps.expand || props.options !== prevProps.options)) {
             this.syncExpanded();
         }
     };
-    TreeCheckboxes.prototype.syncExpanded = function () {
+    TreeSelection.prototype.syncExpanded = function () {
         var options = this.props.options;
         var mode = this.props.expand;
         var expanded = [];
@@ -56,8 +56,8 @@ var TreeCheckboxes = /** @class */ (function (_super) {
         }
         this.setState({ expanded: expanded });
     };
-    TreeCheckboxes.prototype.toggleOption = function (option) {
-        var _a = this.props, value = _a.value, onChange = _a.onChange, option2value = _a.option2value, options = _a.options, onDeferLoad = _a.onDeferLoad, disabled = _a.disabled;
+    TreeSelection.prototype.toggleOption = function (option) {
+        var _a = this.props, value = _a.value, onChange = _a.onChange, option2value = _a.option2value, options = _a.options, onDeferLoad = _a.onDeferLoad, disabled = _a.disabled, multiple = _a.multiple, clearable = _a.clearable;
         if (disabled || option.disabled) {
             return;
         }
@@ -65,10 +65,11 @@ var TreeCheckboxes = /** @class */ (function (_super) {
             onDeferLoad === null || onDeferLoad === void 0 ? void 0 : onDeferLoad(option);
             return;
         }
-        var valueArray = Checkboxes_1.BaseCheckboxes.value2array(value, options, option2value);
+        var valueArray = Selection_1.BaseSelection.value2array(value, options, option2value);
         if (option.value === void 0 &&
             Array.isArray(option.children) &&
-            option.children.length) {
+            option.children.length &&
+            multiple) {
             var someCheckedFn_1 = function (child) {
                 return (Array.isArray(child.children) && child.children.length
                     ? child.children.some(someCheckedFn_1)
@@ -92,19 +93,22 @@ var TreeCheckboxes = /** @class */ (function (_super) {
         }
         else {
             var idx = valueArray.indexOf(option);
-            if (~idx) {
+            if (~idx && (multiple || clearable)) {
                 valueArray.splice(idx, 1);
             }
-            else {
+            else if (multiple) {
                 valueArray.push(option);
             }
+            else {
+                valueArray = [option];
+            }
         }
         var newValue = option2value
             ? valueArray.map(function (item) { return option2value(item); })
             : valueArray;
-        onChange && onChange(newValue);
+        onChange && onChange(multiple ? newValue : newValue[0]);
     };
-    TreeCheckboxes.prototype.toggleCollapsed = function (option, index) {
+    TreeSelection.prototype.toggleCollapsed = function (option, index) {
         var onDeferLoad = this.props.onDeferLoad;
         var expanded = this.state.expanded.concat();
         var idx = expanded.indexOf(index);
@@ -118,10 +122,10 @@ var TreeCheckboxes = /** @class */ (function (_super) {
             expanded: expanded
         }, option.defer && onDeferLoad ? function () { return onDeferLoad(option); } : undefined);
     };
-    TreeCheckboxes.prototype.renderItem = function (option, index, indexes) {
+    TreeSelection.prototype.renderItem = function (option, index, indexes) {
         var _this = this;
         if (indexes === void 0) { indexes = []; }
-        var _a = this.props, labelClassName = _a.labelClassName, disabled = _a.disabled, cx = _a.classnames, itemClassName = _a.itemClassName, itemRender = _a.itemRender;
+        var _a = this.props, labelClassName = _a.labelClassName, disabled = _a.disabled, cx = _a.classnames, itemClassName = _a.itemClassName, itemRender = _a.itemRender, multiple = _a.multiple;
         var id = indexes.join('-');
         var valueArray = this.valueArray;
         var partial = false;
@@ -152,37 +156,37 @@ var TreeCheckboxes = /** @class */ (function (_super) {
             checked = !!~valueArray.indexOf(option);
         }
         var expaned = !!~this.state.expanded.indexOf(id);
-        return (react_1.default.createElement("div", { key: index, className: cx('TreeCheckboxes-item', disabled || option.disabled || (option.defer && option.loading)
+        return (react_1.default.createElement("div", { key: index, className: cx('TreeSelection-item', disabled || option.disabled || (option.defer && option.loading)
                 ? 'is-disabled'
                 : '', expaned ? 'is-expanded' : '') },
-            react_1.default.createElement("div", { className: cx('TreeCheckboxes-itemInner', itemClassName, option.className), onClick: function () { return _this.toggleOption(option); } },
+            react_1.default.createElement("div", { className: cx('TreeSelection-itemInner', itemClassName, option.className, checked ? 'is-active' : ''), onClick: function () { return _this.toggleOption(option); } },
                 hasChildren || option.defer ? (react_1.default.createElement("a", { onClick: function (e) {
                         e.stopPropagation();
                         _this.toggleCollapsed(option, id);
                     }, className: cx('Table-expandBtn', expaned ? 'is-active' : '') },
                     react_1.default.createElement(icons_1.Icon, { icon: "right-arrow-bold", className: "icon" }))) : null,
-                react_1.default.createElement("div", { className: cx('TreeCheckboxes-itemLabel') }, itemRender(option)),
+                react_1.default.createElement("div", { className: cx('TreeSelection-itemLabel') }, itemRender(option)),
                 option.defer && option.loading ? react_1.default.createElement(Spinner_1.default, { show: true, size: "sm" }) : null,
-                !option.defer || option.loaded ? (react_1.default.createElement(Checkbox_1.default, { size: "sm", checked: checked, partial: partial, disabled: disabled || option.disabled, labelClassName: labelClassName, description: option.description })) : null),
-            hasChildren ? (react_1.default.createElement("div", { className: cx('TreeCheckboxes-sublist') }, option.children.map(function (option, key) {
+                multiple && (!option.defer || option.loaded) ? (react_1.default.createElement(Checkbox_1.default, { size: "sm", checked: checked, partial: partial, disabled: disabled || option.disabled, labelClassName: labelClassName, description: option.description })) : null),
+            hasChildren ? (react_1.default.createElement("div", { className: cx('TreeSelection-sublist') }, option.children.map(function (option, key) {
                 return _this.renderItem(option, key, indexes.concat(key));
             }))) : null));
     };
-    TreeCheckboxes.prototype.render = function () {
+    TreeSelection.prototype.render = function () {
         var _this = this;
         var _a = this.props, value = _a.value, options = _a.options, className = _a.className, placeholder = _a.placeholder, cx = _a.classnames, option2value = _a.option2value, __ = _a.translate;
-        this.valueArray = Checkboxes_1.BaseCheckboxes.value2array(value, options, option2value);
+        this.valueArray = Selection_1.BaseSelection.value2array(value, options, option2value);
         var body = [];
         if (Array.isArray(options) && options.length) {
             body = options.map(function (option, key) { return _this.renderItem(option, key, [key]); });
         }
-        return (react_1.default.createElement("div", { className: cx('TreeCheckboxes', className) }, body && body.length ? (body) : (react_1.default.createElement("div", { className: cx('TreeCheckboxes-placeholder') }, __(placeholder)))));
+        return (react_1.default.createElement("div", { className: cx('TreeSelection', className) }, body && body.length ? (body) : (react_1.default.createElement("div", { className: cx('TreeSelection-placeholder') }, __(placeholder)))));
     };
-    TreeCheckboxes.defaultProps = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, Checkboxes_1.BaseCheckboxes.defaultProps), { expand: 'first' });
-    return TreeCheckboxes;
-}(Checkboxes_1.BaseCheckboxes));
-exports.TreeCheckboxes = TreeCheckboxes;
-exports.default = (0, theme_1.themeable)((0, locale_1.localeable)((0, uncontrollable_1.uncontrollable)(TreeCheckboxes, {
+    TreeSelection.defaultProps = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, Selection_1.BaseSelection.defaultProps), { expand: 'first' });
+    return TreeSelection;
+}(Selection_1.BaseSelection));
+exports.TreeSelection = TreeSelection;
+exports.default = (0, theme_1.themeable)((0, locale_1.localeable)((0, uncontrollable_1.uncontrollable)(TreeSelection, {
     value: 'onChange'
 })));
-//# sourceMappingURL=./components/TreeCheckboxes.js.map
+//# sourceMappingURL=./components/TreeSelection.js.map

package/lib/components/TreeSelection.js.map

@@ -0,0 +1,13 @@
+{
+    "version": 3,
+    "file": "TreeSelection.js",
+    "sourceRoot": "",
+    "sources": [
+        "/src/components/TreeSelection.tsx"
+    ],
+    "names": [],
+    "mappings": "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",
+    "sourcesContent": [
+        "import {BaseSelection, BaseSelectionProps} from './Selection';\nimport {themeable} from '../theme';\nimport React from 'react';\nimport {uncontrollable} from 'uncontrollable';\nimport Checkbox from './Checkbox';\nimport {Option} from './Select';\nimport {autobind, eachTree, everyTree} from '../utils/helper';\nimport Spinner from './Spinner';\nimport {localeable} from '../locale';\nimport {Icon} from './icons';\n\nexport interface TreeSelectionProps extends BaseSelectionProps {\n  expand?: 'all' | 'first' | 'root' | 'none';\n}\n\nexport interface TreeSelectionState {\n  expanded: Array<string>;\n}\n\nexport class TreeSelection extends BaseSelection<\n  TreeSelectionProps,\n  TreeSelectionState\n> {\n  valueArray: Array<Option>;\n  state: TreeSelectionState = {\n    expanded: []\n  };\n\n  static defaultProps = {\n    ...BaseSelection.defaultProps,\n    expand: 'first' as 'first'\n  };\n\n  componentDidMount() {\n    this.syncExpanded();\n  }\n\n  componentDidUpdate(prevProps: TreeSelectionProps) {\n    const props = this.props;\n\n    if (\n      !this.state.expanded.length &&\n      (props.expand !== prevProps.expand || props.options !== prevProps.options)\n    ) {\n      this.syncExpanded();\n    }\n  }\n\n  syncExpanded() {\n    const options = this.props.options;\n    const mode = this.props.expand;\n    const expanded: Array<string> = [];\n\n    if (!Array.isArray(options)) {\n      return;\n    }\n\n    if (mode === 'first' || mode === 'root') {\n      options.every((option, index) => {\n        if (Array.isArray(option.children)) {\n          expanded.push(`${index}`);\n          return mode === 'root';\n        }\n        return true;\n      });\n    } else if (mode === 'all') {\n      everyTree(options, (option, index, level, paths, indexes) => {\n        if (Array.isArray(option.children)) {\n          expanded.push(`${indexes.concat(index).join('-')}`);\n        }\n        return true;\n      });\n    }\n\n    this.setState({expanded});\n  }\n\n  toggleOption(option: Option) {\n    const {\n      value,\n      onChange,\n      option2value,\n      options,\n      onDeferLoad,\n      disabled,\n      multiple,\n      clearable\n    } = this.props;\n\n    if (disabled || option.disabled) {\n      return;\n    } else if (option.defer && !option.loaded) {\n      onDeferLoad?.(option);\n      return;\n    }\n\n    let valueArray = BaseSelection.value2array(value, options, option2value);\n\n    if (\n      option.value === void 0 &&\n      Array.isArray(option.children) &&\n      option.children.length &&\n      multiple\n    ) {\n      const someCheckedFn = (child: Option) =>\n        (Array.isArray(child.children) && child.children.length\n          ? child.children.some(someCheckedFn)\n          : false) ||\n        (child.value !== void 0 && ~valueArray.indexOf(child));\n      const someChecked = option.children.some(someCheckedFn);\n      const eachFn = (child: Option) => {\n        if (Array.isArray(child.children) && child.children.length) {\n          child.children.forEach(eachFn);\n        }\n\n        if (child.value !== void 0) {\n          const idx = valueArray.indexOf(child);\n\n          ~idx && valueArray.splice(idx, 1);\n\n          if (!someChecked) {\n            valueArray.push(child);\n          }\n        }\n      };\n      option.children.forEach(eachFn);\n    } else {\n      let idx = valueArray.indexOf(option);\n\n      if (~idx && (multiple || clearable)) {\n        valueArray.splice(idx, 1);\n      } else if (multiple) {\n        valueArray.push(option);\n      } else {\n        valueArray = [option];\n      }\n    }\n\n    let newValue: string | Array<Option> = option2value\n      ? valueArray.map(item => option2value(item))\n      : valueArray;\n\n    onChange && onChange(multiple ? newValue : newValue[0]);\n  }\n\n  toggleCollapsed(option: Option, index: string) {\n    const onDeferLoad = this.props.onDeferLoad;\n    const expanded = this.state.expanded.concat();\n    const idx = expanded.indexOf(index);\n\n    if (~idx) {\n      expanded.splice(idx, 1);\n    } else {\n      expanded.push(index);\n    }\n\n    this.setState(\n      {\n        expanded: expanded\n      },\n      option.defer && onDeferLoad ? () => onDeferLoad(option) : undefined\n    );\n  }\n\n  renderItem(option: Option, index: number, indexes: Array<number> = []) {\n    const {\n      labelClassName,\n      disabled,\n      classnames: cx,\n      itemClassName,\n      itemRender,\n      multiple\n    } = this.props;\n    const id = indexes.join('-');\n    const valueArray = this.valueArray;\n    let partial = false;\n    let checked = false;\n    let hasChildren = Array.isArray(option.children) && option.children.length;\n\n    if (option.value === void 0 && hasChildren) {\n      let allchecked = true;\n      let partialChecked = false;\n      const eachFn = (child: Option) => {\n        if (Array.isArray(child.children) && child.children.length) {\n          child.children.forEach(eachFn);\n        }\n\n        if (child.value !== void 0) {\n          const isIn = !!~valueArray.indexOf(child);\n\n          if (isIn && !partialChecked) {\n            partialChecked = true;\n          } else if (!isIn && allchecked) {\n            allchecked = false;\n          }\n\n          checked = partialChecked;\n          partial = partialChecked && !allchecked;\n        }\n      };\n\n      option.children!.forEach(eachFn);\n    } else {\n      checked = !!~valueArray.indexOf(option);\n    }\n\n    const expaned = !!~this.state.expanded.indexOf(id);\n\n    return (\n      <div\n        key={index}\n        className={cx(\n          'TreeSelection-item',\n          disabled || option.disabled || (option.defer && option.loading)\n            ? 'is-disabled'\n            : '',\n          expaned ? 'is-expanded' : ''\n        )}\n      >\n        <div\n          className={cx(\n            'TreeSelection-itemInner',\n            itemClassName,\n            option.className,\n            checked ? 'is-active' : ''\n          )}\n          onClick={() => this.toggleOption(option)}\n        >\n          {hasChildren || option.defer ? (\n            <a\n              onClick={(e: React.MouseEvent<any>) => {\n                e.stopPropagation();\n                this.toggleCollapsed(option, id);\n              }}\n              className={cx('Table-expandBtn', expaned ? 'is-active' : '')}\n            >\n              <Icon icon=\"right-arrow-bold\" className=\"icon\" />\n            </a>\n          ) : null}\n\n          <div className={cx('TreeSelection-itemLabel')}>\n            {itemRender(option)}\n          </div>\n\n          {option.defer && option.loading ? <Spinner show size=\"sm\" /> : null}\n\n          {multiple && (!option.defer || option.loaded) ? (\n            <Checkbox\n              size=\"sm\"\n              checked={checked}\n              partial={partial}\n              disabled={disabled || option.disabled}\n              labelClassName={labelClassName}\n              description={option.description}\n            />\n          ) : null}\n        </div>\n        {hasChildren ? (\n          <div className={cx('TreeSelection-sublist')}>\n            {option.children!.map((option, key) =>\n              this.renderItem(option, key, indexes.concat(key))\n            )}\n          </div>\n        ) : null}\n      </div>\n    );\n  }\n\n  render() {\n    const {\n      value,\n      options,\n      className,\n      placeholder,\n      classnames: cx,\n      option2value,\n      translate: __\n    } = this.props;\n\n    this.valueArray = BaseSelection.value2array(value, options, option2value);\n    let body: Array<React.ReactNode> = [];\n\n    if (Array.isArray(options) && options.length) {\n      body = options.map((option, key) => this.renderItem(option, key, [key]));\n    }\n\n    return (\n      <div className={cx('TreeSelection', className)}>\n        {body && body.length ? (\n          body\n        ) : (\n          <div className={cx('TreeSelection-placeholder')}>\n            {__(placeholder)}\n          </div>\n        )}\n      </div>\n    );\n  }\n}\n\nexport default themeable(\n  localeable(\n    uncontrollable(TreeSelection, {\n      value: 'onChange'\n    })\n  )\n);\n"
+    ]
+}

package/lib/components/WithRemoteConfig.js

@@ -42,7 +42,7 @@ exports.Store = mobx_state_tree_1.types
                         return [2 /*return*/];
                     }
                     if (ret.ok) {
-                        data = ret.data || {};
+                        data = (0, api_1.normalizeApiResponseData)(ret.data);
                         options = config.adaptor
                             ? config.adaptor(data, component.props)
                             : data;

package/lib/components/WithRemoteConfig.js.map

@@ -6,8 +6,8 @@
         "/src/components/WithRemoteConfig.tsx"
     ],
     "names": [],
-    "mappings": "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",
+    "mappings": "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",
     "sourcesContent": [
-        "/**\n * 一个可以拉取远程配置的 HOC\n *\n */\nimport React from 'react';\nimport hoistNonReactStatic from 'hoist-non-react-statics';\nimport debounce from 'lodash/debounce';\nimport {Api, Payload} from '../types';\nimport {SchemaApi, SchemaTokenizeableString} from '../Schema';\nimport {withStore} from './WithStore';\n\nimport {EnvContext, RendererEnv} from '../env';\n\nimport {flow, Instance, isAlive, types} from 'mobx-state-tree';\nimport {buildApi, isEffectiveApi, normalizeApi} from '../utils/api';\nimport {\n  isPureVariable,\n  resolveVariableAndFilter,\n  tokenize\n} from '../utils/tpl-builtin';\nimport {reaction} from 'mobx';\nimport {createObject, findIndex, findTreeIndex} from '../utils/helper';\n\nexport const Store = types\n  .model('RemoteConfigStore')\n  .props({\n    fetching: false,\n    errorMsg: '',\n    config: types.frozen(),\n    data: types.frozen({})\n  })\n  .actions(self => {\n    let component: any = undefined;\n\n    const load: (\n      env: RendererEnv,\n      api: Api,\n      ctx: any,\n      config: WithRemoteConfigSettings\n    ) => Promise<any> = flow(function* (env, api, ctx, config = {}): any {\n      try {\n        self.fetching = true;\n        const ret: Payload = yield env.fetcher(api, ctx);\n        if (!isAlive(self)) {\n          return;\n        }\n\n        if (ret.ok) {\n          const data = ret.data || {};\n          let options = config.adaptor\n            ? config.adaptor(data, component.props)\n            : data;\n          (self as any).setConfig(options, config, 'remote');\n          config.afterLoad?.(data, self.config, component.props);\n          return ret;\n        } else {\n          throw new Error(ret.msg || 'fetch error');\n        }\n      } catch (e) {\n        isAlive(self) && (self.errorMsg = e.message);\n      } finally {\n        isAlive(self) && (self.fetching = false);\n      }\n    });\n\n    return {\n      setComponent(c: any) {\n        component = c;\n      },\n\n      load,\n      setData(data: any) {\n        self.data = data || {};\n      },\n      setConfig(\n        options: any,\n        config: WithRemoteConfigSettings,\n        motivation?: any\n      ) {\n        if (config.normalizeConfig) {\n          options =\n            config.normalizeConfig(\n              options,\n              self.config,\n              component.props,\n              motivation\n            ) || options;\n        }\n\n        self.config = options;\n      }\n    };\n  });\n\nexport type IStore = Instance<typeof Store>;\n\nexport interface OutterProps {\n  env?: RendererEnv;\n  data: any;\n  source?: SchemaApi | SchemaTokenizeableString;\n  autoComplete?: SchemaApi | SchemaTokenizeableString;\n  deferApi?: SchemaApi;\n  remoteConfigRef?: (\n    instance:\n      | {\n          loadConfig: (ctx?: any) => Promise<any> | void;\n          setConfig: (value: any) => void;\n        }\n      | undefined\n  ) => void;\n}\n\nexport interface RemoteOptionsProps<T = any> {\n  config: T;\n  loading?: boolean;\n  deferLoad: (item: any) => Promise<any>;\n  updateConfig: (value: T, ctx?: any) => void;\n}\n\nexport interface WithRemoteConfigSettings {\n  /**\n   * 从接口返回数据适配到配置\n   */\n  adaptor?: (json: any, props: any) => any;\n\n  /**\n   * 配置格式化\n   */\n  normalizeConfig?: (\n    config: any,\n    origin: any,\n    props: any,\n    motivation?: any\n  ) => any;\n\n  /**\n   * 请求返回后的回调\n   */\n  afterLoad?: (ret: any, config: any, props: any) => void;\n\n  /**\n   * 懒加载选项相关，开始懒加载的回调\n   */\n  beforeDeferLoad?: (\n    item: any,\n    indexes: Array<number>,\n    config: any,\n    props: any\n  ) => any;\n\n  /**\n   * 懒加载选项相关，结束懒加载的回调\n   */\n  afterDeferLoad?: (\n    item: any,\n    indexes: Array<number>,\n    reponse: Payload,\n    config: any,\n    props: any\n  ) => any;\n}\n\nexport function withRemoteConfig<P = any>(\n  config: WithRemoteConfigSettings = {}\n) {\n  return function <\n    T extends React.ComponentType<\n      React.ComponentProps<T> & RemoteOptionsProps<P>\n    >\n  >(ComposedComponent: T) {\n    type FinalOutterProps = JSX.LibraryManagedAttributes<\n      T,\n      Omit<React.ComponentProps<T>, keyof RemoteOptionsProps<P>>\n    > &\n      OutterProps;\n\n    const result = hoistNonReactStatic(\n      withStore(() => Store.create())(\n        class extends React.Component<\n          FinalOutterProps & {\n            store: IStore;\n          }\n        > {\n          static displayName = `WithRemoteConfig(${\n            ComposedComponent.displayName || ComposedComponent.name\n          })`;\n          static ComposedComponent =\n            ComposedComponent as React.ComponentType<T>;\n          static contextType = EnvContext;\n          toDispose: Array<() => void> = [];\n\n          loadOptions = debounce(this.loadAutoComplete.bind(this), 250, {\n            trailing: true,\n            leading: false\n          });\n\n          constructor(\n            props: FinalOutterProps & {\n              store: IStore;\n            }\n          ) {\n            super(props);\n\n            this.setConfig = this.setConfig.bind(this);\n            props.store.setComponent(this);\n            this.deferLoadConfig = this.deferLoadConfig.bind(this);\n            props.remoteConfigRef?.(this);\n          }\n\n          componentDidMount() {\n            const env: RendererEnv = this.props.env || this.context;\n            const {store, source, data} = this.props;\n\n            store.setData(data);\n\n            if (isPureVariable(source)) {\n              this.syncConfig();\n              this.toDispose.push(\n                reaction(\n                  () =>\n                    resolveVariableAndFilter(\n                      source as string,\n                      store.data,\n                      '| raw'\n                    ),\n                  () => this.syncConfig()\n                )\n              );\n            } else if (env && isEffectiveApi(source, data)) {\n              this.loadConfig();\n              source.autoRefresh !== false &&\n                this.toDispose.push(\n                  reaction(\n                    () => {\n                      const api = normalizeApi(source as string);\n                      return api.trackExpression\n                        ? tokenize(api.trackExpression, store.data)\n                        : buildApi(api, store.data, {\n                            ignoreData: true\n                          }).url;\n                    },\n                    () => this.loadConfig()\n                  )\n                );\n            }\n          }\n\n          componentDidUpdate(prevProps: any) {\n            const props = this.props;\n\n            if (props.data !== prevProps.data) {\n              props.store.setData(props.data);\n            }\n          }\n\n          componentWillUnmount() {\n            this.toDispose.forEach(fn => fn());\n            this.toDispose = [];\n\n            this.props.remoteConfigRef?.(undefined);\n            this.loadOptions.cancel();\n          }\n\n          async loadConfig(ctx = this.props.data) {\n            const env: RendererEnv = this.props.env || this.context;\n            const {store, source} = this.props;\n\n            if (env && isEffectiveApi(source, ctx)) {\n              await store.load(env, source, ctx, config);\n            }\n          }\n\n          loadAutoComplete(input: string) {\n            const env: RendererEnv = this.props.env || this.context;\n            const {autoComplete, data, store} = this.props;\n\n            if (!env || !env.fetcher) {\n              throw new Error('fetcher is required');\n            }\n\n            const ctx = createObject(data, {\n              term: input,\n              value: input\n            });\n\n            if (!isEffectiveApi(autoComplete, ctx)) {\n              return Promise.resolve({\n                options: []\n              });\n            }\n\n            return store.load(env, autoComplete, ctx, config);\n          }\n\n          setConfig(value: any, ctx?: any) {\n            const {store} = this.props;\n            store.setConfig(value, config, ctx);\n          }\n\n          syncConfig() {\n            const {store, source, data} = this.props;\n\n            if (isPureVariable(source)) {\n              store.setConfig(\n                resolveVariableAndFilter(source as string, data, '| raw') || [],\n                config,\n                'syncConfig'\n              );\n            }\n          }\n\n          async deferLoadConfig(item: any) {\n            const {store, source, data, deferApi} = this.props;\n            const env: RendererEnv = this.props.env || this.context;\n            const indexes = findTreeIndex(store.config, a => a === item)!;\n\n            const ret = config.beforeDeferLoad?.(\n              item,\n              indexes,\n              store.config,\n              this.props\n            );\n\n            ret && store.setConfig(ret, config, 'before-defer-load');\n            let response: Payload;\n            try {\n              if (!isEffectiveApi(item.deferApi || deferApi || source)) {\n                throw new Error('deferApi is required');\n              }\n\n              response = await env.fetcher(\n                item.deferApi || deferApi || source,\n                createObject(data, item)\n              );\n            } catch (e) {\n              response = {\n                ok: false,\n                msg: e.message,\n                status: 500,\n                data: undefined\n              };\n            }\n            const ret2 = config.afterDeferLoad?.(\n              item,\n              indexes, // 只能假定还是那个 index 了\n              response,\n              store.config,\n              this.props\n            );\n            ret2 && store.setConfig(ret2, config, 'after-defer-load');\n          }\n\n          render() {\n            const store = this.props.store;\n            const env: RendererEnv = this.props.env || this.context;\n            const injectedProps: RemoteOptionsProps<P> = {\n              config: store.config,\n              loading: store.fetching,\n              deferLoad: this.deferLoadConfig,\n              updateConfig: this.setConfig\n            };\n            const {remoteConfigRef, autoComplete, ...rest} = this.props;\n\n            return (\n              <ComposedComponent\n                {...(rest as JSX.LibraryManagedAttributes<\n                  T,\n                  React.ComponentProps<T>\n                >)}\n                {...(env && isEffectiveApi(autoComplete) && this.loadOptions\n                  ? {loadOptions: this.loadOptions}\n                  : {})}\n                {...injectedProps}\n              />\n            );\n          }\n        }\n      ),\n      ComposedComponent\n    );\n\n    return result as typeof result & {\n      ComposedComponent: T;\n    };\n  };\n}\n"
+        "/**\n * 一个可以拉取远程配置的 HOC\n *\n */\nimport React from 'react';\nimport hoistNonReactStatic from 'hoist-non-react-statics';\nimport debounce from 'lodash/debounce';\nimport {Api, Payload} from '../types';\nimport {SchemaApi, SchemaTokenizeableString} from '../Schema';\nimport {withStore} from './WithStore';\n\nimport {EnvContext, RendererEnv} from '../env';\n\nimport {flow, Instance, isAlive, types} from 'mobx-state-tree';\nimport {\n  buildApi,\n  isEffectiveApi,\n  normalizeApi,\n  normalizeApiResponseData\n} from '../utils/api';\nimport {\n  isPureVariable,\n  resolveVariableAndFilter,\n  tokenize\n} from '../utils/tpl-builtin';\nimport {reaction} from 'mobx';\nimport {createObject, findIndex, findTreeIndex} from '../utils/helper';\n\nexport const Store = types\n  .model('RemoteConfigStore')\n  .props({\n    fetching: false,\n    errorMsg: '',\n    config: types.frozen(),\n    data: types.frozen({})\n  })\n  .actions(self => {\n    let component: any = undefined;\n\n    const load: (\n      env: RendererEnv,\n      api: Api,\n      ctx: any,\n      config: WithRemoteConfigSettings\n    ) => Promise<any> = flow(function* (env, api, ctx, config = {}): any {\n      try {\n        self.fetching = true;\n        const ret: Payload = yield env.fetcher(api, ctx);\n        if (!isAlive(self)) {\n          return;\n        }\n\n        if (ret.ok) {\n          const data = normalizeApiResponseData(ret.data);\n          let options = config.adaptor\n            ? config.adaptor(data, component.props)\n            : data;\n          (self as any).setConfig(options, config, 'remote');\n          config.afterLoad?.(data, self.config, component.props);\n          return ret;\n        } else {\n          throw new Error(ret.msg || 'fetch error');\n        }\n      } catch (e) {\n        isAlive(self) && (self.errorMsg = e.message);\n      } finally {\n        isAlive(self) && (self.fetching = false);\n      }\n    });\n\n    return {\n      setComponent(c: any) {\n        component = c;\n      },\n\n      load,\n      setData(data: any) {\n        self.data = data || {};\n      },\n      setConfig(\n        options: any,\n        config: WithRemoteConfigSettings,\n        motivation?: any\n      ) {\n        if (config.normalizeConfig) {\n          options =\n            config.normalizeConfig(\n              options,\n              self.config,\n              component.props,\n              motivation\n            ) || options;\n        }\n\n        self.config = options;\n      }\n    };\n  });\n\nexport type IStore = Instance<typeof Store>;\n\nexport interface OutterProps {\n  env?: RendererEnv;\n  data: any;\n  source?: SchemaApi | SchemaTokenizeableString;\n  autoComplete?: SchemaApi | SchemaTokenizeableString;\n  deferApi?: SchemaApi;\n  remoteConfigRef?: (\n    instance:\n      | {\n          loadConfig: (ctx?: any) => Promise<any> | void;\n          setConfig: (value: any) => void;\n        }\n      | undefined\n  ) => void;\n}\n\nexport interface RemoteOptionsProps<T = any> {\n  config: T;\n  loading?: boolean;\n  deferLoad: (item: any) => Promise<any>;\n  updateConfig: (value: T, ctx?: any) => void;\n}\n\nexport interface WithRemoteConfigSettings {\n  /**\n   * 从接口返回数据适配到配置\n   */\n  adaptor?: (json: any, props: any) => any;\n\n  /**\n   * 配置格式化\n   */\n  normalizeConfig?: (\n    config: any,\n    origin: any,\n    props: any,\n    motivation?: any\n  ) => any;\n\n  /**\n   * 请求返回后的回调\n   */\n  afterLoad?: (ret: any, config: any, props: any) => void;\n\n  /**\n   * 懒加载选项相关，开始懒加载的回调\n   */\n  beforeDeferLoad?: (\n    item: any,\n    indexes: Array<number>,\n    config: any,\n    props: any\n  ) => any;\n\n  /**\n   * 懒加载选项相关，结束懒加载的回调\n   */\n  afterDeferLoad?: (\n    item: any,\n    indexes: Array<number>,\n    reponse: Payload,\n    config: any,\n    props: any\n  ) => any;\n}\n\nexport function withRemoteConfig<P = any>(\n  config: WithRemoteConfigSettings = {}\n) {\n  return function <\n    T extends React.ComponentType<\n      React.ComponentProps<T> & RemoteOptionsProps<P>\n    >\n  >(ComposedComponent: T) {\n    type FinalOutterProps = JSX.LibraryManagedAttributes<\n      T,\n      Omit<React.ComponentProps<T>, keyof RemoteOptionsProps<P>>\n    > &\n      OutterProps;\n\n    const result = hoistNonReactStatic(\n      withStore(() => Store.create())(\n        class extends React.Component<\n          FinalOutterProps & {\n            store: IStore;\n          }\n        > {\n          static displayName = `WithRemoteConfig(${\n            ComposedComponent.displayName || ComposedComponent.name\n          })`;\n          static ComposedComponent =\n            ComposedComponent as React.ComponentType<T>;\n          static contextType = EnvContext;\n          toDispose: Array<() => void> = [];\n\n          loadOptions = debounce(this.loadAutoComplete.bind(this), 250, {\n            trailing: true,\n            leading: false\n          });\n\n          constructor(\n            props: FinalOutterProps & {\n              store: IStore;\n            }\n          ) {\n            super(props);\n\n            this.setConfig = this.setConfig.bind(this);\n            props.store.setComponent(this);\n            this.deferLoadConfig = this.deferLoadConfig.bind(this);\n            props.remoteConfigRef?.(this);\n          }\n\n          componentDidMount() {\n            const env: RendererEnv = this.props.env || this.context;\n            const {store, source, data} = this.props;\n\n            store.setData(data);\n\n            if (isPureVariable(source)) {\n              this.syncConfig();\n              this.toDispose.push(\n                reaction(\n                  () =>\n                    resolveVariableAndFilter(\n                      source as string,\n                      store.data,\n                      '| raw'\n                    ),\n                  () => this.syncConfig()\n                )\n              );\n            } else if (env && isEffectiveApi(source, data)) {\n              this.loadConfig();\n              source.autoRefresh !== false &&\n                this.toDispose.push(\n                  reaction(\n                    () => {\n                      const api = normalizeApi(source as string);\n                      return api.trackExpression\n                        ? tokenize(api.trackExpression, store.data)\n                        : buildApi(api, store.data, {\n                            ignoreData: true\n                          }).url;\n                    },\n                    () => this.loadConfig()\n                  )\n                );\n            }\n          }\n\n          componentDidUpdate(prevProps: any) {\n            const props = this.props;\n\n            if (props.data !== prevProps.data) {\n              props.store.setData(props.data);\n            }\n          }\n\n          componentWillUnmount() {\n            this.toDispose.forEach(fn => fn());\n            this.toDispose = [];\n\n            this.props.remoteConfigRef?.(undefined);\n            this.loadOptions.cancel();\n          }\n\n          async loadConfig(ctx = this.props.data) {\n            const env: RendererEnv = this.props.env || this.context;\n            const {store, source} = this.props;\n\n            if (env && isEffectiveApi(source, ctx)) {\n              await store.load(env, source, ctx, config);\n            }\n          }\n\n          loadAutoComplete(input: string) {\n            const env: RendererEnv = this.props.env || this.context;\n            const {autoComplete, data, store} = this.props;\n\n            if (!env || !env.fetcher) {\n              throw new Error('fetcher is required');\n            }\n\n            const ctx = createObject(data, {\n              term: input,\n              value: input\n            });\n\n            if (!isEffectiveApi(autoComplete, ctx)) {\n              return Promise.resolve({\n                options: []\n              });\n            }\n\n            return store.load(env, autoComplete, ctx, config);\n          }\n\n          setConfig(value: any, ctx?: any) {\n            const {store} = this.props;\n            store.setConfig(value, config, ctx);\n          }\n\n          syncConfig() {\n            const {store, source, data} = this.props;\n\n            if (isPureVariable(source)) {\n              store.setConfig(\n                resolveVariableAndFilter(source as string, data, '| raw') || [],\n                config,\n                'syncConfig'\n              );\n            }\n          }\n\n          async deferLoadConfig(item: any) {\n            const {store, source, data, deferApi} = this.props;\n            const env: RendererEnv = this.props.env || this.context;\n            const indexes = findTreeIndex(store.config, a => a === item)!;\n\n            const ret = config.beforeDeferLoad?.(\n              item,\n              indexes,\n              store.config,\n              this.props\n            );\n\n            ret && store.setConfig(ret, config, 'before-defer-load');\n            let response: Payload;\n            try {\n              if (!isEffectiveApi(item.deferApi || deferApi || source)) {\n                throw new Error('deferApi is required');\n              }\n\n              response = await env.fetcher(\n                item.deferApi || deferApi || source,\n                createObject(data, item)\n              );\n            } catch (e) {\n              response = {\n                ok: false,\n                msg: e.message,\n                status: 500,\n                data: undefined\n              };\n            }\n            const ret2 = config.afterDeferLoad?.(\n              item,\n              indexes, // 只能假定还是那个 index 了\n              response,\n              store.config,\n              this.props\n            );\n            ret2 && store.setConfig(ret2, config, 'after-defer-load');\n          }\n\n          render() {\n            const store = this.props.store;\n            const env: RendererEnv = this.props.env || this.context;\n            const injectedProps: RemoteOptionsProps<P> = {\n              config: store.config,\n              loading: store.fetching,\n              deferLoad: this.deferLoadConfig,\n              updateConfig: this.setConfig\n            };\n            const {remoteConfigRef, autoComplete, ...rest} = this.props;\n\n            return (\n              <ComposedComponent\n                {...(rest as JSX.LibraryManagedAttributes<\n                  T,\n                  React.ComponentProps<T>\n                >)}\n                {...(env && isEffectiveApi(autoComplete) && this.loadOptions\n                  ? {loadOptions: this.loadOptions}\n                  : {})}\n                {...injectedProps}\n              />\n            );\n          }\n        }\n      ),\n      ComposedComponent\n    );\n\n    return result as typeof result & {\n      ComposedComponent: T;\n    };\n  };\n}\n"
     ]
 }

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

@@ -4,7 +4,7 @@ exports.ConditionField = void 0;
 var tslib_1 = require("tslib");
 var react_1 = (0, tslib_1.__importDefault)(require("react"));
 var PopOverContainer_1 = (0, tslib_1.__importDefault)(require("../PopOverContainer"));
-var ListRadios_1 = (0, tslib_1.__importDefault)(require("../ListRadios"));
+var GroupedSelection_1 = (0, tslib_1.__importDefault)(require("../GroupedSelection"));
 var ResultBox_1 = (0, tslib_1.__importDefault)(require("../ResultBox"));
 var theme_1 = require("../../theme");
 var icons_1 = require("../icons");
@@ -62,7 +62,10 @@ var ConditionField = /** @class */ (function (_super) {
                 var onClose = _a.onClose;
                 return (react_1.default.createElement(react_1.default.Fragment, null,
                     searchable ? (react_1.default.createElement(SearchBox_1.default, { mini: false, onSearch: _this.onSearch })) : null,
-                    react_1.default.createElement(ListRadios_1.default, { onClick: function (e) { return _this.onPopClose(e, onClose); }, showRadio: false, options: _this.state.options, value: value, option2value: option2value, onChange: onChange })));
+                    react_1.default.createElement(GroupedSelection_1.default, { multiple: false, onClick: function (e) { return _this.onPopClose(e, onClose); }, options: _this.state.options, value: [value], option2value: option2value, onChange: function (_a) {
+                            var value = _a[0];
+                            return onChange(value);
+                        } })));
             } }, function (_a) {
             var _b;
             var onClick = _a.onClick, ref = _a.ref, isOpened = _a.isOpened;

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

@@ -6,8 +6,8 @@
         "/src/components/condition-builder/Field.tsx"
     ],
     "names": [],
-    "mappings": "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",
+    "mappings": "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",
     "sourcesContent": [
-        "import React from 'react';\nimport PopOverContainer from '../PopOverContainer';\nimport ListRadios from '../ListRadios';\nimport ResultBox from '../ResultBox';\nimport {ClassNamesFn, ThemeProps, themeable} from '../../theme';\nimport {Icon} from '../icons';\nimport {findTree, noop} from '../../utils/helper';\nimport {localeable, LocaleProps} from '../../locale';\nimport SearchBox from '../SearchBox';\n\nexport interface ConditionFieldProps extends ThemeProps, LocaleProps {\n  options: Array<any>;\n  value: any;\n  onChange: (value: any) => void;\n  disabled?: boolean;\n  fieldClassName?: string;\n  searchable?: boolean;\n}\n\nexport interface ConditionFieldState {\n  options: Array<any>;\n}\n\nconst option2value = (item: any) => item.name;\n\nexport class ConditionField extends React.Component<\n  ConditionFieldProps,\n  ConditionFieldState\n> {\n  constructor(props: ConditionFieldProps) {\n    super(props);\n    this.state = {\n      options: props.options\n    };\n    this.onSearch = this.onSearch.bind(this);\n  }\n\n  onSearch(text: string) {\n    let txt = text.toLowerCase();\n\n    this.setState({\n      options: this.props.options\n        .map((item: any) => {\n          if (item.children) {\n            let children = item.children.filter((child: any) => {\n              return (\n                child.name.toLowerCase().includes(txt) ||\n                child.label.toLowerCase().includes(txt)\n              );\n            });\n            return children.length > 0\n              ? Object.assign({}, item, {children}) // 需要copy一份，防止覆盖原始数据\n              : false;\n          } else {\n            return item.name.toLowerCase().includes(txt) ||\n              item.label.toLowerCase().includes(txt)\n              ? item\n              : false;\n          }\n        })\n        .filter((item: any) => {\n          return !!item;\n        })\n    });\n  }\n\n  // 选了值，还原options\n  onPopClose(e: React.MouseEvent, onClose: () => void) {\n    this.setState({\n      options: this.props.options\n    });\n    onClose();\n  }\n\n  render() {\n    const {\n      options,\n      onChange,\n      value,\n      classnames: cx,\n      fieldClassName,\n      disabled,\n      translate: __,\n      searchable\n    } = this.props;\n    return (\n      <PopOverContainer\n        popOverRender={({onClose}) => (\n          <>\n            {searchable ? (\n              <SearchBox mini={false} onSearch={this.onSearch} />\n            ) : null}\n            <ListRadios\n              onClick={e => this.onPopClose(e, onClose)}\n              showRadio={false}\n              options={this.state.options}\n              value={value}\n              option2value={option2value}\n              onChange={onChange}\n            />\n          </>\n        )}\n      >\n        {({onClick, ref, isOpened}) => (\n          <div className={cx('CBGroup-field')}>\n            <ResultBox\n              className={cx(\n                'CBGroup-fieldInput',\n                fieldClassName,\n                isOpened ? 'is-active' : ''\n              )}\n              ref={ref}\n              allowInput={false}\n              result={\n                value\n                  ? findTree(options, item => item.name === value)?.label\n                  : ''\n              }\n              onResultChange={noop}\n              onResultClick={onClick}\n              placeholder={__('Condition.field_placeholder')}\n              disabled={disabled}\n            >\n              <span className={cx('CBGroup-fieldCaret')}>\n                <Icon icon=\"caret\" className=\"icon\" />\n              </span>\n            </ResultBox>\n          </div>\n        )}\n      </PopOverContainer>\n    );\n  }\n}\n\nexport default themeable(localeable(ConditionField));\n"
+        "import React from 'react';\nimport PopOverContainer from '../PopOverContainer';\nimport ListSelection from '../GroupedSelection';\nimport ResultBox from '../ResultBox';\nimport {ClassNamesFn, ThemeProps, themeable} from '../../theme';\nimport {Icon} from '../icons';\nimport {findTree, noop} from '../../utils/helper';\nimport {localeable, LocaleProps} from '../../locale';\nimport SearchBox from '../SearchBox';\n\nexport interface ConditionFieldProps extends ThemeProps, LocaleProps {\n  options: Array<any>;\n  value: any;\n  onChange: (value: any) => void;\n  disabled?: boolean;\n  fieldClassName?: string;\n  searchable?: boolean;\n}\n\nexport interface ConditionFieldState {\n  options: Array<any>;\n}\n\nconst option2value = (item: any) => item.name;\n\nexport class ConditionField extends React.Component<\n  ConditionFieldProps,\n  ConditionFieldState\n> {\n  constructor(props: ConditionFieldProps) {\n    super(props);\n    this.state = {\n      options: props.options\n    };\n    this.onSearch = this.onSearch.bind(this);\n  }\n\n  onSearch(text: string) {\n    let txt = text.toLowerCase();\n\n    this.setState({\n      options: this.props.options\n        .map((item: any) => {\n          if (item.children) {\n            let children = item.children.filter((child: any) => {\n              return (\n                child.name.toLowerCase().includes(txt) ||\n                child.label.toLowerCase().includes(txt)\n              );\n            });\n            return children.length > 0\n              ? Object.assign({}, item, {children}) // 需要copy一份，防止覆盖原始数据\n              : false;\n          } else {\n            return item.name.toLowerCase().includes(txt) ||\n              item.label.toLowerCase().includes(txt)\n              ? item\n              : false;\n          }\n        })\n        .filter((item: any) => {\n          return !!item;\n        })\n    });\n  }\n\n  // 选了值，还原options\n  onPopClose(e: React.MouseEvent, onClose: () => void) {\n    this.setState({\n      options: this.props.options\n    });\n    onClose();\n  }\n\n  render() {\n    const {\n      options,\n      onChange,\n      value,\n      classnames: cx,\n      fieldClassName,\n      disabled,\n      translate: __,\n      searchable\n    } = this.props;\n    return (\n      <PopOverContainer\n        popOverRender={({onClose}) => (\n          <>\n            {searchable ? (\n              <SearchBox mini={false} onSearch={this.onSearch} />\n            ) : null}\n            <ListSelection\n              multiple={false}\n              onClick={e => this.onPopClose(e, onClose)}\n              options={this.state.options}\n              value={[value]}\n              option2value={option2value}\n              onChange={([value]: any) => onChange(value)}\n            />\n          </>\n        )}\n      >\n        {({onClick, ref, isOpened}) => (\n          <div className={cx('CBGroup-field')}>\n            <ResultBox\n              className={cx(\n                'CBGroup-fieldInput',\n                fieldClassName,\n                isOpened ? 'is-active' : ''\n              )}\n              ref={ref}\n              allowInput={false}\n              result={\n                value\n                  ? findTree(options, item => item.name === value)?.label\n                  : ''\n              }\n              onResultChange={noop}\n              onResultClick={onClick}\n              placeholder={__('Condition.field_placeholder')}\n              disabled={disabled}\n            >\n              <span className={cx('CBGroup-fieldCaret')}>\n                <Icon icon=\"caret\" className=\"icon\" />\n              </span>\n            </ResultBox>\n          </div>\n        )}\n      </PopOverContainer>\n    );\n  }\n}\n\nexport default themeable(localeable(ConditionField));\n"
     ]
 }

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

@@ -5,7 +5,7 @@ var tslib_1 = require("tslib");
 var react_1 = (0, tslib_1.__importDefault)(require("react"));
 var theme_1 = require("../../theme");
 var PopOverContainer_1 = (0, tslib_1.__importDefault)(require("../PopOverContainer"));
-var ListRadios_1 = (0, tslib_1.__importDefault)(require("../ListRadios"));
+var GroupedSelection_1 = (0, tslib_1.__importDefault)(require("../GroupedSelection"));
 var helper_1 = require("../../utils/helper");
 var ResultBox_1 = (0, tslib_1.__importDefault)(require("../ResultBox"));
 var icons_1 = require("../icons");
@@ -45,7 +45,7 @@ var ConditionFunc = /** @class */ (function (_super) {
             react_1.default.createElement(PopOverContainer_1.default, { popOverRender: function (_a) {
                     var _b;
                     var onClose = _a.onClose;
-                    return (react_1.default.createElement(ListRadios_1.default, { onClick: onClose, showRadio: false, options: funcs, value: (_b = func) === null || _b === void 0 ? void 0 : _b.type, option2value: option2value, onChange: _this.handleFuncChange }));
+                    return (react_1.default.createElement(GroupedSelection_1.default, { onClick: onClose, options: funcs, value: (_b = func) === null || _b === void 0 ? void 0 : _b.type, option2value: option2value, onChange: _this.handleFuncChange, multiple: false }));
                 } }, function (_a) {
                 var onClick = _a.onClick, ref = _a.ref, isOpened = _a.isOpened;
                 return (react_1.default.createElement("div", { className: cx('CBFunc-select') },

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

@@ -6,8 +6,8 @@
         "/src/components/condition-builder/Func.tsx"
     ],
     "names": [],
-    "mappings": "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",
+    "mappings": "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",
     "sourcesContent": [
-        "import React from 'react';\nimport {Func, ExpressionFunc, Field, Funcs} from './types';\nimport {ThemeProps, themeable} from '../../theme';\nimport PopOverContainer from '../PopOverContainer';\nimport ListRadios from '../ListRadios';\nimport {autobind, findTree, noop} from '../../utils/helper';\nimport ResultBox from '../ResultBox';\nimport {Icon} from '../icons';\nimport Expression from './Expression';\nimport {Config} from './config';\n\nexport interface ConditionFuncProps extends ThemeProps {\n  value: ExpressionFunc;\n  onChange: (value: ExpressionFunc) => void;\n  disabled?: boolean;\n  config: Config;\n  fields?: Field[];\n  funcs?: Funcs;\n  allowedTypes?: Array<'value' | 'field' | 'func' | 'formula'>;\n  fieldClassName?: string;\n}\n\nconst option2value = (item: Func) => item.type;\n\nexport class ConditionFunc extends React.Component<ConditionFuncProps> {\n  @autobind\n  handleFuncChange(type: string) {\n    const value = {...this.props.value};\n    value.func = type;\n    this.props.onChange(value);\n  }\n\n  @autobind\n  handleArgChange(arg: any, index: number) {\n    const value = {...this.props.value};\n    value.args = Array.isArray(value.args) ? value.args.concat() : [];\n    value.args.splice(index, 1, arg);\n    this.props.onChange(value);\n  }\n\n  renderFunc(func: Func) {\n    const {classnames: cx, fields, value, funcs, config, disabled} = this.props;\n\n    return (\n      <div className={cx('CBFunc-args')}>\n        <span>(</span>\n        {Array.isArray(func.args) && func.args.length ? (\n          <div>\n            {func.args.map((item, index) => (\n              <Expression\n                config={config}\n                key={index}\n                index={index}\n                fields={fields}\n                value={value?.args[index]}\n                valueField={{type: item.type} as any}\n                onChange={this.handleArgChange}\n                funcs={funcs}\n                disabled={disabled}\n                // allowedTypes={allowedTypes}\n              />\n            ))}\n          </div>\n        ) : null}\n        <span>)</span>\n      </div>\n    );\n  }\n\n  render() {\n    const {value, classnames: cx, fieldClassName, funcs, disabled} = this.props;\n    const func = value\n      ? findTree(funcs!, item => (item as Func).type === value.func)\n      : null;\n\n    return (\n      <div className={cx('CBFunc')}>\n        <PopOverContainer\n          popOverRender={({onClose}) => (\n            <ListRadios\n              onClick={onClose}\n              showRadio={false}\n              options={funcs!}\n              value={(func as Func)?.type}\n              option2value={option2value}\n              onChange={this.handleFuncChange}\n            />\n          )}\n        >\n          {({onClick, ref, isOpened}) => (\n            <div className={cx('CBFunc-select')}>\n              <ResultBox\n                className={cx(\n                  'CBGroup-fieldInput',\n                  fieldClassName,\n                  isOpened ? 'is-active' : ''\n                )}\n                ref={ref}\n                allowInput={false}\n                result={func?.label}\n                onResultChange={noop}\n                onResultClick={onClick}\n                placeholder=\"请选择字段\"\n                disabled={disabled}\n              >\n                <span className={cx('CBGroup-fieldCaret')}>\n                  <Icon icon=\"caret\" className=\"icon\" />\n                </span>\n              </ResultBox>\n            </div>\n          )}\n        </PopOverContainer>\n\n        {func ? (\n          this.renderFunc(func as Func)\n        ) : (\n          <span className={cx('CBFunc-error')}>方法未定义</span>\n        )}\n      </div>\n    );\n  }\n}\n\nexport default themeable(ConditionFunc);\n"
+        "import React from 'react';\nimport {Func, ExpressionFunc, Field, Funcs} from './types';\nimport {ThemeProps, themeable} from '../../theme';\nimport PopOverContainer from '../PopOverContainer';\nimport GroupedSelection from '../GroupedSelection';\nimport {autobind, findTree, noop} from '../../utils/helper';\nimport ResultBox from '../ResultBox';\nimport {Icon} from '../icons';\nimport Expression from './Expression';\nimport {Config} from './config';\n\nexport interface ConditionFuncProps extends ThemeProps {\n  value: ExpressionFunc;\n  onChange: (value: ExpressionFunc) => void;\n  disabled?: boolean;\n  config: Config;\n  fields?: Field[];\n  funcs?: Funcs;\n  allowedTypes?: Array<'value' | 'field' | 'func' | 'formula'>;\n  fieldClassName?: string;\n}\n\nconst option2value = (item: Func) => item.type;\n\nexport class ConditionFunc extends React.Component<ConditionFuncProps> {\n  @autobind\n  handleFuncChange(type: string) {\n    const value = {...this.props.value};\n    value.func = type;\n    this.props.onChange(value);\n  }\n\n  @autobind\n  handleArgChange(arg: any, index: number) {\n    const value = {...this.props.value};\n    value.args = Array.isArray(value.args) ? value.args.concat() : [];\n    value.args.splice(index, 1, arg);\n    this.props.onChange(value);\n  }\n\n  renderFunc(func: Func) {\n    const {classnames: cx, fields, value, funcs, config, disabled} = this.props;\n\n    return (\n      <div className={cx('CBFunc-args')}>\n        <span>(</span>\n        {Array.isArray(func.args) && func.args.length ? (\n          <div>\n            {func.args.map((item, index) => (\n              <Expression\n                config={config}\n                key={index}\n                index={index}\n                fields={fields}\n                value={value?.args[index]}\n                valueField={{type: item.type} as any}\n                onChange={this.handleArgChange}\n                funcs={funcs}\n                disabled={disabled}\n                // allowedTypes={allowedTypes}\n              />\n            ))}\n          </div>\n        ) : null}\n        <span>)</span>\n      </div>\n    );\n  }\n\n  render() {\n    const {value, classnames: cx, fieldClassName, funcs, disabled} = this.props;\n    const func = value\n      ? findTree(funcs!, item => (item as Func).type === value.func)\n      : null;\n\n    return (\n      <div className={cx('CBFunc')}>\n        <PopOverContainer\n          popOverRender={({onClose}) => (\n            <GroupedSelection\n              onClick={onClose}\n              options={funcs!}\n              value={(func as Func)?.type}\n              option2value={option2value}\n              onChange={this.handleFuncChange}\n              multiple={false}\n            />\n          )}\n        >\n          {({onClick, ref, isOpened}) => (\n            <div className={cx('CBFunc-select')}>\n              <ResultBox\n                className={cx(\n                  'CBGroup-fieldInput',\n                  fieldClassName,\n                  isOpened ? 'is-active' : ''\n                )}\n                ref={ref}\n                allowInput={false}\n                result={func?.label}\n                onResultChange={noop}\n                onResultClick={onClick}\n                placeholder=\"请选择字段\"\n                disabled={disabled}\n              >\n                <span className={cx('CBGroup-fieldCaret')}>\n                  <Icon icon=\"caret\" className=\"icon\" />\n                </span>\n              </ResultBox>\n            </div>\n          )}\n        </PopOverContainer>\n\n        {func ? (\n          this.renderFunc(func as Func)\n        ) : (\n          <span className={cx('CBFunc-error')}>方法未定义</span>\n        )}\n      </div>\n    );\n  }\n}\n\nexport default themeable(ConditionFunc);\n"
     ]
 }

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

@@ -5,14 +5,14 @@ var tslib_1 = require("tslib");
 var react_1 = (0, tslib_1.__importDefault)(require("react"));
 var PopOverContainer_1 = (0, tslib_1.__importDefault)(require("../PopOverContainer"));
 var icons_1 = require("../icons");
-var ListRadios_1 = (0, tslib_1.__importDefault)(require("../ListRadios"));
+var GroupedSelection_1 = (0, tslib_1.__importDefault)(require("../GroupedSelection"));
 var theme_1 = require("../../theme");
 var option2value = function (item) { return item.value; };
 function InputSwitch(_a) {
     var options = _a.options, value = _a.value, onChange = _a.onChange, cx = _a.classnames, disabled = _a.disabled;
     return (react_1.default.createElement(PopOverContainer_1.default, { popOverRender: function (_a) {
             var onClose = _a.onClose;
-            return (react_1.default.createElement(ListRadios_1.default, { onClick: onClose, option2value: option2value, onChange: onChange, options: options, value: value, showRadio: false, disabled: disabled }));
+            return (react_1.default.createElement(GroupedSelection_1.default, { onClick: onClose, option2value: option2value, onChange: onChange, options: options, value: value, multiple: false, disabled: disabled }));
         } }, function (_a) {
         var onClick = _a.onClick, isOpened = _a.isOpened, ref = _a.ref;
         return (react_1.default.createElement("div", { className: cx('CBInputSwitch', isOpened ? 'is-active' : '') },

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

@@ -6,8 +6,8 @@
         "/src/components/condition-builder/InputSwitch.tsx"
     ],
     "names": [],
-    "mappings": ";;;;AAAA,6DAA0B;AAC1B,sFAAmD;AACnD,kCAA8B;AAC9B,0EAAuC;AACvC,qCAAgE;AAShE,IAAM,YAAY,GAAG,UAAC,IAAS,IAAK,OAAA,IAAI,CAAC,KAAK,EAAV,CAAU,CAAC;AAE/C,SAAgB,WAAW,CAAC,EAMT;QALjB,OAAO,aAAA,EACP,KAAK,WAAA,EACL,QAAQ,cAAA,EACI,EAAE,gBAAA,EACd,QAAQ,cAAA;IAER,OAAO,CACL,8BAAC,0BAAgB,IACf,aAAa,EAAE,UAAC,EAAS;gBAAR,OAAO,aAAA;YAAM,OAAA,CAC5B,8BAAC,oBAAU,IACT,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,KAAK,EAChB,QAAQ,EAAE,QAAQ,GAClB,CACH;QAV6B,CAU7B,IAEA,UAAC,EAAwB;YAAvB,OAAO,aAAA,EAAE,QAAQ,cAAA,EAAE,GAAG,SAAA;QAAM,OAAA,CAC7B,uCAAK,SAAS,EAAE,EAAE,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9D,qCAAG,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG;gBAC3B,8BAAC,YAAI,IAAC,IAAI,EAAC,YAAY,GAAG,CACxB,CACA,CACP;IAN8B,CAM9B,CACgB,CACpB,CAAC;AACJ,CAAC;AA9BD,kCA8BC;AAED,kBAAe,IAAA,iBAAS,EAAC,WAAW,CAAC,CAAC",
+    "mappings": ";;;;AAAA,6DAA0B;AAC1B,sFAAmD;AACnD,kCAA8B;AAC9B,sFAAmD;AACnD,qCAAgE;AAShE,IAAM,YAAY,GAAG,UAAC,IAAS,IAAK,OAAA,IAAI,CAAC,KAAK,EAAV,CAAU,CAAC;AAE/C,SAAgB,WAAW,CAAC,EAMT;QALjB,OAAO,aAAA,EACP,KAAK,WAAA,EACL,QAAQ,cAAA,EACI,EAAE,gBAAA,EACd,QAAQ,cAAA;IAER,OAAO,CACL,8BAAC,0BAAgB,IACf,aAAa,EAAE,UAAC,EAAS;gBAAR,OAAO,aAAA;YAAM,OAAA,CAC5B,8BAAC,0BAAgB,IACf,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,KAAK,EACf,QAAQ,EAAE,QAAQ,GAClB,CACH;QAV6B,CAU7B,IAEA,UAAC,EAAwB;YAAvB,OAAO,aAAA,EAAE,QAAQ,cAAA,EAAE,GAAG,SAAA;QAAM,OAAA,CAC7B,uCAAK,SAAS,EAAE,EAAE,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC;YAC9D,qCAAG,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG;gBAC3B,8BAAC,YAAI,IAAC,IAAI,EAAC,YAAY,GAAG,CACxB,CACA,CACP;IAN8B,CAM9B,CACgB,CACpB,CAAC;AACJ,CAAC;AA9BD,kCA8BC;AAED,kBAAe,IAAA,iBAAS,EAAC,WAAW,CAAC,CAAC",
     "sourcesContent": [
-        "import React from 'react';\nimport PopOverContainer from '../PopOverContainer';\nimport {Icon} from '../icons';\nimport ListRadios from '../ListRadios';\nimport {ClassNamesFn, themeable, ThemeProps} from '../../theme';\n\nexport interface InputSwitchProps extends ThemeProps {\n  options: Array<any>;\n  disabled?: boolean;\n  value: any;\n  onChange: (value: any) => void;\n}\n\nconst option2value = (item: any) => item.value;\n\nexport function InputSwitch({\n  options,\n  value,\n  onChange,\n  classnames: cx,\n  disabled\n}: InputSwitchProps) {\n  return (\n    <PopOverContainer\n      popOverRender={({onClose}) => (\n        <ListRadios\n          onClick={onClose}\n          option2value={option2value}\n          onChange={onChange}\n          options={options}\n          value={value}\n          showRadio={false}\n          disabled={disabled}\n        />\n      )}\n    >\n      {({onClick, isOpened, ref}) => (\n        <div className={cx('CBInputSwitch', isOpened ? 'is-active' : '')}>\n          <a onClick={onClick} ref={ref}>\n            <Icon icon=\"ellipsis-v\" />\n          </a>\n        </div>\n      )}\n    </PopOverContainer>\n  );\n}\n\nexport default themeable(InputSwitch);\n"
+        "import React from 'react';\nimport PopOverContainer from '../PopOverContainer';\nimport {Icon} from '../icons';\nimport GroupedSelection from '../GroupedSelection';\nimport {ClassNamesFn, themeable, ThemeProps} from '../../theme';\n\nexport interface InputSwitchProps extends ThemeProps {\n  options: Array<any>;\n  disabled?: boolean;\n  value: any;\n  onChange: (value: any) => void;\n}\n\nconst option2value = (item: any) => item.value;\n\nexport function InputSwitch({\n  options,\n  value,\n  onChange,\n  classnames: cx,\n  disabled\n}: InputSwitchProps) {\n  return (\n    <PopOverContainer\n      popOverRender={({onClose}) => (\n        <GroupedSelection\n          onClick={onClose}\n          option2value={option2value}\n          onChange={onChange}\n          options={options}\n          value={value}\n          multiple={false}\n          disabled={disabled}\n        />\n      )}\n    >\n      {({onClick, isOpened, ref}) => (\n        <div className={cx('CBInputSwitch', isOpened ? 'is-active' : '')}>\n          <a onClick={onClick} ref={ref}>\n            <Icon icon=\"ellipsis-v\" />\n          </a>\n        </div>\n      )}\n    </PopOverContainer>\n  );\n}\n\nexport default themeable(InputSwitch);\n"
     ]
 }

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

@@ -10,7 +10,7 @@ var helper_1 = require("../../utils/helper");
 var Expression_1 = (0, tslib_1.__importDefault)(require("./Expression"));
 var config_1 = require("./config");
 var PopOverContainer_1 = (0, tslib_1.__importDefault)(require("../PopOverContainer"));
-var ListRadios_1 = (0, tslib_1.__importDefault)(require("../ListRadios"));
+var GroupedSelection_1 = (0, tslib_1.__importDefault)(require("../GroupedSelection"));
 var ResultBox_1 = (0, tslib_1.__importDefault)(require("../ResultBox"));
 var locale_1 = require("../../locale");
 var option2value = function (item) { return item.value; };
@@ -86,10 +86,10 @@ var ConditionItem = /** @class */ (function (_super) {
             var __1 = this.props.translate;
             return (react_1.default.createElement(PopOverContainer_1.default, { popOverRender: function (_a) {
                     var onClose = _a.onClose;
-                    return (react_1.default.createElement(ListRadios_1.default, { onClick: onClose, option2value: option2value, onChange: _this.handleOperatorChange, options: operators.map(function (operator) { return ({
+                    return (react_1.default.createElement(GroupedSelection_1.default, { onClick: onClose, option2value: option2value, onChange: _this.handleOperatorChange, options: operators.map(function (operator) { return ({
                             label: __1(config_1.OperationMap[operator]),
                             value: operator
-                        }); }), value: value.op, showRadio: false }));
+                        }); }), value: value.op, multiple: false }));
                 } }, function (_a) {
                 var onClick = _a.onClick, isOpened = _a.isOpened, ref = _a.ref;
                 return (react_1.default.createElement("div", { className: cx('CBGroup-operator') },