ls-pro-common 3.0.86 → 3.0.88

package/es/components/AreaCascader.js

@@ -6,7 +6,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useRef, useState, useEffect, useImperativeHandle } from 'react';
 import { httpGet } from '../http';
-import { getCache, setCache, treeEach } from '../utils';
+import { getCache, setCache, treeEach, isSaasVersion } from '../utils';
 var AreaCascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -25,7 +25,7 @@ var AreaCascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            cacheItems = getCache("areaOptions", true);
+            cacheItems = getCache('areaOptions', true);
             if (!(cacheItems && Array.isArray(cacheItems))) {
               _context.next = 4;
               break;
@@ -34,11 +34,14 @@ var AreaCascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
             return _context.abrupt("return");
           case 4:
             api = '/petrel/petrel-location-center-api/sysAdministrativeDivision/allByTree';
-            _context.next = 7;
+            if (isSaasVersion()) {
+              api = '/lesoon/tenant-lesoon-mdm-center-api/sysAdministrativeDivision/allByTree';
+            }
+            _context.next = 8;
             return httpGet(api, {}, false);
-          case 7:
+          case 8:
             result = _context.sent;
-            opts = result.rows || [];
+            opts = (isSaasVersion() ? result.data : result.rows) || [];
             treeEach(opts, function (item) {
               item.label = item.name;
               item.value = item.id;
@@ -52,7 +55,7 @@ var AreaCascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
             });
             setCache('areaOptions', opts, true);
             setOptions(opts);
-          case 12:
+          case 13:
           case "end":
             return _context.stop();
         }

package/es/components/AreaCascaderPanel.js

@@ -9,7 +9,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useRef, useState, useEffect, useImperativeHandle } from 'react';
 import { httpGet } from '../http';
-import { getCache, setCache, treeEach } from '../utils';
+import { getCache, setCache, treeEach, isSaasVersion } from '../utils';
 import './common.less';
 var AreaPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var propsConfig = _objectSpread({
@@ -17,7 +17,7 @@ var AreaPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       var _document;
       return (_document = document) === null || _document === void 0 ? void 0 : _document.body;
     },
-    placeholder: "请选择"
+    placeholder: '请选择'
   }, props);
   var _useState = useState(getCache('areaOptionsPanel', true) || []),
     _useState2 = _slicedToArray(_useState, 2),
@@ -93,11 +93,14 @@ var AreaPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
             return _context.abrupt("return");
           case 3:
             api = '/petrel/petrel-location-center-api/sysAdministrativeDivision/allByTree';
-            _context.next = 6;
+            if (isSaasVersion()) {
+              api = '/lesoon/tenant-lesoon-mdm-center-api/sysAdministrativeDivision/allByTree';
+            }
+            _context.next = 7;
             return httpGet(api, {}, false);
-          case 6:
+          case 7:
             result = _context.sent;
