@ibiz-template/vue3-components 0.6.16 → 0.7.0

package/lib/control/form/form-detail/form-mdctrl/form-mdctrl.cjs

@@ -25,10 +25,14 @@ const FormMDCtrl = /* @__PURE__ */ vue.defineComponent({
     vue3Util.useController(props.controller);
     const c = props.controller;
     const hasCaption = c.model.showCaption && !!c.model.caption;
+    const onActionClick = async (detail, event) => {
+      await props.controller.onActionClick(detail, event);
+    };
     return {
       c,
       ns,
-      hasCaption
+      hasCaption,
+      onActionClick
     };
   },
   render() {
@@ -60,11 +64,16 @@ const FormMDCtrl = /* @__PURE__ */ vue.defineComponent({
     }
     return vue.createVNode("div", {
       "class": [this.ns.b(), this.ns.m(this.modelData.codeName), ...this.controller.containerClass, this.hasCaption ? this.ns.m("show-caption") : ""]
-    }, [this.hasCaption && vue.createVNode("div", {
+    }, [vue.createVNode("div", {
       "class": this.ns.b("header")
-    }, [vue.createVNode("span", {
+    }, [vue.createVNode("div", {
       "class": this.ns.e("title")
-    }, [this.c.model.caption])]), content]);
+    }, [this.hasCaption ? this.c.model.caption : ""]), model.uiactionGroup && vue.createVNode(vue.resolveComponent("iBizActionToolbar"), {
+      "class": this.ns.e("toolbar"),
+      "action-details": model.uiactionGroup.uiactionGroupDetails,
+      "actions-state": this.controller.state.actionGroupState,
+      "onActionClick": this.onActionClick
+    }, null)]), content]);
   }
 });
 

package/lib/control/form/form-detail/form-mdctrl/form-mdctrl.css

@@ -1 +1 @@
-.ibiz-form-mdctrl{--ibiz-form-mdctrl-header-height:32px}.ibiz-form-mdctrl-header{height:var(--ibiz-form-mdctrl-header-height);line-height:var(--ibiz-form-mdctrl-header-height)}
+.ibiz-form-mdctrl{--ibiz-form-mdctrl-header-height:49px}.ibiz-form-mdctrl__toolbar{display:flex;justify-content:flex-end;width:50%}.ibiz-form-mdctrl__title{width:50%;font-size:var(--ibiz-font-size-header-5);font-weight:var(--ibiz-font-weight-bold)}.ibiz-form-mdctrl-header{display:flex;place-content:center space-between;align-items:center;height:var(--ibiz-form-mdctrl-header-height);padding:var(--ibiz-spacing-base-tight) 0;margin:6px var(--ibiz-spacing-base-tight);line-height:var(--ibiz-form-mdctrl-header-height);border-bottom:1px solid var(--ibiz-color-border)}

package/lib/control/form/form-detail/form-rawitem/form-rawitem.cjs

