yuanjia-form-pro-standard 1.1.6-beta6.2 → 1.1.6-beta6.4

package/designer.es.js

@@ -12734,10 +12734,14 @@ const _sfc_main$5a = {
     handleSelectAll() {
       this.$emit("select-all");
     },
-    async handleLabelClick() {
+    async handleLabelClick(event) {
       if (this.designState) {
         return;
       }
+      if (event) {
+        event.stopPropagation();
+        event.preventDefault();
+      }
       if (this.historyPopoverVisible) {
         this.historyPopoverVisible = false;
         return;
@@ -12745,6 +12749,31 @@ const _sfc_main$5a = {
       this.historyPopoverVisible = true;
       await this.loadHistoryRecord();
     },
+    handleFormItemFocusIn(event) {
+      if (this.historyPopoverVisible && event.relatedTarget) {
+        const relatedElement = event.relatedTarget;
+        if (relatedElement && (relatedElement.classList.contains("label-clickable") || relatedElement.closest(".label-clickable"))) {
+          event.preventDefault();
+          event.stopPropagation();
+          if (event.target && event.target.blur) {
+            event.target.blur();
+          }
+          this.$nextTick(() => {
+            if (!this.historyPopoverVisible) {
+              this.historyPopoverVisible = true;
+            }
+          });
+          return;
+        }
+      }
+      if (this.historyPopoverVisible) {
+        this.$nextTick(() => {
+          if (!this.historyPopoverVisible) {
+            this.historyPopoverVisible = true;
+          }
+        });
+      }
+    },
     async loadHistoryRecord() {
       var _a2, _b2, _c2, _d2;
       if (this.historyLoading) {
@@ -12852,16 +12881,17 @@ function _sfc_render$5a(_ctx, _cache, $props, $setup, $data, $options) {
       rules: $props.rules,
       prop: $options.getPropName(),
       class: normalizeClass$1([$options.selected ? "selected" : "", $options.labelHidden, $options.labelAlign, $options.customClass, $props.field.options.required ? "required" : "", !!$props.field.options.labelWrap ? "label-wrap" : ""]),
-      onClick: _cache[4] || (_cache[4] = withModifiers(($event) => $options.selectField($props.field), ["stop"]))
+      onClick: _cache[4] || (_cache[4] = withModifiers(($event) => $options.selectField($props.field), ["stop"])),
+      onFocusin: $options.handleFormItemFocusIn
     }, {
       label: withCtx(() => [
         createElementVNode("div", _hoisted_1$1i, [
           createElementVNode("div", _hoisted_2$E, [
-            !$props.designState && $options.label && $options.enableHistoryView ? (openBlock(), createBlock(_component_el_popover, {
+            !$props.designState && $options.label && $options.enableHistoryView && $props.field.options.biz_meta_id ? (openBlock(), createBlock(_component_el_popover, {
               key: 0,
               visible: $data.historyPopoverVisible,
               "onUpdate:visible": _cache[2] || (_cache[2] = ($event) => $data.historyPopoverVisible = $event),
-              placement: "top-start",
+              placement: "left",
               width: 400,
               trigger: "manual",
               "popper-class": "field-history-popover"
@@ -13048,7 +13078,7 @@ function _sfc_render$5a(_ctx, _cache, $props, $setup, $data, $options) {
         renderSlot(_ctx.$slots, "default", {}, void 0, true)
       ]),
       _: 3
-    }, 8, ["label", "label-width", "size", "rules", "prop", "class"])) : createCommentVNode("", true),
+    }, 8, ["label", "label-width", "size", "rules", "prop", "class", "onFocusin"])) : createCommentVNode("", true),
     !!this.designer ? (openBlock(), createElementBlock(Fragment, { key: 1 }, [
       $props.designer.selectedId === $props.field.id ? (openBlock(), createElementBlock("div", _hoisted_17$2, [
         createElementVNode("i", {
@@ -13098,7 +13128,7 @@ function _sfc_render$5a(_ctx, _cache, $props, $setup, $data, $options) {
     ], 64)) : createCommentVNode("", true)
   ], 2);
 }
-var FormItemWrapper = /* @__PURE__ */ _export_sfc(_sfc_main$5a, [["render", _sfc_render$5a], ["__scopeId", "data-v-45439cfe"]]);
+var FormItemWrapper = /* @__PURE__ */ _export_sfc(_sfc_main$5a, [["render", _sfc_render$5a], ["__scopeId", "data-v-6c28e2c6"]]);
 var __glob_0_10$3 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   "default": FormItemWrapper
@@ -175112,7 +175142,7 @@ const _sfc_main$4l = {
     },
     enableHistoryView: {
       type: Boolean,
-      default: false
+      default: true
     }
   },
   provide() {
@@ -176961,7 +176991,7 @@ function _sfc_render$4l(_ctx, _cache, $props, $setup, $data, $options) {
                 $data.currentPreviewHistoryBizMetaId = null;
               }
             }),
-            placement: "top-start",
+            placement: "left",
             width: 400,
             trigger: "manual",
             "popper-class": "field-history-popover"
@@ -177056,7 +177086,7 @@ function _sfc_render$4l(_ctx, _cache, $props, $setup, $data, $options) {
     [_directive_loading, $data.formLoading]
   ]);
 }
-var VFormRender = /* @__PURE__ */ _export_sfc(_sfc_main$4l, [["render", _sfc_render$4l], ["__scopeId", "data-v-f49d4bec"]]);
+var VFormRender = /* @__PURE__ */ _export_sfc(_sfc_main$4l, [["render", _sfc_render$4l], ["__scopeId", "data-v-1b548dd8"]]);
 var ace$2 = { exports: {} };
 (function(module, exports) {
   (function() {
@@ -236421,13 +236451,13 @@ var Draggable = /* @__PURE__ */ getDefaultExportFromCjs(vuedraggable_umd.exports
 if (typeof window !== "undefined") {
   let loadSvg = function() {
     var body = document.body;
-    var svgDom = document.getElementById("__svg__icons__dom__1767770539178__");
+    var svgDom = document.getElementById("__svg__icons__dom__1767773421183__");
     if (!svgDom) {
       svgDom = document.createElementNS("http://www.w3.org/2000/svg", "svg");
       svgDom.style.position = "absolute";
       svgDom.style.width = "0";
       svgDom.style.height = "0";
-      svgDom.id = "__svg__icons__dom__1767770539178__";
+      svgDom.id = "__svg__icons__dom__1767773421183__";
       svgDom.setAttribute("xmlns", "http://www.w3.org/2000/svg");
       svgDom.setAttribute("xmlns:link", "http://www.w3.org/1999/xlink");
     }