-            opts = result.rows || [];
+            opts = (isSaasVersion() ? result.data : result.rows) || [];
             treeEach(opts, function (item) {
               item.label = item.name;
               item.value = item.id;
@@ -111,7 +114,7 @@ var AreaPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
             setCache('areaOptionsPanel', opts, true);
             setOptions(opts);
             setShowData(opts);
-          case 12:
+          case 13:
           case "end":
             return _context.stop();
         }

package/es/http/index.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { extend } from 'umi-request';
-import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading } from '../utils';
+import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, isSaasVersion } from '../utils';
 //默认超时时间为1分钟
 var request = extend({
   timeout: 60000
@@ -277,6 +277,9 @@ export function getDict(dictCode) {
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
   var api = '/lesoon-integration/sysDictDtl/listByProperties';
+  if (isSaasVersion()) {
+    api = '/tenant-lesoon-integration-api/sysDictDtl/listByProperties';
+  }
   var param = {
     dictCode: dictCode
   };

package/es/utils/exportProcess.js

@@ -93,7 +93,8 @@ var exportProcess = function exportProcess(apiResult) {
   loading(0);
   var getResult = function getResult() {
     if (exit) return;
-    httpGet('/petrel-poi-center-api/sysPoiExportManage/page', {
+    var url = (localStorage.getItem('poi-center-api') || '/zuul/petrel-poi-center-api/').replace('/zuul/', '/');
+    httpGet(url + 'sysPoiExportManage/page', {
       'page.pn': 1,
       'page.size': 1,
       'search.id': apiResult.taskId

package/es/utils/index.d.ts

@@ -316,3 +316,4 @@ export declare const exitLoading: () => void;
 export declare const handleTheme: () => void;
 export declare const sleep: (secord: number) => Promise<unknown>;
 export declare const downloadFile: (url: string, fileName?: string | undefined) => void;
+export declare const isSaasVersion: () => boolean;

package/es/utils/index.js

@@ -915,4 +915,7 @@ export var downloadFile = function downloadFile(url, fileName) {
   document.body.appendChild(a);
   a.click();
   document.body.removeChild(a);
+};
+export var isSaasVersion = function isSaasVersion() {
+  return (getCache('poi-center-api') || '').includes('/tenant-lesoon-basic-api/');
 };

package/lib/components/AreaCascader.js

@@ -6,7 +6,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useRef, useState, useEffect, useImperativeHandle } from 'react';
 import { httpGet } from '../http';
-import { getCache, setCache, treeEach } from '../utils';
+import { getCache, setCache, treeEach, isSaasVersion } from '../utils';
 var AreaCascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -25,7 +25,7 @@ var AreaCascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            cacheItems = getCache("areaOptions", true);
+            cacheItems = getCache('areaOptions', true);
             if (!(cacheItems && Array.isArray(cacheItems))) {
               _context.next = 4;
               break;
@@ -34,11 +34,14 @@ var AreaCascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
             return _context.abrupt("return");
           case 4:
             api = '/petrel/petrel-location-center-api/sysAdministrativeDivision/allByTree';
-            _context.next = 7;
+            if (isSaasVersion()) {
+              api = '/lesoon/tenant-lesoon-mdm-center-api/sysAdministrativeDivision/allByTree';
+            }
+            _context.next = 8;
             return httpGet(api, {}, false);
-          case 7:
+          case 8:
             result = _context.sent;
-            opts = result.rows || [];
+            opts = (isSaasVersion() ? result.data : result.rows) || [];
             treeEach(opts, function (item) {
               item.label = item.name;
               item.value = item.id;
@@ -52,7 +55,7 @@ var AreaCascader = /*#__PURE__*/React.forwardRef(function (props, ref) {
             });
             setCache('areaOptions', opts, true);
             setOptions(opts);
-          case 12:
+          case 13:
           case "end":
             return _context.stop();
         }

package/lib/components/AreaCascaderPanel.js

@@ -9,7 +9,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import React, { useRef, useState, useEffect, useImperativeHandle } from 'react';
 import { httpGet } from '../http';
-import { getCache, setCache, treeEach } from '../utils';
+import { getCache, setCache, treeEach, isSaasVersion } from '../utils';
 import './common.less';
 var AreaPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var propsConfig = _objectSpread({
@@ -17,7 +17,7 @@ var AreaPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
       var _document;
       return (_document = document) === null || _document === void 0 ? void 0 : _document.body;
     },
-    placeholder: "请选择"
+    placeholder: '请选择'
   }, props);
   var _useState = useState(getCache('areaOptionsPanel', true) || []),
     _useState2 = _slicedToArray(_useState, 2),
@@ -93,11 +93,14 @@ var AreaPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
             return _context.abrupt("return");
           case 3:
             api = '/petrel/petrel-location-center-api/sysAdministrativeDivision/allByTree';
-            _context.next = 6;
+            if (isSaasVersion()) {
+              api = '/lesoon/tenant-lesoon-mdm-center-api/sysAdministrativeDivision/allByTree';
+            }
+            _context.next = 7;
             return httpGet(api, {}, false);
-          case 6:
+          case 7:
             result = _context.sent;
-            opts = result.rows || [];
+            opts = (isSaasVersion() ? result.data : result.rows) || [];
             treeEach(opts, function (item) {
               item.label = item.name;
               item.value = item.id;
@@ -111,7 +114,7 @@ var AreaPicker = /*#__PURE__*/React.forwardRef(function (props, ref) {
             setCache('areaOptionsPanel', opts, true);
             setOptions(opts);
             setShowData(opts);
-          case 12:
+          case 13:
           case "end":
             return _context.stop();
         }

package/lib/http/index.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { extend } from 'umi-request';
-import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading } from '../utils';
+import { getCache, getUrlQuery, setUrlQuery, getCookie, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, isSaasVersion } from '../utils';
 //默认超时时间为1分钟
 var request = extend({
   timeout: 60000
@@ -277,6 +277,9 @@ export function getDict(dictCode) {
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
   var api = '/lesoon-integration/sysDictDtl/listByProperties';
+  if (isSaasVersion()) {
+    api = '/tenant-lesoon-integration-api/sysDictDtl/listByProperties';
+  }
   var param = {
     dictCode: dictCode
   };

package/lib/utils/exportProcess.js

@@ -93,7 +93,8 @@ var exportProcess = function exportProcess(apiResult) {
   loading(0);
   var getResult = function getResult() {
     if (exit) return;
-    httpGet('/petrel-poi-center-api/sysPoiExportManage/page', {
+    var url = (localStorage.getItem('poi-center-api') || '/zuul/petrel-poi-center-api/').replace('/zuul/', '/');
+    httpGet(url + 'sysPoiExportManage/page', {
       'page.pn': 1,
       'page.size': 1,
       'search.id': apiResult.taskId

package/lib/utils/index.d.ts

@@ -316,3 +316,4 @@ export declare const exitLoading: () => void;
 export declare const handleTheme: () => void;
 export declare const sleep: (secord: number) => Promise<unknown>;
 export declare const downloadFile: (url: string, fileName?: string | undefined) => void;
+export declare const isSaasVersion: () => boolean;

package/lib/utils/index.js

@@ -915,4 +915,7 @@ export var downloadFile = function downloadFile(url, fileName) {
   document.body.appendChild(a);
   a.click();
   document.body.removeChild(a);
+};
+export var isSaasVersion = function isSaasVersion() {
+  return (getCache('poi-center-api') || '').includes('/tenant-lesoon-basic-api/');
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.0.86",
+  "version": "3.0.88",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [