@zat-design/sisyphus-react 3.6.5 → 3.6.6-beta.3

package/lib/ProEditTable/propsType.d.ts

@@ -100,6 +100,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     hiddenNames?: NamePath[] | NamePath[][];
     rules?: ProRule[] | RulesFn<T>;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
+    validateTrigger?: string | string[];
     [key: string]: any;
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;
@@ -191,6 +192,11 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @default           -
      */
     draggable?: boolean;
+    /**
+   * @description       是否开启虚拟列表（scroll,x,y必须为固定值）
+   * @default           -
+   */
+    virtual?: boolean;
     /**
      * @description       空列表状态时，自定义添加按钮
      * @default          点击添加

package/lib/ProEditTable/utils/index.js

@@ -125,7 +125,7 @@ var getActionColumn = function getActionColumn(config) {
             case 20:
               result = _context.sent;
             case 21:
-              if (result && type !== 'custom') {
+              if (result !== false && type !== 'custom') {
                 _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
                   rowName: [].concat((0, _toConsumableArray2.default)(name), [index]),
                   virtualRowName: rowName,

package/lib/ProForm/components/base/InputNumber/index.js

@@ -39,6 +39,7 @@ var limitNumber = function limitNumber(num, _ref) {
   return num;
 };
 var InputNumber = function InputNumber(props) {
+  var _props$precision4;
   var placeholder = props.placeholder,
     className = props.className,
     otherProps = props.otherProps,
@@ -59,28 +60,33 @@ var InputNumber = function InputNumber(props) {
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
   var valueProps = {};
   var formatter = function formatter(value) {
+    var _props$precision;
     if (value === '') return '';
     var num = Number(value);
     if (Number.isNaN(num)) {
       return value;
     }
     var val = num.toLocaleString('en-US', {
-      maximumFractionDigits: (props === null || props === void 0 ? void 0 : props.precision) || 2
+      maximumFractionDigits: (_props$precision = props === null || props === void 0 ? void 0 : props.precision) !== null && _props$precision !== void 0 ? _props$precision : 2
     });
     if (!activateRef.current) {
+      var _props$precision2;
       var _val$split = val.split('.'),
         _val$split2 = (0, _slicedToArray2.default)(_val$split, 2),
         int = _val$split2[0],
         _val$split2$ = _val$split2[1],
         float = _val$split2$ === void 0 ? '' : _val$split2$;
-      return "".concat(int, ".").concat(float.padEnd((props === null || props === void 0 ? void 0 : props.precision) || 2, '0'));
+      if ((props === null || props === void 0 ? void 0 : props.precision) === 0) {
+        return int;
+      }
+      return "".concat(int, ".").concat(float.padEnd((_props$precision2 = props === null || props === void 0 ? void 0 : props.precision) !== null && _props$precision2 !== void 0 ? _props$precision2 : 2, '0'));
     }
     return val;
   };
   var _parser = function parser(value, precision) {
-    var num = Number(value.replace(/[\s,]+/g, ''));
     if (value === '') return value;
-    return Number.isNaN(num) || !precision ? value : num.toFixed(precision);
+    var num = Number(value.replace(/[\s,]+/g, ''));
+    return Number.isNaN(num) || !precision && precision !== 0 ? Number.isNaN(Number(value)) ? null : value : num.toFixed(precision);
   };
   if (valueType) {
     switch (valueType) {
@@ -92,8 +98,10 @@ var InputNumber = function InputNumber(props) {
         valueProps = {
           formatter: formatter,
           parser: function parser(val) {
-            return _parser(val, (props === null || props === void 0 ? void 0 : props.precision) || 2);
-          }
+            var _props$precision3;
+            return _parser(val, (_props$precision3 = props === null || props === void 0 ? void 0 : props.precision) !== null && _props$precision3 !== void 0 ? _props$precision3 : 2);
+          },
+          precision: (_props$precision4 = props === null || props === void 0 ? void 0 : props.precision) !== null && _props$precision4 !== void 0 ? _props$precision4 : 2
         };
         break;
       // 百分比
@@ -181,7 +189,7 @@ var InputNumber = function InputNumber(props) {
           var originValue = calc(Number(value), '/', 100);
           // 获取真实数据的小数位数
           var decimalDigits = (0, _index.getDecimalDigits)(originValue);
-          if (decimalDigits > (precision || 4)) {
+          if (decimalDigits > (precision !== null && precision !== void 0 ? precision : 4)) {
             return (0, _jsxRuntime.jsx)(_Container.default, {
               viewEmpty: viewEmpty,
               children: value
@@ -199,7 +207,7 @@ var InputNumber = function InputNumber(props) {
           var _originValue = calc(Number(value), '/', 1000);
           // 获取真实数据的小数位数
           var _decimalDigits = (0, _index.getDecimalDigits)(_originValue);
-          if (_decimalDigits > (precision || 5)) {
+          if (_decimalDigits > (precision !== null && precision !== void 0 ? precision : 5)) {
             return (0, _jsxRuntime.jsx)(_Container.default, {
               viewEmpty: viewEmpty,
               children: value
@@ -216,7 +224,7 @@ var InputNumber = function InputNumber(props) {
       case 'thousandth':
         return (0, _jsxRuntime.jsx)(_Container.default, {
           viewEmpty: viewEmpty,
-          children: _utils.tools.formatAmount(value, precision || 2)
+          children: _utils.tools.formatAmount(value, precision !== null && precision !== void 0 ? precision : 2)
         });
       // CNY千分位
       case 'thousandthCNY':
@@ -236,7 +244,7 @@ var InputNumber = function InputNumber(props) {
   }
   // 失去焦点时处理数字，
   var handleBlur = function handleBlur(e) {
-    var _e$target, _e$target2;
+    var _e$target, _props$precision5, _valueProps3, _e$target2;
     activateRef.current = false;
     var value = e === null || e === void 0 ? void 0 : (_e$target = e.target) === null || _e$target === void 0 ? void 0 : _e$target.value;
     if (_max !== undefined && value > _max) {
@@ -245,7 +253,8 @@ var InputNumber = function InputNumber(props) {
     if (_min !== undefined && value < _min) {
       value = _min;
     }
-    value = _parser(String(value), props.precision);
+    value = _parser(String(value), (_props$precision5 = props.precision) !== null && _props$precision5 !== void 0 ? _props$precision5 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.precision);
+    rest === null || rest === void 0 ? void 0 : rest.onChange(value);
     var limit = {
       min: Number(_min),
       max: Number(_max)

package/lib/ProForm/index.d.ts

@@ -1,11 +1,12 @@
-import { Form, FormInstance } from 'antd';
+import { FormInstance } from 'antd';
 import React, { ForwardRefRenderFunction } from 'react';
 import { FormProviderProps } from 'antd/es/form/context';
 import { ProFormProps } from './propsType';
 import { useForm } from './utils/useForm';
+import useWatch from './utils/useWatch';
 interface IProForm<T = any> extends ForwardRefRenderFunction<FormInstance<T>, ProFormProps<T>> {
     useForm: typeof useForm;
-    useWatch: typeof Form.useWatch;
+    useWatch: typeof useWatch;
     [key: string]: any;
 }
 declare const ProFormForward: IProForm;

package/lib/ProForm/index.js

@@ -24,6 +24,7 @@ var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
+var _useWatch = _interopRequireDefault(require("./utils/useWatch"));
 var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalDiffTip", "formKey", "globalControl", "scrollToError", "optimize"];
 var ProForm = function ProForm(props, ref) {
   var _forms$formKey, _localStorage, _ref;
@@ -274,22 +275,7 @@ var ProForm = function ProForm(props, ref) {
 // @ts-ignore
 var ProFormForward = /*#__PURE__*/(0, _react.forwardRef)(ProForm);
 ProFormForward.useForm = _useForm3.useForm;
