@zat-design/sisyphus-react 3.11.11 → 3.11.13

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

@@ -661,8 +661,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     if (value && !visible && readOnly && (!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;
       var isHasValue = options === null || options === void 0 ? void 0 : (_options$some = options.some) === null || _options$some === void 0 ? void 0 : _options$some.call(options, function (item) {
-        return item[valueKey] === value;
+        return item[valueKey] === _data3;
       });
       if (isHasValue) {
         return;
@@ -673,8 +674,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           var params = withPagination ? {
             pageNum: 1,
             pageSize: 50,
-            queryBean: _objectSpread(_objectSpread({}, defaultParams), initParams)
-          } : _objectSpread(_objectSpread({}, defaultParams), initParams);
+            queryBean: _objectSpread(_objectSpread(_objectSpread({}, defaultParams), initParams), {}, _defineProperty({}, searchKey !== null && searchKey !== void 0 ? searchKey : valueKey, _data3))
+          } : _objectSpread(_objectSpread(_objectSpread({}, defaultParams), initParams), {}, _defineProperty({}, searchKey !== null && searchKey !== void 0 ? searchKey : valueKey, _data3));
           var nextParams = transformParams ? transformParams(params) : params;
           run(nextParams);
         }, 300);

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

@@ -10,7 +10,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectSpread5 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -134,7 +134,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       withPagination: withPagination,
       transformParams: transformParams,
       transformResponse: transformResponse
-    }, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+    }, (0, _objectSpread5.default)((0, _objectSpread5.default)({}, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
       manual: true,
       onSuccess: function onSuccess(res) {
         var _res$data, _ref5;
@@ -158,7 +158,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       withPagination: withPagination,
       transformParams: transformParams,
       transformResponse: transformResponse
-    }, (0, _objectSpread3.default)({
+    }, (0, _objectSpread5.default)({
       manual: true,
       ready: (initParams || defaultOne) && !readOnly || visible
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
@@ -192,13 +192,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       return data;
     }
     if (Object.prototype.toString.call(data) === '[object Object]') {
-      return handleFormat((0, _objectSpread3.default)((0, _objectSpread3.default)({}, data), {}, {
+      return handleFormat((0, _objectSpread5.default)((0, _objectSpread5.default)({}, data), {}, {
         value: data[valueKey],
         label: data[labelKey]
       }));
     }
     return (0, _lodash.isArray)(data) ? data === null || data === void 0 ? void 0 : (_data$map = data.map(function (item) {
-      return handleFormat((0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, {
+      return handleFormat((0, _objectSpread5.default)((0, _objectSpread5.default)({}, item), {}, {
         value: item[valueKey],
         label: item[labelKey]
       }));
@@ -403,7 +403,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             return form.validateFields();
           case 2:
             values = _context3.sent;
-            onSearch((0, _objectSpread3.default)((0, _objectSpread3.default)({}, values), {}, {
+            onSearch((0, _objectSpread5.default)((0, _objectSpread5.default)({}, values), {}, {
               d: Date.now()
             }));
           case 4:
@@ -416,7 +416,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       return _ref9.apply(this, arguments);
     };
   }();
-  var _rowSelection = (0, _objectSpread3.default)({
+  var _rowSelection = (0, _objectSpread5.default)({
     type: type,
     onChange: function onChange(rowKeys, rows) {
       setState({
@@ -476,12 +476,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               _context4.next = 9;
               break;
             }
-            queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), initParams || {});
-            page = (0, _objectSpread3.default)({
+            queryBean = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, defaultParams), initParams || {});
+            page = (0, _objectSpread5.default)({
               pageNum: 1,
               pageSize: 10
             }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
-            params = withPagination ? (0, _objectSpread3.default)((0, _objectSpread3.default)({}, page), {}, {
+            params = withPagination ? (0, _objectSpread5.default)((0, _objectSpread5.default)({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
             params = transformParams ? transformParams(params) : params;
@@ -534,12 +534,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
-            queryBean = (0, _objectSpread3.default)({}, defaultParams);
-            page = (0, _objectSpread3.default)({
+            queryBean = (0, _objectSpread5.default)({}, defaultParams);
+            page = (0, _objectSpread5.default)({
               pageNum: 1,
               pageSize: 10
             }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.page);
-            params = withPagination ? (0, _objectSpread3.default)((0, _objectSpread3.default)({}, page), {}, {
+            params = withPagination ? (0, _objectSpread5.default)((0, _objectSpread5.default)({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
             params = transformParams ? transformParams(params) : params;
@@ -656,8 +656,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     if (value && !visible && readOnly && (!(0, _lodash.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;
       var isHasValue = options === null || options === void 0 ? void 0 : (_options$some = options.some) === null || _options$some === void 0 ? void 0 : _options$some.call(options, function (item) {
-        return item[valueKey] === value;
+        return item[valueKey] === _data3;
       });
       if (isHasValue) {
         return;
@@ -668,8 +669,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           var params = withPagination ? {
             pageNum: 1,
             pageSize: 50,
-            queryBean: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), initParams)
-          } : (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), initParams);
+            queryBean: (0, _objectSpread5.default)((0, _objectSpread5.default)((0, _objectSpread5.default)({}, defaultParams), initParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : valueKey, _data3))
+          } : (0, _objectSpread5.default)((0, _objectSpread5.default)((0, _objectSpread5.default)({}, defaultParams), initParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : valueKey, _data3));
           var nextParams = transformParams ? transformParams(params) : params;
           run(nextParams);
         }, 300);
@@ -697,7 +698,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleSelectSearch = (0, _lodash.debounce)(function (val) {
     if (useRequest) {
-      var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
+      var queryBean = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
       var params = withPagination ? {
         pageNum: 1,
         pageSize: 50,
@@ -742,7 +743,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       width: '100%'
     },
     block: true,
-    children: [readOnly ? (0, _jsxRuntime.jsx)(_index.ProSelect, (0, _objectSpread3.default)({
+    children: [readOnly ? (0, _jsxRuntime.jsx)(_index.ProSelect, (0, _objectSpread5.default)({
       value: value,
       onChange: handleSelectValue,
       disabled: disabled,
@@ -761,7 +762,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }
-    }, restProps)) : (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread3.default)({
+    }, restProps)) : (0, _jsxRuntime.jsx)(_antd.Input, (0, _objectSpread5.default)({
       value: viewText,
       onChange: handleChangeValue,
       disabled: disabled,
@@ -856,7 +857,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         title: viewText,
         children: initRender
       }) : initRender
-    }), (0, _jsxRuntime.jsxs)(_index.ProDrawerForm, (0, _objectSpread3.default)((0, _objectSpread3.default)({
+    }), (0, _jsxRuntime.jsxs)(_index.ProDrawerForm, (0, _objectSpread5.default)((0, _objectSpread5.default)({
       showType: "Modal",
       title: title,
       onOk: handleFinish,
@@ -871,7 +872,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         onFinish: handleSearch,
         confirmLoading: loading,
         footer: (formColumns === null || formColumns === void 0 ? void 0 : formColumns.length) > 1
-      }), (0, _jsxRuntime.jsx)(_index.ProTable, (0, _objectSpread3.default)({
+      }), (0, _jsxRuntime.jsx)(_index.ProTable, (0, _objectSpread5.default)({
         onRow: function onRow(record) {
           return {
             onClick: function onClick() {

package/package.json

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