vue2-client 1.20.39 → 1.20.41

package/.env.message

@@ -1,19 +1,19 @@
-VUE_APP_PUBLIC_PATH=/
-VUE_APP_NAME=Admin
-VUE_APP_ROUTES_KEY=admin.routes
-VUE_APP_PERMISSIONS_KEY=admin.permissions
-VUE_APP_ROLES_KEY=admin.roles
-VUE_APP_USER_KEY=admin.user
-VUE_APP_LOGIN_KEY=admin.login
-VUE_APP_SETTING_KEY=admin.setting
-VUE_APP_TBAS_KEY=admin.tabs
-VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
-VUE_APP_DICTIONARY_KEY=admin.dictionary
-VUE_APP_BADGE_KEY=admin.badge
-VUE_APP_SINGLEVALUE_KEY=admin.singlevalue
-VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
-VUE_APP_WEB_CONFIG_KEY=admin.webconfig
-VUE_APP_API_BASE_URL=http://123.60.214.109:8405
-VUE_APP_SYSTEM_NAME=af-message
-VUE_APP_LOGIN_VERSION=V4
-
+VUE_APP_PUBLIC_PATH=/
+VUE_APP_NAME=Admin
+VUE_APP_ROUTES_KEY=admin.routes
+VUE_APP_PERMISSIONS_KEY=admin.permissions
+VUE_APP_ROLES_KEY=admin.roles
+VUE_APP_USER_KEY=admin.user
+VUE_APP_LOGIN_KEY=admin.login
+VUE_APP_SETTING_KEY=admin.setting
+VUE_APP_TBAS_KEY=admin.tabs
+VUE_APP_TBAS_TITLES_KEY=admin.tabs.titles
+VUE_APP_DICTIONARY_KEY=admin.dictionary
+VUE_APP_BADGE_KEY=admin.badge
+VUE_APP_SINGLEVALUE_KEY=admin.singlevalue
+VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
+VUE_APP_WEB_CONFIG_KEY=admin.webconfig
+VUE_APP_API_BASE_URL=http://123.60.214.109:8405
+VUE_APP_SYSTEM_NAME=af-message
+VUE_APP_LOGIN_VERSION=V4
+

package/package.json

