@zat-design/sisyphus-react 3.7.1 → 3.7.2-beta.10

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

@@ -441,36 +441,25 @@ var Render = function Render(props) {
         children: child
       });
     }
-    var orgFormItem = (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
+    return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
       children: child
     }));
-    var formItem = orgFormItem;
-    // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
-    if (_otherFormItemProps.shouldUpdate) {
-      formItem =
-      // 空标签防止气泡不显示
-      (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-        children: (0, _jsxRuntime.jsx)(_antd.Form.Item, {
-          shouldUpdate: _otherFormItemProps.shouldUpdate,
-          noStyle: true,
-          children: function children() {
-            return (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(_otherFormItemProps, filterFormItemKey)), {}, {
-              // @ts-ignore
-              _internalItemRender: internalItemRender,
-              className: _className,
-              children: child
-            }));
-          }
-        })
-      });
-    }
-    return formItem;
   };
   var FormItem = (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
+    children: [_otherFormItemProps.shouldUpdate ?
+    // 空标签防止气泡不显示
+    (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+      children: (0, _jsxRuntime.jsx)(_antd.Form.Item, {
+        shouldUpdate: _otherFormItemProps.shouldUpdate,
+        noStyle: true,
+        children: function children() {
+          return renderItem();
+        }
+      })
+    }) : renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {
       return (0, _jsxRuntime.jsx)(_antd.Form.Item, {
         hidden: true,
         name: name,

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

@@ -12,6 +12,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 var _react = _interopRequireDefault(require("react"));
 var _lodash = require("lodash");
 var _Render = _interopRequireDefault(require("./Render"));
+var _getDefaultProps = require("../../utils/getDefaultProps");
 var componentMap = _interopRequireWildcard(require("../index"));
 var _utils = require("../../utils");
 var _useFieldProps = require("../../utils/useFieldProps");
@@ -84,8 +85,9 @@ var RenderFields = function RenderFields(props) {
       otherFormItemProps = (0, _objectWithoutProperties2.default)(column, _excluded);
     var component = column.component;
     var _isView = typeof column.isView === 'boolean' ? column.isView : isView;
+    var defaultProps = (0, _getDefaultProps.getDefaultProps)(column);
     // 允许formItem的属性放在column最外层 并优先级高于 formItemProps 内部参数
-    var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, formItemProps), otherFormItemProps), {}, {
+    var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultProps), formItemProps), otherFormItemProps), {}, {
       required: columnRequired !== null && columnRequired !== void 0 ? columnRequired : required,
       clearNotShow: clearNotShow
     });

package/lib/ProForm/components/render/propsType.d.ts

