@zat-design/sisyphus-react 3.4.2-beta.23 → 3.4.2-beta.25

package/dist/index.esm.css

@@ -932,12 +932,12 @@
   position: -webkit-sticky;
   position: sticky;
   z-index: 101;
-  -webkit-box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
-          box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
+  -webkit-box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
+          box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
 }
 .pro-header.pro-header-shadow {
-  -webkit-box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
-          box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
+  -webkit-box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
+          box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
 }
 .pro-header .ant-breadcrumb li {
   color: #1d2129;
@@ -2611,9 +2611,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
       -ms-flex-align: normal;
           align-items: normal;
 }
-.pro-form.ant-form {
-  margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
-}
 .pro-form .pro-collapse-level2 .ant-collapse-item {
   margin-bottom: 0 !important;
 }
@@ -5045,7 +5042,7 @@ input[type='button'] {
   -webkit-flex: 0 0 var(--zaui-form-label-width, 130px);
       -ms-flex: 0 0 var(--zaui-form-label-width, 130px);
           flex: 0 0 var(--zaui-form-label-width, 130px);
-  padding-right: calc(var(--zaui-space-size-sm, 8px) * var(--zaui-size, 1));
+  padding-right: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
   overflow: initial;
   line-height: 1;
   white-space: pre-wrap;

package/dist/less.esm.css

@@ -932,12 +932,12 @@
   position: -webkit-sticky;
   position: sticky;
   z-index: 101;
-  -webkit-box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
-          box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
+  -webkit-box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
+          box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
 }
 .pro-header.pro-header-shadow {
-  -webkit-box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
-          box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
+  -webkit-box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
+          box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
 }
 .pro-header .ant-breadcrumb li {
   color: #1d2129;
@@ -2611,9 +2611,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
       -ms-flex-align: normal;
           align-items: normal;
 }
-.pro-form.ant-form {
-  margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1));
-}
 .pro-form .pro-collapse-level2 .ant-collapse-item {
   margin-bottom: 0 !important;
 }

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

@@ -29,7 +29,7 @@ import { useListChanged } from '../../../ProForm/utils/useListChanged';
 import useRules from '../../../ProForm/utils/useRules';
 import { isSelect } from '../../../ProForm/utils';
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _TargetComponent4;
+  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _TargetComponent4, _componentProps;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -469,6 +469,7 @@ var RenderField = function RenderField(_ref) {
     form: form,
     name: cellName
   }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
+    namePath: [].concat(_toConsumableArray(namePath), [index]),
     disabled: _disabled,
     onChange: _onchange,
     onBlur: _onblur,
@@ -481,6 +482,9 @@ var RenderField = function RenderField(_ref) {
       isView: isView
     }
   });
