ls-pro-common 3.1.55 → 3.1.57

package/es/components/InputTable.js

@@ -159,18 +159,18 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
    * @param formValue
    */
   var setFormValue = function setFormValue(formValue) {
-    var _prop$onChange;
-    (_prop$onChange = prop.onChange) === null || _prop$onChange === void 0 ? void 0 : _prop$onChange.call(prop, formValue[name]);
     for (var key in formValue) {
       if (formValue[key] === null) {
         formValue[key] = undefined;
       }
     }
     if (rowKey) {
-      var _formRef$current3, _formRef$current3$set;
+      var _formRef$current3, _formRef$current3$set, _prop$onChange;
       formRef === null || formRef === void 0 ? void 0 : (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : (_formRef$current3$set = _formRef$current3.setFieldsValue) === null || _formRef$current3$set === void 0 ? void 0 : _formRef$current3$set.call(_formRef$current3, _defineProperty({}, rowKey, formValue));
+      (_prop$onChange = prop.onChange) === null || _prop$onChange === void 0 ? void 0 : _prop$onChange.call(prop, formValue[name]);
     } else {
-      var _formRef$current4, _formRef$current4$set;
+      var _prop$onChange2, _formRef$current4, _formRef$current4$set;
+      (_prop$onChange2 = prop.onChange) === null || _prop$onChange2 === void 0 ? void 0 : _prop$onChange2.call(prop, formValue[name]);
       formRef === null || formRef === void 0 ? void 0 : (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : (_formRef$current4$set = _formRef$current4.setFieldsValue) === null || _formRef$current4$set === void 0 ? void 0 : _formRef$current4$set.call(_formRef$current4, formValue);
     }
   };
@@ -495,12 +495,6 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       }
     } catch (e) {}
   }, [text, rest, fieldProps]);
-  // useEffect(() => {
-  //   if (!prop.value) {
-  //     handleClear();
-  //   }
-  //   console.log('value', prop.value);
-  // }, [prop.value]);
   var tableDom = /*#__PURE__*/React.createElement(ProTable, _extends({
     className: "ls-input-table",
     columns: columns,
@@ -640,13 +634,13 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     name: [rowKey, textNameProp]
   }, rest, {
     noStyle: true
-  }), InputDom) :
+  }), InputDom) : (formRef === null || formRef === void 0 ? void 0 : formRef.current) ?
   /*#__PURE__*/
   // 在 ProTable 的查询面板中使用
   React.createElement(_Form.Item, _extends({
     name: textNameProp
   }, rest, {
     noStyle: true
-  }), InputDom));
+  }), InputDom) : /*#__PURE__*/React.createElement(React.Fragment, null, InputDom));
 });
 export default InputTable;

package/es/http/index.d.ts

