ls-pro-common 3.0.39 → 3.0.41

package/dist/common.min.js.LICENSE.txt

@@ -30,6 +30,16 @@ PERFORMANCE OF THIS SOFTWARE.
  * Copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
  */
 
+/**
+ * @license React
+ * react-is.production.min.js
+ *
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 /** @license React v16.13.1
  * react-is.production.min.js
  *

package/es/components/antd-custom.less

@@ -363,4 +363,41 @@
 
 .ant-table-filter-dropdown .ant-dropdown-menu-item .ant-checkbox+span {
   width: 230px;
+}
+
+.ant-picker-panel-container {
+  .ant-picker-panel-layout {
+    display: flex;
+    flex-wrap: nowrap;
+    align-items: stretch;
+  }
+
+  .ant-picker-presets {
+    display: flex;
+    flex-direction: column;
+    min-width: 120px;
+    max-width: 200px;
+
+    ul {
+      height: 0;
+      flex: auto;
+      list-style: none;
+      overflow: auto;
+      margin: 0;
+      padding: 8px;
+      border-inline-end: 1px solid rgba(5, 5, 5, 0.06);
+
+      li {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        border-radius: 4px;
+        padding-inline: 8px;
+        padding-block: 1px;
+        cursor: pointer;
+        transition: all 0.3s;
+        margin-top: 8px;
+      }
+    }
+  }
 }

package/es/http/index.d.ts

@@ -6,7 +6,7 @@ declare const request: import("umi-request").RequestMethod<false>;
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpGet(url: string, params?: Record<string, any>, needGateWay?: boolean): Promise<any>;
+export declare function httpGet(url: string, params?: Record<string, any>, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * post请求
  * @param url 接口
@@ -15,7 +15,7 @@ export declare function httpGet(url: string, params?: Record<string, any>, needG
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpPost(url: string, data?: Record<string, any>, isJson?: boolean, needGateWay?: boolean): Promise<any>;
+export declare function httpPost(url: string, data?: Record<string, any>, isJson?: boolean, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * put 请求
  * @param url 接口
@@ -23,7 +23,7 @@ export declare function httpPost(url: string, data?: Record<string, any>, isJson
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpPut(url: string, data?: Record<string, any>, needGateWay?: boolean): Promise<any>;
+export declare function httpPut(url: string, data?: Record<string, any>, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * delete 请求
  * @param url 接口
@@ -31,14 +31,14 @@ export declare function httpPut(url: string, data?: Record<string, any>, needGat
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpDelete(url: string, data: any, needGateWay?: boolean): Promise<any>;
+export declare function httpDelete(url: string, data: any, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * 读取数据字典
  * @param dictCode 字典编码
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<Record<string,string>>
  */
-export declare function getDict(dictCode: string, showValue?: boolean, needGateWay?: boolean): Promise<any>;
+export declare function getDict(dictCode: string, showValue?: boolean, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * 加载下拉框的数据源
  * @param url 后端接口
@@ -49,5 +49,5 @@ export declare function getDict(dictCode: string, showValue?: boolean, needGateW
  * @param needGateWay 是否需要网关 默认为true
  * @returns
  */
-export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean): Promise<any>;
+export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean, timeout?: number): Promise<any>;
 export default request;

package/es/http/index.js

