@ibiz-template/vue3-components 0.6.7 → 0.6.9

package/es/editor/rate/ibiz-rate/ibiz-rate.mjs

@@ -34,7 +34,7 @@ const IBizRate = /* @__PURE__ */ defineComponent({
       }
     }
     const showFormDefaultContent = computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/es/editor/raw/ibiz-raw/ibiz-raw.mjs

@@ -28,7 +28,7 @@ const IBizRaw = /* @__PURE__ */ defineComponent({
       template = editorModel.editorParams.TEMPLATE.replaceAll("//n", "\n");
     }
     const showFormDefaultContent = computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/es/editor/slider/ibiz-slider/ibiz-slider.mjs

@@ -49,7 +49,7 @@ const IBizSlider = /* @__PURE__ */ defineComponent({
       }
     }
     const showFormDefaultContent = computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/es/editor/span/span/span.d.ts

@@ -33,8 +33,10 @@ export declare const IBizSpan: import("vue").DefineComponent<{
         text: string;
         id: string;
         color?: string | undefined;
+        bkcolor?: string | undefined;
         children?: any[] | undefined;
         textCls?: string | undefined;
+        cls?: string | undefined;
         disableSelect?: boolean | undefined;
         sysImage?: {
             codeName?: string | undefined;

package/es/editor/span/span/span.mjs

@@ -99,7 +99,7 @@ const IBizSpan = /* @__PURE__ */ defineComponent({
       componentRef: editorRef
     } = useFocusAndBlur(() => emit("focus"), () => emit("blur"));
     const showFormDefaultContent = computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/es/editor/span/span-link/span-link.mjs

@@ -27,7 +27,7 @@ const IBizSpanLink = /* @__PURE__ */ defineComponent({
       componentRef: editorRef
     } = useFocusAndBlur(() => emit("focus"), () => emit("blur"));
     const showFormDefaultContent = computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/es/editor/stepper/ibiz-stepper/ibiz-stepper.css

@@ -1 +1 @@
-.ibiz-form-item .ibiz-stepper.is-show-default{padding:var(--ibiz-form-item-hover-edit-padding)}
+.ibiz-stepper--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-stepper.is-show-default{padding:var(--ibiz-form-item-hover-edit-padding)}

package/es/editor/stepper/ibiz-stepper/ibiz-stepper.mjs

@@ -34,7 +34,7 @@ const IBizStepper = /* @__PURE__ */ defineComponent({
       }
     }
     const showFormDefaultContent = computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/es/editor/switch/ibiz-switch/ibiz-switch.mjs

@@ -43,7 +43,7 @@ const IBizSwitch = /* @__PURE__ */ defineComponent({
       }
     }
     const showFormDefaultContent = computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/es/editor/text-box/ibiz-input-ip/ibiz-input-ip.mjs

@@ -13,7 +13,7 @@ const IBizInputIP = /* @__PURE__ */ defineComponent({
     const ns = useNamespace("input-ip");
     const c = props.controller;
     const showFormDefaultContent = computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/es/editor/text-box/ibiz-input-number/ibiz-input-number.css

@@ -1 +1 @@
-.ibiz-input-number{display:flex;align-items:center;height:100%}.ibiz-input-number .el-input .el-input__inner{font-size:var(--ibiz-form-item-font-size);color:var(--ibiz-form-item-text-color);border-color:var(--ibiz-form-item-border-color)}.ibiz-input-number .el-input .el-input__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input-number .el-input .el-input__inner::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input-number .el-input.is-disabled .el-input__inner{color:var(--ibiz-form-item-disabled-color);border-color:var(--ibiz-form-item-disabled-border-color)}.ibiz-input-number .el-input.is-disabled .el-input__wrapper{background-color:var(--ibiz-form-item-disabled-bg-color)}.ibiz-input-number .ibiz-input-number-input{flex-grow:1;width:auto;height:var(--ibiz-editor-default-line-height)}.ibiz-input-number--readonly{color:var(--ibiz-form-item-readonly-color);word-break:break-word;white-space:pre-wrap}.ibiz-input-number .ibiz-input-number__unit{flex:0 0 auto;margin-left:10px;font-size:var(--ibiz-form-item-font-size);font-style:normal}.ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input{display:block}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input .el-input-number__decrease,.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input .el-input-number__increase{top:2px}.ibiz-form-item .ibiz-input-number.is-show-default .ibiz-input-number-form-default-content{display:flex;align-items:center;width:100%;padding:var(--ibiz-form-item-hover-edit-padding);font-family:Arial,sans-serif;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-text-color)}.ibiz-form-item .ibiz-input-number.is-show-default .ibiz-input-number-input{display:none}.ibiz-form-item .ibiz-input-number.is-show-default.is-editable .ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default.is-editable .ibiz-input-number-input{display:block}
+.ibiz-input-number{display:flex;align-items:center;height:100%}.ibiz-input-number .el-input .el-input__inner{font-size:var(--ibiz-form-item-font-size);color:var(--ibiz-form-item-text-color);border-color:var(--ibiz-form-item-border-color)}.ibiz-input-number .el-input .el-input__inner::-moz-placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input-number .el-input .el-input__inner::placeholder{color:var(--ibiz-form-item-placeholder-color)}.ibiz-input-number .el-input.is-disabled .el-input__inner{color:var(--ibiz-form-item-disabled-color);border-color:var(--ibiz-form-item-disabled-border-color)}.ibiz-input-number .el-input.is-disabled .el-input__wrapper{background-color:var(--ibiz-form-item-disabled-bg-color)}.ibiz-input-number .ibiz-input-number-input{flex-grow:1;width:auto;height:var(--ibiz-editor-default-line-height)}.ibiz-input-number--readonly{font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-readonly-color);word-break:break-word;white-space:pre-wrap}.ibiz-input-number .ibiz-input-number__unit{flex:0 0 auto;margin-left:10px;font-size:var(--ibiz-form-item-font-size);font-style:normal}.ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input{display:block}.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input .el-input-number__decrease,.ibiz-form-item .ibiz-input-number.is-show-default:hover .ibiz-input-number-input .el-input-number__increase{top:2px}.ibiz-form-item .ibiz-input-number.is-show-default .ibiz-input-number-form-default-content{display:flex;align-items:center;width:100%;padding:var(--ibiz-form-item-hover-edit-padding);font-family:Arial,sans-serif;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-text-color)}.ibiz-form-item .ibiz-input-number.is-show-default .ibiz-input-number-input{display:none}.ibiz-form-item .ibiz-input-number.is-show-default.is-editable .ibiz-input-number-form-default-content{display:none}.ibiz-form-item .ibiz-input-number.is-show-default.is-editable .ibiz-input-number-input{display:block}

package/es/editor/text-box/ibiz-input-number/ibiz-input-number.mjs

@@ -29,7 +29,7 @@ const IBizInputNumber = /* @__PURE__ */ defineComponent({
     const isEditable = ref(false);
     const editorRef = ref();
     const showFormDefaultContent = computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/es/editor/text-box/input/input.mjs

@@ -48,7 +48,7 @@ const IBizInput = /* @__PURE__ */ defineComponent({
       }
     });
     const showFormDefaultContent = computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/es/editor/upload/ibiz-file-upload/ibiz-file-upload.mjs

@@ -34,7 +34,7 @@ const IBizFileUpload = /* @__PURE__ */ defineComponent({
       return !!c.parent.model.columnType;
     });
     const showFormDefaultContent = computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/es/editor/upload/ibiz-image-preview/ibiz-image-preview.mjs

@@ -11,7 +11,7 @@ const IBizImagePreview = /* @__PURE__ */ defineComponent({
     const ns = useNamespace("image-preview");
     const c = props.controller;
     const showFormDefaultContent = computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/es/editor/upload/ibiz-image-upload/ibiz-image-upload.mjs

@@ -39,7 +39,7 @@ const IBizImageUpload = /* @__PURE__ */ defineComponent({
       return limit.value === 1 && files.value.length === 1;
     });
     const showFormDefaultContent = computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/es/editor/user/ibiz-searchcond-edit/ibiz-searchcond-edit.mjs

@@ -21,7 +21,7 @@ const IBizSearchCondEdit = /* @__PURE__ */ defineComponent({
     const filterButtonRef = ref();
     let popover;
     const showFormDefaultContent = computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/es/panel-component/panel-button/panel-button.controller.mjs

@@ -80,6 +80,7 @@ class PanelButtonController extends PanelItemController {
    */
   async updateButtonState() {
     await this.state.uiActionState.update(
+      this.panel.context,
       this.data,
       this.panel.model.appDataEntityId
     );

package/es/web-app/guard/auth-guard/auth-guard.d.ts

@@ -85,11 +85,4 @@ export declare class AuthGuard {
      */
     initEnvironment(app: IApplication): Promise<void>;
     throw401(): void;
-    /**
-     * 根据refreshToken获取新token
-     * @return {*}
-     * @author: zhujiamin
-     * @Date: 2024-03-05 11:38:20
-     */
-    refreshToken(): Promise<void>;
 }

package/es/web-app/guard/auth-guard/auth-guard.mjs

@@ -1,7 +1,7 @@
-import { RuntimeError, HttpError, CoreConst } from '@ibiz-template/core';
+import { RuntimeError, CoreConst, HttpError } from '@ibiz-template/core';
 import { mergeDeepRight } from 'ramda';
 import { AppHooks } from '@ibiz-template/vue3-util';
-import { getCookie, setCookie } from 'qx-util';
+import { getCookie } from 'qx-util';
 
 "use strict";
 var __defProp = Object.defineProperty;
@@ -103,11 +103,25 @@ class AuthGuard {
    * @return {*}  {Promise<void>}
    */
   async appInit() {
-    if (ibiz.env.isSaaSMode === true) {
-      await this.loadOrgData();
+    try {
+      if (ibiz.env.isSaaSMode === true) {
+        await this.loadOrgData();
+      }
+      await this.loadAppData();
+    } catch (error) {
+      const responseStatus = error.status;
+      const remember = getCookie(CoreConst.TOKEN_REMEMBER);
+      const refreshToken = getCookie(CoreConst.REFRESH_TOKEN);
+      if (responseStatus === 401 && remember && refreshToken != null && refreshToken !== "") {
+        await ibiz.auth.refreshToken();
+        if (ibiz.env.isSaaSMode === true) {
+          await this.loadOrgData();
+        }
+        await this.loadAppData();
+      } else {
+        throw error;
+      }
     }
-    await this.refreshToken();
-    await this.loadAppData();
     await this.initModel();
     await ibiz.auth.extendLogin();
     await ibiz.hub.notice.init();
@@ -215,34 +229,6 @@ class AuthGuard {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     });
   }
-  /**
-   * 根据refreshToken获取新token
-   * @return {*}
-   * @author: zhujiamin
-   * @Date: 2024-03-05 11:38:20
-   */
-  async refreshToken() {
-    const remember = getCookie(CoreConst.TOKEN_REMEMBER);
-    const token = getCookie(CoreConst.TOKEN);
-    const refreshToken = getCookie(CoreConst.REFRESH_TOKEN);
-    const cacheDay = remember ? 7 : 0;
-    if (!token && refreshToken != null && refreshToken !== "") {
-      const res = await ibiz.net.get("/uaa/refresh_token/".concat(refreshToken));
-      if (res.ok) {
-        setCookie(CoreConst.TOKEN, res.data.token, cacheDay, true);
-        const expiredDate = (/* @__PURE__ */ new Date()).getTime() + (res.data.expirein || 7199) * 1e3;
-        setCookie(CoreConst.TOKEN_EXPIRES, "".concat(expiredDate), cacheDay, true);
-        if (res.data.refresh_token) {
-          setCookie(
-            CoreConst.REFRESH_TOKEN,
-            res.data.refresh_token,
-            cacheDay,
-            true
-          );
-        }
-      }
-    }
-  }
 }
 
 export { AuthGuard };

package/lib/control/drbar/drbar.cjs

@@ -60,6 +60,17 @@ const DRBarControl = /* @__PURE__ */ vue.defineComponent({
     const route = vueRouter.useRoute();
     const defaultActive = vue.ref("");
     let expViewRoutePath = "";
+    const opens = [];
+    vue.watch(() => c.state.isCreated, (_newVal, _oldVal) => {
+      if (props.showMode !== "horizontal") {
+        const {
+          drBarItems
+        } = c.state;
+        drBarItems.forEach((item) => {
+          opens.push(item.tag);
+        });
+      }
+    });
     if (c.routeDepth) {
       expViewRoutePath = vue3Util.getNestedRoutePath(route, c.routeDepth);
     }
@@ -130,7 +141,8 @@ const DRBarControl = /* @__PURE__ */ vue.defineComponent({
       ns,
       handleSelect,
       renderMenuItems,
-      defaultActive
+      defaultActive,
+      opens
     };
   },
   render() {
@@ -148,7 +160,8 @@ const DRBarControl = /* @__PURE__ */ vue.defineComponent({
         "class": this.ns.e("menu"),
         "mode": this.showMode,
         "default-active": this.defaultActive || defaultItem,
-        "onSelect": this.handleSelect
+        "onSelect": this.handleSelect,
+        "default-openeds": this.opens
       }, _isSlot(_slot = drBarItems.map((item) => {
         return this.renderMenuItems(item);
       })) ? _slot : {

package/lib/control/drbar/drbar.controller.cjs

@@ -348,7 +348,12 @@ class DRBarController extends runtime.ControlController {
    * @return {*}  {void}
    */
   doDefaultSelect() {
-    var _a;
+    var _a, _b;
+    const viewForm = (_a = this.view.layoutPanel) == null ? void 0 : _a.panelItems.view_form;
+    if (viewForm) {
+      viewForm.state.visible = false;
+      viewForm.state.keepAlive = false;
+    }
     if (!this.state.hideEditItem && !this.state.srfnav) {
       this.setVisible("form");
       return;
@@ -358,7 +363,7 @@ class DRBarController extends runtime.ControlController {
       return;
     }
     const { drBarItems } = this.state;
-    let key = ((_a = drBarItems[0].children) == null ? void 0 : _a[0].tag) || drBarItems[0].tag;
+    let key = ((_b = drBarItems[0].children) == null ? void 0 : _b[0].tag) || drBarItems[0].tag;
     if (this.routeDepth && this.state.srfnav) {
       key = this.state.srfnav;
     }

package/lib/control/search-bar/filter-mode-select/filter-mode-select.cjs

@@ -46,6 +46,12 @@ const FilterModes = [{
 }, {
   valueOP: runtime.ValueOP.RIGHT_LIKE,
   label: "\u6587\u672C\u53F3\u5305\u542B(#%)"
+}, {
+  valueOP: runtime.ValueOP.EXISTS,
+  label: "\u5B58\u5728(EXISTS)"
+}, {
+  valueOP: runtime.ValueOP.NOT_EXISTS,
+  label: "\u4E0D\u5B58\u5728(NOTEXISTS)"
 }];
 const FilterModeSelect = /* @__PURE__ */ vue.defineComponent({
   name: "IBizFilterModeSelect",

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

@@ -48,6 +48,12 @@ const FilterModes = [{
 }, {
   valueOP: runtime.ValueOP.RIGHT_LIKE,
   label: "\u6587\u672C\u53F3\u5305\u542B(#%)"
+}, {
+  valueOP: runtime.ValueOP.EXISTS,
+  label: "\u5B58\u5728(EXISTS)"
+}, {
+  valueOP: runtime.ValueOP.NOT_EXISTS,
+  label: "\u4E0D\u5B58\u5728(NOTEXISTS)"
 }];
 const ExcludeOPs = [runtime.ValueOP.IS_NULL, runtime.ValueOP.IS_NOT_NULL];
 const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
@@ -95,11 +101,11 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
       });
     };
     const allFields = [];
-    const getFilterModes = (fieldName) => {
+    const getFilterModes = (fieldName, fieldInfos = allFields) => {
       if (!fieldName) {
         return;
       }
-      const field = allFields.find((item) => item.name === fieldName);
+      const field = fieldInfos.find((item) => item.name === fieldName);
       if (!field) {
         return;
       }
@@ -123,11 +129,35 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
     });
     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 onValueOPSelect = (node, valueOP) => {
       node.valueOP = valueOP;
       node.value = null;
+      if (["EXISTS", "NOTEXISTS"].includes(valueOP)) {
+        Object.assign(node, {
+          leaf: false,
+          logicType: "ITEMS",
+          children: [{
+            leaf: true,
+            field: null,
+            valueOP: null,
+            value: null
+          }]
+        });
+      } else {
+        Object.assign(node, {
+          leaf: true,
+          logicType: void 0,
+          children: void 0
+        });
+      }
     };
     const onGroupLogicTypeChange = (node, logicType) => {
       node.logicType = logicType;
@@ -182,10 +212,25 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
         "class": ns.e("editor")
       }, [editor]);
     };
-    const renderFilterItem = (node) => {
+    const renderFilterItem = (node, itemsC) => {
       let _slot;
-      const filterC = findFilterController(node.field, node.valueOP);
-      const availableModes = getFilterModes(node.field);
+      let fieldInfos = allFields;
+      if (itemsC) {
+        fieldInfos = itemsC.allFields;
+      }
+      const availableModes = getFilterModes(node.field, fieldInfos);
+      let editor = null;
+      if (node.field && node.valueOP) {
+        if (itemsC) {
+          const subFilterC = itemsC.getSubFilterController(node.field, node.valueOP);
+          editor = renderEditor(node, subFilterC);
+        } else {
+          const filterC = findFilterController(node.field, node.valueOP);
+          if (filterC && !["EXISTS", "NOTEXISTS"].includes(filterC.valueOP)) {
+            editor = renderEditor(node, filterC);
+          }
+        }
+      }
       return vue.createVNode("div", {
         "class": ns.b("item")
       }, [vue.createVNode(vue.resolveComponent("el-select"), {
@@ -196,7 +241,7 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
         "onChange": (field) => {
           onFieldSelect(node, field);
         }
-      }, _isSlot(_slot = allFields.map((field) => {
+      }, _isSlot(_slot = fieldInfos.map((field) => {
         return vue.createVNode(vue.resolveComponent("el-option"), {
           "key": field.name,
           "value": field.name,
@@ -212,9 +257,13 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
         "onChange": (valueOP) => {
           onValueOPSelect(node, valueOP);
         }
-      }, null), filterC && renderEditor(node, filterC)]);
+      }, null), editor]);
     };
-    const renderFilterGroup = (node) => {
+    let renderFilterItems = (_node) => vue.createVNode("div", null, null);
+    const renderFilterGroup = (node, itemsC) => {
+      if (node.logicType === "ITEMS") {
+        return renderFilterItems(node);
+      }
       return vue.createVNode("div", {
         "class": ns.b("group")
       }, [vue.createVNode("div", {
@@ -254,7 +303,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) : renderFilterGroup(child);
+        const childContent = child.leaf ? renderFilterItem(child, itemsC) : renderFilterGroup(child, itemsC);
         return vue.createVNode("div", {
           "class": ns.be("group", "list-item")
         }, [vue.createVNode("div", {
@@ -270,6 +319,38 @@ const FilterTreeControl = /* @__PURE__ */ vue.defineComponent({
         }, null)]);
       })])]);
     };
+    renderFilterItems = (node) => {
+      const itemsC = findFilterController(node.field, node.valueOP);
+      return vue.createVNode("div", {
+        "class": (ns.b("group"), ns.bm("group", "items"))
+      }, [vue.createVNode("div", {
+        "class": ns.be("group", "actions")
+      }, [renderFilterItem(node), vue.createVNode(vue.resolveComponent("el-button"), {
+        "text": true,
+        "onClick": () => {
+          addItem(node);
+        }
+      }, {
+        default: () => [vue.createTextVNode("\u6DFB\u52A0\u9879")]
+      })]), 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);
+        return vue.createVNode("div", {
+          "class": ns.be("group", "list-item")
+        }, [vue.createVNode("div", {
+          "class": ns.be("group", "list-item-left")
+        }, [vue.createTextVNode("AND")]), childContent, vue.createVNode(vue.resolveComponent("iBizIcon"), {
+          "class": ns.be("group", "list-item-right"),
+          "onClick": () => {
+            node.children.splice(index, 1);
+          },
+          "icon": {
+            cssClass: "trash"
+          }
+        }, null)]);
+      })])]);
+    };
     const onConfirm = () => {
       emit("confirm");
     };

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

@@ -1 +1 @@
-.ibiz-filter-tree{padding:16px}.ibiz-filter-tree__editor{display:inline-block;width:180px;margin-right:8px}.ibiz-filter-tree__field-select{width:185px;margin-right:8px}.ibiz-filter-tree__mode-select{width:185px;margin-right:8px}.ibiz-filter-tree-group{padding:6px;border:1px solid var(--ibiz-color-border)}.ibiz-filter-tree-group__actions{padding-bottom:16px}.ibiz-filter-tree-group__logic-type{width:80px;margin-left:12px}.ibiz-filter-tree-group__list-item{position:relative;display:flex;align-items:center;justify-content:flex-start;padding-right:15px;padding-bottom:16px}.ibiz-filter-tree-group__list-item-left{align-self:flex-start;width:32px;margin:5px 8px 0;font-size:14px;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-item{display:flex;align-items:center;justify-content:flex-start;width:574px}.ibiz-filter-tree-footer{margin-top:8px;text-align:right}
+.ibiz-filter-tree{padding:16px}.ibiz-filter-tree__editor{display:inline-block;width:180px;margin-right:8px}.ibiz-filter-tree__field-select{width:185px;margin-right:8px}.ibiz-filter-tree__mode-select{width:185px;margin-right:8px}.ibiz-filter-tree-group{padding:6px;border:1px solid var(--ibiz-color-border)}.ibiz-filter-tree-group__actions{padding-bottom:16px}.ibiz-filter-tree-group__logic-type{width:80px;margin-left:12px}.ibiz-filter-tree-group__list-item{position:relative;display:flex;align-items:center;justify-content:flex-start;padding-right:15px;padding-bottom:16px}.ibiz-filter-tree-group__list-item-left{align-self:flex-start;width:32px;margin:5px 8px 0;font-size:14px;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:8px;text-align:right}

package/lib/control/tree/tree.css

@@ -1 +1 @@
-.ibiz-control-treeview{--ibiz-control-treeview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-control-treeview-icon-height:var(--ibiz-spacing-base);--ibiz-control-treeview-icon-width:var(--ibiz-spacing-base);height:100%;padding:var(--ibiz-control-treeview-padding)}.ibiz-control-treeview-node{display:flex;flex-grow:1;flex-shrink:1;align-items:center;min-width:1px;height:100%}.ibiz-control-treeview-node__icon{width:var(--ibiz-control-treeview-icon-width);height:var(--ibiz-control-treeview-icon-height);margin-right:var(--ibiz-spacing-tight)}.ibiz-control-treeview-node__label{flex-grow:1;flex-shrink:1;min-width:1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-treeview-node:hover .ibiz-control-treeview-context-menu-trigger{display:inline-block}.ibiz-control-treeview-node--disabled{color:var(--ibiz-color-disabled-text);cursor:not-allowed}.ibiz-control-treeview-context-menu-trigger{display:none;flex-shrink:0;width:30px;text-align:center;cursor:pointer}.ibiz-control-treeview-context-menu-trigger__caption-icon{vertical-align:middle}.ibiz-control-treeview-context-menu.mx-context-menu{padding:var(--ibiz-spacing-extra-tight) 0}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item{padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base)}.ibiz-control-treeview-quick-search{margin-bottom:var(--ibiz-spacing-tight)}
+.ibiz-control-treeview{--ibiz-control-treeview-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base);--ibiz-control-treeview-icon-height:var(--ibiz-spacing-base);--ibiz-control-treeview-icon-width:var(--ibiz-spacing-base);height:100%;padding:var(--ibiz-control-treeview-padding)}.ibiz-control-treeview-node{display:flex;flex-grow:1;flex-shrink:1;align-items:center;min-width:1px;height:100%}.ibiz-control-treeview-node__icon{display:inline-block;width:var(--ibiz-control-treeview-icon-width);height:var(--ibiz-control-treeview-icon-height);margin-right:var(--ibiz-spacing-tight)}.ibiz-control-treeview-node__icon>svg{width:100%;height:100%}.ibiz-control-treeview-node__label{flex-grow:1;flex-shrink:1;min-width:1px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-control-treeview-node:hover .ibiz-control-treeview-context-menu-trigger{display:inline-block}.ibiz-control-treeview-node--disabled{color:var(--ibiz-color-disabled-text);cursor:not-allowed}.ibiz-control-treeview-context-menu-trigger{display:none;flex-shrink:0;width:30px;text-align:center;cursor:pointer}.ibiz-control-treeview-context-menu-trigger__caption-icon{vertical-align:middle}.ibiz-control-treeview-context-menu.mx-context-menu{padding:var(--ibiz-spacing-extra-tight) 0}.ibiz-control-treeview-context-menu.mx-context-menu .mx-context-menu-item{padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-base)}.ibiz-control-treeview-quick-search{margin-bottom:var(--ibiz-spacing-tight)}

package/lib/editor/array/ibiz-array/ibiz-array.cjs

@@ -58,7 +58,7 @@ const IBizArray = /* @__PURE__ */ vue.defineComponent({
     const dataType = editorModel.dataType;
     const type = Object.is(dataType, "NUMBER") || Object.is(dataType, "INTEGER") ? "number" : "text";
     const showFormDefaultContent = vue.computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/lib/editor/autocomplete/ibiz-autocomplete/ibiz-autocomplete.cjs

@@ -23,7 +23,7 @@ const IBizAutoComplete = /* @__PURE__ */ vue.defineComponent({
     const editorRef = vue.ref();
     const isSearched = vue.ref(false);
     const showFormDefaultContent = vue.computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/lib/editor/autocomplete/ibiz-autocomplete/ibiz-autocomplete.css

@@ -1 +1 @@
-.ibiz-autocomplete{width:100%}.ibiz-autocomplete .ibiz-autocomplete-input{width:100%}.ibiz-autocomplete-form-default-content{display:none}.ibiz-form-item .ibiz-autocomplete.is-show-default:hover .ibiz-autocomplete-form-default-content{display:none}.ibiz-form-item .ibiz-autocomplete.is-show-default:hover .ibiz-autocomplete-input{display:block}.ibiz-form-item .ibiz-autocomplete.is-show-default .ibiz-autocomplete-form-default-content{display:flex;align-items:center;width:100%;padding:var(--ibiz-form-item-hover-edit-padding);font-family:Arial,sans-serif;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-text-color)}.ibiz-form-item .ibiz-autocomplete.is-show-default .ibiz-autocomplete-input{display:none}.ibiz-form-item .ibiz-autocomplete.is-show-default.is-editable .ibiz-autocomplete-form-default-content{display:none}.ibiz-form-item .ibiz-autocomplete.is-show-default.is-editable .ibiz-autocomplete-input{display:block}
+.ibiz-autocomplete{width:100%}.ibiz-autocomplete .ibiz-autocomplete-input{width:100%}.ibiz-autocomplete--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-autocomplete-form-default-content{display:none}.ibiz-form-item .ibiz-autocomplete.is-show-default:hover .ibiz-autocomplete-form-default-content{display:none}.ibiz-form-item .ibiz-autocomplete.is-show-default:hover .ibiz-autocomplete-input{display:block}.ibiz-form-item .ibiz-autocomplete.is-show-default .ibiz-autocomplete-form-default-content{display:flex;align-items:center;width:100%;padding:var(--ibiz-form-item-hover-edit-padding);font-family:Arial,sans-serif;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-text-color)}.ibiz-form-item .ibiz-autocomplete.is-show-default .ibiz-autocomplete-input{display:none}.ibiz-form-item .ibiz-autocomplete.is-show-default.is-editable .ibiz-autocomplete-form-default-content{display:none}.ibiz-form-item .ibiz-autocomplete.is-show-default.is-editable .ibiz-autocomplete-input{display:block}

package/lib/editor/cascader/ibiz-cascader/ibiz-cascader.cjs

@@ -80,7 +80,7 @@ const IBizCascader = /* @__PURE__ */ vue.defineComponent({
     const isEditable = vue.ref(false);
     const editorRef = vue.ref();
     const showFormDefaultContent = vue.computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/lib/editor/cascader/ibiz-cascader/ibiz-cascader.css

@@ -1 +1 @@
-.ibiz-cascader .el-cascader{width:100%}.ibiz-cascader-form-default-content{display:none}.ibiz-form-item .ibiz-cascader.is-show-default:hover .ibiz-cascader-form-default-content{display:none}.ibiz-form-item .ibiz-cascader.is-show-default:hover .ibiz-cascader-input{display:block}.ibiz-form-item .ibiz-cascader.is-show-default .ibiz-cascader-form-default-content{display:flex;align-items:center;width:100%;padding:var(--ibiz-form-item-hover-edit-padding);font-family:Arial,sans-serif;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-text-color)}.ibiz-form-item .ibiz-cascader.is-show-default .ibiz-cascader-input{display:none}.ibiz-form-item .ibiz-cascader.is-show-default.is-editable .ibiz-cascader-form-default-content{display:none}.ibiz-form-item .ibiz-cascader.is-show-default.is-editable .ibiz-cascader-input{display:block}
+.ibiz-cascader .el-cascader{width:100%}.ibiz-cascader--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-cascader-form-default-content{display:none}.ibiz-form-item .ibiz-cascader.is-show-default:hover .ibiz-cascader-form-default-content{display:none}.ibiz-form-item .ibiz-cascader.is-show-default:hover .ibiz-cascader-input{display:block}.ibiz-form-item .ibiz-cascader.is-show-default .ibiz-cascader-form-default-content{display:flex;align-items:center;width:100%;padding:var(--ibiz-form-item-hover-edit-padding);font-family:Arial,sans-serif;font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-text-color)}.ibiz-form-item .ibiz-cascader.is-show-default .ibiz-cascader-input{display:none}.ibiz-form-item .ibiz-cascader.is-show-default.is-editable .ibiz-cascader-form-default-content{display:none}.ibiz-form-item .ibiz-cascader.is-show-default.is-editable .ibiz-cascader-input{display:block}

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

@@ -25,7 +25,7 @@ const IBizCheckbox = /* @__PURE__ */ vue.defineComponent({
       nullValue = editorModel.editorParams.nullValue;
     }
     const showFormDefaultContent = vue.computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

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

@@ -20,7 +20,7 @@ const IBizCheckboxList = /* @__PURE__ */ vue.defineComponent({
     const c = props.controller;
     const codeList = c.codeList;
     const showFormDefaultContent = vue.computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/lib/editor/color-picker/ibiz-color-picker/ibiz-color-picker.cjs

@@ -18,7 +18,7 @@ const IBizColorPicker = /* @__PURE__ */ vue.defineComponent({
     const colorPicker = vue.ref(null);
     const predefineColors = vue.ref(["#000000", "#2C2C2C", "#50555C", "#ACB3BF", "#D0D3D9", "#C4C4C4", "#DADADA", "#E5E5E5", "#F0F0F0", "#F24E1E", "#E99C58", "#FFC700", "#FF4D00", "#FF00D6", "#D82E57", "#8E1DE8", "#0ACF83", "#18A0FB", "#A259FF", "#907CFF"]);
     const showFormDefaultContent = vue.computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/lib/editor/color-picker/ibiz-color-picker/ibiz-color-picker.css

@@ -1 +1 @@
-.ibiz-color-picker{color:var(--ibiz-form-item-text-color)}.ibiz-color-picker .el-color-picker__trigger{border:none}.ibiz-color-picker .ibiz-color-picker-content{display:inline-block;padding:3px var(--ibiz-spacing-tight);font-size:var(--ibiz-form-item-font-size);border:1px solid var(--ibiz-editor-default-border-color);border-radius:var(--ibiz-border-radius-small)}.ibiz-color-picker .ibiz-color-picker-content:hover{border:1px solid var(--ibiz-editor-hover-border-color)}.ibiz-color-picker .ibiz-color-picker-text{margin-left:var(--ibiz-spacing-super-tight)}.ibiz-color-picker--readonly{color:var(--ibiz-form-item-readonly-color);word-break:break-word;white-space:pre-wrap}.ibiz-form-item .ibiz-color-picker.is-show-default{padding:var(--ibiz-form-item-hover-edit-padding)}
+.ibiz-color-picker{color:var(--ibiz-form-item-text-color)}.ibiz-color-picker .el-color-picker__trigger{border:none}.ibiz-color-picker .ibiz-color-picker-content{display:inline-block;padding:3px var(--ibiz-spacing-tight);font-size:var(--ibiz-form-item-font-size);border:1px solid var(--ibiz-editor-default-border-color);border-radius:var(--ibiz-border-radius-small)}.ibiz-color-picker .ibiz-color-picker-content:hover{border:1px solid var(--ibiz-editor-hover-border-color)}.ibiz-color-picker .ibiz-color-picker-text{margin-left:var(--ibiz-spacing-super-tight)}.ibiz-color-picker--readonly{font-size:var(--ibiz-form-item-font-size);line-height:var(--ibiz-editor-default-line-height);color:var(--ibiz-form-item-readonly-color);word-break:break-word;white-space:pre-wrap}.ibiz-form-item .ibiz-color-picker.is-show-default{padding:var(--ibiz-form-item-hover-edit-padding)}

package/lib/editor/data-picker/ibiz-mpicker/ibiz-mpicker.cjs

@@ -26,7 +26,7 @@ const IBizMPicker = /* @__PURE__ */ vue.defineComponent({
     const isEditable = vue.ref(false);
     const editorRef = vue.ref();
     const showFormDefaultContent = vue.computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;

package/lib/editor/data-picker/ibiz-picker/ibiz-picker.cjs

@@ -22,7 +22,7 @@ const IBizPicker = /* @__PURE__ */ vue.defineComponent({
     const editorRef = vue.ref();
     const isLoaded = vue.ref(false);
     const showFormDefaultContent = vue.computed(() => {
-      if (props.controlParams && props.controlParams.editmode === "hover") {
+      if (props.controlParams && props.controlParams.editmode === "hover" && !props.readonly) {
         return true;
       }
       return false;