@@ -22,14 +22,43 @@ const FormRawItem = /* @__PURE__ */ vue.defineComponent({
   },
   setup(props) {
     const ns = vue3Util.useNamespace("form-raw-item");
+    const c = props.controller;
+    const content = vue.ref("");
     const showFormDefaultContent = vue.computed(() => {
       if (props.controller.form.controlParams && props.controller.form.controlParams.editmode === "hover") {
         return true;
       }
       return false;
     });
+    vue.watch(() => c.data, async (newVal) => {
+      if (newVal) {
+        const rawItemModel = c.model.rawItem;
+        if (!rawItemModel) {
+          return;
+        }
+        let rawItemContent = "";
+        const obj = {
+          ...newVal
+        };
+        if (rawItemModel.contentType === "RAW") {
+          rawItemContent = rawItemModel.caption;
+        } else if (rawItemModel.contentType === "HTML") {
+          rawItemContent = rawItemModel.content;
+        }
+        if (rawItemContent && rawItemModel.templateMode) {
+          content.value = await ibiz.util.hbs.render(rawItemContent.replaceAll("//n", "\n"), Object.assign(obj, {
+            data: {
+              ...newVal
+            }
+          }));
+        }
+      }
+    }, {
+      immediate: true
+    });
     return {
       ns,
+      content,
       showFormDefaultContent
     };
   },
@@ -40,6 +69,7 @@ const FormRawItem = /* @__PURE__ */ vue.defineComponent({
     return vue.createVNode(vue.resolveComponent("iBizRawItem"), {
       "class": [this.ns.b(), ...this.controller.containerClass, this.ns.is("show-default", this.showFormDefaultContent)],
       "rawItem": this.modelData,
+      "content": this.content,
       "onClick": (event) => this.controller.onClick(event)
     }, null);
   }

package/lib/control/grid/grid/grid.cjs

@@ -294,6 +294,7 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
         "total": state.total,
         "curPage": state.curPage,
         "size": state.size,
+        "totalPages": state.totalPages,
         "onChange": this.onPageChange,
         "onPageSizeChange": this.onPageSizeChange,
         "onPageRefresh": this.onPageRefresh

package/lib/control/grid/grid-column/grid-field-edit-column/cell-edit.cjs

@@ -29,7 +29,9 @@ function useCellEdit(props, componentRef) {
     return !editorShowEdit.value;
   });
   const editorDisabled = false;
-  const isAutoFocus = true;
+  const isAutoFocus = vue.computed(() => {
+    return !hasError.value;
+  });
   const showEditMask = vue.computed(() => {
     return cellEditable.value && !editable.value;
   });

package/lib/control/list/list.cjs

@@ -214,6 +214,7 @@ const ListControl = /* @__PURE__ */ vue.defineComponent({
         "total": this.c.state.total,
         "curPage": this.c.state.curPage,
         "size": this.c.state.size,
+        "totalPages": this.c.state.totalPages,
         "onChange": this.onPageChange,
         "onPageSizeChange": this.onPageSizeChange,
         "onPageRefresh": this.onPageRefresh

package/lib/control/search-bar/filter-tree/filter-tree.cjs

@@ -4,6 +4,7 @@ var vue = require('vue');
 var runtime = require('@ibiz-template/runtime');
 var vue3Util = require('@ibiz-template/vue3-util');
 require('./filter-tree.css');
+var qxUtil = require('qx-util');
 
 "use strict";
 function _isSlot(s) {
@@ -92,33 +93,49 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
     const UiFilterNodes = vue.computed(() => {
       return props.filterNodes;
     });
-    const findFilterController = (fieldName, valueOP) => {
+    const findFilterController = (node) => {
+      if (node.nodeType === "ITEMS" && node.simple) {
+        const subNode = node.children[0];
+        return props.filterControllers.find((item) => {
+          if (item.type === "SIMPLE_ITEMS") {
+            const simpleC = item;
+            if (simpleC.fieldName === node.field && simpleC.valueOP === node.valueOP && simpleC.subFieldName === subNode.field && simpleC.subValueOP === subNode.valueOP) {
+              return true;
+            }
+          }
+          return false;
+        });
+      }
+      const {
+        field,
+        valueOP
+      } = node;
       return props.filterControllers.find((item) => {
-        if (item.fieldName === fieldName) {
+        if (item.type === "SIMPLE_ITEMS") {
+          return false;
+        }
+        if (item.fieldName === field) {
           return item.valueOP ? item.valueOP === valueOP : true;
         }
         return false;
       });
     };
     const allFields = [];
-    const getFilterModes = (fieldName, fieldInfos = allFields) => {
-      if (!fieldName) {
-        return;
-      }
-      const field = fieldInfos.find((item) => item.name === fieldName);
-      if (!field) {
+    props.filterControllers.forEach((filterC) => {
+      let find = allFields.find((x) => x.name === filterC.key);
+      if (filterC.hidden) {
         return;
       }
-      return field.valueOPs;
-    };
-    props.filterControllers.forEach((filterC) => {
-      let find = allFields.find((x) => x.name === filterC.fieldName);
       if (find === void 0) {
         find = {
-          name: filterC.fieldName,
+          name: filterC.key,
+          fieldName: filterC.fieldName,
           label: filterC.label,
           valueOPs: []
         };
+        if (filterC.type === "SIMPLE_ITEMS") {
+          find.simpleFilterC = filterC;
+        }
         allFields.push(find);
       }
       if (!filterC.valueOP) {
@@ -127,25 +144,38 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
         find.valueOPs.push(filterC.valueOP);
       }
     });
-    const onFieldSelect = (node, field) => {
-      node.value = null;
-      node.valueOP = null;
-      node.field = field;
-      Object.assign(node, {
-        leaf: true,
-        logicType: void 0,
-        children: void 0
-      });
+    const getFilterModes = (fieldName, fieldInfos = allFields) => {
+      if (!fieldName) {
+        return;
+      }
+      const field = fieldInfos.find((item) => item.name === fieldName);
+      if (!field) {
+        return;
+      }
+      return field.valueOPs;
+    };
+    const onFieldSelect = (node, key, fields = allFields) => {
+      const fieldInfo = fields.find((item) => item.name === key);
+      if (!fieldInfo) {
+        ibiz.log.error("allFields\u627E\u4E0D\u5230\u5C5E\u6027\u6807\u8BC6\u4E3A".concat(key, "\u7684"));
+        return;
+      }
+      qxUtil.clearAll(node);
+      if (fieldInfo.simpleFilterC) {
+        fieldInfo.simpleFilterC.addSimpleFilterNode(node);
+        return;
+      }
+      node.nodeType = "FIELD";
+      node.field = fieldInfo.fieldName;
     };
     const onValueOPSelect = (node, valueOP) => {
       node.valueOP = valueOP;
       node.value = null;
       if (["EXISTS", "NOTEXISTS"].includes(valueOP)) {
         Object.assign(node, {
-          leaf: false,
-          logicType: "ITEMS",
+          nodeType: "ITEMS",
           children: [{
-            leaf: true,
+            nodeType: "FIELD",
             field: null,
             valueOP: null,
             value: null
@@ -153,8 +183,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
         });
       } else {
         Object.assign(node, {
-          leaf: true,
-          logicType: void 0,
+          nodeType: "FIELD",
           children: void 0
         });
       }
@@ -164,10 +193,10 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
     };
     const addGroup = (node) => {
       node.children.push({
-        leaf: false,
+        nodeType: "GROUP",
         logicType: "AND",
         children: [{
-          leaf: true,
+          nodeType: "FIELD",
           field: null,
           valueOP: null,
           value: null
@@ -176,7 +205,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
     };
     const addItem = (node) => {
       node.children.push({
-        leaf: true,
+        nodeType: "FIELD",
         field: null,
         valueOP: null,
         value: null
@@ -214,6 +243,9 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
     };
     const renderFilterItem = (node, itemsC) => {
       let _slot;
+      if (node.hidden) {
+        return;
+      }
       let fieldInfos = allFields;
       if (itemsC) {
         fieldInfos = itemsC.allFields;
@@ -225,7 +257,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
           const subFilterC = itemsC.getSubFilterController(node.field, node.valueOP);
           editor = renderEditor(node, subFilterC);
         } else {
-          const filterC = findFilterController(node.field, node.valueOP);
+          const filterC = findFilterController(node);
           if (filterC && !["EXISTS", "NOTEXISTS"].includes(filterC.valueOP)) {
             editor = renderEditor(node, filterC);
           }
@@ -239,7 +271,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
         "teleported": false,
         "class": ns.e("field-select"),
         "onChange": (field) => {
-          onFieldSelect(node, field);
+          onFieldSelect(node, field, fieldInfos);
         }
       }, _isSlot(_slot = fieldInfos.map((field) => {
         return vue.createVNode(vue.resolveComponent("el-option"), {
@@ -261,7 +293,10 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
     };
     let renderFilterItems = (_node) => vue.createVNode("div", null, null);
     const renderFilterGroup = (node, itemsC) => {
-      if (node.logicType === "ITEMS") {
+      if (node.hidden) {
+        return;
+      }
+      if (node.nodeType === "ITEMS") {
         return renderFilterItems(node);
       }
       return vue.createVNode("div", {
@@ -303,7 +338,10 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
       })]), vue.createVNode("div", {
         "class": ns.be("group", "list")
       }, [node.children.length > 0 && node.children.map((child, index) => {
-        const childContent = child.leaf ? renderFilterItem(child, itemsC) : renderFilterGroup(child, itemsC);
+        const childContent = child.nodeType === "FIELD" ? renderFilterItem(child, itemsC) : renderFilterGroup(child, itemsC);
+        if (!childContent) {
+          return null;
+        }
         return vue.createVNode("div", {
           "class": ns.be("group", "list-item")
         }, [vue.createVNode("div", {
@@ -320,7 +358,30 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
       })])]);
     };
     renderFilterItems = (node) => {
-      const itemsC = findFilterController(node.field, node.valueOP);
+      const itemsC = findFilterController(node);
+      if (node.simple) {
+        let _slot2;
+        const child = node.children[0];
+        if (!child) {
+          return;
+        }
+        return [vue.createVNode(vue.resolveComponent("el-select"), {
+          "model-value": itemsC.key,
+          "teleported": false,
+          "class": ns.e("field-select"),
+          "onChange": (field) => {
+            onFieldSelect(node, field);
+          }
+        }, _isSlot(_slot2 = allFields.map((field) => {
+          return vue.createVNode(vue.resolveComponent("el-option"), {
+            "key": field.name,
+            "value": field.name,
+            "label": field.label
+          }, null);
+        })) ? _slot2 : {
+          default: () => [_slot2]
+        }), renderEditor(child, itemsC)];
+      }
       return vue.createVNode("div", {
         "class": (ns.b("group"), ns.bm("group", "items"))
       }, [vue.createVNode("div", {
@@ -335,7 +396,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
       })]), vue.createVNode("div", {
         "class": ns.be("group", "list")
       }, [node.children.length > 0 && node.children.map((child, index) => {
-        const childContent = child.leaf ? renderFilterItem(child, itemsC) : renderFilterGroup(child, itemsC);
+        const childContent = child.nodeType === "FIELD" ? renderFilterItem(child, itemsC) : renderFilterGroup(child, itemsC);
         return vue.createVNode("div", {
           "class": ns.be("group", "list-item")
         }, [vue.createVNode("div", {
@@ -371,7 +432,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
     return vue.createVNode("div", {
       "class": [this.ns.b()]
     }, [this.UiFilterNodes.length > 0 && this.UiFilterNodes.map((node) => {
-      if (node.leaf) {
+      if (node.nodeType === "FIELD") {
         return this.renderFilterItem(node);
       }
       return this.renderFilterGroup(node);

package/lib/control/search-bar/index.cjs

@@ -9,6 +9,7 @@ var searchBar_provider = require('./search-bar.provider.cjs');
 var filterTree = require('./filter-tree/filter-tree.cjs');
 var filterModeSelect = require('./filter-mode-select/filter-mode-select.cjs');
 var searchGroups = require('./search-groups/search-groups.cjs');
+var quickSearchSelect = require('./quick-search-select/quick-search-select.cjs');
 
 "use strict";
 const IBizSearchBarControl = vue3Util.withInstall(
@@ -18,6 +19,7 @@ const IBizSearchBarControl = vue3Util.withInstall(
     v.component(filterTree.FilterTreeControl.name, filterTree.FilterTreeControl);
     v.component(filterModeSelect.FilterModeSelect.name, filterModeSelect.FilterModeSelect);
     v.component(searchGroups.SearchGroups.name, searchGroups.SearchGroups);
+    v.component(quickSearchSelect.QuickSearchSelect.name, quickSearchSelect.QuickSearchSelect);
     runtime.registerControlProvider(
       runtime.ControlType.SEARCHBAR,
       () => new searchBar_provider.SearchBarProvider()

package/lib/control/search-bar/quick-search-select/quick-search-select.cjs

@@ -0,0 +1,74 @@
+'use strict';
+
+var vue = require('vue');
+var runtime = require('@ibiz-template/runtime');
+var vue3Util = require('@ibiz-template/vue3-util');
+require('./quick-search-select.css');
+
+"use strict";
+function _isSlot(s) {
+  return typeof s === "function" || Object.prototype.toString.call(s) === "[object Object]" && !vue.isVNode(s);
+}
+const QuickSearchSelect = /* @__PURE__ */ vue.defineComponent({
+  name: "IBizQuickSearchSelect",
+  props: {
+    controller: {
+      type: runtime.SearchBarController,
+      required: true
+    }
+  },
+  setup(props) {
+    const ns = vue3Util.useNamespace("quick-search-select");
+    const onItemClick = (item) => {
+      const key = item.fieldName;
+      const {
+        quickSearchFieldNames
+      } = props.controller.state;
+      const index = quickSearchFieldNames.indexOf(key);
+      if (index === -1) {
+        quickSearchFieldNames.push(key);
+      } else {
+        quickSearchFieldNames.splice(index, 1);
+      }
+      props.controller.calcQuickSearchPlaceHolder();
+    };
+    return {
+      ns,
+      onItemClick
+    };
+  },
+  render() {
+    const {
+      state
+    } = this.controller;
+    return vue.createVNode(vue.resolveComponent("el-dropdown"), {
+      "onCommand": this.onItemClick,
+      "trigger": "click",
+      "hide-on-click": false,
+      "class": [this.ns.b()],
+      "popper-class": [this.ns.b("popover")]
+    }, {
+      default: () => vue.createVNode("div", {
+        "class": this.ns.e("icon")
+      }, [vue.createVNode("ion-icon", {
+        "name": "settings-outline"
+      }, null)]),
+      dropdown: () => {
+        let _slot;
+        return vue.createVNode(vue.resolveComponent("el-dropdown-menu"), null, _isSlot(_slot = state.quickSearchItems.map((item) => {
+          const isSelected = state.quickSearchFieldNames.includes(item.fieldName);
+          return vue.createVNode(vue.resolveComponent("el-dropdown-item"), {
+            "class": [this.ns.be("popover", "item"), isSelected && this.ns.bem("popover", "item", "selected")],
+            "command": item
+          }, {
+            default: () => [item.label]
+          });
+        })) ? _slot : {
+          default: () => [_slot]
+        });
+      }
+    });
+  }
+});
+
+exports.QuickSearchSelect = QuickSearchSelect;

package/lib/control/search-bar/quick-search-select/quick-search-select.css

@@ -0,0 +1 @@
+.ibiz-quick-search-select{width:40px;height:100%;color:var(--ibiz-color-white);cursor:pointer;background-color:var(--ibiz-color-primary);border-top-left-radius:var(--el-input-border-radius);border-bottom-left-radius:var(--el-input-border-radius)}.ibiz-quick-search-select:hover{background-color:var(--ibiz-color-primary-hover)}.ibiz-quick-search-select__icon{display:flex;align-items:center;justify-content:center;width:100%;height:100%}.ibiz-quick-search-select-popover{--ibiz-quick-search-select-item-text-color:var(--ibiz-color-text-2);--ibiz-quick-search-select-item-bg-color:var(--ibiz-color-bg-1);--ibiz-quick-search-select-item-hover-text-color:var(--ibiz-color-text-0);--ibiz-quick-search-select-item-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-quick-search-select-item-selected-text-color:var(--ibiz-color-primary);--ibiz-quick-search-select-item-selected-bg-color:var(--ibiz-color-bg-1)}.ibiz-quick-search-select-popover.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list{background-color:var(--ibiz-color-bg-1)}.ibiz-quick-search-select-popover.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu{background-color:var(--ibiz-color-bg-1)}.ibiz-quick-search-select-popover.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu__item{color:var(--ibiz-quick-search-select-item-text-color);background-color:var(--ibiz-quick-search-select-item-bg-color)}.ibiz-quick-search-select-popover.el-popper.el-dropdown__popper .el-scrollbar .el-dropdown__list .el-dropdown-menu__item:hover{color:var(--ibiz-quick-search-select-item-hover-text-color);background-color:var(--ibiz-quick-search-select-item-hover-bg-color)}.ibiz-quick-search-select-popover__item--selected{font-weight:700;--ibiz-quick-search-select-item-text-color:var(--ibiz-quick-search-select-item-selected-text-color);--ibiz-quick-search-select-item-bg-color:var(--ibiz-quick-search-select-item-selected-bg-color)}

package/lib/control/search-bar/search-bar.cjs

@@ -96,6 +96,14 @@ const SearchBarControl = /* @__PURE__ */ vue.defineComponent({
     const handleSave = () => {
       c.handleSave();
     };
+    const renderAdvancedSearch = () => {
+      if (!c.state.advancedQuickSearch) {
+        return null;
+      }
+      return vue.createVNode(vue.resolveComponent("iBizQuickSearchSelect"), {
+        "controller": c
+      }, null);
+    };
     return {
       c,
       ns,
@@ -106,7 +114,8 @@ const SearchBarControl = /* @__PURE__ */ vue.defineComponent({
       onKeydown,
       onGroupClick,
       triggerFilter,
-      handleSave
+      handleSave,
+      renderAdvancedSearch
     };
   },
   render() {
@@ -139,7 +148,7 @@ const SearchBarControl = /* @__PURE__ */ vue.defineComponent({
           "modelValue": this.c.state.query,
           "onUpdate:modelValue": ($event) => this.c.state.query = $event,
           "class": this.ns.b("quick-search"),
-          "placeholder": this.c.placeHolder,
+          "placeholder": this.c.state.quickSearchPlaceHolder,
           "clearable": true,
           "onKeydown": this.onKeydown,
           "onClear": this.onClear,
@@ -148,7 +157,9 @@ const SearchBarControl = /* @__PURE__ */ vue.defineComponent({
             "class": this.ns.e("search-icon"),
             "name": "search"
           }, null)
-        }, null), this.c.enableFilter && vue.createVNode(vue.resolveComponent("el-button"), {
+        }, {
+          prepend: () => this.renderAdvancedSearch()
+        }), this.c.enableFilter && vue.createVNode(vue.resolveComponent("el-button"), {
           "ref": "filterButtonRef",
           "type": "primary",
           "title": "\u8FC7\u6EE4",

package/lib/control/search-bar/search-bar.css

@@ -1 +1 @@
-@charset "UTF-8";.ibiz-control-searchbar{--ibiz-control-searchbar-quick-search-width:220px;--ibiz-control-searchbar-quick-group-item-padding:var(--ibiz-spacing-tight);--ibiz-control-searchbar-quick-group-item-margin:var(--ibiz-spacing-tight);display:flex;align-items:center;justify-content:flex-start;height:100%}.ibiz-control-searchbar .ibiz-control-searchbar-quick-search{width:var(--ibiz-control-searchbar-quick-search-width);margin-left:var(--ibiz-spacing-base-tight);font-size:14px;color:var(--ibiz-text-color);background:var(--ibiz-color-white);border:1px solid var(--ibiz-border-color);border-radius:4px}.ibiz-control-searchbar .ibiz-control-searchbar-quick-group{height:100%;overflow-x:auto;white-space:nowrap}.ibiz-control-searchbar .ibiz-control-searchbar-quick-group .ibiz-control-searchbar-quick-group-item{position:relative;display:inline-block;height:100%;padding:var(--ibiz-control-searchbar-quick-group-item-padding);margin-right:var(--ibiz-control-searchbar-quick-group-item-margin);font-size:var(--ibiz-font-size-regular);cursor:pointer}.ibiz-control-searchbar .ibiz-control-searchbar-quick-group .ibiz-control-searchbar-quick-group-item.is-selected::after{position:absolute;bottom:2px;left:0;width:100%;height:2px;content:"";background-color:var(--ibiz-color-primary)}.ibiz-control-searchbar .ibiz-control-searchbar-quick-group .ibiz-control-searchbar-quick-group-item:hover{color:var(--ibiz-color-primary)}.ibiz-control-searchbar .el-input__icon{cursor:pointer}.ibiz-control-searchbar-filter{margin-right:var(--ibiz-spacing-extra-tight);margin-left:var(--ibiz-spacing-base-tight)}.ibiz-control-searchbar-save{margin-left:var(--ibiz-spacing-base-tight)}
+@charset "UTF-8";.ibiz-control-searchbar{--ibiz-control-searchbar-quick-search-width:220px;--ibiz-control-searchbar-quick-group-item-padding:var(--ibiz-spacing-tight);--ibiz-control-searchbar-quick-group-item-margin:var(--ibiz-spacing-tight);display:flex;align-items:center;justify-content:flex-start;height:100%}.ibiz-control-searchbar .ibiz-control-searchbar-quick-search{width:var(--ibiz-control-searchbar-quick-search-width);margin-left:var(--ibiz-spacing-base-tight);font-size:14px;color:var(--ibiz-text-color);background:var(--ibiz-color-white);border:1px solid var(--ibiz-border-color);border-radius:4px}.ibiz-control-searchbar .ibiz-control-searchbar-quick-search .el-input-group__prepend,.ibiz-control-searchbar .ibiz-control-searchbar-quick-search.el-input-group__append{padding:0}.ibiz-control-searchbar .ibiz-control-searchbar-quick-group{height:100%;overflow-x:auto;white-space:nowrap}.ibiz-control-searchbar .ibiz-control-searchbar-quick-group .ibiz-control-searchbar-quick-group-item{position:relative;display:inline-block;height:100%;padding:var(--ibiz-control-searchbar-quick-group-item-padding);margin-right:var(--ibiz-control-searchbar-quick-group-item-margin);font-size:var(--ibiz-font-size-regular);cursor:pointer}.ibiz-control-searchbar .ibiz-control-searchbar-quick-group .ibiz-control-searchbar-quick-group-item.is-selected::after{position:absolute;bottom:2px;left:0;width:100%;height:2px;content:"";background-color:var(--ibiz-color-primary)}.ibiz-control-searchbar .ibiz-control-searchbar-quick-group .ibiz-control-searchbar-quick-group-item:hover{color:var(--ibiz-color-primary)}.ibiz-control-searchbar .el-input__icon{cursor:pointer}.ibiz-control-searchbar-filter{margin-right:var(--ibiz-spacing-extra-tight);margin-left:var(--ibiz-spacing-base-tight)}.ibiz-control-searchbar-save{margin-left:var(--ibiz-spacing-base-tight)}

package/lib/control/toolbar/toolbar.cjs

@@ -52,9 +52,11 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
     }
   },
   setup() {
+    var _a;
     const c = vue3Util.useControlController((...args) => new runtime.ToolbarController(...args));
     const ns = vue3Util.useNamespace("control-".concat(c.model.controlType.toLowerCase()));
     const btnSize = vue.ref("default");
+    const toolbarStyle = (_a = c.model.toolbarStyle) == null ? void 0 : _a.toLowerCase();
     const handleClick = async (item, event, params) => {
       await c.onItemClick(item, event, params);
     };
@@ -80,13 +82,13 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
         "class": ns.b("submenu"),
         "index": item.id,
         "title": item.tooltip,
-        "popper-class": ns.b("submenu-popper")
+        "popper-class": [ns.b("submenu-popper"), ns.bm("submenu-popper", toolbarStyle)]
       }, {
         default: () => {
           return detoolbarItems.map((item2) => {
-            var _a;
+            var _a2;
             const actionId = item2.uiactionId;
-            const visible = (_a = c.state.buttonsState[item2.id]) == null ? void 0 : _a.visible;
+            const visible = (_a2 = c.state.buttonsState[item2.id]) == null ? void 0 : _a2.visible;
             if (!visible) {
               return null;
             }
@@ -150,9 +152,9 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
       });
     };
     const renderToolbarItem = (item) => {
-      var _a, _b;
+      var _a2, _b;
       const itemId = item.id;
-      const visible = (_a = c.state.buttonsState[itemId]) == null ? void 0 : _a.visible;
+      const visible = (_a2 = c.state.buttonsState[itemId]) == null ? void 0 : _a2.visible;
       if (!visible) {
         return null;
       }
@@ -192,7 +194,7 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
         }, [vue.createVNode(vue.resolveComponent("el-button"), {
           "title": item.tooltip,
           "size": btnSize.value,
-          "text": Object.is(buttonType, "INVERSE"),
+          "text": Object.is(buttonType, "inverse"),
           "type": buttonType,
           "loading": c.state.buttonsState[itemId].loading,
           "disabled": c.state.buttonsState[itemId].disabled,
@@ -218,24 +220,23 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
       c,
       btnSize,
       ns,
+      toolbarStyle,
       handleClick,
       renderExtraButtons,
       renderToolbarItem
     };
   },
   render() {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const {
-      state,
-      model
+      state
     } = this.c;
-    const toolbarStyle = (_a = model.toolbarStyle) == null ? void 0 : _a.toLowerCase();
     let content = null;
     if (state.isCreated) {
       content = [
         // 绘制最前方的额外按钮
-        ((_b = state.extraButtons.before) == null ? void 0 : _b.length) > 0 && this.renderExtraButtons(state.extraButtons.before),
-        (_c = this.modelData.detoolbarItems) == null ? void 0 : _c.map((item, index) => {
+        ((_a = state.extraButtons.before) == null ? void 0 : _a.length) > 0 && this.renderExtraButtons(state.extraButtons.before),
+        (_b = this.modelData.detoolbarItems) == null ? void 0 : _b.map((item, index) => {
           var _a2;
           const toolbarItemNode = this.renderToolbarItem(item);
           if ((_a2 = state.extraButtons[index]) == null ? void 0 : _a2.length) {
@@ -244,12 +245,12 @@ const ToolbarControl = /* @__PURE__ */ vue.defineComponent({
           return toolbarItemNode;
         }),
         // 绘制最后方的额外按钮
-        ((_d = state.extraButtons.after) == null ? void 0 : _d.length) > 0 && this.renderExtraButtons(state.extraButtons.after)
+        ((_c = state.extraButtons.after) == null ? void 0 : _c.length) > 0 && this.renderExtraButtons(state.extraButtons.after)
       ];
     }
     return vue.createVNode(vue.resolveComponent("iBizControlBase"), {
       "controller": this.c,
-      "class": [this.ns.m(state.viewMode.toLowerCase()), this.ns.m(toolbarStyle)]
+      "class": [this.ns.m(state.viewMode.toLowerCase()), this.ns.m(this.toolbarStyle)]
     }, _isSlot(content) ? content : {
       default: () => [content]
     });

package/lib/control/tree-grid/tree-grid.cjs

@@ -239,6 +239,7 @@ const TreeGridControl = /* @__PURE__ */ vue.defineComponent({
         "total": state.total,
         "curPage": state.curPage,
         "size": state.size,
+        "totalPages": state.totalPages,
         "onChange": this.onPageChange,
         "onPageSizeChange": this.onPageSizeChange,
         "onPageRefresh": this.onPageRefresh

package/lib/control/tree-grid-ex/tree-grid-ex-column/tree-grid-ex-edit-column/cell-edit.cjs

@@ -27,7 +27,9 @@ function useCellEdit(props, componentRef) {
     return !editorShowEdit.value;
   });
   const editorDisabled = false;
-  const isAutoFocus = true;
+  const isAutoFocus = vue.computed(() => {
+    return !hasError.value;
+  });
   const showEditMask = vue.computed(() => {
     return cellEditable.value && !editable.value;
   });