af-mobile-client-vue3 1.3.1 → 1.3.2

package/compress.js

@@ -1,36 +1,36 @@
-import fs from 'node:fs'
-import path from 'node:path'
-import { fileURLToPath } from 'node:url'
-import * as tar from 'tar'
-
-// 当前文件所在目录
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-
-// 压缩源目录名（即 build 后生成的目录名）
-const outputName = `dist_af-library-mobile-web`
-
-// 源目录路径
-const cwd = path.join(__dirname, 'dist', outputName)
-
-// 输出 tar.gz 文件路径
-const outputPath = path.join(__dirname, 'dist', `${outputName}.tar.gz`)
-
-if (!fs.existsSync(cwd)) {
-  console.error('❌ 目录不存在:', cwd)
-  // eslint-disable-next-line node/prefer-global/process
-  process.exit(1)
-}
-
-tar.c(
-  {
-    gzip: true,
-    file: outputPath,
-    cwd,
-  },
-  ['.'],
-).then(() => {
-  console.log(`✅ 压缩完成: ${outputPath}`)
-}).catch((err) => {
-  console.error('❌ 压缩失败:', err)
-})
+import fs from 'node:fs'
+import path from 'node:path'
+import { fileURLToPath } from 'node:url'
+import * as tar from 'tar'
+
+// 当前文件所在目录
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
+// 压缩源目录名（即 build 后生成的目录名）
+const outputName = `dist_af-library-mobile-web`
+
+// 源目录路径
+const cwd = path.join(__dirname, 'dist', outputName)
+
+// 输出 tar.gz 文件路径
+const outputPath = path.join(__dirname, 'dist', `${outputName}.tar.gz`)
+
+if (!fs.existsSync(cwd)) {
+  console.error('❌ 目录不存在:', cwd)
+  // eslint-disable-next-line node/prefer-global/process
+  process.exit(1)
+}
+
+tar.c(
+  {
+    gzip: true,
+    file: outputPath,
+    cwd,
+  },
+  ['.'],
+).then(() => {
+  console.log(`✅ 压缩完成: ${outputPath}`)
+}).catch((err) => {
+  console.error('❌ 压缩失败:', err)
+})

package/package.json

