@ibiz-template/vue3-components 0.7.30 → 0.7.34

package/lib/control/dashboard/portlet/portlet-layout/portlet-layout.css

@@ -1 +1 @@
-.ibiz-portlet-layout{--ibiz-portlet-layout-bg-color:transparent;--ibiz-portlet-layout-header-height:50px;--ibiz-portlet-layout-header-padding:calc(var(--ibiz-spacing-base-tight) + 2px) var(--ibiz-spacing-base);--ibiz-portlet-layout-header-margin:var(--ibiz-spacing-none);--ibiz-portlet-layout-header-bg-color:var(--ibiz-color-bg-1);--ibiz-portlet-layout-header-border-bottom:var(--ibiz-border);--ibiz-portlet-layout-caption-max-width:300px;--ibiz-portlet-layout-caption-font-weight:var(--ibiz-font-weight-regular);--ibiz-portlet-layout-caption-font-size:var(--ibiz-font-size-header-5);--ibiz-portlet-layout-caption-color:var(--ibiz-text-color-primary);--ibiz-portlet-layout-content-bg-color:var(--ibiz-color-bg-1);--ibiz-portlet-layout-content-padding:var(--ibiz-spacing-none);--ibiz-portlet-layout-content-margin:var(--ibiz-spacing-none);--ibiz-portlet-layout-padding:var(--ibiz-spacing-tight);width:100%;height:100%;padding:var(--ibiz-portlet-layout-padding);background-color:var(--ibiz-portlet-layout-bg-color)}.ibiz-portlet-layout__caption{max-width:var(--ibiz-portlet-layout-caption-max-width);height:100%;padding:var(--ibiz-spacing-none) var(--ibiz-spacing-none) var(--ibiz-spacing-none) var(--ibiz-spacing-base)}.ibiz-portlet-layout__caption-text{font-size:var(--ibiz-portlet-layout-caption-font-size);font-weight:var(--ibiz-portlet-layout-caption-font-weight);line-height:var(--ibiz-portlet-layout-caption-font-size);color:var(--ibiz-portlet-layout-caption-color)}.ibiz-portlet-layout__caption::before{position:absolute;top:50%;left:0;width:4px;height:var(--ibiz-width-icon-large);content:"";background-color:var(--ibiz-color-primary);border-radius:var(--ibiz-border-radius-extra-small);transform:translateY(-50%)}.ibiz-portlet-layout.is-no-header>.ibiz-portlet-layout-content{height:100%}.ibiz-portlet-layout-header{display:flex;justify-content:space-between;height:var(--ibiz-portlet-layout-header-height);padding:var(--ibiz-portlet-layout-header-padding);margin:var(--ibiz-portlet-layout-header-margin);background-color:var(--ibiz-portlet-layout-header-bg-color);border-bottom:var(--ibiz-portlet-layout-header-border-bottom)}.ibiz-portlet-layout-header__left{position:relative}.ibiz-portlet-layout-content{height:calc(100% - var(--ibiz-portlet-layout-header-height));padding:var(--ibiz-portlet-layout-content-padding);margin:var(--ibiz-portlet-layout-content-margin);overflow-y:scroll;background-color:var(--ibiz-portlet-layout-content-bg-color)}
+.ibiz-portlet-layout{--ibiz-portlet-layout-bg-color:transparent;--ibiz-portlet-layout-header-height:50px;--ibiz-portlet-layout-header-padding:calc(var(--ibiz-spacing-base-tight) + 2px) var(--ibiz-spacing-base);--ibiz-portlet-layout-header-margin:var(--ibiz-spacing-none);--ibiz-portlet-layout-header-bg-color:var(--ibiz-color-bg-1);--ibiz-portlet-layout-header-border-bottom:var(--ibiz-border);--ibiz-portlet-layout-caption-max-width:300px;--ibiz-portlet-layout-caption-font-weight:var(--ibiz-font-weight-regular);--ibiz-portlet-layout-caption-font-size:var(--ibiz-font-size-header-5);--ibiz-portlet-layout-caption-color:var(--ibiz-text-color-primary);--ibiz-portlet-layout-content-bg-color:var(--ibiz-color-bg-1);--ibiz-portlet-layout-content-padding:var(--ibiz-spacing-none);--ibiz-portlet-layout-content-margin:var(--ibiz-spacing-none);--ibiz-portlet-layout-padding:var(--ibiz-spacing-tight);width:100%;height:100%;padding:var(--ibiz-portlet-layout-padding);background-color:var(--ibiz-portlet-layout-bg-color)}.ibiz-portlet-layout__caption{max-width:var(--ibiz-portlet-layout-caption-max-width);height:100%;padding:var(--ibiz-spacing-none) var(--ibiz-spacing-none) var(--ibiz-spacing-none) var(--ibiz-spacing-base)}.ibiz-portlet-layout__caption-text{font-size:var(--ibiz-portlet-layout-caption-font-size);font-weight:var(--ibiz-portlet-layout-caption-font-weight);line-height:var(--ibiz-portlet-layout-caption-font-size);color:var(--ibiz-portlet-layout-caption-color)}.ibiz-portlet-layout__caption::before{position:absolute;top:50%;left:0;width:4px;height:var(--ibiz-width-icon-large);content:"";background-color:var(--ibiz-color-primary);border-radius:var(--ibiz-border-radius-extra-small);transform:translateY(-50%)}.ibiz-portlet-layout__caption.is-link{cursor:pointer}.ibiz-portlet-layout__caption.is-link:hover{color:var(--ibiz-color-link)}.ibiz-portlet-layout.is-no-header>.ibiz-portlet-layout-content{height:100%}.ibiz-portlet-layout-header{display:flex;justify-content:space-between;height:var(--ibiz-portlet-layout-header-height);padding:var(--ibiz-portlet-layout-header-padding);margin:var(--ibiz-portlet-layout-header-margin);background-color:var(--ibiz-portlet-layout-header-bg-color);border-bottom:var(--ibiz-portlet-layout-header-border-bottom)}.ibiz-portlet-layout-header__left{position:relative}.ibiz-portlet-layout-content{height:calc(100% - var(--ibiz-portlet-layout-header-height));padding:var(--ibiz-portlet-layout-content-padding);margin:var(--ibiz-portlet-layout-content-margin);overflow-y:scroll;background-color:var(--ibiz-portlet-layout-content-bg-color)}

