cloud-web-corejs 1.0.267 → 1.0.268

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.267",
+  "version": "1.0.268",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/baseTabs/mixins.js

@@ -1,3 +1,5 @@
+import { scrollIntoScrollParent } from '@base/utils/scrollUtil';
+
 let baseTabsMixin, baseTabPaneMixin;
 
 baseTabsMixin = {
@@ -76,17 +78,10 @@ baseTabsMixin = {
       this.$emit('input', name);
       this.$emit('on-click', name);
       let target = this.getTabs()[index].$el;
-      let scrollContainer = Array.prototype.find.call(
-        this.$el.children,
-        item => item.classList && item.classList.contains('d-cont')
-      );
-      if (scrollContainer) {
-        let containerRect = scrollContainer.getBoundingClientRect();
-        let targetRect = target.getBoundingClientRect();
-        scrollContainer.scrollTop += targetRect.top - containerRect.top;
-      } else {
-        target.scrollIntoView();
-      }
+      //滚动体是 .d-cont 还是它外面那层(.d-header + div{flex:1;overflow-y:auto})由布局决定,
+      //原来写死 .d-cont,在 .d-cont 没有确定高度(height:inherit 拿到 auto)的页面上
+      //scrollTop 赋值是空操作,点导航没反应——统一交给 scrollIntoScrollParent 找真正的滚动体。
+      scrollIntoScrollParent(target);
     }
   },
   watch: {

package/src/components/wf/wfUtil.js

@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import settingConfig from '@/settings.js'
+import { scrollIntoScrollParent } from '@base/utils/scrollUtil';
 
 let f;
 let configUtil = {
@@ -90,7 +91,9 @@ f = async function (option) {
                     click: (event) => {
                       instance.$children[0].handleFold(true);
                       that.$nextTick(() => {
-                        instance.$el.scrollIntoView();
+                        //流程区是挂在 .d-cont 里滚的，直接 scrollIntoView 会把外层文档/宿主容器
+                        //一起滚起来（固定头被顶走、微前端下滚的是主应用），只在真正的滚动容器里滚。
+                        scrollIntoScrollParent(instance.$el);
                       })
                     }
                   }

package/src/utils/scrollUtil.js

@@ -0,0 +1,25 @@
+//在元素最近的可滚动祖先内部滚动到该元素；确实没有可滚动祖先时才退回 scrollIntoView。
+//不能一上来就 scrollIntoView：那会把外层文档/宿主容器一起滚起来（固定头被顶走、
+//微前端下滚的是主应用）。反过来也不能写死某一层容器——同一套详情结构里，真正带
+//overflow 的是哪一层由 CSS 决定（有的布局是 .d-cont，有的是它外面那层 flex:1 的 div），
+//写死就会在另一种布局里变成空操作。
+//使用方：baseTabs 的页签锚点(components/baseTabs/mixins.js)、wf 的「流程信息」导航(components/wf/wfUtil.js)。
+function scrollIntoScrollParent(el) {
+  if (!el || !el.parentElement) return;
+  let container = el.parentElement;
+  let root = document.documentElement;
+  while (container && container !== document.body && container !== root) {
+    let overflowY = window.getComputedStyle(container).overflowY;
+    let scrollable = /auto|scroll|overlay/.test(overflowY);
+    if (scrollable && container.scrollHeight > container.clientHeight) {
+      let containerRect = container.getBoundingClientRect();
+      let targetRect = el.getBoundingClientRect();
+      container.scrollTop += targetRect.top - containerRect.top;
+      return;
+    }
+    container = container.parentElement;
+  }
+  el.scrollIntoView();
+}
+
+export { scrollIntoScrollParent };