@ohuoy/easymap 1.0.9 → 1.0.10

package/main.js

@@ -5,6 +5,13 @@ import  mapboxgl from './lib/mapbox-gl/dist/mapbox-gl.js';
 import * as ant7 from './lib/@antv/l7';
 import * as Three from 'three'
 import {TrackballControls} from 'three/addons/controls/TrackballControls.js'
+import {OrbitControls} from 'three/addons/controls/OrbitControls.js'
+import {EffectComposer} from 'three/examples/jsm/postprocessing/EffectComposer.js';
+import {RenderPass} from 'three/examples/jsm/postprocessing/RenderPass.js';
+import {ShaderPass} from 'three/examples/jsm/postprocessing/ShaderPass.js';
+import {OutlinePass} from 'three/examples/jsm/postprocessing/OutlinePass.js';
+import {FXAAShader} from 'three/examples/jsm/shaders/FXAAShader.js';
+import { UnrealBloomPass } from 'three/examples/jsm/postprocessing/UnrealBloomPass'
 window.EasyMap = EasyMap
 window.EmComponents = EmComponents
 window.EmUtils = EmUtils
@@ -18,7 +25,14 @@ export {
     EmComponents,
     EmUtils,
     mapboxgl,
+    OrbitControls,
+    UnrealBloomPass,
     ant7,
     Three,
-    TrackballControls
+    TrackballControls,
+    EffectComposer,
+    RenderPass,
+    ShaderPass,
+    OutlinePass,
+    FXAAShader
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ohuoy/easymap",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "self map easy use",
   "main": "main.js",
   "scripts": {

package/src/components/api/GisReverse.js

@@ -0,0 +1,3 @@
+export default class GisReverse {
+    
+}

package/src/components/api/constant.ts

@@ -0,0 +1,28 @@
+export const VERSION = '/api/'+ 'v1'
+export const UPLOADMINIOURL = import.meta.env.VITE_MINIO_URL
+export const UPLOADMINIOURLSERVER = import.meta.env.VITE_MINIO_SERVER_URL
+export const LOGINURL =VERSION+ '/auth'
+export const UPLOADANDDOWNLOADURL = VERSION+'/attachment'
+export const SITEURL = VERSION+'/site'
+export const LIDARURL = VERSION+'/lidar'
+export const USERURL = VERSION+'/user'
+export const ROLEURL = VERSION+'/role'
+export const PERMISSIONSURL =ROLEURL+'/permission'
+export const DICURL = VERSION + '/dictionary'
+export const GEOURL = VERSION + '/redisGeo'
+export const MONITORPOINTURL = VERSION + '/monitorpoint'
+export const SYS = VERSION + '/sys'
+export const EXTERNALURL = VERSION + '/external'
+export const MESSAGEURL = VERSION+'/notice'
+export const NOTICECONFIGURL = MESSAGEURL+'/reciver/configuration'
+export const LOGURL = VERSION+'/sys/log'
+export const COMPANYURL = VERSION+'/company'
+export const GIS = VERSION + '/gis'
+export const REPORTURL = VERSION + '/report'
+export const DAILYREPORTURL = REPORTURL + '/daily'
+export const CASEURL = VERSION + '/case'
+export const STATISTICSURL = VERSION + '/statistics'
+export const MARKERURL = VERSION + '/markinfo'
+export const MARKERTYPE = VERSION + '/marktype'
+export const MARKERRECORDS = VERSION + 'markRecords'
+export const EXTERNALMONITORPOINT = 'http://47.114.183.34:10207'

package/src/components/api/enums/httpEnum.ts

@@ -0,0 +1,34 @@
+/**
+ * @description: 请求结果集
+ */
+export enum ResultEnum {
+  SUCCESS = 200,
+  ERROR = -1,
+  TIMEOUT = 10042,
+  TYPE = 'success',
+}
+
+/**
+ * @description: 请求方法
+ */
+export enum RequestEnum {
+  GET = 'GET',
+  POST = 'POST',
+  PATCH = 'PATCH',
+  PUT = 'PUT',
+  DELETE = 'DELETE',
+}
+
+/**
+ * @description:  常用的contentTyp类型
+ */
+export enum ContentTypeEnum {
+  // json
+  JSON = 'application/json;charset=UTF-8',
+  // json
+  TEXT = 'text/plain;charset=UTF-8',
+  // form-data 一般配合qs
+  FORM_URLENCODED = 'application/x-www-form-urlencoded;charset=UTF-8',
+  // form-data  上传
+  FORM_DATA = 'multipart/form-data;charset=UTF-8',
+}

package/src/components/api/request.ts

@@ -0,0 +1,205 @@
+import axios, { CanceledError } from 'axios';
+import { isString } from 'lodash-es';
+import type { AxiosRequestConfig, AxiosResponse } from 'axios';
+import { ResultEnum } from './enums/httpEnum';
+import Qs from 'qs'
+import { getUniqueCode} from '@/utils/helper'
+
+export interface RequestOptions extends AxiosRequestConfig {
+  /** 是否直接将数据从响应中提取出，例如直接返回 res.data，而忽略 res.code 等信息 */
+  isReturnResult?: boolean;
+  /** 请求成功是提示信息 */
+  successMsg?: string;
+  /** 请求失败是提示信息 */
+  errorMsg?: string;
+  /** 成功时，是否显示后端返回的成功信息 */
+  showSuccessMsg?: boolean;
+  /** 失败时，是否显示后端返回的失败信息 */
+  showErrorMsg?: boolean;
+  requestType?: 'json' | 'form';
+}
+
+const UNKNOWN_ERROR = '未知错误，请重试';
+
+
+let tokenStore;
+
+/** 真实请求的路径前缀 */
+export const baseApiUrl = import.meta.env.VITE_BASE_API_URL;
+/** mock请求路径前缀 */
+// const baseMockUrl = import.meta.env.VITE_MOCK_API;
+const controller = new AbortController();
+const service = axios.create({
+  baseURL: baseApiUrl,
+  timeout: 1000 * 60 *3,
+  signal: controller.signal,
+  headers:{
+    clientId:await getUniqueCode(),
+    'Accept-Language':'zh-',
+    'clientType':"Web_Client"
+  }
+});
+service.interceptors.request.use(
+  async (config) => {
+    if (config.loading) {
+      config.loading.value = true
+    }    
+    if (config.headers && !config.noAuth) {
+        if(!tokenStore){
+          tokenStore= useTokenStore()
+        }
+        const token = await tokenStore.getTokenString();
+      // 请求头token信息，请根据实际情况进行修改
+      config.headers['Authorization'] = `Bearer ${token}`;
+    }
+    return config;
+  },
+  (error) => {
+    Promise.reject(error);
+  },
+);
+
+
+service.interceptors.response.use(
+  (response: AxiosResponse<BaseResponse>) => {
+    const res = response.data;
+    if (response.config.loading) {
+      response.config.loading.value = false
+    }
+    // if the custom code is not 200, it is judged as an error.
+    if (response.status !== ResultEnum.SUCCESS) {      
+      if(204 == response.status){
+        return response;
+      }
+      console.error(res.title || "请求错误");
+      // Illegal token
+      if ([401, 403,400].includes(res.statusCode)) {
+        
+        // to re-login
+        localStorage.clear();
+        setTimeout(() => {
+          console.error(res.title || "认证错误");
+        }, 400);
+        window.location.reload();
+       
+      }      
+
+      // throw other
+      const error = new Error(res.statusText || UNKNOWN_ERROR) as Error & { code: any };
+      error.code = res.code;
+      return Promise.reject(error);
+    } else {
+      return response;
+    }
+  },
+  (error) => {   
+    if(!error.response){
+      debugger
+      console.error("系统错误");
+      localStorage.clear();
+      return          
+    }
+    if (error.config.loading) {
+      error.config.loading.value = false
+    }
+    if (error.code === 'ERR_NETWORK' || [401, 403,400].includes(error.response.data.statusCode)) {
+      console.error(error.response.data.title || "认证错误");
+      // to re-login
+      localStorage.clear();
+      setTimeout(() => {
+        window.location.reload();
+      }, 2000);          
+    }
+    else{
+      console.error(error.response?.data?.title);
+    }
+    return Promise.reject(error);
+  },
+);
+
+type BaseResponse<T = any> = Omit<API.ResOp, 'data'> & {
+  data: T;
+};
+
+export function request<T = any>(
+  url: string,
+  config: { isReturnResult: false } & RequestOptions,
+): Promise<BaseResponse<T>>;
+export function request<T = any>(
+  url: string,
+  config: RequestOptions,
+): Promise<BaseResponse<T>['data']>;
+export function request<T = any>(
+  config: { isReturnResult: false } & RequestOptions,
+): Promise<BaseResponse<T>>;
+export function request<T = any>(config: RequestOptions): Promise<BaseResponse<T>['data']>;
+
+/**
+ *
+ * @param url - request url
+ * @param config - AxiosRequestConfig
+ */
+export async function request(_url: string | RequestOptions, _config: RequestOptions = {}) {
+  const url = isString(_url) ? _url : _url.url;
+  const config = isString(_url) ? _config : _url;
+  try {
+    // 兼容 from data 文件上传的情况
+    const { requestType , noAuth, isReturnResult = true, ...rest } = config;
+    const response = (await service.request({
+      url,
+      noAuth,
+      ...rest,
+      headers: {
+        ...rest.headers,
+        ...(requestType === 'form' ? { 'Content-Type': 'multipart/form-data' } : {}),
+      },
+      paramsSerializer: function (par) {
+        return Qs.stringify(par, {arrayFormat: 'repeat'})
+      },
+    })) as AxiosResponse<BaseResponse>;
+    const { data } = response;
+    // 页面代码需要获取 code，data，message 等信息时，需要将 isReturnResult 设置为 false
+    return data;
+  } catch (error: any) {
+    return Promise.reject(error);
+  }
+}
+
+
+// /**
+//  *
+//  * @param url - request url
+//  * @param config - AxiosRequestConfig
+//  */
+// export async function requestAll(requestList:[]) {
+//   let requestEnList= requestList.map(a=>{
+//    let url = isString(_url) ? _url : _url.url;
+//    let config = isString(_url) ? _config : _url;
+//    const { requestType , noAuth, isReturnResult = true, ...rest } = config;
+//    return (service.request({
+//       url,
+//       noAuth,
+//       ...rest,
+//       headers: {
+//         ...rest.headers,
+//         ...(requestType === 'form' ? { 'Content-Type': 'multipart/form-data' } : {}),
+//       },
+//       paramsSerializer: function (par) {
+//         return Qs.stringify(par, {arrayFormat: 'repeat'})
+//       },
+//     })) as AxiosResponse<BaseResponse>;
+//   })
+//   try {
+//     axios.all(requestEnList).then(axios.spread(()=>{
+
+//     }))
+//     // 兼容 from data 文件上传的情况
+//     const { requestType , noAuth, isReturnResult = true, ...rest } = config;
+//     const response = 
+//     const { data } = response;
+//     // 页面代码需要获取 code，data，message 等信息时，需要将 isReturnResult 设置为 false
+//     return data;
+//   } catch (error: any) {
+//     return Promise.reject(error);
+//   }
+// }

package/src/components/api/url.js

@@ -0,0 +1 @@
+export const