ls-pro-common 3.1.24 → 3.1.26

package/lib/http/mdmRequest.js

@@ -13,7 +13,7 @@ function httpGetWithCache(_x, _x2) {
 }
 /**
  * @param params 请求参数
- * @name 获取主数据货主数据，调用接口/lesoon-mdm-center-api/bmOwner/findAll
+ * @name 获取主数据货主数据，调用接口/lesoon-mdm-center-api/bmOwner/page
  * @returns
  */
 function _httpGetWithCache() {
@@ -61,9 +61,10 @@ export var getOwner = /*#__PURE__*/function () {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           params = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-          url = '/lesoon-mdm-center-api/bmOwner/findAll';
+          setPageSize(params);
+          url = '/lesoon-mdm-center-api/bmOwner/page';
           return _context.abrupt("return", httpGetWithCache('owner', url, params));
-        case 3:
+        case 4:
         case "end":
           return _context.stop();
       }
@@ -75,42 +76,46 @@ export var getOwner = /*#__PURE__*/function () {
 }();
 /**
  * @param params 请求参数
- * @name 获取主数据仓库数据，调用接口/lesoon-mdm-center-api/bmStore/findAll
+ * @name 获取主数据仓库数据，调用接口/lesoon-mdm-center-api/bmStore/page
  * @returns
  */
 export var getStore = function getStore() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmStore/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmStore/page';
   return httpGetWithCache('store', url, params);
 };
 /**
  * @param params 请求参数
- * @name 获取主数据品牌部数据，调用接口/lesoon-mdm-center-api/bmBrandDept/findAll
+ * @name 获取主数据品牌部数据，调用接口/lesoon-mdm-center-api/bmBrandDept/page
  * @returns
  */
 export var getBrandDept = function getBrandDept() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmBrandDept/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmBrandDept/page';
   return httpGetWithCache('brandDept', url, params);
 };
 /**
  * @param params 请求参数
- * @name 获取主数据物流大区数据，调用接口/lesoon-mdm-center-api/bmLogisticRegion/findAll
+ * @name 获取主数据物流大区数据，调用接口/lesoon-mdm-center-api/bmLogisticRegion/page
  * @returns
  */
 export var getLogisticRegion = function getLogisticRegion() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmLogisticRegion/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmLogisticRegion/page';
   return httpGetWithCache('region', url, params);
 };
 /**
  * @param where: {forwarderLevel: 1 // 承运商级别 1:一级 2:二级 , forwarderType: 1 // 承运商类型 0:货运公司 1:快递公司 }
- * @name 获取快递/快运承运商，调用接口/lesoon-mdm-center-api/bmForwarder/findAll
+ * @name 获取快递/快运承运商，调用接口/lesoon-mdm-center-api/bmForwarder/page
  * @returns
  */
 export var getExpressCompany = function getExpressCompany() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmForwarder/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmForwarder/page';
   return httpGetWithCache('forwarder', url, params);
 };
 /**
@@ -124,101 +129,111 @@ export var getExpressCompanyPage = function getExpressCompanyPage() {
   return httpGetWithCache('forwarder', url, params);
 };
 /**
- * @name 实体仓，调用接口/lesoon-mdm-center-api/bmPhysicalStore/findAll
+ * @name 实体仓，调用接口/lesoon-mdm-center-api/bmPhysicalStore/page
  * @returns
  */
 export var getPhysicalStore = function getPhysicalStore() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmPhysicalStore/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmPhysicalStore/page';
   return httpGetWithCache('physicalStore', url, params);
 };
 /**
  * @param params
- * @name 结算大类，调用接口/lesoon-mdm-center-api/bmSettlementCate/findAll
+ * @name 结算大类，调用接口/lesoon-mdm-center-api/bmSettlementCate/page
  * @returns
  */
 export var getSettleCategory = function getSettleCategory() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmSettlementCate/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmSettlementCate/page';
   return httpGetWithCache('settlementCate', url, params);
 };
 /**
  * @param param
- * @name 获取损益主体，调用接口/lesoon-mdm-center-api/bmProfitLossMain/findAll
+ * @name 获取损益主体，调用接口/lesoon-mdm-center-api/bmProfitLossMain/page
  * @returns
  */
 export var getProfitLossMain = function getProfitLossMain() {
   var param = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmProfitLossMain/findAll';
+  setPageSize(param);
+  var url = '/lesoon-mdm-center-api/bmProfitLossMain/page';
   return httpGetWithCache('profitLossMain', url, param);
 };
 /**
  * @param params
- * @name 结算公司，调用接口/lesoon-mdm-center-api/bmSettleCompany/findAll
+ * @name 结算公司，调用接口/lesoon-mdm-center-api/bmSettleCompany/page
  * @returns
  */
 export var getSettleCompany = function getSettleCompany() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmSettleCompany/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmSettleCompany/page';
   return httpGetWithCache('settleCompany', url, params);
 };
 /**
  * @param params
- * @name 货权，调用接口/lesoon-mdm-center-api/bmPowerUnit/findAll
+ * @name 货权，调用接口/lesoon-mdm-center-api/bmPowerUnit/page
  * @returns
  */
 export var getPowerUnit = function getPowerUnit() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmPowerUnit/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmPowerUnit/page';
   return httpGetWithCache('powerUnit', url, params);
 };
 /**
  * @param params
- * @name 结算账号，调用接口/lesoon-mdm-center-api/bmSettleAccount/findAll
+ * @name 结算账号，调用接口/lesoon-mdm-center-api/bmSettleAccount/page
  * @returns
  */
 export var getSettleAccount = function getSettleAccount() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmSettleAccount/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmSettleAccount/page';
   return httpGetWithCache('settleAccount', url, params);
 };
 /**
- * @name 获取物流大类，调用接口/lesoon-mdm-center-api/bmLogisticCategory/findAll
+ * @name 获取物流大类，调用接口/lesoon-mdm-center-api/bmLogisticCategory/page
  * @returns
  */
 export var getLogisticCategory = function getLogisticCategory() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmLogisticCategory/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmLogisticCategory/page';
   return httpGetWithCache('logisticCategory', url, params);
 };
 /**
  * @param param
- * @name 管理城市，调用接口/lesoon-mdm-center-api/bmManagingCity/findAll
+ * @name 管理城市，调用接口/lesoon-mdm-center-api/bmManagingCity/page
  * @returns
  */
 export var getManagingCity = function getManagingCity() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmManagingCity/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmManagingCity/page';
   return httpGetWithCache('managingCity', url, params);
 };
 /**
  * @param {where: {level:'province'}} level Province=省,city=市,district=区
- * @name 获取省市区，调用接口/lesoon-mdm-center-api/sysAdministrativeDivision/findAll
+ * @name 获取省市区，调用接口/lesoon-mdm-center-api/sysAdministrativeDivision/page
  * @returns
  */
 export var getArea = function getArea() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/sysAdministrativeDivision/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/sysAdministrativeDivision/page';
   return httpGetWithCache('area', url, params);
 };
 /**
  * @param param
- * @name 获取集散中心，调用接口/lesoon-mdm-center-api/tmsTransportLocno/findAll
+ * @name 获取集散中心，调用接口/lesoon-mdm-center-api/tmsTransportLocno/page
  * @returns
  */
 export var getTransportLocno = function getTransportLocno() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/tmsTransportLocno/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/tmsTransportLocno/page';
   return httpGetWithCache('transportLocno', url, params);
 };
 /**
@@ -256,62 +271,68 @@ export var getShopPage = function getShopPage() {
 };
 /**
  * @param param
- * @name 获取颜色，调用接口/lesoon-mdm-center-api/bmColor/findAll
+ * @name 获取颜色，调用接口/lesoon-mdm-center-api/bmColor/page
  * @returns
  */
 export var getColor = function getColor() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmColor/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmColor/page';
   return httpGetWithCache('color', url, params);
 };
 /**
  * @param param
- * @name 获取尺码类型，调用接口/lesoon-mdm-center-api/bmSizeType/findAll
+ * @name 获取尺码类型，调用接口/lesoon-mdm-center-api/bmSizeType/page
  * @returns
  */
 export var getSizeType = function getSizeType() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmSizeType/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmSizeType/page';
   return httpGetWithCache('sizeType', url, params);
 };
 /**
  * @param param
- * @name 获取性别，调用接口/lesoon-mdm-center-api/bmGender/findAll
+ * @name 获取性别，调用接口/lesoon-mdm-center-api/bmGender/page
  * @returns
  */
 export var getGender = function getGender() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmGender/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmGender/page';
   return httpGetWithCache('gender', url, params);
 };
 /**
  * @param param
- * @name 获取年份，调用接口/lesoon-mdm-center-api/bmYear/findAll
+ * @name 获取年份，调用接口/lesoon-mdm-center-api/bmYear/page
  * @returns
  */
 export var getYear = function getYear() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmYear/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmYear/page';
   return httpGetWithCache('year', url, params);
 };
 /**
  * @param param
- * @name 获取季节，调用接口/lesoon-mdm-center-api/bmSeason/findAll
+ * @name 获取季节，调用接口/lesoon-mdm-center-api/bmSeason/page
  * @returns
  */
 export var getSeason = function getSeason() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmSeason/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmSeason/page';
   return httpGetWithCache('season', url, params);
 };
 /**
  * @param param
- * @name 获取品类，调用接口/lesoon-mdm-center-api/bmCategory/findAll
+ * @name 获取品类，调用接口/lesoon-mdm-center-api/bmCategory/page
  * @returns
  */
 export var getCategory = function getCategory() {
   var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-  var url = '/lesoon-mdm-center-api/bmCategory/findAll';
+  setPageSize(params);
+  var url = '/lesoon-mdm-center-api/bmCategory/page';
   return httpGetWithCache('category', url, params);
 };
 var mdmMap = {

package/lib/index.d.ts

@@ -19,7 +19,7 @@ import TagCheck from './components/TagCheck';
 import ViewOffice from './components/ViewOffice';
 import ProButton from './components/ProButton';
 import RecordLog from './components/RecordLog';
-import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions, httpBatchGet } from './http';
+import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions, httpBatchGet, httpBatchPost, getResourceRight } from './http';
 import BaseService from './service/BaseService';
 import * as mdmRequest from './http/mdmRequest';
 import * as utils from './utils';
