ls-pro-common 1.0.12 → 1.0.13

package/es/http/index.d.ts

@@ -3,21 +3,24 @@ declare const request: import("umi-request").RequestMethod<false>;
  * get请求
  * @param url 接口
  * @param params 参数{key:value}
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpGet(url: string, params?: Record<string, any>): Promise<any>;
+export declare function httpGet(url: string, params?: Record<string, any>, needGateWay?: boolean): Promise<any>;
 /**
  * post请求
  * @param url 接口
  * @param data 参数{key:value}
  * @param isJson json请求还是form请求,默认为json请求
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpPost(url: string, data?: Record<string, any>, isJson?: boolean): Promise<any>;
+export declare function httpPost(url: string, data?: Record<string, any>, isJson?: boolean, needGateWay?: boolean): Promise<any>;
 /**
  * put 请求
  * @param url 接口
  * @param data 参数{key:value}
+  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
 export declare function httpPut(url: string, data?: Record<string, any>): Promise<any>;
@@ -25,15 +28,17 @@ export declare function httpPut(url: string, data?: Record<string, any>): Promis
  * delete 请求
  * @param url 接口
  * @param data 参数[]
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
 export declare function httpDelete(url: string, data: any): Promise<any>;
 /**
  * 读取数据字典
  * @param dictCode 字典编码
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<Record<string,string>>
  */
-export declare function getDict(dictCode: string, showValue?: boolean): Promise<any>;
+export declare function getDict(dictCode: string, showValue?: boolean, needGateWay?: boolean): Promise<any>;
 /**
  * 加载下拉框的数据源
  * @param url 后端接口
@@ -41,7 +46,8 @@ export declare function getDict(dictCode: string, showValue?: boolean): Promise<
  * @param valueField 值字段
  * @param labelField 显示字段
  * @param showValue 显示值
+ * @param needGateWay 是否需要网关 默认为true
  * @returns
  */
-export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean): Promise<any>;
+export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean): Promise<any>;
 export default request;

package/es/http/index.js

@@ -23,7 +23,7 @@ request.interceptors.request.use(function (url, options) {
   }
 
   return {
-    url: toGatewayUrl(url),
+    url: url,
     options: opts
   };
 });
@@ -84,6 +84,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
  * get请求
  * @param url 接口
  * @param params 参数{key:value}
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
 
