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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/es/ProEditTable/components/RenderField/index.js +4 -6
  2. package/es/ProEditTable/propsType.d.ts +1 -1
  3. package/lib/ProEditTable/components/RenderField/index.js +4 -6
  4. package/lib/ProEditTable/propsType.d.ts +1 -1
  5. package/package.json +1 -1
package/es/ProEditTable/components/RenderField/index.js CHANGED
@@ -11,7 +11,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
11
11
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
12
12
  import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
13
13
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
14
- var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm", "validateTrigger"];
14
+ var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
15
15
  import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
16
16
  /* eslint-disable prefer-destructuring */
17
17
  /* eslint-disable prefer-const */
@@ -60,8 +60,6 @@ var RenderField = function RenderField(_ref) {
60
60
  className = column.className,
61
61
  trim = column.trim,
62
62
  confirm = column.confirm,
63
- _column$validateTrigg = column.validateTrigger,
64
- validateTrigger = _column$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _column$validateTrigg,
65
63
  resetProps = _objectWithoutProperties(column, _excluded);
66
64
  // editRender弃用使用component同ProForm
67
65
  var _editRender = component || editRender;
@@ -79,6 +77,8 @@ var RenderField = function RenderField(_ref) {
79
77
  _config$originalDiffT = config.originalDiffTip,
80
78
  originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT,
81
79
  rowDisabled = config.rowDisabled,
80
+ _config$validateTrigg = config.validateTrigger,
81
+ validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
82
82
  otherProps = config.otherProps;
83
83
  var _fieldProps = fieldProps || formItemProps || {};
84
84
  var _rules = rules || [];
@@ -160,9 +160,7 @@ var RenderField = function RenderField(_ref) {
160
160
  // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 _fieldProps 内部参数
161
161
  var formItemChildProps = _objectSpread({}, _fieldProps);
162
162
  // 允许formItem的属性放在column最外层
163
- var _formItemProps = _objectSpread(_objectSpread(_objectSpread({}, resetProps), internalRule), {}, {
164
- validateTrigger: validateTrigger
165
- });
163
+ var _formItemProps = _objectSpread(_objectSpread({}, resetProps), internalRule);
166
164
  if (['Switch', 'SwitchCheckbox'].includes(type)) {
167
165
  _formItemProps.valuePropName = 'checked';
168
166
  valueType = 'switch';
package/es/ProEditTable/propsType.d.ts CHANGED
@@ -105,7 +105,6 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
105
105
  hiddenNames?: NamePath[] | NamePath[][];
106
106
  rules?: ProRule[] | RulesFn<T>;
107
107
  confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
108
- validateTrigger?: string | string[];
109
108
  [key: string]: any;
110
109
  }
111
110
  export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;
@@ -276,4 +275,5 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
276
275
  onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
277
276
  ref?: any;
278
277
  actionDirection?: 'vertical' | 'horizontal';
278
+ validateTrigger?: string | string[];
279
279
  }
package/lib/ProEditTable/components/RenderField/index.js CHANGED
@@ -30,7 +30,7 @@ var _useListChanged3 = require("../../../ProForm/utils/useListChanged");
30
30
  var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
31
31
  var _utils = require("../../../ProForm/utils");
32
32
  var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
33
- var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm", "validateTrigger"];
33
+ var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
34
34
  /* eslint-disable prefer-destructuring */
35
35
  /* eslint-disable prefer-const */
36
36
  var RenderField = function RenderField(_ref) {
@@ -63,8 +63,6 @@ var RenderField = function RenderField(_ref) {
63
63
  className = column.className,
64
64
  trim = column.trim,
65
65
  confirm = column.confirm,
66
- _column$validateTrigg = column.validateTrigger,
67
- validateTrigger = _column$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _column$validateTrigg,
68
66
  resetProps = (0, _objectWithoutProperties2.default)(column, _excluded);
69
67
  // editRender弃用使用component同ProForm
70
68
  var _editRender = component || editRender;
@@ -82,6 +80,8 @@ var RenderField = function RenderField(_ref) {
82
80
  _config$originalDiffT = config.originalDiffTip,
83
81
  originalDiffTip = _config$originalDiffT === void 0 ? true : _config$originalDiffT,
84
82
  rowDisabled = config.rowDisabled,
83
+ _config$validateTrigg = config.validateTrigger,
84
+ validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
85
85
  otherProps = config.otherProps;
86
86
  var _fieldProps = fieldProps || formItemProps || {};
87
87
  var _rules = rules || [];
@@ -163,9 +163,7 @@ var RenderField = function RenderField(_ref) {
163
163
  // 分离form item参数，防止对于参数透传（如onChange,防止重复触发）并优先级高于 _fieldProps 内部参数
164
164
  var formItemChildProps = (0, _objectSpread2.default)({}, _fieldProps);
165
165
  // 允许formItem的属性放在column最外层
166
- var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), internalRule), {}, {
167
- validateTrigger: validateTrigger
168
- });
166
+ var _formItemProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, resetProps), internalRule);
169
167
  if (['Switch', 'SwitchCheckbox'].includes(type)) {
170
168
  _formItemProps.valuePropName = 'checked';
171
169
  valueType = 'switch';
package/lib/ProEditTable/propsType.d.ts CHANGED
@@ -105,7 +105,6 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
105
105
  hiddenNames?: NamePath[] | NamePath[][];
106
106
  rules?: ProRule[] | RulesFn<T>;
107
107
  confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
108
- validateTrigger?: string | string[];
109
108
  [key: string]: any;
110
109
  }
111
110
  export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;
@@ -276,4 +275,5 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
276
275
  onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
277
276
  ref?: any;
278
277
  actionDirection?: 'vertical' | 'horizontal';
278
+ validateTrigger?: string | string[];
279
279
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@zat-design/sisyphus-react",
3
- "version": "3.6.8-beta.7",
3
+ "version": "3.6.8-beta.9",
4
4
  "license": "Apache-2.0",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",