@@ -1,115 +1,115 @@
-{
-  "name": "vue2-client",
-  "version": "1.20.39",
-  "private": false,
-  "scripts": {
-    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
-    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
-    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
-    "serve:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
-    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
-    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
-    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
-    "serve:runtime": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode runtime",
-    "serve:message": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode message",
-    "serve:apply": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode apply",
-    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
-    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "lint": "vue-cli-service lint",
-    "build:preview": "vue-cli-service build --mode preview",
-    "lint:nofix": "vue-cli-service lint --no-fix",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@afwenming123/vue-easy-tree": "^1.0.1",
-    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
-    "@amap/amap-jsapi-loader": "^1.0.1",
-    "@antv/data-set": "^0.11.8",
-    "@antv/g2plot": "^2.4.31",
-    "@hufe921/canvas-editor": "^0.9.49",
-    "@microsoft/fetch-event-source": "^2.0.1",
-    "@vue/babel-preset-jsx": "^1.4.0",
-    "animate.css": "^4.1.1",
-    "ant-design-vue": "^1.7.8",
-    "axios": "^0.27.2",
-    "clipboard": "^2.0.11",
-    "core-js": "^3.33.0",
-    "crypto-js": "^4.1.1",
-    "date-fns": "^2.29.3",
-    "default-passive-events": "^2.0.0",
-    "dotenv": "^16.3.1",
-    "echarts": "^5.5.0",
-    "enquire.js": "^2.1.6",
-    "file-saver": "^2.0.5",
-    "highlight.js": "^11.7.0",
-    "html-to-image": "^1.11.13",
-    "html2canvas": "^1.4.1",
-    "js-base64": "^3.7.5",
-    "js-cookie": "^2.2.1",
-    "jsencrypt": "^3.3.2",
-    "jspdf": "^2.5.1",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.debounce": "^4",
-    "lodash.get": "^4.4.2",
-    "marked": "^4",
-    "mockjs": "^1.1.0",
-    "nprogress": "^0.2.0",
-    "ol": "10.3.1",
-    "qs": "^6.11.2",
-    "regenerator-runtime": "^0.14.0",
-    "splitpanes": "^2.4.1",
-    "videojs-contrib-hls": "^5.15.0",
-    "viser-vue": "^2.4.8",
-    "vue": "^2.7.14",
-    "vue-codemirror": "4.0.6",
-    "vue-color": "2.7.0",
-    "vue-draggable-resizable": "^2.3.0",
-    "vue-i18n": "^8.28.2",
-    "vue-json-viewer": "^2.2.22",
-    "vue-router": "^3.6.5",
-    "vue-video-player": "^5.0.2",
-    "vue-virtual-scroller": "^1.1.2",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.6.2",
-    "xlsx": "0.18.5"
-  },
-  "devDependencies": {
-    "@ant-design/colors": "^7.0.0",
-    "@babel/core": "^7.22.20",
-    "@babel/eslint-parser": "^7.22.15",
-    "@babel/preset-env": "^7.22.20",
-    "@vue/cli-plugin-babel": "^5.0.8",
-    "@vue/cli-plugin-eslint": "^5.0.8",
-    "@vue/cli-service": "^5.0.8",
-    "@vue/eslint-config-standard": "^8.0.1",
-    "@vue/test-utils": "^1.3.6",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "compression-webpack-plugin": "^10.0.0",
-    "css-minimizer-webpack-plugin": "^5.0.1",
-    "deepmerge": "^4.3.1",
-    "eslint": "^8.51.0",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-vue": "^9.17.0",
-    "fast-deep-equal": "^3.1.3",
-    "ignore-loader": "^0.1.2",
-    "jest": "^29.7.0",
-    "jest-environment-jsdom": "^29.7.0",
-    "jest-transform-stub": "^2.0.0",
-    "less-loader": "^6.2.0",
-    "script-loader": "^0.7.2",
-    "style-resources-loader": "^1.5.0",
-    "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-jest": "^4.0.1",
-    "vue-template-compiler": "^2.7.14",
-    "webpack": "^5.88.2",
-    "webpack-theme-color-replacer": "^1.4.7",
-    "whatwg-fetch": "^3.6.19"
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not dead",
-    "not ie 11"
-  ]
-}
+{
+  "name": "vue2-client",
+  "version": "1.20.41",
+  "private": false,
+  "scripts": {
+    "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",
+    "serve:gaslink": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode gaslink",
+    "serve:revenue": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode revenue",
+    "serve:liuli": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode liuli",
+    "serve:scada": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode scada",
+    "serve:iot": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode iot",
+    "serve:his": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode his",
+    "serve:runtime": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode runtime",
+    "serve:message": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode message",
+    "serve:apply": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint --mode apply",
+    "mac-serve": "vue-cli-service serve --no-eslint --mode his",
+    "build": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "lint": "vue-cli-service lint",
+    "build:preview": "vue-cli-service build --mode preview",
+    "lint:nofix": "vue-cli-service lint --no-fix",
+    "test": "jest"
+  },
+  "dependencies": {
+    "@afwenming123/vue-easy-tree": "^1.0.1",
+    "@afwenming123/vue-plugin-hiprint": "^0.0.70",
+    "@amap/amap-jsapi-loader": "^1.0.1",
+    "@antv/data-set": "^0.11.8",
+    "@antv/g2plot": "^2.4.31",
+    "@hufe921/canvas-editor": "^0.9.49",
+    "@microsoft/fetch-event-source": "^2.0.1",
+    "@vue/babel-preset-jsx": "^1.4.0",
+    "animate.css": "^4.1.1",
+    "ant-design-vue": "^1.7.8",
+    "axios": "^0.27.2",
+    "clipboard": "^2.0.11",
+    "core-js": "^3.33.0",
+    "crypto-js": "^4.1.1",
+    "date-fns": "^2.29.3",
+    "default-passive-events": "^2.0.0",
+    "dotenv": "^16.3.1",
+    "echarts": "^5.5.0",
+    "enquire.js": "^2.1.6",
+    "file-saver": "^2.0.5",
+    "highlight.js": "^11.7.0",
+    "html-to-image": "^1.11.13",
+    "html2canvas": "^1.4.1",
+    "js-base64": "^3.7.5",
+    "js-cookie": "^2.2.1",
+    "jsencrypt": "^3.3.2",
+    "jspdf": "^2.5.1",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.debounce": "^4",
+    "lodash.get": "^4.4.2",
+    "marked": "^4",
+    "mockjs": "^1.1.0",
+    "nprogress": "^0.2.0",
+    "ol": "10.3.1",
+    "qs": "^6.11.2",
+    "regenerator-runtime": "^0.14.0",
+    "splitpanes": "^2.4.1",
+    "videojs-contrib-hls": "^5.15.0",
+    "viser-vue": "^2.4.8",
+    "vue": "^2.7.14",
+    "vue-codemirror": "4.0.6",
+    "vue-color": "2.7.0",
+    "vue-draggable-resizable": "^2.3.0",
+    "vue-i18n": "^8.28.2",
+    "vue-json-viewer": "^2.2.22",
+    "vue-router": "^3.6.5",
+    "vue-video-player": "^5.0.2",
+    "vue-virtual-scroller": "^1.1.2",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.6.2",
+    "xlsx": "0.18.5"
+  },
+  "devDependencies": {
+    "@ant-design/colors": "^7.0.0",
+    "@babel/core": "^7.22.20",
+    "@babel/eslint-parser": "^7.22.15",
+    "@babel/preset-env": "^7.22.20",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
+    "@vue/eslint-config-standard": "^8.0.1",
+    "@vue/test-utils": "^1.3.6",
+    "babel-plugin-transform-remove-console": "^6.9.4",
+    "compression-webpack-plugin": "^10.0.0",
+    "css-minimizer-webpack-plugin": "^5.0.1",
+    "deepmerge": "^4.3.1",
+    "eslint": "^8.51.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-vue": "^9.17.0",
+    "fast-deep-equal": "^3.1.3",
+    "ignore-loader": "^0.1.2",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "jest-transform-stub": "^2.0.0",
+    "less-loader": "^6.2.0",
+    "script-loader": "^0.7.2",
+    "style-resources-loader": "^1.5.0",
+    "vue-cli-plugin-style-resources-loader": "^0.1.5",
+    "vue-jest": "^4.0.1",
+    "vue-template-compiler": "^2.7.14",
+    "webpack": "^5.88.2",
+    "webpack-theme-color-replacer": "^1.4.7",
+    "whatwg-fetch": "^3.6.19"
+  },
+  "browserslist": [
+    "> 1%",
+    "last 2 versions",
+    "not dead",
+    "not ie 11"
+  ]
+}