package/lib/control/dashboard/portlet/report-portlet/report-portlet.cjs

@@ -26,6 +26,12 @@ const ReportPortlet = /* @__PURE__ */ vue.defineComponent({
     const report = (_b = props.modelData.controls) == null ? void 0 : _b.find((item) => {
       return item.controlType === runtime.ControlType.REPORT_PANEL;
     });
+    const linkAction = vue.computed(() => {
+      const {
+        uiactionGroupDetails = []
+      } = props.controller.model.uiactionGroup || {};
+      return uiactionGroupDetails.find((x) => x.uiactionId && x.uiactionId.startsWith("bi_report_view"));
+    });
     let timerTag;
     vue.onMounted(() => {
       const timer = props.controller.model.timer;
@@ -40,7 +46,8 @@ const ReportPortlet = /* @__PURE__ */ vue.defineComponent({
     });
     return {
       ns,
-      report
+      report,
+      linkAction
     };
   },
   render() {
@@ -52,6 +59,7 @@ const ReportPortlet = /* @__PURE__ */ vue.defineComponent({
     } = this.controller;
     return vue.createVNode(vue.resolveComponent("iBizPortletLayout"), {
       "controller": this.controller,
+      "linkAction": this.linkAction,
       "class": classArr
     }, _isSlot(_slot = vue.h(vue.resolveComponent("IBizControlShell"), {
       context,

package/lib/control/drtab/drtab-control.util.cjs

@@ -1,7 +1,7 @@
 'use strict';
 
 var vue = require('vue');
-var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.30_axios@1.6.8_lodash-es@4.17.21_qs@6.11.2_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
+var namespace = require('../../node_modules/.pnpm/@ibiz-template_core@0.7.32_axios@1.7.2_lodash-es@4.17.21_qs@6.12.3_qx-util@0.4.8_ramda@0.29.1/node_modules/@ibiz-template/core/out/utils/namespace/namespace.cjs');
 
 "use strict";
 function useAppDRTab(c, controlRef, counterData) {

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

@@ -64,11 +64,18 @@ const FormRawItem = /* @__PURE__ */ vue.defineComponent({
     };
   },
   render() {
+    var _a;
     if (!this.controller.state.visible) {
       return null;
     }
     return vue.createVNode(vue.resolveComponent("iBizRawItem"), {
-      "class": [this.ns.b(), ...this.controller.containerClass, this.ns.is("show-default", this.showFormDefaultContent)],
+      "class": [
+        this.ns.b(),
+        ...this.controller.containerClass,
+        this.ns.is("show-default", this.showFormDefaultContent),
+        // 表单直接内容文本类型与直接内容类型应具备与标签相同样式
+        this.ns.is("form-text", ["TEXT", "RAW"].includes(((_a = this.modelData.rawItem) == null ? void 0 : _a.contentType) || ""))
+      ],
       "rawItem": this.modelData,
       "content": this.content,
       "onClick": (event) => this.controller.onClick(event)

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

@@ -1 +1 @@
-.ibiz-form-raw-item{width:100%;height:100%}.ibiz-form-raw-item.is-show-default{padding:var(--ibiz-spacing-none) 11px}
+.ibiz-form-raw-item{--ibiz-form-rawitem-line-height:var(--ibiz-height-control-default);--ibiz-form-rawitem-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-tight) var(--ibiz-spacing-extra-tight);--ibiz-form-rawitem-font-size:var(--ibiz-font-size-regular);width:100%;height:100%}.ibiz-form-raw-item.is-form-text{padding:var(--ibiz-form-rawitem-padding);font-size:var(--ibiz-form-rawitem-font-size);line-height:var(--ibiz-form-rawitem-line-height)}.ibiz-form-raw-item.is-show-default{padding:var(--ibiz-spacing-none) 11px}

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

@@ -331,12 +331,13 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
       return;
     }
     const state = this.c.state;
+    const defaultExpandAll = this.c.controlParams.defaultexpandall === "true";
     return vue.createVNode(vue.resolveComponent("iBizControlBase"), {
       "class": [this.ns.is("show-header", !this.c.state.hideHeader), this.ns.is("enable-page", this.c.state.enablePagingBar), this.ns.is("enable-group", this.c.model.enableGroup), this.ns.is("single-select", state.singleSelect), this.ns.is("empty", state.items.length === 0), this.ns.is("enable-customized", this.c.model.enableCustomized)],
       "controller": this.c,
       "style": this.headerCssVars
     }, {
-      default: () => [vue.createVNode(vue.resolveComponent("el-table"), {
+      default: () => [vue.createVNode(vue.resolveComponent("el-table"), vue.mergeProps({
         "ref": "tableRef",
         "class": this.ns.e("table"),
         "default-sort": this.defaultSort,
@@ -349,6 +350,7 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
         "header-cell-class-name": this.handleHeaderCellClassName,
         "row-key": "tempsrfkey",
         "data": this.tableData,
+        "default-expand-all": defaultExpandAll,
         "span-method": this.spanMethod,
         "onRowClick": this.onRowClick,
         "onRowDblclick": this.onDbRowClick,
@@ -357,7 +359,7 @@ const GridControl = /* @__PURE__ */ vue.defineComponent({
         "onHeaderDragend": this.headerDragend,
         "tooltip-effect": "light",
         "scrollbar-always-on": true
-      }, {
+      }, this.$attrs), {
         empty: this.renderNoData,
         default: () => {
           return [this.c.enableRowEditOrder && this.renderDragIconColumn(), !state.singleSelect && vue.createVNode(vue.resolveComponent("el-table-column"), {

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

@@ -41,7 +41,8 @@ const GridFieldColumn = /* @__PURE__ */ vue.defineComponent({
     vue.watch(() => props.row, async () => {
       CustomHtml.value = await props.controller.getCustomHtml(props.row);
     }, {
-      deep: true
+      deep: true,
+      immediate: true
     });
     const fieldValue = vue.computed(() => props.row.data[props.controller.fieldName]);
     const formatValue = vue.computed(() => props.controller.formatValue(fieldValue.value));
@@ -89,6 +90,25 @@ const GridFieldColumn = /* @__PURE__ */ vue.defineComponent({
       }
     };
     vue3Util.useCodeListListen(props.controller.model.appCodeListId, props.controller.context.srfappid, fn);
+    const findLayoutPanel = () => {
+      var _a;
+      const {
+        controlRenders = []
+      } = props.controller.model;
+      return (_a = controlRenders.find((renderItem) => renderItem.renderType === "LAYOUTPANEL")) == null ? void 0 : _a.layoutPanel;
+    };
+    const renderPanelItemLayout = (item, modelData) => {
+      const {
+        context,
+        params
+      } = props.controller;
+      return vue.createVNode(vue.resolveComponent("iBizControlShell"), {
+        "data": item,
+        "modelData": modelData,
+        "context": context,
+        "params": params
+      }, null);
+    };
     return {
       ns,
       onCellClick,
@@ -102,7 +122,9 @@ const GridFieldColumn = /* @__PURE__ */ vue.defineComponent({
       codeListValue,
       tooltip,
       zIndex,
-      codeListItems
+      codeListItems,
+      findLayoutPanel,
+      renderPanelItemLayout
     };
   },
   render() {
@@ -117,11 +139,19 @@ const GridFieldColumn = /* @__PURE__ */ vue.defineComponent({
       "zIndex": this.zIndex
     }, null) : null;
     let content = null;
+    const panel = this.findLayoutPanel();
     if (c.isCustomCode) {
       content = vue.createVNode("span", {
         "class": this.ns.e("script"),
         "innerHTML": this.CustomHtml
       }, null);
+    } else if (panel) {
+      content = vue.createVNode(vue.resolveComponent("iBizControlShell"), {
+        "data": this.row.data,
+        "modelData": panel,
+        "context": c.context,
+        "params": c.params
+      }, null);
     } else if (c.codeList) {
       content = vue.createVNode(vue.resolveComponent("iBizCodeList"), {
         "class": this.ns.e("text"),

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

@@ -80,9 +80,27 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
     parent: {
       type: String,
       required: true
+    },
+    filterMode: {
+      type: String,
+      default: "default"
+    },
+    customCond: {
+      type: String,
+      default: ""
+    },
+    context: {
+      type: Object
+    },
+    params: {
+      type: Object
+    },
+    schemaEntityMap: {
+      type: Object,
+      default: () => /* @__PURE__ */ new Map()
     }
   },
-  emits: ["confirm", "cancel", "change"],
+  emits: ["confirm", "cancel", "change", "customCondChange"],
   setup(props, {
     emit
   }) {
@@ -144,6 +162,34 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
         find.valueOPs.push(filterC.valueOP);
       }
     });
+    const schemaFields = vue.ref([]);
+    allFields.forEach(async (field) => {
+      var _a, _b;
+      const filterController = props.filterControllers.find((item) => item.key === field.name);
+      if (!filterController) {
+        return;
+      }
+      schemaFields.value.push({
+        appDEFieldId: field.fieldName,
+        caption: field.label,
+        valueOPs: field.valueOPs,
+        appDataEntityId: props.schemaEntityMap.get(field.fieldName),
+        appDataEntityFullTag: (_a = filterController.appDataEntity) == null ? void 0 : _a.defullTag,
+        appCodeListId: (_b = filterController.model.editor) == null ? void 0 : _b.appCodeListId
+      });
+    });
+    const pqlEditor = vue.ref();
+    const mode = vue.ref(props.filterMode || "default");
+    const currentCustomCond = vue.ref("");
+    const handleCustomCondChange = (value) => {
+      currentCustomCond.value = value;
+      emit("customCondChange", currentCustomCond.value);
+    };
+    vue.watch(() => props.customCond, () => {
+      currentCustomCond.value = props.customCond;
+    }, {
+      immediate: true
+    });
     const getFilterModes = (fieldName, fieldInfos = allFields) => {
       if (!fieldName) {
         return;
@@ -291,7 +337,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
       }, null), editor]);
     };
     let renderFilterItems = (_node) => vue.createVNode("div", null, null);
-    const renderFilterGroup = (node, itemsC) => {
+    const renderFilterGroup = (node, itemsC, root) => {
       if (node.hidden) {
         return;
       }
@@ -306,22 +352,38 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
         "text": true,
         "type": "primary",
         "onClick": () => {
+          if (mode.value === "pql") {
+            mode.value = "default";
+            return;
+          }
           addGroup(node);
         }
       }, {
-        default: () => [vue.createTextVNode("\u6DFB\u52A0\u7EC4")]
+        default: () => [mode.value === "pql" ? "\u5207\u6362\u7EC4" : "\u6DFB\u52A0\u7EC4"]
       }), vue.createVNode(vue.resolveComponent("el-button"), {
         "text": true,
         "onClick": () => {
+          if (mode.value === "pql") {
+            mode.value = "default";
+            return;
+          }
           addItem(node);
         }
       }, {
-        default: () => [vue.createTextVNode("\u6DFB\u52A0\u9879")]
+        default: () => [mode.value === "pql" ? "\u5207\u6362\u9879" : "\u6DFB\u52A0\u9879"]
+      }), root && isInSearchBar.value && vue.createVNode(vue.resolveComponent("el-button"), {
+        "text": true,
+        "onClick": () => {
+          mode.value = "pql";
+        }
+      }, {
+        default: () => [vue.createTextVNode("\u6DFB\u52A0PQL")]
       }), vue.createVNode(vue.resolveComponent("el-select"), {
         "model-value": node.logicType,
         "teleported": false,
         "class": ns.be("group", "logic-type"),
         "onChange": (logicType) => {
+          mode.value = "default";
           onGroupLogicTypeChange(node, logicType);
         }
       }, {
@@ -334,7 +396,16 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
           "value": "OR",
           "label": "OR"
         }, null)]
-      })]), vue.createVNode("div", {
+      })]), mode.value === "pql" && vue.createVNode("div", {
+        "class": ns.be("group", "editor")
+      }, [vue.createVNode(vue.resolveComponent("iBizPqlEditor"), {
+        "ref": "pqlEditor",
+        "value": currentCustomCond.value,
+        "fields": schemaFields.value,
+        "context": props.context,
+        "params": props.params,
+        "onChange": handleCustomCondChange
+      }, null)]), mode.value !== "pql" && vue.createVNode("div", {
         "class": ns.be("group", "list")
       }, [node.children.length > 0 && node.children.map((child, index) => {
         const childContent = child.nodeType === "FIELD" ? renderFilterItem(child, itemsC) : renderFilterGroup(child, itemsC);
@@ -418,7 +489,17 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
       })])]);
     };
     const onConfirm = () => {
-      emit("confirm");
+      var _a, _b;
+      if (mode.value === "pql") {
+        if (pqlEditor.value) {
+          const result = (_b = (_a = pqlEditor.value).verify) == null ? void 0 : _b.call(_a);
+          if (result) {
+            emit("confirm", mode.value, currentCustomCond.value);
+          }
+        }
+        return;
+      }
+      emit("confirm", mode.value, currentCustomCond.value);
     };
     const onCancel = () => {
       emit("cancel");
@@ -430,7 +511,8 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
       onConfirm,
       onCancel,
       isInSearchBar,
-      UiFilterNodes
+      UiFilterNodes,
+      pqlEditor
     };
   },
   render() {
@@ -441,7 +523,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
       if (node.nodeType === "FIELD") {
         return this.renderFilterItem(node);
       }
-      return this.renderFilterGroup(node);
+      return this.renderFilterGroup(node, void 0, true);
     }), vue.createVNode("div", {
       "class": this.ns.b("footer")
     }, [vue.createVNode(vue.resolveComponent("el-button"), {

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

@@ -1 +1 @@
-.ibiz-filter-tree{padding:var(--ibiz-spacing-base)}.ibiz-filter-tree__editor{display:inline-block;width:180px;margin-right:var(--ibiz-spacing-tight)}.ibiz-filter-tree__field-select{width:185px;margin-right:var(--ibiz-spacing-tight)}.ibiz-filter-tree__mode-select{width:185px;margin-right:var(--ibiz-spacing-tight)}.ibiz-filter-tree-group{padding:var(--ibiz-spacing-tight);border:1px solid var(--ibiz-color-border)}.ibiz-filter-tree-group__actions{padding-bottom:var(--ibiz-spacing-base)}.ibiz-filter-tree-group__logic-type{width:80px;margin-left:var(--ibiz-spacing-tight)}.ibiz-filter-tree-group__list-item{position:relative;display:flex;align-items:center;justify-content:flex-start;padding-right:var(--ibiz-spacing-base);padding-bottom:var(--ibiz-spacing-base)}.ibiz-filter-tree-group__list-item-left{align-self:flex-start;width:32px;margin:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-tight) var(--ibiz-spacing-none);font-size:var(--ibiz-font-size-regular);color:var(--ibiz-editor-default-text-color)}.ibiz-filter-tree-group__list-item-right{position:absolute;top:8px;right:0;color:var(--ibiz-color-danger);cursor:pointer}.ibiz-filter-tree-group__list-item-right:hover{color:var(--ibiz-color-danger-hover)}.ibiz-filter-tree-group--items>.ibiz-filter-tree-group__actions{display:flex}.ibiz-filter-tree-group--items>.ibiz-filter-tree-group__actions>.ibiz-filter-tree-item{width:auto}.ibiz-filter-tree-item{display:flex;align-items:center;justify-content:flex-start;width:574px}.ibiz-filter-tree-footer{margin-top:var(--ibiz-spacing-tight);text-align:right}
+.ibiz-filter-tree{padding:var(--ibiz-spacing-base)}.ibiz-filter-tree__editor{display:inline-block;width:180px;margin-right:var(--ibiz-spacing-tight)}.ibiz-filter-tree__field-select{width:185px;margin-right:var(--ibiz-spacing-tight)}.ibiz-filter-tree__mode-select{width:185px;margin-right:var(--ibiz-spacing-tight)}.ibiz-filter-tree-group{padding:var(--ibiz-spacing-tight);border:1px solid var(--ibiz-color-border)}.ibiz-filter-tree-group__editor{width:600px;height:270px}.ibiz-filter-tree-group__actions{padding-bottom:var(--ibiz-spacing-base)}.ibiz-filter-tree-group__logic-type{width:80px;margin-left:var(--ibiz-spacing-tight)}.ibiz-filter-tree-group__list-item{position:relative;display:flex;align-items:center;justify-content:flex-start;padding-right:var(--ibiz-spacing-base);padding-bottom:var(--ibiz-spacing-base)}.ibiz-filter-tree-group__list-item-left{align-self:flex-start;width:32px;margin:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-tight) var(--ibiz-spacing-none);font-size:var(--ibiz-font-size-regular);color:var(--ibiz-editor-default-text-color)}.ibiz-filter-tree-group__list-item-right{position:absolute;top:8px;right:0;color:var(--ibiz-color-danger);cursor:pointer}.ibiz-filter-tree-group__list-item-right:hover{color:var(--ibiz-color-danger-hover)}.ibiz-filter-tree-group--items>.ibiz-filter-tree-group__actions{display:flex}.ibiz-filter-tree-group--items>.ibiz-filter-tree-group__actions>.ibiz-filter-tree-item{width:auto}.ibiz-filter-tree-item{display:flex;align-items:center;justify-content:flex-start;width:574px}.ibiz-filter-tree-footer{margin-top:var(--ibiz-spacing-tight);text-align:right}

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

@@ -70,7 +70,17 @@ const SearchBarControl = /* @__PURE__ */ vue.defineComponent({
           "filterControllers": c.filterControllers,
           "filterNodes": c.state.filterNodes,
           "parent": "search-bar",
-          "onConfirm": () => {
+          "filterMode": c.state.filterMode,
+          "customCond": c.state.customCond,
+          "context": c.context,
+          "params": c.params,
+          "schemaEntityMap": c.schemaEntityMap,
+          "onCustomCondChange": (customCond) => {
+            c.state.customCond = customCond;
+          },
+          "onConfirm": (mode, customCond) => {
+            c.state.filterMode = mode;
+            c.state.customCond = customCond;
             c.onSearch();
             if (popover) {
               popover.dismiss();
@@ -78,6 +88,7 @@ const SearchBarControl = /* @__PURE__ */ vue.defineComponent({
           },
           "onCancel": () => {
             c.resetFilter();
+            c.state.customCond = "";
           }
         }, null);
       }, void 0, {

package/lib/editor/check-box-list/checkbox-list-editor.controller.cjs

@@ -19,13 +19,24 @@ class CheckBoxListEditorController extends runtime.CodeListEditorController {
      * @Date: 2023-05-24 10:55:50
      */
     __publicField(this, "codeList");
+    /**
+     * 多选一行展示几个
+     * @author fangZhiHao
+     * @date 2024-07-17 10:07:40
+     * @type {(number | undefined)}
+     */
+    __publicField(this, "rowNumber");
   }
   async onInit() {
+    var _a;
     super.onInit();
     if (this.model.appCodeListId) {
       const app = await ibiz.hub.getApp(this.context.srfappid);
       this.codeList = app.codeList.getCodeList(this.model.appCodeListId);
     }
+    if ((_a = this.editorParams) == null ? void 0 : _a.rowNumber) {
+      this.rowNumber = Number(this.editorParams.rowNumber);
+    }
   }
 }
 

package/lib/editor/check-box-list/ibiz-checkbox-list/ibiz-checkbox-list.cjs

@@ -158,7 +158,8 @@ const IBizCheckboxList = /* @__PURE__ */ vue.defineComponent({
     let _slot;
     return vue.createVNode("div", {
       "ref": "editorRef",
-      "class": [this.ns.b(), this.disabled ? this.ns.m("disabled") : "", this.readonly ? this.ns.m("readonly") : "", this.ns.is("show-default", this.showFormDefaultContent)]
+      "class": [this.ns.b(), this.disabled ? this.ns.m("disabled") : "", this.readonly ? this.ns.m("readonly") : "", this.ns.is("show-default", this.showFormDefaultContent), this.ns.is("grid-layout", !!this.controller.rowNumber)],
+      "style": this.controller.rowNumber ? "--ibiz-checkbox-list-group-row-number:".concat(this.controller.rowNumber) : ""
     }, [this.readonly ? this.valueText : vue.createVNode(vue.resolveComponent("el-checkbox-group"), vue.mergeProps({
       "model-value": this.selectArray,
       "onChange": this.onSelectArrayChange

package/lib/editor/check-box-list/ibiz-checkbox-list/ibiz-checkbox-list.css

@@ -1 +1 @@
-.ibiz-checkbox-list__text{font-size:var(--ibiz-form-item-font-size);color:var(--ibiz-form-item-text-color)}.ibiz-checkbox-list--readonly{font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-readonly-color)}.ibiz-form-item .ibiz-checkbox-list.is-show-default{padding:var(--ibiz-form-item-hover-edit-padding)}
+.ibiz-checkbox-list{--ibiz-checkbox-list-group-row-number:0}.ibiz-checkbox-list__text{font-size:var(--ibiz-form-item-font-size);color:var(--ibiz-form-item-text-color)}.ibiz-checkbox-list--readonly{font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-readonly-color)}.ibiz-checkbox-list.is-grid-layout .el-checkbox-group{display:grid;grid-template-columns:repeat(var(--ibiz-checkbox-list-group-row-number),1fr)}.ibiz-form-item .ibiz-checkbox-list.is-show-default{padding:var(--ibiz-form-item-hover-edit-padding)}