-ProFormForward.useWatch = function (watchValue, form) {
-  if ((0, _lodash.isString)(watchValue)) {
-    var watchValues = [watchValue];
-    watchValues.forEach(function (item) {
-      _antd.Form.useWatch(item, form);
-    });
-    return form.getFieldsValue(watchValues);
-  }
-  if (watchValue.length) {
-    watchValue.forEach(function (item) {
-      _antd.Form.useWatch(item, form);
-    });
-    return form.getFieldsValue(watchValue);
-  }
-  return _antd.Form.useWatch([], form);
-};
+ProFormForward.useWatch = _useWatch.default;
 var ProFormProvider = exports.ProFormProvider = function ProFormProvider(props) {
   var onFormChange = props.onFormChange,
     onFormFinish = props.onFormFinish,

package/lib/ProForm/utils/useShouldUpdate.js

@@ -29,6 +29,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
     names = formItemProps.names,
     dependencies = formItemProps.dependencies;
   var timerRef = (0, _react.useRef)();
+  var needClear = (0, _react.useRef)(); // 是否需要执行清值操作
   var showRef = (0, _react.useRef)();
   var disabledRef = (0, _react.useRef)();
   var requiredRef = (0, _react.useRef)();
@@ -165,17 +166,24 @@ var useShouldUpdate = function useShouldUpdate(props) {
       }) : fieldProps;
       // 清值防抖  多次刷新时以最后一次为准
       if (clearNotShow !== false && (name || names)) {
+        // 当show为其他变为false的时候记录一次需要清值
+        if (_show !== showRef.current && _show === false) {
+          needClear.current = true;
+        }
         if (_show === false) {
           clearTimeout(timerRef.current);
           timerRef.current = setTimeout(function () {
+            if (needClear.current !== true) return;
             if (Array.isArray(names)) {
               form.resetFields(names);
             } else {
               var clearName = formItemProps.namePath ? formItemProps.namePath.slice(0, -1).concat(formItemProps.name) : formItemProps.name;
               form.resetFields([clearName]);
             }
-          }, 200);
+            needClear.current = false;
+          }, 300);
         } else {
+          needClear.current = false;
           clearTimeout(timerRef.current);
         }
       }

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