@@ -95,23 +96,31 @@ export function httpGet(_x3) {
  * @param url 接口
  * @param data 参数{key:value}
  * @param isJson json请求还是form请求,默认为json请求
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
 
 function _httpGet() {
   _httpGet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(url) {
     var params,
+        needGateWay,
         _args2 = arguments;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
             params = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : {};
+            needGateWay = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : true;
+
+            if (needGateWay) {
+              url = toGatewayUrl(url);
+            }
+
             return _context2.abrupt("return", request.get(url, {
               params: params
             }));
 
-          case 2:
+          case 4:
           case "end":
             return _context2.stop();
         }
@@ -128,6 +137,7 @@ export function httpPost(_x4) {
  * put 请求
  * @param url 接口
  * @param data 参数{key:value}
+  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
 
@@ -135,6 +145,7 @@ function _httpPost() {
   _httpPost = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(url) {
     var data,
         isJson,
+        needGateWay,
         _args3 = arguments;
     return _regeneratorRuntime.wrap(function _callee3$(_context3) {
       while (1) {
@@ -142,12 +153,18 @@ function _httpPost() {
           case 0:
             data = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : {};
             isJson = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : true;
+            needGateWay = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : true;
+
+            if (needGateWay) {
+              url = toGatewayUrl(url);
+            }
+
             return _context3.abrupt("return", request.post(url, {
               data: data,
               requestType: isJson ? 'json' : 'form'
             }));
 
-          case 3:
+          case 5:
           case "end":
             return _context3.stop();
         }
@@ -164,6 +181,7 @@ export function httpPut(_x5) {
  * delete 请求
  * @param url 接口
  * @param data 参数[]
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
 
@@ -196,6 +214,7 @@ export function httpDelete(_x6, _x7) {
 /**
  * 读取数据字典
  * @param dictCode 字典编码
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<Record<string,string>>
  */
 
@@ -229,12 +248,14 @@ export function getDict(_x8) {
  * @param valueField 值字段
  * @param labelField 显示字段
  * @param showValue 显示值
+ * @param needGateWay 是否需要网关 默认为true
  * @returns
  */
 
 function _getDict() {
   _getDict = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(dictCode) {
     var showValue,
+        needGateWay,
         api,
         param,
         _args6 = arguments;
@@ -243,6 +264,7 @@ function _getDict() {
         switch (_context6.prev = _context6.next) {
           case 0:
             showValue = _args6.length > 1 && _args6[1] !== undefined ? _args6[1] : true;
+            needGateWay = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : true;
             api = '/lesoon-integration/sysDictDtl';
             param = {
               where: {
@@ -250,9 +272,9 @@ function _getDict() {
               },
               ifPage: 0
             };
-            return _context6.abrupt("return", fetchOptions(api, param, 'dictValue', 'displayName', showValue));
+            return _context6.abrupt("return", fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay));
 
-          case 4:
+          case 5:
           case "end":
             return _context6.stop();
         }
@@ -269,6 +291,7 @@ export function fetchOptions(_x9, _x10, _x11, _x12) {
 function _fetchOptions() {
   _fetchOptions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(url, param, valueField, labelField) {
     var showValue,
+        needGateWay,
         _yield$httpGet,
         _yield$httpGet$rows,
         rows,
@@ -280,10 +303,11 @@ function _fetchOptions() {
         switch (_context7.prev = _context7.next) {
           case 0:
             showValue = _args7.length > 4 && _args7[4] !== undefined ? _args7[4] : true;
-            _context7.next = 3;
-            return httpGet(url, param);
+            needGateWay = _args7.length > 5 && _args7[5] !== undefined ? _args7[5] : true;
+            _context7.next = 4;
+            return httpGet(url, param, needGateWay);
 
-          case 3:
+          case 4:
             _yield$httpGet = _context7.sent;
             _yield$httpGet$rows = _yield$httpGet.rows;
             rows = _yield$httpGet$rows === void 0 ? [] : _yield$httpGet$rows;
@@ -297,7 +321,7 @@ function _fetchOptions() {
             });
             return _context7.abrupt("return", data);
 
-          case 8:
+          case 9:
           case "end":
             return _context7.stop();
         }

package/lib/http/index.d.ts

@@ -3,21 +3,24 @@ declare const request: import("umi-request").RequestMethod<false>;
  * get请求
  * @param url 接口
  * @param params 参数{key:value}
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpGet(url: string, params?: Record<string, any>): Promise<any>;
+export declare function httpGet(url: string, params?: Record<string, any>, needGateWay?: boolean): Promise<any>;
 /**
  * post请求
  * @param url 接口
  * @param data 参数{key:value}
  * @param isJson json请求还是form请求,默认为json请求
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpPost(url: string, data?: Record<string, any>, isJson?: boolean): Promise<any>;
+export declare function httpPost(url: string, data?: Record<string, any>, isJson?: boolean, needGateWay?: boolean): Promise<any>;
 /**
  * put 请求
  * @param url 接口
  * @param data 参数{key:value}
+  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
 export declare function httpPut(url: string, data?: Record<string, any>): Promise<any>;
@@ -25,15 +28,17 @@ export declare function httpPut(url: string, data?: Record<string, any>): Promis
  * delete 请求
  * @param url 接口
  * @param data 参数[]
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
 export declare function httpDelete(url: string, data: any): Promise<any>;
 /**
  * 读取数据字典
  * @param dictCode 字典编码
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<Record<string,string>>
  */
-export declare function getDict(dictCode: string, showValue?: boolean): Promise<any>;
+export declare function getDict(dictCode: string, showValue?: boolean, needGateWay?: boolean): Promise<any>;
 /**
  * 加载下拉框的数据源
  * @param url 后端接口
@@ -41,7 +46,8 @@ export declare function getDict(dictCode: string, showValue?: boolean): Promise<
  * @param valueField 值字段
  * @param labelField 显示字段
  * @param showValue 显示值
+ * @param needGateWay 是否需要网关 默认为true
  * @returns
  */
-export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean): Promise<any>;
+export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean): Promise<any>;
 export default request;

package/lib/http/index.js

@@ -42,7 +42,7 @@ request.interceptors.request.use(function (url, options) {
   }
 
   return {
-    url: (0, _utils.toGatewayUrl)(url),
+    url: url,
     options: opts
   };
 });
@@ -103,6 +103,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
  * get请求
  * @param url 接口
  * @param params 参数{key:value}
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
 
@@ -114,6 +115,7 @@ function httpGet(_x3) {
  * @param url 接口
  * @param data 参数{key:value}
  * @param isJson json请求还是form请求,默认为json请求
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
 
@@ -121,17 +123,24 @@ function httpGet(_x3) {
 function _httpGet() {
   _httpGet = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(url) {
     var params,
+        needGateWay,
         _args2 = arguments;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
             params = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : {};
+            needGateWay = _args2.length > 2 && _args2[2] !== undefined ? _args2[2] : true;
+
+            if (needGateWay) {
+              url = (0, _utils.toGatewayUrl)(url);
+            }
+
             return _context2.abrupt("return", request.get(url, {
               params: params
             }));
 
-          case 2:
+          case 4:
           case "end":
             return _context2.stop();
         }
@@ -148,6 +157,7 @@ function httpPost(_x4) {
  * put 请求
  * @param url 接口
  * @param data 参数{key:value}
+  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
 
@@ -156,6 +166,7 @@ function _httpPost() {
   _httpPost = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(url) {
     var data,
         isJson,
+        needGateWay,
         _args3 = arguments;
     return _regenerator.default.wrap(function _callee3$(_context3) {
       while (1) {
@@ -163,12 +174,18 @@ function _httpPost() {
           case 0:
             data = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : {};
             isJson = _args3.length > 2 && _args3[2] !== undefined ? _args3[2] : true;
+            needGateWay = _args3.length > 3 && _args3[3] !== undefined ? _args3[3] : true;
+
+            if (needGateWay) {
+              url = (0, _utils.toGatewayUrl)(url);
+            }
+
             return _context3.abrupt("return", request.post(url, {
               data: data,
               requestType: isJson ? 'json' : 'form'
             }));
 
-          case 3:
+          case 5:
           case "end":
             return _context3.stop();
         }
@@ -185,6 +202,7 @@ function httpPut(_x5) {
  * delete 请求
  * @param url 接口
  * @param data 参数[]
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
 
@@ -218,6 +236,7 @@ function httpDelete(_x6, _x7) {
 /**
  * 读取数据字典
  * @param dictCode 字典编码
+ * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<Record<string,string>>
  */
 
@@ -252,6 +271,7 @@ function getDict(_x8) {
  * @param valueField 值字段
  * @param labelField 显示字段
  * @param showValue 显示值
+ * @param needGateWay 是否需要网关 默认为true
  * @returns
  */
 
@@ -259,6 +279,7 @@ function getDict(_x8) {
 function _getDict() {
   _getDict = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(dictCode) {
     var showValue,
+        needGateWay,
         api,
         param,
         _args6 = arguments;
@@ -267,6 +288,7 @@ function _getDict() {
         switch (_context6.prev = _context6.next) {
           case 0:
             showValue = _args6.length > 1 && _args6[1] !== undefined ? _args6[1] : true;
+            needGateWay = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : true;
             api = '/lesoon-integration/sysDictDtl';
             param = {
               where: {
@@ -274,9 +296,9 @@ function _getDict() {
               },
               ifPage: 0
             };
-            return _context6.abrupt("return", fetchOptions(api, param, 'dictValue', 'displayName', showValue));
+            return _context6.abrupt("return", fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay));
 
-          case 4:
+          case 5:
           case "end":
             return _context6.stop();
         }
@@ -293,6 +315,7 @@ function fetchOptions(_x9, _x10, _x11, _x12) {
 function _fetchOptions() {
   _fetchOptions = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(url, param, valueField, labelField) {
     var showValue,
+        needGateWay,
         _yield$httpGet,
         _yield$httpGet$rows,
         rows,
@@ -304,10 +327,11 @@ function _fetchOptions() {
         switch (_context7.prev = _context7.next) {
           case 0:
             showValue = _args7.length > 4 && _args7[4] !== undefined ? _args7[4] : true;
-            _context7.next = 3;
-            return httpGet(url, param);
+            needGateWay = _args7.length > 5 && _args7[5] !== undefined ? _args7[5] : true;
+            _context7.next = 4;
+            return httpGet(url, param, needGateWay);
 
-          case 3:
+          case 4:
             _yield$httpGet = _context7.sent;
             _yield$httpGet$rows = _yield$httpGet.rows;
             rows = _yield$httpGet$rows === void 0 ? [] : _yield$httpGet$rows;
@@ -321,7 +345,7 @@ function _fetchOptions() {
             });
             return _context7.abrupt("return", data);
 
-          case 8:
+          case 9:
           case "end":
             return _context7.stop();
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "ls-pro-common",
   "keywords": [
     "antd",
@@ -28,7 +28,7 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "2.62.18",
+    "ls-pro-table": "2.62.19",
     "ls-pro-form": "1.52.20",
     "@babel/runtime": "^7.16.3",
     "classnames": "^2.2.6",