@@ -1,114 +1,114 @@
-{
-  "name": "af-mobile-client-vue3",
-  "type": "module",
-  "version": "1.3.1",
-  "packageManager": "pnpm@10.13.1",
-  "description": "Vue + Vite component lib",
-  "engines": {
-    "node": ">=20.19.0"
-  },
-  "scripts": {
-    "dev": "cross-env MOCK_SERVER_PORT=8086 vite",
-    "compress": "node ./compress.js",
-    "build:dev": "vue-tsc --noEmit && vite build --mode development",
-    "build:pro": "vue-tsc --noEmit && vite build --mode production && pnpm run compress",
-    "preview": "vite preview",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "release": "bumpp --commit --push --tag",
-    "typecheck": "vue-tsc --noEmit",
-    "commitlint": "commitlint --edit",
-    "prepare": "simple-git-hooks"
-  },
-  "dependencies": {
-    "@iconify/vue": "4.3.0",
-    "@micro-zoe/micro-app": "1.0.0-rc.26",
-    "@unhead/vue": "2.0.12",
-    "@vant/area-data": "^2.0.0",
-    "@vant/touch-emulator": "^1.4.0",
-    "@vant/use": "^1.6.0",
-    "@vueuse/core": "^13.5.0",
-    "axios": "^1.10.0",
-    "crypto-js": "^4.2.0",
-    "dayjs": "^1.11.13",
-    "echarts": "^5.6.0",
-    "lodash-es": "^4.17.21",
-    "nprogress": "^0.2.0",
-    "ol": "^10.5.0",
-    "pinia": "^3.0.3",
-    "pinia-plugin-persistedstate": "^4.4.1",
-    "resize-detector": "^0.3.0",
-    "vant": "^4.9.21",
-    "vconsole": "^3.15.1",
-    "vue": "^3.5.17",
-    "vue-i18n": "^11.1.10",
-    "vue-router": "^4.5.1",
-    "vue3-hash-calendar": "^1.1.3"
-  },
-  "devDependencies": {
-    "@antfu/eslint-config": "4.17.0",
-    "@commitlint/cli": "^19.8.1",
-    "@commitlint/config-conventional": "^19.8.1",
-    "@commitlint/types": "^19.8.1",
-    "@iconify/json": "2.2.318",
-    "@iconify/utils": "^2.3.0",
-    "@intlify/unplugin-vue-i18n": "^6.0.8",
-    "@types/crypto-js": "^4.2.2",
-    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^24.0.14",
-    "@types/nprogress": "^0.2.3",
-    "@unocss/eslint-config": "66.3.3",
-    "@vitejs/plugin-legacy": "^7.0.1",
-    "@vitejs/plugin-vue": "^6.0.0",
-    "autoprefixer": "^10.4.21",
-    "bumpp": "^10.2.0",
-    "consola": "^3.4.2",
-    "cross-env": "^7.0.3",
-    "eslint": "^9.31.0",
-    "eslint-plugin-format": "^1.0.1",
-    "less": "^4.4.0",
-    "lint-staged": "^16.1.2",
-    "mockjs": "^1.1.0",
-    "postcss-mobile-forever": "^5.0.0",
-    "rollup": "^4.45.1",
-    "simple-git-hooks": "^2.13.0",
-    "tar": "^7.4.3",
-    "terser": "^5.43.1",
-    "typescript": "^5.8.3",
-    "unocss": "66.3.3",
-    "vite": "^7.0.5",
-    "vite-plugin-compression": "^0.5.1",
-    "vite-plugin-mock-dev-server": "^1.9.1",
-    "vite-plugin-pwa": "^1.0.1",
-    "vite-plugin-sitemap": "^0.8.2",
-    "vite-plugin-vconsole": "^2.1.1",
-    "vite-plugin-vue-devtools": "^7.7.7",
-    "vue-tsc": "^3.0.2"
-  },
-  "pnpm": {
-    "allowedDeprecatedVersions": {
-      "glob": "7.2.3",
-      "inflight": "1.0.6",
-      "sourcemap-codec": "1.4.8"
-    },
-    "peerDependencyRules": {
-      "allowedVersions": {}
-    },
-    "onlyBuiltDependencies": [
-      "core-js",
-      "esbuild",
-      "simple-git-hooks",
-      "unrs-resolver"
-    ]
-  },
-  "resolutions": {
-    "vite": "^7.0.5"
-  },
-  "simple-git-hooks": {
-    "pre-commit": "pnpm lint-staged",
-    "commit-msg": "pnpm commitlint $1"
-  },
-  "lint-staged": {
-    "*": "eslint --fix"
-  }
-}
+{
+  "name": "af-mobile-client-vue3",
+  "type": "module",
+  "version": "1.3.2",
+  "packageManager": "pnpm@10.13.1",
+  "description": "Vue + Vite component lib",
+  "engines": {
+    "node": ">=20.19.0"
+  },
+  "scripts": {
+    "dev": "cross-env MOCK_SERVER_PORT=8086 vite",
+    "compress": "node ./compress.js",
+    "build:dev": "vue-tsc --noEmit && vite build --mode development",
+    "build:pro": "vue-tsc --noEmit && vite build --mode production && pnpm run compress",
+    "preview": "vite preview",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "release": "bumpp --commit --push --tag",
+    "typecheck": "vue-tsc --noEmit",
+    "commitlint": "commitlint --edit",
+    "prepare": "simple-git-hooks"
+  },
+  "dependencies": {
+    "@iconify/vue": "4.3.0",
+    "@micro-zoe/micro-app": "1.0.0-rc.26",
+    "@unhead/vue": "2.0.12",
+    "@vant/area-data": "^2.0.0",
+    "@vant/touch-emulator": "^1.4.0",
+    "@vant/use": "^1.6.0",
+    "@vueuse/core": "^13.5.0",
+    "axios": "^1.10.0",
+    "crypto-js": "^4.2.0",
+    "dayjs": "^1.11.13",
+    "echarts": "^5.6.0",
+    "lodash-es": "^4.17.21",
+    "nprogress": "^0.2.0",
+    "ol": "^10.5.0",
+    "pinia": "^3.0.3",
+    "pinia-plugin-persistedstate": "^4.4.1",
+    "resize-detector": "^0.3.0",
+    "vant": "^4.9.21",
+    "vconsole": "^3.15.1",
+    "vue": "^3.5.17",
+    "vue-i18n": "^11.1.10",
+    "vue-router": "^4.5.1",
+    "vue3-hash-calendar": "^1.1.3"
+  },
+  "devDependencies": {
+    "@antfu/eslint-config": "4.17.0",
+    "@commitlint/cli": "^19.8.1",
+    "@commitlint/config-conventional": "^19.8.1",
+    "@commitlint/types": "^19.8.1",
+    "@iconify/json": "2.2.318",
+    "@iconify/utils": "^2.3.0",
+    "@intlify/unplugin-vue-i18n": "^6.0.8",
+    "@types/crypto-js": "^4.2.2",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^24.0.14",
+    "@types/nprogress": "^0.2.3",
+    "@unocss/eslint-config": "66.3.3",
+    "@vitejs/plugin-legacy": "^7.0.1",
+    "@vitejs/plugin-vue": "^6.0.0",
+    "autoprefixer": "^10.4.21",
+    "bumpp": "^10.2.0",
+    "consola": "^3.4.2",
+    "cross-env": "^7.0.3",
+    "eslint": "^9.31.0",
+    "eslint-plugin-format": "^1.0.1",
+    "less": "^4.4.0",
+    "lint-staged": "^16.1.2",
+    "mockjs": "^1.1.0",
+    "postcss-mobile-forever": "^5.0.0",
+    "rollup": "^4.45.1",
+    "simple-git-hooks": "^2.13.0",
+    "tar": "^7.4.3",
+    "terser": "^5.43.1",
+    "typescript": "^5.8.3",
+    "unocss": "66.3.3",
+    "vite": "^7.0.5",
+    "vite-plugin-compression": "^0.5.1",
+    "vite-plugin-mock-dev-server": "^1.9.1",
+    "vite-plugin-pwa": "^1.0.1",
+    "vite-plugin-sitemap": "^0.8.2",
+    "vite-plugin-vconsole": "^2.1.1",
+    "vite-plugin-vue-devtools": "^7.7.7",
+    "vue-tsc": "^3.0.2"
+  },
+  "pnpm": {
+    "allowedDeprecatedVersions": {
+      "glob": "7.2.3",
+      "inflight": "1.0.6",
+      "sourcemap-codec": "1.4.8"
+    },
+    "peerDependencyRules": {
+      "allowedVersions": {}
+    },
+    "onlyBuiltDependencies": [
+      "core-js",
+      "esbuild",
+      "simple-git-hooks",
+      "unrs-resolver"
+    ]
+  },
+  "resolutions": {
+    "vite": "^7.0.5"
+  },
+  "simple-git-hooks": {
+    "pre-commit": "pnpm lint-staged",
+    "commit-msg": "pnpm commitlint $1"
+  },
+  "lint-staged": {
+    "*": "eslint --fix"
+  }
+}

