af-mobile-client-vue3 1.0.98 → 1.1.1

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

@@ -0,0 +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)

package/src/services/api/search.ts

@@ -0,0 +1,8 @@
+import { post } from '@af-mobile-client-vue3/services/restTools'
+
+export function getUserPermissions(userid: string) {
+  return post(`/af-system/search`, {
+    source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($功能权限$) != -1)',
+    userid,
+  })
+}

package/src/views/component/index.vue

@@ -24,7 +24,11 @@ const list = ref([
   },
   {
     name: 'XForm 表单',
-    to: '/Component/XFormView/1/debug',
+    to: '/Component/XFormView/1/debug?configName=hiddenTroubleFollowForm&serviceName=af-linepatrol&mode=新增',
+  },
+  {
+    name: 'XFormGroup 表单组',
+    to: '/Component/XFormGroupView',
   },
   {
     name: '操作卡手机端',
@@ -46,6 +50,10 @@ const list = ref([
     name: 'XFormAppraise 表单',
     to: '/Component/XFormAppraiseView/2/debug',
   },
+  {
+    name: 'XOlmap 地图组件',
+    to: '/Component/XOlMapView',
+  },
 ])
 
 function cleanConfigCache() {

package/src/views/user/login/LoginForm.vue

@@ -3,12 +3,25 @@ import type { UserInfo } from '@af-mobile-client-vue3/stores/modules/user'
 import type { FormInstance } from 'vant'
 import { LoginStateEnum, useFormRules, useLoginState } from '@af-mobile-client-vue3/hooks/useLogin'
 import GetAppDataService from '@af-mobile-client-vue3/plugins/AppData'
+import { getUserPermissions } from '@af-mobile-client-vue3/services/api/search'
 import { useSettingStore } from '@af-mobile-client-vue3/stores/modules/setting'
 import { useUserStore } from '@af-mobile-client-vue3/stores/modules/user'
 import { indexedDB } from '@af-mobile-client-vue3/utils/indexedDB'
 import { funcToRouter, loadRoutes } from '@af-mobile-client-vue3/utils/routerUtil'
 import { isWechat } from '@af-mobile-client-vue3/utils/wechatUtil'
-import { closeToast, showDialog, showFailToast, Switch, Button as VanButton, Col as VanCol, Field as VanField, Form as VanForm, Icon as VanIcon, Loading as VanLoading, Row as VanRow } from 'vant'
+import {
+  closeToast,
+  showDialog,
+  showFailToast,
+  Switch,
+  Button as VanButton,
+  Col as VanCol,
+  Field as VanField,
+  Form as VanForm,
+  Icon as VanIcon,
+  Loading as VanLoading,
+  Row as VanRow,
+} from 'vant'
 import { computed, inject, onBeforeMount, onMounted, reactive, ref, unref } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import 'vant/lib/switch/index.css'
@@ -41,13 +54,12 @@ onBeforeMount(async () => {
       try {
         wxloading.value = true
         if (route.query.code && route.query.state) {
-          const res: any = await userState.loginUnified({
+          const data = await userState.loginUnified({
             unifiedCode: `${route.query.code}`,
             tenantName: `${route.query.state}`,
             loginMode: 'wechat',
             resourceName: setting.getSetting()?.routerName || '智慧手机',
           })
-          const data = res
           login.f = data
           await Promise.all([GetAppDataService.load()])
           const loginInfo = {
@@ -157,7 +169,11 @@ function afterGeneral(result) {
     rolestr: result.rolestr,
   }
   userState.setUserInfo(user)
-  userState.setPermissions([{ id: 'queryForm', operation: ['add', 'edit'] }])
+  // 如果result中没有返回 权限 需要主动获取权限列表
+  if (!result.permissions) {
+    result.permissions = getUserPermissions(result.id)
+  }
+  userState.setPermissions(result.permissions)
   userState.setRoles([{ id: 'admin', operation: ['add', 'edit', 'delete'] }])
   // 加载路由
   loadRoutes(funcToRouter(user.functions))

package/vite.config.ts

@@ -1,123 +1,130 @@
-import type { ConfigEnv, UserConfig } from 'vite'
-import path from 'node:path'
-import process from 'node:process'
-import autoprefixer from 'autoprefixer'
-import viewport from 'postcss-mobile-forever'
-import { loadEnv } from 'vite'
-import { createVitePlugins } from './build/vite'
-
-// import fs from 'fs'
-export default ({ mode }: ConfigEnv): UserConfig => {
-  const root = process.cwd()
-  const env = loadEnv(mode, root)
-
-  const appProxys = {}
-
-  const v4Server = 'http://aote-office.8866.org:31567'
-  const v3Server = 'http://aote-office.8866.org:31567'
-  const OSSServerDev = 'http://192.168.50.67:30351'
-  // const OSSServerProd = 'http://192.168.50.67:31351'
-
-  return {
-    base: env.VITE_APP_PUBLIC_PATH,
-    plugins: [
-      createVitePlugins(),
-    ],
-
-    server: {
-      host: true,
-      port: 7190,
-      // https: {
-      //   key: fs.readFileSync('certs/127.0.0.1+2-key.pem'),
-      //   cert: fs.readFileSync('certs/127.0.0.1+2.pem')
-      // },
-      proxy: Object.assign({
-        '/api/af-system/resource': {
-          target: v4Server,
-          ws: false,
-          changeOrigin: true,
-        },
-        '/api/invoice': {
-          target: 'http://219.153.176.6:8400/',
-          rewrite: (path: string) => path.replace(/^\/api\//, '/'),
-          ws: false,
-          changeOrigin: true,
-        },
-        '/api/af-system/entity/t_files': {
-          target: v3Server,
-          ws: false,
-          changeOrigin: true,
-        },
-        '/resource': {
-          // pathRewrite: { '^/resource': '/' },
-          target: v4Server,
-          changeOrigin: true,
-        },
-        // '/api/af-auth/login': {
-        //   target: 'http://127.0.0.1:9200/',
-        //   rewrite: (path: string) => path.replace(/^\/api\/af-auth\//, '/'),
-        //   ws: false,
-        //   changeOrigin: true,
-        // },
-        '/api': {
-          // v3用
-          // rewrite: (path: string) => path.replace(/^\/api\/af-system\//, '/rs/'),
-          target: v4Server,
-          ws: false,
-          changeOrigin: true,
-        },
-        '/oss': {
-          target: OSSServerDev,
-          rewrite: (path: string) => path.replace(/^\/oss\//, '/'),
-          changeOrigin: true,
-        },
-      }, appProxys),
-    },
-
-    resolve: {
-      alias: {
-        '~@': path.join(__dirname, './src'),
-        '@': path.join(__dirname, './src'),
-        '~': path.join(__dirname, './src/assets'),
-        '@af-mobile-client-vue3': path.join(__dirname, './src'),
-      },
-    },
-
-    css: {
-      // postcss 官网：www.postcss.com.cn/
-      postcss: {
-        plugins: [
-          // 自动获取浏览器的流行度和能够支持的属性，并为 CSS 规则添加前缀
-          autoprefixer(),
-          viewport({
-            appSelector: '#system-app',
-            viewportWidth: 375,
-            maxDisplayWidth: 800,
-            appContainingBlock: 'auto',
-            necessarySelectorWhenAuto: '.app-wrapper',
-            rootContainingBlockSelectorList: ['van-tabbar', 'van-popup'],
-          }),
-        ],
-      },
-    },
-
-    build: {
-      chunkSizeWarningLimit: 2048,
-      rollupOptions: {
-        output: {
-          // 打包时分割资源
-          chunkFileNames: 'static/js/[name]-[hash].js',
-          entryFileNames: 'static/js/[name]-[hash].js',
-          assetFileNames: 'static/[ext]/[name]-[hash].[ext]',
-          manualChunks(id) {
-            if (id.includes('node_modules'))
-              return 'third' // 代码分割为第三方包
-
-            if (id.includes('views'))
-              return 'views' // 代码分割为业务视图
-          },
-        },
-      },
-    },
-  }
-}
+import type { ConfigEnv, UserConfig } from 'vite'
+import path from 'node:path'
+import process from 'node:process'
+import autoprefixer from 'autoprefixer'
+import viewport from 'postcss-mobile-forever'
+import { loadEnv } from 'vite'
+import { createVitePlugins } from './build/vite'
+
+// import fs from 'fs'
+export default ({ mode }: ConfigEnv): UserConfig => {
+  const root = process.cwd()
+  const env = loadEnv(mode, root)
+
+  const appProxys = {}
+
+  const v4Server = 'http://aote-office.8866.org:31567'
+  const v3Server = 'http://aote-office.8866.org:31567'
+  const OSSServerDev = 'http://192.168.50.67:30351'
+  const geoserver = 'http://39.104.49.8:30372'
+  // const OSSServerProd = 'http://192.168.50.67:31351'
+
+  return {
+    base: env.VITE_APP_PUBLIC_PATH,
+    plugins: [
+      createVitePlugins(),
+    ],
+
+    server: {
+      host: true,
+      port: 7190,
+      // https: {
+      //   key: fs.readFileSync('certs/127.0.0.1+2-key.pem'),
+      //   cert: fs.readFileSync('certs/127.0.0.1+2.pem')
+      // },
+      proxy: Object.assign({
+        '/api/af-system/resource': {
+          target: v4Server,
+          ws: false,
+          changeOrigin: true,
+        },
+        '/api/invoice': {
+          target: 'http://219.153.176.6:8400/',
+          rewrite: (path: string) => path.replace(/^\/api\//, '/'),
+          ws: false,
+          changeOrigin: true,
+        },
+        '/api/af-system/entity/t_files': {
+          target: v3Server,
+          ws: false,
+          changeOrigin: true,
+        },
+        '/resource': {
+          // pathRewrite: { '^/resource': '/' },
+          target: v4Server,
+          changeOrigin: true,
+        },
+        // '/api/af-auth/login': {
+        //   target: 'http://127.0.0.1:9200/',
+        //   rewrite: (path: string) => path.replace(/^\/api\/af-auth\//, '/'),
+        //   ws: false,
+        //   changeOrigin: true,
+        // },
+        // geoserver 转发
+        '/linepatrol/geoserver': {
+          target: geoserver,
+          changeOrigin: true,
+          rewrite: path => path.replace(/^\/linepatrol\/geoserver/, '/geoserver'),
+        },
+        '/api': {
+          // v3用
+          // rewrite: (path: string) => path.replace(/^\/api\/af-system\//, '/rs/'),
+          target: v4Server,
+          ws: false,
+          changeOrigin: true,
+        },
+        '/oss': {
+          target: OSSServerDev,
+          rewrite: (path: string) => path.replace(/^\/oss\//, '/'),
+          changeOrigin: true,
+        },
+      }, appProxys),
+    },
+
+    resolve: {
+      alias: {
+        '~@': path.join(__dirname, './src'),
+        '@': path.join(__dirname, './src'),
+        '~': path.join(__dirname, './src/assets'),
+        '@af-mobile-client-vue3': path.join(__dirname, './src'),
+      },
+    },
+
+    css: {
+      // postcss 官网：www.postcss.com.cn/
+      postcss: {
+        plugins: [
+          // 自动获取浏览器的流行度和能够支持的属性，并为 CSS 规则添加前缀
+          autoprefixer(),
+          viewport({
+            appSelector: '#system-app',
+            viewportWidth: 375,
+            maxDisplayWidth: 800,
+            appContainingBlock: 'auto',
+            necessarySelectorWhenAuto: '.app-wrapper',
+            rootContainingBlockSelectorList: ['van-tabbar', 'van-popup'],
+          }),
+        ],
+      },
+    },
+
+    build: {
+      chunkSizeWarningLimit: 2048,
+      rollupOptions: {
+        output: {
+          // 打包时分割资源
+          chunkFileNames: 'static/js/[name]-[hash].js',
+          entryFileNames: 'static/js/[name]-[hash].js',
+          assetFileNames: 'static/[ext]/[name]-[hash].[ext]',
+          manualChunks(id) {
+            if (id.includes('node_modules'))
+              return 'third' // 代码分割为第三方包
+
+            if (id.includes('views'))
+              return 'views' // 代码分割为业务视图
+          },
+        },
+      },
+    },
+  }
+}