@@ -0,0 +1,7 @@
+import { InternalNamePath, FormInstance, NamePath } from 'rc-field-form/es/interface';
+export declare function toArray<T>(value?: T | T[] | null): T[];
+export declare function getNamePath(path: NamePath | null): InternalNamePath;
+export declare function stringify(value: any): string | number;
+declare function useWatch(dependencies: string, form?: FormInstance, wait?: number): any;
+declare function useWatch(dependencies: NamePath[], form?: FormInstance, wait?: number): any[];
+export default useWatch;

package/lib/ProForm/utils/useWatch.js

@@ -0,0 +1,87 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+exports.getNamePath = getNamePath;
+exports.stringify = stringify;
+exports.toArray = toArray;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _lodash = require("lodash");
+var _FieldContext = require("rc-field-form/es/FieldContext");
+var _warning = _interopRequireDefault(require("rc-util/lib/warning"));
+var _react = require("react");
+function toArray(value) {
+  if (value === undefined || value === null) {
+    return [];
+  }
+  return Array.isArray(value) ? value : [value];
+}
+function getNamePath(path) {
+  return toArray(path);
+}
+function stringify(value) {
+  try {
+    return JSON.stringify(value);
+  } catch (err) {
+    return Math.random();
+  }
+}
+// 创建之后namepath就不可变
+var useWatchWarning = process.env.NODE_ENV !== 'production' ? function (namePath) {
+  var fullyStr = JSON.stringify(namePath);
+  var nameStrRef = (0, _react.useRef)(fullyStr);
+  (0, _warning.default)(nameStrRef.current === fullyStr, '`useWatch` is not support dynamic `namePath`. Please provide static instead.');
+} : function () {};
+function useWatch(dependencies, form, wait) {
+  var isSingle = typeof dependencies === 'string';
+  var _useState = (0, _react.useState)({}),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    value = _useState2[0],
+    setValue = _useState2[1];
+  var valueStr = (0, _react.useMemo)(function () {
+    return stringify(value);
+  }, [value]);
+  var valueStrRef = (0, _react.useRef)(valueStr);
+  valueStrRef.current = valueStr;
+  var formInstance = form;
+  var isValidForm = formInstance && formInstance._init;
+  var _dependencies = isSingle ? [dependencies] : dependencies;
+  var namePaths = _dependencies === null || _dependencies === void 0 ? void 0 : _dependencies.map(function (item) {
+    return getNamePath(item);
+  });
+  var namePathsRef = (0, _react.useRef)(namePaths);
+  namePathsRef.current = namePaths;
+  useWatchWarning(namePaths);
+  (0, _react.useEffect)(function () {
+    if (!isValidForm) return;
+    var getFieldsValue = formInstance.getFieldsValue,
+      getInternalHooks = formInstance.getInternalHooks;
+    var _getInternalHooks = getInternalHooks(_FieldContext.HOOK_MARK),
+      registerWatch = _getInternalHooks.registerWatch;
+    var callback = function callback() {
+      var newValue = getFieldsValue(_dependencies);
+      var nextValueStr = stringify(newValue);
+      // Compare stringify in case it's nest object
+      if (valueStrRef.current !== nextValueStr) {
+        valueStrRef.current = nextValueStr;
+        setValue(getFieldsValue(_dependencies));
+      }
+    };
+    // 增加防抖
+    if (wait) {
+      callback = (0, _lodash.debounce)(callback, wait);
+    }
+    var cancelRegister = registerWatch(callback);
+    var initialValue = getFieldsValue(_dependencies);
+    setValue(initialValue);
+    return cancelRegister;
+  },
+  // We do not need re-register since namePath content is the same
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  [isValidForm]);
+  return value;
+}
+var _default = exports.default = useWatch;

