amis-ui 6.9.0 → 6.10.0-beta.1

package/lib/components/Tree.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.9.0
+ * amis-ui v6.10.0-beta.1
  * Copyright 2018-2024 fex
  */
 
@@ -38,6 +38,7 @@ var TreeSelector = /** @class */ (function (_super) {
             y: 0
         };
         _this.root = React__default["default"].createRef();
+        _this.virtualListRef = React__default["default"].createRef();
         var value = Select.value2array(props.value, {
             multiple: props.multiple,
             delimiter: props.delimiter,
@@ -230,12 +231,23 @@ var TreeSelector = /** @class */ (function (_super) {
                     : node);
         });
     };
+    TreeSelector.prototype.handleItemClick = function (node, checked) {
+        var _a;
+        var _b = this.props, onHandleNodeClick = _b.onHandleNodeClick, multiple = _b.multiple, _c = _b.nodeBehavior, nodeBehavior = _c === void 0 ? ['check'] : _c;
+        onHandleNodeClick && onHandleNodeClick(node);
+        if ((nodeBehavior === null || nodeBehavior === void 0 ? void 0 : nodeBehavior.includes('unfold')) && ((_a = node.children) === null || _a === void 0 ? void 0 : _a.length)) {
+            this.toggleUnfolded(node);
+        }
+        if (nodeBehavior === null || nodeBehavior === void 0 ? void 0 : nodeBehavior.includes('check')) {
+            multiple ? this.handleCheck(node, !checked) : this.handleSelect(node);
+        }
+    };
     TreeSelector.prototype.handleCheck = function (item, checked) {
         var _this = this;
         // TODO: 重新梳理这里的逻辑
         var props = this.props;
         var value = this.state.valueSet;
-        var onlyChildren = props.onlyChildren, withChildren = props.withChildren, cascade = props.cascade, autoCheckChildren = props.autoCheckChildren;
+        var onlyChildren = props.onlyChildren, withChildren = props.withChildren, cascade = props.cascade, autoCheckChildren = props.autoCheckChildren, autoCancelParent = props.autoCancelParent;
         if (checked) {
             if (!value.has(item)) {
                 value.add(item);
@@ -341,6 +353,20 @@ var TreeSelector = /** @class */ (function (_super) {
                     }
                 }
             }
+            if (autoCancelParent && cascade) {
+                var toCheck = item;
+                while (true) {
+                    var parent_2 = amisCore.getTreeParent(props.options, toCheck);
+                    //判断 parent 节点是否已经勾选
+                    if (value.has(parent_2)) {
+                        //当有一个子节点取消时要去掉父节点，也要去掉父节点的父节点，直至最外层
+                        value.delete(parent_2);
+                        toCheck = parent_2;
+                        continue;
+                    }
+                    break;
+                }
+            }
         }
         this.setState({
             value: tslib.__spreadArray([], tslib.__read(value), false)
@@ -745,7 +771,7 @@ var TreeSelector = /** @class */ (function (_super) {
     TreeSelector.prototype.renderItem = function (_a) {
         var _this = this;
         var index = _a.index, style = _a.style;
-        var _b = this.props, itemClassName = _b.itemClassName, showIcon = _b.showIcon, showRadio = _b.showRadio, multiple = _b.multiple, labelField = _b.labelField, iconField = _b.iconField, deferField = _b.deferField, cascade = _b.cascade, cx = _b.classnames, highlightTxt = _b.highlightTxt, creatable = _b.creatable, editable = _b.editable, removable = _b.removable, createTip = _b.createTip, editTip = _b.editTip, removeTip = _b.removeTip, __ = _b.translate, itemRender = _b.itemRender, draggable = _b.draggable, loadingConfig = _b.loadingConfig, enableDefaultIcon = _b.enableDefaultIcon, valueField = _b.valueField, mobileUI = _b.mobileUI, testIdBuilder = _b.testIdBuilder;
+        var _b = this.props, itemClassName = _b.itemClassName, showIcon = _b.showIcon, showRadio = _b.showRadio, multiple = _b.multiple, labelField = _b.labelField, iconField = _b.iconField, deferField = _b.deferField, cascade = _b.cascade, cx = _b.classnames, highlightTxt = _b.highlightTxt, creatable = _b.creatable, editable = _b.editable, removable = _b.removable, createTip = _b.createTip, editTip = _b.editTip, removeTip = _b.removeTip, __ = _b.translate, itemRender = _b.itemRender, draggable = _b.draggable, loadingConfig = _b.loadingConfig, enableDefaultIcon = _b.enableDefaultIcon, valueField = _b.valueField, mobileUI = _b.mobileUI, testIdBuilder = _b.testIdBuilder, itemActionsRender = _b.itemActionsRender, actionClassName = _b.actionClassName;
         var item = this.state.flattenedOptions[index];
         if (!item) {
             return null;
@@ -760,7 +786,8 @@ var TreeSelector = /** @class */ (function (_super) {
         var isLeaf = (!item.children || !item.children.length) && !item.placeholder;
         var iconValue = item[iconField] ||
             (enableDefaultIcon !== false
-                ? Array.isArray(item.children) && item.children.length
+                ? (Array.isArray(item.children) && item.children.length) ||
+                    item[deferField]
                     ? 'folder'
                     : 'file'
                 : false);
@@ -789,21 +816,12 @@ var TreeSelector = /** @class */ (function (_super) {
                     }) }, itemTestBuilder === null || itemTestBuilder === void 0 ? void 0 : itemTestBuilder.getChild(isFolded ? 'open' : 'fold').getTestId()),
                     _J$X_(icons.Icon, { icon: "down-arrow-bold", className: "icon" }))) : (_J$X_("span", { className: cx('Tree-itemArrowPlaceholder') })),
                 checkbox,
-                _J$X_("div", tslib.__assign({ className: cx('Tree-itemLabel-item', { 'is-mobile': mobileUI }) }, itemTestBuilder === null || itemTestBuilder === void 0 ? void 0 : itemTestBuilder.getChild('content').getTestId()),
-                    showIcon ? (_J$X_("i", { className: cx("Tree-itemIcon ".concat(Array.isArray(item.children) && item.children.length
+                _J$X_("div", tslib.__assign({ className: cx('Tree-itemLabel-item', { 'is-mobile': mobileUI }) }, itemTestBuilder === null || itemTestBuilder === void 0 ? void 0 : itemTestBuilder.getChild('content').getTestId(), { onClick: function () { return !disabled && _this.handleItemClick(item, checked); } }),
+                    showIcon ? (_J$X_("i", { className: cx("Tree-itemIcon ".concat((Array.isArray(item.children) && item.children.length) ||
+                            item[deferField]
                             ? 'Tree-folderIcon'
-                            : 'Tree-leafIcon')), onClick: function () {
-                            return !disabled &&
-                                (multiple
-                                    ? _this.handleCheck(item, !checked)
-                                    : _this.handleSelect(item));
-                        } }, iconValue ? _J$X_(icons.Icon, { icon: iconValue, className: "icon" }) : null)) : null,
-                    _J$X_("span", tslib.__assign({ className: cx('Tree-itemText'), onClick: function () {
-                            return !disabled &&
-                                (multiple
-                                    ? _this.handleCheck(item, !checked)
-                                    : _this.handleSelect(item));
-                        }, title: item[labelField] }, itemTestBuilder === null || itemTestBuilder === void 0 ? void 0 : itemTestBuilder.getChild('text').getTestId()), itemRender
+                            : 'Tree-leafIcon')) }, iconValue ? _J$X_(icons.Icon, { icon: iconValue, className: "icon" }) : null)) : null,
+                    _J$X_("span", tslib.__assign({ className: cx('Tree-itemText'), title: item[labelField] }, itemTestBuilder === null || itemTestBuilder === void 0 ? void 0 : itemTestBuilder.getChild('text').getTestId()), itemRender
                         ? itemRender(item, {
                             index: index,
                             multiple: multiple,
@@ -816,7 +834,7 @@ var TreeSelector = /** @class */ (function (_super) {
                         : highlightTxt
                             ? amisCore.highlight("".concat(item[labelField]), highlightTxt)
                             : "".concat(item[labelField])),
-                    !disabled && !isAdding && !isEditing ? (_J$X_("div", { className: cx('Tree-item-icons') },
+                    !disabled && !isAdding && !isEditing ? (_J$X_("div", { className: cx('Tree-item-icons', actionClassName), onClick: function (e) { return e.stopPropagation(); } },
                         creatable &&
                             !(item[deferField] && !item.loaded) &&
                             amisCore.hasAbility(item, 'creatable') ? (_J$X_(TooltipWrapper["default"], { placement: 'bottom', tooltip: __(createTip), trigger: 'hover', tooltipTheme: "dark" },
@@ -827,7 +845,8 @@ var TreeSelector = /** @class */ (function (_super) {
                                 _J$X_(icons.Icon, { icon: "minus", className: "icon" })))) : null,
                         editable && amisCore.hasAbility(item, 'editable') ? (_J$X_(TooltipWrapper["default"], { placement: 'bottom', tooltip: __(editTip), trigger: 'hover', tooltipTheme: "dark" },
                             _J$X_("a", tslib.__assign({ onClick: this.handleEdit.bind(this, item) }, itemTestBuilder === null || itemTestBuilder === void 0 ? void 0 : itemTestBuilder.getChild('edit').getTestId()),
-                                _J$X_(icons.Icon, { icon: "new-edit", className: "icon" })))) : null)) : null)));
+                                _J$X_(icons.Icon, { icon: "new-edit", className: "icon" })))) : null,
+                        itemActionsRender && (_J$X_("div", { className: cx('Tree-itemActions') }, itemActionsRender(item, tslib.__assign(tslib.__assign({}, item), { index: index, multiple: multiple, checked: checked, labelField: labelField, onChange: function () { return _this.handleCheck(item, !checked); }, disabled: disabled || item.disabled, classnames: cx })))))) : null)));
         }
         return (_J$X_("li", tslib.__assign({ key: "".concat(item[valueField || 'value'], "-").concat(index), className: cx("Tree-item ".concat(itemClassName || ''), {
                 'Tree-item--isLeaf': isLeaf,
@@ -891,18 +910,19 @@ var TreeSelector = /** @class */ (function (_super) {
     };
     TreeSelector.prototype.renderList = function (list, value) {
         var _this = this;
-        var _a = this.props, virtualThreshold = _a.virtualThreshold, _b = _a.itemHeight, itemHeight = _b === void 0 ? 32 : _b;
+        var _a = this.props, virtualThreshold = _a.virtualThreshold, _b = _a.itemHeight, itemHeight = _b === void 0 ? 32 : _b, virtualHeight = _a.virtualHeight;
         if (virtualThreshold && list.length > virtualThreshold) {
-            return (_J$X_(index["default"], { height: list.length > 8 ? 266 : list.length * itemHeight, itemCount: list.length, prefix: this.renderCheckAll(), itemSize: itemHeight, 
-                //! hack: 让 VirtualList 重新渲染
-                renderItem: this.renderItem.bind(this) }));
+            return (_J$X_("div", { ref: this.virtualListRef },
+                _J$X_(index["default"], { height: virtualHeight !== undefined ? virtualHeight : 266, itemCount: list.length, prefix: this.renderCheckAll(), itemSize: itemHeight, 
+                    //! hack: 让 VirtualList 重新渲染
+                    renderItem: this.renderItem.bind(this) })));
         }
         return (_J$X_(React__default["default"].Fragment, null,
             this.renderCheckAll(),
             list.map(function (item, index) { return _this.renderItem({ index: index }); })));
     };
     TreeSelector.prototype.render = function () {
-        var _a = this.props, className = _a.className, placeholder = _a.placeholder, hideRoot = _a.hideRoot, rootLabel = _a.rootLabel, showOutline = _a.showOutline, showIcon = _a.showIcon, cx = _a.classnames, creatable = _a.creatable, rootCreatable = _a.rootCreatable, rootCreateTip = _a.rootCreateTip, disabled = _a.disabled, draggable = _a.draggable, __ = _a.translate, testIdBuilder = _a.testIdBuilder;
+        var _a = this.props, className = _a.className, placeholder = _a.placeholder, hideRoot = _a.hideRoot, rootLabel = _a.rootLabel, showOutline = _a.showOutline, showIcon = _a.showIcon, cx = _a.classnames, creatable = _a.creatable, rootCreatable = _a.rootCreatable, rootCreateTip = _a.rootCreateTip, disabled = _a.disabled, draggable = _a.draggable, __ = _a.translate, testIdBuilder = _a.testIdBuilder, actionClassName = _a.actionClassName;
         var _b = this.state, value = _b.value, isAdding = _b.isAdding, addingParent = _b.addingParent, isEditing = _b.isEditing, dropIndicator = _b.dropIndicator, flattenedOptions = _b.flattenedOptions;
         var addBtn = null;
         if (creatable && rootCreatable !== false && hideRoot) {
@@ -934,7 +954,7 @@ var TreeSelector = /** @class */ (function (_super) {
                         creatable &&
                         rootCreatable !== false &&
                         !isAdding &&
-                        !isEditing ? (_J$X_("div", { className: cx('Tree-item-icons') }, creatable ? (_J$X_("a", tslib.__assign({ onClick: this.handleAdd.bind(this, null), "data-tooltip": rootCreateTip, "data-position": "left" }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild("root-add").getTestId()),
+                        !isEditing ? (_J$X_("div", { className: cx('Tree-item-icons', actionClassName) }, creatable ? (_J$X_("a", tslib.__assign({ onClick: this.handleAdd.bind(this, null), "data-tooltip": rootCreateTip, "data-position": "left" }, testIdBuilder === null || testIdBuilder === void 0 ? void 0 : testIdBuilder.getChild("root-add").getTestId()),
                         _J$X_(icons.Icon, { icon: "plus", className: "icon" }))) : null)) : null),
                 _J$X_("ul", { className: cx('Tree-sublist') },
                     isAdding && !addingParent ? (_J$X_("li", { className: cx('Tree-item') }, this.renderInput())) : null,
@@ -967,6 +987,7 @@ var TreeSelector = /** @class */ (function (_super) {
         rootLabel: 'Tree.root',
         rootValue: 0,
         autoCheckChildren: true,
+        autoCancelParent: false,
         cascade: false,
         selfDisabledAffectChildren: true,
         rootCreateTip: 'Tree.addRoot',
@@ -998,6 +1019,12 @@ var TreeSelector = /** @class */ (function (_super) {
         tslib.__metadata("design:paramtypes", [Object, Object]),
         tslib.__metadata("design:returntype", void 0)
     ], TreeSelector.prototype, "handleSelect", null);
+    tslib.__decorate([
+        amisCore.autobind,
+        tslib.__metadata("design:type", Function),
+        tslib.__metadata("design:paramtypes", [Object, Boolean]),
+        tslib.__metadata("design:returntype", void 0)
+    ], TreeSelector.prototype, "handleItemClick", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),

package/lib/components/TreeSelection.js

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

package/lib/components/UserSelect.js

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

package/lib/components/UserTabSelect.js

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

package/lib/components/VerificationCode.js

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

package/lib/components/VirtualList.js

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

package/lib/components/WithRemoteConfig.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.9.0
+ * amis-ui v6.10.0-beta.1
  * Copyright 2018-2024 fex
  */
 
@@ -225,7 +225,7 @@ function withRemoteConfig(config) {
                             store.setConfig(source, config, 'syncConfig');
                         }
                     }
-                    else if (amisCore.isObject(source) && !amisCore.isEffectiveApi(source, data)) {
+                    else if (amisCore.isObject(source) && !source.method) {
                         store.setConfig(source, config, 'syncConfig');
                     }
                 };

package/lib/components/WithStore.js

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

package/lib/components/calendar/Calendar.js

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

package/lib/components/calendar/CalendarContainer.js

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

package/lib/components/calendar/DaysView.js

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

package/lib/components/calendar/MonthsView.js

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

package/lib/components/calendar/QuartersView.js

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

package/lib/components/calendar/TimeView.js

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

package/lib/components/calendar/YearsView.js

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

package/lib/components/formula/CodeEditor.js

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

package/lib/components/formula/Editor.js

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

package/lib/components/formula/FuncList.js

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

package/lib/components/formula/Input.js

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

package/lib/components/formula/Picker.js

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

package/lib/components/formula/VariableList.js

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

package/lib/components/formula/plugin.js

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

package/lib/components/icons.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v6.9.0
+ * amis-ui v6.10.0-beta.1
  * Copyright 2018-2024 fex
  */
 
@@ -262,7 +262,7 @@ function Icon(_a) {
     if (typeof jest !== 'undefined' && icon) {
         iconContent = '';
     }
-    if (!icon) {
+    if (!icon && !iconContent) {
         return null;
     }
     // 支持的事件

package/lib/components/json-schema/Array.js

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

package/lib/components/json-schema/Item.js

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

package/lib/components/json-schema/Object.js

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

package/lib/components/json-schema/index.js

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

package/lib/components/menu/MenuContext.js

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

package/lib/components/menu/MenuItem.js

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

package/lib/components/menu/SubMenu.js

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