+  if (type !== 'Group') {
+    componentProps = omit(componentProps, ['onFieldChange']);
+  }
   // 单元格编辑时，设置各个单元格disabled属性
   if (isCell) {
     record["".concat(dataIndex, "-Disabled")] = _disabled;
@@ -506,11 +510,11 @@ var RenderField = function RenderField(_ref) {
   }
   var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed));
   var originalTitle = originalDiffTip ? _jsxs(_Space, {
-    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
+    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
-    }))) : _jsx(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
+    }))) : _jsx(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
@@ -521,12 +525,12 @@ var RenderField = function RenderField(_ref) {
   }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: cellName,
-    children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))) : _jsx(TargetComponent, _objectSpread({}, omit(componentProps, ['onFieldChange'])))
+    children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps))
   })) : _jsx(Container, {
     viewEmpty: viewEmpty
   });
   return _jsx(FieldProvider, {
-    value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
+    value: (_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps,
     children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {
       title: originalTitle,
       open: changed ? undefined : false,

package/es/ProForm/style/index.less

@@ -31,10 +31,6 @@
     }
   }
 
-  &.@{ant-prefix}-form {
-    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
-  }
-
   .pro-collapse-level2 {
     .@{ant-prefix}-collapse-item {
       margin-bottom: 0 !important;

package/es/ProLayout/components/ProHeader/style/index.less

@@ -102,11 +102,11 @@
   &.pro-header-fixed {
     position: sticky;
     z-index: 101;
-    box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
+    box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
   }
 
   &.pro-header-shadow {
-    box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
+    box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
   }
 
   .@{ant-prefix}-breadcrumb {

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

@@ -11,6 +11,8 @@ import _TreeSelect from "antd/es/tree-select";
 var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className"],
   _excluded2 = ["children"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/* eslint-disable react/no-danger */
+/* eslint-disable react/jsx-closing-tag-location */
 import { useDeepCompareEffect, useRequest as useRequestFunc, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { useImperativeHandle, forwardRef } from 'react';
@@ -282,8 +284,7 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
    */
   var renderTreeNode = function renderTreeNode(node, grade) {
     var children = node.children,
-      icon = node.icon,
-      hideNodeClass = node.hideNodeClass;
+      icon = node.icon;
     var labelText = node[label];
     var value = node[code];
     var titleHtml = _jsx("span", {
@@ -302,10 +303,10 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
       children: [_jsx("span", {
         className: "check-option-text-content",
         children: titleHtml
-      }), _jsx("span", {
+      }), !disabled ? _jsx("span", {
         className: "check-mark-icon",
         children: _jsx(Icon, {})
-      })]
+      }) : null]
     });
     if (!children) {
       return _jsx(_TreeSelect.TreeNode, {
@@ -357,10 +358,6 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
           item[label] = item[label].replace(regExp, "<span class=\"highlight-search-text\">".concat(keyWord, "</span>"));
         }
         currentAllNodeChild.push(item);
-        // if (tag || item?.children?.length) {
-        //   // 如果子节点有匹配项或者自己匹配了那么都加入结果中
-        //   currentAllNodeChild.push(item);
-        // }
       }
       return currentAllNodeChild;
     };
@@ -473,7 +470,6 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
   var treeProps = _objectSpread({
     disabled: disabled,
     showSearch: showSearch,
-    // filterTreeNode: filterTreeNodeEvent,
     treeDefaultExpandAll: defaultExpandAll,
     treeExpandedKeys: expandedKeys,
     treeCheckable: treeCheckable,

package/es/style/theme/antd.less

@@ -24,7 +24,7 @@
     // label 超过130px换行
     .@{ant-prefix}-form-item-label {
       flex: 0 0 @zaui-form-label-width;
-      padding-right: @zaui-space-size-sm;
+      padding-right: @zaui-space-size-md;
       overflow: initial;
       line-height: 1;
       white-space: pre-wrap;

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

@@ -32,7 +32,7 @@ var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "e
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _TargetComponent4;
+  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _TargetComponent4, _componentProps;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -472,6 +472,7 @@ var RenderField = function RenderField(_ref) {
     form: form,
     name: cellName
   }, _fieldProps), (_TargetComponent4 = TargetComponent) === null || _TargetComponent4 === void 0 ? void 0 : _TargetComponent4.props), {}, {
+    namePath: [].concat((0, _toConsumableArray2.default)(namePath), [index]),
     disabled: _disabled,
     onChange: _onchange,
     onBlur: _onblur,
@@ -484,6 +485,9 @@ var RenderField = function RenderField(_ref) {
       isView: isView
     }
   });
+  if (type !== 'Group') {
+    componentProps = (0, _lodash.omit)(componentProps, ['onFieldChange']);
+  }
   // 单元格编辑时，设置各个单元格disabled属性
   if (isCell) {
     record["".concat(dataIndex, "-Disabled")] = _disabled;
@@ -509,11 +513,11 @@ var RenderField = function RenderField(_ref) {
   }
   var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed));
   var originalTitle = originalDiffTip ? (0, _jsxRuntime.jsxs)(_antd.Space, {
-    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
+    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
-    }))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
+    }))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
@@ -524,12 +528,12 @@ var RenderField = function RenderField(_ref) {
   }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: cellName,
