@ibiz-template/vue3-components 0.7.41-alpha.2 → 0.7.41-alpha.21

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

@@ -41,28 +41,152 @@ const FlowDrtab = /* @__PURE__ */ vue.defineComponent({
       type: Object,
       default: () => {
       }
+    },
+    controller: {
+      type: Object,
+      default: () => {
+      }
     }
   },
   setup(props) {
     const ns = vue3Util.useNamespace("flow-drtab");
     const uuid = qxUtil.createUUID();
+    const c = props.controller;
     const navtag = vue.ref("");
     const viewList = vue.ref([]);
+    const navbarpos = vue.ref();
+    const navBarWidth = vue.ref(200);
+    const visibleViews = [];
+    const scrollTop = vue.ref(0);
+    const navbarRef = vue.ref();
+    const completedViews = vue.ref(0);
+    const tempTimer = vue.ref();
+    const tempTarget = vue.ref();
+    navbarpos.value = c.navbarpos;
+    navBarWidth.value = c.navbarwidth;
+    const allVisibleViews = vue.computed(() => {
+      return props.pagesstate.filter((item) => {
+        const target = props.drtabpages.find((page) => {
+          return page.id === item.tag;
+        });
+        return target && !item.hidden;
+      }).length;
+    });
+    const allNavTags = vue.computed(() => {
+      if (props.pagesstate) {
+        return props.pagesstate.map((item) => {
+          const target = props.drtabpages.find((page) => {
+            return page.id === item.tag;
+          });
+          return "".concat(target == null ? void 0 : target.appViewId, "_").concat(item.tag);
+        });
+      }
+      return [];
+    });
     const scrollToTarget = () => {
       if (navtag.value) {
-        const el = document.getElementById("".concat(uuid, "_").concat(navtag.value));
+        const el = document.getElementById("".concat(navtag.value));
         if (el) {
           el.scrollIntoView();
         }
       }
     };
-    const onViewMounted = () => {
-      scrollToTarget();
+    const isFullyVisible = (element, container) => {
+      const containerRect = container.getBoundingClientRect();
+      const elementRect = element.getBoundingClientRect();
+      return (
+        // 元素顶部不超出容器顶部
+        elementRect.top >= containerRect.top && // 元素底部不超出容器底部
+        elementRect.bottom <= containerRect.bottom && // 元素左侧不超出容器左侧
+        elementRect.left >= containerRect.left && // 元素右侧不超出容器右侧
+        elementRect.right <= containerRect.right
+      );
+    };
+    const scrollToTargetNavItem = () => {
+      const anchor = document.getElementById("navbar_".concat(navtag.value));
+      if (anchor && navbarRef.value && !isFullyVisible(anchor, navbarRef.value)) {
+        anchor.scrollIntoView({
+          behavior: "smooth"
+        });
+      }
+    };
+    const computeSelectItem = () => {
+      if (visibleViews.length > 0) {
+        navtag.value = visibleViews[0];
+      }
+      if (tempTarget.value) {
+        clearTimeout(tempTimer.value);
+        tempTimer.value = setTimeout(() => {
+          navtag.value = tempTarget.value;
+          scrollToTargetNavItem();
+          tempTarget.value = "";
+        }, 200);
+      } else {
+        scrollToTargetNavItem();
+      }
+    };
+    const observer = new IntersectionObserver((entries) => {
+      entries.forEach((entry) => {
+        var _a, _b;
+        if (entry.isIntersecting) {
+          if (entry.target && entry.target.id) {
+            if (visibleViews.length > 0) {
+              const curIndex = (_a = allNavTags.value) == null ? void 0 : _a.findIndex((tag) => tag === entry.target.id);
+              const index = (_b = allNavTags.value) == null ? void 0 : _b.findIndex((tag) => tag === visibleViews[0]);
+              if (curIndex < index) {
+                visibleViews.unshift(entry.target.id);
+              } else {
+                visibleViews.push(entry.target.id);
+              }
+            } else {
+              visibleViews.push(entry.target.id);
+            }
+          }
+        } else if (entry.target && entry.target.id) {
+          const index = visibleViews.indexOf(entry.target.id);
+          if (index >= 0) {
+            visibleViews.splice(index, 1);
+          }
+        }
+      });
+      visibleViews.sort((a, b) => {
+        var _a, _b;
+        const aIndex = (_a = allNavTags.value) == null ? void 0 : _a.findIndex((tag) => tag === a);
+        const bIndex = (_b = allNavTags.value) == null ? void 0 : _b.findIndex((tag) => tag === b);
+        return aIndex - bIndex;
+      });
+      if (allVisibleViews.value !== completedViews.value || !c.enableAnchor) {
+        return;
+      }
+      computeSelectItem();
+    });
+    const onViewMounted = (item) => {
+      const target = props.drtabpages.find((page) => {
+        return page.id === item.tag;
+      });
+      completedViews.value += 1;
+      if (completedViews.value === allVisibleViews.value && !navtag.value) {
+        navtag.value = "".concat(target == null ? void 0 : target.appViewId, "_").concat(props.pagesstate[0].tag);
+      }
+      const el = document.getElementById("".concat(target == null ? void 0 : target.appViewId, "_").concat(item.tag));
+      if (el) {
+        observer.observe(el);
+      }
+      if (completedViews.value === allVisibleViews.value && props.activeTab && props.activeTab.tag !== props.drtabpages[0].id) {
+        vue.nextTick(() => {
+          scrollToTarget();
+        });
+      }
     };
     vue.watch(() => props.activeTab, (newVal, oldVal) => {
       if (newVal && newVal.tag !== (oldVal == null ? void 0 : oldVal.tag)) {
-        navtag.value = newVal.tag;
-        scrollToTarget();
+        const target = props.drtabpages.find((page) => {
+          return page.id === newVal.tag;
+        });
+        navtag.value = "".concat(target == null ? void 0 : target.appViewId, "_").concat(newVal.tag);
+        if (newVal.tag !== props.drtabpages[0].id) {
+          scrollToTarget();
+        }
       }
     }, {
       deep: true,
@@ -85,6 +209,14 @@ const FlowDrtab = /* @__PURE__ */ vue.defineComponent({
       deep: true,
       immediate: true
     });
+    vue.onActivated(() => {
+      vue.nextTick(() => {
+        const el = document.getElementById("".concat(uuid));
+        if (el) {
+          el.scrollTop = scrollTop.value;
+        }
+      });
+    });
     const calcStyle = (tag) => {
       const target = viewList.value.find((item) => {
         return item.id === tag;
@@ -96,14 +228,68 @@ const FlowDrtab = /* @__PURE__ */ vue.defineComponent({
         };
       }
     };
+    const onClickBar = (item) => {
+      const target = props.drtabpages.find((page) => {
+        return page.id === item.tag;
+      });
+      tempTarget.value = "".concat(target == null ? void 0 : target.appViewId, "_").concat(item.tag);
+      const el = document.getElementById("".concat(target == null ? void 0 : target.appViewId, "_").concat(item.tag));
+      if (el) {
+        el.scrollIntoView({
+          behavior: "smooth"
+        });
+        if (visibleViews.includes(tempTarget.value)) {
+          navtag.value = tempTarget.value;
+        }
+      }
+    };
+    const renderAnchorBar = () => {
+      if (c.enableAnchor) {
+        return vue.createVNode("div", {
+          "class": [ns.e("anchor-bar"), ns.is(navbarpos.value, true)],
+          "style": {
+            width: "".concat(navBarWidth.value, "px")
+          }
+        }, [vue.createVNode("div", {
+          "class": [ns.e("anchor-items"), ns.is(navbarpos.value)],
+          "ref": (el) => {
+            navbarRef.value = el;
+          }
+        }, [props.pagesstate.map((item) => {
+          const target = props.drtabpages.find((page) => {
+            return page.id === item.tag;
+          });
+          if (!target || item.hidden) {
+            return null;
+          }
+          return vue.createVNode("div", {
+            "class": [ns.e("anchor-item"), ns.is("active", "".concat(target == null ? void 0 : target.appViewId, "_").concat(item.tag) === navtag.value)],
+            "id": "navbar_".concat(target.appViewId, "_").concat(item.tag),
+            "onClick": () => onClickBar(item)
+          }, [item.caption]);
+        })])]);
+      }
+    };
+    const handleScroll = () => {
+      const el = document.getElementById("".concat(uuid));
+      if (el) {
+        scrollTop.value = el.scrollTop;
+      }
+    };
     return {
+      c,
       ns,
       uuid,
+      navbarpos,
       onViewMounted,
-      calcStyle
+      navBarWidth,
+      calcStyle,
+      renderAnchorBar,
+      handleScroll
     };
   },
   render() {
+    var _a, _b;
     const tabs = this.pagesstate.map((item) => {
       const counterNum = item.counterId ? this.counterData[item.counterId] : void 0;
       const viewShell = vue.resolveComponent("IBizViewShell");
@@ -114,7 +300,7 @@ const FlowDrtab = /* @__PURE__ */ vue.defineComponent({
         return null;
       }
       return vue.createVNode("div", {
-        "id": "".concat(this.uuid, "_").concat(item.tag),
+        "id": "".concat(target.appViewId, "_").concat(item.tag),
         "class": this.ns.e("tab-item")
       }, [this.showHeader && vue.createVNode("div", {
         "class": this.ns.em("tab-item", "label")
@@ -134,12 +320,19 @@ const FlowDrtab = /* @__PURE__ */ vue.defineComponent({
         context: this.context,
         params: this.params,
         viewId: target.appViewId,
-        onMounted: this.onViewMounted
+        onMounted: () => this.onViewMounted(item)
       })])]);
     });
     return vue.createVNode("div", {
-      "class": this.ns.b()
-    }, [tabs]);
+      "class": [this.ns.b(), this.ns.m(this.navbarpos), this.ns.is("left", (_a = this.navbarpos) == null ? void 0 : _a.includes("left")), this.ns.is("right", (_b = this.navbarpos) == null ? void 0 : _b.includes("right")), this.ns.is("enable-anchor", this.c.enableAnchor)],
+      "onScroll": this.handleScroll,
+      "id": this.uuid
+    }, [this.renderAnchorBar(), vue.createVNode("div", {
+      "class": this.ns.e("container"),
+      "style": {
+        "--navbarwidth": "".concat(this.navBarWidth, "px")
+      }
+    }, [tabs])]);
   }
 });
 

package/lib/control/drtab/flow-drtab.css

@@ -1 +1 @@
-.ibiz-flow-drtab{display:flex;flex-direction:column;gap:var(--ibiz-spacing-base);background-color:var(--ibiz-color-bg-0)}.ibiz-flow-drtab__tab-item{margin-right:var(--ibiz-spacing-base);background-color:var(--ibiz-color-bg-1);border-radius:var(--ibiz-border-radius-medium)}.ibiz-flow-drtab__tab-item--label{padding:var(--ibiz-spacing-base);font-size:var(--ibiz-font-size-header-5);border-bottom:1px solid var(--ibiz-color-fill-1)}.ibiz-flow-drtab__tab-item--tab-view{padding:var(--ibiz-spacing-tight) 0}.ibiz-flow-drtab__counter{font-size:var(--ibiz-font-size-regular);text-align:center}
+.ibiz-flow-drtab{width:100%;height:100%;overflow:hidden;background-color:var(--ibiz-color-bg-0)}.ibiz-flow-drtab__container{height:100%;overflow:auto}.ibiz-flow-drtab__tab-item{background-color:var(--ibiz-color-bg-1);border-radius:var(--ibiz-border-radius-medium)}.ibiz-flow-drtab__tab-item--label{padding:var(--ibiz-spacing-base);font-size:var(--ibiz-font-size-header-5);border-bottom:1px solid var(--ibiz-color-fill-1)}.ibiz-flow-drtab__tab-item--tab-view{padding:var(--ibiz-spacing-tight) 0}.ibiz-flow-drtab__tab-item+.ibiz-flow-drtab__tab-item{margin-top:var(--ibiz-spacing-base)}.ibiz-flow-drtab__counter{font-size:var(--ibiz-font-size-regular);text-align:center}.ibiz-flow-drtab .ibiz-flow-drtab{background-color:inherit}.ibiz-flow-drtab.is-enable-anchor{display:flex;gap:var(--ibiz-spacing-base)}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__container{flex:1}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-bar{display:flex;min-width:200px;padding:var(--ibiz-spacing-base) 0;font-size:var(--ibiz-font-size-regular);background-color:var(--ibiz-color-bg-1);border-radius:var(--ibiz-border-radius-medium)}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-bar.is-topleft{align-items:start}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-bar.is-bottomleft{align-items:end}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-bar.is-topright{flex-direction:row-reverse;align-items:start}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-bar.is-bottomright{flex-direction:row-reverse;align-items:end}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-bar.is-middleleft{align-items:center}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-bar.is-middleright{flex-direction:row-reverse;align-items:center}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-items{width:100%;max-height:100%;overflow:auto}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-item{width:100%;height:32px;padding:0 var(--ibiz-spacing-base);overflow:hidden;line-height:32px;text-overflow:ellipsis;white-space:nowrap;cursor:pointer}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-item:hover{color:var(--ibiz-color-primary)}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-item.is-active{position:relative;color:var(--ibiz-color-primary)}.ibiz-flow-drtab.is-enable-anchor .ibiz-flow-drtab__anchor-item.is-active::before{position:absolute;top:0;left:0;width:4px;height:100%;content:"";background-color:var(--ibiz-color-primary);border-radius:2px}.ibiz-flow-drtab.is-enable-anchor.is-left{flex-direction:row;overflow:auto}.ibiz-flow-drtab.is-enable-anchor.is-left>.ibiz-flow-drtab__container{--navbarwidth:200px;flex:1 0;width:calc(100% - var(--navbarwidth) - 2 * var(--ibiz-spacing-base));overflow:unset}.ibiz-flow-drtab.is-enable-anchor.is-left .ibiz-flow-drtab__anchor-bar{position:sticky;top:0}.ibiz-flow-drtab.is-enable-anchor.is-left .ibiz-flow-drtab__anchor-items::-webkit-scrollbar{display:none}.ibiz-flow-drtab.is-enable-anchor.is-right{flex-direction:row-reverse;overflow:auto}.ibiz-flow-drtab.is-enable-anchor.is-right>.ibiz-flow-drtab__container{--navbarwidth:200px;flex:1 0;width:calc(100% - var(--navbarwidth) - 2 * var(--ibiz-spacing-base));overflow:unset}.ibiz-flow-drtab.is-enable-anchor.is-right .ibiz-flow-drtab__anchor-bar{position:sticky;top:0}.ibiz-flow-drtab.is-enable-anchor.is-right .ibiz-flow-drtab__anchor-items::-webkit-scrollbar{display:none}

package/lib/control/form/edit-form/edit-form.cjs

@@ -62,6 +62,20 @@ const EditFormControl = /* @__PURE__ */ vue.defineComponent({
     loadDefault: {
       type: Boolean,
       default: true
+    },
+    /**
+     * @description 简单模式下传入的数据索引
+     */
+    simpleDataIndex: {
+      type: Number,
+      required: false
+    },
+    /**
+     * @description 多数据部件表单模式下传入的表单索引
+     */
+    mdCtrlFormIndex: {
+      type: Number,
+      required: false
     }
   },
   setup(props) {
@@ -73,6 +87,9 @@ const EditFormControl = /* @__PURE__ */ vue.defineComponent({
     const anchorList = vue.ref([]);
     const anchorTargetRef = vue.ref();
     if (props.isSimple) {
+      if (props.simpleDataIndex || props.simpleDataIndex === 0) {
+        c.setSimpleDataIndex(props.simpleDataIndex);
+      }
       c.evt.on("onMounted", () => {
         c.setSimpleData(props.data || {});
       });
@@ -88,6 +105,9 @@ const EditFormControl = /* @__PURE__ */ vue.defineComponent({
         deep: true
       });
     }
+    if (props.mdCtrlFormIndex || props.mdCtrlFormIndex === 0) {
+      c.setMdCtrlFormIndex(props.mdCtrlFormIndex);
+    }
     c.evt.on("onCreated", () => {
       const keys = Object.keys(c.details);
       keys.forEach((key) => {

package/lib/control/form/form/form.cjs

@@ -25,6 +25,7 @@ const FormControl = /* @__PURE__ */ vue.defineComponent({
   }) {
     const ns = vue3Util.useNamespace("control-form");
     const c = props.controller;
+    vue3Util.useControlPopoverzIndex(c);
     const slotProps = {
       form: c
     };

package/lib/control/form/form/index.cjs

@@ -15,6 +15,7 @@ var index$6 = require('../form-detail/form-rawitem/index.cjs');
 var index$7 = require('../form-detail/form-tab-panel/index.cjs');
 var index$8 = require('../form-detail/form-tab-page/index.cjs');
 var index$9 = require('../form-detail/form-button-list/index.cjs');
+var index$a = require('../form-detail/form-iframe/index.cjs');
 
 "use strict";
 const IBizFormControl = vue3Util.withInstall(form.FormControl, function(v) {
@@ -29,6 +30,7 @@ const IBizFormControl = vue3Util.withInstall(form.FormControl, function(v) {
   v.use(index$7.IBizFormTabPanel);
   v.use(index$8.IBizFormTabPage);
   v.use(index$9.IBizFormButtonList);
+  v.use(index$a.IBizFormIFrame);
 });
 
 exports.IBizFormControl = IBizFormControl;

package/lib/control/form/form-detail/form-group-panel/form-group-panel.cjs

@@ -26,6 +26,7 @@ const FormGroupPanel = /* @__PURE__ */ vue.defineComponent({
   setup(props) {
     const ns = vue3Util.useNamespace("form-group");
     const c = props.controller;
+    const zIndex = props.controller.form.state.zIndex;
     const changeCollapse = () => {
       if (!c.disableClose) {
         c.state.collapse = !c.state.collapse;
@@ -49,6 +50,7 @@ const FormGroupPanel = /* @__PURE__ */ vue.defineComponent({
     });
     return {
       ns,
+      zIndex,
       captionText,
       changeCollapse,
       onActionClick
@@ -105,6 +107,7 @@ const FormGroupPanel = /* @__PURE__ */ vue.defineComponent({
       }, null), this.captionText])]), vue.createVNode("div", {
         "class": [this.ns.be("header", "right")]
       }, [this.modelData.uiactionGroup && vue.createVNode(vue.resolveComponent("iBizActionToolbar"), {
+        "zIndex": this.zIndex,
         "class": this.ns.e("toolbar"),
         "action-details": this.modelData.uiactionGroup.uiactionGroupDetails,
         "actions-state": state.actionGroupState,

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

@@ -0,0 +1,58 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var vue = require('vue');
+var vue3Util = require('@ibiz-template/vue3-util');
+var runtime = require('@ibiz-template/runtime');
+require('./form-iframe.css');
+
+"use strict";
+const FormIFrame = /* @__PURE__ */ vue.defineComponent({
+  name: "IBizFormIFrame",
+  props: {
+    modelData: {
+      type: Object,
+      required: true
+    },
+    controller: {
+      type: runtime.FormIFrameController,
+      required: true
+    }
+  },
+  setup(props) {
+    const c = props.controller;
+    const ns = vue3Util.useNamespace("form-iframe");
+    vue3Util.useController(c);
+    const loading = vue.ref(true);
+    const url = vue.computed(() => {
+      return c.calcIFrameUrl();
+    });
+    const onLoad = () => {
+      loading.value = false;
+    };
+    return {
+      ns,
+      url,
+      loading,
+      onLoad
+    };
+  },
+  render() {
+    if (!this.controller.state.visible || !this.url) {
+      return null;
+    }
+    return vue.withDirectives(vue.createVNode("div", {
+      "class": this.ns.b()
+    }, [vue.createVNode("iframe", {
+      "class": this.ns.e("iframe"),
+      "src": this.url,
+      "frameborder": "0",
+      "onLoad": () => this.onLoad(),
+      "onError": () => this.onLoad()
+    }, null)]), [[vue.resolveDirective("loading"), this.loading]]);
+  }
+});
+
+exports.FormIFrame = FormIFrame;
+exports.default = FormIFrame;

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

@@ -0,0 +1 @@
+.ibiz-form-iframe{width:100%;height:100%}.ibiz-form-iframe__iframe{width:100%;height:100%}

package/lib/control/form/form-detail/form-iframe/form-iframe.provider.cjs

@@ -0,0 +1,23 @@
+'use strict';
+
+var runtime = require('@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 FormIFrameProvider {
+  constructor() {
+    __publicField(this, "component", "IBizFormIFrame");
+  }
+  async createController(detailModel, form, parent) {
+    const c = new runtime.FormIFrameController(detailModel, form, parent);
+    await c.init();
+    return c;
+  }
+}
+
+exports.FormIFrameProvider = FormIFrameProvider;

package/lib/control/form/form-detail/form-iframe/index.cjs

@@ -0,0 +1,17 @@
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var vue3Util = require('@ibiz-template/vue3-util');
+var runtime = require('@ibiz-template/runtime');
+var formIframe = require('./form-iframe.cjs');
+var formIframe_provider = require('./form-iframe.provider.cjs');
+
+"use strict";
+const IBizFormIFrame = vue3Util.withInstall(formIframe.FormIFrame, function(v) {
+  v.component(formIframe.FormIFrame.name, formIframe.FormIFrame);
+  runtime.registerFormDetailProvider("IFRAME", () => new formIframe_provider.FormIFrameProvider());
+});
+
+exports.IBizFormIFrame = IBizFormIFrame;
+exports.default = IBizFormIFrame;

package/lib/control/form/form-detail/form-item/form-item-container/form-item-container.cjs

@@ -28,12 +28,34 @@ const IBizFormItemContainer = /* @__PURE__ */ vue.defineComponent({
         c.loadInputTip();
     });
     vue.onUnmounted(() => c.clearTipsCache());
+    const renderTipContent = () => {
+      const {
+        inputTip
+      } = c.state;
+      switch (ibiz.config.tooltiprendermode) {
+        case "none":
+          return vue.createVNode("span", {
+            "class": ns.m("text")
+          }, [inputTip]);
+        case "html":
+          return vue.createVNode("div", {
+            "class": ns.m("html"),
+            "innerHTML": inputTip
+          }, null);
+        case "md":
+        default:
+          return vue.createVNode(vue.resolveComponent("iBizMarkDown"), {
+            "value": inputTip,
+            "disabled": true
+          }, null);
+      }
+    };
     const renderInputTip = () => {
       return vue.createVNode(vue.resolveComponent("el-tooltip"), {
         "effect": "light",
         "visible": visible.value,
         "onUpdate:visible": ($event) => visible.value = $event,
-        "popper-class": ns.e("popper"),
+        "popper-class": [ns.e("popper"), ns.is(ibiz.config.tooltiprendermode.toLowerCase(), true)],
         "disabled": !enableInputTip,
         "placement": labelPos === "RIGHT" ? "right" : "left"
       }, {
@@ -54,9 +76,8 @@ const IBizFormItemContainer = /* @__PURE__ */ vue.defineComponent({
           return vue.createVNode("div", {
             "class": ns.em("popper", "content")
           }, [vue.createVNode("div", {
-            "class": ns.em("popper", "tooltip"),
-            "innerHTML": c.state.inputTip
-          }, null), c.state.inputTipUrl && vue.createVNode("a", {
+            "class": ns.em("popper", "tooltip")
+          }, [renderTipContent()]), c.state.inputTipUrl && vue.createVNode("a", {
             "target": "_blank",
             "href": c.state.inputTipUrl,
             "title": ibiz.i18n.t("component.formItemContainer.more")

package/lib/control/form/form-detail/form-item/form-item-container/form-item-container.css

@@ -1 +1 @@
-.ibiz-form-item-container{--ibiz-form-item-container-label-width:130px;--ibiz-form-item-container-line-height:var(--ibiz-height-control-default);--ibiz-form-item-container-require-mark-color:var(--ibiz-color-danger);--ibiz-form-item-container-label-left-padding:0 var(--ibiz-spacing-base-tight) 0 0;--ibiz-form-item-container-label-right-padding:0 0 0 var(--ibiz-spacing-base-tight);--ibiz-form-item-container-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-tight) var(--ibiz-spacing-extra-tight);--ibiz-form-item-container-font-size:var(--ibiz-font-size-regular);--ibiz-form-item-container-label-color:var(--ibiz-color-text-1);--ibiz-form-item-container-error-font-size:var(--ibiz-font-size-small);--ibiz-form-item-container-error-color:var(--ibiz-color-danger);width:100%;height:100%;padding:var(--ibiz-form-item-container-padding)}.ibiz-form-item-container__label{flex-shrink:0;font-size:var(--ibiz-form-item-container-font-size);color:var(--ibiz-form-item-container-label-color)}.ibiz-form-item-container__label--content{display:flex;align-items:center;max-width:100%}.ibiz-form-item-container__label--content.is-tooltip{cursor:pointer}.ibiz-form-item-container__label--icon{padding-right:var(--ibiz-spacing-extra-tight)}.ibiz-form-item-container__label--text{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-form-item-container__popper.el-popper{padding:var(--ibiz-spacing-extra-tight);border:1px solid var(--ibiz-color-border);border-radius:0;box-shadow:var(--ibiz-shadow-elevated)}.ibiz-form-item-container__popper.el-popper table{border-spacing:0;border-collapse:collapse}.ibiz-form-item-container__popper.el-popper table tr td,.ibiz-form-item-container__popper.el-popper table tr th{padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-tight);border:1px solid var(--ibiz-color-border)}.ibiz-form-item-container__popper.el-popper .el-popper__arrow{display:block}.ibiz-form-item-container__popper--content{max-width:500px;padding:var(--ibiz-spacing-extra-tight)}.ibiz-form-item-container__popper--content a{color:var(--ibiz-color-link)}.ibiz-form-item-container__popper--tooltip{min-width:50px;min-height:20px}.ibiz-form-item-container--left,.ibiz-form-item-container--right{display:flex;min-height:var(--ibiz-form-item-container-line-height)}.ibiz-form-item-container--left .ibiz-form-item-container__label,.ibiz-form-item-container--right .ibiz-form-item-container__label{width:var(--ibiz-form-item-container-label-width)}.ibiz-form-item-container--left .ibiz-form-item-container__content,.ibiz-form-item-container--right .ibiz-form-item-container__content{width:calc(100% - var(--ibiz-form-item-container-label-width))}.ibiz-form-item-container--bottom,.ibiz-form-item-container--top{display:flex;flex-flow:column nowrap}.ibiz-form-item-container--top .ibiz-form-item-container__label{margin-bottom:var(--ibiz-spacing-extra-tight)}.ibiz-form-item-container--bottom .ibiz-form-item-container__label{margin-top:var(--ibiz-spacing-extra-tight)}.ibiz-form-item-container--left .ibiz-form-item-container__label{padding:var(--ibiz-form-item-container-label-left-padding);line-height:var(--ibiz-form-item-container-line-height)}.ibiz-form-item-container--left .ibiz-form-item-container__label--content{float:right}.ibiz-form-item-container--right .ibiz-form-item-container__label{padding:var(--ibiz-form-item-container-label-right-padding);line-height:var(--ibiz-form-item-container-line-height)}.ibiz-form-item-container--right .ibiz-form-item-container__label--content{float:left}.ibiz-form-item-container.is-required .ibiz-form-item-container__label--content::before{display:inline-block;margin-right:4px;font-family:SimSun;line-height:1;color:var(--ibiz-form-item-container-require-mark-color);content:"*"}.ibiz-form-item-container__content{display:flex;flex-flow:column nowrap;position:relative;flex-grow:1}.ibiz-form-item-container__content--label-left,.ibiz-form-item-container__content--label-none,.ibiz-form-item-container__content--label-right{height:100%}.ibiz-form-item-container__editor{position:relative;flex-grow:1;height:100%}.ibiz-form-item-container__error{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;position:absolute;top:100%;width:100%;font-size:var(--ibiz-form-item-container-error-font-size);line-height:calc(var(--ibiz-form-item-container-error-font-size) + 2px);color:var(--ibiz-form-item-container-error-color);word-wrap:break-word}.ibiz-form-item-container.is-error .ibiz-form-item-container__editor .el-input__wrapper{box-shadow:0 0 0 1px var(--ibiz-form-item-container-error-color) inset}
+.ibiz-form-item-container{--ibiz-form-item-container-label-width:130px;--ibiz-form-item-container-line-height:var(--ibiz-height-control-default);--ibiz-form-item-container-require-mark-color:var(--ibiz-color-danger);--ibiz-form-item-container-label-left-padding:0 var(--ibiz-spacing-base-tight) 0 0;--ibiz-form-item-container-label-right-padding:0 0 0 var(--ibiz-spacing-base-tight);--ibiz-form-item-container-padding:var(--ibiz-spacing-tight) var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-tight) var(--ibiz-spacing-extra-tight);--ibiz-form-item-container-font-size:var(--ibiz-font-size-regular);--ibiz-form-item-container-label-color:var(--ibiz-color-text-1);--ibiz-form-item-container-error-font-size:var(--ibiz-font-size-small);--ibiz-form-item-container-error-color:var(--ibiz-color-danger);width:100%;height:100%;padding:var(--ibiz-form-item-container-padding)}.ibiz-form-item-container__label{flex-shrink:0;font-size:var(--ibiz-form-item-container-font-size);color:var(--ibiz-form-item-container-label-color)}.ibiz-form-item-container__label--content{display:flex;align-items:center;max-width:100%}.ibiz-form-item-container__label--content.is-tooltip{cursor:pointer}.ibiz-form-item-container__label--icon{padding-right:var(--ibiz-spacing-extra-tight)}.ibiz-form-item-container__label--text{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.ibiz-form-item-container__popper.el-popper{padding:var(--ibiz-spacing-extra-tight);border:1px solid var(--ibiz-color-border);border-radius:0;box-shadow:var(--ibiz-shadow-elevated)}.ibiz-form-item-container__popper.el-popper table{border-spacing:0;border-collapse:collapse}.ibiz-form-item-container__popper.el-popper table tr td,.ibiz-form-item-container__popper.el-popper table tr th{padding:var(--ibiz-spacing-extra-tight) var(--ibiz-spacing-tight);border:1px solid var(--ibiz-color-border)}.ibiz-form-item-container__popper.el-popper .el-popper__arrow{display:block}.ibiz-form-item-container__popper--content{max-width:500px;padding:var(--ibiz-spacing-extra-tight)}.ibiz-form-item-container__popper--content a{color:var(--ibiz-color-link)}.ibiz-form-item-container__popper--tooltip{min-width:50px;min-height:20px}.ibiz-form-item-container__popper.is-md.el-popper.el-popper{padding:0}.ibiz-form-item-container__popper.is-md.el-popper.el-popper .ibiz-form-item-container__popper--content{padding:0}.ibiz-form-item-container__popper.is-md .ibiz-markdown{max-height:100vh;padding:0 calc(var(--ibiz-spacing-extra-tight) + var(--ibiz-spacing-extra-tight));overflow:auto}.ibiz-form-item-container__popper.is-md .ibiz-form-item-container__popper--tooltip{padding:calc(var(--ibiz-spacing-extra-tight) + var(--ibiz-spacing-extra-tight)) 0}.ibiz-form-item-container__popper.is-md .ibiz-markdown-cherry{width:auto!important}.ibiz-form-item-container__popper.is-md .cherry-previewer p:only-child{margin:0}.ibiz-form-item-container__popper.is-md .cherry-previewer>p:first-child{margin-top:0}.ibiz-form-item-container__popper.is-md .cherry-sidebar,.ibiz-form-item-container__popper.is-md .cherry-toolbar,.ibiz-form-item-container__popper.is-md .cherry-toolbar-button{display:none}.ibiz-form-item-container__popper.is-md .cherry{font-size:inherit;line-height:inherit}.ibiz-form-item-container__popper.is-md .cherry,.ibiz-form-item-container__popper.is-md .cherry .cherry-previewer{padding:0;background-color:transparent;border:none!important;box-shadow:none}.ibiz-form-item-container--left,.ibiz-form-item-container--right{display:flex;min-height:var(--ibiz-form-item-container-line-height)}.ibiz-form-item-container--left .ibiz-form-item-container__label,.ibiz-form-item-container--right .ibiz-form-item-container__label{width:var(--ibiz-form-item-container-label-width)}.ibiz-form-item-container--left .ibiz-form-item-container__content,.ibiz-form-item-container--right .ibiz-form-item-container__content{width:calc(100% - var(--ibiz-form-item-container-label-width))}.ibiz-form-item-container--bottom,.ibiz-form-item-container--top{display:flex;flex-flow:column nowrap}.ibiz-form-item-container--top .ibiz-form-item-container__label{margin-bottom:var(--ibiz-spacing-extra-tight)}.ibiz-form-item-container--bottom .ibiz-form-item-container__label{margin-top:var(--ibiz-spacing-extra-tight)}.ibiz-form-item-container--left .ibiz-form-item-container__label{padding:var(--ibiz-form-item-container-label-left-padding);line-height:var(--ibiz-form-item-container-line-height)}.ibiz-form-item-container--left .ibiz-form-item-container__label--content{float:right}.ibiz-form-item-container--right .ibiz-form-item-container__label{padding:var(--ibiz-form-item-container-label-right-padding);line-height:var(--ibiz-form-item-container-line-height)}.ibiz-form-item-container--right .ibiz-form-item-container__label--content{float:left}.ibiz-form-item-container.is-required .ibiz-form-item-container__label--content::before{display:inline-block;margin-right:4px;font-family:SimSun;line-height:1;color:var(--ibiz-form-item-container-require-mark-color);content:"*"}.ibiz-form-item-container__content{display:flex;flex-flow:column nowrap;position:relative;flex-grow:1}.ibiz-form-item-container__content--label-left,.ibiz-form-item-container__content--label-none,.ibiz-form-item-container__content--label-right{height:100%}.ibiz-form-item-container__editor{position:relative;flex-grow:1;height:100%}.ibiz-form-item-container__error{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;position:absolute;top:100%;width:100%;font-size:var(--ibiz-form-item-container-error-font-size);line-height:calc(var(--ibiz-form-item-container-error-font-size) + 2px);color:var(--ibiz-form-item-container-error-color);word-wrap:break-word}.ibiz-form-item-container.is-error .ibiz-form-item-container__editor .el-input__wrapper{box-shadow:0 0 0 1px var(--ibiz-form-item-container-error-color) inset}

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

@@ -68,13 +68,19 @@ const FormItem = /* @__PURE__ */ vue.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 vue.createVNode(compositeFormItem.CompositeFormItem, {
-          "modelData": controller.model,
-          "controller": controller,
-          "attrs": this.attrs
-        }, null);
+        return [
+          vue.createVNode(compositeFormItem.CompositeFormItem, {
+            "modelData": controller.model,
+            "controller": controller,
+            "attrs": this.attrs
+          }, null),
+          // feat：复合表单项样式2会在编辑器之间加`-`分隔符
+          editorItems.length - 1 > index && this.c.model.detailStyle === "STYLE2" && vue.createVNode("span", {
+            "class": this.ns.e("composite-separator")
+          }, [vue.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;

package/lib/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/lib/control/form/form-detail/form-mdctrl/form-mdctrl-form/form-mdctrl-form.cjs

@@ -81,7 +81,8 @@ const FormMDCtrlForm = /* @__PURE__ */ vue.defineComponent({
       "onRemoveClick": (item) => this.controller.remove(item.id)
     }, {
       item: ({
-        data
+        data,
+        index
       }) => {
         if (!formProvider) {
           return vue.createVNode("div", null, [ibiz.i18n.t("control.form.formMDctrlForm.noFindProvider")]);
@@ -90,6 +91,7 @@ const FormMDCtrlForm = /* @__PURE__ */ vue.defineComponent({
           class: this.ns.be("item", "form"),
           key: data.id,
           modelData: model.contentControl,
+          mdCtrlFormIndex: index,
           context: data.context,
           params: data.params,
           onCreated: (event) => {