@@ -155,6 +155,7 @@ function ajax(url) {
   var type = arguments.length > 2 ? arguments[2] : undefined;
   var needGateWay = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   var isJson = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
+  var timeout = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 60000;
   if (needGateWay) {
     url = toGatewayUrl(url);
   }
@@ -167,25 +168,29 @@ function ajax(url) {
   }
   if (type === 'get') {
     return request.get(url, {
-      params: params
+      params: params,
+      timeout: timeout
     }).finally(function () {
       return exitLoading();
     });
   } else if (type === 'delete') {
     return request.delete(url, {
-      data: params
+      data: params,
+      timeout: timeout
     }).finally(function () {
       return exitLoading();
     });
   } else if (type === 'put') {
     return request.put(url, {
-      data: params
+      data: params,
+      timeout: timeout
     }).finally(function () {
       return exitLoading();
     });
   } else {
     return request.post(url, {
       data: params,
+      timeout: timeout,
       requestType: isJson ? 'json' : 'form'
     }).finally(function () {
       return exitLoading();
@@ -202,7 +207,8 @@ function ajax(url) {
 export function httpGet(url) {
   var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  return ajax(url, params, 'get', needGateWay);
+  var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
+  return ajax(url, params, 'get', needGateWay, true, timeout);
 }
 /**
  * post请求
@@ -216,7 +222,8 @@ export function httpPost(url) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var isJson = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var needGateWay = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
-  return ajax(url, data, 'post', needGateWay, isJson);
+  var timeout = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 60000;
+  return ajax(url, data, 'post', needGateWay, isJson, timeout);
 }
 /**
  * put 请求
@@ -228,7 +235,8 @@ export function httpPost(url) {
 export function httpPut(url) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  return ajax(url, data, 'put', needGateWay);
+  var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
+  return ajax(url, data, 'put', needGateWay, true, timeout);
 }
 /**
  * delete 请求
@@ -239,7 +247,8 @@ export function httpPut(url) {
  */
 export function httpDelete(url, data) {
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  return ajax(url, data, 'delete', needGateWay);
+  var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
+  return ajax(url, data, 'delete', needGateWay, true, timeout);
 }
 /**
  * 读取数据字典
@@ -250,11 +259,12 @@ export function httpDelete(url, data) {
 export function getDict(dictCode) {
   var showValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
   var api = '/lesoon-integration/sysDictDtl/listByProperties';
   var param = {
     dictCode: dictCode
   };
-  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay);
+  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay, timeout);
 }
 /**
  * 加载下拉框的数据源
@@ -273,6 +283,7 @@ function _fetchOptions() {
   _fetchOptions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(url, param, valueField, labelField) {
     var showValue,
       needGateWay,
+      timeout,
       _yield$httpGet,
       _yield$httpGet$rows,
       rows,
@@ -283,9 +294,10 @@ function _fetchOptions() {
         case 0:
           showValue = _args2.length > 4 && _args2[4] !== undefined ? _args2[4] : true;
           needGateWay = _args2.length > 5 && _args2[5] !== undefined ? _args2[5] : true;
-          _context2.next = 4;
-          return httpGet(url, param, needGateWay);
-        case 4:
+          timeout = _args2.length > 6 && _args2[6] !== undefined ? _args2[6] : 60000;
+          _context2.next = 5;
+          return httpGet(url, param, needGateWay, timeout);
+        case 5:
           _yield$httpGet = _context2.sent;
           _yield$httpGet$rows = _yield$httpGet.rows;
           rows = _yield$httpGet$rows === void 0 ? [] : _yield$httpGet$rows;
@@ -298,7 +310,7 @@ function _fetchOptions() {
             };
           });
           return _context2.abrupt("return", data);
-        case 9:
+        case 10:
         case "end":
           return _context2.stop();
       }

package/lib/components/antd-custom.less

@@ -363,4 +363,41 @@
 
 .ant-table-filter-dropdown .ant-dropdown-menu-item .ant-checkbox+span {
   width: 230px;
+}
+
+.ant-picker-panel-container {
+  .ant-picker-panel-layout {
+    display: flex;
+    flex-wrap: nowrap;
+    align-items: stretch;
+  }
+
+  .ant-picker-presets {
+    display: flex;
+    flex-direction: column;
+    min-width: 120px;
+    max-width: 200px;
+
+    ul {
+      height: 0;
+      flex: auto;
+      list-style: none;
+      overflow: auto;
+      margin: 0;
+      padding: 8px;
+      border-inline-end: 1px solid rgba(5, 5, 5, 0.06);
+
+      li {
+        overflow: hidden;
+        white-space: nowrap;
+        text-overflow: ellipsis;
+        border-radius: 4px;
+        padding-inline: 8px;
+        padding-block: 1px;
+        cursor: pointer;
+        transition: all 0.3s;
+        margin-top: 8px;
+      }
+    }
+  }
 }

package/lib/http/index.d.ts

@@ -6,7 +6,7 @@ declare const request: import("umi-request").RequestMethod<false>;
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpGet(url: string, params?: Record<string, any>, needGateWay?: boolean): Promise<any>;
+export declare function httpGet(url: string, params?: Record<string, any>, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * post请求
  * @param url 接口
@@ -15,7 +15,7 @@ export declare function httpGet(url: string, params?: Record<string, any>, needG
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpPost(url: string, data?: Record<string, any>, isJson?: boolean, needGateWay?: boolean): Promise<any>;
+export declare function httpPost(url: string, data?: Record<string, any>, isJson?: boolean, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * put 请求
  * @param url 接口
@@ -23,7 +23,7 @@ export declare function httpPost(url: string, data?: Record<string, any>, isJson
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpPut(url: string, data?: Record<string, any>, needGateWay?: boolean): Promise<any>;
+export declare function httpPut(url: string, data?: Record<string, any>, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * delete 请求
  * @param url 接口
@@ -31,14 +31,14 @@ export declare function httpPut(url: string, data?: Record<string, any>, needGat
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<ApiResponse>
  */
-export declare function httpDelete(url: string, data: any, needGateWay?: boolean): Promise<any>;
+export declare function httpDelete(url: string, data: any, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * 读取数据字典
  * @param dictCode 字典编码
  * @param needGateWay 是否需要网关 默认为true
  * @returns Promise<Record<string,string>>
  */
-export declare function getDict(dictCode: string, showValue?: boolean, needGateWay?: boolean): Promise<any>;
+export declare function getDict(dictCode: string, showValue?: boolean, needGateWay?: boolean, timeout?: number): Promise<any>;
 /**
  * 加载下拉框的数据源
  * @param url 后端接口
@@ -49,5 +49,5 @@ export declare function getDict(dictCode: string, showValue?: boolean, needGateW
  * @param needGateWay 是否需要网关 默认为true
  * @returns
  */
-export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean): Promise<any>;
+export declare function fetchOptions(url: string, param: any, valueField: string, labelField: string, showValue?: boolean, needGateWay?: boolean, timeout?: number): Promise<any>;
 export default request;

package/lib/http/index.js

@@ -155,6 +155,7 @@ function ajax(url) {
   var type = arguments.length > 2 ? arguments[2] : undefined;
   var needGateWay = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
   var isJson = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
+  var timeout = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 60000;
   if (needGateWay) {
     url = toGatewayUrl(url);
   }
@@ -167,25 +168,29 @@ function ajax(url) {
   }
   if (type === 'get') {
     return request.get(url, {
-      params: params
+      params: params,
+      timeout: timeout
     }).finally(function () {
       return exitLoading();
     });
   } else if (type === 'delete') {
     return request.delete(url, {
-      data: params
+      data: params,
+      timeout: timeout
     }).finally(function () {
       return exitLoading();
     });
   } else if (type === 'put') {
     return request.put(url, {
-      data: params
+      data: params,
+      timeout: timeout
     }).finally(function () {
       return exitLoading();
     });
   } else {
     return request.post(url, {
       data: params,
+      timeout: timeout,
       requestType: isJson ? 'json' : 'form'
     }).finally(function () {
       return exitLoading();
@@ -202,7 +207,8 @@ function ajax(url) {
 export function httpGet(url) {
   var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  return ajax(url, params, 'get', needGateWay);
+  var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
+  return ajax(url, params, 'get', needGateWay, true, timeout);
 }
 /**
  * post请求
@@ -216,7 +222,8 @@ export function httpPost(url) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var isJson = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
   var needGateWay = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
-  return ajax(url, data, 'post', needGateWay, isJson);
+  var timeout = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 60000;
+  return ajax(url, data, 'post', needGateWay, isJson, timeout);
 }
 /**
  * put 请求
@@ -228,7 +235,8 @@ export function httpPost(url) {
 export function httpPut(url) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  return ajax(url, data, 'put', needGateWay);
+  var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
+  return ajax(url, data, 'put', needGateWay, true, timeout);
 }
 /**
  * delete 请求
@@ -239,7 +247,8 @@ export function httpPut(url) {
  */
 export function httpDelete(url, data) {
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
-  return ajax(url, data, 'delete', needGateWay);
+  var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
+  return ajax(url, data, 'delete', needGateWay, true, timeout);
 }
 /**
  * 读取数据字典
@@ -250,11 +259,12 @@ export function httpDelete(url, data) {
 export function getDict(dictCode) {
   var showValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
   var needGateWay = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : true;
+  var timeout = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 60000;
   var api = '/lesoon-integration/sysDictDtl/listByProperties';
   var param = {
     dictCode: dictCode
   };
-  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay);
+  return fetchOptions(api, param, 'dictValue', 'displayName', showValue, needGateWay, timeout);
 }
 /**
  * 加载下拉框的数据源
@@ -273,6 +283,7 @@ function _fetchOptions() {
   _fetchOptions = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(url, param, valueField, labelField) {
     var showValue,
       needGateWay,
+      timeout,
       _yield$httpGet,
       _yield$httpGet$rows,
       rows,
@@ -283,9 +294,10 @@ function _fetchOptions() {
         case 0:
           showValue = _args2.length > 4 && _args2[4] !== undefined ? _args2[4] : true;
           needGateWay = _args2.length > 5 && _args2[5] !== undefined ? _args2[5] : true;
-          _context2.next = 4;
-          return httpGet(url, param, needGateWay);
-        case 4:
+          timeout = _args2.length > 6 && _args2[6] !== undefined ? _args2[6] : 60000;
+          _context2.next = 5;
+          return httpGet(url, param, needGateWay, timeout);
+        case 5:
           _yield$httpGet = _context2.sent;
           _yield$httpGet$rows = _yield$httpGet.rows;
           rows = _yield$httpGet$rows === void 0 ? [] : _yield$httpGet$rows;
@@ -298,7 +310,7 @@ function _fetchOptions() {
             };
           });
           return _context2.abrupt("return", data);
-        case 9:
+        case 10:
         case "end":
           return _context2.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.0.39",
+  "version": "3.0.41",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [
@@ -21,8 +21,9 @@
   ],
   "dependencies": {
     "@ant-design/icons": "^4.3.0",
-    "ls-pro-table": "^3.0.24",
+    "ls-pro-table": "^3.0.25",
     "ls-pro-form": "^3.0.9",
+    "ls-pro-field": "^3.0.5",
     "ls-pro-descriptions": "^3.0.1",
     "ls-pro-card": "^3.0.3",
     "ls-pro-utils": "^3.0.6",
@@ -36,6 +37,10 @@
   "peerDependencies": {
     "antd": "4.x",
     "react": ">=16.9.0",
-    "react-dom": ">=16.9.0"
+    "react-dom": ">=16.9.0",
+    "rc-picker": "^3.14.6"
+  },
+  "resolutions": {
+    "rc-picker": "^3.14.6"
   }
 }