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

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

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

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

@@ -238,10 +238,12 @@ export var useTransformColumns = function useTransformColumns(params) {
         args[_key] = arguments[_key];
       }
       newValue = valueFromEventWrapper(column, args);
-      if ((transform === null || transform === void 0 ? void 0 : transform.normalize) || normalize) {
+      if (transform === null || transform === void 0 ? void 0 : transform.normalize) {
         var _transform$normalize;
+        newValue = transform === null || transform === void 0 ? void 0 : (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue);
+      } else if (normalize) {
         // @ts-ignore
-        newValue = (transform === null || transform === void 0 ? void 0 : (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue)) || (normalize === null || normalize === void 0 ? void 0 : normalize(newValue));
+        newValue = normalize === null || normalize === void 0 ? void 0 : normalize(newValue);
       }
       internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
       var values = form.getFieldValue(namePath);

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", "isView"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import React, { useImperativeHandle, useState, forwardRef } from 'react';
@@ -53,10 +53,11 @@ 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 = props.value;
+  var value = getValueProps && props.value ? getValueProps(props.value) : props.value;
   var _ref2 = ProForm.useFieldProps() || {},
     isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty;
@@ -216,6 +217,7 @@ 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) {
@@ -225,14 +227,14 @@ export var ProSelect = function ProSelect(props, ref) {
         });
       }
       if (labelInValue) {
-        onChange === null || onChange === void 0 ? void 0 : onChange(getValueObject(value), option);
+        onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
       } else {
-        onChange === null || onChange === void 0 ? void 0 : onChange(value, option);
+        onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option);
       }
     } else if (!selectProps.mode && labelInValue) {
-      onChange(getValueObject(value), option);
+      onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
     } else {
-      onChange === null || onChange === void 0 ? void 0 : onChange(value, option === null || option === void 0 ? void 0 : option.record);
+      onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option === null || option === void 0 ? void 0 : option.record);
     }
   };
   /**
@@ -278,10 +280,11 @@ export var ProSelect = function ProSelect(props, ref) {
   if ((otherProps === null || otherProps === void 0 ? void 0 : otherProps.listName) && filterInList) {
     newSelectList = getSelectList({
       otherProps: otherProps,
-      value: props.value,
+      value: value,
       dataSource: selectList,
       labelInValue: labelInValue,
-      fieldNames: fieldNames
+      fieldNames: fieldNames,
+      mode: selectProps.mode
     });
   }
   return _jsx("div", {

package/es/ProSelect/propsType.d.ts

@@ -46,6 +46,10 @@ 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/es/ProSelect/utils/index.d.ts

@@ -1,10 +1,4 @@
 /**
  * 返回当前组件可以显示的数据源
  */
-export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, fieldNames, }: {
-    otherProps: any;
-    value: any;
-    dataSource: any;
-    labelInValue: any;
-    fieldNames: any;
-}) => any;
+export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, fieldNames, mode, }: any) => any;

package/es/ProSelect/utils/index.js

@@ -1,3 +1,4 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 /* eslint-disable no-restricted-syntax */
 import _ from 'lodash';
@@ -8,7 +9,8 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
     value = _ref.value,
     dataSource = _ref.dataSource,
     labelInValue = _ref.labelInValue,
-    fieldNames = _ref.fieldNames;
+    fieldNames = _ref.fieldNames,
+    mode = _ref.mode;
   var selectValues = [];
   list.forEach(function (item) {
     var result = item;
@@ -27,9 +29,13 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
     } finally {
       _iterator.f();
     }
-    selectValues.push(result);
+    if (mode === 'multiple') {
+      selectValues = [].concat(_toConsumableArray(selectValues), _toConsumableArray(result));
+    } else {
+      selectValues.push(result);
+    }
   });
-  var diffList = _.difference(selectValues, [value]);
+  var diffList = _.difference(selectValues, mode === 'multiple' ? value : [value]);
   return dataSource.filter(function (item) {
     return !diffList.includes(labelInValue ? item : item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value] || (item === null || item === void 0 ? void 0 : item.value));
   });
@@ -42,7 +48,8 @@ export var getSelectList = function getSelectList(_ref2) {
     value = _ref2.value,
     dataSource = _ref2.dataSource,
     labelInValue = _ref2.labelInValue,
-    fieldNames = _ref2.fieldNames;
+    fieldNames = _ref2.fieldNames,
+    mode = _ref2.mode;
   if (!otherProps) {
     return null;
   }
@@ -59,6 +66,7 @@ export var getSelectList = function getSelectList(_ref2) {
     value: value,
     dataSource: dataSource,
     labelInValue: labelInValue,
-    fieldNames: fieldNames
+    fieldNames: fieldNames,
+    mode: mode
   });
 };

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

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

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

@@ -245,10 +245,12 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
         args[_key] = arguments[_key];
       }
       newValue = valueFromEventWrapper(column, args);