@@ -43,4 +43,4 @@ import type { DescritionCardProps } from './components/DescritionCard';
 import type { PermissionProps } from './components/Permission';
 import type { TDict } from './hooks/useDict';
 export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps, DescritionCardProps, PermissionProps, TDict, };
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, ViewOffice, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, httpBatchGet, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, useBaseDict, useSelectOptions, useDict, useMdm, showConfirmFun, exportProcess, mdmRequest, ProButton, RecordLog, };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, ViewOffice, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, httpBatchGet, httpBatchPost, getResourceRight, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, useBaseDict, useSelectOptions, useDict, useMdm, showConfirmFun, exportProcess, mdmRequest, ProButton, RecordLog, };

package/lib/index.js

@@ -19,7 +19,7 @@ import TagCheck from './components/TagCheck';
 import ViewOffice from './components/ViewOffice';
 import ProButton from './components/ProButton';
 import RecordLog from './components/RecordLog';
-import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions, httpBatchGet } from './http';
+import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions, httpBatchGet, httpBatchPost, getResourceRight } from './http';
 import BaseService from './service/BaseService';
 import * as mdmRequest from './http/mdmRequest';
 import * as utils from './utils';
@@ -36,4 +36,4 @@ import showConfirmFun from './hooks/useShowConfirm';
 import useQueue from './hooks/useQueue';
 import { useDict } from './hooks/useDict';
 import useMdm from './hooks/useMdm';
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, ViewOffice, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, httpBatchGet, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, useBaseDict, useSelectOptions, useDict, useMdm, showConfirmFun, exportProcess, mdmRequest, ProButton, RecordLog };
+export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, ViewOffice, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, httpBatchGet, httpBatchPost, getResourceRight, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, useBaseDict, useSelectOptions, useDict, useMdm, showConfirmFun, exportProcess, mdmRequest, ProButton, RecordLog };

