eoss 0.1.0-alpha.32 → 0.1.0-alpha.34

package/lib/eoss.common.js

@@ -3687,7 +3687,7 @@ var publishedLists = '/main2/pageComponentConfig/listPublished';
 // 获取自定义配置详情
 var pageInfo = '/main2/pageComponentConfig/info';
 // 获取自定义配置授权列表
-var pageGroup = 'main2/pageComponentTarget/listByConfigIdAndTypeGroup';
+var pageGroup = '/main2/pageComponentTarget/listByConfigIdAndTypeGroup';
 
 // 保存自定义配置,发布也调这个接口但要加上字段status=1
 var pageSave = '/main2/pageComponentConfig/save';
@@ -3804,7 +3804,7 @@ var changeInTime = '/baseIssueRules/changeInTime';
 /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(2);
 /* harmony import */ var eoss_packages_message_box__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(27);
 /* harmony import */ var eoss_packages_message_box__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(eoss_packages_message_box__WEBPACK_IMPORTED_MODULE_8__);
-/* harmony import */ var eoss_packages_message__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(21);
+/* harmony import */ var eoss_packages_message__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(19);
 /* harmony import */ var eoss_packages_message__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(eoss_packages_message__WEBPACK_IMPORTED_MODULE_9__);
 var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
@@ -6572,19 +6572,19 @@ module.exports = require("eoss/lib/checkbox-group");
 /* 19 */
 /***/ (function(module, exports) {
 
-module.exports = require("eoss/lib/tooltip");
+module.exports = require("eoss/lib/message");
 
 /***/ }),
 /* 20 */
 /***/ (function(module, exports) {
 
-module.exports = require("eoss/lib/select");
+module.exports = require("eoss/lib/tooltip");
 
 /***/ }),
 /* 21 */
 /***/ (function(module, exports) {
 
-module.exports = require("eoss/lib/message");
+module.exports = require("eoss/lib/select");
 
 /***/ }),
 /* 22 */
@@ -9768,7 +9768,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
     //
     var referenceOffsets = getOffsetRectRelativeToCustomParent(
       reference,
-      getOffsetParent(popper),
+      popper,
       isParentFixed
     );
 
@@ -9823,17 +9823,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
   Popper.prototype._setupEventListeners = function () {
     // NOTE: 1 DOM access here
     this.state.updateBound = this.update.bind(this);
-    root.addEventListener('resize', this.state.updateBound);
+    // 无界等微前端场景下沙箱 window 不会触发 resize，需监听真实 window
+    this.state.realWindow = getRealWindow(this._popper);
+    this.state.realWindow.addEventListener('resize', this.state.updateBound);
     // if the boundariesElement is window we don't need to listen for the scroll event
     if (this._options.boundariesElement !== 'window') {
       var target = getScrollParent(this._reference);
-      // here it could be both `body` or `documentElement` thanks to Firefox, we then check both
-      if (
-        target === root.document.body ||
-        target === root.document.documentElement
-      ) {
-        target = root;
-      }
       target.addEventListener('scroll', this.state.updateBound);
       this.state.scrollTarget = target;
     }
@@ -9847,7 +9842,10 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
    */
   Popper.prototype._removeEventListeners = function () {
     // NOTE: 1 DOM access here
-    root.removeEventListener('resize', this.state.updateBound);
+    (this.state.realWindow || root).removeEventListener(
+      'resize',
+      this.state.updateBound
+    );
     if (
       this._options.boundariesElement !== 'window' &&
       this.state.scrollTarget
@@ -9901,47 +9899,24 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
         left: 0
       };
     } else if (boundariesElement === 'viewport') {
-      var offsetParent = getOffsetParent(this._popper);
-      var scrollParent = getScrollParent(this._popper);
-      var offsetParentRect = getOffsetRect(offsetParent);
-
-      // Thanks the fucking native API, `document.body.scrollTop` & `document.documentElement.scrollTop`
-      var getScrollTopValue = function (element) {
-        return element == document.body
-          ? Math.max(
-            document.documentElement.scrollTop,
-            document.body.scrollTop
-          )
-          : element.scrollTop;
-      };
-      var getScrollLeftValue = function (element) {
-        return element == document.body
-          ? Math.max(
-            document.documentElement.scrollLeft,
-            document.body.scrollLeft
-          )
-          : element.scrollLeft;
-      };
-
-      // if the popper is fixed we don't have to substract scrolling from the boundaries
-      var scrollTop =
+      // 将真实 window 的视口换算到 popper 所在包含块的坐标系。
+      // 无界等场景下沙箱 window 的尺寸、shadowRoot 内元素的 scrollTop 均不可靠，
+      // 统一从元素自身的 view 与真实包含块获取
+      var realWindow = getRealWindow(this._popper);
+      var containingBlockRect = getContainingBlockRect(
+        this._popper,
         data.offsets.popper.position === 'fixed'
-          ? 0
-          : getScrollTopValue(scrollParent);
-      var scrollLeft =
-        data.offsets.popper.position === 'fixed'
-          ? 0
-          : getScrollLeftValue(scrollParent);
+      );
 
       boundaries = {
-        top: 0 - (offsetParentRect.top - scrollTop),
+        top: 0 - containingBlockRect.top,
         right:
-          root.document.documentElement.clientWidth -
-          (offsetParentRect.left - scrollLeft),
+          realWindow.document.documentElement.clientWidth -
+          containingBlockRect.left,
         bottom:
-          root.document.documentElement.clientHeight -
-          (offsetParentRect.top - scrollTop),
-        left: 0 - (offsetParentRect.left - scrollLeft)
+          realWindow.document.documentElement.clientHeight -
+          containingBlockRect.top,
+        left: 0 - containingBlockRect.left
       };
     } else {
       if (getOffsetParent(this._popper) === boundariesElement) {
@@ -10409,7 +10384,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
     element.style.visibility = 'hidden';
     var calcWidthToForceRepaint = element.offsetWidth;
     // original method
-    var styles = root.getComputedStyle(element);
+    var styles = getRealWindow(element).getComputedStyle(element);
     var x = parseFloat(styles.marginTop) + parseFloat(styles.marginBottom);
     var y = parseFloat(styles.marginLeft) + parseFloat(styles.marginRight);
     var result = {
@@ -10480,9 +10455,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
    */
   function getStyleComputedProperty(element, property) {
     // NOTE: 1 DOM access here
-    var css = root.getComputedStyle(element, null);
+    // 无界等微前端场景下沙箱 window 与元素实际渲染所在 window 可能不一致，
+    // 需使用元素自身的 view 读取计算样式，避免跨 document 读取到空值
+    var css = getRealWindow(element).getComputedStyle(element, null);
     return css[property];
   }
+
   /**
    * Returns the offset parent of the given element
    * @function
@@ -10497,6 +10475,68 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
       : offsetParent;
   }
 
+  /**
+   * Returns the window the given element actually renders in.
+   * 无界等微前端场景下组件代码运行在沙箱 window 中，而 DOM 实际渲染在
+   * 主应用的 window（shadowRoot 内），滚动量、视口尺寸等必须取自元素自身的 view
+   * @function
+   * @ignore
+   * @argument {Element} element
+   * @returns {Window} window
+   */
+  function getRealWindow(element) {
+    return (
+      (element &&
+        element.ownerDocument &&
+        element.ownerDocument.defaultView) ||
+      root
+    );
+  }
+
+  /**
+   * Returns the viewport rect of the containing block actually used to position the popper.
+   * 无界微前端等场景下 popper 被挂载进子应用的 shadowRoot，offsetParent 的兜底值
+   * （documentElement）与浏览器真实的包含块不再重合，导致下拉框/提示框整体偏移
+   * （偏移量恰为子应用容器在主应用中的位置），因此需要沿 composed tree 查找：
+   * - fixed 定位：包含块为视口；
+   * - absolute 定位：最近的 positioned 祖先元素（跨 shadowRoot 边界查找）；
+   * - 无 positioned 祖先：初始包含块，其视口原点为真实 window 滚动量的负值。
+   * @function
+   * @ignore
+   * @argument {Element} element - popper element
+   * @argument {Boolean} fixed - whether the popper is fixed positioned
+   * @returns {Object} rect
+   */
+  function getContainingBlockRect(element, fixed) {
+    if (fixed) {
+      return { top: 0, left: 0, right: 0, bottom: 0 };
+    }
+
+    var node = element.parentNode;
+    while (node) {
+      if (node.nodeType === 1) {
+        if (getStyleComputedProperty(node, 'position') !== 'static') {
+          return getBoundingClientRect(node);
+        }
+      } else if (node.nodeType === 11) {
+        // 遇到 shadowRoot，跨边界从宿主元素继续向上查找
+        node = node.host;
+        continue;
+      } else {
+        break;
+      }
+      node = node.parentNode;
+    }
+
+    var win = getRealWindow(element);
+    return {
+      top: -(win.pageYOffset || 0),
+      left: -(win.pageXOffset || 0),
+      right: 0,
+      bottom: 0
+    };
+  }
+
   /**
    * Returns the scrolling parent of the given element
    * @function
@@ -10506,18 +10546,20 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
    */
   function getScrollParent(element) {
     var parent = element.parentNode;
-    if (!parent || parent.nodeType !== 1) {
+    if (!parent) {
       return element;
     }
 
-    if (parent === root.document) {
-      // Firefox puts the scrollTOp value on `documentElement` instead of `body`, we then check which of them is
-      // greater than 0 and return the proper element
-      if (root.document.body.scrollTop || root.document.body.scrollLeft) {
-        return root.document.body;
-      } else {
-        return root.document.documentElement;
-      }
+    if (parent.nodeType === 11) {
+      // 无界等微前端场景 DOM 位于 shadowRoot 内，需跨边界从宿主元素继续向上查找，
+      // 否则查找到 shadowRoot 即终止，滚动事件无法被监听
+      return getScrollParent(parent.host);
+    }
+
+    if (parent.nodeType !== 1) {
+      // 到达 document，返回元素实际渲染所在的真实 window，
+      // 保证 window 滚动时能触发位置更新
+      return getRealWindow(element);
     }
 
     // Firefox want us to check `-x` and `-y` variations as well
@@ -10537,7 +10579,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
       // fixes issue #65
       return parent;
     }
-    return getScrollParent(element.parentNode);
+    return getScrollParent(parent);
   }
 
   /**
@@ -10555,9 +10597,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
     if (getStyleComputedProperty(element, 'position') === 'fixed') {
       return true;
     }
-    return element.parentNode && element.parentNode.nodeType === 1
-      ? isFixed(element.parentNode)
-      : element;
+    var parent = element.parentNode;
+    if (parent && parent.nodeType === 11) {
+      // 跨 shadowRoot 边界，从宿主元素继续向上判断
+      parent = parent.host;
+    }
+    return parent && parent.nodeType === 1 ? isFixed(parent) : false;
   }
 
   /**
@@ -10673,15 +10718,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
    */
   function getOffsetRectRelativeToCustomParent(element, parent, fixed) {
     var elementRect = getBoundingClientRect(element);
-    var parentRect = getBoundingClientRect(parent);
-
-    if (fixed) {
-      var scrollParent = getScrollParent(parent);
-      parentRect.top += scrollParent.scrollTop;
-      parentRect.bottom += scrollParent.scrollTop;
-      parentRect.left += scrollParent.scrollLeft;
-      parentRect.right += scrollParent.scrollLeft;
-    }
+    // parent 为 popper 元素：取其真实包含块的视口 rect，
+    // 避免无界 shadowRoot 等场景下包含块假设错误导致的整体偏移
+    var parentRect = getContainingBlockRect(parent, fixed);
 
     var rect = {
       top: elementRect.top - parentRect.top,
@@ -21490,7 +21529,7 @@ checkboxvue_type_template_id_cb3c173a_render._withStripped = true
 // CONCATENATED MODULE: ./packages/checkbox/src/checkbox.vue?vue&type=template&id=cb3c173a&
 
 // EXTERNAL MODULE: external "eoss/lib/tooltip"
-var tooltip_ = __webpack_require__(19);
+var tooltip_ = __webpack_require__(20);
 var tooltip_default = /*#__PURE__*/__webpack_require__.n(tooltip_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/checkbox/src/checkbox.vue?vue&type=script&lang=js&
@@ -23235,7 +23274,7 @@ var checkbox_group_ = __webpack_require__(18);
 var checkbox_group_default = /*#__PURE__*/__webpack_require__.n(checkbox_group_);
 
 // EXTERNAL MODULE: external "eoss/lib/select"
-var select_ = __webpack_require__(20);
+var select_ = __webpack_require__(21);
 var select_default = /*#__PURE__*/__webpack_require__.n(select_);
 
 // EXTERNAL MODULE: external "eoss/lib/cascader"
@@ -64196,7 +64235,7 @@ start_flowvue_type_template_id_19dc68c7_render._withStripped = true
 // CONCATENATED MODULE: ./packages/flows/src/components/start-flow.vue?vue&type=template&id=19dc68c7&
 
 // EXTERNAL MODULE: external "eoss/lib/message"
-var message_ = __webpack_require__(21);
+var message_ = __webpack_require__(19);
 var message_default = /*#__PURE__*/__webpack_require__.n(message_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flows/src/components/start-flow.vue?vue&type=script&lang=js&
@@ -80712,8 +80751,8 @@ login.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_login = (login);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/lowcode/src/lowcode.vue?vue&type=template&id=ac68474e&
-var lowcodevue_type_template_id_ac68474e_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/lowcode/src/lowcode.vue?vue&type=template&id=2c9b5e4a&
+var lowcodevue_type_template_id_2c9b5e4a_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -81197,11 +81236,11 @@ var lowcodevue_type_template_id_ac68474e_render = function () {
     1
   )
 }
-var lowcodevue_type_template_id_ac68474e_staticRenderFns = []
-lowcodevue_type_template_id_ac68474e_render._withStripped = true
+var lowcodevue_type_template_id_2c9b5e4a_staticRenderFns = []
+lowcodevue_type_template_id_2c9b5e4a_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/lowcode/src/lowcode.vue?vue&type=template&id=ac68474e&
+// CONCATENATED MODULE: ./packages/lowcode/src/lowcode.vue?vue&type=template&id=2c9b5e4a&
 
 // CONCATENATED MODULE: ./src/utils/bus.js
 /**
@@ -83077,8 +83116,8 @@ canvasvue_type_template_id_3f236c3d_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/lowcode/src/canvas.vue?vue&type=template&id=3f236c3d&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/lowcode/src/render.vue?vue&type=template&id=12ff94c0&
-var rendervue_type_template_id_12ff94c0_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/lowcode/src/render.vue?vue&type=template&id=274525cb&
+var rendervue_type_template_id_274525cb_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -83129,6 +83168,7 @@ var rendervue_type_template_id_12ff94c0_render = function () {
                   key: _vm.instanceKey,
                   tag: "component",
                   style: _vm.innerLayoutStyle,
+                  attrs: { height: _vm.newHeight },
                 },
                 "component",
                 _vm.cleanProps,
@@ -83381,11 +83421,11 @@ var rendervue_type_template_id_12ff94c0_render = function () {
     2
   )
 }
-var rendervue_type_template_id_12ff94c0_staticRenderFns = []
-rendervue_type_template_id_12ff94c0_render._withStripped = true
+var rendervue_type_template_id_274525cb_staticRenderFns = []
+rendervue_type_template_id_274525cb_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/lowcode/src/render.vue?vue&type=template&id=12ff94c0&
+// CONCATENATED MODULE: ./packages/lowcode/src/render.vue?vue&type=template&id=274525cb&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/lowcode/src/iframe.vue?vue&type=template&id=ceca7cf4&scoped=true&
 var iframevue_type_template_id_ceca7cf4_scoped_true_render = function () {
@@ -83641,6 +83681,7 @@ var rendervue_type_script_lang_js_extends = Object.assign || function (target) {
 //
 //
 //
+//
 
 
 
@@ -83687,11 +83728,9 @@ var LAYOUT_PROPS = ['display', 'gap', 'grid-gap', 'grid-template-columns', 'flex
       initialMouseY: 0,
       initialWidth: 0,
       initialHeight: 0,
-      resizeObserver: null,
       isResizing: false,
       direction: '',
-      width: 0,
-      height: 0,
+      newHeight: 0,
       isDragOver: false
     };
   },
@@ -83708,6 +83747,42 @@ var LAYOUT_PROPS = ['display', 'gap', 'grid-gap', 'grid-template-columns', 'flex
     }
   },
   computed: {
+    /**
+     * 手柄旁 span 展示的宽度
+     * - masonry：style.width 由 layoutWaterfall 按 span×列宽 算好写入
+     * - flex：style.width 补默认值 / 拖拽写入
+     * - grid：canvas 会删除 style.width，宽度由 grid-column: span N 决定，
+     *   按 span×列宽+(span-1)×gap 计算（公式与 util.js layoutWaterfall 一致）；
+     *   读取 style.span 建立响应式依赖，span 变化时立即重算，无需等浏览器重排
+     */
+    width: function width() {
+      var style = this.newNode && this.newNode.style || {};
+      if (style.width) {
+        var w = parseInt(style.width);
+        if (!isNaN(w)) return w;
+      }
+      // grid 模式：按 span 计算列宽
+      var pageStyle = this.page && this.page.style || {};
+      var columns = parseInt(pageStyle.columns) || 1;
+      var gap = parseInt(pageStyle.gap) || 0;
+      var span = Math.max(1, Math.min(parseInt(style.span) || 1, columns));
+      var parent = this.$el && this.$el.parentElement;
+      if (!parent) return 0;
+      var cs = window.getComputedStyle(parent);
+      var containerWidth = parent.clientWidth - (parseFloat(cs.paddingLeft) || 0) - (parseFloat(cs.paddingRight) || 0);
+      if (containerWidth <= 0) return 0;
+      var columnWidth = (containerWidth - gap * (columns - 1)) / columns;
+      return Math.round(columnWidth * span + gap * (span - 1));
+    },
+
+    /**
+     * 手柄旁 span 展示的高度：style.height 由编辑器保证存在，直接派生
+     */
+    height: function height() {
+      var h = this.newNode && this.newNode.style && this.newNode.style.height;
+      return parseInt(h) || 0;
+    },
+
     /**
      * 解析 text 指令中的表达式
      * 支持 {{variable}} 形式，从 page.data 中获取值
@@ -83813,6 +83888,7 @@ var LAYOUT_PROPS = ['display', 'gap', 'grid-gap', 'grid-template-columns', 'flex
           if (src[key]) style[key] = src[key];
         });
       }
+      this.newHeight = parseInt(style.height) || 0;
       return style;
     },
 
@@ -83926,15 +84002,14 @@ var LAYOUT_PROPS = ['display', 'gap', 'grid-gap', 'grid-template-columns', 'flex
       this.direction = direction;
       // 只响应鼠标左键或触摸
       if (event.pointerType === 'mouse' && event.button !== 0) return;
+      // 防御性兜底：若历史数据中 style.width/height 缺失，从 DOM 补一次
+      // （正常流程下 canvas.vue 会保证 style.height 存在，这里仅防异常数据）
       if (!node.style || !node.style.width || !node.style.height) {
-        // 从组件DOM元素获取实际宽高
         var componentElement = document.querySelector('[data-id="' + node.id + '"]');
         if (componentElement) {
-          // 获取计算后的样式
           var computedStyle = window.getComputedStyle(componentElement);
           var width = parseInt(computedStyle.width) || componentElement.offsetWidth;
           var height = parseInt(computedStyle.height) || componentElement.offsetHeight;
-          // 只补全缺失的 width/height，保留 span 等其它属性
           if (!node.style) this.$set(this.newNode, 'style', {});
           if (!this.newNode.style.width) {
             this.$set(this.newNode.style, 'width', width + 'px');
@@ -83955,9 +84030,10 @@ var LAYOUT_PROPS = ['display', 'gap', 'grid-gap', 'grid-template-columns', 'flex
       this.resizingComponent = rendervue_type_script_lang_js_extends({}, this.newNode, { direction: direction });
       this.initialMouseX = event.clientX;
       this.initialMouseY = event.clientY;
-      // 记录初始宽高
-      this.initialWidth = parseInt(this.newNode.style.width) || 200;
-      this.initialHeight = parseInt(this.newNode.style.height) || 100;
+      // 记录初始宽高：直接取 computed width/height，已覆盖 grid(按 span 计算)/masonry/flex 各模式，
+      // 与展示值同源，避免 grid 模式下 style.width 缺失导致拖拽基准为 0
+      this.initialWidth = this.width || 0;
+      this.initialHeight = this.height || 0;
       this.$emit('change', this.newNode, true, this.initialWidth);
 
       document.addEventListener('pointermove', this.handleResizeMove);
@@ -84017,10 +84093,8 @@ var LAYOUT_PROPS = ['display', 'gap', 'grid-gap', 'grid-template-columns', 'flex
 
         // 限制最大宽度不超过画布宽度
         newWidth = Math.min(canvasWidth, newWidth);
-        this.width = parseInt(newWidth);
-        this.height = parseInt(newHeight);
         if (this.newNode) {
-          // 使用Vue.set确保样式变化能触发响应式更新
+          // 写入 style 后，computed width/height 会自动跟随更新，无需再手动赋值
           this.$set(this.newNode.style, 'width', newWidth + 'px');
           this.$set(this.newNode.style, 'height', newHeight + 'px');
         }
@@ -84146,8 +84220,8 @@ var LAYOUT_PROPS = ['display', 'gap', 'grid-gap', 'grid-template-columns', 'flex
 
 var render_component = Object(componentNormalizer["a" /* default */])(
   src_rendervue_type_script_lang_js_,
-  rendervue_type_template_id_12ff94c0_render,
-  rendervue_type_template_id_12ff94c0_staticRenderFns,
+  rendervue_type_template_id_274525cb_render,
+  rendervue_type_template_id_274525cb_staticRenderFns,
   false,
   null,
   null,
@@ -93239,10 +93313,49 @@ function lowcodevue_type_script_lang_js_objectWithoutProperties(obj, keys) { var
 
     /**
      * 复制 URL 到剪贴板
+     * 说明：wujie 微前端 / dialog 挂载到子应用 document 时，navigator.clipboard
+     * 会因 "Document is not focused" 抛出 NotAllowedError，这里采用
+     * 异步 Clipboard API + execCommand('copy') 同步兜底 的双通道策略。
      */
     copyUrl: function copyUrl() {
-      navigator.clipboard.writeText(this.publishForm.url);
-      message_default.a.success('复制成功');
+      var text = this.publishForm.url;
+      if (!text) {
+        message_default.a.warning('没有可复制的内容');
+        return;
+      }
+      var fallbackCopy = function fallbackCopy() {
+        var textarea = document.createElement('textarea');
+        textarea.value = text;
+        textarea.setAttribute('readonly', '');
+        textarea.style.position = 'fixed';
+        textarea.style.top = '-1000px';
+        textarea.style.left = '-1000px';
+        textarea.style.opacity = '0';
+        document.body.appendChild(textarea);
+        textarea.select();
+        textarea.setSelectionRange(0, textarea.value.length);
+        var ok = false;
+        try {
+          ok = document.execCommand('copy');
+        } catch (e) {
+          ok = false;
+        }
+        document.body.removeChild(textarea);
+        if (ok) {
+          message_default.a.success('复制成功');
+        } else {
+          message_default.a.error('复制失败，请手动选择地址复制');
+        }
+      };
+      if (navigator.clipboard && typeof navigator.clipboard.writeText === 'function') {
+        navigator.clipboard.writeText(text).then(function () {
+          return message_default.a.success('复制成功');
+        }, function () {
+          return fallbackCopy();
+        });
+      } else {
+        fallbackCopy();
+      }
     },
 
     /**
@@ -93352,8 +93465,8 @@ function lowcodevue_type_script_lang_js_objectWithoutProperties(obj, keys) { var
 
 var lowcode_component = Object(componentNormalizer["a" /* default */])(
   src_lowcodevue_type_script_lang_js_,
-  lowcodevue_type_template_id_ac68474e_render,
-  lowcodevue_type_template_id_ac68474e_staticRenderFns,
+  lowcodevue_type_template_id_2c9b5e4a_render,
+  lowcodevue_type_template_id_2c9b5e4a_staticRenderFns,
   false,
   null,
   null,
@@ -93370,8 +93483,8 @@ lowcode.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_lowcode = (lowcode);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/lowcode-view/src/view.vue?vue&type=template&id=a1097a78&
-var viewvue_type_template_id_a1097a78_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/lowcode-view/src/view.vue?vue&type=template&id=4955d640&
+var viewvue_type_template_id_4955d640_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -93572,14 +93685,14 @@ var viewvue_type_template_id_a1097a78_render = function () {
     1
   )
 }
-var viewvue_type_template_id_a1097a78_staticRenderFns = []
-viewvue_type_template_id_a1097a78_render._withStripped = true
+var viewvue_type_template_id_4955d640_staticRenderFns = []
+viewvue_type_template_id_4955d640_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/lowcode-view/src/view.vue?vue&type=template&id=a1097a78&
+// CONCATENATED MODULE: ./packages/lowcode-view/src/view.vue?vue&type=template&id=4955d640&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/lowcode-view/src/render.vue?vue&type=template&id=30079e52&
-var rendervue_type_template_id_30079e52_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/lowcode-view/src/render.vue?vue&type=template&id=45a220b2&
+var rendervue_type_template_id_45a220b2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -93615,6 +93728,7 @@ var rendervue_type_template_id_30079e52_render = function () {
                   key: _vm.newNode.id,
                   tag: "component",
                   staticStyle: { width: "100%", height: "100%" },
+                  attrs: { height: _vm.newHeight },
                 },
                 "component",
                 _vm.cleanProps,
@@ -93784,11 +93898,11 @@ var rendervue_type_template_id_30079e52_render = function () {
     2
   )
 }
-var rendervue_type_template_id_30079e52_staticRenderFns = []
-rendervue_type_template_id_30079e52_render._withStripped = true
+var rendervue_type_template_id_45a220b2_staticRenderFns = []
+rendervue_type_template_id_45a220b2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/lowcode-view/src/render.vue?vue&type=template&id=30079e52&
+// CONCATENATED MODULE: ./packages/lowcode-view/src/render.vue?vue&type=template&id=45a220b2&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/lowcode-view/src/Iframe.vue?vue&type=template&id=3a1f5bf7&
 var Iframevue_type_template_id_3a1f5bf7_render = function () {
@@ -94005,6 +94119,7 @@ var src_rendervue_type_script_lang_js_extends = Object.assign || function (targe
 //
 //
 //
+//
 
 
 
@@ -94046,11 +94161,8 @@ var src_rendervue_type_script_lang_js_extends = Object.assign || function (targe
       initialMouseY: 0,
       initialWidth: 0,
       initialHeight: 0,
-      resizeObserver: null,
       isResizing: false,
-      direction: '',
-      width: 0,
-      height: 0
+      direction: ''
     };
   },
 
@@ -94066,6 +94178,50 @@ var src_rendervue_type_script_lang_js_extends = Object.assign || function (targe
     }
   },
   computed: {
+    /**
+     * 手柄旁 span 展示的宽度
+     * - masonry：style.width 由 layoutWaterfall 按 span×列宽 算好写入
+     * - flex：style.width 补默认值 / 拖拽写入
+     * - grid：style.width 被删除，宽度由 grid-column: span N 决定，
+     *   按 span×列宽+(span-1)×gap 计算（公式与 util.js layoutWaterfall 一致）；
+     *   读取 style.span 建立响应式依赖，span 变化时立即重算
+     */
+    width: function width() {
+      var style = this.newNode && this.newNode.style || {};
+      if (style.width) {
+        var w = parseInt(style.width);
+        if (!isNaN(w)) return w;
+      }
+      // grid 模式：按 span 计算列宽
+      var pageStyle = this.page && this.page.style || {};
+      var columns = parseInt(pageStyle.columns) || 1;
+      var gap = parseInt(pageStyle.gap) || 0;
+      var span = Math.max(1, Math.min(parseInt(style.span) || 1, columns));
+      var parent = this.$el && this.$el.parentElement;
+      if (!parent) return 0;
+      var cs = window.getComputedStyle(parent);
+      var containerWidth = parent.clientWidth - (parseFloat(cs.paddingLeft) || 0) - (parseFloat(cs.paddingRight) || 0);
+      if (containerWidth <= 0) return 0;
+      var columnWidth = (containerWidth - gap * (columns - 1)) / columns;
+      return Math.round(columnWidth * span + gap * (span - 1));
+    },
+
+    /**
+     * 手柄旁 span 展示的高度：style.height 由编辑器保证存在，直接派生
+     */
+    height: function height() {
+      var h = this.newNode && this.newNode.style && this.newNode.style.height;
+      return parseInt(h) || 0;
+    },
+
+    /**
+     * 传递给内层业务组件的 height（:height）：与展示用 height 同源，取自 style.height，
+     * 保证业务组件（如图表/表格）拿到的是节点真实像素高度，且随 style.height 响应式变化
+     */
+    newHeight: function newHeight() {
+      return this.height;
+    },
+
     /**
      * 解析 text 指令中的表达式
      * 支持 {{variable}} 形式，从 page.data 中获取值
@@ -94122,18 +94278,17 @@ var src_rendervue_type_script_lang_js_extends = Object.assign || function (targe
       this.direction = direction;
       // 只响应鼠标左键或触摸
       if (event.pointerType === 'mouse' && event.button !== 0) return;
-      if (!node.style || !node.style.width || !node.style.height) {
-        // 从组件 DOM 元素获取实际宽高
+      // 防御性兜底：历史数据中 style.height 缺失时从 DOM 补一次
+      // （grid 模式 style.width 本就被删除，不强行补，交给 computed 按 span 计算）
+      if (!node.style || !node.style.height) {
         var componentElement = document.querySelector('[data-id="' + node.id + '"]');
         if (componentElement) {
-          // 获取计算后的样式
           var computedStyle = window.getComputedStyle(componentElement);
-          var width = parseInt(computedStyle.width) || componentElement.offsetWidth;
-          var height = parseInt(computedStyle.height) || componentElement.offsetHeight;
-          // 只设置 width 和 height，不替换整个 style 对象（保留 span 等其他属性）
           if (!node.style) this.$set(this.newNode, 'style', {});
-          this.$set(this.newNode.style, 'width', width + 'px');
-          this.$set(this.newNode.style, 'height', height + 'px');
+          if (!this.newNode.style.height) {
+            var height = parseInt(computedStyle.height) || componentElement.offsetHeight;
+            this.$set(this.newNode.style, 'height', height + 'px');
+          }
         }
       }
 
@@ -94141,9 +94296,9 @@ var src_rendervue_type_script_lang_js_extends = Object.assign || function (targe
       this.resizingComponent = src_rendervue_type_script_lang_js_extends({}, this.newNode, { direction: direction });
       this.initialMouseX = event.clientX;
       this.initialMouseY = event.clientY;
-      // 记录初始宽高
-      this.initialWidth = parseInt(this.newNode.style.width) || 200;
-      this.initialHeight = parseInt(this.newNode.style.height) || 100;
+      // 记录初始宽高：直接取 computed width/height，已覆盖 grid(按 span 计算)/masonry/flex 各模式，与展示值同源
+      this.initialWidth = this.width || 0;
+      this.initialHeight = this.height || 0;
       this.$emit('change', this.newNode, true);
 
       document.addEventListener('pointermove', this.handleResizeMove);
@@ -94163,8 +94318,11 @@ var src_rendervue_type_script_lang_js_extends = Object.assign || function (targe
         var deltaX = pointerEvent.clientX - this.initialMouseX;
         var deltaY = pointerEvent.clientY - this.initialMouseY;
         var direction = this.resizingComponent.direction;
-        var canvasElement = document.querySelector('.es-lowcode__canvas--content');
-        var canvasWidth = canvasElement && canvasElement.offsetWidth || 0;
+        // 容器宽度：view 版内容容器是 .es-lowcode-view__waterfall（即当前元素的父容器），
+        // 不能沿用编辑器 canvas.vue 的 .es-lowcode__canvas--content 类名（view 版不存在，
+        // 会查到 null 使 canvasWidth=0，进而把宽度钳成 0 导致元素塌成竖线）
+        var parent = this.$el && this.$el.parentElement;
+        var canvasWidth = parent ? parent.clientWidth : 0;
 
         // 使用初始宽高进行计算
         var newWidth = this.initialWidth;
@@ -94201,12 +94359,11 @@ var src_rendervue_type_script_lang_js_extends = Object.assign || function (targe
             break;
         }
 
-        // 限制最大宽度不超过画布宽度
-        newWidth = Math.min(canvasWidth, newWidth);
-        this.width = parseInt(newWidth);
-        this.height = parseInt(newHeight);
+        // 限制最大宽度不超过容器宽度；容器宽度不可用时不钳制，避免误塌成 0
+        newWidth = canvasWidth > 0 ? Math.min(canvasWidth, newWidth) : newWidth;
         if (this.newNode) {
-          // grid 模式下宽度由列宽/span 决定，拖动过程中不更新 width 样式，避免视觉跳动
+          // grid 模式下宽度由列宽/span 决定，拖动过程中不更新 width 样式，避免视觉跳动；
+          // 展示用的 width/height 为 computed，写入 style 后会自动跟随更新
           if (this.displayMode !== 'grid') {
             this.$set(this.newNode.style, 'width', newWidth + 'px');
           }
@@ -94263,8 +94420,8 @@ var src_rendervue_type_script_lang_js_extends = Object.assign || function (targe
 
 var src_render_component = Object(componentNormalizer["a" /* default */])(
   packages_lowcode_view_src_rendervue_type_script_lang_js_,
-  rendervue_type_template_id_30079e52_render,
-  rendervue_type_template_id_30079e52_staticRenderFns,
+  rendervue_type_template_id_45a220b2_render,
+  rendervue_type_template_id_45a220b2_staticRenderFns,
   false,
   null,
   null,
@@ -94944,7 +95101,7 @@ var viewvue_type_script_lang_js_DROP_SPACE = 200;
         }
       }).then(function () {
         var _ref = viewvue_type_script_lang_js_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(res) {
-          var _ref2, pageInfo, targetList, content, page, parsed, userConfig, modules, _parsed, children, parseds;
+          var _ref2, pageInfo, targetList, content, page, parsed, userConfig, modules, _parsed, children, parseds, childrens;
 
           return regeneratorRuntime.wrap(function _callee$(_context) {
             while (1) {
@@ -94998,8 +95155,17 @@ var viewvue_type_script_lang_js_DROP_SPACE = 200;
                   if (userConfig.rCode === 0 && userConfig.results && userConfig.results[pageInfo.code] && userConfig.results[pageInfo.code].userConfig) {
                     modules = JSON.parse(userConfig.results[pageInfo.code].userConfig);
                     _parsed = parsed, children = _parsed.children, parseds = viewvue_type_script_lang_js_objectWithoutProperties(_parsed, ['children']);
+                    // 以模块（modules）为准，按 id 合并已保存的子节点配置（child），
+                    // 使渲染节点同时具备模块信息与编辑器保存的布局/样式等配置
+
+                    childrens = modules.map(function (item) {
+                      var child = (children || []).find(function (c) {
+                        return c.id === item.id;
+                      }) || {};
+                      return viewvue_type_script_lang_js_extends({}, child, item);
+                    });
 
-                    _this.pageData = viewvue_type_script_lang_js_extends({}, page, parseds, { children: modules });
+                    _this.pageData = viewvue_type_script_lang_js_extends({}, page, parseds, { children: childrens });
                     _this.pagesMap = children || [];
                   } else {
                     _this.pageData = viewvue_type_script_lang_js_extends({}, page, parsed);
@@ -95112,13 +95278,19 @@ var viewvue_type_script_lang_js_DROP_SPACE = 200;
         return;
       }
       var loadingInstance = Object(utils_util["K" /* loading */])('保存中...');
+      var data = this.pages.map(function (item) {
+        return {
+          id: item.id,
+          style: item.style
+        };
+      });
       Object(utils_ajax["a" /* ajax */])({
         url: api["Zb" /* saveOrUpdate */],
         method: 'post',
         format: false,
         data: {
           type: this.pageData.code,
-          userConfig: JSON.stringify(this.pages)
+          userConfig: JSON.stringify(data)
         }
       }).then(function (res) {
         if (res.rCode == 0 || res.status == 'success') {
@@ -95507,8 +95679,8 @@ var viewvue_type_script_lang_js_DROP_SPACE = 200;
 
 var view_component = Object(componentNormalizer["a" /* default */])(
   src_viewvue_type_script_lang_js_,
-  viewvue_type_template_id_a1097a78_render,
-  viewvue_type_template_id_a1097a78_staticRenderFns,
+  viewvue_type_template_id_4955d640_render,
+  viewvue_type_template_id_4955d640_staticRenderFns,
   false,
   null,
   null,
@@ -104917,7 +105089,7 @@ var appid = Object(utils_util["s" /* getParams */])('applicationId');
                       return t.id === item.id;
                     });
                   });
-                  var customMenus = _this8.customMenus.split(',');
+                  var customMenus = typeof _this8.customMenus === 'string' ? _this8.customMenus.split(',') : _this8.customMenus;
                   var filteredApps = allApps.filter(function (item) {
                     return customMenus.includes(item.id);
                   });
@@ -104973,6 +105145,7 @@ var appid = Object(utils_util["s" /* getParams */])('applicationId');
           case 'themeColor':
             var themeColor = unescape(res[i]).toLowerCase();
             if (Object(utils_util["R" /* startWith */])(themeColor, '#')) {
+              Object(utils_util["W" /* updateTheme */])(themeColor);
               this.themeColor = themeColor;
             }
             break;
@@ -155045,7 +155218,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.1.0-alpha.32',
+  version: '0.1.0-alpha.34',
   install: src_install,
   CollapseTransition: collapse_transition,
   Loading: packages_loading,