@zat-design/sisyphus-react 3.6.8-beta.5 → 3.6.8-beta.9

package/es/ProEditTable/components/RenderField/index.js

@@ -11,7 +11,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm", "validateTrigger"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
@@ -60,8 +60,6 @@ var RenderField = function RenderField(_ref) {
     className = column.className,
     trim = column.trim,
     confirm = column.confirm,
-    _column$validateTrigg = column.validateTrigger,
-    validateTrigger = _column$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _column$validateTrigg,
     resetProps = _objectWithoutProperties(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -79,6 +77,8 @@ var RenderField = function RenderField(_ref) {
     _config$originalDiffT = config.originalDiffTip,
     originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT,
     rowDisabled = config.rowDisabled,
+    _config$validateTrigg = config.validateTrigger,
+    validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
     otherProps = config.otherProps;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
@@ -160,9 +160,7 @@ var RenderField = function RenderField(_ref) {
   // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 _fieldProps 内部参数
   var formItemChildProps = _objectSpread({}, _fieldProps);
   // 允许formItem的属性放在column最外层
-  var _formItemProps = _objectSpread(_objectSpread(_objectSpread({}, resetProps), internalRule), {}, {
-    validateTrigger: validateTrigger
-  });
+  var _formItemProps = _objectSpread(_objectSpread({}, resetProps), internalRule);
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     valueType = 'switch';

package/es/ProEditTable/propsType.d.ts

@@ -105,7 +105,6 @@ 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'>;
@@ -276,4 +275,5 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
     ref?: any;
     actionDirection?: 'vertical' | 'horizontal';
+    validateTrigger?: string | string[];
 }

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

@@ -261,7 +261,7 @@ var ProCascader = function ProCascader(props) {
       displayRender: displayRender,
       showSearch: {
         filter: handlefilter,
-        limit: false
+        limit: 1000
       },
       onChange: handleChange
     }, omit(otherProps, 'otherProps'))), hasDetail && (tooltip && disabled && detail ? _jsx(_Tooltip, {

package/lib/ProEditTable/components/RenderField/index.js

@@ -30,7 +30,7 @@ var _useListChanged3 = require("../../../ProForm/utils/useListChanged");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
 var _utils = require("../../../ProForm/utils");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm", "validateTrigger"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
@@ -63,8 +63,6 @@ var RenderField = function RenderField(_ref) {
     className = column.className,
     trim = column.trim,
     confirm = column.confirm,
-    _column$validateTrigg = column.validateTrigger,
-    validateTrigger = _column$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _column$validateTrigg,
     resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -82,6 +80,8 @@ var RenderField = function RenderField(_ref) {
     _config$originalDiffT = config.originalDiffTip,
     originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT,
     rowDisabled = config.rowDisabled,
+    _config$validateTrigg = config.validateTrigger,
+    validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
     otherProps = config.otherProps;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
@@ -163,9 +163,7 @@ var RenderField = function RenderField(_ref) {
   // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 _fieldProps 内部参数
   var formItemChildProps = (0, _objectSpread2.default)({}, _fieldProps);
   // 允许formItem的属性放在column最外层
-  var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), internalRule), {}, {
-    validateTrigger: validateTrigger
-  });
+  var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), internalRule);
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     valueType = 'switch';

package/lib/ProEditTable/propsType.d.ts

@@ -105,7 +105,6 @@ 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'>;
@@ -276,4 +275,5 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
     onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
     ref?: any;
     actionDirection?: 'vertical' | 'horizontal';
+    validateTrigger?: string | string[];
 }

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

@@ -261,7 +261,7 @@ var ProCascader = function ProCascader(props) {
       displayRender: displayRender,
       showSearch: {
         filter: handlefilter,
-        limit: false
+        limit: 1000
       },
       onChange: handleChange
     }, (0, _lodash.omit)(otherProps, 'otherProps'))), hasDetail && (tooltip && disabled && detail ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {

package/package.json

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