-      if ((transform === null || transform === void 0 ? void 0 : transform.normalize) || normalize) {
+      if (transform === null || transform === void 0 ? void 0 : transform.normalize) {
         var _transform$normalize;
+        newValue = transform === null || transform === void 0 ? void 0 : (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue);
+      } else if (normalize) {
         // @ts-ignore
-        newValue = (transform === null || transform === void 0 ? void 0 : (_transform$normalize = transform.normalize) === null || _transform$normalize === void 0 ? void 0 : _transform$normalize.call(transform, newValue)) || (normalize === null || normalize === void 0 ? void 0 : normalize(newValue));
+        newValue = normalize === null || normalize === void 0 ? void 0 : normalize(newValue);
       }
       internalChange === null || internalChange === void 0 ? void 0 : internalChange(newValue, args[1], index);
       var values = form.getFieldValue(namePath);

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", "isView"];
+var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
 var Option = _antd.Select.Option;
 var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
   var _selectProps$showCode, _locale$ProSelect;
@@ -54,10 +54,11 @@ 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 = props.value;
+  var value = getValueProps && props.value ? getValueProps(props.value) : props.value;
   var _ref2 = _.ProForm.useFieldProps() || {},
     isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty;
@@ -217,6 +218,7 @@ 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) {
@@ -226,14 +228,14 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
         });
       }
       if (labelInValue) {
-        onChange === null || onChange === void 0 ? void 0 : onChange(getValueObject(value), option);
+        onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
       } else {
-        onChange === null || onChange === void 0 ? void 0 : onChange(value, option);
+        onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option);
       }
     } else if (!selectProps.mode && labelInValue) {
-      onChange(getValueObject(value), option);
+      onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
     } else {
-      onChange === null || onChange === void 0 ? void 0 : onChange(value, option === null || option === void 0 ? void 0 : option.record);
+      onChange === null || onChange === void 0 ? void 0 : onChange(getChangeValue ? getChangeValue(value) : value, option === null || option === void 0 ? void 0 : option.record);
     }
   };
   /**
@@ -279,10 +281,11 @@ 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: props.value,
+      value: value,
       dataSource: selectList,
       labelInValue: labelInValue,
-      fieldNames: fieldNames
+      fieldNames: fieldNames,
+      mode: selectProps.mode
     });
   }
   return (0, _jsxRuntime.jsx)("div", {

package/lib/ProSelect/propsType.d.ts

@@ -46,6 +46,10 @@ 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/ProSelect/utils/index.d.ts

@@ -1,10 +1,4 @@
 /**
  * 返回当前组件可以显示的数据源
  */
-export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, fieldNames, }: {
-    otherProps: any;
-    value: any;
-    dataSource: any;
-    labelInValue: any;
-    fieldNames: any;
-}) => any;
+export declare const getSelectList: ({ otherProps, value, dataSource, labelInValue, fieldNames, mode, }: any) => any;

package/lib/ProSelect/utils/index.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getSelectList = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
 var _lodash = _interopRequireDefault(require("lodash"));
 /* eslint-disable no-restricted-syntax */
@@ -16,7 +17,8 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
     value = _ref.value,
     dataSource = _ref.dataSource,
     labelInValue = _ref.labelInValue,
-    fieldNames = _ref.fieldNames;
+    fieldNames = _ref.fieldNames,
+    mode = _ref.mode;
   var selectValues = [];
   list.forEach(function (item) {
     var result = item;
@@ -35,9 +37,13 @@ var findSelectNameValues = function findSelectNameValues(_ref) {
     } finally {
       _iterator.f();
     }
-    selectValues.push(result);
+    if (mode === 'multiple') {
+      selectValues = [].concat((0, _toConsumableArray2.default)(selectValues), (0, _toConsumableArray2.default)(result));
+    } else {
+      selectValues.push(result);
+    }
   });
-  var diffList = _lodash.default.difference(selectValues, [value]);
+  var diffList = _lodash.default.difference(selectValues, mode === 'multiple' ? value : [value]);
   return dataSource.filter(function (item) {
     return !diffList.includes(labelInValue ? item : item[fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value] || (item === null || item === void 0 ? void 0 : item.value));
   });
@@ -50,7 +56,8 @@ var getSelectList = exports.getSelectList = function getSelectList(_ref2) {
     value = _ref2.value,
     dataSource = _ref2.dataSource,
     labelInValue = _ref2.labelInValue,
-    fieldNames = _ref2.fieldNames;
+    fieldNames = _ref2.fieldNames,
+    mode = _ref2.mode;
   if (!otherProps) {
     return null;
   }
@@ -67,6 +74,7 @@ var getSelectList = exports.getSelectList = function getSelectList(_ref2) {
     value: value,
     dataSource: dataSource,
     labelInValue: labelInValue,
-    fieldNames: fieldNames
+    fieldNames: fieldNames,
+    mode: mode
   });
 };

package/package.json

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