ls-pro-common 3.1.18 → 3.1.20

package/es/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) => any;
+    beforeLoad?: (param: any) => Promise<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) => any) | undefined;
+    beforeLoad?: ((param: any) => Promise<any> | any) | undefined;
     /** @name 加载之后事件,row为接口返回数据，可以通过此方法调整 */
     afterLoad?: ((rows: any[]) => void) | undefined;
     getPopupContainer?: ((triggerNode: any) => HTMLElement) | undefined;

package/es/components/InputTable.js

@@ -184,28 +184,34 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
               selectRowRef.current = [];
               (_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) {
-              _param = beforeLoad(data);
-              if (typeof _param !== 'boolean' && _param !== undefined) {
-                data = _param;
-              }
+            if (!beforeLoad) {
+              _context.next = 18;
+              break;
+            }
+            _context.next = 16;
+            return beforeLoad(data);
+          case 16:
+            _param = _context.sent;
+            if (typeof _param !== 'boolean' && _param !== undefined) {
+              data = _param;
             }
+          case 18:
             if (!(method !== 'GET')) {
-              _context.next = 20;
+              _context.next = 24;
               break;
             }
-            _context.next = 17;
+            _context.next = 21;
             return httpPost(url, data);
-          case 17:
+          case 21:
             result = _context.sent;
-            _context.next = 23;
+            _context.next = 27;
             break;
-          case 20:
-            _context.next = 22;
+          case 24:
+            _context.next = 26;
             return httpGet(url, data);
-          case 22:
+          case 26:
             result = _context.sent;
-          case 23:
+          case 27:
             rows = (result.rows || []).filter(function (o) {
               return o;
             });
@@ -238,7 +244,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
               total: Number(result.total || 0),
               success: true
             });
-          case 27:
+          case 31:
           case "end":
             return _context.stop();
         }

package/es/hooks/useDtl/index.js

