@ibiz-template/vue3-components 0.7.41-alpha.5 → 0.7.41-alpha.51

package/es/control/form/form-detail/form-item/composite-form-item-ex/composite-form-item-ex.controller.mjs

@@ -0,0 +1,177 @@
+import { FormItemController, getEditorProvider, filterValueRules, generateRules, generateEditorRules } from '@ibiz-template/runtime';
+import Schema from 'async-validator';
+import { CompositeFormItemExState } from './composite-form-item-ex.state.mjs';
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class CompositeFormItemExController extends FormItemController {
+  constructor() {
+    super(...arguments);
+    /**
+     * @description 默认显示的编辑器类型
+     * @type {string}
+     * @memberof CompositeFormItemExController
+     */
+    __publicField(this, "defaultType", "");
+    /**
+     * @description 组件内部自己绘制切换菜单，而非外部绘制的编辑器类型
+     * @type {string[]}
+     * @memberof CompositeFormItemExController
+     */
+    __publicField(this, "includesList", ["HTMLEDITOR_DEFAULT", "MARKDOWN_DEFAULT"]);
+    /**
+     * @description 代码表id
+     * @type {string}
+     * @memberof CompositeFormItemExController
+     */
+    __publicField(this, "codeListId", "");
+    /**
+     * @description 是否禁止切换菜单选项
+     * @type {boolean}
+     * @memberof CompositeFormItemExController
+     */
+    __publicField(this, "disableSwitch", false);
+    /**
+     * @description 切换菜单选项
+     * @type {{ id: string; name: string; icon?: ISysImage, editor?: IData, valueItem?: string }[]}
+     * @memberof CompositeFormItemExController
+     */
+    __publicField(this, "switchOptions", []);
+    /**
+     * @description 值项
+     * @type {(IEditorItem | undefined)}
+     * @memberof CompositeFormItemExController
+     */
+    __publicField(this, "valueItem");
+  }
+  createState() {
+    var _a;
+    return new CompositeFormItemExState((_a = this.parent) == null ? void 0 : _a.state);
+  }
+  get name() {
+    return this.state.editorValueItem || this.model.id;
+  }
+  get value() {
+    var _a;
+    const option = this.switchOptions.find(
+      (item) => item.id === this.state.editorId
+    );
+    return (_a = this.data) == null ? void 0 : _a[(option == null ? void 0 : option.valueItem) || this.model.id];
+  }
+  async onInit() {
+    var _a, _b, _c, _d, _e;
+    await super.onInit();
+    const editor = this.model.editor;
+    if (!editor) {
+      return;
+    }
+    this.codeListId = editor.appCodeListId || "";
+    if ((_a = editor.editorParams) == null ? void 0 : _a.codelistid) {
+      this.codeListId = editor.editorParams.codelistid;
+    }
+    if (this.codeListId) {
+      const app = ibiz.hub.getApp(this.context.srfappid);
+      const items = await app.codeList.get(
+        this.codeListId,
+        this.context,
+        this.params
+      );
+      if (items && items.length) {
+        this.switchOptions = items.map((item) => {
+          return {
+            id: item.value,
+            name: item.text,
+            icon: item.sysImage,
+            editor: item.data,
+            valueItem: item.userData
+          };
+        });
+        this.defaultType = ((_b = this.switchOptions[0]) == null ? void 0 : _b.id) || "";
+      }
+    }
+    if ((_c = editor.editorParams) == null ? void 0 : _c.defaulttype) {
+      this.defaultType = editor.editorParams.defaulttype;
+    }
+    if ((_d = editor.editorParams) == null ? void 0 : _d.includes) {
+      this.includesList = JSON.parse(editor.editorParams.includes);
+    }
+    if ((_e = editor.editorParams) == null ? void 0 : _e.disableswitch) {
+      this.disableSwitch = editor.editorParams.disableswitch === "true";
+    }
+    if (editor.editorItems && editor.editorItems.length) {
+      this.valueItem = editor.editorItems[0];
+    }
+    await this.updateEditor(this.defaultType);
+  }
+  /**
+   * @description 更新编辑器模型
+   * @param {string} id
+   * @returns {*}  {Promise<void>}
+   * @memberof CompositeFormItemExController
+   */
+  async updateEditor(id) {
+    if (!id || id === this.state.editorId) {
+      return;
+    }
+    const option = this.switchOptions.find((item) => item.id === id);
+    if (!option) {
+      return;
+    }
+    this.state.editorValueItem = option.valueItem || "";
+    const editorModel = {
+      ...this.createEditorModel(),
+      ...option.editor
+    };
+    this.editorProvider = await getEditorProvider(editorModel);
+    if (this.editorProvider) {
+      this.editor = await this.editorProvider.createController(
+        editorModel,
+        this
+      );
+      this.rules = [];
+      const formItemsVRs = filterValueRules(
+        this.form.model.deformItemVRs || [],
+        this.name
+      );
+      if (formItemsVRs) {
+        this.rules.push(
+          ...generateRules(formItemsVRs, this.name, this.valueItemName)
+        );
+      }
+      if (editorModel) {
+        this.rules.push(...generateEditorRules(editorModel));
+      }
+      if (this.rules.length > 0) {
+        this.validator = new Schema({ [this.name]: this.rules });
+      } else {
+        this.validator = void 0;
+      }
+    } else {
+      this.editor = void 0;
+      this.rules = [];
+      this.validator = void 0;
+    }
+    this.state.editorId = id;
+  }
+  /**
+   * @description 处理编辑器切换
+   * @param {string} id
+   * @returns {*}  {Promise<void>}
+   * @memberof CompositeFormItemExController
+   */
+  async handleEditorSwitch(id) {
+    if (!id || id === this.state.editorId) {
+      return;
+    }
+    if (this.valueItem && this.valueItem.id) {
+      this.setDataValue(id, this.valueItem.id);
+    }
+  }
+}
+
+export { CompositeFormItemExController };

