@zat-design/sisyphus-react 3.4.8-beta.9 → 3.4.9-beta.1

package/es/ProEnum/index.js

@@ -41,8 +41,7 @@ var ProEnum = function ProEnum(props) {
     enumProps = _objectWithoutProperties(props, _excluded);
   var _ref = otherProps || {},
     isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty,
-    disabled = _ref.disabled;
+    viewEmpty = _ref.viewEmpty;
   var _ref2 = useProConfig('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -165,6 +164,7 @@ var ProEnum = function ProEnum(props) {
     switch (type) {
       case 'ProSelect':
         return _jsx(ProSelect, _objectSpread(_objectSpread({}, enumProps), {}, {
+          otherProps: otherProps,
           dataSource: list,
           fieldNames: {
             label: label,

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

@@ -16,7 +16,7 @@ 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";
-var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "searchForm", "defaultOne"],
+var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "searchForm", "searchKey", "defaultOne"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -52,6 +52,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     beforeOpen = props.beforeOpen,
     isTooltip = props.isTooltip,
     searchForm = props.searchForm,
+    searchKey = props.searchKey,
     defaultOne = props.defaultOne,
     restProps = _objectWithoutProperties(props, _excluded);
   var contentForm = _Form.useFormInstance();
@@ -603,7 +604,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRows = value;
         }
       } else if (value) {
-        console.log('value', value);
         nextState.selectedRowKeys = [value];
       }
       setState(nextState);
@@ -696,7 +696,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       },
       onSearch: debounce(function (val) {
         var _useRequest$options10;
-        var queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams), {}, _defineProperty({}, labelKey, val));
+        var queryBean = _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams), {}, _defineProperty({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
         var params = withPagination ? {
           pageNum: 1,
           pageSize: 50,

package/es/ProForm/components/combination/ProModalSelect/propsType.d.ts

@@ -42,6 +42,7 @@ interface ProModalPropsType {
     isTooltip?: any;
     showCodeName?: boolean;
     searchForm?: FormInstance;
+    searchKey?: string;
 }
 export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalPropsType;
 export {};

package/es/ProForm/components/render/ConfirmWrapper.js

@@ -55,41 +55,30 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
             _context.t0 = confirm;
           case 9:
             confirmProps = _context.t0;
-            if (!(confirmProps === false)) {
-              _context.next = 12;
-              break;
-            }
-            return _context.abrupt("return");
-          case 12:
-            if (!(confirmProps === true)) {
-              _context.next = 15;
-              break;
+            // 只处理 false, true 和 对象的情况
+            if (confirmProps === false) {
+              onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
             }
-            _Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
-              onOk: function onOk() {
-                return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
-              }
-            }));
-            return _context.abrupt("return");
-          case 15:
-            if (!isObject(confirmProps)) {
-              _context.next = 18;
-              break;
+            if (confirmProps === true) {
+              _Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
+                onOk: function onOk() {
+                  return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
+                }
+              }));
             }
-            _Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
-              onOk: function onOk() {
-                var _confirmProps$onOk;
-                for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-                  arg[_key2] = arguments[_key2];
+            if (isObject(confirmProps)) {
+              _Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
+                onOk: function onOk() {
+                  var _confirmProps$onOk;
+                  for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+                    arg[_key2] = arguments[_key2];
+                  }
+                  (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
+                  onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
                 }
-                (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
-                onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
-              }
-            }));
-            return _context.abrupt("return");
-          case 18:
-            onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
-          case 19:
+              }));
+            }
+          case 13:
           case "end":
             return _context.stop();
         }

package/es/ProLayout/components/ProCollapse/PropTypes.d.ts

