@zat-design/sisyphus-react 3.6.9-beta.2 → 3.6.9-beta.3

package/dist/index.esm.css

@@ -1434,7 +1434,7 @@
 .pro-step {
   position: fixed;
   right: 0;
-  z-index: 101;
+  z-index: 999;
   min-width: 48px;
   min-height: 48px;
   overflow-x: hidden;
@@ -3036,19 +3036,19 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   width: auto;
 }
 .pro-form .pro-form-item-changed span.ant-input-affix-wrapper,
-.pro-form .pro-form-item-changed .ant-select-selector,
+.pro-form .pro-form-item-changed .ant-select .ant-select-selector,
 .pro-form .pro-form-item-changed .ant-picker,
 .pro-form .pro-form-item-changed .ant-input-number {
   background: var(--zaui-contract-bg, #fffaa1) !important;
 }
 .pro-form .pro-form-item-changed span.ant-input-affix-wrapper input,
-.pro-form .pro-form-item-changed .ant-select-selector input,
+.pro-form .pro-form-item-changed .ant-select .ant-select-selector input,
 .pro-form .pro-form-item-changed .ant-picker input,
 .pro-form .pro-form-item-changed .ant-input-number input {
   background: transparent;
 }
 .pro-form .pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
-.pro-form .pro-form-item-changed .ant-select-selector .ant-select-selection-placeholder,
+.pro-form .pro-form-item-changed .ant-select .ant-select-selector .ant-select-selection-placeholder,
 .pro-form .pro-form-item-changed .ant-picker .ant-select-selection-placeholder,
 .pro-form .pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
   z-index: 9;

package/dist/less.esm.css

@@ -1434,7 +1434,7 @@
 .pro-step {
   position: fixed;
   right: 0;
-  z-index: 101;
+  z-index: 999;
   min-width: 48px;
   min-height: 48px;
   overflow-x: hidden;
@@ -3036,19 +3036,19 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   width: auto;
 }
 .pro-form .pro-form-item-changed span.ant-input-affix-wrapper,
-.pro-form .pro-form-item-changed .ant-select-selector,
+.pro-form .pro-form-item-changed .ant-select .ant-select-selector,
 .pro-form .pro-form-item-changed .ant-picker,
 .pro-form .pro-form-item-changed .ant-input-number {
   background: var(--zaui-contract-bg, #fffaa1) !important;
 }
 .pro-form .pro-form-item-changed span.ant-input-affix-wrapper input,
-.pro-form .pro-form-item-changed .ant-select-selector input,
+.pro-form .pro-form-item-changed .ant-select .ant-select-selector input,
 .pro-form .pro-form-item-changed .ant-picker input,
 .pro-form .pro-form-item-changed .ant-input-number input {
   background: transparent;
 }
 .pro-form .pro-form-item-changed span.ant-input-affix-wrapper .ant-select-selection-placeholder,
-.pro-form .pro-form-item-changed .ant-select-selector .ant-select-selection-placeholder,
+.pro-form .pro-form-item-changed .ant-select .ant-select-selector .ant-select-selection-placeholder,
 .pro-form .pro-form-item-changed .ant-picker .ant-select-selection-placeholder,
 .pro-form .pro-form-item-changed .ant-input-number .ant-select-selection-placeholder {
   z-index: 9;

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

@@ -6,7 +6,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 } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
@@ -55,8 +55,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;
@@ -74,6 +72,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 || [];
@@ -155,9 +155,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

@@ -255,7 +255,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/es/ProForm/style/index.less

@@ -325,7 +325,7 @@
   // 比较原始值场景下  不同时的样式
   .pro-form-item-changed {
     span.@{ant-prefix}-input-affix-wrapper,
-    .@{ant-prefix}-select-selector,
+    .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,
     .@{ant-prefix}-input-number {
       background: @zaui-contract-bg !important;

package/es/ProStep/style/index.less

@@ -8,7 +8,7 @@
 .pro-step {
   position: fixed;
   right: 0;
-  z-index: 101;
+  z-index: 999;
   min-width: 48px;
   min-height: 48px;
   overflow-x: hidden;

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

@@ -29,7 +29,7 @@ var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"
 var _utils = require("../../../ProForm/utils");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
 var _ListChanged = _interopRequireDefault(require("./ListChanged"));
-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) {
@@ -62,8 +62,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;
@@ -81,6 +79,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 || [];
@@ -162,9 +162,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

@@ -255,7 +255,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/lib/ProForm/style/index.less

@@ -325,7 +325,7 @@
   // 比较原始值场景下  不同时的样式
   .pro-form-item-changed {
     span.@{ant-prefix}-input-affix-wrapper,
-    .@{ant-prefix}-select-selector,
+    .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,
     .@{ant-prefix}-input-number {
       background: @zaui-contract-bg !important;

package/lib/ProStep/style/index.less

@@ -8,7 +8,7 @@
 .pro-step {
   position: fixed;
   right: 0;
-  z-index: 101;
+  z-index: 999;
   min-width: 48px;
   min-height: 48px;
   overflow-x: hidden;

package/package.json

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