@oinone/kunlun-vue-admin-base 6.3.1 → 6.3.2

package/dist/oinone-kunlun-vue-admin-base.esm.js

@@ -70814,32 +70814,38 @@ var script$1h = defineComponent({
                     }
                     const finalExpandSize = props.invisibleSearch ? props.foldSize + 1 : props.foldSize;
                     appendFieldDslDefinition(fields, widgets, finalExpandSize, props.foldSize, props.cateFields);
-                    hasExpandButton = fields.length > finalExpandSize;
-                    if (hasExpandButton) {
-                        fields = fields.slice(0, finalExpandSize);
+                    if (fields.length) {
+                        hasExpandButton = fields.length > finalExpandSize;
+                        if (hasExpandButton) {
+                            fields = fields.slice(0, finalExpandSize);
+                        }
+                        if (!props.invisibleSearch) {
+                            const searchActionBar = createSearchBar(false, {
+                                hasExpandButton,
+                                showSearchPrefer: props.showSearchPrefer,
+                                onSearch,
+                                onReset,
+                                onExpand,
+                                translate: props.translate,
+                                preferProps: {
+                                    selected: props.selectedPrefer,
+                                    options: props.searchPreferOptions,
+                                    onLoad: props.onLoadSearchPreferOptions,
+                                    onCreate: props.onCreateSearchPrefer,
+                                    onUpdate: props.onUpdateSearchPrefer,
+                                    onRemove: props.onRemoveSearchPrefer,
+                                    onSelect: props.onSelectSearchPrefer,
+                                    onUnselect: props.onUnselectSearchPrefer
+                                }
+                            });
+                            invisible = !fields.length;
+                            const searchBarCol = createSearchBarCol(searchActionBar, (props.foldSize - fields.length) * (DEFAULT_COLS$1 / (props.foldSize + 1)), invisible, props.foldSize);
+                            fields.push(searchBarCol);
+                        }
                     }
-                    if (!props.invisibleSearch) {
-                        const searchActionBar = createSearchBar(false, {
-                            hasExpandButton,
-                            showSearchPrefer: props.showSearchPrefer,
-                            onSearch,
-                            onReset,
-                            onExpand,
-                            translate: props.translate,
-                            preferProps: {
-                                selected: props.selectedPrefer,
-                                options: props.searchPreferOptions,
-                                onLoad: props.onLoadSearchPreferOptions,
-                                onCreate: props.onCreateSearchPrefer,
-                                onUpdate: props.onUpdateSearchPrefer,
-                                onRemove: props.onRemoveSearchPrefer,
-                                onSelect: props.onSelectSearchPrefer,
-                                onUnselect: props.onUnselectSearchPrefer
-                            }
-                        });
-                        invisible = !fields.length;
-                        const searchBarCol = createSearchBarCol(searchActionBar, (props.foldSize - fields.length) * (DEFAULT_COLS$1 / (props.foldSize + 1)), invisible, props.foldSize);
-                        fields.push(searchBarCol);
+                    else {
+                        hasExpandButton = false;
+                        fields = widgets;
                     }
                     defaultChildren.push(withDirectives(DslRender.render({
                         internal: true,
@@ -71118,6 +71124,17 @@ let SearchWidget = class SearchWidget extends BaseSearchWidget {
         super.$$mounted();
         this.isExpand = BooleanHelper.toBoolean(this.urlParameters.expand) || false;
     }
+    childrenInvisibleProcess() {
+        if (this.disabledExpand && !this.invisibleSearch) {
+            const children = this.getChildren();
+            const lastChild = children[children.length - 1];
+            if (children.length === 2 && lastChild instanceof DefaultRowWidget) {
+                return isAllInvisible(children.slice(0, children.length - 1));
+            }
+            return isAllInvisible(children);
+        }
+        return super.childrenInvisibleProcess();
+    }
 };
 __decorate([
     Widget.Reactive(),