@@ -87,13 +87,13 @@ function useDtl(dtlParam) {
             return beforeFn(arg, isDtl);
           case 4:
             data = _context.sent;
-            if (!(data === true || data === undefined)) {
+            if (!(data === false)) {
               _context.next = 7;
               break;
             }
-            return _context.abrupt("return", arg);
+            return _context.abrupt("return", false);
           case 7:
-            return _context.abrupt("return", data);
+            return _context.abrupt("return", arg);
           case 8:
           case "end":
             return _context.stop();

package/es/hooks/useSingle/index.js

@@ -104,13 +104,13 @@ function useSingle(inParam) {
             return beforeFn(arg);
           case 4:
             data = _context.sent;
-            if (!(data === true || data === undefined)) {
+            if (!(data === false)) {
               _context.next = 7;
               break;
             }
-            return _context.abrupt("return", arg);
+            return _context.abrupt("return", false);
           case 7:
-            return _context.abrupt("return", data);
+            return _context.abrupt("return", arg);
           case 8:
           case "end":
             return _context.stop();

package/es/utils/index.d.ts

@@ -176,6 +176,12 @@ export declare const getUserName: () => string | undefined;
 export declare const getLoginName: () => string | undefined;
 /** @name 公司Id */
 export declare const getCompanyId: () => string | undefined;
+/**
+ * 判断是否是微前端子应用
+ *
+ * @returns String | undefined
+ */
+export declare const isQiankunSubApp: () => any;
 /** @name 微前端原生路径 */
 export declare const appPath: (path?: string) => any;
 /**

package/es/utils/index.js

@@ -392,13 +392,20 @@ export var getCompanyId = function getCompanyId() {
   var _getUserInfo3;
   return (_getUserInfo3 = getUserInfo()) === null || _getUserInfo3 === void 0 ? void 0 : _getUserInfo3.companyId;
 };
+/**
+ * 判断是否是微前端子应用
+ *
+ * @returns String | undefined
+ */
+export var isQiankunSubApp = function isQiankunSubApp() {
+  // @ts-ignore
+  return window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
+};
 /** @name 微前端原生路径 */
 export var appPath = function appPath() {
   var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  // @ts-ignore
-  if (window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__) {
-    // @ts-ignore
-    return window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
+  if (isQiankunSubApp()) {
+    return isQiankunSubApp();
   }
   if (path) return path;
   //本地开发环境，判断是否hash路由，如果是hash路由，则返回./

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) => any;
+    beforeLoad?: (param: any) => Promise<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) => any) | undefined;
+    beforeLoad?: ((param: any) => Promise<any> | any) | undefined;
     /** @name 加载之后事件,row为接口返回数据，可以通过此方法调整 */
     afterLoad?: ((rows: any[]) => void) | undefined;
     getPopupContainer?: ((triggerNode: any) => HTMLElement) | undefined;

package/lib/components/InputTable.js

@@ -184,28 +184,34 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
               selectRowRef.current = [];
               (_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) {
-              _param = beforeLoad(data);
-              if (typeof _param !== 'boolean' && _param !== undefined) {
-                data = _param;
-              }
+            if (!beforeLoad) {
+              _context.next = 18;
+              break;
+            }
+            _context.next = 16;
+            return beforeLoad(data);
+          case 16:
+            _param = _context.sent;
+            if (typeof _param !== 'boolean' && _param !== undefined) {
+              data = _param;
             }
+          case 18:
             if (!(method !== 'GET')) {
-              _context.next = 20;
+              _context.next = 24;
               break;
             }
-            _context.next = 17;
+            _context.next = 21;
             return httpPost(url, data);
-          case 17:
+          case 21:
             result = _context.sent;
-            _context.next = 23;
+            _context.next = 27;
             break;
-          case 20:
-            _context.next = 22;
+          case 24:
+            _context.next = 26;
             return httpGet(url, data);
-          case 22:
+          case 26:
             result = _context.sent;
-          case 23:
+          case 27:
             rows = (result.rows || []).filter(function (o) {
               return o;
             });
@@ -238,7 +244,7 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
               total: Number(result.total || 0),
               success: true
             });
-          case 27:
+          case 31:
           case "end":
             return _context.stop();
         }

package/lib/hooks/useDtl/index.js

@@ -87,13 +87,13 @@ function useDtl(dtlParam) {
             return beforeFn(arg, isDtl);
           case 4:
             data = _context.sent;
-            if (!(data === true || data === undefined)) {
+            if (!(data === false)) {
               _context.next = 7;
               break;
             }
-            return _context.abrupt("return", arg);
+            return _context.abrupt("return", false);
           case 7:
-            return _context.abrupt("return", data);
+            return _context.abrupt("return", arg);
           case 8:
           case "end":
             return _context.stop();

package/lib/hooks/useSingle/index.js

@@ -104,13 +104,13 @@ function useSingle(inParam) {
             return beforeFn(arg);
           case 4:
             data = _context.sent;
-            if (!(data === true || data === undefined)) {
+            if (!(data === false)) {
               _context.next = 7;
               break;
             }
-            return _context.abrupt("return", arg);
+            return _context.abrupt("return", false);
           case 7:
-            return _context.abrupt("return", data);
+            return _context.abrupt("return", arg);
           case 8:
           case "end":
             return _context.stop();

package/lib/utils/index.d.ts

@@ -176,6 +176,12 @@ export declare const getUserName: () => string | undefined;
 export declare const getLoginName: () => string | undefined;
 /** @name 公司Id */
 export declare const getCompanyId: () => string | undefined;
+/**
+ * 判断是否是微前端子应用
+ *
+ * @returns String | undefined
+ */
+export declare const isQiankunSubApp: () => any;
 /** @name 微前端原生路径 */
 export declare const appPath: (path?: string) => any;
 /**

package/lib/utils/index.js

@@ -392,13 +392,20 @@ export var getCompanyId = function getCompanyId() {
   var _getUserInfo3;
   return (_getUserInfo3 = getUserInfo()) === null || _getUserInfo3 === void 0 ? void 0 : _getUserInfo3.companyId;
 };
+/**
+ * 判断是否是微前端子应用
+ *
+ * @returns String | undefined
+ */
+export var isQiankunSubApp = function isQiankunSubApp() {
+  // @ts-ignore
+  return window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
+};
 /** @name 微前端原生路径 */
 export var appPath = function appPath() {
   var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
-  // @ts-ignore
-  if (window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__) {
-    // @ts-ignore
-    return window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
+  if (isQiankunSubApp()) {
+    return isQiankunSubApp();
   }
   if (path) return path;
   //本地开发环境，判断是否hash路由，如果是hash路由，则返回./

package/package.json

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