'20260305修复bug'

src/components/views/xmInfo.vue

@@ -1,17 +1,15 @@
 <script setup lang="ts">
-import { computed, onActivated, onBeforeUnmount, onMounted, ref } from 'vue'
-import type { ColDef } from 'ag-grid-community'
+import { onActivated, onMounted, ref } from 'vue'
 import localforage from 'localforage'
-import { isMajorCodeInIndustryScope, majorList } from '@/sql'
-import { decimalAggSum, roundTo, sumByNumber } from '@/lib/decimal'
-import { formatThousands } from '@/lib/numberFormat'
-import CommonAgGrid from '@/components/common/CommonAgGrid.vue'
-import MethodUnavailableNotice from '@/components/common/MethodUnavailableNotice.vue'
+import { getMajorDictEntries, isMajorIdInIndustryScope } from '@/sql'
+import CommonAgGrid from '@/components/common/xmCommonAgGrid.vue'
 
 interface DictLeaf {
   id: string
   code: string
   name: string
+  hasCost: boolean
+  hasArea: boolean
 }
 
 interface DictGroup {
@@ -27,6 +25,8 @@ interface DetailRow {
   groupName: string
   majorCode: string
   majorName: string
+  hasCost: boolean
+  hasArea: boolean
   amount: number | null
   landArea: number | null
   path: string[]
@@ -41,87 +41,14 @@ interface XmBaseInfoState {
 
 const DB_KEY = 'xm-info-v3'
 const BASE_INFO_KEY = 'xm-base-info-v1'
-type MajorLite = { code: string; name: string }
+type MajorLite = { code: string; name: string; hasCost?: boolean; hasArea?: boolean }
 
 const detailRows = ref<DetailRow[]>([])
-const rootRef = ref<HTMLElement | null>(null)
-const agGridRef = ref<HTMLElement | null>(null)
-const agGridHeight = ref(580)
-let snapScrollHost: HTMLElement | null = null
-let snapTimer: ReturnType<typeof setTimeout> | null = null
-let snapLockTimer: ReturnType<typeof setTimeout> | null = null
-let gridPersistTimer: ReturnType<typeof setTimeout> | null = null
-let isSnapping = false
-let hostResizeObserver: ResizeObserver | null = null
 const activeIndustryCode = ref('')
-const hasProjectBaseInfo = ref(false)
 const detailDict = ref<DictGroup[]>([])
-const idLabelMap = ref(new Map<string, string>())
 
-const updateGridCardHeight = () => {
-  if (!snapScrollHost || !rootRef.value) return
-  const contentWrap = rootRef.value.parentElement
-  const style = contentWrap ? window.getComputedStyle(contentWrap) : null
-  const paddingTop = style ? Number.parseFloat(style.paddingTop || '0') || 0 : 0
-  const paddingBottom = style ? Number.parseFloat(style.paddingBottom || '0') || 0 : 0
-  const nextHeight = Math.max(360, Math.floor(snapScrollHost.clientHeight - paddingTop - paddingBottom))
-  agGridHeight.value = nextHeight + 10
-}
-
-const bindSnapScrollHost = () => {
-  snapScrollHost = rootRef.value?.closest('[data-slot="scroll-area-viewport"]') as HTMLElement | null
-  if (!snapScrollHost) return
-  snapScrollHost.addEventListener('scroll', handleSnapHostScroll, { passive: true })
-  hostResizeObserver?.disconnect()
-  hostResizeObserver = new ResizeObserver(() => {
-    updateGridCardHeight()
-  })
-  hostResizeObserver.observe(snapScrollHost)
-  updateGridCardHeight()
-}
-
-const unbindSnapScrollHost = () => {
-  if (snapScrollHost) {
-    snapScrollHost.removeEventListener('scroll', handleSnapHostScroll)
-  }
-  hostResizeObserver?.disconnect()
-  hostResizeObserver = null
-  snapScrollHost = null
-}
-
-const trySnapToGrid = () => {
-  if (isSnapping || !snapScrollHost || !agGridRef.value) return
-
-  const hostRect = snapScrollHost.getBoundingClientRect()
-  const gridRect = agGridRef.value.getBoundingClientRect()
-  const offsetTop = gridRect.top - hostRect.top
-  const inVisibleBand = gridRect.bottom > hostRect.top + 40 && gridRect.top < hostRect.bottom - 40
-  const inSnapRange = offsetTop > -120 && offsetTop < 180
-
-  if (!inVisibleBand || !inSnapRange) return
-
-  isSnapping = true
-  agGridRef.value.scrollIntoView({ behavior: 'smooth', block: 'start' })
-  if (snapLockTimer) clearTimeout(snapLockTimer)
-  snapLockTimer = setTimeout(() => {
-    isSnapping = false
-  }, 420)
-}
-
-function handleSnapHostScroll() {
-  if (isSnapping) return
-  if (snapTimer) clearTimeout(snapTimer)
-  snapTimer = setTimeout(() => {
-    trySnapToGrid()
-  }, 90)
-}
-
-const majorEntries = Object.entries(majorList as Record<string, MajorLite>)
-  .sort((a, b) => Number(a[0]) - Number(b[0]))
-  .filter((entry): entry is [string, MajorLite] => {
-    const item = entry[1]
-    return Boolean(item?.code && item?.name)
-  })
+const majorEntries = getMajorDictEntries().map(({ id, item }) => [id, item] as [string, MajorLite])
+const majorIdAliasMap = new Map(getMajorDictEntries().map(({ rawId, id }) => [rawId, id]))
 
 const buildDetailDict = (entries: Array<[string, MajorLite]>) => {
   const groupMap = new Map<string, DictGroup>()
@@ -156,7 +83,9 @@ const buildDetailDict = (entries: Array<[string, MajorLite]>) => {
     groupMap.get(parentCode)!.children.push({
       id: key,
       code: item.code,
-      name: item.name
+      name: item.name,
+      hasCost: item.hasCost !== false,
+      hasArea: item.hasArea !== false
     })
   }
 
@@ -166,20 +95,10 @@ const buildDetailDict = (entries: Array<[string, MajorLite]>) => {
 const rebuildDictByIndustry = (industryCode: string) => {
   if (!industryCode) {
     detailDict.value = []
-    idLabelMap.value = new Map()
     return
   }
-  const filteredEntries = majorEntries.filter(([, item]) => isMajorCodeInIndustryScope(item.code, industryCode))
-  const nextDict = buildDetailDict(filteredEntries)
-  const nextLabelMap = new Map<string, string>()
-  for (const group of nextDict) {
-    nextLabelMap.set(group.id, `${group.code} ${group.name}`)
-    for (const child of group.children) {
-      nextLabelMap.set(child.id, `${child.code} ${child.name}`)
-    }
-  }
-  detailDict.value = nextDict
-  idLabelMap.value = nextLabelMap
+  const filteredEntries = majorEntries.filter(([id]) => isMajorIdInIndustryScope(id, industryCode))
+  detailDict.value = buildDetailDict(filteredEntries)
 }
 
 const buildDefaultRows = (): DetailRow[] => {
@@ -192,9 +111,11 @@ const buildDefaultRows = (): DetailRow[] => {
         groupName: group.name,
         majorCode: child.code,
         majorName: child.name,
+        hasCost: child.hasCost,
+        hasArea: child.hasArea,
         amount: null,
         landArea: null,
-        path: [group.id, child.id]
+        path: [`${group.code} ${group.name}`, `${child.code} ${child.name}`]
       })
     }
   }
@@ -204,7 +125,12 @@ const buildDefaultRows = (): DetailRow[] => {
 const mergeWithDictRows = (rowsFromDb: DetailRow[] | undefined): DetailRow[] => {
   const dbValueMap = new Map<string, DetailRow>()
   for (const row of rowsFromDb || []) {
-    dbValueMap.set(row.id, row)
+    const rowId = String(row.id)
+    dbValueMap.set(rowId, row)
+    const aliasId = majorIdAliasMap.get(rowId)
+    if (aliasId && !dbValueMap.has(aliasId)) {
+      dbValueMap.set(aliasId, row)
+    }
   }
 
   return buildDefaultRows().map(row => {
@@ -213,121 +139,15 @@ const mergeWithDictRows = (rowsFromDb: DetailRow[] | undefined): DetailRow[] =>
 
     return {
       ...row,
-      amount: typeof fromDb.amount === 'number' ? fromDb.amount : null,
-      landArea: typeof fromDb.landArea === 'number' ? fromDb.landArea : null
+      amount: row.hasCost && typeof fromDb.amount === 'number' ? fromDb.amount : null,
+      landArea: row.hasArea && typeof fromDb.landArea === 'number' ? fromDb.landArea : null
     }
   })
 }
 
-const columnDefs: ColDef<DetailRow>[] = [
-  {
-    headerName: '造价金额(万元)',
-    field: 'amount',
-    headerClass: 'ag-right-aligned-header',
-    minWidth: 100,
-    flex: 1,
-    editable: params => !params.node?.group && !params.node?.rowPinned,
-    cellClass: params => (!params.node?.group && !params.node?.rowPinned ? 'ag-right-aligned-cell editable-cell-line' : 'ag-right-aligned-cell'),
-    cellClassRules: {
-      'editable-cell-empty': params =>
-        !params.node?.group && !params.node?.rowPinned && (params.value == null || params.value === '')
-    },
-    aggFunc: decimalAggSum,
-    valueParser: params => {
-      if (params.newValue === '' || params.newValue == null) return null
-      const v = Number(params.newValue)
-      return Number.isFinite(v) ? roundTo(v, 2) : null
-    },
-    valueFormatter: params => {
-      if (!params.node?.group && !params.node?.rowPinned && (params.value == null || params.value === '')) {
-        return '点击输入'
-      }
-      if (params.value == null) return ''
-      return formatThousands(params.value)
-    }
-  },
-  {
-    headerName: '用地面积(亩)',
-    field: 'landArea',
-    headerClass: 'ag-right-aligned-header',
-    minWidth: 100,
-    flex: 1,
-    editable: params => !params.node?.group && !params.node?.rowPinned,
-    cellClass: params =>
-      !params.node?.group && !params.node?.rowPinned
-        ? 'ag-right-aligned-cell editable-cell-line'
-        : 'ag-right-aligned-cell',
-    cellClassRules: {
-      'editable-cell-empty': params =>
-        !params.node?.group && !params.node?.rowPinned && (params.value == null || params.value === '')
-    },
-    valueParser: params => {
-      if (params.newValue === '' || params.newValue == null) return null
-      const v = Number(params.newValue)
-      return Number.isFinite(v) ? roundTo(v, 3) : null
-    },
-    valueFormatter: params => {
-      if (!params.node?.group && !params.node?.rowPinned && (params.value == null || params.value === '')) {
-        return '点击输入'
-      }
-      if (params.value == null) return ''
-      return formatThousands(params.value, 3)
-    }
-  }
-]
-
-const autoGroupColumnDef: ColDef = {
-  headerName: '专业编码以及工程专业名称',
-  minWidth: 200,
-  flex: 2,
-  cellRendererParams: {
-    suppressCount: true
-  },
-  valueFormatter: params => {
-    if (params.node?.rowPinned) {
-      return '总合计'
-    }
-    const nodeId = String(params.value || '')
-    return idLabelMap.value.get(nodeId) || nodeId
-  },
-  tooltipValueGetter: params => {
-    if (params.node?.rowPinned) return '总合计'
-    const nodeId = String(params.value || '')
-    return idLabelMap.value.get(nodeId) || nodeId
-  }
-}
-
-const totalAmount = computed(() => sumByNumber(detailRows.value, row => row.amount))
-
-const pinnedTopRowData = computed(() => [
-  {
-    id: 'pinned-total-row',
-    groupCode: '',
-    groupName: '',
-    majorCode: '',
-    majorName: '',
-    amount: totalAmount.value,
-    landArea: null,
-    path: ['TOTAL']
-  }
-])
-
-const saveToIndexedDB = async () => {
-  if (!activeIndustryCode.value) return
-  try {
-    const payload: XmScaleState = {
-      detailRows: JSON.parse(JSON.stringify(detailRows.value))
-    }
-    await localforage.setItem(DB_KEY, payload)
-  } catch (error) {
-    console.error('saveToIndexedDB failed:', error)
-  }
-}
-
 const loadFromIndexedDB = async () => {
   try {
     const baseInfo = await localforage.getItem<XmBaseInfoState>(BASE_INFO_KEY)
-    hasProjectBaseInfo.value = Boolean(baseInfo)
     activeIndustryCode.value =
       typeof baseInfo?.projectIndustry === 'string' ? baseInfo.projectIndustry.trim() : ''
     rebuildDictByIndustry(activeIndustryCode.value)
@@ -345,90 +165,19 @@ const loadFromIndexedDB = async () => {
     detailRows.value = buildDefaultRows()
   } catch (error) {
     console.error('loadFromIndexedDB failed:', error)
-    hasProjectBaseInfo.value = false
     detailRows.value = []
   }
 }
 
-const handleCellValueChanged = () => {
-  if (gridPersistTimer) clearTimeout(gridPersistTimer)
-  gridPersistTimer = setTimeout(() => {
-    void saveToIndexedDB()
-  }, 1000)
-}
-
 onMounted(async () => {
   await loadFromIndexedDB()
-  bindSnapScrollHost()
-  requestAnimationFrame(() => {
-    updateGridCardHeight()
-  })
 })
 
 onActivated(() => {
   void loadFromIndexedDB()
 })
-
-onBeforeUnmount(() => {
-  unbindSnapScrollHost()
-  if (gridPersistTimer) clearTimeout(gridPersistTimer)
-  if (snapTimer) clearTimeout(snapTimer)
-  if (snapLockTimer) clearTimeout(snapLockTimer)
-  void saveToIndexedDB()
-})
-
-const processCellForClipboard = (params: any) => {
-  if (Array.isArray(params.value)) {
-    return JSON.stringify(params.value)
-  }
-  return params.value
-}
-
-const processCellFromClipboard = (params: any) => {
-  try {
-    const parsed = JSON.parse(params.value)
-    if (Array.isArray(parsed)) return parsed
-  } catch (e) {
-    // no-op
-  }
-  return params.value
-}
-
-
 </script>
 
 <template>
-  <div ref="rootRef" class="h-full">
-    <MethodUnavailableNotice
-      v-if="!hasProjectBaseInfo"
-      title="请先在“基础信息”里新建项目"
-      message="完成新建后将自动加载规模信息。"
-    />
-    <div
-      v-else
-      class="rounded-lg border bg-card xmMx scroll-mt-3 flex flex-col overflow-hidden h-full"
-    >
-      <div class="flex items-center justify-between border-b px-4 py-3 ">
-        <h3
-          class="text-sm font-semibold text-foreground cursor-pointer select-none transition-colors hover:text-primary"
-          
-        >
-          项目明细
-        </h3>
-        <div class="text-xs text-muted-foreground"></div>
-      </div>
-
-      <div ref="agGridRef" class="ag-theme-quartz w-full flex-1 min-h-0 h-full">
-        <CommonAgGrid
-          :rowData="detailRows"
-          :pinnedTopRowData="pinnedTopRowData"
-          :columnDefs="columnDefs"
-          :autoGroupColumnDef="autoGroupColumnDef"
-          :processCellForClipboard="processCellForClipboard"
-          :processCellFromClipboard="processCellFromClipboard"
-          @cell-value-changed="handleCellValueChanged"
-        />
-      </div>
-    </div>
-  </div>
+  <CommonAgGrid title="项目明细" :rowData="detailRows" :dbKey="DB_KEY" />
 </template>