package/lib/utils/index.d.ts

@@ -215,7 +215,14 @@ export declare const handleTheme: () => void;
  */
 export declare const sleep: (secord: number) => Promise<unknown>;
 /**
- * 通用下载文件方法
+ * 将url转换为下载地址,优先走下载域名,如果下载域名没有配置,则走原url
+ *
+ * @param url
+ * @returns
+ */
+export declare const urlDownloadDomain: (url: string) => string;
+/**
+ * 通用下载文件方法,直接走下载域名。
  *
  * @param url 文件地址
  * @param fileName 文件名

package/lib/utils/index.js

@@ -460,22 +460,41 @@ export var sleep = function sleep(secord) {
   });
 };
 /**
- * 通用下载文件方法
+ * 将url转换为下载地址,优先走下载域名,如果下载域名没有配置,则走原url
+ *
+ * @param url
+ * @returns
+ */
+export var urlDownloadDomain = function urlDownloadDomain(url) {
+  var _downDomain;
+  if (!url) return url;
+  //获取下载域名
+  var downDomain = getCache('exportUrl');
+  if (!downDomain && location.origin.endsWith('.cloud')) {
+    downDomain = 'https://download.lesoon.cloud';
+  } else if ((_downDomain = downDomain) === null || _downDomain === void 0 ? void 0 : _downDomain.startsWith('//')) {
+    downDomain = location.protocol + downDomain;
+  }
+  // 处理网关
+  url = toGatewayUrl(url);
+  // 替换域名
+  if (downDomain) {
+    url = setUrlQuery(url.replace(location.origin, downDomain), {
+      token: getCookie('token')
+    });
+  }
+  return url;
+};
+/**
+ * 通用下载文件方法,直接走下载域名。
  *
  * @param url 文件地址
  * @param fileName 文件名
  */
 export var downloadFile = function downloadFile(url, fileName) {
   var a = document.createElement('a');
+  url = urlDownloadDomain(url);
   a.href = url;
-  // 如果导出域名有配置，则优先使用导出域名
-  var baseExportUrl = getCache('exportUrl') || '';
-  var token = getCookie('token') || '';
-  if (baseExportUrl && !url.startsWith('http') && token) {
-    a.href = setUrlQuery(baseExportUrl + url, {
-      token: token
-    });
-  }
   // a.target = '_blank'; // 新开屏有闪烁
   if (fileName) {
     a.setAttribute('download', fileName);

package/package.json

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