ztxkui 2.2.8 → 2.3.2

package/dist/components/EnhanceSelect/index.d.ts

@@ -87,6 +87,10 @@ export interface IProps<T> extends Omit<SelectProps<T>, 'onChange'> {
      * 接口数据格式转换
      */
     transformData?: (res: any) => any;
+    /**
+     * 增加必传参数组
+     */
+    mustHasParams?: string | string[];
 }
 /**
  * 增强下拉框功能组件
@@ -103,6 +107,6 @@ export interface IProps<T> extends Omit<SelectProps<T>, 'onChange'> {
  *    { code: 200, data: { records: [] } } || { status: 200, data: { code: 200, data: { records: [] } } }
  * 如果数据不能在接口层面满足以上形式，那么组件提供transformData属性，转换接口数据格式
  */
-declare function EnhanceSelect<VT extends SelectValue = SelectValue>({ list, defaultList, params, url, method, dataKey, componentKey, titleKey, showAll, isCatch, onCompleted, onChange, request, remoteSearch, remoteSearchKey, remoteSearchDataKey, isRemoteSearchDataKey, transformData, joinKey, joinStr, ...restProps }: IProps<VT>): JSX.Element;
+declare function EnhanceSelect<VT extends SelectValue = SelectValue>({ list, defaultList, params, url, method, dataKey, componentKey, titleKey, showAll, isCatch, onCompleted, onChange, request, remoteSearch, remoteSearchKey, remoteSearchDataKey, isRemoteSearchDataKey, transformData, joinKey, joinStr, mustHasParams, ...restProps }: IProps<VT>): JSX.Element;
 declare const _default: React.MemoExoticComponent<typeof EnhanceSelect>;
 export default _default;

package/dist/components/EnhanceSelect/index.js

@@ -39,6 +39,7 @@ import debounce from 'lodash/debounce';
 var enhanceSelectCatchObj = {};
 // 获取接口数据
 function getData(request, options) {
+    var _a;
     if (typeof request === 'function') {
         if (typeof options.params === 'string') {
             try {
@@ -48,6 +49,10 @@ function getData(request, options) {
                 console.log(err);
             }
         }
+        if (((_a = options === null || options === void 0 ? void 0 : options.method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === 'POST') {
+            options.data = options.params;
+            Reflect.deleteProperty(options, 'params');
+        }
         return request(options);
     }
     return Promise.resolve({
@@ -71,7 +76,7 @@ function getData(request, options) {
  * 如果数据不能在接口层面满足以上形式，那么组件提供transformData属性，转换接口数据格式
  */
 function EnhanceSelect(_a) {
-    var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.dataKey, dataKey = _c === void 0 ? 'id' : _c, componentKey = _a.componentKey, _d = _a.titleKey, titleKey = _d === void 0 ? 'name' : _d, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, remoteSearchDataKey = _a.remoteSearchDataKey, _e = _a.isRemoteSearchDataKey, isRemoteSearchDataKey = _e === void 0 ? true : _e, transformData = _a.transformData, joinKey = _a.joinKey, _f = _a.joinStr, joinStr = _f === void 0 ? '-' : _f, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "request", "remoteSearch", "remoteSearchKey", "remoteSearchDataKey", "isRemoteSearchDataKey", "transformData", "joinKey", "joinStr"]);
+    var list = _a.list, defaultList = _a.defaultList, params = _a.params, url = _a.url, _b = _a.method, method = _b === void 0 ? 'GET' : _b, _c = _a.dataKey, dataKey = _c === void 0 ? 'id' : _c, componentKey = _a.componentKey, _d = _a.titleKey, titleKey = _d === void 0 ? 'name' : _d, showAll = _a.showAll, isCatch = _a.isCatch, onCompleted = _a.onCompleted, onChange = _a.onChange, request = _a.request, remoteSearch = _a.remoteSearch, remoteSearchKey = _a.remoteSearchKey, remoteSearchDataKey = _a.remoteSearchDataKey, _e = _a.isRemoteSearchDataKey, isRemoteSearchDataKey = _e === void 0 ? true : _e, transformData = _a.transformData, joinKey = _a.joinKey, _f = _a.joinStr, joinStr = _f === void 0 ? '-' : _f, mustHasParams = _a.mustHasParams, restProps = __rest(_a, ["list", "defaultList", "params", "url", "method", "dataKey", "componentKey", "titleKey", "showAll", "isCatch", "onCompleted", "onChange", "request", "remoteSearch", "remoteSearchKey", "remoteSearchDataKey", "isRemoteSearchDataKey", "transformData", "joinKey", "joinStr", "mustHasParams"]);
     // 下拉数据源
     var _g = useFetchState([]), selectList = _g[0], setSelectList = _g[1];
     // 多选时，自己需要合并的数据
@@ -91,6 +96,30 @@ function EnhanceSelect(_a) {
     }, [selectList]);
     // 获取数据，并设置数据
     var getDataHandle = useCallback(function (request, options, appointObj) {
+        var _a;
+        if (mustHasParams) {
+            var _params_1;
+            if (typeof options.params === 'string') {
+                try {
+                    _params_1 = JSON.parse(options.params);
+                }
+                catch (err) {
+                    console.log(err);
+                }
+            }
+            if (((_a = options === null || options === void 0 ? void 0 : options.method) === null || _a === void 0 ? void 0 : _a.toUpperCase()) === 'POST') {
+                _params_1 = options.params;
+            }
+            // 如果必传参数不存在
+            if (typeof mustHasParams === 'string' &&
+                _params_1[mustHasParams] == null) {
+                return;
+            }
+            if (Array.isArray(mustHasParams) &&
+                mustHasParams.find(function (key) { return _params_1[key] == null; })) {
+                return;
+            }
+        }
         setLoading(true);
         // 利用闭包，存到当前请求的id
         fetchId.current++;
@@ -120,7 +149,7 @@ function EnhanceSelect(_a) {
             setLoading(false);
             console.log(err);
         });
-    }, [setSelectList, setLoading, transformData]);
+    }, [setSelectList, setLoading, transformData, mustHasParams]);
     // 远程搜索
     var getRemoteDataHandle = useCallback(function (value, dataKeyValue) {
         var searchKey = remoteSearchKey ? remoteSearchKey : titleKey;
@@ -264,9 +293,9 @@ function EnhanceSelect(_a) {
             // console.log('已经通过id访问了');
             return;
         }
+        // TODO:注释这里的内容
         // 这种情况不需要启用远程搜索key值
         if (!isRemoteSearchDataKey) {
-            getRemoteDataHandle('', '');
             setFirstLoading(true);
             return;
         }
@@ -291,6 +320,24 @@ function EnhanceSelect(_a) {
         isRemoteSearchDataKey,
         setFirstLoading,
     ]);
+    useEffect(function () {
+        if (!url || !remoteSearch) {
+            return;
+        }
+        // console.log('TEST: 远程搜索');
+        // 这种情况不需要启用远程搜索key值
+        if (!isRemoteSearchDataKey) {
+            getRemoteDataHandle('', '');
+            setFirstLoading(true);
+            return;
+        }
+    }, [
+        url,
+        remoteSearch,
+        setFirstLoading,
+        getRemoteDataHandle,
+        isRemoteSearchDataKey,
+    ]);
     // 数据合并
     function concatData(originalData, newData) {
         if (!newData) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "2.2.8",
+  "version": "2.3.2",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",