Merge branch 'dev' of http://192.168.50.149:8085/r/aps-kj-web into dev

CD配唱片

2025-04-25 b93a8c6a6fe812d6b1f6b3e71f6ccf95ad1daad4

Merge branch 'dev' of http://192.168.50.149:8085/r/aps-kj-web into dev

 package.json

@@ -37,7 +37,9 @@
    "vue-router": "4.4.0",
    "vuedraggable": "4.1.0",
    "vxe-pc-ui": "4.5.15",
    "xlsx": "^0.18.5"
    "xlsx": "^0.18.5",
    "vxe-table": "^4.13.8",
    "xe-utils": "^3.7.4"
  },
  "devDependencies": {
    "@vitejs/plugin-vue": "5.0.5",
@@ -46,8 +48,6 @@
    "unplugin-vue-setup-extend-plus": "1.0.1",
    "vite": "5.3.2",
    "vite-plugin-compression": "0.5.1",
    "vite-plugin-svg-icons": "2.0.1",
    "vxe-table": "^4.13.8",
    "xe-utils": "^3.7.4"
    "vite-plugin-svg-icons": "2.0.1"
  }
}

 src/components/HxlhTable/index.vue

@@ -16,7 +16,8 @@
      :pager-config="tablePage"
      :form-config="tableForm"
      :columns="columns"
      :column-config="{ resizable: true }"
      :column-config="{ resizable: true, useKey: true }"
      :row-config="{ useKey: true }"
      :data.sync="data"
      :checkbox-config="checkboxConfig"
      :height="height"
@@ -168,7 +169,7 @@
  treeConfig: {
    type: Object,
    default: () => {
      return {};
      return null;
    },
  },
  rowStyle: {