package/src/components/data/XCellList/index.vue

@@ -31,6 +31,7 @@ const {
   scanOptions,
   customAdd = false,
   customEdit = false,
+  hideAllActions = false,
 } = defineProps<{
   configName?: string
   fixQueryForm?: object
@@ -44,6 +45,8 @@ const {
   // 是否自定义新增、编辑按钮
   customAdd?: boolean
   customEdit?: boolean
+  // 是否隐藏所有操作按钮
+  hideAllActions?: boolean
 }>()
 
 const emit = defineEmits<{
@@ -151,7 +154,7 @@ const currInst = getCurrentInstance()
 
 // 列表底部的文字显示
 function finishedBottomText() {
-  if (buttonState.value?.add && buttonState.value.add === true && (filterButtonPermissions('add').state === false || ((filterButtonPermissions('add').state === true && userState.f.resources.f_role_name.includes((filterButtonPermissions('add').roleStr))))))
+  if (!hideAllActions && buttonState.value?.add && buttonState.value.add === true && (filterButtonPermissions('add').state === false || ((filterButtonPermissions('add').state === true && userState.f.resources.f_role_name.includes((filterButtonPermissions('add').roleStr))))))
     return '已加载全部内容，如需新增请点击右上角的 + 号'
   else
     return '已加载全部内容'
@@ -560,7 +563,7 @@ defineExpose({
         />
       </VanCol>
       <!-- 新增按钮，放在查询框后、查询条件下拉按钮前 -->
-      <VanCol v-if="buttonState?.add && buttonState.add === true && (filterButtonPermissions('add').state === false || ((filterButtonPermissions('add').state === true && userState.f.resources.f_role_name.includes((filterButtonPermissions('add').roleStr)))))" class="add-col">
+      <VanCol v-if="!hideAllActions && buttonState?.add && buttonState.add === true && (filterButtonPermissions('add').state === false || ((filterButtonPermissions('add').state === true && userState.f.resources.f_role_name.includes((filterButtonPermissions('add').roleStr)))))" class="add-col">
         <VanButton
           icon="add"
           type="primary"
@@ -629,7 +632,7 @@ defineExpose({
                         />
                       </p>
                     </div>
-                    <div class="action-buttons">
+                    <div v-if="!hideAllActions" class="action-buttons">
                       <VanButton
                         v-for="btn in btnList"
                         :key="btn.dataIndex"
@@ -704,7 +707,7 @@ defineExpose({
               </VanRow>
               <!-- 添加详情插槽 -->
               <slot name="item-detail" :item="item" />
-              <VanRow v-if="allActions.length > 0" gutter="20" class="card_item_bottom">
+              <VanRow v-if="!hideAllActions && allActions.length > 0" gutter="20" class="card_item_bottom">
                 <VanCol span="4">
                   <VanPopover
                     v-if="getActionGroups(item, index).more.length"

package/src/components/data/XOlMap/utils/wgs84ToGcj02.js

@@ -1,154 +1,154 @@
-// 导入proj控件
-import * as proj from 'ol/proj'
-
-function forEachPoint(func) {
-  return function (input, opt_output, opt_dimension) {
-    const len = input.length
-
-    const dimension = opt_dimension || 2
-    let output
-
-    if (opt_output) {
-      output = opt_output
-    }
-    else {
-      if (dimension !== 2) {
-        output = input.slice()
-      }
-      else {
-        output = [len]
-      }
-    }
-    for (let offset = 0; offset < len; offset += dimension) {
-      func(input, output, offset)
-    }
-    return output
-  }
-}
-
-const gcj02 = {}
-const PI = Math.PI
-const AXIS = 6378245.0
-// eslint-disable-next-line no-loss-of-precision
-const OFFSET = 0.00669342162296594323 // (a^2 - b^2) / a^2
-
-function delta(wgLon, wgLat) {
-  let dLat = transformLat(wgLon - 105.0, wgLat - 35.0)
-  let dLon = transformLon(wgLon - 105.0, wgLat - 35.0)
-  const radLat = (wgLat / 180.0) * PI
-  let magic = Math.sin(radLat)
-  magic = 1 - OFFSET * magic * magic
-  const sqrtMagic = Math.sqrt(magic)
-  dLat = (dLat * 180.0) / (((AXIS * (1 - OFFSET)) / (magic * sqrtMagic)) * PI)
-  dLon = (dLon * 180.0) / ((AXIS / sqrtMagic) * Math.cos(radLat) * PI)
-  return [dLon, dLat]
-}
-
-function outOfChina(lon, lat) {
-  if (lon < 72.004 || lon > 137.8347) {
-    return true
-  }
-  return lat < 0.8293 || lat > 55.8271
-}
-
-function transformLat(x, y) {
-  let ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x))
-  ret += ((20.0 * Math.sin(6.0 * x * PI) + 20.0 * Math.sin(2.0 * x * PI)) * 2.0) / 3.0
-  ret += ((20.0 * Math.sin(y * PI) + 40.0 * Math.sin((y / 3.0) * PI)) * 2.0) / 3.0
-  ret += ((160.0 * Math.sin((y / 12.0) * PI) + 320 * Math.sin((y * PI) / 30.0)) * 2.0) / 3.0
-  return ret
-}
-
-function transformLon(x, y) {
-  let ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x))
-  ret += ((20.0 * Math.sin(6.0 * x * PI) + 20.0 * Math.sin(2.0 * x * PI)) * 2.0) / 3.0
-  ret += ((20.0 * Math.sin(x * PI) + 40.0 * Math.sin((x / 3.0) * PI)) * 2.0) / 3.0
-  ret += ((150.0 * Math.sin((x / 12.0) * PI) + 300.0 * Math.sin((x / 30.0) * PI)) * 2.0) / 3.0
-  return ret
-}
-
-gcj02.toWGS84 = forEachPoint((input, output, offset) => {
-  let lng = input[offset]
-  let lat = input[offset + 1]
-  if (!outOfChina(lng, lat)) {
-    const deltaD = delta(lng, lat)
-    lng = lng - deltaD[0] // 改回减法
-    lat = lat - deltaD[1] // 改回减法
-  }
-  output[offset] = lng
-  output[offset + 1] = lat
-})
-
-gcj02.fromWGS84 = forEachPoint((input, output, offset) => {
-  let lng = input[offset]
-  let lat = input[offset + 1]
-  if (!outOfChina(lng, lat)) {
-    const deltaD = delta(lng, lat)
-    lng = lng + deltaD[0] // 改回加法
-    lat = lat + deltaD[1] // 改回加法
-  }
-  output[offset] = lng
-  output[offset + 1] = lat
-})
-
-const sphericalMercator = {}
-const RADIUS = 6378137
-const MAX_LATITUDE = 85.0511287798
-const RAD_PER_DEG = Math.PI / 180
-
-sphericalMercator.forward = forEachPoint((input, output, offset) => {
-  const lat = Math.max(Math.min(MAX_LATITUDE, input[offset + 1]), -MAX_LATITUDE)
-  const sin = Math.sin(lat * RAD_PER_DEG)
-  output[offset] = RADIUS * input[offset] * RAD_PER_DEG
-  output[offset + 1] = (RADIUS * Math.log((1 + sin) / (1 - sin))) / 2
-})
-
-sphericalMercator.inverse = forEachPoint((input, output, offset) => {
-  output[offset] = input[offset] / RADIUS / RAD_PER_DEG
-  output[offset + 1] = (2 * Math.atan(Math.exp(input[offset + 1] / RADIUS)) - Math.PI / 2) / RAD_PER_DEG
-})
-
-const projzh = {}
-
-projzh.ll2gmerc = function (input, opt_output, opt_dimension) {
-  const output = gcj02.toWGS84(input, opt_output, opt_dimension) // 改用 toWGS84
-  return projzh.ll2smerc(output, output, opt_dimension)
-}
-
-projzh.gmerc2ll = function (input, opt_output, opt_dimension) {
-  const output = projzh.smerc2ll(input, input, opt_dimension)
-  return gcj02.fromWGS84(output, opt_output, opt_dimension) // 改用 fromWGS84
-}
-
-// smerc2gmerc 需要修改
-
-projzh.smerc2gmerc = function (input, opt_output, opt_dimension) {
-  let output = projzh.smerc2ll(input, input, opt_dimension)
-  output = gcj02.toWGS84(output, output, opt_dimension) // 这里应该用 toWGS84
-  return projzh.ll2smerc(output, output, opt_dimension)
-}
-
-// gmerc2smerc 需要修改
-
-projzh.gmerc2smerc = function (input, opt_output, opt_dimension) {
-  let output = projzh.smerc2ll(input, input, opt_dimension)
-  output = gcj02.fromWGS84(output, output, opt_dimension) // 这里应该用 fromWGS84
-  return projzh.ll2smerc(output, output, opt_dimension)
-}
-
-projzh.ll2smerc = sphericalMercator.forward
-projzh.smerc2ll = sphericalMercator.inverse
-
-// 定义WGS84转GCJ02的投影
-const extent = [-20037508.342789244, -20037508.342789244, 20037508.342789244, 20037508.342789244]
-export const wgs84ToGcj02Projection = new proj.Projection({
-  code: 'WGS84-TO-GCJ02',
-  extent,
-  units: 'm',
-})
-
-// 添加投影和转换方法
-proj.addProjection(wgs84ToGcj02Projection)
-// 注意这里转换方法的顺序与原来相反
-proj.addCoordinateTransforms('EPSG:4326', wgs84ToGcj02Projection, projzh.ll2gmerc, projzh.gmerc2ll)
-proj.addCoordinateTransforms('EPSG:3857', wgs84ToGcj02Projection, projzh.smerc2gmerc, projzh.gmerc2smerc)
+// 导入proj控件
+import * as proj from 'ol/proj'
+
+function forEachPoint(func) {
+  return function (input, opt_output, opt_dimension) {
+    const len = input.length
+
+    const dimension = opt_dimension || 2
+    let output
+
+    if (opt_output) {
+      output = opt_output
+    }
+    else {
+      if (dimension !== 2) {
+        output = input.slice()
+      }
+      else {
+        output = [len]
+      }
+    }
+    for (let offset = 0; offset < len; offset += dimension) {
+      func(input, output, offset)
+    }
+    return output
+  }
+}
+
+const gcj02 = {}
+const PI = Math.PI
+const AXIS = 6378245.0
+// eslint-disable-next-line no-loss-of-precision
+const OFFSET = 0.00669342162296594323 // (a^2 - b^2) / a^2
+
+function delta(wgLon, wgLat) {
+  let dLat = transformLat(wgLon - 105.0, wgLat - 35.0)
+  let dLon = transformLon(wgLon - 105.0, wgLat - 35.0)
+  const radLat = (wgLat / 180.0) * PI
+  let magic = Math.sin(radLat)
+  magic = 1 - OFFSET * magic * magic
+  const sqrtMagic = Math.sqrt(magic)
+  dLat = (dLat * 180.0) / (((AXIS * (1 - OFFSET)) / (magic * sqrtMagic)) * PI)
+  dLon = (dLon * 180.0) / ((AXIS / sqrtMagic) * Math.cos(radLat) * PI)
+  return [dLon, dLat]
+}
+
+function outOfChina(lon, lat) {
+  if (lon < 72.004 || lon > 137.8347) {
+    return true
+  }
+  return lat < 0.8293 || lat > 55.8271
+}
+
+function transformLat(x, y) {
+  let ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x))
+  ret += ((20.0 * Math.sin(6.0 * x * PI) + 20.0 * Math.sin(2.0 * x * PI)) * 2.0) / 3.0
+  ret += ((20.0 * Math.sin(y * PI) + 40.0 * Math.sin((y / 3.0) * PI)) * 2.0) / 3.0
+  ret += ((160.0 * Math.sin((y / 12.0) * PI) + 320 * Math.sin((y * PI) / 30.0)) * 2.0) / 3.0
+  return ret
+}
+
+function transformLon(x, y) {
+  let ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x))
+  ret += ((20.0 * Math.sin(6.0 * x * PI) + 20.0 * Math.sin(2.0 * x * PI)) * 2.0) / 3.0
+  ret += ((20.0 * Math.sin(x * PI) + 40.0 * Math.sin((x / 3.0) * PI)) * 2.0) / 3.0
+  ret += ((150.0 * Math.sin((x / 12.0) * PI) + 300.0 * Math.sin((x / 30.0) * PI)) * 2.0) / 3.0
+  return ret
+}
+
+gcj02.toWGS84 = forEachPoint((input, output, offset) => {
+  let lng = input[offset]
+  let lat = input[offset + 1]
+  if (!outOfChina(lng, lat)) {
+    const deltaD = delta(lng, lat)
+    lng = lng - deltaD[0] // 改回减法
+    lat = lat - deltaD[1] // 改回减法
+  }
+  output[offset] = lng
+  output[offset + 1] = lat
+})
+
+gcj02.fromWGS84 = forEachPoint((input, output, offset) => {
+  let lng = input[offset]
+  let lat = input[offset + 1]
+  if (!outOfChina(lng, lat)) {
+    const deltaD = delta(lng, lat)
+    lng = lng + deltaD[0] // 改回加法
+    lat = lat + deltaD[1] // 改回加法
+  }
+  output[offset] = lng
+  output[offset + 1] = lat
+})
+
+const sphericalMercator = {}
+const RADIUS = 6378137
+const MAX_LATITUDE = 85.0511287798
+const RAD_PER_DEG = Math.PI / 180
+
+sphericalMercator.forward = forEachPoint((input, output, offset) => {
+  const lat = Math.max(Math.min(MAX_LATITUDE, input[offset + 1]), -MAX_LATITUDE)
+  const sin = Math.sin(lat * RAD_PER_DEG)
+  output[offset] = RADIUS * input[offset] * RAD_PER_DEG
+  output[offset + 1] = (RADIUS * Math.log((1 + sin) / (1 - sin))) / 2
+})
+
+sphericalMercator.inverse = forEachPoint((input, output, offset) => {
+  output[offset] = input[offset] / RADIUS / RAD_PER_DEG
+  output[offset + 1] = (2 * Math.atan(Math.exp(input[offset + 1] / RADIUS)) - Math.PI / 2) / RAD_PER_DEG
+})
+
+const projzh = {}
+
+projzh.ll2gmerc = function (input, opt_output, opt_dimension) {
+  const output = gcj02.toWGS84(input, opt_output, opt_dimension) // 改用 toWGS84
+  return projzh.ll2smerc(output, output, opt_dimension)
+}
+
+projzh.gmerc2ll = function (input, opt_output, opt_dimension) {
+  const output = projzh.smerc2ll(input, input, opt_dimension)
+  return gcj02.fromWGS84(output, opt_output, opt_dimension) // 改用 fromWGS84
+}
+
+// smerc2gmerc 需要修改
+
+projzh.smerc2gmerc = function (input, opt_output, opt_dimension) {
+  let output = projzh.smerc2ll(input, input, opt_dimension)
+  output = gcj02.toWGS84(output, output, opt_dimension) // 这里应该用 toWGS84
+  return projzh.ll2smerc(output, output, opt_dimension)
+}
+
+// gmerc2smerc 需要修改
+
+projzh.gmerc2smerc = function (input, opt_output, opt_dimension) {
+  let output = projzh.smerc2ll(input, input, opt_dimension)
+  output = gcj02.fromWGS84(output, output, opt_dimension) // 这里应该用 fromWGS84
+  return projzh.ll2smerc(output, output, opt_dimension)
+}
+
+projzh.ll2smerc = sphericalMercator.forward
+projzh.smerc2ll = sphericalMercator.inverse
+
+// 定义WGS84转GCJ02的投影
+const extent = [-20037508.342789244, -20037508.342789244, 20037508.342789244, 20037508.342789244]
+export const wgs84ToGcj02Projection = new proj.Projection({
+  code: 'WGS84-TO-GCJ02',
+  extent,
+  units: 'm',
+})
+
+// 添加投影和转换方法
+proj.addProjection(wgs84ToGcj02Projection)
+// 注意这里转换方法的顺序与原来相反
+proj.addCoordinateTransforms('EPSG:4326', wgs84ToGcj02Projection, projzh.ll2gmerc, projzh.gmerc2ll)
+proj.addCoordinateTransforms('EPSG:3857', wgs84ToGcj02Projection, projzh.smerc2gmerc, projzh.gmerc2smerc)

package/src/views/component/XCellListView/index.vue

@@ -1,107 +1,29 @@
 <script setup lang="ts">
 import XCellList from '@af-mobile-client-vue3/components/data/XCellList/index.vue'
-import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
 import { defineEmits, ref } from 'vue'
 import { useRouter } from 'vue-router'
 
-// 定义事件
-const emit = defineEmits(['deleteRow'])
-// 访问路由
+const emit = defineEmits(['addressSelected'])
 const router = useRouter()
-// 获取默认值
-const idKey = ref('o_id')
-
-// 简易crud表单测试
-const configName = ref('lngChargeAuditMobileCRUD')
-const serviceName = ref('af-gaslink')
-
-// 资源权限测试
-// const configName = ref('crud_sources_test')
-// const serviceName = ref('af-system')
-
-// 实际业务测试
-// const configName = ref('lngChargeAuditMobileCRUD')
-// const serviceName = ref('af-gaslink')
-
-// 跳转到详情页面
-// function toDetail(item) {
-//   router.push({
-//     name: 'XCellDetailView',
-//     params: { id: item[idKey.value] }, // 如果使用命名路由，推荐使用路由参数而不是直接构建 URL
-//     query: {
-//       operName: item[operNameKey.value],
-//       method:item[methodKey.value],
-//       requestMethod:item[requestMethodKey.value],
-//       operatorType:item[operatorTypeKey.value],
-//       operUrl:item[operUrlKey.value],
-//       operIp:item[operIpKey.value],
-//       costTime:item[costTimeKey.value],
-//       operTime:item[operTimeKey.value],
-//
-//       title: item[titleKey.value],
-//       businessType: item[businessTypeKey.value],
-//       status:item[statusKey.value]
-//     }
-//   })
-// }
-
-// 跳转到表单——以表单组来渲染纯表单
-function toDetail(item) {
-  router.push({
-    name: 'XFormGroupView',
-    query: {
-      id: item[idKey.value],
-      // id: item.rr_id,
-      // o_id: item.o_id,
-    },
+const configName = ref('ApplyContractPhoneCRUD')
+const xCellListRefPatrolPlan = ref()
+// 详情
+function toDetail(row) {
+  emit('addressSelected', {
+    f_address: row.tua_f_address,
+    f_address_id: row.tua_id,
   })
 }
-
-// 新增功能
-// function addOption(totalCount) {
-//   router.push({
-//     name: 'XFormView',
-//     params: { id: totalCount, openid: totalCount },
-//     query: {
-//       configName: configName.value,
-//       serviceName: serviceName.value,
-//       mode: '新增',
-//     },
-//   })
-// }
-
-// 修改功能
-// function updateRow(result) {
-//   router.push({
-//     name: 'XFormView',
-//     params: { id: result.o_id, openid: result.o_id },
-//     query: {
-//       configName: configName.value,
-//       serviceName: serviceName.value,
-//       mode: '修改',
-//     },
-//   })
-// }
-
-// 删除功能
-function deleteRow(result) {
-  emit('deleteRow', result.o_id)
-}
 </script>
 
 <template>
-  <NormalDataLayout id="XCellListView" title="工作计划">
-    <template #layout_content>
-      <XCellList
-        :config-name="configName"
-        :service-name="serviceName"
-        :fix-query-form="{ o_f_oper_name: 'edu_test' }"
-        :id-key="idKey"
-        @to-detail="toDetail"
-        @delete-row="deleteRow"
-      />
-    </template>
-  </NormalDataLayout>
+  <XCellList
+    ref="xCellListRefPatrolPlan"
+    service-name="af-apply"
+    :config-name="configName"
+    :hide-all-actions="true"
+    @to-detail="toDetail"
+  />
 </template>
 
 <style scoped lang="less">

package/src/views/component/XFormGroupView/index.vue

@@ -6,8 +6,8 @@ import { ref } from 'vue'
 import { useRoute } from 'vue-router'
 
 // 纯表单
-const configName = ref('form_check_test')
-const serviceName = ref('af-system')
+const configName = ref('appapplyuserinfoFormGroup')
+const serviceName = ref('af-apply')
 
 // const configName = ref("计划下发Form")
 // const serviceName = ref("af-linepatrol")
@@ -20,6 +20,12 @@ const formData = ref({})
 const formGroup = ref(null)
 const route = useRoute()
 const isInit = ref(false)
+
+const formShow = {
+  showt_userinfo: true,
+  showdevices: true
+}
+
 function submit(_result) {
   showDialog({ message: '提交成功' }).then(() => {
     history.back()
@@ -66,7 +72,9 @@ function submit(_result) {
         :config-name="configName"
         :service-name="serviceName"
         :group-form-data="formData"
+        :form-show="formShow"
         mode="新增"
+        :is-scrollspy="true"
         @submit="submit"
       />
     </template>

package/src/views/component/XFormView/index.vue

@@ -7,8 +7,19 @@ const configName = ref('AddConstructionForm')
 const serviceName = ref('af-linepatrol')
 
 const formGroupAddConstruction = ref(null)
+function emitFunc(func, data) {
+  if (func === 'selectAddress') {
+    const add = 'ccss'
+    // 设置单个字段
+    formGroupAddConstruction.value?.setForm({ address: '你的字符串' })
+  }
+}
+function submit(data) {
+  console.log('>>>> data: ', JSON.stringify(data))
+}
 </script>
 
+<!-- workflowId -->
 <template>
   <NormalDataLayout id="XFormGroupView" title="纯表单">
     <template #layout_content>
@@ -17,6 +28,10 @@ const formGroupAddConstruction = ref(null)
         mode="新增"
         :config-name="configName"
         :service-name="serviceName"
+        :param-logic-name-param="{ aa: 123 }"
+        :form-data="{ f_project_name: 333 }"
+        @x-form-item-emit-func="emitFunc"
+        @on-submit="submit"
       />
     </template>
   </NormalDataLayout>

package/src/views/component/XFormView/oldindex.vue

@@ -0,0 +1,70 @@
+<script setup lang="ts">
+import XForm from '@af-mobile-client-vue3/components/data/XForm/index.vue'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { getConfigByName } from '@af-mobile-client-vue3/services/api/common'
+import { onBeforeMount, ref, toRaw } from 'vue'
+
+const configName = ref('AddConstructionForm')
+const serviceName = ref('af-linepatrol')
+const formGroup = ref(null)
+const formConfig = ref(null)
+const submitSimple = ref(null)
+const isLoading = ref(true)
+
+function safeStringify(obj) {
+  const seen = new WeakSet()
+  return JSON.stringify(toRaw(obj), (key, val) => {
+    if (typeof val === 'object' && val !== null) {
+      if (seen.has(val))
+        return
+      seen.add(val)
+    }
+    return val
+  }, 2)
+}
+
+function submit(result) {
+  console.log('>>>> result: ', safeStringify(result))
+}
+
+function loadConfig() {
+  return new Promise((resolve) => {
+    getConfigByName(configName.value, (result) => {
+      submitSimple.value = result.showSubmitBtn
+      formConfig.value = result
+      resolve(result)
+    }, serviceName.value)
+  })
+}
+
+onBeforeMount(async () => {
+  try {
+    await loadConfig()
+  }
+  finally {
+    isLoading.value = false
+  }
+})
+</script>
+
+<template>
+  <NormalDataLayout id="XFormGroupView" title="纯表单">
+    <template #layout_content>
+      <van-loading v-if="isLoading" />
+      <XForm
+        v-else
+        ref="formGroup"
+        mode="查询"
+        :service-name="serviceName"
+        :group-form-items="formConfig"
+        :form-data="{}"
+        :form-name="formConfig?.groupName || '11111'"
+        :submit-button="submitSimple"
+        @on-submit="submit"
+      />
+    </template>
+  </NormalDataLayout>
+</template>
+
+<style scoped lang="less">
+</style>

package/src/views/component/XOlMapView/XLocationPicker/index.vue

@@ -1,118 +1,118 @@
-<script setup lang="ts">
-import type { LocationResult } from '@af-mobile-client-vue3/components/data/XOlMap/types'
-import LocationPicker from '@af-mobile-client-vue3/components/data/XOlMap/XLocationPicker/index.vue'
-import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
-import { showNotify } from 'vant'
-import { ref } from 'vue'
-
-const selectedLocation = ref<LocationResult>()
-
-// 处理位置选择
-function handleLocationConfirm(location: LocationResult) {
-  // console.log('选择的位置:', location)
-  // selectedLocation.value = location
-  showNotify({ type: 'success', message: '位置已选择' })
-}
-</script>
-
-<template>
-  <NormalDataLayout id="XLocationPicker" title="XOlMap地址选择器">
-    <template #layout_content>
-      <div class="location-picker-demo">
-        <!-- 页面标题 -->
-        <div class="page-header">
-          <div class="title">
-            位置选择
-          </div>
-        </div>
-
-        <!-- 选择结果展示 -->
-        <div v-if="selectedLocation" class="location-result">
-          <div class="label">
-            已选位置:
-          </div>
-          <div class="value">
-            {{ selectedLocation.address }}
-          </div>
-          <div class="coordinates">
-            经度: {{ selectedLocation.longitude.toFixed(6) }},
-            纬度: {{ selectedLocation.latitude.toFixed(6) }}
-          </div>
-        </div>
-
-        <!-- 地图组件 -->
-        <div class="map-container">
-          <LocationPicker
-            v-model="selectedLocation"
-            :default-center="[108.948024, 34.263161]"
-            :default-zoom="12"
-            @confirm="handleLocationConfirm"
-          />
-        </div>
-      </div>
-    </template>
-  </NormalDataLayout>
-</template>
-
-<style scoped lang="less">
-.location-picker-demo {
-  width: 100%;
-  height: 100%;
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  background-color: #f7f8fa;
-}
-
-.page-header {
-  height: 44px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: white;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
-  position: relative;
-  z-index: 1;
-
-  .title {
-    font-size: 16px;
-    color: #333;
-    font-weight: 500;
-  }
-}
-
-.location-result {
-  background: white;
-  padding: 12px 16px;
-  margin: 10px;
-  border-radius: 8px;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
-
-  .label {
-    font-size: 14px;
-    color: #666;
-    margin-bottom: 4px;
-  }
-
-  .value {
-    font-size: 16px;
-    color: #333;
-    margin-bottom: 8px;
-    word-break: break-all;
-  }
-
-  .coordinates {
-    font-size: 12px;
-    color: #999;
-  }
-}
-
-.map-container {
-  flex: 1;
-  position: relative;
-  margin: 0 10px 10px 10px;
-  border-radius: 8px;
-  overflow: hidden;
-  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
-}
-</style>
+<script setup lang="ts">
+import type { LocationResult } from '@af-mobile-client-vue3/components/data/XOlMap/types'
+import LocationPicker from '@af-mobile-client-vue3/components/data/XOlMap/XLocationPicker/index.vue'
+import NormalDataLayout from '@af-mobile-client-vue3/components/layout/NormalDataLayout/index.vue'
+import { showNotify } from 'vant'
+import { ref } from 'vue'
+
+const selectedLocation = ref<LocationResult>()
+
+// 处理位置选择
+function handleLocationConfirm(location: LocationResult) {
+  // console.log('选择的位置:', location)
+  // selectedLocation.value = location
+  showNotify({ type: 'success', message: '位置已选择' })
+}
+</script>
+
+<template>
+  <NormalDataLayout id="XLocationPicker" title="XOlMap地址选择器">
+    <template #layout_content>
+      <div class="location-picker-demo">
+        <!-- 页面标题 -->
+        <div class="page-header">
+          <div class="title">
+            位置选择
+          </div>
+        </div>
+
+        <!-- 选择结果展示 -->
+        <div v-if="selectedLocation" class="location-result">
+          <div class="label">
+            已选位置:
+          </div>
+          <div class="value">
+            {{ selectedLocation.address }}
+          </div>
+          <div class="coordinates">
+            经度: {{ selectedLocation.longitude.toFixed(6) }},
+            纬度: {{ selectedLocation.latitude.toFixed(6) }}
+          </div>
+        </div>
+
+        <!-- 地图组件 -->
+        <div class="map-container">
+          <LocationPicker
+            v-model="selectedLocation"
+            :default-center="[108.948024, 34.263161]"
+            :default-zoom="12"
+            @confirm="handleLocationConfirm"
+          />
+        </div>
+      </div>
+    </template>
+  </NormalDataLayout>
+</template>
+
+<style scoped lang="less">
+.location-picker-demo {
+  width: 100%;
+  height: 100%;
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  background-color: #f7f8fa;
+}
+
+.page-header {
+  height: 44px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: white;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.1);
+  position: relative;
+  z-index: 1;
+
+  .title {
+    font-size: 16px;
+    color: #333;
+    font-weight: 500;
+  }
+}
+
+.location-result {
+  background: white;
+  padding: 12px 16px;
+  margin: 10px;
+  border-radius: 8px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05);
+
+  .label {
+    font-size: 14px;
+    color: #666;
+    margin-bottom: 4px;
+  }
+
+  .value {
+    font-size: 16px;
+    color: #333;
+    margin-bottom: 8px;
+    word-break: break-all;
+  }
+
+  .coordinates {
+    font-size: 12px;
+    color: #999;
+  }
+}
+
+.map-container {
+  flex: 1;
+  position: relative;
+  margin: 0 10px 10px 10px;
+  border-radius: 8px;
+  overflow: hidden;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+</style>