ls-pro-common 3.0.77 → 3.0.80

package/lib/http/index.d.ts

@@ -1,6 +1,7 @@
 declare const request: import("umi-request").RequestMethod<false>;
 /**
- * get请求
+ * Get请求
+ *
  * @param url 接口
  * @param params 参数{key:value}
  * @param needGateWay 是否需要网关 默认为true
@@ -8,16 +9,18 @@ declare const request: import("umi-request").RequestMethod<false>;
  */
 export declare function httpGet(url: string, params?: Record<string, any>, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
- * post请求
+ * Post请求
+ *
  * @param url 接口
  * @param data 参数{key:value}
- * @param isJson json请求还是form请求,默认为json请求
+ * @param isJson Json请求还是form请求,默认为json请求
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
 export declare function httpPost(url: string, data?: Record<string, any>, isJson?: boolean, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
- * put 请求
+ * Put 请求
+ *
  * @param url 接口
  * @param data 参数{key:value}
  * @param needGateWay 是否需要网关 默认为true
@@ -25,7 +28,8 @@ export declare function httpPost(url: string, data?: Record<string, any>, isJson
  */
 export declare function httpPut(url: string, data?: Record<string, any>, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
- * delete 请求
+ * Delete 请求
+ *
  * @param url 接口
  * @param data 参数[]
  * @param needGateWay 是否需要网关 默认为true
@@ -34,6 +38,7 @@ export declare function httpPut(url: string, data?: Record<string, any>, needGat
 export declare function httpDelete(url: string, data: any, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * 读取数据字典
+ *
  * @param dictCode 字典编码
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<Record<string,string>>
@@ -41,6 +46,7 @@ export declare function httpDelete(url: string, data: any, needGateWay?: boolean
 export declare function getDict(dictCode: string, showValue?: boolean, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * 加载下拉框的数据源
+ *
  * @param url 后端接口
  * @param param 请求参数
  * @param valueField 值字段

package/lib/http/index.js

@@ -15,31 +15,37 @@ var httpStatus = {
 };
 /** 请求拦截器,统一添加token */
 request.interceptors.request.use(function (url, options) {
-  var token = getCookie("token");
+  var token = getCookie('token');
   options.headers = options.headers || {};
   // 处理 token
   if (token && url.indexOf('noToken=1') === -1) {
+    // @ts-ignore
     options.headers['token'] = token;
   }
   // 处理门店
   var shopNo = getCache('shopNo', true) || getCache('shopNo');
   if (shopNo) {
-    options.headers["shopNo"] = shopNo;
+    // @ts-ignore
+    options.headers['shopNo'] = shopNo;
   }
   // 处理门店
   var shopCode = getCache('shopCode', true) || getCache('shopCode');
   if (shopCode) {
-    options.headers["shopCode"] = shopCode;
+    // @ts-ignore
+    options.headers['shopCode'] = shopCode;
   }
   // 处理仓库
   var storeNo = getCache('storeNo', true) || getCache('storeNo');
   if (storeNo) {
-    options.headers["storeNo"] = storeNo;
+    // @ts-ignore
+    options.headers['storeNo'] = storeNo;
   }
   var tag = getCookie('x-asm-prefer-tag');
   if (tag) {
-    options.headers['x-asm-prefer-tag'] = tag;
+    // @ts-ignore
+    options.headers['x-asm-prefer-tag'] = tag; //灰度发版标识
   }
+
   url = url.replace('&noToken=1', '').replace('noToken=1', '');
   var param = {
     resCode: getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId'),
@@ -78,7 +84,7 @@ request.interceptors.response.use( /*#__PURE__*/function () {
           retMsg = (_data$flag2 = data.flag) === null || _data$flag2 === void 0 ? void 0 : _data$flag2.retMsg;
           faultCode = (_data$flag3 = data.flag) === null || _data$flag3 === void 0 ? void 0 : _data$flag3.faultCode;
           if ((retCode === 'timeout' || retCode === '4011') && !isMobile) {
-            if (!getCookie("token")) {
+            if (!getCookie('token')) {
               (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
             } else {
               reLogin();
@@ -122,12 +128,12 @@ request.interceptors.response.use( /*#__PURE__*/function () {
           _data = _context.sent;
           _retCode = (_data === null || _data === void 0 ? void 0 : (_data$flag4 = _data.flag) === null || _data$flag4 === void 0 ? void 0 : _data$flag4.retCode) || '0';
           _retMsg = ((_data$flag5 = _data.flag) === null || _data$flag5 === void 0 ? void 0 : _data$flag5.retMsg) || '请求的服务出错';
-          status = (getUrlQuery('apiStatus') || '0').split(',');
+          status = (getUrlQuery('apiStatus', options.url) || '0').split(',');
           requestId = (_data$flag6 = _data.flag) === null || _data$flag6 === void 0 ? void 0 : _data$flag6.requestId;
           _faultCode = (_data$flag7 = _data.flag) === null || _data$flag7 === void 0 ? void 0 : _data$flag7.faultCode;
           if (_retCode && !status.includes(_retCode)) {
             if ((_retCode === 'timeout' || _retCode === '4011') && !isMobile) {
-              if (!getCookie("token")) {
+              if (!getCookie('token')) {
                 (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);
               } else {
                 reLogin();
@@ -200,7 +206,8 @@ function ajax(url) {
   }
 }
 /**
- * get请求
+ * Get请求
+ *
  * @param url 接口
  * @param params 参数{key:value}
  * @param needGateWay 是否需要网关 默认为true
@@ -213,10 +220,11 @@ export function httpGet(url) {
   return ajax(url, params, 'get', needGateWay, true, timeout);
 }
 /**
- * post请求
+ * Post请求
+ *
  * @param url 接口
  * @param data 参数{key:value}
- * @param isJson json请求还是form请求,默认为json请求
+ * @param isJson Json请求还是form请求,默认为json请求
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
@@ -228,7 +236,8 @@ export function httpPost(url) {
   return ajax(url, data, 'post', needGateWay, isJson, timeout);
 }
 /**
- * put 请求
+ * Put 请求
+ *
  * @param url 接口
  * @param data 参数{key:value}
  * @param needGateWay 是否需要网关 默认为true
@@ -241,7 +250,8 @@ export function httpPut(url) {
   return ajax(url, data, 'put', needGateWay, true, timeout);
 }
 /**
- * delete 请求
+ * Delete 请求
+ *
  * @param url 接口
  * @param data 参数[]
  * @param needGateWay 是否需要网关 默认为true
@@ -254,6 +264,7 @@ export function httpDelete(url, data) {
 }
 /**
  * 读取数据字典
+ *
  * @param dictCode 字典编码
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<Record<string,string>>
@@ -270,6 +281,7 @@ export function getDict(dictCode) {
 }
 /**
  * 加载下拉框的数据源
+ *
  * @param url 后端接口
  * @param param 请求参数
  * @param valueField 值字段

package/lib/index.d.ts

@@ -16,6 +16,7 @@ import IconQuestion from './components/IconQuestion';
 import IconBell from './components/IconBell';
 import IconSearch from './components/IconSearch';
 import TagCheck from './components/TagCheck';
+import ViewOffice from './components/ViewOffice';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
@@ -32,4 +33,4 @@ import type { DtlLyaoutProps } from './components/DtlLayout';
 import type { DescritionCardProps } from './components/DescritionCard';
 import type { PermissionProps } from './components/Permission';
 export type { ApiResponse, TableToolbar, BaseApiType, MethodType, DtlLyaoutProps, DescritionCardProps, PermissionProps, };
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, };
+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, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue, };

package/lib/index.js

@@ -16,6 +16,7 @@ import IconQuestion from './components/IconQuestion';
 import IconBell from './components/IconBell';
 import IconSearch from './components/IconSearch';
 import TagCheck from './components/TagCheck';
+import ViewOffice from './components/ViewOffice';
 import BaseService from './service/BaseService';
 import request, { httpGet, httpPut, httpPost, httpDelete, getDict, fetchOptions } from './http';
 import * as utils from './utils';
@@ -26,4 +27,4 @@ import usePermission from './hooks/usePermission';
 import useGetState from './hooks/useGetState';
 import { useFilterLocal } from './hooks/useFilterBack';
 import useQueue from './hooks/useQueue';
-export { DtlLayout, InputTable, Page404, Loading, IconSelector, ImageSelector, InputMultiLine, AreaCascader, AreaCascaderPanel, DescritionCard, Permission, GroupTip, IconBack, IconText, IconBell, IconQuestion, IconSearch, TagCheck, BaseService, request, httpDelete, httpGet, httpPost, httpPut, getDict, fetchOptions, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue };
+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, utils, useSingle, useDtl, usePermission, useGetState, useFilterLocal, useQueue };

package/lib/typing.d.ts

@@ -25,29 +25,29 @@ export declare type TableToolbar = {
 };
 /** 基础模块接口类型 */
 export declare type BaseApiType = {
-    /**加载数据api */
+    /** 加载数据api */
     load?: string;
-    /**新增数据api */
+    /** 新增数据api */
     add?: string;
-    /**更改数据api,如果跟新增接口一样，可不指定 */
+    /** 更改数据api,如果跟新增接口一样，可不指定 */
     edit?: string;
-    /**删除数据api */
+    /** 删除数据api */
     delete?: string;
-    /**主从一起保存方法，新增，现改，删除共用一个接口 */
+    /** 主从一起保存方法，新增，现改，删除共用一个接口 */
     mstDtl?: string;
-    /**导入数据api */
+    /** 导入数据api */
     import?: string;
-    /**导出数据api,如果跟加载数据api一致，可不指定 */
+    /** 导出数据api,如果跟加载数据api一致，可不指定 */
     export?: string;
     /** 审核接口 */
     audit?: string;
 };
-/**请求后端接口方法 */
+/** 请求后端接口方法 */
 export declare type MethodType = {
-    /**加载数据对应的方法，默认为get, 如果请求参数太长时，后端可能会改为post */
-    get: 'get' | 'post';
+    /** 加载数据对应的方法，默认为get, 如果请求参数太长时，后端可能会改为post */
+    get?: 'get' | 'post';
     /** 更改数据的请求方法，默认为 put, 也可以是post，根据后端接口而定 */
-    edit: 'put' | 'post';
+    edit?: 'put' | 'post';
     /** 删除数据的请求方法，默认为delete, 也可以是post,根据后端接口而定 */
-    delete: 'delete' | 'post';
+    delete?: 'delete' | 'post';
 };

package/lib/utils/index.js

@@ -461,16 +461,11 @@ export var showAlert = function showAlert(text) {
   var title = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '系统提示';
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'error';
   var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
-  var win = top || window;
-  //@ts-ignore
-  if (!win.lsAppList || !!document.fullscreenElement) {
-    win = window;
-  }
   return new Promise(function (resolve, reject) {
     _Modal[type](_objectSpread({
       content: text,
       title: title,
-      getContainer: getFullScreenElement() || win.document.body,
+      getContainer: getFullScreenElement() || document.body,
       onOk: function onOk() {
         resolve(true);
       },
@@ -492,11 +487,6 @@ export var exitAlert = function exitAlert() {
 export var showConfirm = function showConfirm(text) {
   var title = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '系统提示';
   return new Promise(function (resolve, reject) {
-    var win = top || window;
-    //@ts-ignore
-    if (!win.lsAppList || !!document.fullscreenElement) {
-      win = window;
-    }
     _Modal.confirm({
       title: title,
       content: text,
@@ -506,7 +496,7 @@ export var showConfirm = function showConfirm(text) {
       cancelButtonProps: {
         className: 'ant-btn-gray'
       },
-      getContainer: getFullScreenElement() || win.document.body,
+      getContainer: getFullScreenElement() || document.body,
       onOk: function onOk() {
         resolve(true);
       },
@@ -525,16 +515,11 @@ var timeout = false;
 export var reLogin = function reLogin() {
   if (timeout) return;
   timeout = true;
-  var win = top || window;
-  //@ts-ignore
-  if (!win.lsAppList || !!document.fullscreenElement) {
-    win = window;
-  }
   _Modal.warning({
     title: '登录状态已过期,请重新登录',
     okText: '重新登录',
     maskClosable: false,
-    getContainer: getFullScreenElement() || win.document.body,
+    getContainer: getFullScreenElement() || document.body,
     afterClose: function afterClose() {
       timeout = false;
       (window.top || window).location.href = location.pathname === '/' ? '/login' : '/login?redirect=' + encodeURIComponent(location.href);

package/package.json

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