@zat-design/sisyphus-react 3.7.3-beta.1 → 3.7.3

package/es/ProForm/components/combination/FormList/utils.js

@@ -1,4 +1,4 @@
-import { isEqualWith } from 'lodash';
+import { isEqualWith, isFunction } from 'lodash';
 import React from 'react';
 /**
  * namesPath生产 [['list', 0, 'min'], ['list', 0, 'max']] => list_0_min-list_0_max
@@ -26,9 +26,8 @@ export var memoWith = function memoWith(pre, next) {
     if ( /*#__PURE__*/React.isValidElement(objValue) && /*#__PURE__*/React.isValidElement(othValue)) {
       return true;
     }
-    // 移除解决formlist函数里不更新问题
-    // if (isFunction(objValue) && isFunction(othValue)) {
-    //   return true;
-    // }
+    if (isFunction(objValue) && isFunction(othValue)) {
+      return true;
+    }
   });
 };

package/es/ProSelect/index.js

@@ -9,7 +9,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/select/style";
 import _Select from "antd/es/select";
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import React, { useImperativeHandle, useState, forwardRef } from 'react';
@@ -53,11 +53,10 @@ export var ProSelect = function ProSelect(props, ref) {
     onChange = props.onChange,
     updateDataSource = props.updateDataSource,
     transformResponse = props.transformResponse,
-    getValueProps = props.getValueProps,
     isViewPro = props.isView,
     selectProps = _objectWithoutProperties(props, _excluded);
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
-  var value = getValueProps && props.value ? getValueProps(props.value) : props.value;
+  var value = props.value;
   var _ref2 = ProForm.useFieldProps() || {},
     isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty;
@@ -217,7 +216,6 @@ export var ProSelect = function ProSelect(props, ref) {
     return props.children;
   };
   var handleChange = function handleChange(value, option) {
-    var getChangeValue = selectProps.getChangeValue;
     if (selectProps.mode && selectProps.mode === 'multiple') {
       if (Array.isArray(option)) {
         option.forEach(function (item) {
@@ -227,14 +225,14 @@ export var ProSelect = function ProSelect(props, ref) {
         });
       }
       if (labelInValue) {
-        onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
+        onChange === null || onChange === void 0 ? void 0 : onChange(getValueObject(value), option);
       } else {
-        onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option);
+        onChange === null || onChange === void 0 ? void 0 : onChange(value, option);
       }
     } else if (!selectProps.mode && labelInValue) {
-      onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
+      onChange(getValueObject(value), option);
     } else {
-      onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option === null || option === void 0 ? void 0 : option.record);
+      onChange === null || onChange === void 0 ? void 0 : onChange(value, option === null || option === void 0 ? void 0 : option.record);
     }
   };
   /**
@@ -280,7 +278,7 @@ export var ProSelect = function ProSelect(props, ref) {
   if ((otherProps === null || otherProps === void 0 ? void 0 : otherProps.listName) && filterInList) {
     newSelectList = getSelectList({
       otherProps: otherProps,
-      value: value,
+      value: props.value,
       dataSource: selectList,
       labelInValue: labelInValue,
       fieldNames: fieldNames,

package/es/ProSelect/propsType.d.ts

@@ -46,10 +46,6 @@ export interface PropSelectProps extends Omit<SelectProps, 'onSearch'> {
     onSearch?: (value: string, useRequest: Result<any, any>) => void;
     /** 自定义展示 */
     optionRender?: (value: DataOption) => string | ReactNode;
-    /** 用来转换修改value值 和 getValueProps配合使用  */
-    getChangeValue?: (value: DataOption) => any;
-    /** 用来转换传入的value值 getChangeValue配合使用 */
-    getValueProps?: (value: DataOption) => any;
 }
 export interface ProSelectAction {
     /** 实例方法、根据 code ｜ code[] 批量获取数据 */

package/lib/ProForm/components/combination/FormList/utils.js

@@ -33,9 +33,8 @@ var memoWith = exports.memoWith = function memoWith(pre, next) {
     if ( /*#__PURE__*/_react.default.isValidElement(objValue) && /*#__PURE__*/_react.default.isValidElement(othValue)) {
       return true;
     }
-    // 移除解决formlist函数里不更新问题
-    // if (isFunction(objValue) && isFunction(othValue)) {
-    //   return true;
-    // }
+    if ((0, _lodash.isFunction)(objValue) && (0, _lodash.isFunction)(othValue)) {
+      return true;
+    }
   });
 };

package/lib/ProSelect/index.js

@@ -21,7 +21,7 @@ var _ = require("..");
 var _locale = _interopRequireDefault(require("../locale"));
 var _utils = require("./utils");
 require("./index.less");
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "isView"];
 var Option = _antd.Select.Option;
 var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
   var _selectProps$showCode, _locale$ProSelect;
@@ -54,11 +54,10 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     onChange = props.onChange,
     updateDataSource = props.updateDataSource,
     transformResponse = props.transformResponse,
-    getValueProps = props.getValueProps,
     isViewPro = props.isView,
     selectProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
-  var value = getValueProps && props.value ? getValueProps(props.value) : props.value;
+  var value = props.value;
   var _ref2 = _.ProForm.useFieldProps() || {},
     isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty;
@@ -218,7 +217,6 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
     return props.children;
   };
   var handleChange = function handleChange(value, option) {
-    var getChangeValue = selectProps.getChangeValue;
     if (selectProps.mode && selectProps.mode === 'multiple') {
       if (Array.isArray(option)) {
         option.forEach(function (item) {
@@ -228,14 +226,14 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
         });
       }
       if (labelInValue) {
-        onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
+        onChange === null || onChange === void 0 ? void 0 : onChange(getValueObject(value), option);
       } else {
-        onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option);
+        onChange === null || onChange === void 0 ? void 0 : onChange(value, option);
       }
     } else if (!selectProps.mode && labelInValue) {
-      onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
+      onChange(getValueObject(value), option);
     } else {
-      onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option === null || option === void 0 ? void 0 : option.record);
+      onChange === null || onChange === void 0 ? void 0 : onChange(value, option === null || option === void 0 ? void 0 : option.record);
     }
   };
   /**
@@ -281,7 +279,7 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
   if ((otherProps === null || otherProps === void 0 ? void 0 : otherProps.listName) && filterInList) {
     newSelectList = (0, _utils.getSelectList)({
       otherProps: otherProps,
-      value: value,
+      value: props.value,
       dataSource: selectList,
       labelInValue: labelInValue,
       fieldNames: fieldNames,

package/lib/ProSelect/propsType.d.ts

@@ -46,10 +46,6 @@ export interface PropSelectProps extends Omit<SelectProps, 'onSearch'> {
     onSearch?: (value: string, useRequest: Result<any, any>) => void;
     /** 自定义展示 */
     optionRender?: (value: DataOption) => string | ReactNode;
-    /** 用来转换修改value值 和 getValueProps配合使用  */
-    getChangeValue?: (value: DataOption) => any;
-    /** 用来转换传入的value值 getChangeValue配合使用 */
-    getValueProps?: (value: DataOption) => any;
 }
 export interface ProSelectAction {
     /** 实例方法、根据 code ｜ code[] 批量获取数据 */

package/package.json

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