@@ -20,6 +20,11 @@ export interface ProCollapseProps {
     */
     title?: string | React.ReactNode;
     /**
+    * @description     自动适应窗口大小
+    * @default           -
+    */
+    autoHeight?: Boolean;
+    /**
    * @description       标题前图标
    * @default           -
    */

package/es/ProLayout/components/ProCollapse/index.js

@@ -34,7 +34,9 @@ var ProCollapse = function ProCollapse(props) {
     collapseProps = props.collapseProps,
     collapsePanelProps = props.collapsePanelProps,
     className = props.className,
-    icon = props.icon;
+    icon = props.icon,
+    _props$autoHeight = props.autoHeight,
+    autoHeight = _props$autoHeight === void 0 ? true : _props$autoHeight;
   var cls = classNames(_defineProperty({
     'pro-collapse': true,
     'pro-collapse-level2': level === '2',
@@ -114,6 +116,9 @@ var ProCollapse = function ProCollapse(props) {
   };
   // 当pro-layout-content只存在一个card时，高度动态计算
   useLayoutEffect(function () {
+    if (!autoHeight) {
+      return;
+    }
     var proCollapseContent = document.querySelector('.pro-layout-content');
     if (!proCollapseContent) {
       return;

package/es/ProSelect/index.js

@@ -269,6 +269,8 @@ export var ProSelect = function ProSelect(props, ref) {
     return value;
   };
   var newSelectList = selectList;
+  console.log('otherProps', otherProps, filterInList);
+  debugger;
   if ((otherProps === null || otherProps === void 0 ? void 0 : otherProps.listName) && filterInList) {
     newSelectList = getSelectList({
       otherProps: otherProps,

package/lib/ProEnum/index.js

@@ -42,8 +42,7 @@ var ProEnum = function ProEnum(props) {
     enumProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = otherProps || {},
     isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty,
-    disabled = _ref.disabled;
+    viewEmpty = _ref.viewEmpty;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -166,6 +165,7 @@ var ProEnum = function ProEnum(props) {
     switch (type) {
       case 'ProSelect':
         return (0, _jsxRuntime.jsx)(_ProSelect.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
+          otherProps: otherProps,
           dataSource: list,
           fieldNames: {
             label: label,

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

@@ -24,7 +24,7 @@ var _Container = _interopRequireDefault(require("../../Container"));
 var _view = _interopRequireDefault(require("../../../../assets/view.svg"));
 var _useRequestList3 = _interopRequireDefault(require("./hooks/useRequestList"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
-var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "searchForm", "defaultOne"],
+var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "isTooltip", "searchForm", "searchKey", "defaultOne"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 var ProModalSelect = function ProModalSelect(props, ref) {
@@ -49,6 +49,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     beforeOpen = props.beforeOpen,
     isTooltip = props.isTooltip,
     searchForm = props.searchForm,
+    searchKey = props.searchKey,
     defaultOne = props.defaultOne,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var contentForm = _antd.Form.useFormInstance();
@@ -600,7 +601,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRows = value;
         }
       } else if (value) {
-        console.log('value', value);
         nextState.selectedRowKeys = [value];
       }
       setState(nextState);
@@ -693,7 +693,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       },
       onSearch: (0, _lodash.debounce)(function (val) {
         var _useRequest$options10;
-        var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams), {}, (0, _defineProperty2.default)({}, labelKey, val));
+        var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
         var params = withPagination ? {
           pageNum: 1,
           pageSize: 50,

package/lib/ProForm/components/combination/ProModalSelect/propsType.d.ts

@@ -42,6 +42,7 @@ interface ProModalPropsType {
     isTooltip?: any;
     showCodeName?: boolean;
     searchForm?: FormInstance;
+    searchKey?: string;
 }
 export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalPropsType;
 export {};

package/lib/ProForm/components/render/ConfirmWrapper.js

@@ -61,41 +61,30 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
             _context.t0 = confirm;
           case 9:
             confirmProps = _context.t0;
-            if (!(confirmProps === false)) {
-              _context.next = 12;
-              break;
-            }
-            return _context.abrupt("return");
-          case 12:
-            if (!(confirmProps === true)) {
-              _context.next = 15;
-              break;
+            // 只处理 false, true 和 对象的情况
+            if (confirmProps === false) {
+              onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
             }
-            _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), {}, {
-              onOk: function onOk() {
-                return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
-              }
-            }));
-            return _context.abrupt("return");
-          case 15:
-            if (!(0, _lodash.isObject)(confirmProps)) {
-              _context.next = 18;
-              break;
+            if (confirmProps === true) {
+              _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultConfirmProps), {}, {
+                onOk: function onOk() {
+                  return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
+                }
+              }));
             }
-            _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
-              onOk: function onOk() {
-                var _confirmProps$onOk;
-                for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-                  arg[_key2] = arguments[_key2];
+            if ((0, _lodash.isObject)(confirmProps)) {
+              _antd.Modal.confirm((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
+                onOk: function onOk() {
+                  var _confirmProps$onOk;
+                  for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+                    arg[_key2] = arguments[_key2];
+                  }
+                  (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
+                  onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
                 }
-                (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
-                onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
-              }
-            }));
-            return _context.abrupt("return");
-          case 18:
-            onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
-          case 19:
+              }));
+            }
+          case 13:
           case "end":
             return _context.stop();
         }

package/lib/ProLayout/components/ProCollapse/PropTypes.d.ts

@@ -20,6 +20,11 @@ export interface ProCollapseProps {
     */
     title?: string | React.ReactNode;
     /**
+    * @description     自动适应窗口大小
+    * @default           -
+    */
+    autoHeight?: Boolean;
+    /**
    * @description       标题前图标
    * @default           -
    */

package/lib/ProLayout/components/ProCollapse/index.js

@@ -36,7 +36,9 @@ var ProCollapse = function ProCollapse(props) {
     collapseProps = props.collapseProps,
     collapsePanelProps = props.collapsePanelProps,
     className = props.className,
-    icon = props.icon;
+    icon = props.icon,
+    _props$autoHeight = props.autoHeight,
+    autoHeight = _props$autoHeight === void 0 ? true : _props$autoHeight;
   var cls = (0, _classnames.default)((0, _defineProperty2.default)({
     'pro-collapse': true,
     'pro-collapse-level2': level === '2',
@@ -116,6 +118,9 @@ var ProCollapse = function ProCollapse(props) {
   };
   // 当pro-layout-content只存在一个card时，高度动态计算
   (0, _react.useLayoutEffect)(function () {
+    if (!autoHeight) {
+      return;
+    }
     var proCollapseContent = document.querySelector('.pro-layout-content');
     if (!proCollapseContent) {
       return;

package/lib/ProSelect/index.js

@@ -270,6 +270,8 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     return value;
   };
   var newSelectList = selectList;
+  console.log('otherProps', otherProps, filterInList);
+  debugger;
   if ((otherProps === null || otherProps === void 0 ? void 0 : otherProps.listName) && filterInList) {
     newSelectList = (0, _utils.getSelectList)({
       otherProps: otherProps,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.4.8-beta.9",
+  "version": "3.4.9-beta.1",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",