package/es/control/form/form-detail/form-item/composite-form-item-ex/composite-form-item-ex.css

@@ -0,0 +1 @@
+.ibiz-composite-form-item-ex{--ibiz-composite-form-item-ex-menu-top:0;--ibiz-composite-form-item-ex-menu-right:0;--ibiz-composite-form-item-ex-menu-text-color:var(--ibiz-color-text-2);--ibiz-composite-form-item-ex-menu-font-size:var(--ibiz-font-size-regular);--ibiz-composite-form-item-ex-menu-width:120px;--ibiz-composite-form-item-ex-menu-height:var(--ibiz-height-control-default);--ibiz-composite-form-item-ex-menu-icon-gap:var(--ibiz-spacing-extra-tight);--ibiz-composite-form-item-ex-menu-z-index:9;--ibiz-composite-form-item-ex-menu-padding:0 var(--ibiz-spacing-base-tight);--ibiz-composite-form-item-ex-menu-item-padding:var(--ibiz-spacing-extra-tight);--ibiz-composite-form-item-ex-menu-item-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-composite-form-item-ex-menu-bg-color:var(--ibiz-color-bg-3);--ibiz-composite-form-item-ex-menu-text-icon-size:var(--ibiz-font-size-header-6);--ibiz-composite-form-item-ex-menu-content-padding:var(--ibiz-spacing-base-tight);--ibiz-composite-form-item-ex-loading-min-height:calc(var(--el-loading-spinner-size) + var(--ibiz-spacing-tight));position:relative}.ibiz-composite-form-item-ex .ibiz-composite-form-item-ex-menu{position:absolute;top:var(--ibiz-composite-form-item-ex-menu-top);right:var(--ibiz-composite-form-item-ex-menu-right);z-index:var(--ibiz-composite-form-item-ex-menu-z-index);display:flex;align-items:center;width:var(--ibiz-composite-form-item-ex-menu-width);height:var(--ibiz-composite-form-item-ex-menu-height);padding:var(--ibiz-composite-form-item-ex-menu-padding);font-size:var(--ibiz-composite-form-item-ex-menu-font-size);color:var(--ibiz-composite-form-item-ex-menu-text-color);cursor:pointer;background:var(--ibiz-composite-form-item-ex-menu-bg-color)}.ibiz-composite-form-item-ex .ibiz-composite-form-item-ex-menu.is-disabled{cursor:auto}.ibiz-composite-form-item-ex .ibiz-composite-form-item-ex-menu.is-disabled .ibiz-composite-form-item-ex-menu__icon{display:none}.ibiz-composite-form-item-ex-menu__text-icon{display:flex;flex:0 0 auto;align-items:center;justify-content:center;width:1em;height:1em;margin-right:var(--ibiz-composite-form-item-ex-menu-icon-gap);font-size:var(--ibiz-composite-form-item-ex-menu-text-icon-size)}.ibiz-composite-form-item-ex-menu__text-icon .ibiz-icon{display:flex;align-items:center;justify-content:center}.ibiz-composite-form-item-ex-menu__text-icon .ibiz-icon svg{width:1em;height:1em;fill:currentcolor}.ibiz-composite-form-item-ex-menu__text{flex:1 1 0;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-composite-form-item-ex-menu__icon{display:flex;flex:0 0 auto;align-items:center;justify-content:center;margin-left:var(--ibiz-composite-form-item-ex-menu-icon-gap)}.ibiz-composite-form-item-ex-menu__icon svg{width:1em;height:1em}.ibiz-form-item-container__editor>.el-loading-parent--relative{min-height:var(--ibiz-composite-form-item-ex-loading-min-height)}.ibiz-composite-form-item-ex-menu-popover{--ibiz-composite-form-item-ex-menu-top:0;--ibiz-composite-form-item-ex-menu-right:0;--ibiz-composite-form-item-ex-menu-text-color:var(--ibiz-color-text-2);--ibiz-composite-form-item-ex-menu-font-size:var(--ibiz-font-size-regular);--ibiz-composite-form-item-ex-menu-width:120px;--ibiz-composite-form-item-ex-menu-height:var(--ibiz-height-control-default);--ibiz-composite-form-item-ex-menu-icon-gap:var(--ibiz-spacing-extra-tight);--ibiz-composite-form-item-ex-menu-z-index:9;--ibiz-composite-form-item-ex-menu-padding:0 var(--ibiz-spacing-base-tight);--ibiz-composite-form-item-ex-menu-item-padding:var(--ibiz-spacing-extra-tight);--ibiz-composite-form-item-ex-menu-item-hover-bg-color:var(--ibiz-color-fill-0);--ibiz-composite-form-item-ex-menu-bg-color:var(--ibiz-color-bg-3);--ibiz-composite-form-item-ex-menu-text-icon-size:var(--ibiz-font-size-header-6);--ibiz-composite-form-item-ex-menu-content-padding:var(--ibiz-spacing-base-tight);--ibiz-composite-form-item-ex-loading-min-height:calc(var(--el-loading-spinner-size) + var(--ibiz-spacing-tight))}.ibiz-composite-form-item-ex-menu-popover.el-popover.el-popper{width:var(--ibiz-composite-form-item-ex-menu-width)!important;min-width:var(--ibiz-composite-form-item-ex-menu-width);padding:var(--ibiz-composite-form-item-ex-menu-content-padding)}.ibiz-composite-form-item-ex-menu-content{font-size:var(--ibiz-composite-form-item-ex-menu-font-size);color:var(--ibiz-composite-form-item-ex-menu-text-color)}.ibiz-composite-form-item-ex-menu-item{display:flex;align-items:center;padding:var(--ibiz-composite-form-item-ex-menu-item-padding);overflow:hidden;text-overflow:ellipsis;white-space:nowrap;cursor:pointer}.ibiz-composite-form-item-ex-menu-item__icon{flex:0 0 auto;width:1em;height:1em;margin-right:var(--ibiz-composite-form-item-ex-menu-icon-gap);visibility:hidden;fill:currentcolor}.ibiz-composite-form-item-ex-menu-item__text-icon{display:flex;flex:0 0 auto;align-items:center;justify-content:center;width:1em;height:1em;margin-right:var(--ibiz-composite-form-item-ex-menu-icon-gap);font-size:var(--ibiz-composite-form-item-ex-menu-text-icon-size)}.ibiz-composite-form-item-ex-menu-item__text-icon .ibiz-icon{display:flex;align-items:center;justify-content:center}.ibiz-composite-form-item-ex-menu-item__text-icon .ibiz-icon svg{width:1em;height:1em;fill:currentcolor}.ibiz-composite-form-item-ex-menu-item__text{flex:1 1 0;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-composite-form-item-ex-menu-item.is-active .ibiz-composite-form-item-ex-menu-item__icon{visibility:visible}.ibiz-composite-form-item-ex-menu-item:hover{background-color:var(--ibiz-composite-form-item-ex-menu-item-hover-bg-color)}

package/es/control/form/form-detail/form-item/composite-form-item-ex/composite-form-item-ex.mjs

@@ -0,0 +1,175 @@
+import { defineComponent, createVNode, resolveComponent, h, withDirectives, resolveDirective, ref, watch } from 'vue';
+import { useNamespace } from '@ibiz-template/vue3-util';
+import './composite-form-item-ex.css';
+
+"use strict";
+const CompositeFormItemEx = /* @__PURE__ */ defineComponent({
+  name: "IBizCompositeFormItemEx",
+  props: {
+    modelData: {
+      type: Object,
+      required: true
+    },
+    controller: {
+      type: Object,
+      required: true
+    },
+    attrs: {
+      type: Object,
+      required: false
+    }
+  },
+  setup(props) {
+    const ns = useNamespace("form-item");
+    const ns2 = useNamespace("composite-form-item-ex");
+    const c = props.controller;
+    const onValueChange = (val, _name, ignore = false) => {
+      props.controller.setDataValue(val, c.name, ignore);
+    };
+    const loading = ref(true);
+    const editorRef = ref();
+    watch(() => {
+      var _a, _b;
+      return (_b = props.controller.data) == null ? void 0 : _b[((_a = c.valueItem) == null ? void 0 : _a.id) || ""];
+    }, (value) => {
+      if (value) {
+        c.updateEditor(value);
+      } else {
+        c.updateEditor(c.defaultType);
+      }
+    }, {
+      immediate: true
+    });
+    watch(() => editorRef.value, (value) => {
+      if (value) {
+        loading.value = false;
+      } else {
+        loading.value = true;
+      }
+    });
+    return {
+      ns,
+      ns2,
+      c,
+      editorRef,
+      loading,
+      onValueChange
+    };
+  },
+  render() {
+    var _a, _b, _c, _d, _e, _f, _g;
+    if (!this.c.state.visible || ((_a = this.c.model.editor) == null ? void 0 : _a.editorType) === "HIDDEN") {
+      return null;
+    }
+    const editorType = (_b = this.c.editor) == null ? void 0 : _b.model.editorType;
+    const editorStyle = ((_c = this.c.editor) == null ? void 0 : _c.model.editorStyle) || "DEFAULT";
+    const isIncludes = this.c.includesList.some((id) => id === "".concat(editorType, "_").concat(editorStyle));
+    const editorSwitchMenu = createVNode(resolveComponent("el-popover"), {
+      "trigger": "click",
+      "popper-class": this.ns2.b("menu-popover"),
+      "offset": 0,
+      "disabled": this.c.disableSwitch
+    }, {
+      reference: () => {
+        const option = this.c.switchOptions.find((item) => item.id === this.c.state.editorId);
+        return createVNode("div", {
+          "class": [this.ns2.b("menu"), this.ns2.is("disabled", this.c.disableSwitch)]
+        }, [createVNode("div", {
+          "class": this.ns2.be("menu", "text-icon")
+        }, [createVNode(resolveComponent("iBizIcon"), {
+          "icon": option == null ? void 0 : option.icon
+        }, null)]), createVNode("div", {
+          "class": this.ns2.be("menu", "text")
+        }, [(option == null ? void 0 : option.name) || this.c.state.editorId]), createVNode("div", {
+          "class": this.ns2.be("menu", "icon")
+        }, [createVNode("svg", {
+          "xmlns": "http://www.w3.org/2000/svg",
+          "viewBox": "0 0 1024 1024"
+        }, [createVNode("path", {
+          "fill": "currentColor",
+          "d": "M831.872 340.864 512 652.672 192.128 340.864a30.59 30.59 0 0 0-42.752 0 29.12 29.12 0 0 0 0 41.6L489.664 714.24a32 32 0 0 0 44.672 0l340.288-331.712a29.12 29.12 0 0 0 0-41.728 30.59 30.59 0 0 0-42.752 0z"
+        }, null)])])]);
+      },
+      default: () => {
+        return createVNode("div", {
+          "class": this.ns2.b("menu-content")
+        }, [this.c.switchOptions.map((option) => {
+          return createVNode("div", {
+            "class": [this.ns2.b("menu-item"), this.ns2.is("active", option.id === this.c.state.editorId)],
+            "onClick": () => {
+              this.c.handleEditorSwitch(option.id);
+            }
+          }, [createVNode("svg", {
+            "viewBox": "0 0 1446 1024",
+            "class": this.ns2.be("menu-item", "icon")
+          }, [createVNode("path", {
+            "d": "M574.116299 786.736392 1238.811249 48.517862C1272.390222 11.224635 1329.414799 7.827718 1366.75664 41.450462 1403.840015 74.840484 1406.731043 132.084741 1373.10189 169.433699L655.118888 966.834607C653.072421 969.716875 650.835807 972.514337 648.407938 975.210759 615.017957 1012.29409 558.292155 1015.652019 521.195664 982.250188L72.778218 578.493306C35.910826 545.297758 32.859041 488.584019 66.481825 451.242134 99.871807 414.158803 156.597563 410.800834 193.694055 444.202665L574.116299 786.736392Z"
+          }, null)]), createVNode("div", {
+            "class": this.ns2.be("menu-item", "text-icon")
+          }, [createVNode(resolveComponent("iBizIcon"), {
+            "icon": option.icon
+          }, null)]), createVNode("span", {
+            "class": this.ns2.be("menu-item", "text")
+          }, [option.name])]);
+        })]);
+      }
+    });
+    let editor = null;
+    const compositeItem = this.c.model.compositeItem;
+    const editMode = (_f = (_e = (_d = this.c.editor) == null ? void 0 : _d.model) == null ? void 0 : _e.editorParams) == null ? void 0 : _f.editMode;
+    const editorProps = {
+      ref: "editorRef",
+      key: this.c.state.editorId,
+      style: (_g = this.c.editor) == null ? void 0 : _g.style,
+      value: this.c.value,
+      data: this.c.data,
+      controller: this.c.editor,
+      disabled: this.c.state.disabled,
+      readonly: this.c.state.readonly,
+      onChange: this.onValueChange,
+      controlParams: editMode ? {
+        ...this.c.form.controlParams,
+        editmode: editMode
+      } : this.c.form.controlParams,
+      onFocus: (event) => this.c.onFocus(event),
+      onBlur: (event) => this.c.onBlur(event),
+      onEnter: (event) => this.c.onEnter(event),
+      onClick: (event, params) => this.c.onClick(event, params),
+      ...this.attrs
+    };
+    if (this.$slots.default) {
+      editor = this.$slots.default(editorProps);
+    } else if (this.c.editorProvider) {
+      const component = resolveComponent(this.c.editorProvider.formEditor);
+      if (isIncludes) {
+        editor = h(component, {
+          ...editorProps
+        }, {
+          editorSwitchMenu: () => editorSwitchMenu
+        });
+      } else {
+        editor = h(component, {
+          ...editorProps
+        });
+      }
+    } else {
+      editor = createVNode(resolveComponent("not-supported-editor"), {
+        "modelData": this.modelData.editor,
+        "context": this.c.context
+      }, null);
+    }
+    return createVNode(resolveComponent("iBizFormItemContainer"), {
+      "id": "".concat(this.c.form.view.model.codeName, "_").concat(this.c.form.model.codeName, "_").concat(this.modelData.codeName),
+      "class": [this.ns.b(), this.ns2.b(), this.ns.m(this.modelData.id), this.ns.is("compositeItem", compositeItem), ...this.c.containerClass],
+      "style": this.modelData.cssStyle,
+      "controller": this.c,
+      "onClick": (event) => this.c.onClick(event)
+    }, {
+      default: () => [withDirectives(createVNode("div", {
+        "class": this.ns2.e("editor")
+      }, [editor, !this.loading && !isIncludes && editorSwitchMenu]), [[resolveDirective("loading"), this.loading]])]
+    });
+  }
+});
+
+export { CompositeFormItemEx, CompositeFormItemEx as default };

package/es/control/form/form-detail/form-item/composite-form-item-ex/composite-form-item-ex.provider.mjs

@@ -0,0 +1,21 @@
+import { CompositeFormItemExController } from './composite-form-item-ex.controller.mjs';
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class CompositeFormItemExProvider {
+  constructor() {
+    __publicField(this, "component", "IBizCompositeFormItemEx");
+  }
+  async createController(detailModel, form, parent) {
+    const c = new CompositeFormItemExController(detailModel, form, parent);
+    await c.init();
+    return c;
+  }
+}
+
+export { CompositeFormItemExProvider };

package/es/control/form/form-detail/form-item/composite-form-item-ex/composite-form-item-ex.state.mjs

@@ -0,0 +1,28 @@
+import { FormItemState } from '@ibiz-template/runtime';
+
+"use strict";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+class CompositeFormItemExState extends FormItemState {
+  constructor() {
+    super(...arguments);
+    /**
+     * @description 当前选中的编辑器id
+     * @type {string}
+     * @memberof CompositeFormItemExState
+     */
+    __publicField(this, "editorId", "");
+    /**
+     * @description 当前选中的编辑器值项
+     * @type {string}
+     * @memberof CompositeFormItemExState
+     */
+    __publicField(this, "editorValueItem", "");
+  }
+}
+
+export { CompositeFormItemExState };

package/es/control/form/form-detail/form-item/composite-form-item-ex/index.mjs

@@ -0,0 +1,16 @@
+import { registerFormDetailProvider } from '@ibiz-template/runtime';
+import { CompositeFormItemExProvider } from './composite-form-item-ex.provider.mjs';
+import { CompositeFormItemEx } from './composite-form-item-ex.mjs';
+
+"use strict";
+var CompositeFormItemEX = {
+  install: (v) => {
+    v.component(CompositeFormItemEx.name, CompositeFormItemEx);
+    registerFormDetailProvider(
+      "FORM_USERCONTROL_COMPOSITE_FORM_ITEM_EX",
+      () => new CompositeFormItemExProvider()
+    );
+  }
+};
+
+export { CompositeFormItemEX as default };

package/es/control/form/form-detail/form-item/form-item-container/form-item-container.mjs

@@ -1,4 +1,4 @@
-import { ref, watch, onUnmounted, resolveComponent, createVNode, defineComponent } from 'vue';
+import { defineComponent, createVNode, ref, watch, onUnmounted, computed, resolveComponent } from 'vue';
 import { useNamespace, IBizIcon } from '@ibiz-template/vue3-util';
 import { showTitle } from '@ibiz-template/core';
 import './form-item-container.css';
@@ -26,6 +26,12 @@ const IBizFormItemContainer = /* @__PURE__ */ defineComponent({
         c.loadInputTip();
     });
     onUnmounted(() => c.clearTipsCache());
+    const showError = computed(() => {
+      const {
+        validateMode
+      } = c.form;
+      return validateMode === "default";
+    });
     const renderTipContent = () => {
       const {
         inputTip
@@ -48,7 +54,7 @@ const IBizFormItemContainer = /* @__PURE__ */ defineComponent({
           }, null);
       }
     };
-    const renderInputTip = () => {
+    const renderTipsIcon = () => {
       return createVNode(resolveComponent("el-tooltip"), {
         "effect": "light",
         "visible": visible.value,
@@ -58,16 +64,42 @@ const IBizFormItemContainer = /* @__PURE__ */ defineComponent({
         "placement": labelPos === "RIGHT" ? "right" : "left"
       }, {
         default: () => {
-          return createVNode("div", {
-            "class": [ns.em("label", "content"), ns.is("tooltip", enableInputTip)]
-          }, [enableInputTip && ibiz.config.form.showTipsIcon && createVNode("ion-icon", {
+          return createVNode("ion-icon", {
             "name": "bulb-outline",
             "class": ns.em("label", "icon")
-          }, null), sysImage && createVNode(IBizIcon, {
+          }, null);
+        },
+        content: () => {
+          return createVNode("div", {
+            "class": ns.em("popper", "content")
+          }, [createVNode("div", {
+            "class": ns.em("popper", "tooltip")
+          }, [renderTipContent()]), c.state.inputTipUrl && createVNode("a", {
+            "target": "_blank",
+            "href": c.state.inputTipUrl,
+            "title": ibiz.i18n.t("component.formItemContainer.more")
+          }, [ibiz.i18n.t("component.formItemContainer.more")])]);
+        }
+      });
+    };
+    const renderLabelWithoutTips = () => {
+      return createVNode(resolveComponent("el-tooltip"), {
+        "effect": "light",
+        "visible": visible.value,
+        "onUpdate:visible": ($event) => visible.value = $event,
+        "popper-class": [ns.e("popper"), ns.is(ibiz.config.tooltiprendermode.toLowerCase(), true)],
+        "disabled": !enableInputTip,
+        "placement": labelPos === "RIGHT" ? "right" : "left"
+      }, {
+        default: () => {
+          return createVNode("div", {
+            "class": [ns.em("label", "content"), ns.is("tooltip", enableInputTip)]
+          }, [sysImage && createVNode(IBizIcon, {
             "class": ns.em("label", "icon"),
             "icon": sysImage
           }, null), createVNode("div", {
-            "class": ns.em("label", "text")
+            "class": ns.em("label", "text"),
+            "title": enableInputTip ? void 0 : showTitle(c.labelCaption)
           }, [c.labelCaption])]);
         },
         content: () => {
@@ -84,13 +116,23 @@ const IBizFormItemContainer = /* @__PURE__ */ defineComponent({
       });
     };
     const renderLabel = () => {
+      const form = props.controller.form;
+      const showTipsIcon = enableInputTip && form.showTipsIcon;
       return createVNode("div", {
-        "title": enableInputTip ? void 0 : showTitle(c.labelCaption),
         "class": [ns.e("label"), ...c.labelClass || []]
-      }, [renderInputTip()]);
+      }, [showTipsIcon && createVNode("div", {
+        "class": [ns.em("label", "content"), ns.is("tooltip", enableInputTip)]
+      }, [renderTipsIcon(), sysImage && createVNode(IBizIcon, {
+        "class": ns.em("label", "icon"),
+        "icon": sysImage
+      }, null), createVNode("div", {
+        "class": ns.em("label", "text"),
+        "title": showTitle(c.labelCaption)
+      }, [c.labelCaption])]), !showTipsIcon && renderLabelWithoutTips()]);
     };
     return {
       ns,
+      showError,
       renderLabel
     };
   },
@@ -104,7 +146,7 @@ const IBizFormItemContainer = /* @__PURE__ */ defineComponent({
       "class": [this.ns.e("content"), this.ns.em("content", "label-".concat(labelPos == null ? void 0 : labelPos.toLowerCase()))]
     }, [createVNode("div", {
       "class": [this.ns.e("editor")]
-    }, [(_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a)]), this.controller.state.error ? createVNode("div", {
+    }, [(_b = (_a = this.$slots).default) == null ? void 0 : _b.call(_a)]), this.showError && this.controller.state.error ? createVNode("div", {
       "title": showTitle(this.controller.state.error),
       "class": [this.ns.e("error")]
     }, [this.controller.state.error]) : null]);

package/es/control/form/form-detail/form-item/form-item.css

@@ -1 +1 @@
-.ibiz-form-item{border-color:var(--ibiz-color-border);--ibiz-form-item-label-color:var(--ibiz-color-text-1);--ibiz-form-item-text-color:var(--ibiz-color-text-2);--ibiz-form-item-hover-color:var(--ibiz-color-text-0);--ibiz-form-item-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-form-item-readonly-color:var(--ibiz-color-disabled-text);--ibiz-form-item-border-color:transparent;--ibiz-form-item-font-size:var(--ibiz-font-size-regular);--ibiz-form-item-placeholder-color:var(--ibiz-color-text-3);--ibiz-form-item-disabled-color:var(--ibiz-color-disabled-text);--ibiz-form-item-disabled-bg-color:var(--ibiz-color-disabled-fill);--ibiz-form-item-disabled-border-color:var(--ibiz-color-disabled-border);--ibiz-form-item-active-bg:var(--ibiz-color-fill-2);--ibiz-form-item-active-border:var(--ibiz-active-bg);--ibiz-form-item-focus-bg:var(--ibiz-color-fill-0);--ibiz-form-item-focus-border:var(--ibiz-color-focus-border);--ibiz-form-item-line-height:var(--ibiz-editor-default-line-height);--ibiz-form-item-font-weight:var(--ibiz-font-weight-regular);--ibiz-form-item-hover-edit-padding:var(--ibiz-spacing-none) 11px}.ibiz-form-item.is-compositeItem{--ibiz-form-item-compositeItem-gap:var(--ibiz-spacing-tight)}.ibiz-form-item.is-compositeItem .ibiz-form-item-container__editor{display:flex;gap:var(--ibiz-form-item-compositeItem-gap)}
+.ibiz-form-item{border-color:var(--ibiz-color-border);--ibiz-form-item-label-color:var(--ibiz-color-text-1);--ibiz-form-item-text-color:var(--ibiz-color-text-2);--ibiz-form-item-hover-color:var(--ibiz-color-text-0);--ibiz-form-item-hover-bg-color:var(--ibiz-color-fill-1);--ibiz-form-item-readonly-color:var(--ibiz-color-disabled-text);--ibiz-form-item-border-color:transparent;--ibiz-form-item-font-size:var(--ibiz-font-size-regular);--ibiz-form-item-placeholder-color:var(--ibiz-color-text-3);--ibiz-form-item-disabled-color:var(--ibiz-color-disabled-text);--ibiz-form-item-disabled-bg-color:var(--ibiz-color-disabled-fill);--ibiz-form-item-disabled-border-color:var(--ibiz-color-disabled-border);--ibiz-form-item-active-bg:var(--ibiz-color-fill-2);--ibiz-form-item-active-border:var(--ibiz-active-bg);--ibiz-form-item-focus-bg:var(--ibiz-color-fill-0);--ibiz-form-item-focus-border:var(--ibiz-color-focus-border);--ibiz-form-item-line-height:var(--ibiz-editor-default-line-height);--ibiz-form-item-font-weight:var(--ibiz-font-weight-regular);--ibiz-form-item-hover-edit-padding:var(--ibiz-spacing-none) 11px}.ibiz-form-item.is-compositeItem{--ibiz-form-item-compositeItem-gap:var(--ibiz-spacing-tight)}.ibiz-form-item.is-compositeItem .ibiz-form-item__composite-separator{line-height:var(--ibiz-form-item-container-line-height)}.ibiz-form-item.is-compositeItem .ibiz-form-item-container__editor{display:flex;gap:var(--ibiz-form-item-compositeItem-gap)}

package/es/control/form/form-detail/form-item/form-item.mjs

@@ -1,4 +1,4 @@
-import { isVNode, ref, createVNode, resolveComponent, h, defineComponent } from 'vue';
+import { isVNode, defineComponent, createVNode, createTextVNode, resolveComponent, h } from 'vue';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import { CompositeFormItem } from './composite-form-item/composite-form-item.mjs';
 import './form-item.css';
@@ -24,32 +24,14 @@ const FormItem = /* @__PURE__ */ defineComponent({
     }
   },
   setup(props) {
-    var _a, _b, _c, _d;
     const ns = useNamespace("form-item");
     const c = props.controller;
     const onValueChange = (val, name, ignore = false) => {
       props.controller.setDataValue(val, name, ignore);
     };
-    const extraParams = ref({});
-    let emptyHiddenUnit = ibiz.config.form.emptyHiddenUnit;
-    const emptyhiddenunit = (_b = (_a = props.controller.form) == null ? void 0 : _a.controlParams) == null ? void 0 : _b.emptyhiddenunit;
-    if (emptyhiddenunit) {
-      emptyHiddenUnit = Object.is(emptyhiddenunit, "true");
-    }
-    const editorParams = ((_d = (_c = props.controller.editor) == null ? void 0 : _c.model) == null ? void 0 : _d.editorParams) || {};
-    const {
-      EMPTYHIDDENUNIT
-    } = editorParams;
-    if (EMPTYHIDDENUNIT) {
-      emptyHiddenUnit = Object.is(EMPTYHIDDENUNIT, "true");
-    }
-    Object.assign(extraParams.value, {
-      emptyHiddenUnit
-    });
     return {
       ns,
       c,
-      extraParams,
       onValueChange
     };
   },
@@ -64,13 +46,19 @@ const FormItem = /* @__PURE__ */ defineComponent({
       const {
         editorItems = []
       } = this.c.model.editor || {};
-      editor = editorItems.map((item) => {
+      editor = editorItems.map((item, index) => {
         const controller = this.c.form.details[item.id];
-        return createVNode(CompositeFormItem, {
-          "modelData": controller.model,
-          "controller": controller,
-          "attrs": this.attrs
-        }, null);
+        return [
+          createVNode(CompositeFormItem, {
+            "modelData": controller.model,
+            "controller": controller,
+            "attrs": this.attrs
+          }, null),
+          // feat：复合表单项样式2会在编辑器之间加`-`分隔符
+          editorItems.length - 1 > index && this.c.model.detailStyle === "STYLE2" && createVNode("span", {
+            "class": this.ns.e("composite-separator")
+          }, [createTextVNode("-")])
+        ];
       });
     } else {
       const editMode = (_d = (_c = (_b = this.c.editor) == null ? void 0 : _b.model) == null ? void 0 : _c.editorParams) == null ? void 0 : _d.editMode;
@@ -82,7 +70,6 @@ const FormItem = /* @__PURE__ */ defineComponent({
         disabled: this.c.state.disabled,
         readonly: this.c.state.readonly,
         onChange: this.onValueChange,
-        extraParams: this.extraParams,
         controlParams: editMode ? {
           ...this.c.form.controlParams,
           editmode: editMode

package/es/control/form/form-detail/form-item/index.mjs

@@ -3,12 +3,14 @@ import { withInstall } from '@ibiz-template/vue3-util';
 import { FormItem } from './form-item.mjs';
 import { IBizFormItemContainer } from './form-item-container/form-item-container.mjs';
 import { FormItemProvider } from './form-item.provider.mjs';
+import CompositeFormItemEX from './composite-form-item-ex/index.mjs';
 
 "use strict";
 const IBizFormItem = withInstall(FormItem, function(v) {
   v.component(FormItem.name, FormItem);
   v.component(IBizFormItemContainer.name, IBizFormItemContainer);
   registerFormDetailProvider("FORMITEM", () => new FormItemProvider());
+  v.use(CompositeFormItemEX);
 });
 
 export { IBizFormItem, IBizFormItemContainer, IBizFormItem as default };

package/es/control/form/form-detail/form-mdctrl/form-mdctrl-form/form-mdctrl-form.mjs

@@ -1,4 +1,4 @@
-import { isVNode, computed, resolveComponent, createVNode, h, defineComponent } from 'vue';
+import { isVNode, defineComponent, createVNode, resolveComponent, h, computed } from 'vue';
 import { FormMDCtrlFormController } from '@ibiz-template/runtime';
 import { useNamespace } from '@ibiz-template/vue3-util';
 import './form-mdctrl-form.css';
@@ -79,7 +79,8 @@ const FormMDCtrlForm = /* @__PURE__ */ defineComponent({
       "onRemoveClick": (item) => this.controller.remove(item.id)
     }, {
       item: ({
-        data
+        data,
+        index
       }) => {
         if (!formProvider) {
           return createVNode("div", null, [ibiz.i18n.t("control.form.formMDctrlForm.noFindProvider")]);
@@ -88,6 +89,7 @@ const FormMDCtrlForm = /* @__PURE__ */ defineComponent({
           class: this.ns.be("item", "form"),
           key: data.id,
           modelData: model.contentControl,
+          mdCtrlFormIndex: index,
           context: data.context,
           params: data.params,
           onCreated: (event) => {