package/lib/ProTable/utils.js

@@ -112,7 +112,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
   if (['percentage', 'permillage'].includes(valueType)) {
     column.render = function (value, record, index) {
       var multiple = valueType === 'percentage' ? 100 : 1000;
-      var realValue = _utils.tools.calc(Number(value), '*', multiple);
+      var realValue = _utils.tools.calc(Number(value !== null && value !== void 0 ? value : 0), '*', multiple);
       var renderValue = getDecimalDigits(value) > valueTypePrecision ? realValue : realValue.toFixed(valueTypePrecision);
       var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRealValue = _utils.tools.calc(Number(originalValue || null), '*', multiple);

package/lib/ProTree/components/ProTreeSelect/index.js

@@ -355,9 +355,9 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
         }
         // 迭代完子节点向上回溯，如果有匹配到得子节点，那么加入当前节点得孩子对象上,否则加入得是空数组
         item.children = currentNodeChild;
-        // let tag = false;
         // 判断节点title是否包含关键字 如果有，那么直接进行下一循环
-        if (item[label].indexOf(keyWord) > -1) {
+        // @ts-ignore
+        if (item[label].indexOf(keyWord) > -1 && (selectProps === null || selectProps === void 0 ? void 0 : selectProps.mode) !== 'treeSelect') {
           var regExp = new RegExp(keyWord);
           item[label] = item[label].replace(regExp, "<span class=\"highlight-search-text\">".concat(keyWord, "</span>"));
         }
@@ -419,11 +419,22 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
   }
   var handleChange = function handleChange(newVal, label, extra) {
     // newVal回来得一定是label、value
+    var _selectList = selectList.map(function (item) {
+      var label = item.label;
+      var _label = label;
+      if (label) {
+        var regex = /<span class="highlight-search-text">(.*?)<\/span>/g;
+        _label = item[label] = label === null || label === void 0 ? void 0 : label.replace(regex, '$1');
+      }
+      return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+        label: _label
+      });
+    });
     var result = newVal;
     if (props === null || props === void 0 ? void 0 : props.labelInValue) {
-      result = getLabelByValue(selectList, newVal);
+      result = getLabelByValue(_selectList, newVal);
     }
-    var options = findTreeNode(selectList, extra === null || extra === void 0 ? void 0 : extra.triggerValue);
+    var options = findTreeNode(_selectList, extra === null || extra === void 0 ? void 0 : extra.triggerValue);
     onChange && onChange(result, options, extra);
     // 重置搜索
     showSearch && searchTreeEvent('');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.6.5",
+  "version": "3.6.6-beta.3",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -58,15 +58,17 @@
     "@dnd-kit/sortable": "^7.0.2",
     "@dnd-kit/utilities": "^3.2.1",
     "@pansy/react-watermark": "^3.1.13",
-    "@zat-design/utils": "^1.1.28",
+    "@zat-design/utils": "^1.1.31",
     "ahooks": "3.7.4",
     "antd": "4.24.8",
     "big.js": "^6.2.1",
     "classnames": "^2.3.1",
     "lodash": "^4.17.21",
     "moment": "^2.29.1",
+    "rc-resize-observer": "^1.4.0",
     "react-resizable": "^3.0.4",
-    "react-svg": "^15.1.7"
+    "react-svg": "^15.1.7",
+    "react-window": "^1.8.10"
   },
   "peerDependencies": {
     "antd": "^4.24.8",