amis-ui 3.6.2 → 6.0.0

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -59,9 +59,14 @@ var ConditionItem = /** @class */ (function (_super) {
     };
     ConditionItem.prototype.handleOperatorChange = function (op) {
         var _a;
-        var _b = this.props, fields = _b.fields, value = _b.value, index = _b.index, onChange = _b.onChange;
+        var _b = this.props, fields = _b.fields, value = _b.value, index = _b.index, onChange = _b.onChange, formula = _b.formula;
+        var useFormulaInput = (formula === null || formula === void 0 ? void 0 : formula.mode) === 'input-group' && (formula === null || formula === void 0 ? void 0 : formula.inputSettings);
         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 });
+        var result = tslib.__assign(tslib.__assign({}, value), { op: op, 
+            /** 使用公式编辑器模式时，因为不同条件下值格式不一致（比如select类型下包含和等于对应的multiple会变化），所以变化条件时需要清空right值 */
+            right: useFormulaInput
+                ? leftFieldSchema === null || leftFieldSchema === void 0 ? void 0 : leftFieldSchema.defaultValue
+                : (_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) {
@@ -121,12 +126,12 @@ var ConditionItem = /** @class */ (function (_super) {
                     return operator;
                 }
             });
-            return (_J$X_(PopOverContainer.PopOverContainer, { mobileUI: mobileUI, popOverContainer: popOverContainer || (function () { return ReactDOM.findDOMNode(_this); }), popOverRender: function (_a) {
+            return (_J$X_(PopOverContainer.PopOverContainer, { mobileUI: mobileUI, disabled: operators.length < 2, popOverContainer: popOverContainer || (function () { return ReactDOM.findDOMNode(_this); }), popOverRender: function (_a) {
                     var onClose = _a.onClose;
                     return (_J$X_(GroupedSelection["default"], { onClick: onClose, option2value: option2value, onChange: _this.handleOperatorChange, options: options_1, value: value.op, multiple: false }));
                 } }, function (_a) {
                 var _b;
-                var onClick = _a.onClick, isOpened = _a.isOpened, ref = _a.ref;
+                var onClick = _a.onClick, isOpened = _a.isOpened, ref = _a.ref; _a.disabled;
                 return (_J$X_("div", { className: cx('CBGroup-operator') },
                     _J$X_(ResultBox["default"], { className: cx('CBGroup-operatorInput', isOpened ? 'is-active' : ''), ref: ref, allowInput: false, result: __1(config.OperationMap[value === null || value === void 0 ? void 0 : value.op]) ||
                             ((_b = options_1.find(function (option) { return option.value === value.op; })) === null || _b === void 0 ? void 0 : _b.label), onResultChange: amisCore.noop, onResultClick: onClick, disabled: disabled, placeholder: __1('Condition.cond_placeholder'), mobileUI: mobileUI }, !mobileUI ? (_J$X_("span", { className: cx('CBGroup-operatorCaret') },

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

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

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -180,9 +180,18 @@ var QueryBuilder = /** @class */ (function (_super) {
         if (embed) {
             return this.renderBody(onFinalChange, value, popOverContainer);
         }
+        /** 因为 ConditionBuilder特殊的数据结构，提供给 ResultBox 的需要处理一下 */
+        var resultBoxValue = embed === false
+            ? !value ||
+                !(value === null || value === void 0 ? void 0 : value.hasOwnProperty('children')) ||
+                !Array.isArray(value.children) ||
+                value.children.length < 1
+                ? undefined
+                : value
+            : value;
         return (_J$X_(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 (_J$X_(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 && (_J$X_("span", { className: cx('CBPicker-trigger'), onClick: onClick }, pickerIcon)), mobileUI: mobileUI, onResultClick: onClick }));
+            return (_J$X_(ResultBox["default"], { classnames: cx, classPrefix: classPrefix, translate: translate, locale: locale, className: cx('CBGroup-result', { 'is-active': isOpened }), allowInput: false, clearable: true, result: resultBoxValue, itemRender: _this.highlightValue, onResultChange: amisCore.noop, onClear: _this.handleClear, disabled: disabled, borderMode: 'full', placeholder: placeholder, actions: pickerIcon && (_J$X_("span", { className: cx('CBPicker-trigger'), onClick: onClick }, pickerIcon)), mobileUI: mobileUI, onResultClick: onClick }));
         }));
     };
     tslib.__decorate([

package/lib/components/formula/Editor.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -81,6 +81,15 @@ var FormulaEditor = /** @class */ (function (_super) {
         if (!Array.isArray(variables) || !variables.length || !value) {
             return;
         }
+        if (typeof value !== 'string') {
+            try {
+                value = JSON.stringify(value);
+            }
+            catch (error) {
+                console.error('[amis][formula] given value is not a string');
+                value = '';
+            }
+        }
         var varMap = {};
         amisCore.eachTree(variables, function (item) {
             var _a;

package/lib/components/formula/FuncList.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 

package/lib/components/formula/Input.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v3.6.2
+ * amis-ui v6.0.0
  * Copyright 2018-2023 fex
  */
 
@@ -29,8 +29,8 @@ var __react_jsx__ = require('react');
 var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
 var FormulaInput = function (props) {
-    var _a, _b, _c, _d, _e;
-    var __ = props.translate, className = props.className, cx = props.classnames, allowInput = props.allowInput, placeholder = props.placeholder, borderMode = props.borderMode, evalMode = props.evalMode, mixedMode = props.mixedMode, value = props.value, variables = props.variables, _f = props.inputSettings, inputSettings = _f === void 0 ? { type: 'text' } : _f, popOverContainer = props.popOverContainer, onChange = props.onChange, itemRender = props.itemRender;
+    var _a, _b, _c, _d;
+    var __ = props.translate, className = props.className, cx = props.classnames, allowInput = props.allowInput, placeholder = props.placeholder, borderMode = props.borderMode, evalMode = props.evalMode, mixedMode = props.mixedMode, value = props.value, variables = props.variables, _e = props.inputSettings, inputSettings = _e === void 0 ? { type: 'text' } : _e, popOverContainer = props.popOverContainer, onChange = props.onChange, itemRender = props.itemRender;
     var schemaType = inputSettings.type;
     /** 自上层共享的属性 */
     var sharedProps = pick__default["default"](props, ['disabled', 'clearable']);
@@ -47,9 +47,31 @@ var FormulaInput = function (props) {
             result = origin.value;
         }
         else if (schemaType === 'select') {
-            result = Array.isArray(origin)
-                ? origin.map(function (item) { return item.value; })
-                : origin.value;
+            var joinValues = inputSettings.joinValues, extractValue = inputSettings.extractValue, delimiter = inputSettings.delimiter, multiple = inputSettings.multiple, _a = inputSettings.valueField, valueField_1 = _a === void 0 ? 'value' : _a;
+            if (joinValues) {
+                if (multiple) {
+                    result = Array.isArray(origin)
+                        ? origin.map(function (item) { return item[valueField_1]; }).join(delimiter)
+                        : origin
+                            ? origin[valueField_1]
+                            : '';
+                }
+                else {
+                    result = origin ? origin[valueField_1] : '';
+                }
+            }
+            else if (extractValue) {
+                if (multiple) {
+                    result = Array.isArray(origin)
+                        ? origin.map(function (item) { return item[valueField_1]; })
+                        : origin
+                            ? [origin[valueField_1 || 'value']]
+                            : [];
+                }
+                else {
+                    result = origin ? origin[valueField_1] : '';
+                }
+            }
         }
         onChange === null || onChange === void 0 ? void 0 : onChange(result);
     }, ['onChange']);
@@ -69,24 +91,56 @@ var FormulaInput = function (props) {
                 : cmptValue === (item === null || item === void 0 ? void 0 : item.value);
         })
         : null;
-    if (amisCore.isExpression(cmptValue) ||
-        targetVariable ||
-        (schemaType === 'number' &&
-            cmptValue != null &&
-            typeof cmptValue !== 'number') ||
-        (['date', 'time', 'datetime'].includes(schemaType) &&
-            !moment__default["default"](cmptValue).isValid()) ||
-        (schemaType === 'select' &&
-            cmptValue != null &&
-            !((_a = inputSettings === null || inputSettings === void 0 ? void 0 : inputSettings.options) !== null && _a !== void 0 ? _a : []).some(function (item) { return (item === null || item === void 0 ? void 0 : item.value) === cmptValue; })) ||
-        (schemaType === 'boolean' &&
-            cmptValue != null &&
-            typeof cmptValue !== 'boolean')) {
-        var varName = cmptValue && mixedMode
+    var useVariable = !!(amisCore.isExpression(cmptValue) || targetVariable);
+    /** 判断value是否为变量，如果是变量，使用ResultBox渲染 */
+    if (!useVariable) {
+        if (schemaType === 'number') {
+            useVariable = cmptValue != null && typeof cmptValue !== 'number';
+        }
+        else if (['date', 'time', 'datetime'].includes(schemaType)) {
+            useVariable = !moment__default["default"](cmptValue).isValid();
+        }
+        else if (schemaType === 'select') {
+            var options = inputSettings.options, joinValues = inputSettings.joinValues, extractValue = inputSettings.extractValue, delimiter = inputSettings.delimiter, multiple = inputSettings.multiple, _f = inputSettings.valueField, valueField_2 = _f === void 0 ? 'value' : _f;
+            var selctedValue_1 = [];
+            if (multiple) {
+                if (joinValues) {
+                    selctedValue_1 =
+                        typeof cmptValue === 'string' ? cmptValue.split(delimiter) : [];
+                }
+                else {
+                    selctedValue_1 = Array.isArray(cmptValue)
+                        ? extractValue
+                            ? cmptValue
+                            : cmptValue.map(function (i) { return i === null || i === void 0 ? void 0 : i[valueField_2]; })
+                        : [];
+                }
+            }
+            else {
+                if (joinValues) {
+                    selctedValue_1 = typeof cmptValue === 'string' ? [cmptValue] : [];
+                }
+                else {
+                    selctedValue_1 = amisCore.isObject(cmptValue) ? [cmptValue === null || cmptValue === void 0 ? void 0 : cmptValue[valueField_2]] : [];
+                }
+            }
+            /** 选项类型清空后是空字符串， */
+            useVariable =
+                cmptValue &&
+                    !(options !== null && options !== void 0 ? options : []).some(function (item) {
+                        return selctedValue_1.includes(item === null || item === void 0 ? void 0 : item.value);
+                    });
+        }
+        else if (schemaType === 'boolean') {
+            useVariable = cmptValue != null && typeof cmptValue !== 'boolean';
+        }
+    }
+    if (useVariable) {
+        var varName = typeof cmptValue === 'string' && cmptValue && mixedMode
             ? cmptValue.replace(/^\$\{/, '').replace(/\}$/, '')
             : cmptValue;
-        var resultValue = (_b = targetVariable === null || targetVariable === void 0 ? void 0 : targetVariable.value) !== null && _b !== void 0 ? _b : varName;
-        return (_J$X_(ResultBox["default"], { className: cx("FormulaPicker-input-variable"), allowInput: false, value: resultValue, result: resultValue == null
+        var resultValue = (_a = targetVariable === null || targetVariable === void 0 ? void 0 : targetVariable.value) !== null && _a !== void 0 ? _a : varName;
+        return (_J$X_(ResultBox["default"], { className: cx("FormulaPicker-input-variable"), allowInput: allowInput, value: resultValue, result: resultValue == null
                 ? void 0
                 : Editor.FormulaEditor.highlightValue(resultValue, variables, evalMode), itemRender: function (item) {
                 return (_J$X_("div", { className: cx('FormulaPicker-ResultBox'), dangerouslySetInnerHTML: { __html: item.html } }));
@@ -109,15 +163,15 @@ var FormulaInput = function (props) {
         return (_J$X_(Select["default"], tslib.__assign({}, sharedProps, { className: cx(className, "FormulaPicker-input-".concat(schemaType)), borderMode: "none", multiple: schemaType === 'boolean' ? false : inputSettings.multiple, options: schemaType === 'boolean'
                 ? [
                     {
-                        label: __((_c = inputSettings === null || inputSettings === void 0 ? void 0 : inputSettings.trueLabel) !== null && _c !== void 0 ? _c : 'FormulaInput.True'),
+                        label: __((_b = inputSettings === null || inputSettings === void 0 ? void 0 : inputSettings.trueLabel) !== null && _b !== void 0 ? _b : 'FormulaInput.True'),
                         value: true
                     },
                     {
-                        label: __((_d = inputSettings === null || inputSettings === void 0 ? void 0 : inputSettings.falseLabel) !== null && _d !== void 0 ? _d : 'FormulaInput.False'),
+                        label: __((_c = inputSettings === null || inputSettings === void 0 ? void 0 : inputSettings.falseLabel) !== null && _c !== void 0 ? _c : 'FormulaInput.False'),
                         value: false
                     }
                 ]
-                : (_e = inputSettings.options) !== null && _e !== void 0 ? _e : [], value: pipInValue(value), renderValueLabel: function (option) {
+                : (_d = inputSettings.options) !== null && _d !== void 0 ? _d : [], value: pipInValue(value), renderValueLabel: function (option) {
                 var _a, _b;
                 var label = (_b = (_a = option.label) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : '';
                 return schemaType === 'boolean' || !inputSettings.multiple ? (_J$X_(Tag["default"], { label: label, className: cx('rounded') })) : (_J$X_(React__default["default"].Fragment, null, label));