@@ -61,9 +61,10 @@ export interface UploadResult {
  * @param labelName 对应后端接口的文件字段名，默认为 'file'
  * @param needGateWay 是否需要网关，默认为 true,如果url里已包含网关，则不需要网关
  * @param onProgress 进度回调函数，参数为 0-100 的进度百分比
+ * @param useDownloadDomain 是否使用下载域名来上传，默认为 false
  * @returns 返回包含 promise 和 cancel 方法的对象
  */
-export declare const httpUpload: (url: string, file: File, params?: Record<string, any>, labelName?: string, needGateWay?: boolean, onProgress?: UploadProgressCallback | undefined) => UploadResult;
+export declare const httpUpload: (url: string, file: File, params?: Record<string, any>, labelName?: string, needGateWay?: boolean, onProgress?: UploadProgressCallback | undefined, useDownloadDomain?: boolean) => UploadResult;
 /**
  * 分批获取数据，当一次性取大于2000条，且是第一页时，分多次去取，避免一次性取太多数据导致后端工程压力过大
  *

package/es/http/index.js

@@ -4,7 +4,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { extend } from 'umi-request';
-import { getCache, getUrlQuery, setUrlQuery, getCookie, getCacheSessionFirst, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, getBrowserId, setCache, isDingtalk } from '../utils';
+import { getCache, getUrlQuery, setUrlQuery, getCookie, getCacheSessionFirst, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, getBrowserId, setCache, isDingtalk, urlDownloadDomain } from '../utils';
 //默认超时时间为1分钟
 var request = extend({
   timeout: 60000
@@ -368,6 +368,7 @@ export function httpDelete(url, data) {
  * @param labelName 对应后端接口的文件字段名，默认为 'file'
  * @param needGateWay 是否需要网关，默认为 true,如果url里已包含网关，则不需要网关
  * @param onProgress 进度回调函数，参数为 0-100 的进度百分比
+ * @param useDownloadDomain 是否使用下载域名来上传，默认为 false
  * @returns 返回包含 promise 和 cancel 方法的对象
  */
 export var httpUpload = function httpUpload(url, file) {
@@ -375,6 +376,7 @@ export var httpUpload = function httpUpload(url, file) {
   var labelName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'file';
   var needGateWay = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
   var onProgress = arguments.length > 5 ? arguments[5] : undefined;
+  var useDownloadDomain = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   var formData = new FormData();
   // 处理附加参数，转换为FormData格式
   Object.keys(params).forEach(function (key) {
@@ -394,6 +396,9 @@ export var httpUpload = function httpUpload(url, file) {
     var _window$crypto$random2, _window$crypto2;
     // 处理 URL（模拟拦截器的逻辑）
     var requestUrl = finalUrl;
+    if (useDownloadDomain) {
+      requestUrl = urlDownloadDomain(requestUrl);
+    }
     // 移除 noToken 参数
     requestUrl = requestUrl.replace('&noToken=1', '').replace('noToken=1', '');
     // 处理 resCode

package/es/utils/url.js

@@ -80,8 +80,11 @@ export var toGatewayUrl = function toGatewayUrl(url) {
   var defaultGateway = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
   url = url || '';
   // 如果url带有名称，不需要设置网关
-  if (url.startsWith('http://') || url.startsWith('https://') || url.startsWith('//')) return url;
-  if (url.startsWith('/lesoon/') || url.startsWith('/petrel/') || url.startsWith('/lesoon-retail/') || url.startsWith('/scm-bms/')) {
+  if (url.startsWith('http://') || url.startsWith('https://')) return url;
+  if (url.startsWith('//')) {
+    return location.protocol + url;
+  }
+  if (url.startsWith('/lesoon/') || url.startsWith('/petrel/') || url.startsWith('/lesoon-retail/') || url.startsWith('/scm-bms/') || url.startsWith('/porch/')) {
     return location.origin + url;
   }
   // 读取项目的默认网关
@@ -105,7 +108,7 @@ export var toGatewayUrl = function toGatewayUrl(url) {
       }
     }
   }
-  // 网关加上域名，避免多次设置
+  // 网关加上域名，避免多次设置,比如业务开发调用了一次，基础组件中又添加一次。
   if (gateway && !gateway.startsWith('http')) {
     gateway = location.origin + gateway;
   }

package/lib/components/InputTable.js

@@ -159,18 +159,18 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
    * @param formValue
    */
   var setFormValue = function setFormValue(formValue) {
-    var _prop$onChange;
-    (_prop$onChange = prop.onChange) === null || _prop$onChange === void 0 ? void 0 : _prop$onChange.call(prop, formValue[name]);
     for (var key in formValue) {
       if (formValue[key] === null) {
         formValue[key] = undefined;
       }
     }
     if (rowKey) {
-      var _formRef$current3, _formRef$current3$set;
+      var _formRef$current3, _formRef$current3$set, _prop$onChange;
       formRef === null || formRef === void 0 ? void 0 : (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : (_formRef$current3$set = _formRef$current3.setFieldsValue) === null || _formRef$current3$set === void 0 ? void 0 : _formRef$current3$set.call(_formRef$current3, _defineProperty({}, rowKey, formValue));
+      (_prop$onChange = prop.onChange) === null || _prop$onChange === void 0 ? void 0 : _prop$onChange.call(prop, formValue[name]);
     } else {
-      var _formRef$current4, _formRef$current4$set;
+      var _prop$onChange2, _formRef$current4, _formRef$current4$set;
+      (_prop$onChange2 = prop.onChange) === null || _prop$onChange2 === void 0 ? void 0 : _prop$onChange2.call(prop, formValue[name]);
       formRef === null || formRef === void 0 ? void 0 : (_formRef$current4 = formRef.current) === null || _formRef$current4 === void 0 ? void 0 : (_formRef$current4$set = _formRef$current4.setFieldsValue) === null || _formRef$current4$set === void 0 ? void 0 : _formRef$current4$set.call(_formRef$current4, formValue);
     }
   };
@@ -495,12 +495,6 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       }
     } catch (e) {}
   }, [text, rest, fieldProps]);
-  // useEffect(() => {
-  //   if (!prop.value) {
-  //     handleClear();
-  //   }
-  //   console.log('value', prop.value);
-  // }, [prop.value]);
   var tableDom = /*#__PURE__*/React.createElement(ProTable, _extends({
     className: "ls-input-table",
     columns: columns,
@@ -640,13 +634,13 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     name: [rowKey, textNameProp]
   }, rest, {
     noStyle: true
-  }), InputDom) :
+  }), InputDom) : (formRef === null || formRef === void 0 ? void 0 : formRef.current) ?
   /*#__PURE__*/
   // 在 ProTable 的查询面板中使用
   React.createElement(_Form.Item, _extends({
     name: textNameProp
   }, rest, {
     noStyle: true
-  }), InputDom));
+  }), InputDom) : /*#__PURE__*/React.createElement(React.Fragment, null, InputDom));
 });
 export default InputTable;

