@zat-design/sisyphus-react 3.3.2 → 3.3.3-beta.2

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

@@ -18,59 +18,62 @@
 
   .@{ant-prefix}-collapse-header {
     align-items: center !important;
-    padding    : 12px var(--zaui-space-size-md, 16px) !important;
-    background : var(--zaui-area, #fafafa);
+    padding: 12px var(--zaui-space-size-md, 16px) !important;
+    background: var(--zaui-area, #fafafa);
   }
 
   .@{ant-prefix}-collapse-header-text {
-    color      : var(--zaui-text, #343434);
+    color: var(--zaui-text, #343434);
     font-weight: 500;
-    font-size  : var(--zaui-font-size-lg, 16px);
+    font-size: var(--zaui-font-size-lg, 16px);
   }
 
   .@{ant-prefix}-collapse-expand-icon {
     color: #c5c7cd;
   }
 
-  &.@{ant-prefix}-collapse-borderless .@{ant-prefix}-collapse-item>.@{ant-prefix}-collapse-content>.@{ant-prefix}-collapse-content-box {
+  &.@{ant-prefix}-collapse-borderless
+    .@{ant-prefix}-collapse-item
+    > .@{ant-prefix}-collapse-content
+    > .@{ant-prefix}-collapse-content-box {
     padding: 0;
   }
 
   .@{ant-prefix}-collapse-content-box {
-    padding   : 0;
+    padding: 0;
     background: var(--zaui-base-bg, #ffffff);
 
     .pro-collapse-content {
-      padding       : var(--zaui-space-size-md, 16px);
+      padding: var(--zaui-space-size-md, 16px);
       padding-bottom: 0;
-      background    : var(--zaui-base-bg, #ffffff);
+      background: var(--zaui-base-bg, #ffffff);
     }
   }
 
   &.pro-collapse-level2 {
     margin-bottom: 0;
-    background   : var(--zaui-base-bg, #ffffff);
+    background: var(--zaui-base-bg, #ffffff);
 
     .@{ant-prefix}-collapse-header {
       margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
-      padding      : 0 !important;
-      background   : var(--zaui-base-bg, #ffffff);
+      padding: 0 !important;
+      background: var(--zaui-base-bg, #ffffff);
 
       .@{ant-prefix}-collapse-header-text {
-        position    : relative;
+        position: relative;
         padding-left: var(--zaui-space-size-sm, 8px);
-        font-size   : var(--zaui-font-size, 14px);
+        font-size: var(--zaui-font-size, 14px);
 
         &::before {
-          position     : absolute;
-          top          : 50%;
-          left         : 0;
-          width        : 4px;
-          height       : 14px;
-          background   : var(--zaui-brand);
+          position: absolute;
+          top: 50%;
+          left: 0;
+          width: 4px;
+          height: 14px;
+          background: var(--zaui-brand);
           border-radius: var(--zaui-border-radius-card, 2px);
-          transform    : translateY(-50%);
-          content      : '';
+          transform: translateY(-50%);
+          content: '';
         }
       }
 
@@ -93,9 +96,12 @@
       padding: 0;
     }
 
-    &.@{ant-prefix}-collapse .@{ant-prefix}-collapse-item-disabled>.@{ant-prefix}-collapse-header,
-    .@{ant-prefix}-collapse .@{ant-prefix}-collapse-item-disabled>.@{ant-prefix}-collapse-header>.arrow {
-      color : var(--zaui-text, #343434);
+    &.@{ant-prefix}-collapse .@{ant-prefix}-collapse-item-disabled > .@{ant-prefix}-collapse-header,
+    .@{ant-prefix}-collapse
+      .@{ant-prefix}-collapse-item-disabled
+      > .@{ant-prefix}-collapse-header
+      > .arrow {
+      color: var(--zaui-text, #343434);
       cursor: default;
     }
 
@@ -108,6 +114,12 @@
         display: block;
       }
     }
+
+    .pro-collapse-level2-no-collapse {
+      .@{ant-prefix}-collapse-expand-icon {
+        display: none;
+      }
+    }
   }
 
   .@{ant-prefix}-collapse-extra {
@@ -117,10 +129,9 @@
   }
 
   &.pro-collapse-list {
-
-    .@{ant-prefix}-descriptions-row>th,
-    .@{ant-prefix}-descriptions-row>td {
-      padding   : var(--zaui-space-size-md, 16px) 0;
+    .@{ant-prefix}-descriptions-row > th,
+    .@{ant-prefix}-descriptions-row > td {
+      padding: var(--zaui-space-size-md, 16px) 0;
       background: #fafafa;
 
       &.@{ant-prefix}-descriptions-item {
@@ -133,26 +144,25 @@
         position: relative;
 
         &::before {
-          position     : absolute;
-          top          : 50%;
-          left         : 8px;
-          width        : 4px;
-          height       : 14px;
-          background   : var(--zaui-brand);
+          position: absolute;
+          top: 50%;
+          left: 8px;
+          width: 4px;
+          height: 14px;
+          background: var(--zaui-brand);
           border-radius: var(--zaui-border-radius-card, 2px);
-          transform    : translateY(-50%);
-          content      : '';
+          transform: translateY(-50%);
+          content: '';
         }
       }
     }
 
     .@{ant-prefix}-descriptions-item-container {
-
       .@{ant-prefix}-descriptions-item-label,
       .@{ant-prefix}-descriptions-item-content {
-        color      : #0a0a0a !important;
+        color: #0a0a0a !important;
         font-weight: 500 !important;
-        font-size  : var(--zaui-font-size, 14px);
+        font-size: var(--zaui-font-size, 14px);
       }
     }
 

package/lib/ProStep/index.js

@@ -167,7 +167,6 @@ var ProStep = function ProStep(_ref) {
       subtree: true,
       childList: true // 是否观察子元素的添加或删除
     };
-
     observer.observe(targetElement, config);
   };
   (0, _ahooks.useDeepCompareEffect)(function () {

package/lib/ProThemeTools/index.js

@@ -119,7 +119,6 @@ var ProThemeTools = function ProThemeTools(_ref) {
         return ["".concat((0, _index.getKebabCase)(item === null || item === void 0 ? void 0 : item[0])), ['zauiSize'].includes(item === null || item === void 0 ? void 0 : item[0]) || typeof (item === null || item === void 0 ? void 0 : item[1]) !== 'number' ? item === null || item === void 0 ? void 0 : item[1] : "".concat(item === null || item === void 0 ? void 0 : item[1], "px") // zauiSize取数字
         ];
       }));
-
       setState((0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), localThemeConfig));
       (0, _index.setThemes)(cssVariables);
       _antd.ConfigProvider.config({

package/lib/ProThemeTools/utils/index.js

@@ -55,7 +55,6 @@ var getKebabCase = exports.getKebabCase = function getKebabCase(str) {
   if (temp.slice(0, 1) === '-') {
     temp = temp.slice(1); // 如果首字母是大写，执行replace时会多一个-，需要去掉
   }
-
   return temp;
 };
 /** JS实现对象驼峰命名与横线命名的转换  */

package/lib/ProTree/components/Tree.js

@@ -308,7 +308,6 @@ function List(props) {
       });
       return treeRow; // .filter((item) => item);
     };
-
     if ((other === null || other === void 0 ? void 0 : other.mode) === 'view') {
       return;
     }

package/lib/ProTree/index.js

@@ -16,6 +16,7 @@ var _ProTreeSelect = _interopRequireDefault(require("../ProTreeSelect"));
  *@Author: liudongliang
  *@Description: ProTree组件，集成了tree和treeSelect
 */
+
 var ProTreeHandle = function ProTreeHandle(props) {
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'tree' : _props$mode;

package/lib/ProTreeModal/index.js

@@ -492,8 +492,12 @@ var ProTreeModal = function ProTreeModal(props) {
     } else {
       onChange === null || onChange === void 0 ? void 0 : onChange([]);
       setState({
-        checkAll: false
+        checkAll: false,
+        open: true
       });
+      if (appoint) {
+        openChange === null || openChange === void 0 ? void 0 : openChange(true);
+      }
     }
   };
   /**

package/lib/ProTreeSelect/index.js

@@ -21,7 +21,6 @@ var _excluded = ["disabled", "code", "dataSource", "defaultDisableValue", "onCha
   _excluded2 = ["children"];
 var SHOW_PARENT = _antd.TreeSelect.SHOW_PARENT;
 var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
-  var _classnames2;
   // 全局属性配置在ConfigProvider
   var _ref = (0, _ProConfigProvider.useProConfig)('ProTreeSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
@@ -365,7 +364,6 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
         //   currentAllNodeChild.push(item);
         // }
       }
-
       return currentAllNodeChild;
     };
     sourceList = filterData(sourceList);
@@ -471,9 +469,9 @@ var ProTreeSelect = exports.ProTreeSelect = function ProTreeSelect(props, ref) {
     'pro-tree-select': true
   }, "".concat(className), className));
   var innerClass = treeCheckable ? 'checkable-tree pro' : "".concat(tenCountClass, " signal-tree");
-  var dropDownClassName = (0, _classnames3.default)((_classnames2 = {
+  var dropDownClassName = (0, _classnames3.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
     'pro-tree-select-drop-down-container': true
-  }, (0, _defineProperty2.default)(_classnames2, "".concat(innerClass), true), (0, _defineProperty2.default)(_classnames2, "".concat(popupClassName), popupClassName), _classnames2));
+  }, "".concat(innerClass), true), "".concat(popupClassName), popupClassName));
   var treeProps = (0, _objectSpread2.default)({
     disabled: disabled,
     showSearch: showSearch,

package/lib/ProUpload/index.js

@@ -98,7 +98,6 @@ var ProUpload = /*#__PURE__*/_react.default.forwardRef(function (props, ref) {
           response: file === null || file === void 0 ? void 0 : file.response
           // url: file?.response?.data?.url,
         };
-
         if (transformResponse) {
           var data = transformResponse(file.response) || {};
           return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, nfile), data);

package/lib/index.d.ts

@@ -8,6 +8,7 @@ export { default as ProViewer } from './ProViewer';
 export { default as ProEditTable } from './ProEditTable';
 export { default as ProDrawerForm } from './ProDrawerForm';
 export { default as ProEditLabel } from './ProEditLabel';
+export { ProFormGroup, useProFormGroup } from './ProForm/components/ProFormGroup';
 export { default as ProForm } from './ProForm';
 export * from './ProForm';
 export * from './ProForm/components';

package/lib/index.js

@@ -15,6 +15,8 @@ var _exportNames = {
   ProEditTable: true,
   ProDrawerForm: true,
   ProEditLabel: true,
+  ProFormGroup: true,
+  useProFormGroup: true,
   ProForm: true,
   ProSelect: true,
   ProEnum: true,
@@ -95,6 +97,12 @@ Object.defineProperty(exports, "ProForm", {
     return _ProForm.default;
   }
 });
+Object.defineProperty(exports, "ProFormGroup", {
+  enumerable: true,
+  get: function get() {
+    return _ProFormGroup.ProFormGroup;
+  }
+});
 Object.defineProperty(exports, "ProIcon", {
   enumerable: true,
   get: function get() {
@@ -161,6 +169,12 @@ Object.defineProperty(exports, "ProWaterMark", {
     return _ProWaterMark.default;
   }
 });
+Object.defineProperty(exports, "useProFormGroup", {
+  enumerable: true,
+  get: function get() {
+    return _ProFormGroup.useProFormGroup;
+  }
+});
 var _ProLayout = _interopRequireDefault(require("./ProLayout"));
 var _ProStep = _interopRequireDefault(require("./ProStep"));
 var _ProTabs = _interopRequireDefault(require("./ProTabs"));
@@ -170,6 +184,7 @@ var _ProViewer = _interopRequireDefault(require("./ProViewer"));
 var _ProEditTable = _interopRequireDefault(require("./ProEditTable"));
 var _ProDrawerForm = _interopRequireDefault(require("./ProDrawerForm"));
 var _ProEditLabel = _interopRequireDefault(require("./ProEditLabel"));
+var _ProFormGroup = require("./ProForm/components/ProFormGroup");
 var _ProForm = _interopRequireWildcard(require("./ProForm"));
 Object.keys(_ProForm).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/lib/old/ProEditableTable/index.js

@@ -398,7 +398,7 @@ var ProEditableTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref)
           }, antButtonProps), {}, {
             children: buttonText
           }))]
-        }) : /*#__PURE__*/(0, _react.cloneElement)(buttonText, antButtonProps)
+        }) : ( /*#__PURE__*/(0, _react.cloneElement)(buttonText, antButtonProps))
       }) : null
     });
   };

package/lib/style/theme/antd.less

@@ -663,7 +663,7 @@
       width: calc(100% - 18px);
       margin-bottom: 0;
       text-align: right;
-      background: #fff;
+      // background: #fff;
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.3.2",
+  "version": "3.3.3-beta.2",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -71,7 +71,8 @@
   "peerDependencies": {
     "antd": "^4.24.8",
     "react": "17.x",
-    "react-dom": "17.x"
+    "react-dom": "17.x",
+    "react-router-dom": "^5.1.7"
   },
   "devDependencies": {
     "@commitlint/cli": "^12.1.1",