ls-pro-common 3.0.99 → 3.1.1

package/es/components/InputTable.js

@@ -244,22 +244,24 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     };
   }();
   var initName = function initName(val) {
-    var _columns$find;
     var updateTxt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     if (!val) return;
-    var fieldName = ((_columns$find = columns.find(function (o) {
+    // 当返回值列不在表格配置中不查询，因为有可能会导致查询别名问题报错。
+    var valueColumn = columns.find(function (o) {
       return o.dataIndex === valueField;
-    })) === null || _columns$find === void 0 ? void 0 : _columns$find.searchField) || valueField;
+    });
+    if (!valueColumn) return;
+    var fieldName = valueColumn.searchField; //优先取开发人员配置的searchField,没有配置取valueField
+    if (!fieldName) {
+      fieldName = (isV2 ? 'search.' : '') + valueField;
+    }
     var param = {
       current: 1,
       pageSize: 1000
     };
     if (Array.isArray(val)) val = val.join(',');
     if (val.toString().includes(',')) {
-      fieldName += '_in';
-    }
-    if (isV2) {
-      fieldName = 'search.' + fieldName;
+      fieldName = fieldName.split('_')[0] + '_in';
     }
     param[fieldName] = val;
     loadData(param).then(function (result) {
@@ -290,11 +292,10 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       if (!txt) {
         formValue[textNameProp] = val;
         setFormValue(formValue);
-        // 多值选择或选择的初始值不在第一页时显示有问题
         if (textField !== valueField) {
           initName(val);
         }
-      } else {
+      } else if (multiple) {
         initName(val, false);
       }
     }

package/es/hooks/useSyncState.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+declare type Getter<T> = () => T;
+export default function useSyncState<T>(defaultValue: T | Getter<T>): readonly [T, (action: React.SetStateAction<T>) => void, Getter<T>];
+export {};

package/es/hooks/useSyncState.js

@@ -0,0 +1,18 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React from 'react';
+export default function useSyncState(defaultValue) {
+  var _React$useState = React.useState(0),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    forceUpdate = _React$useState2[1];
+  var stateRef = React.useRef(typeof defaultValue === 'function' ? defaultValue() : defaultValue);
+  var setState = React.useCallback(function (action) {
+    stateRef.current = typeof action === 'function' ? action(stateRef.current) : action;
+    forceUpdate(function (prev) {
+      return prev + 1;
+    });
+  }, []);
+  var getState = React.useCallback(function () {
+    return stateRef.current;
+  }, []);
+  return [stateRef.current, setState, getState];
+}

package/es/http/index.d.ts

@@ -1,4 +1,11 @@
 declare const request: import("umi-request").RequestMethod<false>;
+/**
+ * 判断URL是否跨域
+ *
+ * @param url 需要判断的URL
+ * @returns 如果是跨域返回true，否则返回false
+ */
+export declare const isCrossDomain: (url: string) => boolean;
 /**
  * Get请求
  *

package/es/http/index.js

@@ -24,6 +24,33 @@ var browserId = '';
     } catch (_unused) {}
   }, 0);
 })();
+//是否跨域
+/**
+ * 判断URL是否跨域
+ *
+ * @param url 需要判断的URL
+ * @returns 如果是跨域返回true，否则返回false
+ */
+export var isCrossDomain = function isCrossDomain(url) {
+  // 如果URL不是以http(s)://开头，则直接认为是同源
+  if (!url.startsWith('http://') && !url.startsWith('https://') && !url.startsWith('//')) {
+    return false;
+  }
+  try {
+    // 创建URL对象
+    var currentUrl = window.location;
+    if (url.startsWith('//')) {
+      url = currentUrl.protocol + url;
+    }
+    var targetUrl = new URL(url);
+    // 判断协议、域名、端口是否一致
+    return targetUrl.protocol !== currentUrl.protocol || targetUrl.hostname !== currentUrl.hostname || targetUrl.port !== currentUrl.port;
+  } catch (e) {
+    // URL解析失败，返回true表示跨域
+    console.warn('URL解析失败:', e);
+    return true;
+  }
+};
 /** 请求拦截器,统一添加token */
 request.interceptors.request.use(function (url, options) {
   var _options$params;
@@ -57,6 +84,11 @@ request.interceptors.request.use(function (url, options) {
     options.headers['x-asm-prefer-tag'] = tag; //灰度发版标识
   }
 
+  var token = getCookie('token');
+  if (token && url.indexOf('noToken=1') === -1) {
+    //@ts-ignore
+    options.headers['token'] = token;
+  }
   url = url.replace('&noToken=1', '').replace('noToken=1', '');
   var resCode = getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
   var param = {

package/lib/components/InputTable.js

@@ -244,22 +244,24 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
     };
   }();
   var initName = function initName(val) {
-    var _columns$find;
     var updateTxt = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
     if (!val) return;
-    var fieldName = ((_columns$find = columns.find(function (o) {
+    // 当返回值列不在表格配置中不查询，因为有可能会导致查询别名问题报错。
+    var valueColumn = columns.find(function (o) {
       return o.dataIndex === valueField;
-    })) === null || _columns$find === void 0 ? void 0 : _columns$find.searchField) || valueField;
+    });
+    if (!valueColumn) return;
+    var fieldName = valueColumn.searchField; //优先取开发人员配置的searchField,没有配置取valueField
+    if (!fieldName) {
+      fieldName = (isV2 ? 'search.' : '') + valueField;
+    }
     var param = {
       current: 1,
       pageSize: 1000
     };
     if (Array.isArray(val)) val = val.join(',');
     if (val.toString().includes(',')) {
-      fieldName += '_in';
-    }
-    if (isV2) {
-      fieldName = 'search.' + fieldName;
+      fieldName = fieldName.split('_')[0] + '_in';
     }
     param[fieldName] = val;
     loadData(param).then(function (result) {
@@ -290,11 +292,10 @@ var InputTable = /*#__PURE__*/React.forwardRef(function (prop, ref) {
       if (!txt) {
         formValue[textNameProp] = val;
         setFormValue(formValue);
-        // 多值选择或选择的初始值不在第一页时显示有问题
         if (textField !== valueField) {
           initName(val);
         }
-      } else {
+      } else if (multiple) {
         initName(val, false);
       }
     }

package/lib/hooks/useSyncState.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+declare type Getter<T> = () => T;
+export default function useSyncState<T>(defaultValue: T | Getter<T>): readonly [T, (action: React.SetStateAction<T>) => void, Getter<T>];
+export {};

package/lib/hooks/useSyncState.js

@@ -0,0 +1,18 @@
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React from 'react';
+export default function useSyncState(defaultValue) {
+  var _React$useState = React.useState(0),
+    _React$useState2 = _slicedToArray(_React$useState, 2),
+    forceUpdate = _React$useState2[1];
+  var stateRef = React.useRef(typeof defaultValue === 'function' ? defaultValue() : defaultValue);
+  var setState = React.useCallback(function (action) {
+    stateRef.current = typeof action === 'function' ? action(stateRef.current) : action;
+    forceUpdate(function (prev) {
+      return prev + 1;
+    });
+  }, []);
+  var getState = React.useCallback(function () {
+    return stateRef.current;
+  }, []);
+  return [stateRef.current, setState, getState];
+}

package/lib/http/index.d.ts

@@ -1,4 +1,11 @@
 declare const request: import("umi-request").RequestMethod<false>;
+/**
+ * 判断URL是否跨域
+ *
+ * @param url 需要判断的URL
+ * @returns 如果是跨域返回true，否则返回false
+ */
+export declare const isCrossDomain: (url: string) => boolean;
 /**
  * Get请求
  *

package/lib/http/index.js

@@ -24,6 +24,33 @@ var browserId = '';
     } catch (_unused) {}
   }, 0);
 })();
+//是否跨域
+/**
+ * 判断URL是否跨域
+ *
+ * @param url 需要判断的URL
+ * @returns 如果是跨域返回true，否则返回false
+ */
+export var isCrossDomain = function isCrossDomain(url) {
+  // 如果URL不是以http(s)://开头，则直接认为是同源
+  if (!url.startsWith('http://') && !url.startsWith('https://') && !url.startsWith('//')) {
+    return false;
+  }
+  try {
+    // 创建URL对象
+    var currentUrl = window.location;
+    if (url.startsWith('//')) {
+      url = currentUrl.protocol + url;
+    }
+    var targetUrl = new URL(url);
+    // 判断协议、域名、端口是否一致
+    return targetUrl.protocol !== currentUrl.protocol || targetUrl.hostname !== currentUrl.hostname || targetUrl.port !== currentUrl.port;
+  } catch (e) {
+    // URL解析失败，返回true表示跨域
+    console.warn('URL解析失败:', e);
+    return true;
+  }
+};
 /** 请求拦截器,统一添加token */
 request.interceptors.request.use(function (url, options) {
   var _options$params;
@@ -57,6 +84,11 @@ request.interceptors.request.use(function (url, options) {
     options.headers['x-asm-prefer-tag'] = tag; //灰度发版标识
   }
 
+  var token = getCookie('token');
+  if (token && url.indexOf('noToken=1') === -1) {
+    //@ts-ignore
+    options.headers['token'] = token;
+  }
   url = url.replace('&noToken=1', '').replace('noToken=1', '');
   var resCode = getUrlQuery('resCode', url) || getUrlQuery('resCode') || getUrlQuery('resourceId') || getResourceProps('resourceId');
   var param = {

package/package.json

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