amis-ui 2.9.0 → 3.1.0

package/lib/components/condition-builder/Item.d.ts

@@ -27,12 +27,12 @@ export declare class ConditionItem extends React.Component<ConditionItemProps> {
     handleLeftChange(leftValue: any): void;
     handleOperatorChange(op: OperatorType): void;
     handleRightChange(rightValue: any): void;
-    handleRightSubChange(isCustom: boolean, index: number | string, rightValue: any): void;
-    renderLeft(): JSX.Element;
-    renderOperator(): JSX.Element | null;
-    renderRight(): JSX.Element | JSX.Element[] | null;
-    renderRightWidgets(type: string, op: OperatorType): JSX.Element | JSX.Element[] | null;
-    render(): JSX.Element;
+    handleRightSubChange(index: number | string, rightValue: any): void;
+    renderLeft(): React.JSX.Element;
+    renderOperator(): React.JSX.Element | null;
+    renderRight(): React.JSX.Element | React.JSX.Element[] | null;
+    renderRightWidgets(type: string, op: OperatorType): React.JSX.Element | React.JSX.Element[] | null;
+    render(): React.JSX.Element;
 }
 declare const _default: {
     new (props: Omit<Omit<ConditionItemProps, keyof LocaleProps> & {
@@ -42,7 +42,7 @@ declare const _default: {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<Omit<ConditionItemProps, keyof LocaleProps> & {
             locale?: string | undefined;
@@ -101,7 +101,7 @@ declare const _default: {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ConditionItemProps, keyof LocaleProps> & {
                 locale?: string | undefined;
@@ -164,7 +164,7 @@ declare const _default: {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ConditionItemProps, keyof LocaleProps> & {
             locale?: string | undefined;
@@ -227,7 +227,7 @@ declare const _default: {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ConditionItemProps, keyof LocaleProps> & {
                 locale?: string | undefined;

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -51,18 +51,21 @@ var ConditionItem = /** @class */ (function (_super) {
         onChange(value, this.props.index);
     };
     ConditionItem.prototype.handleOperatorChange = function (op) {
-        var value = tslib.__assign(tslib.__assign({}, this.props.value), { op: op, right: undefined });
-        this.props.onChange(value, this.props.index);
+        var _a;
+        var _b = this.props, fields = _b.fields, value = _b.value, index = _b.index, onChange = _b.onChange;
+        var leftFieldSchema = amisCore.findTree(fields, function (i) { var _a; return i.name === ((_a = value === null || value === void 0 ? void 0 : value.left) === null || _a === void 0 ? void 0 : _a.field); });
+        var result = tslib.__assign(tslib.__assign({}, value), { op: op, right: (_a = value.right) !== null && _a !== void 0 ? _a : leftFieldSchema === null || leftFieldSchema === void 0 ? void 0 : leftFieldSchema.defaultValue });
+        onChange(result, index);
     };
     ConditionItem.prototype.handleRightChange = function (rightValue) {
         var value = tslib.__assign(tslib.__assign({}, this.props.value), { right: rightValue });
         var onChange = this.props.onChange;
         onChange(value, this.props.index);
     };
-    ConditionItem.prototype.handleRightSubChange = function (isCustom, index, rightValue) {
+    ConditionItem.prototype.handleRightSubChange = function (index, rightValue) {
         var _a, _b;
         var origin;
-        if (isCustom) {
+        if (typeof index === 'string') {
             origin = Object.assign({}, (_a = this.props.value) === null || _a === void 0 ? void 0 : _a.right);
             origin[index] = rightValue;
         }
@@ -168,16 +171,16 @@ var ConditionItem = /** @class */ (function (_super) {
         }
         else if (op === 'between' || op === 'not_between') {
             return (React__default["default"].createElement(React__default["default"].Fragment, null,
-                React__default["default"].createElement(Expression["default"], { config: config, funcs: funcs, valueField: field, value: (_c = value.right) === null || _c === void 0 ? void 0 : _c[0], data: data, onChange: this.handleRightSubChange.bind(this, false, 0), fields: fields, allowedTypes: (field === null || field === void 0 ? void 0 : field.valueTypes) ||
+                React__default["default"].createElement(Expression["default"], { config: config, funcs: funcs, valueField: field, value: (_c = value.right) === null || _c === void 0 ? void 0 : _c[0], data: data, onChange: this.handleRightSubChange.bind(this, 0), fields: fields, allowedTypes: (field === null || field === void 0 ? void 0 : field.valueTypes) ||
                         config.valueTypes || ['value', 'field', 'func', 'formula'], disabled: disabled, formula: formula, popOverContainer: popOverContainer, renderEtrValue: renderEtrValue }),
                 React__default["default"].createElement("span", { className: cx('CBSeprator') }, "~"),
-                React__default["default"].createElement(Expression["default"], { config: config, funcs: funcs, valueField: field, value: (_d = value.right) === null || _d === void 0 ? void 0 : _d[1], data: data, onChange: this.handleRightSubChange.bind(this, false, 1), fields: fields, allowedTypes: (field === null || field === void 0 ? void 0 : field.valueTypes) ||
+                React__default["default"].createElement(Expression["default"], { config: config, funcs: funcs, valueField: field, value: (_d = value.right) === null || _d === void 0 ? void 0 : _d[1], data: data, onChange: this.handleRightSubChange.bind(this, 1), fields: fields, allowedTypes: (field === null || field === void 0 ? void 0 : field.valueTypes) ||
                         config.valueTypes || ['value', 'field', 'func', 'formula'], disabled: disabled, formula: formula, popOverContainer: popOverContainer, renderEtrValue: renderEtrValue })));
         }
         else if (option && typeof option !== 'string' && option.values) {
             return option.values.map(function (schema, i) {
                 return (React__default["default"].createElement("span", { key: i },
-                    React__default["default"].createElement(Expression["default"], { config: config, op: op, funcs: funcs, valueField: schema, value: value.right, data: data, onChange: _this.handleRightSubChange.bind(_this, true, schema.name), fields: fields, allowedTypes: (field === null || field === void 0 ? void 0 : field.valueTypes) ||
+                    React__default["default"].createElement(Expression["default"], { config: config, op: op, funcs: funcs, valueField: tslib.__assign(tslib.__assign({}, field), { value: schema }), value: amisCore.getVariable(value.right, schema.name), data: data, onChange: _this.handleRightSubChange.bind(_this, schema.name), fields: fields, allowedTypes: (field === null || field === void 0 ? void 0 : field.valueTypes) ||
                             config.valueTypes || ['value', 'field', 'func', 'formula'], disabled: disabled, formula: formula, popOverContainer: popOverContainer, renderEtrValue: renderEtrValue })));
             });
         }

package/lib/components/condition-builder/Value.d.ts

@@ -16,7 +16,7 @@ export interface ValueProps extends ThemeProps, LocaleProps {
     renderEtrValue?: any;
 }
 export declare class Value extends React.Component<ValueProps> {
-    render(): JSX.Element;
+    render(): React.JSX.Element;
 }
 declare const _default: {
     new (props: Omit<Omit<ValueProps, keyof LocaleProps> & {
@@ -26,7 +26,7 @@ declare const _default: {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<Omit<ValueProps, keyof LocaleProps> & {
             locale?: string | undefined;
@@ -85,7 +85,7 @@ declare const _default: {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ValueProps, keyof LocaleProps> & {
                 locale?: string | undefined;
@@ -148,7 +148,7 @@ declare const _default: {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ValueProps, keyof LocaleProps> & {
             locale?: string | undefined;
@@ -211,7 +211,7 @@ declare const _default: {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ValueProps, keyof LocaleProps> & {
                 locale?: string | undefined;

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -66,23 +66,14 @@ var Value = /** @class */ (function (_super) {
         }
         else if (field.type === 'custom') {
             input = renderEtrValue
-                ? renderEtrValue(tslib.__assign(tslib.__assign({}, field.value), { name: field.name }), {
+                ? renderEtrValue(tslib.__assign(tslib.__assign({}, field.value), { name: 'TMP_WHATEVER_NAME' }), // name 随便输入，应该是 value 传入的为主，目前表单项内部逻辑还有问题先传一个 name
+                {
                     data: data,
                     onChange: onChange,
                     value: value !== null && value !== void 0 ? value : field.defaultValue
                 })
                 : null;
         }
-        else {
-            var res = value !== null && value !== void 0 ? value : field.defaultValue;
-            input = renderEtrValue
-                ? renderEtrValue(field, {
-                    data: data,
-                    onChange: onChange,
-                    value: res ? res[field.name] : res
-                })
-                : null;
-        }
         return React__default["default"].createElement("div", { className: cx('CBValue') }, input);
     };
     return Value;

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/condition-builder/index.d.ts

@@ -32,7 +32,7 @@ export interface ConditionBuilderState {
 }
 export declare class QueryBuilder extends React.Component<ConditionBuilderProps, ConditionBuilderState> {
     config: {
-        valueTypes?: ("value" | "func" | "formula" | "field")[] | undefined;
+        valueTypes?: ("value" | "formula" | "func" | "field")[] | undefined;
         fields?: ConditionBuilderFields | undefined;
         funcs?: ConditionBuilderFuncs | undefined;
         maxLevel?: number | undefined;
@@ -51,9 +51,9 @@ export declare class QueryBuilder extends React.Component<ConditionBuilderProps,
     handleDragDrop(): void;
     handleDragEnd(e: Event): void;
     handleClear(): void;
-    highlightValue(value: ConditionGroupValue): JSX.Element;
-    renderBody(onChange: (value: ConditionGroupValue) => void, value?: ConditionGroupValue, popOverContainer?: any): JSX.Element;
-    render(): JSX.Element;
+    highlightValue(value: ConditionGroupValue): React.JSX.Element;
+    renderBody(onChange: (value: ConditionGroupValue) => void, value?: ConditionGroupValue, popOverContainer?: any): React.JSX.Element;
+    render(): React.JSX.Element;
 }
 declare const _default: {
     new (props: Omit<Omit<ConditionBuilderProps, keyof LocaleProps> & {
@@ -63,7 +63,7 @@ declare const _default: {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<Omit<ConditionBuilderProps, keyof LocaleProps> & {
             locale?: string | undefined;
@@ -122,7 +122,7 @@ declare const _default: {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ConditionBuilderProps, keyof LocaleProps> & {
                 locale?: string | undefined;
@@ -185,7 +185,7 @@ declare const _default: {
         ref: any;
         childRef(ref: any): void;
         getWrappedInstance(): any;
-        render(): JSX.Element;
+        render(): React.JSX.Element;
         context: unknown;
         setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ConditionBuilderProps, keyof LocaleProps> & {
             locale?: string | undefined;
@@ -248,7 +248,7 @@ declare const _default: {
             ref: any;
             childRef(ref: any): void;
             getWrappedInstance(): any;
-            render(): JSX.Element;
+            render(): React.JSX.Element;
             context: unknown;
             setState<K_1 extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Omit<ConditionBuilderProps, keyof LocaleProps> & {
                 locale?: string | undefined;

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v2.9.0
+ * amis-ui v3.1.0
  * Copyright 2018-2023 fex
  */
 
@@ -175,7 +175,7 @@ var QueryBuilder = /** @class */ (function (_super) {
         }
         return (React__default["default"].createElement(PickerContainer["default"], { classnames: cx, classPrefix: classPrefix, translate: translate, locale: locale, onConfirm: onFinalChange, value: value, size: 'md', popOverContainer: popOverContainer, bodyRender: function (params) { return _this.renderBody(params.onChange, params.value); }, title: title }, function (_a) {
             var onClick = _a.onClick, isOpened = _a.isOpened;
-            return (React__default["default"].createElement(ResultBox["default"], { classnames: cx, classPrefix: classPrefix, translate: translate, locale: locale, className: cx('CBGroup-result', { 'is-active': isOpened }), allowInput: false, clearable: true, result: value, itemRender: _this.highlightValue, onResultChange: amisCore.noop, onClear: _this.handleClear, disabled: disabled, borderMode: 'full', placeholder: placeholder, actions: pickerIcon && (React__default["default"].createElement("span", { className: cx('CBPicker-trigger'), onClick: onClick }, pickerIcon)), onResultClick: pickerIcon ? undefined : onClick }));
+            return (React__default["default"].createElement(ResultBox["default"], { classnames: cx, classPrefix: classPrefix, translate: translate, locale: locale, className: cx('CBGroup-result', { 'is-active': isOpened }), allowInput: false, clearable: true, result: value, itemRender: _this.highlightValue, onResultChange: amisCore.noop, onClear: _this.handleClear, disabled: disabled, borderMode: 'full', placeholder: placeholder, actions: pickerIcon && (React__default["default"].createElement("span", { className: cx('CBPicker-trigger'), onClick: onClick }, pickerIcon)), onResultClick: onClick }));
         }));
     };
     tslib.__decorate([

package/lib/components/condition-builder/types.d.ts

@@ -76,7 +76,7 @@ interface BooleanField extends BaseField {
     type: 'boolean';
     name: string;
 }
-interface CustomField extends BaseField {
+export interface CustomField extends BaseField {
     type: 'custom';
     name: string;
     value: any;