vue2-client 1.20.66 → 1.20.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.20.66",
+  "version": "1.20.68",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

package/src/base-client/components/common/XReportGrid/XReport.vue

@@ -584,8 +584,14 @@ export default {
      * @param mixinData  需要混入得数据
      * @param outEnv 其他传递给打开窗口的数据
      * @param attr 传递给Modal弹框用的信息
+     * @param manageScope 管理快捷键作用域
      */
-    openDialog (configName, selectedId, mixinData, outEnv = {}, attr = {}, showButtons = true) {
+    openDialog(configName, selectedId, mixinData, outEnv = {}, attr = {}, showButtons = true, manageScope = false) {
+      if (manageScope) {
+        this.openDialogWithScope(configName, selectedId, mixinData, outEnv, attr, showButtons)
+        return
+      }
+
       this.$refs.xAddReport.init({
         configName: configName,
         selectedId: selectedId,
@@ -595,6 +601,33 @@ export default {
         showButtons: showButtons
       })
     },
+    // 打开弹窗（带快捷键作用域管理）
+    openDialogWithScope(configName, selectedId, mixinData, outEnv = {}, attr = {}, showButtons = true) {
+      const savedScopes = new Map()
+      if (shortcutManager.isEnabled) {
+        shortcutManager.scopeActive.forEach((active, scopeId) => {
+          savedScopes.set(scopeId, active)
+          shortcutManager.setScopeActive(scopeId, false)
+        })
+      }
+
+      const xAddReport = this.$refs.xAddReport
+      if (xAddReport && !xAddReport._shortcutPatched) {
+        xAddReport._shortcutPatched = true
+        const originalClose = xAddReport.close.bind(xAddReport)
+        xAddReport.close = () => {
+          if (shortcutManager.isEnabled && savedScopes.size > 0) {
+            savedScopes.forEach((wasActive, scopeId) => {
+              if (wasActive) shortcutManager.setScopeActive(scopeId, true)
+            })
+          }
+          originalClose()
+        }
+      }
+
+      xAddReport.init({ configName, selectedId, mixinData, outEnv, attr, showButtons })
+    },
+
     openDrawer (configName, selectedId, mixinData, outEnv = {}, attr = {}) {
       this.$refs.xReportDrawer.init({
         configName,

package/src/base-client/components/common/XTab/XTab.vue

@@ -340,8 +340,8 @@ export default {
           // 3. 检查组件是否有 realQueryConfig（如 XFormTable）
           const tab = this.config.data[index]
           const isFormTableType = tab?.slotType === 'x-form-table' ||
-                                 tab?.slotType === 'XFormTable' ||
-                                 tab?.slotType?.toLowerCase() === 'xformtable'
+            tab?.slotType === 'XFormTable' ||
+            tab?.slotType?.toLowerCase() === 'xformtable'
           if (isFormTableType && component.realQueryConfig === undefined && !component.loadError) {
             if (attempts < maxAttempts) {
               setTimeout(checkReady, checkInterval)
@@ -484,7 +484,85 @@ export default {
     },
     // 确保页签已加载，如果未加载则先加载，返回 Promise 等待组件渲染完成
     ensureTabLoaded (index, options = {}) {
-      return Promise.resolve(this.getTabComponent(+index))
+      return new Promise((resolve, reject) => {
+        const numIndex = Number(index)
+        const innerRefs = Array.isArray(options.innerRefs) ? options.innerRefs : []
+        const allowSwitch = options.allowSwitch !== false
+        // 验证索引有效性
+        if (isNaN(numIndex) || numIndex < 0) {
+          reject(new Error(`无效的页签索引: ${index}`))
+          return
+        }
+        if (!this.config || !this.config.data || !this.config.data[numIndex]) {
+          reject(new Error(`页签索引 ${index} 不存在`))
+          return
+        }
+        // 如果已经加载，直接返回组件实例
+        if (this.isTabLoaded(numIndex)) {
+          const component = this.getTabComponent(numIndex)
+          if (component) {
+            if (innerRefs.length === 0) {
+              resolve(component)
+            } else {
+              this.waitForInnerRefs(component, innerRefs, resolve, reject)
+            }
+          } else {
+            // 已标记但组件可能还在渲染中，等待一下
+            this.$nextTick(() => {
+              const comp = this.getTabComponent(numIndex)
+              if (comp) {
+                if (innerRefs.length === 0) {
+                  resolve(comp)
+                } else {
+                  this.waitForInnerRefs(comp, innerRefs, resolve, reject)
+                }
+              } else {
+                // 等待组件mounted
+                this.waitForComponent(numIndex, (c) => {
+                  if (innerRefs.length === 0) {
+                    resolve(c)
+                  } else {
+                    this.waitForInnerRefs(c, innerRefs, resolve, reject)
+                  }
+                }, reject)
+              }
+            })
+          }
+          return
+        }
+        // 标记为已加载，触发渲染
+        this.markTabAsLoaded(numIndex)
+        // 优先尝试在不切换页签的情况下获取组件
+        this.$nextTick(() => {
+          const comp = this.getTabComponent(numIndex)
+          if (comp) {
+            if (innerRefs.length === 0) resolve(comp)
+            else this.waitForInnerRefs(comp, innerRefs, resolve, reject)
+            return
+          }
+          // 若仍未渲染，且允许临时切换，则进行一次激活-恢复回退
+          if (!allowSwitch) {
+            // 不允许切换则进入常规等待（可能更慢）
+            this.waitForComponent(numIndex, (c) => {
+              if (innerRefs.length === 0) resolve(c)
+              else this.waitForInnerRefs(c, innerRefs, resolve, reject)
+            }, reject)
+            return
+          }
+          const prevActive = this.activeKey
+          this.activeKey = numIndex
+          this.$nextTick(() => {
+            this.waitForComponent(numIndex, (c) => {
+              // 组件到位后再恢复原激活页签
+              if (prevActive !== numIndex) {
+                this.$nextTick(() => { this.activeKey = prevActive })
+              }
+              if (innerRefs.length === 0) resolve(c)
+              else this.waitForInnerRefs(c, innerRefs, resolve, reject)
+            }, reject)
+          })
+        })
+      })
     },
     // 等待组件渲染完成
     waitForComponent (index, resolve, reject) {

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -341,8 +341,12 @@ export default {
       // 检查下一个节点是否为分支退出节点
       const nextStep = this.stepsDefine.find(step => step.id === this.nextBtnTo)
 
-      // 如果下一个节点的flowRole不是branchExit，说明不是分支的最后一个节点
-      if (!nextStep || nextStep.properties?.flowRole !== 'branchExit') {
+      // 如果下一个节点 没有有等待节点 waitStepIds, 说明不是分支的最后一个节点
+      if (!nextStep
+        || !(Object.prototype.hasOwnProperty.call(nextStep.properties, 'waitStepIds') &&
+          Array.isArray(nextStep.properties?.waitStepIds) &&
+          nextStep.properties?.waitStepIds.length > 0)
+      ) {
         return defaultResult
       }