package/src/base-client/components/common/HIS/HFormTable/HFormTable.vue

@@ -21,16 +21,17 @@ const SYNC_DELAY_RETRY = 60
 const SYNC_DELAY_EXPAND = 20
 
 // 选择器常量
-const MAIN_TABLE_SELECTORS = [
-  '.ant-table-tbody > tr.ant-table-row',
-  '.ant-table-body > table > tbody > tr.ant-table-row'
-]
 const FIXED_TABLE_SELECTORS = [
   '.ant-table-fixed-right .ant-table-tbody > tr',
   '.ant-table-fixed-right .ant-table-body-inner > table > tbody > tr',
   '.ant-table-fixed-right .ant-table-body > table > tbody > tr'
 ]
 const MAIN_TBODY_SELECTORS = ['.ant-table-body > table > tbody', '.ant-table-tbody']
+// 仅主表滚动区域 tbody（不含左右固定列表格），用于按 data-row-key 对齐展开行与固定列
+const MAIN_SCROLL_TBODY_SELECTORS = [
+  '.ant-table-scroll .ant-table-body > table > tbody',
+  '.ant-table-body > table > tbody'
+]
 const FIXED_TBODY_SELECTORS = [
   '.ant-table-fixed-right .ant-table-body-inner > table > tbody',
   '.ant-table-fixed-right .ant-table-body > table > tbody',
@@ -41,6 +42,12 @@ const TABLE_BODY_SELECTORS = ['.ant-table-body', '.ant-table-body-inner']
 // 辅助函数
 const getRowKey = (tr) => tr?.getAttribute?.('data-row-key') || tr?.dataset?.rowKey || ''
 
+const escapeRowKeyAttr = (key) => {
+  const s = String(key)
+  if (typeof CSS !== 'undefined' && typeof CSS.escape === 'function') return CSS.escape(s)
+  return s.replace(/\\/g, '\\\\').replace(/"/g, '\\"')
+}
+
 const cleanRowStyles = (element, isCollapse = false) => {
   if (!element) return
   element.removeAttribute('data-synced-height')
@@ -129,6 +136,8 @@ let resizeObserver = null
 let isSyncing = false
 let rafId = 0
 let syncAfterPageChangeTimer = 0
+// 记录上一次同步时的固定行高度快照，防止 MutationObserver 循环触发
+let lastSyncedSnapshot = ''
 
 const getWrapperEl = () => wrapperRef.value
 
@@ -157,7 +166,6 @@ const clearAllFixedRowHeights = () => {
 }
 
 const scheduleSyncAfterPageChange = () => {
-  clearAllFixedRowHeights()
   if (syncAfterPageChangeTimer) clearTimeout(syncAfterPageChangeTimer)
   syncAfterPageChangeTimer = setTimeout(() => {
     syncAfterPageChangeTimer = 0
@@ -177,22 +185,17 @@ const setupHeightSync = () => {
 
     const observerOptions = {
       childList: true,
-      subtree: true,
-      attributes: true,
-      attributeFilter: ['style', 'class']
+      subtree: true
     }
 
     observer = new MutationObserver((mutations) => {
       if (isSyncing) return
+      const wrapper = getWrapperEl()
+      if (wrapper && wrapper.dataset.heightSyncing) return
+
       const hasChildList = mutations.some(m => m.type === 'childList')
-      const hasAttr = mutations.some(m =>
-        m.type === 'attributes' &&
-        (m.attributeName === 'style' || m.attributeName === 'class')
-      )
       if (hasChildList) {
         scheduleSyncAfterPageChange()
-      } else if (hasAttr) {
-        scheduleSync()
       }
     })
 
@@ -215,25 +218,56 @@ const syncFixedExpandedHeights = () => {
     if (isSyncing) return
     isSyncing = true
 
-    const mainRows = Array.from(wrapper.querySelectorAll(MAIN_TABLE_SELECTORS.join(', ')))
+    const mainScrollTbody = queryFirst(wrapper, MAIN_SCROLL_TBODY_SELECTORS)
+    if (!mainScrollTbody) {
+      isSyncing = false
+      return
+    }
+
     const fixedRows = Array.from(wrapper.querySelectorAll(FIXED_TABLE_SELECTORS.join(', ')))
 
-    // 只取有 key 的行进行顺序匹配
-    const mainRowsList = mainRows.filter(m => getRowKey(m))
-    const fixedRowsList = fixedRows.filter(f => getRowKey(f))
-    const count = Math.min(mainRowsList.length, fixedRowsList.length)
+    // 生成当前快照：如果与上次完全相同，跳过写入
+    const snapshotParts = []
+    fixedRows.forEach(f => {
+      const key = getRowKey(f)
+      if (!key) return
+      let mainTr = null
+      try {
+        mainTr = mainScrollTbody.querySelector(`tr[data-row-key="${escapeRowKeyAttr(key)}"]`)
+      } catch (e) { mainTr = null }
+      if (!mainTr) return
+      const h = Math.round(mainTr.getBoundingClientRect().height)
+      if (h) snapshotParts.push(key + ':' + h)
+    })
+    const snapshot = snapshotParts.join('|')
+    if (snapshot === lastSyncedSnapshot) {
+      isSyncing = false
+      return
+    }
+    lastSyncedSnapshot = snapshot
+
+    fixedRows.forEach(f => {
+      const key = getRowKey(f)
+      if (!key) return
+
+      let mainTr = null
+      try {
+        mainTr = mainScrollTbody.querySelector(`tr[data-row-key="${escapeRowKeyAttr(key)}"]`)
+      } catch (e) { mainTr = null }
 
-    for (let i = 0; i < count; i++) {
-      const m = mainRowsList[i]
-      const f = fixedRowsList[i]
-      const key = getRowKey(m)
-      if (!key) continue
+      if (!mainTr) {
+        if (f.dataset.syncedHeight) {
+          cleanRowStyles(f, true)
+          f.querySelectorAll('td').forEach(td => cleanCellStyles(td, true))
+        }
+        return
+      }
 
-      const h = Math.round(m.getBoundingClientRect().height)
-      if (!h) continue
+      const h = Math.round(mainTr.getBoundingClientRect().height)
+      if (!h) return
 
       const hs = String(h)
-      if (f.dataset.syncedHeight === hs) continue
+      if (f.dataset.syncedHeight === hs) return
       f.dataset.syncedHeight = hs
 
       f.style.cssText = ''
@@ -250,16 +284,6 @@ const syncFixedExpandedHeights = () => {
         td.style.setProperty('line-height', 'normal', 'important')
         td.style.setProperty('vertical-align', 'middle', 'important')
       })
-    }
-
-    // 清理无对应主表 key 的固定列行
-    const mainKeys = new Set(mainRowsList.map(m => getRowKey(m)))
-    fixedRows.forEach(f => {
-      const key = getRowKey(f)
-      if (!mainKeys.has(key) && f.dataset.syncedHeight) {
-        cleanRowStyles(f, true)
-        f.querySelectorAll('td').forEach(td => cleanCellStyles(td, true))
-      }
     })
   } catch (e) {
     console.warn('[HFormTable] syncFixedExpandedHeights error:', e)
@@ -678,7 +702,8 @@ defineExpose({
 <!-- 非scoped样式：全局覆盖表格内下拉框宽度 -->
 <style lang="less">
 .h-form-table-wrapper {
-  .ant-table-tbody td {
+  // 只针对普通数据行的单元格，排除展开行
+  .ant-table-tbody > tr:not(.ant-table-expanded-row) > td {
     --form-label-width: 0 !important;
 
     .ant-select,

package/src/base-client/components/common/ImagePreviewModal/index.js

@@ -1,3 +1,3 @@
-import ImagePreviewModal from './ImagePreviewModal'
-
-export default ImagePreviewModal
+import ImagePreviewModal from './ImagePreviewModal'
+
+export default ImagePreviewModal