@nstc-business/imes 1.0.18 → 1.0.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nstc-business/imes",
-  "version": "1.0.18",
+  "version": "1.0.20",
   "private": false,
   "main": "src/index.js",
   "scripts": {

package/src/components/calculateDetail/index.vue

@@ -351,9 +351,11 @@
             </vxe-column>
           </table-pro>
         </div>
+        <!-- 子模型：按模型树文件夹顺序（定量→定性→调整项）展开，不按类型分块 -->
+        <template v-for="(item, index) in typeObj.orderedSubModels">
         <!-- 评价模型 -->
         <div
-          v-for="(item, index) in typeObj.assessModelArray"
+          v-if="item._subModelKind === 'assess'"
           :key="'assessModelArray' + index"
           class="m-t-m"
         >
@@ -580,7 +582,7 @@
         </div>
         <!-- 计算模型 -->
         <div
-          v-for="(item, index) in typeObj.evalModelArray"
+          v-else-if="item._subModelKind === 'eval'"
           :key="'evalModelArray' + index"
           class="m-t-m"
         >
@@ -797,7 +799,7 @@
 
         <!--  统计模型 (暂不考虑子模型的情况) -->
         <div
-          v-for="(item, index) in typeObj.statisticsArray"
+          v-else-if="item._subModelKind === 'stat'"
           :key="'statisticsArray' + index"
           class="m-t-m"
         >
@@ -999,6 +1001,7 @@
             </table-pro>
           </div>
         </div>
+        </template>
       </div>
     </expandable-pane>
   </Page>
@@ -1083,7 +1086,9 @@ export default {
         // 计算模型数组
         evalModelArray: [],
         // 评价模型数组
-        assessModelArray: []
+        assessModelArray: [],
+        // 子模型按模型树文件夹顺序（定量→定性→调整项）展开
+        orderedSubModels: []
       },
       tabelHeadersAssessModel: [
         {
@@ -1402,6 +1407,7 @@ export default {
             this.processingData(this.model, 'targetArray')
             await this.queryCalcResultDetail()
             this.processingData(this.modelData)
+            this.alignSubModelsWithTargetOrder()
             this.comFn(this.modelData)
           }
           break
@@ -1414,7 +1420,9 @@ export default {
           modelTreeVO.itemID = modelTreeVO.modelID
           modelTreeVO.tableData = []
           modelTreeVO.children = []
-          this.typeObj.statisticsArray.push({...modelTreeVO})
+          const statRow = {...modelTreeVO, _subModelKind: 'stat'}
+          this.typeObj.statisticsArray.push(statRow)
+          this.typeObj.orderedSubModels.push(statRow)
           this.comFn(this.modelData)
           let showFullScore = 0
           let showIndicatorValText = 0
@@ -1706,6 +1714,21 @@ export default {
     // 统计模型table : isLeaf=2 itemType = 13
     // 计算模型table : isLeaf=0 itemType = 11
     // 评价模型table: isLeaf=0 itemType = 12
+    /** 子模型展开顺序与主表指标（定量→定性→调整项）保持一致 */
+    alignSubModelsWithTargetOrder() {
+      const orderIds = this.typeObj.targetArray
+        .filter(i => [11, 12, 13].includes(Number(i.itemType)))
+        .map(i => i.itemID)
+      if (!orderIds.length || !this.typeObj.orderedSubModels.length) {
+        return
+      }
+      this.typeObj.orderedSubModels.sort((a, b) => {
+        const ia = orderIds.indexOf(a.itemID)
+        const ib = orderIds.indexOf(b.itemID)
+        return (ia < 0 ? Number.MAX_SAFE_INTEGER : ia) -
+          (ib < 0 ? Number.MAX_SAFE_INTEGER : ib)
+      })
+    },
     processingData(modelData, type) {
       const modelTreeVO = JSON.parse(JSON.stringify(modelData.modelTreeVO))
       const digui = data => {
@@ -1750,7 +1773,9 @@ export default {
                   } else {
                     item.children = []
                     item.tableData = []
-                    this.typeObj.evalModelArray.push({...item})
+                    const row = {...item, _subModelKind: 'eval'}
+                    this.typeObj.evalModelArray.push(row)
+                    this.typeObj.orderedSubModels.push(row)
                   }
                 }
                   break
@@ -1766,7 +1791,9 @@ export default {
                   } else {
                     item.children = []
                     item.tableData = []
-                    this.typeObj.assessModelArray.push({...item})
+                    const row = {...item, _subModelKind: 'assess'}
+                    this.typeObj.assessModelArray.push(row)
+                    this.typeObj.orderedSubModels.push(row)
                   }
                 }
 
@@ -1783,7 +1810,9 @@ export default {
                   } else {
                     item.children = []
                     item.tableData = []
-                    this.typeObj.statisticsArray.push({...item})
+                    const row = {...item, _subModelKind: 'stat'}
+                    this.typeObj.statisticsArray.push(row)
+                    this.typeObj.orderedSubModels.push(row)
                   }
                   // this.typeObj.targetArray[this.typeObj.targetArray.length - 1] = await this.itemDataFn(item, data)
                 }

package/src/components/measureCalc/MeasureStatModelTable.vue

@@ -123,7 +123,8 @@ export default {
       try {
         this.tableData = await buildStatModelTables(
           this.subModel,
-          id => this.fetchScoreMap(id)
+          id => this.fetchScoreMap(id),
+          this.ctx.modelWrap
         )
       } finally {
         this.loading = false

package/src/components/measureCalc/index.vue

@@ -1054,6 +1054,10 @@ export default {
           if (this.statRootModel) {
             const treeRoot = resData.modelTreeVO || {}
             preprocessStatIndicatorDeepList(treeRoot.children || [])
+            if (resData.modelStatsSetupVOS) {
+              treeRoot.modelStatsSetupVOS = resData.modelStatsSetupVOS
+              this.$set(this.model, 'modelStatsSetupVOS', resData.modelStatsSetupVOS)
+            }
             mergeStatModelNode(this.model.modelTreeVO || {}, treeRoot)
             this.bumpStatTableVersion(this.model.modelTreeVO)
           }
@@ -1131,6 +1135,9 @@ export default {
           if (isStatModel(subModel)) {
             const treeRoot = data.modelTreeVO || {}
             preprocessStatIndicatorDeepList(treeRoot.children || [])
+            if (data.modelStatsSetupVOS) {
+              treeRoot.modelStatsSetupVOS = data.modelStatsSetupVOS
+            }
             mergeStatModelNode(subModel, treeRoot)
             this.bumpStatTableVersion(subModel)
           }

package/src/components/measureCalc/statModelHelper.js

@@ -1,7 +1,12 @@
 /**
  * 统计模型行转列：以 isLeaf=2 为横向展开边界
  * 逻辑参考 EvaOfCreditConditionsRewrite.initColumnsRewrite
- * statCalResult 仅作辅助元数据（列配置/标题/合计），不作为是否行转列的判断条件
+ * statCalResult / modelStatsSetupVOS 作辅助元数据（列配置/标题/合计），
+ * 不作为是否行转列的判断条件。
+ *
+ * 注意：getModelTree 对统计模型通常不下发 statCalResult（挂在评价模型的
+ * 定量分析/定性分析节点上），标题需按 pid 反查分组目录，列配置优先用
+ * modelStatsSetupVOS，避免回退到第一个指标名 / 默认 calType=0 导致错列。
  */
 
 function hasFilledValue(val) {
@@ -105,14 +110,31 @@ export function hasStatPivotData(statNode) {
   return hasStatPivotNodes(statNode)
 }
 
+/**
+ * calType：0=指标取数（展示「xxx指标值/指标得分」），非 0（如 9=统计项运算）只展示统计项名。
+ * 树节点通常只有 rankType，缺 calType 时用 rankType 推断，避免「平均」被当成指标取数导致列重复。
+ */
+function resolveStatCalType(statLike) {
+  if (!statLike) return 0
+  if (statLike.calType !== '' && statLike.calType != null) return statLike.calType
+  if (statLike.rankType !== '' && statLike.rankType != null) return statLike.rankType
+  return 0
+}
+
 function resolveStatMeta(statsResultList, statChild) {
   const fromList = (statsResultList || []).find(
     s => s.name == statChild.statsName
   )
-  if (fromList) return fromList
+  if (fromList) {
+    return {
+      ...fromList,
+      name: fromList.name || statChild.statsName,
+      calType: resolveStatCalType(fromList)
+    }
+  }
   return {
     name: statChild.statsName,
-    calType: statChild.calType ?? 0,
+    calType: resolveStatCalType(statChild),
     statShow: statChild.statShow ?? 1,
     statCalMethod: statChild.statCalMethod,
     statResult: statChild.statResult
@@ -120,25 +142,104 @@ function resolveStatMeta(statsResultList, statChild) {
 }
 
 function buildStatsResultListFromChildren(statChildren) {
-  return statChildren.map(c => ({
+  return (statChildren || []).map(c => ({
     name: c.statsName,
-    calType: c.calType ?? 0,
+    calType: resolveStatCalType(c),
     statShow: c.statShow ?? 1,
     statCalMethod: c.statCalMethod,
     statResult: c.statResult
   }))
 }
 
-function resolveTableBlockMeta(treeData, pid, indicatorItems) {
-  const calBlock = (treeData.statCalResult || []).find(r => r.pid === pid)
-  const first = indicatorItems[0]
-  const firstStatChildren = statItemChildren(first)
+function normalizeStatsResultList(list) {
+  if (!Array.isArray(list) || !list.length) return null
+  return list.map(s => ({
+    name: s.name || s.statsName,
+    calType: resolveStatCalType(s),
+    statShow: s.statShow ?? 1,
+    statCalMethod: s.statCalMethod,
+    statResult: s.statResult
+  }))
+}
+
+/** 在节点树中按 tid 查找节点（含根） */
+function findNodeByTid(root, tid) {
+  if (!root || tid == null || tid === '') return null
+  if (root.tid === tid || root.TID === tid) return root
+  const stack = Array.isArray(root.children) ? [...root.children] : []
+  while (stack.length) {
+    const node = stack.shift()
+    if (!node) continue
+    if (node.tid === tid || node.TID === tid) return node
+    if (Array.isArray(node.children) && node.children.length) {
+      stack.push(...node.children)
+    }
+  }
+  return null
+}
+
+/** 收集整棵树上所有 statCalResult（挂在定量分析/定性分析等祖先节点上） */
+function collectAllStatCalResults(root, bucket = []) {
+  if (!root) return bucket
+  if (Array.isArray(root.statCalResult) && root.statCalResult.length) {
+    bucket.push(...root.statCalResult)
+  }
+  ;(root.children || []).forEach(child => collectAllStatCalResults(child, bucket))
+  return bucket
+}
+
+function findStatCalBlock(treeData, pid, modelWrap) {
+  const local = (treeData && treeData.statCalResult) || []
+  let block = local.find(r => r.pid === pid)
+  if (block) return block
+  const modelRoot = modelWrap && modelWrap.modelTreeVO
+  if (!modelRoot) return null
+  return collectAllStatCalResults(modelRoot).find(r => r.pid === pid) || null
+}
+
+/**
+ * 分组标题优先用 statCalResult.statIndicatorName（分组目录名），
+ * 否则按 pid 反查树节点 name；禁止回退到第一个指标 name（缺陷现象）。
+ */
+function resolveStatIndicatorName(calBlock, treeData, pid, indicatorItems, modelWrap) {
+  if (calBlock && calBlock.statIndicatorName) return calBlock.statIndicatorName
+  const fromTree =
+    findNodeByTid(treeData, pid) ||
+    findNodeByTid(modelWrap && modelWrap.modelTreeVO, pid)
+  if (fromTree && fromTree.name) return fromTree.name
+  const first = indicatorItems && indicatorItems[0]
+  if (first && first.folderName) return first.folderName
+  return ''
+}
+
+function resolveStatsResultList(calBlock, treeData, indicatorItems, modelWrap) {
+  const fromBlock = normalizeStatsResultList(calBlock && calBlock.statsResultList)
+  if (fromBlock) return fromBlock
+  const fromModel = normalizeStatsResultList(
+    (modelWrap && modelWrap.modelStatsSetupVOS) ||
+      (treeData && treeData.modelStatsSetupVOS)
+  )
+  if (fromModel) return fromModel
+  const first = indicatorItems && indicatorItems[0]
+  return buildStatsResultListFromChildren(statItemChildren(first))
+}
+
+function resolveTableBlockMeta(treeData, pid, indicatorItems, modelWrap) {
+  const calBlock = findStatCalBlock(treeData, pid, modelWrap)
   return {
-    statIndicatorName:
-      calBlock?.statIndicatorName || first?.folderName || first?.name || '',
-    statsResultList:
-      calBlock?.statsResultList ||
-      buildStatsResultListFromChildren(firstStatChildren)
+    statIndicatorName: resolveStatIndicatorName(
+      calBlock,
+      treeData,
+      pid,
+      indicatorItems,
+      modelWrap
+    ),
+    statsResultList: resolveStatsResultList(
+      calBlock,
+      treeData,
+      indicatorItems,
+      modelWrap
+    )
   }
 }
 
@@ -155,8 +256,9 @@ function groupIsLeaf2ByPid(nodes) {
 /**
  * @param {Object} treeData 统计模型节点
  * @param {Function} fetchScoreMap async (itemID) => optionList
+ * @param {Object} [modelWrap] 整模 ModelVO（含 modelTreeVO / modelStatsSetupVOS）
  */
-export async function buildStatModelTables(treeData, fetchScoreMap) {
+export async function buildStatModelTables(treeData, fetchScoreMap, modelWrap) {
   const isLeaf2Nodes = collectIsLeaf2Nodes(treeData.children || [])
   if (!isLeaf2Nodes.length) return []
 
@@ -168,7 +270,8 @@ export async function buildStatModelTables(treeData, fetchScoreMap) {
       const { statIndicatorName, statsResultList } = resolveTableBlockMeta(
         treeData,
         pid,
-        indicatorItems
+        indicatorItems,
+        modelWrap
       )
 
       const columns = [
@@ -342,6 +445,9 @@ export function mergeStatModelNode(target, source) {
   if (source.statsResultList) {
     target.statsResultList = source.statsResultList
   }
+  if (source.modelStatsSetupVOS) {
+    target.modelStatsSetupVOS = source.modelStatsSetupVOS
+  }
   const fields = [
     'result',
     'resultText',