-    children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])))
+    children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps))
   })) : (0, _jsxRuntime.jsx)(_Container.default, {
     viewEmpty: viewEmpty
   });
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
-    value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
+    value: (_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps,
     children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: originalTitle,
       open: changed ? undefined : false,

package/lib/ProForm/style/index.less

@@ -31,10 +31,6 @@
     }
   }
 
-  &.@{ant-prefix}-form {
-    margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
-  }
-
   .pro-collapse-level2 {
     .@{ant-prefix}-collapse-item {
       margin-bottom: 0 !important;

package/lib/ProLayout/components/ProHeader/style/index.less

@@ -102,11 +102,11 @@
   &.pro-header-fixed {
     position: sticky;
     z-index: 101;
-    box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
+    box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
   }
 
   &.pro-header-shadow {
-    box-shadow: 0px 1px 2px 0px rgba(0, 55, 93, 0.1);
+    box-shadow: 0px 2px 4px 0px rgba(0, 55, 93, 0.2);
   }
 
   .@{ant-prefix}-breadcrumb {

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

@@ -19,6 +19,8 @@ var _ProConfigProvider = require("../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
 var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onChange", "useRequest", "transformResponse", "fieldNames", "tooltip", "showSearch", "filterTreeNode", "treeNodeFilterProp", "defaultExpandAll", "expandedKeys", "treeCheckable", "onSearch", "otherProps", "width", "dropdownStyle", "popupClassName", "style", "allowClear", "listHeight", "showCodeName", "className"],
   _excluded2 = ["children"];
+/* eslint-disable react/no-danger */
+/* eslint-disable react/jsx-closing-tag-location */
 var SHOW_PARENT = _antd.TreeSelect.SHOW_PARENT;
 var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
   // 全局属性配置在ConfigProvider
@@ -284,8 +286,7 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
    */
   var renderTreeNode = function renderTreeNode(node, grade) {
     var children = node.children,
-      icon = node.icon,
-      hideNodeClass = node.hideNodeClass;
+      icon = node.icon;
     var labelText = node[label];
     var value = node[code];
     var titleHtml = (0, _jsxRuntime.jsx)("span", {
@@ -304,10 +305,10 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
       children: [(0, _jsxRuntime.jsx)("span", {
         className: "check-option-text-content",
         children: titleHtml
-      }), (0, _jsxRuntime.jsx)("span", {
+      }), !disabled ? (0, _jsxRuntime.jsx)("span", {
         className: "check-mark-icon",
         children: (0, _jsxRuntime.jsx)(Icon, {})
-      })]
+      }) : null]
     });
     if (!children) {
       return (0, _jsxRuntime.jsx)(_antd.TreeSelect.TreeNode, {
@@ -359,10 +360,6 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
           item[label] = item[label].replace(regExp, "<span class=\"highlight-search-text\">".concat(keyWord, "</span>"));
         }
         currentAllNodeChild.push(item);
-        // if (tag || item?.children?.length) {
-        //   // 如果子节点有匹配项或者自己匹配了那么都加入结果中
-        //   currentAllNodeChild.push(item);
-        // }
       }
       return currentAllNodeChild;
     };
@@ -475,7 +472,6 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
   var treeProps = (0, _objectSpread2.default)({
     disabled: disabled,
     showSearch: showSearch,
-    // filterTreeNode: filterTreeNodeEvent,
     treeDefaultExpandAll: defaultExpandAll,
     treeExpandedKeys: expandedKeys,
     treeCheckable: treeCheckable,

package/lib/style/theme/antd.less

@@ -24,7 +24,7 @@
     // label 超过130px换行
     .@{ant-prefix}-form-item-label {
       flex: 0 0 @zaui-form-label-width;
-      padding-right: @zaui-space-size-sm;
+      padding-right: @zaui-space-size-md;
       overflow: initial;
       line-height: 1;
       white-space: pre-wrap;

package/package.json

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