ls-pro-common 3.1.16 → 3.1.18

package/es/http/index.js

@@ -14,7 +14,7 @@ var httpStatus = {
   503: '请求的服务器异常',
   504: '请求服务超时'
 };
-var browserId = getCache('browserId') || '';
+var browserId = '';
 (function () {
   setTimeout(function () {
     getBrowserId().then(function (id) {
@@ -58,9 +58,15 @@ request.interceptors.request.use(function (url, options) {
     // @ts-ignore
     options.headers.browserId = browserId;
   } else {
-    getBrowserId().then(function (id) {
-      browserId = id;
-    });
+    if (getCache('browserId')) {
+      browserId = getCache('browserId');
+      // @ts-ignore
+      options.headers.browserId = browserId;
+    } else {
+      getBrowserId().then(function (id) {
+        browserId = id;
+      });
+    }
   }
   // 处理门店
   var shopNo = getCacheSessionFirst('shopNo');

package/lib/components/InputTable.d.ts

@@ -48,7 +48,7 @@ export declare type InputTableProps = ProFormItemProps<InputProps> & {
     /** @name 选择行事件 */
     onSelectChange?: (item: any, formRef?: any) => void;
     /** @name 加载之前事件,param为查询条件对象,可以通过此方法调整 */
-    beforeLoad?: (param: any) => void;
+    beforeLoad?: (param: any) => any;
     /** @name 加载之后事件,row为接口返回数据，可以通过此方法调整 */
     afterLoad?: (rows: any[]) => void;
     getPopupContainer?: (triggerNode: any) => HTMLElement;
@@ -108,7 +108,7 @@ declare const InputTable: React.ForwardRefExoticComponent<{
     /** @name 选择行事件 */
     onSelectChange?: ((item: any, formRef?: any) => void) | undefined;
     /** @name 加载之前事件,param为查询条件对象,可以通过此方法调整 */
-    beforeLoad?: ((param: any) => void) | undefined;
+    beforeLoad?: ((param: any) => any) | undefined;
     /** @name 加载之后事件,row为接口返回数据，可以通过此方法调整 */
     afterLoad?: ((rows: any[]) => void) | undefined;
     getPopupContainer?: ((triggerNode: any) => HTMLElement) | undefined;

package/lib/components/InputTable.js

@@ -141,7 +141,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
   };
   var loadData = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(param) {
-      var current, pageSize, restParams, _selectRowRef$current, _rows, data, _tableRef$current2, _tableRef$current2$cl, result, rows, formValue, val, _selectRowRef$current2, arr, pageSelectedRows;
+      var current, pageSize, restParams, _selectRowRef$current, _rows, data, _tableRef$current2, _tableRef$current2$cl, _param, result, rows, formValue, val, _selectRowRef$current2, arr, pageSelectedRows;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -185,7 +185,10 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
               (_tableRef$current2 = tableRef.current) === null || _tableRef$current2 === void 0 ? void 0 : (_tableRef$current2$cl = _tableRef$current2.clearSelected) === null || _tableRef$current2$cl === void 0 ? void 0 : _tableRef$current2$cl.call(_tableRef$current2);
             }
             if (beforeLoad) {
-              beforeLoad(data);
+              _param = beforeLoad(data);
+              if (typeof _param !== 'boolean' && _param !== undefined) {
+                data = _param;
+              }
             }
             if (!(method !== 'GET')) {
               _context.next = 20;

package/lib/hooks/useDtl/index.d.ts

@@ -36,7 +36,7 @@ declare function useDtl(dtlParam: DtlParamType): {
     onRemoveDtl: (rows?: any) => void;
     onSaveDtl: (formData: any) => Promise<boolean>;
     onLoadDtl: (params: Record<string, any>, sort: Record<string, any>, filter: Record<string, any>) => Promise<any>;
-    onAddDtl: (item?: any) => Promise<boolean>;
+    onAddDtl: (item?: any) => Promise<boolean | undefined>;
     onEditDtl: (item?: any) => Promise<boolean>;
     onSaveMst: (values: any) => Promise<boolean>;
     onSaveMstDtl: (isDelete?: boolean) => Promise<boolean | undefined>;