@zat-design/sisyphus-react 3.13.18-beta.4 → 3.13.18-beta.6

package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -62,7 +62,7 @@ export function useRequestList(service, options, useRequestOptions) {
       queryBean: _condition !== null && _condition !== void 0 ? _condition : {}
     }) : _condition;
     return transformParams ? transformParams(tempParams) : tempParams;
-  }, [page, searchValues]);
+  }, [page, searchValues, _defaultParams, transformParams]);
   // 调接口
   var result = useRequest(service || defaultService, _objectSpread(_objectSpread({}, useRequestOptions), {}, {
     defaultParams: [params]

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -19,8 +19,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _isObject from "lodash/isObject";
 import _isFunction from "lodash/isFunction";
 import _isEqual from "lodash/isEqual";
+import _isBoolean from "lodash/isBoolean";
 import _isArray from "lodash/isArray";
 import _debounce from "lodash/debounce";
 var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "mode", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "tooltip", "searchForm", "searchKey", "defaultOne", "otherProps"],
@@ -69,15 +71,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     otherProps = props.otherProps,
     restProps = _objectWithoutProperties(props, _excluded);
   var _tooltip = tooltip !== null && tooltip !== void 0 ? tooltip : isTooltip;
-  var _readOnly = readOnly;
-  if (mode) {
-    if (String(mode) === 'input') {
-      _readOnly = false;
+  var nextMode = useMemo(function () {
+    if (_isBoolean(readOnly) && readOnly === false) {
+      return 'input';
     }
-    if (String(mode) === 'select') {
-      _readOnly = true;
-    }
-  }
+    return mode;
+  }, [mode, readOnly]);
   var contentForm = _Form.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
     throw new Error('error: 请检查枚举选择弹框的配置项【configOption】');
@@ -184,8 +183,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       transformParams: transformParams,
       transformResponse: transformResponse
     }, _objectSpread({
-      manual: true,
-      ready: (initParams || defaultOne) && !_readOnly || visible
+      ready: (initParams || defaultOne) && nextMode === 'input' || visible
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
     data = _useRequestList2.data,
     loading = _useRequestList2.loading,
@@ -216,7 +214,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     if (typeof data === 'string' || typeof data === 'number') {
       return data;
     }
-    if (Object.prototype.toString.call(data) === '[object Object]') {
+    if (_isObject(data)) {
       return handleFormat(_objectSpread(_objectSpread({}, data), {}, {
         value: data[valueKey],
         label: data[labelKey]
@@ -253,7 +251,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
    * @returns {any}
    */
   var getRowKey = function getRowKey(record) {
-    if (typeof rowKey === 'function') {
+    if (_isFunction(rowKey)) {
       return rowKey(record);
     }
     return record[rowKey];
@@ -275,7 +273,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var handleChangeValue = function handleChangeValue(e) {
     onChange(e.target.value);
     preValue.current = e.target.value;
-    if (!_readOnly) {
+    if (nextMode === 'input') {
       setState({
         _value: e.target.value
       });
@@ -533,7 +531,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                   selectedRows: list,
                   selectedRowKeys: nextSelectRowKeys
                 });
-              } else if (!_readOnly) {
+              } else if (nextMode === 'input') {
                 // 当传入initParams且文本框非只读时，不调用接口获取初始化数据
                 setState({
                   _value: value,
@@ -621,13 +619,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         selectedRows: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || [],
         _value: undefined
       });
-    } else if (Object.prototype.toString.call(value) === '[object Array]') {
+    } else if (_isArray(value)) {
       setState({
         selectedRowKeys: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || value,
         selectedRows: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || value,
         _value: value
       });
-    } else if (Object.prototype.toString.call(value) === '[object Object]') {
+    } else if (_isObject(value)) {
       var initialValue = _defineProperty(_defineProperty({}, valueKey, value[valueKey]), labelKey, value[labelKey]);
       setState({
         selectedRowKeys: [value],
@@ -650,7 +648,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRowKeys = [];
           nextState.selectedRows = [];
         }
-        if (Object.prototype.toString.call(value) === '[object Object]') {
+        if (_isObject(value)) {
           nextState.selectedRowKeys = [getRowKey(value)];
           nextState.selectedRows = [value];
         }
@@ -676,12 +674,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     hideTooltipIfOpen(fieldRef.current, visible);
   }, [visible]);
   useEffect(function () {
-    if (value && !visible && isInit && !_readOnly) {
+    if (value && !visible && isInit && nextMode === 'input') {
       getInitValues();
     }
   }, [JSON.stringify(value), visible, isInit]);
   useDebounceEffect(function () {
-    if (value && !visible && _readOnly && (!_isEqual(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
+    if (value && !visible && nextMode === 'select' && (!_isEqual(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
       var _options$some;
       preValue.current = value;
       var _data3 = labelInValue ? value[valueKey] : value;
@@ -748,7 +746,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       }
     }
-    if (!_readOnly) {
+    if (nextMode === 'input') {
       if (labelInValue && _value && !_isEqual(value, _value)) {
         setState({
           _value: value,
@@ -771,7 +769,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       width: '100%'
     },
     block: true,
-    children: [_readOnly ? _jsx(ProSelect, _objectSpread({
+    children: [nextMode === 'select' ? _jsx(ProSelect, _objectSpread({
       value: value,
       onChange: handleSelectValue,
       disabled: disabled,
@@ -812,17 +810,19 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     });
   }
   useDeepCompareEffect(function () {
-    if (_tooltip && value) {
-      var dom = document.getElementById(uuid);
+    var dom = document.getElementById(uuid);
+    if (_tooltip && value && dom) {
       dom.addEventListener('mouseover', function (e) {
-        if (value && e.target.tagName === 'INPUT') {
+        var _e$target, _e$target$className, _e$target$className$i;
+        if (value && (e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : (_e$target$className = _e$target.className) === null || _e$target$className === void 0 ? void 0 : (_e$target$className$i = _e$target$className.includes) === null || _e$target$className$i === void 0 ? void 0 : _e$target$className$i.call(_e$target$className, 'select'))) {
           setState({
             open: true
           });
         }
       });
       dom.addEventListener('mouseout', function (e) {
-        if (e.target.tagName === 'INPUT') {
+        var _e$target2, _e$target2$className, _e$target2$className$;
+        if (e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : (_e$target2$className = _e$target2.className) === null || _e$target2$className === void 0 ? void 0 : (_e$target2$className$ = _e$target2$className.includes) === null || _e$target2$className$ === void 0 ? void 0 : _e$target2$className$.call(_e$target2$className, 'select')) {
           setState({
             open: false
           });
@@ -830,14 +830,16 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       });
       return function () {
         dom.removeEventListener('mouseover', function (e) {
-          if (value && e.target.tagName === 'INPUT') {
+          var _e$target3, _e$target3$className, _e$target3$className$;
+          if (value && (e === null || e === void 0 ? void 0 : (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : (_e$target3$className = _e$target3.className) === null || _e$target3$className === void 0 ? void 0 : (_e$target3$className$ = _e$target3$className.includes) === null || _e$target3$className$ === void 0 ? void 0 : _e$target3$className$.call(_e$target3$className, 'select'))) {
             setState({
               open: true
             });
           }
         });
         dom.removeEventListener('mouseout', function (e) {
-          if (e.target.tagName === 'INPUT') {
+          var _e$target4, _e$target4$className, _e$target4$className$;
+          if (e === null || e === void 0 ? void 0 : (_e$target4 = e.target) === null || _e$target4 === void 0 ? void 0 : (_e$target4$className = _e$target4.className) === null || _e$target4$className === void 0 ? void 0 : (_e$target4$className$ = _e$target4$className.includes) === null || _e$target4$className$ === void 0 ? void 0 : _e$target4$className$.call(_e$target4$className, 'select')) {
             setState({
               open: false
             });
@@ -845,7 +847,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       };
     }
-  }, [value, _tooltip]);
+  }, [value, _tooltip, document.getElementById(uuid)]);
   useDeepCompareEffect(function () {
     setState({
       options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || []
@@ -890,7 +892,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         children: initRender
       }) : initRender
     }), _jsxs(ProDrawerForm, _objectSpread(_objectSpread({
-      showType: "Modal",
+      mode: "Modal",
       title: title,
       onOk: handleFinish,
       // @ts-ignore

package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -71,7 +71,7 @@ function useRequestList(service, options, useRequestOptions) {
       queryBean: _condition !== null && _condition !== void 0 ? _condition : {}
     }) : _condition;
     return transformParams ? transformParams(tempParams) : tempParams;
-  }, [page, searchValues]);
+  }, [page, searchValues, _defaultParams, transformParams]);
   // 调接口
   var result = (0, _ahooks.useRequest)(service || defaultService, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, useRequestOptions), {}, {
     defaultParams: [params]

package/lib/ProForm/components/combination/ProModalSelect/index.js

@@ -27,8 +27,10 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 require("antd/es/form/style");
 var _form = _interopRequireDefault(require("antd/es/form"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
+var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
 var _isArray2 = _interopRequireDefault(require("lodash/isArray"));
 var _debounce2 = _interopRequireDefault(require("lodash/debounce"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -77,15 +79,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     otherProps = props.otherProps,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _tooltip = tooltip !== null && tooltip !== void 0 ? tooltip : isTooltip;
-  var _readOnly = readOnly;
-  if (mode) {
-    if (String(mode) === 'input') {
-      _readOnly = false;
+  var nextMode = (0, _react.useMemo)(function () {
+    if ((0, _isBoolean2.default)(readOnly) && readOnly === false) {
+      return 'input';
     }
-    if (String(mode) === 'select') {
-      _readOnly = true;
-    }
-  }
+    return mode;
+  }, [mode, readOnly]);
   var contentForm = _form.default.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
     throw new Error('error: 请检查枚举选择弹框的配置项【configOption】');
@@ -192,8 +191,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       transformParams: transformParams,
       transformResponse: transformResponse
     }, (0, _objectSpread5.default)({
-      manual: true,
-      ready: (initParams || defaultOne) && !_readOnly || visible
+      ready: (initParams || defaultOne) && nextMode === 'input' || visible
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
     data = _useRequestList2.data,
     loading = _useRequestList2.loading,
@@ -224,7 +222,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     if (typeof data === 'string' || typeof data === 'number') {
       return data;
     }
-    if (Object.prototype.toString.call(data) === '[object Object]') {
+    if ((0, _isObject2.default)(data)) {
       return handleFormat((0, _objectSpread5.default)((0, _objectSpread5.default)({}, data), {}, {
         value: data[valueKey],
         label: data[labelKey]
@@ -261,7 +259,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
    * @returns {any}
    */
   var getRowKey = function getRowKey(record) {
-    if (typeof rowKey === 'function') {
+    if ((0, _isFunction2.default)(rowKey)) {
       return rowKey(record);
     }
     return record[rowKey];
@@ -283,7 +281,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var handleChangeValue = function handleChangeValue(e) {
     onChange(e.target.value);
     preValue.current = e.target.value;
-    if (!_readOnly) {
+    if (nextMode === 'input') {
       setState({
         _value: e.target.value
       });
@@ -541,7 +539,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                   selectedRows: list,
                   selectedRowKeys: nextSelectRowKeys
                 });
-              } else if (!_readOnly) {
+              } else if (nextMode === 'input') {
                 // 当传入initParams且文本框非只读时，不调用接口获取初始化数据
                 setState({
                   _value: value,
@@ -629,13 +627,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         selectedRows: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || [],
         _value: undefined
       });
-    } else if (Object.prototype.toString.call(value) === '[object Array]') {
+    } else if ((0, _isArray2.default)(value)) {
       setState({
         selectedRowKeys: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || value,
         selectedRows: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || value,
         _value: value
       });
-    } else if (Object.prototype.toString.call(value) === '[object Object]') {
+    } else if ((0, _isObject2.default)(value)) {
       var initialValue = (0, _defineProperty2.default)((0, _defineProperty2.default)({}, valueKey, value[valueKey]), labelKey, value[labelKey]);
       setState({
         selectedRowKeys: [value],
@@ -658,7 +656,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRowKeys = [];
           nextState.selectedRows = [];
         }
-        if (Object.prototype.toString.call(value) === '[object Object]') {
+        if ((0, _isObject2.default)(value)) {
           nextState.selectedRowKeys = [getRowKey(value)];
           nextState.selectedRows = [value];
         }
@@ -684,12 +682,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     (0, _utils.hideTooltipIfOpen)(fieldRef.current, visible);
   }, [visible]);
   (0, _react.useEffect)(function () {
-    if (value && !visible && isInit && !_readOnly) {
+    if (value && !visible && isInit && nextMode === 'input') {
       getInitValues();
     }
   }, [JSON.stringify(value), visible, isInit]);
   (0, _ahooks.useDebounceEffect)(function () {
-    if (value && !visible && _readOnly && (!(0, _isEqual2.default)(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
+    if (value && !visible && nextMode === 'select' && (!(0, _isEqual2.default)(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
       var _options$some;
       preValue.current = value;
       var _data3 = labelInValue ? value[valueKey] : value;
@@ -756,7 +754,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       }
     }
-    if (!_readOnly) {
+    if (nextMode === 'input') {
       if (labelInValue && _value && !(0, _isEqual2.default)(value, _value)) {
         setState({
           _value: value,
@@ -779,7 +777,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       width: '100%'
     },
     block: true,
-    children: [_readOnly ? (0, _jsxRuntime.jsx)(_index.ProSelect, (0, _objectSpread5.default)({
+    children: [nextMode === 'select' ? (0, _jsxRuntime.jsx)(_index.ProSelect, (0, _objectSpread5.default)({
       value: value,
       onChange: handleSelectValue,
       disabled: disabled,
@@ -820,17 +818,19 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     });
   }
   (0, _ahooks.useDeepCompareEffect)(function () {
-    if (_tooltip && value) {
-      var dom = document.getElementById(uuid);
+    var dom = document.getElementById(uuid);
+    if (_tooltip && value && dom) {
       dom.addEventListener('mouseover', function (e) {
-        if (value && e.target.tagName === 'INPUT') {
+        var _e$target, _e$target$className, _e$target$className$i;
+        if (value && (e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : (_e$target$className = _e$target.className) === null || _e$target$className === void 0 ? void 0 : (_e$target$className$i = _e$target$className.includes) === null || _e$target$className$i === void 0 ? void 0 : _e$target$className$i.call(_e$target$className, 'select'))) {
           setState({
             open: true
           });
         }
       });
       dom.addEventListener('mouseout', function (e) {
-        if (e.target.tagName === 'INPUT') {
+        var _e$target2, _e$target2$className, _e$target2$className$;
+        if (e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : (_e$target2$className = _e$target2.className) === null || _e$target2$className === void 0 ? void 0 : (_e$target2$className$ = _e$target2$className.includes) === null || _e$target2$className$ === void 0 ? void 0 : _e$target2$className$.call(_e$target2$className, 'select')) {
           setState({
             open: false
           });
@@ -838,14 +838,16 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       });
       return function () {
         dom.removeEventListener('mouseover', function (e) {
-          if (value && e.target.tagName === 'INPUT') {
+          var _e$target3, _e$target3$className, _e$target3$className$;
+          if (value && (e === null || e === void 0 ? void 0 : (_e$target3 = e.target) === null || _e$target3 === void 0 ? void 0 : (_e$target3$className = _e$target3.className) === null || _e$target3$className === void 0 ? void 0 : (_e$target3$className$ = _e$target3$className.includes) === null || _e$target3$className$ === void 0 ? void 0 : _e$target3$className$.call(_e$target3$className, 'select'))) {
             setState({
               open: true
             });
           }
         });
         dom.removeEventListener('mouseout', function (e) {
-          if (e.target.tagName === 'INPUT') {
+          var _e$target4, _e$target4$className, _e$target4$className$;
+          if (e === null || e === void 0 ? void 0 : (_e$target4 = e.target) === null || _e$target4 === void 0 ? void 0 : (_e$target4$className = _e$target4.className) === null || _e$target4$className === void 0 ? void 0 : (_e$target4$className$ = _e$target4$className.includes) === null || _e$target4$className$ === void 0 ? void 0 : _e$target4$className$.call(_e$target4$className, 'select')) {
             setState({
               open: false
             });
@@ -853,7 +855,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       };
     }
-  }, [value, _tooltip]);
+  }, [value, _tooltip, document.getElementById(uuid)]);
   (0, _ahooks.useDeepCompareEffect)(function () {
     setState({
       options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || []
@@ -898,7 +900,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         children: initRender
       }) : initRender
     }), (0, _jsxRuntime.jsxs)(_index.ProDrawerForm, (0, _objectSpread5.default)((0, _objectSpread5.default)({
-      showType: "Modal",
+      mode: "Modal",
       title: title,
       onOk: handleFinish,
       // @ts-ignore

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.13.18-beta.4",
+  "version": "3.13.18-beta.6",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",