@@ -34,11 +34,11 @@ import { DistributiveOmit } from '../../propsType';
 export type ComponentMap = keyof typeof componentMap;
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;
-interface ExtendType {
+interface ExtendType extends Omit<RuleObject, 'type'> {
     type?: ValidateKey | RegExpKey;
     message?: string;
 }
-export type ProRule = RuleObject | ExtendType;
+export type ProRule = ExtendType;
 /**
  * percent 百分比 permillage 千分比 amount 金额
  */

package/lib/ProForm/utils/getDefaultProps.d.ts

@@ -0,0 +1 @@
+export declare const getDefaultProps: (props: any) => any;

package/lib/ProForm/utils/getDefaultProps.js

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultProps = void 0;
+var _lodash = require("lodash");
+var defaultPropsMap = {
+  ProSelect: function ProSelect(props) {
+    var fieldProps = props.fieldProps,
+      name = props.name,
+      namePath = props.namePath;
+    var _ref = fieldProps || {},
+      filterInList = _ref.filterInList;
+    var defaultProps = {};
+    // formList场景传入列表过滤时
+    if (filterInList && namePath && name) {
+      var _listName = namePath.slice(0, -1);
+      var _namePath = name.slice(1);
+      defaultProps.shouldUpdate = function (preValues, curValues) {
+        var preListValue = (0, _lodash.get)(preValues, _listName).map(function (item) {
+          return (0, _lodash.get)(item, _namePath);
+        });
+        var curListValue = (0, _lodash.get)(curValues, _listName).map(function (item) {
+          return (0, _lodash.get)(item, _namePath);
+        });
+        return !(0, _lodash.isEqual)(preListValue, curListValue);
+      };
+    }
+    return defaultProps;
+  }
+};
+var getDefaultProps = exports.getDefaultProps = function getDefaultProps(props) {
+  var _defaultPropsMap$type;
+  var type = props.type;
+  return (_defaultPropsMap$type = defaultPropsMap[type]) === null || _defaultPropsMap$type === void 0 ? void 0 : _defaultPropsMap$type.call(defaultPropsMap, props);
+};

package/lib/ProForm/utils/rulesCreator.d.ts

@@ -1,5 +1,5 @@
 export declare const rulesCreator: ({ rules, label, isSelect, names, required }: {
-    rules: any;
+    rules?: any[];
     label: any;
     isSelect: any;
     names: any;

package/lib/ProForm/utils/rulesCreator.js

@@ -22,35 +22,38 @@ var getNonEmptyValuesByIndex = function getNonEmptyValuesByIndex(required, value
 };
 var rulesCreator = exports.rulesCreator = function rulesCreator(_ref) {
   var _result;
-  var rules = _ref.rules,
+  var _ref$rules = _ref.rules,
+    rules = _ref$rules === void 0 ? [] : _ref$rules,
     label = _ref.label,
     isSelect = _ref.isSelect,
     names = _ref.names,
     required = _ref.required;
   var message = "".concat(isSelect ? "".concat(_locale.default.ProForm.selectPlaceHolder) : "".concat(_locale.default.ProForm.inputPlaceholder)).concat(_locale.default.ProForm.ruleText).concat((0, _lodash.isString)(label) ? label : '');
   var result = [];
-  result = rules.map(function (ruleItem) {
-    var rule = (0, _objectSpread2.default)({}, ruleItem);
-    if (rule instanceof Object && 'type' in rule) {
-      if (Object.keys(_utils.regExp).includes(rule.type)) {
-        rule.validator = function (rule, value) {
-          if (!(0, _index.isNullValue)(value) && !_utils.regExp[rule.type].test(value)) {
-            return Promise.reject(new Error(rule.message || message));
-          }
-          return Promise.resolve();
-        };
-      }
-      if (Object.keys(_utils.validate).includes(rule.type)) {
-        rule.validator = function (rule, value) {
-          if (!(0, _index.isNullValue)(value) && !_utils.validate[rule.type](value)) {
-            return Promise.reject(new Error(rule.message || message));
-          }
-          return Promise.resolve();
-        };
+  if (Array.isArray(rules)) {
+    result = rules.map(function (ruleItem) {
+      var rule = (0, _objectSpread2.default)({}, ruleItem);
+      if (rule instanceof Object && 'type' in rule) {
+        if (Object.keys(_utils.regExp).includes(rule.type)) {
+          rule.validator = function (rule, value) {
+            if (!(0, _index.isNullValue)(value) && !_utils.regExp[rule.type].test(value)) {
+              return Promise.reject(new Error(rule.message || message));
+            }
+            return Promise.resolve();
+          };
+        }
+        if (Object.keys(_utils.validate).includes(rule.type)) {
+          rule.validator = function (rule, value) {
+            if (!(0, _index.isNullValue)(value) && !_utils.validate[rule.type](value)) {
+              return Promise.reject(new Error(rule.message || message));
+            }
+            return Promise.resolve();
+          };
+        }
       }
-    }
-    return rule;
-  });
+      return rule;
+    });
+  }
   if ((names === null || names === void 0 ? void 0 : names.length) && (required === null || required === void 0 ? void 0 : required.length)) {
     var customRequired = {
       validator: function validator(rules, value) {

package/lib/ProForm/utils/useRules.js

@@ -21,7 +21,7 @@ var useRules = function useRules(props) {
     type = props.type;
   var _label = (0, _lodash.isString)(label) ? label : '';
   var requiredRule = Array.isArray(rules) && (rules === null || rules === void 0 ? void 0 : rules.find(function (rule) {
-    return 'required' in rule;
+    return rule.required === true;
   }));
   var allRequired = required === true || Array.isArray(required) && required.every(function (item) {
     return item === true;

package/lib/ProForm/utils/valueType.js

@@ -25,7 +25,7 @@ var transformRatio = function transformRatio(_ref) {
     return {
       normalize: function normalize(value) {
         if (!value || !value.some(function (item) {
-          return item;
+          return item || item === 0;
         })) {
           return {};
         }
@@ -33,7 +33,7 @@ var transformRatio = function transformRatio(_ref) {
       },
       getValueProps: function getValueProps(value) {
         if (!value || !value.some(function (item) {
-          return item;
+          return item || item === 0;
         })) {
           return {
             value: []

package/lib/ProSelect/index.js

@@ -282,7 +282,8 @@ var ProSelect = exports.ProSelect = function ProSelect(props, ref) {
       value: props.value,
       dataSource: selectList,
       labelInValue: labelInValue,
-      fieldNames: fieldNames
+      fieldNames: fieldNames,
+      mode: selectProps.mode
     });
   }
   return (0, _jsxRuntime.jsx)("div", {

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/lib/ProTable/components/RenderColumn/index.js

@@ -94,42 +94,70 @@ var RenderColumn = function RenderColumn(props) {
     });
   }
   if (ellipsis) {
-    var handleMouseOver = function handleMouseOver(e) {
-      var _e$target, _e$target2;
-      if ((e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.scrollWidth) > (e === null || e === void 0 ? void 0 : (_e$target2 = e.target) === null || _e$target2 === void 0 ? void 0 : _e$target2.offsetWidth)) {
-        setState({
-          tooltip: (0, _objectSpread2.default)({
-            getPopupContainer: function getPopupContainer(triggerNode) {
-              return triggerNode.parentNode;
-            },
-            open: true
-          }, toolTipProps)
-        });
-      } else {
-        setState({
-          tooltip: false
-        });
+    var getPadding = function getPadding(el) {
+      var style = window.getComputedStyle(el, null);
+      var paddingLeft = Number.parseInt(style.paddingLeft, 10) || 0;
+      var paddingRight = Number.parseInt(style.paddingRight, 10) || 0;
+      var paddingTop = Number.parseInt(style.paddingTop, 10) || 0;
+      var paddingBottom = Number.parseInt(style.paddingBottom, 10) || 0;
+      return {
+        pLeft: paddingLeft,
+        pRight: paddingRight,
+        pTop: paddingTop,
+        pBottom: paddingBottom
+      };
+    };
+    var checkEllipsis = function checkEllipsis(box) {
+      var range = document.createRange();
+      range.setStart(box, 0);
+      range.setEnd(box, box.childNodes.length);
+      var rangeWidth = range.getBoundingClientRect().width;
+      var rangeHeight = range.getBoundingClientRect().height;
+      var contentWidth = rangeWidth - Math.floor(rangeWidth);
+      var _getPadding = getPadding(box),
+        pLeft = _getPadding.pLeft,
+        pRight = _getPadding.pRight,
+        pTop = _getPadding.pTop,
+        pBottom = _getPadding.pBottom;
+      var horizontalPadding = pLeft + pRight;
+      var verticalPadding = pTop + pBottom;
+      if (rangeWidth + horizontalPadding > box.clientWidth) {
+        return true;
       }
+      return false;
     };
-    var handleMouseOut = function handleMouseOut() {
+    var handleMouseOver = function handleMouseOver(e) {
       setState({
-        tooltip: false
+        tooltip: checkEllipsis(e.target)
       });
     };
-    var _ellipsis = {
-      tooltip: tooltip
-    };
-    return value ? (0, _jsxRuntime.jsx)(Text, {
-      style: {
-        width: width
+    var tooltipProps = (0, _objectSpread2.default)({
+      getPopupContainer: function getPopupContainer(triggerNode) {
+        return triggerNode.parentNode;
+      }
+    }, toolTipProps);
+    if (!value) {
+      return '-';
+    }
+    return (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      title: value,
+      onOpenChange: function onOpenChange(open) {
+        setState({
+          tooltip: false
+        });
       },
-      ellipsis: _ellipsis,
-      onMouseOver: handleMouseOver,
-      onFocus: handleMouseOver,
-      onMouseOut: handleMouseOut,
-      onBlur: handleMouseOut,
-      children: node
-    }) : '-';
+      open: tooltip
+    }, tooltipProps), {}, {
+      children: (0, _jsxRuntime.jsx)(Text, {
+        style: {
+          width: width
+        },
+        ellipsis: true,
+        onMouseOver: handleMouseOver,
+        onFocus: handleMouseOver,
+        children: node
+      })
+    }));
   }
   return value || value === 0 ? node : '-';
 };

package/lib/ProTable/index.js

@@ -199,6 +199,18 @@ function ProTable(props) {
     });
     return newColumns;
   }, [curColumns, handleResize]);
+  var _columns = (0, _react.useMemo)(function () {
+    return columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {
+      var show = item.show;
+      if ((0, _lodash.isBoolean)(show)) {
+        return show;
+      }
+      if ((0, _lodash.isFunction)(show)) {
+        return show();
+      }
+      return true;
+    });
+  }, [columns]);
   var handleColumnConfig = /*#__PURE__*/function () {
     var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(checkList) {
       var newColumns, _columnConfig$onColum, catchColumns;
@@ -368,7 +380,7 @@ function ProTable(props) {
           tableProps: {
             value: _dataSource,
             headerRender: headerRender,
-            columns: columns,
+            columns: _columns,
             renderRowSelection: renderRowSelection,
             rowClassName: _rowClassName,
             disabled: disabled,

package/lib/ProTable/propsType.d.ts

@@ -40,6 +40,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     };
     toolTipProps?: TooltipProps & React.RefAttributes<unknown>;
     transform?: (value: any, record?: any) => string[];
+    show?: boolean | (() => boolean);
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/lib/ProUpload/index.js

@@ -78,7 +78,7 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
     fieldNames = props.fieldNames,
     isConfirmDelete = props.isConfirmDelete,
     residueProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var isView = otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
+  var isView = (props === null || props === void 0 ? void 0 : props.isView) || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView);
   var sensor = (0, _core.useSensor)(_core.PointerSensor, {
     activationConstraint: {
       distance: 10

package/lib/ProUpload/propsType.d.ts

@@ -195,6 +195,11 @@ export interface ProUploadProps {
      */
     isConfirmDelete?: boolean;
     id?: string;
+    /**
+     * @description 查看模式
+     * @default    false
+     */
+    isView?: boolean;
 }
 export interface DraggableUploadListItemProps {
     file: UploadFile<any>;

package/package.json

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