package/lib/http/index.d.ts

@@ -61,9 +61,10 @@ export interface UploadResult {
  * @param labelName 对应后端接口的文件字段名，默认为 'file'
  * @param needGateWay 是否需要网关，默认为 true,如果url里已包含网关，则不需要网关
  * @param onProgress 进度回调函数，参数为 0-100 的进度百分比
+ * @param useDownloadDomain 是否使用下载域名来上传，默认为 false
  * @returns 返回包含 promise 和 cancel 方法的对象
  */
-export declare const httpUpload: (url: string, file: File, params?: Record<string, any>, labelName?: string, needGateWay?: boolean, onProgress?: UploadProgressCallback | undefined) => UploadResult;
+export declare const httpUpload: (url: string, file: File, params?: Record<string, any>, labelName?: string, needGateWay?: boolean, onProgress?: UploadProgressCallback | undefined, useDownloadDomain?: boolean) => UploadResult;
 /**
  * 分批获取数据，当一次性取大于2000条，且是第一页时，分多次去取，避免一次性取太多数据导致后端工程压力过大
  *

package/lib/http/index.js

@@ -4,7 +4,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import { extend } from 'umi-request';
-import { getCache, getUrlQuery, setUrlQuery, getCookie, getCacheSessionFirst, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, getBrowserId, setCache, isDingtalk } from '../utils';
+import { getCache, getUrlQuery, setUrlQuery, getCookie, getCacheSessionFirst, getResourceProps, showError, httpError, toGatewayUrl, reLogin, showLoading, exitLoading, getBrowserId, setCache, isDingtalk, urlDownloadDomain } from '../utils';
 //默认超时时间为1分钟
 var request = extend({
   timeout: 60000
@@ -368,6 +368,7 @@ export function httpDelete(url, data) {
  * @param labelName 对应后端接口的文件字段名，默认为 'file'
  * @param needGateWay 是否需要网关，默认为 true,如果url里已包含网关，则不需要网关
  * @param onProgress 进度回调函数，参数为 0-100 的进度百分比
+ * @param useDownloadDomain 是否使用下载域名来上传，默认为 false
  * @returns 返回包含 promise 和 cancel 方法的对象
  */
 export var httpUpload = function httpUpload(url, file) {
@@ -375,6 +376,7 @@ export var httpUpload = function httpUpload(url, file) {
   var labelName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 'file';
   var needGateWay = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
   var onProgress = arguments.length > 5 ? arguments[5] : undefined;
+  var useDownloadDomain = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   var formData = new FormData();
   // 处理附加参数，转换为FormData格式
   Object.keys(params).forEach(function (key) {
@@ -394,6 +396,9 @@ export var httpUpload = function httpUpload(url, file) {
     var _window$crypto$random2, _window$crypto2;
     // 处理 URL（模拟拦截器的逻辑）
     var requestUrl = finalUrl;
+    if (useDownloadDomain) {
+      requestUrl = urlDownloadDomain(requestUrl);
+    }
     // 移除 noToken 参数
     requestUrl = requestUrl.replace('&noToken=1', '').replace('noToken=1', '');
     // 处理 resCode

package/lib/utils/url.js

@@ -80,8 +80,11 @@ export var toGatewayUrl = function toGatewayUrl(url) {
   var defaultGateway = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
   url = url || '';
   // 如果url带有名称，不需要设置网关
-  if (url.startsWith('http://') || url.startsWith('https://') || url.startsWith('//')) return url;
-  if (url.startsWith('/lesoon/') || url.startsWith('/petrel/') || url.startsWith('/lesoon-retail/') || url.startsWith('/scm-bms/')) {
+  if (url.startsWith('http://') || url.startsWith('https://')) return url;
+  if (url.startsWith('//')) {
+    return location.protocol + url;
+  }
+  if (url.startsWith('/lesoon/') || url.startsWith('/petrel/') || url.startsWith('/lesoon-retail/') || url.startsWith('/scm-bms/') || url.startsWith('/porch/')) {
     return location.origin + url;
   }
   // 读取项目的默认网关
@@ -105,7 +108,7 @@ export var toGatewayUrl = function toGatewayUrl(url) {
       }
     }
   }
-  // 网关加上域名，避免多次设置
+  // 网关加上域名，避免多次设置,比如业务开发调用了一次，基础组件中又添加一次。
   if (gateway && !gateway.startsWith('http')) {
     gateway = location.origin + gateway;
   }

package/package.json

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