@lingxiteam/ebe-utils 0.0.24 → 0.0.27

package/lib/public/src/components/ProgressComp/index.tsx

@@ -1,6 +1,5 @@
 import { antPrefix } from '@/components/pcfactory/src/variables';
 import { CloseCircleFilled } from '@ant-design/icons';
-import { LocaleFunction } from '@lingxiteam/types';
 import {
   Button,
   ConfigProvider,
@@ -21,13 +20,9 @@ const openProgressMsg = (
   fileName: string,
   percentComplete: number,
   text: string,
-  { getLocale = (k, p) => p ?? '' }: { getLocale: LocaleFunction },
 ) => {
   message.loading({
-    icon: getLocale('ProgressComp.progressMsg', `${fileName} 正在${text}：`, {
-      fileName,
-      text,
-    }),
+    icon: `${fileName} 正在${text}：`,
     content: openProgress(percentComplete),
     key,
     duration: 0,
@@ -66,12 +61,10 @@ const showProgressNotification = (config: {
   type?: 'error' | 'success' | 'process';
   btn: (onCancel: () => void) => any;
   loadingText?: string;
-  getLocale: LocaleFunction;
 }) => {
-  const getLocale = config.getLocale ?? ((k?: string, l?: string) => l ?? '');
   const {
     key,
-    title = getLocale('derive', '导出'),
+    title = '导出',
     percent,
     onCancel,
     message,
@@ -93,17 +86,14 @@ const showProgressNotification = (config: {
       <ConfigProvider prefixCls={antPrefix} locale={zhCN}>
         <Popconfirm
           placement="bottomRight"
-          title={getLocale(
-            'ProgressComp.cancelMessage',
-            '取消将无法获得下载结果，请确认是否需要取消',
-          )}
+          title={'取消将无法获得下载结果，请确认是否需要取消'}
           onConfirm={() => {
             onCancel?.();
             notification?.close(key);
           }}
           overlayClassName="ProgressComp-confirm"
         >
-          <Button>{getLocale('cancelText', '取消')}</Button>
+          <Button>{'取消'}</Button>
         </Popconfirm>
       </ConfigProvider>
     );

package/lib/public/src/hooks/useBaseDataSource.ts

@@ -118,7 +118,8 @@ const useBaseDataSource = <T extends BaseDataSourceType>(
         } else if (operateType === ARRAY_OPERATE_TYPE.DELETE) {
           ArrayUtil.remove(data, path, predicate);
         } else if (operateType === ARRAY_OPERATE_TYPE.REPLACE) {
-          ArrayUtil.replace(data, path, value);
+          // 如果是数组，变化的值是一个 undefined 则应给一个空数组
+          ArrayUtil.replace(data, path, value || []);
         } else if (operateType === ARRAY_OPERATE_TYPE.UPDATE) {
           ArrayUtil.update(
             {

package/lib/public/src/services/api/engine.ts

@@ -23,6 +23,12 @@ interface ApiType {
   importInsts: string;
   // 获取导出进度
   getImportExportApply: HTTPMehodFn;
+  // 根据 serviceCodes 获取内部服务字段
+  getSqlQueryColumnsList: HTTPMehodFn;
+  // 根据 busiObjectIds 获取业务对象字段
+  queryBusiObjectRowColumnsList: HTTPMehodFn;
+  // 获取服务编排出参字段
+  queryServiceResponseColumnsList: HTTPMehodFn;
 }
 
 const api: ApiType = {
@@ -54,6 +60,19 @@ const api: ApiType = {
   // 获取导出进度
   getImportExportApply: (params, appCtx) =>
     urlHelper.get('app/object/getImportExportApply', params, appCtx),
+  // 根据 serviceCodes 获取内部服务字段
+  getSqlQueryColumnsList: (params, appCtx) =>
+    urlHelper.get('app/sql/getSqlQueryColumnsList', params, appCtx),
+  // 根据 busiObjectIds 获取业务对象字段
+  queryBusiObjectRowColumnsList: (params, appCtx) =>
+    urlHelper.get('app/object/queryBusiObjectRowColumnsList', params, appCtx),
+  // 获取服务编排出参字段
+  queryServiceResponseColumnsList: (params, appCtx) =>
+    urlHelper.get(
+      'app/orchestrationService/queryServiceResponseColumnsList',
+      params,
+      appCtx,
+    ),
 };
 
 export default api;

package/lib/public/src/utils/cmd.ts

@@ -19,9 +19,464 @@ export const checkIsContains = (contents: any, containContent: any) => {
   }
   return String(contents).indexOf(containContent) !== -1;
 };
+
 const numberregex = /\d+/g;
 export const safeNumber = (str: string | number) => {
   return typeof str === 'string' && numberregex.test(str) && !isNaN(Number(str))
     ? Number(str)
     : str;
 };
+
+/**
+ * 复制文本
+ * @param text 复制内容
+ */
+export const copyText = (text: string) => {
+  return new Promise<void>((resolve, reject) => {
+    const textarea = document.createElement('textarea');
+    textarea.value = text;
+    textarea.setAttribute('readonly', 'readonly');
+    document.body.appendChild(textarea);
+    textarea.select();
+    if (document.execCommand('copy')) {
+      document.execCommand('copy');
+      resolve();
+    } else {
+      reject();
+    }
+    document.body.removeChild(textarea);
+  });
+};
+
+interface commonFunc {
+  (...args: any): any;
+}
+
+// 初始化百度地图
+const initBaiduMap = (mapKey: string) =>
+  new Promise((resolve, reject) => {
+    if (typeof (window as any).BMap !== 'undefined') {
+      resolve((window as any).BMap);
+      return;
+    }
+    (window as any).onBMapCallback = () => {
+      // console.log('百度地图脚本初始化成功');
+      resolve((window as any).BMap);
+    };
+    //  将地图注册的信息插入到document中
+    const url = `https://api.map.baidu.com/api?v=3.0&ak=${mapKey}&callback=onBMapCallback`;
+    const mapScript = document.createElement('script');
+    mapScript.type = 'text/javascript';
+    mapScript.src = url;
+    mapScript.onerror = reject;
+    const [head] = document.getElementsByTagName('head') as any;
+    head.appendChild(mapScript);
+  });
+
+const pointBaiduTranslate: commonFunc = (
+  convertor,
+  ggPoint,
+  successCallBack,
+  errorCallBask,
+  address,
+  { getLocale },
+) => {
+  convertor.translate([ggPoint], 5, 3, (data: any) => {
+    // console.log('转换后的坐标', data);
+    if (data.status === 0) {
+      successCallBack([data.points[0], address]);
+    } else {
+      errorCallBask(getLocale('sysAction.location.transformfail'));
+    }
+  });
+};
+
+const getBaiduCurrentLocation: commonFunc = (
+  geolocation,
+  geocoder,
+  locationAddress,
+  type,
+  convertor,
+  successCallBack,
+  errorCallBask,
+  timer,
+  { getLocale },
+) => {
+  geolocation.getCurrentPosition(
+    (r: any) => {
+      console.log(geolocation.getStatus());
+      console.log((window as any).BMAP_STATUS_SUCCESS);
+      if (geolocation.getStatus() === (window as any).BMAP_STATUS_SUCCESS) {
+        // console.log('获取定位：', r);
+        // 获取详细地址
+        if (locationAddress && locationAddress !== '') {
+          geocoder.getLocation(r.point, (address: any) => {
+            // console.log('定位地址：', address.address);
+            switch (type) {
+              case 'WGS84': // 大地坐标系 法律规定不支持转换
+                // pointTranslate(convertor, r.point, successCallBack, errorCallBask, r.address);
+                successCallBack([r.point, address]);
+                break;
+              case 'GCJ02': // 火星坐标系
+                pointBaiduTranslate(
+                  convertor,
+                  r.point,
+                  successCallBack,
+                  errorCallBask,
+                  address,
+                  { getLocale },
+                );
+                break;
+              default:
+                // 默认百度坐标系
+                successCallBack([r.point, address]);
+                break;
+            }
+          });
+        } else {
+          switch (type) {
+            case 'WGS84': // 大地坐标系 法律规定不支持转换
+              // pointTranslate(convertor, r.point, successCallBack, errorCallBask, r.address);
+              successCallBack([r.point, r.address]);
+              break;
+            case 'GCJ02': // 火星坐标系
+              pointBaiduTranslate(
+                convertor,
+                r.point,
+                successCallBack,
+                errorCallBask,
+                r.address,
+                { getLocale },
+              );
+              break;
+            default:
+              // 默认百度坐标系
+              successCallBack([r.point, r.address]);
+              break;
+          }
+        }
+      } else {
+        // console.log('定位失败:', r);
+        clearInterval(timer);
+        errorCallBask(getLocale('sysAction.localtion.fail'));
+      }
+    },
+    { enableHighAccuracy: true, maximumAge: 0, SDKLocation: true },
+  );
+};
+
+const getBaiduLocation: commonFunc = (
+  always,
+  type,
+  locationAddress,
+  successCallBack,
+  errorCallBask,
+  { getLocale },
+) => {
+  const geolocation = new (window as any).BMap.Geolocation();
+  const convertor = new (window as any).BMap.Convertor();
+  const geocoder = new (window as any).BMap.Geocoder();
+
+  // /**
+  //  * 开启辅助定位
+  //  */
+  // geolocation?.enableSDKLocation();
+  getBaiduCurrentLocation(
+    geolocation,
+    geocoder,
+    locationAddress,
+    type,
+    convertor,
+    successCallBack,
+    errorCallBask,
+    null,
+    { getLocale },
+  );
+  if (always && always !== '') {
+    // 持续定位 默认定位60次，间隔15秒
+    let times = 0;
+    const timer = setInterval(() => {
+      if (times > 60) {
+        clearInterval(timer);
+      }
+      times += 1;
+      getBaiduCurrentLocation(
+        geolocation,
+        geocoder,
+        locationAddress,
+        type,
+        convertor,
+        successCallBack,
+        errorCallBask,
+        timer,
+        { getLocale },
+      );
+    }, 15000);
+  }
+};
+
+// 初始化高德地图
+const initGaoDeMap = (securityKey: string | null, mapKey: string) =>
+  new Promise((resolve, reject) => {
+    if (typeof (window as any).AMap !== 'undefined') {
+      resolve((window as any).AMap);
+      return;
+    }
+    (window as any)._AMapSecurityConfig = {
+      securityJsCode: securityKey || '',
+    };
+    (window as any).onAMapLoaded = () => {
+      resolve((window as any).AMap);
+    };
+    //  将地图注册的信息插入到document中
+    const url = `https://webapi.amap.com/maps?v=2.0&key=${mapKey}&callback=onAMapLoaded`;
+    const mapScript = document.createElement('script');
+    mapScript.type = 'text/javascript';
+    mapScript.src = url;
+    mapScript.onerror = reject;
+    const [head] = document.getElementsByTagName('head') as any;
+    head.appendChild(mapScript);
+  });
+
+const pointTranslate: commonFunc = (
+  ggPoint,
+  successCallBack,
+  errorCallBask,
+  address,
+  { getLocale },
+) => {
+  // 高德转百度坐标
+  const xPI = (3.14159265358979324 * 3000.0) / 180.0;
+  const bdLng = Number(ggPoint.KL || ggPoint.lng);
+  const bdLat = Number(ggPoint.kT || ggPoint.lat);
+  const z =
+    Math.sqrt(bdLng * bdLng + bdLat * bdLat) + 0.00002 * Math.sin(bdLat * xPI);
+  const theTa = Math.atan2(bdLat, bdLng) + 0.000003 * Math.cos(bdLng * xPI);
+  const lng = z * Math.cos(theTa) + 0.0065;
+  const lat = z * Math.sin(theTa) + 0.006;
+  if (lng && lat) {
+    successCallBack([{ lng, lat }, address]);
+  } else {
+    errorCallBask(getLocale('sysAction.location.transformfail'));
+  }
+};
+
+const getCurrentLocation: commonFunc = (
+  geolocation,
+  locationAddress,
+  type,
+  successCallBack,
+  errorCallBask,
+  timer,
+  { getLocale },
+) => {
+  geolocation.getCurrentPosition((status: string, r: any) => {
+    if (status === 'complete') {
+      // console.log('获取定位：', r, status);
+      // 获取详细地址
+      if (locationAddress && locationAddress !== '') {
+        (window as any).AMap.plugin('AMap.Geocoder', () => {
+          const geocoder = new (window as any).AMap.Geocoder({});
+          geocoder.getAddress(
+            {
+              lng: r.position.KL || r.position.lng,
+              lat: r.position.kT || r.position.lat,
+              noAutofix: false,
+            },
+            (status: string, result: any) => {
+              let address = '获取详细地址失败';
+              if (status === 'complete' && result.regeocode) {
+                address = result.regeocode.formattedAddress;
+              } else {
+                address = `${address}: ${result}`;
+              }
+              switch (type) {
+                case 'WGS84': // 大地坐标系 法律规定不支持转换
+                  // pointTranslate(convertor, r.point, successCallBack, errorCallBask, r.address);
+                  successCallBack([r.position, address]);
+                  break;
+                case 'GCJ02': // 火星坐标系
+                  successCallBack([r.position, address]);
+                  break;
+                default:
+                  // 默认百度坐标系
+                  pointTranslate(
+                    r.position,
+                    successCallBack,
+                    errorCallBask,
+                    address,
+                    { getLocale },
+                  );
+                  break;
+              }
+            },
+          );
+        });
+      } else {
+        switch (type) {
+          case 'WGS84': // 大地坐标系 法律规定不支持转换
+            // pointTranslate(convertor, r.point, successCallBack, errorCallBask, r.address);
+            successCallBack([r.position, '']);
+            break;
+          case 'GCJ02': // 火星坐标系
+            successCallBack([r.position, '']);
+            break;
+          default:
+            // 默认百度坐标系
+            pointTranslate(r.position, successCallBack, errorCallBask, '', {
+              getLocale,
+            });
+            break;
+        }
+      }
+    } else {
+      // console.log('高德定位失败:', r);
+      clearInterval(timer);
+      errorCallBask(`${getLocale('sysAction.location.fail')}：${status}${r}`);
+    }
+  });
+};
+
+const getGaoDeLocation: commonFunc = (
+  always,
+  type,
+  locationAddress,
+  successCallBack,
+  errorCallBask,
+  { getLocale },
+) => {
+  (window as any).AMap.plugin('AMap.Geolocation', () => {
+    const geolocation = new (window as any).AMap.Geolocation({
+      timeout: 10000,
+      enableHighAccuracy: true,
+    });
+    // const convertor = new (window as any).AMap.Convertor();
+    getCurrentLocation(
+      geolocation,
+      locationAddress,
+      type,
+      successCallBack,
+      errorCallBask,
+      null,
+      { getLocale },
+    );
+    if (always && always !== '') {
+      // 持续定位 默认定位60次，间隔15秒
+      let times = 0;
+      const timer = setInterval(() => {
+        if (times > 60) {
+          clearInterval(timer);
+        }
+        times += 1;
+        getCurrentLocation(
+          geolocation,
+          locationAddress,
+          type,
+          successCallBack,
+          errorCallBask,
+          timer,
+          { getLocale },
+        );
+      }, 15000);
+    }
+  });
+};
+
+// export default {
+//   initBaiduMap,
+//   getBaiduLocation,
+// };
+interface LocalLocationParams {
+  mapKey: string;
+  mapType: string;
+  securityKey?: string;
+  locationAlways: boolean;
+  locationOutputType: string;
+  locationAddress: boolean;
+}
+interface LocalLocation {
+  longitude: string;
+  latitude: string;
+  locationInformation: string;
+}
+export const getLocalLocation = ({
+  securityKey = '',
+  mapType,
+  mapKey,
+  locationAlways,
+  locationOutputType,
+  locationAddress,
+}: LocalLocationParams) => {
+  return new Promise<LocalLocation>((resolve, reject) => {
+    if (mapType === 'baidu') {
+      initBaiduMap(mapKey)
+        .then(() => {
+          // 百度地图注册成功
+          getBaiduLocation(
+            locationAlways,
+            locationOutputType,
+            locationAddress,
+            (opt: any) => {
+              // console.log('定位成功：', opt);
+              const [position] = opt;
+              const localLocation = {
+                longitude: position.lng,
+                latitude: position.lat,
+                locationInformation: '',
+              };
+              if (locationAddress) {
+                const address = opt[1];
+                localLocation.locationInformation = address;
+              }
+              resolve(localLocation);
+            },
+            (err: any) => {
+              reject(err);
+              // console.log('定位失败：', err);
+            },
+            // FIXME: getLocale
+            { getLocale: (a: any) => a },
+          );
+        })
+        .catch((err) => {
+          reject(err);
+          // 地图注册失败
+          // console.log('---注册失败:', err);
+        });
+    } else {
+      initGaoDeMap(securityKey, mapKey)
+        .then(() => {
+          getGaoDeLocation(
+            locationAlways,
+            locationOutputType,
+            locationAddress,
+            (opt: any) => {
+              // console.log('定位成功：', opt);
+              const [position] = opt;
+              const localLocation = {
+                longitude: position.KL || position.lng,
+                latitude: position.kT || position.lat,
+                locationInformation: '',
+              };
+              if (locationAddress) {
+                const address = opt[1];
+                localLocation.locationInformation = address;
+              }
+              resolve(localLocation);
+            },
+            (err: any) => {
+              // console.log('定位失败：', err);
+              reject(err);
+            },
+            // FIXME: getLocale
+            { getLocale: (a: any) => a },
+          );
+        })
+        .catch((err) => {
+          reject(err);
+          // 地图注册失败
+          // console.log('---注册失败:', err);
+        });
+    }
+  });
+};

package/lib/public/src/utils/useComponentHoc.ts

@@ -73,9 +73,12 @@ export const useComponentHoc = (
         setState({ value: v }),
       );
       if (syncComplete) {
-        if (isFunction(propsTrigger)) {
-          propsTrigger(v, ...resetProps);
-        }
+        // setState 异步设置值，onChange 中存在同步取值的问题，会导致取到的是上一次的值
+        setTimeout(() => {
+          if (isFunction(propsTrigger)) {
+            propsTrigger(v, ...resetProps);
+          }
+        }, 10);
       }
     }, 20);
   })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/ebe-utils",
-  "version": "0.0.24",
+  "version": "0.0.27",
   "description": "",
   "keywords": [],
   "author": "",
@@ -17,7 +17,7 @@
     "@babel/parser": "^7.12.12",
     "@babel/traverse": "^7.12.12",
     "@babel/types": "^7.12.12",
-    "@lingxiteam/ebe": "0.0.24",
+    "@lingxiteam/ebe": "0.0.27",
     "cac": "^6.7.14",
     "fs-extra": "9.x"
   },