@zat-design/sisyphus-react 3.4.8-beta.4 → 3.4.8-beta.6

package/dist/index.esm.css

@@ -5163,6 +5163,14 @@ input[type='button'] {
 .ant-modal .ant-input-textarea-show-count.ant-input-textarea-in-form-item::after {
   background: transparent;
 }
+.ant-form .ant-drawer-body .ant-form-item .ant-form-item-label.ant-form-item-label-left > .ant-form-item-required::before,
+.ant-drawer .ant-drawer-body .ant-form-item .ant-form-item-label.ant-form-item-label-left > .ant-form-item-required::before,
+.ant-modal .ant-drawer-body .ant-form-item .ant-form-item-label.ant-form-item-label-left > .ant-form-item-required::before {
+  position: absolute;
+  top: calc(50% - 7px);
+  left: -8px;
+  margin: 0;
+}
 .ant-form .ant-form-item.ant-form-item-with-help,
 .ant-drawer .ant-form-item.ant-form-item-with-help,
 .ant-modal .ant-form-item.ant-form-item-with-help {

package/es/ProForm/index.d.ts

@@ -1,5 +1,6 @@
 import { Form, FormInstance } from 'antd';
-import { ForwardRefRenderFunction } from 'react';
+import React, { ForwardRefRenderFunction } from 'react';
+import { FormProviderProps } from 'antd/es/form/context';
 import { ProFormProps } from './propsType';
 interface IProForm<T = any> extends ForwardRefRenderFunction<FormInstance<T>, ProFormProps<T>> {
     useForm: typeof Form.useForm;
@@ -7,4 +8,5 @@ interface IProForm<T = any> extends ForwardRefRenderFunction<FormInstance<T>, Pr
     [key: string]: any;
 }
 declare const ProFormForward: IProForm;
+export declare const ProFormProvider: React.FC<FormProviderProps>;
 export default ProFormForward;

package/es/ProForm/index.js

@@ -1,4 +1,3 @@
-import _toArray from "@babel/runtime/helpers/esm/toArray";
 import "antd/es/row/style";
 import _Row from "antd/es/row";
 import "antd/es/form/style";
@@ -282,30 +281,32 @@ ProFormForward.useWatch = function (watchValue, form) {
   }
   return _Form.useWatch([], form);
 };
-var ProFormProvider = function ProFormProvider(props) {
+export var ProFormProvider = function ProFormProvider(props) {
   var onFormChange = props.onFormChange,
     onFormFinish = props.onFormFinish,
     children = props.children;
-  var handleFormChange = function handleFormChange(name, info) {
+  var handleFormChange = function handleFormChange(formName, info) {
     var changedFields = info.changedFields;
     var _changedFields = changedFields.flatMap(function (item) {
-      var name = item.name,
-        _item$value = item.value,
+      var _item$value = item.value,
         value = _item$value === void 0 ? [] : _item$value;
-      var _name = _toArray(name),
-        firstName = _name[0],
-        names = _name.slice(1);
-      var _namePath = [].concat(_toConsumableArray(splitNameStr(String(firstName))), _toConsumableArray(names));
-      return _namePath.map(function (name, index) {
+      var name = item.name;
+      var namesStr = name[name.length - 1];
+      // name中的最后一位如果包含 '-' 则是names组件
+      var isNames = String(namesStr).includes('-');
+      if (!isNames) return item; // 不是names组件直接返回
+      var namesList = splitNameStr(String(namesStr)); // 拆解出name列表
+      var prefix = name.slice(0, name.length - 1);
+      return namesList.map(function (nameItem, index) {
         return _objectSpread(_objectSpread({}, item), {}, {
-          name: name,
+          name: [].concat(_toConsumableArray(prefix), _toConsumableArray(nameItem)),
           value: value[index]
         });
       });
     });
     info.changedFields = _changedFields;
     // @ts-ignore
-    onFormChange(name, info);
+    onFormChange(formName, info);
   };
   return _jsx(_Form.Provider, {
     onFormChange: onFormChange ? handleFormChange : undefined,

package/es/ProForm/utils/index.d.ts

@@ -27,7 +27,7 @@ export declare const isTrim: (type: string, trim: boolean, configData: any) => a
 export declare const isUpperCase: (type: string, upperCase: boolean) => any;
 export declare const weedOutProps: (data: Record<string, any>, keys: string[]) => {}[];
 export declare const diffField: (prevValues: any, curValues: any, names: NamePath[]) => boolean;
-export declare const splitNameStr: (name: string) => NamePath[];
+export declare const splitNameStr: (name: string) => string[][];
 export declare const filterInternalFields: (values: any) => any;
 export declare const getAllNamePath: (object: Record<string, any>, currentPath?: InternalNamePath) => InternalNamePath[];
 export declare const isNullValue: (value: any) => boolean;

package/es/ProLayout/components/ProCollapse/index.js

@@ -119,12 +119,16 @@ var ProCollapse = function ProCollapse(props) {
       return;
     }
     var proCollapseNoTitles = proCollapseContent.querySelectorAll('.pro-collapse-no-level1-title');
+    var proFooterNode = proCollapseContent.querySelector('.pro-footer');
     var proCollapses = proCollapseContent.querySelectorAll('.pro-collapse');
-    if (proCollapseNoTitles.length === 1 && proCollapses.length === 1) {
+    if ((proCollapseNoTitles === null || proCollapseNoTitles === void 0 ? void 0 : proCollapseNoTitles.length) === 1 && proCollapses.length === 1) {
       var rect = proCollapseNoTitles[0].getBoundingClientRect();
       if ((rect === null || rect === void 0 ? void 0 : rect.height) < window.innerHeight - rect.top) {
         proCollapseNoTitles[0].style.minHeight = "calc(100vh - ".concat(rect.top + 16, "px)");
       }
+      if (proFooterNode) {
+        proCollapseNoTitles[0].style.minHeight = "calc(100vh - ".concat(rect.top + proFooterNode.offsetHeight + 16, "px)");
+      }
     }
     return function () {
       if (proCollapseNoTitles.length === 1 && proCollapses.length === 1) {

package/es/style/theme/antd.less

@@ -15,6 +15,21 @@
       background: transparent;
     }
   }
+  .@{ant-prefix}-drawer-body{
+  
+    .@{ant-prefix}-form-item{
+      .@{ant-prefix}-form-item-label{
+        &.@{ant-prefix}-form-item-label-left{
+          & > .@{ant-prefix}-form-item-required::before{
+            position: absolute;
+            top: calc(50% - 7px);
+            left: -8px;
+            margin: 0;
+          }
+        }
+      }
+    }
+  }
 
   .@{ant-prefix}-form-item {
     &.@{ant-prefix}-form-item-with-help {
@@ -28,7 +43,6 @@
       overflow: initial;
       line-height: 1;
       white-space: pre-wrap;
-
       .@{ant-prefix}-form-item-required {
         position: relative;
         &::before {

package/lib/ProForm/index.d.ts

@@ -1,5 +1,6 @@
 import { Form, FormInstance } from 'antd';
-import { ForwardRefRenderFunction } from 'react';
+import React, { ForwardRefRenderFunction } from 'react';
+import { FormProviderProps } from 'antd/es/form/context';
 import { ProFormProps } from './propsType';
 interface IProForm<T = any> extends ForwardRefRenderFunction<FormInstance<T>, ProFormProps<T>> {
     useForm: typeof Form.useForm;
@@ -7,4 +8,5 @@ interface IProForm<T = any> extends ForwardRefRenderFunction<FormInstance<T>, Pr
     [key: string]: any;
 }
 declare const ProFormForward: IProForm;
+export declare const ProFormProvider: React.FC<FormProviderProps>;
 export default ProFormForward;

package/lib/ProForm/index.js

@@ -5,8 +5,7 @@ var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWild
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
-var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
+exports.default = exports.ProFormProvider = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -283,30 +282,32 @@ ProFormForward.useWatch = function (watchValue, form) {
   }
   return _antd.Form.useWatch([], form);
 };
-var ProFormProvider = function ProFormProvider(props) {
+var ProFormProvider = exports.ProFormProvider = function ProFormProvider(props) {
   var onFormChange = props.onFormChange,
     onFormFinish = props.onFormFinish,
     children = props.children;
-  var handleFormChange = function handleFormChange(name, info) {
+  var handleFormChange = function handleFormChange(formName, info) {
     var changedFields = info.changedFields;
     var _changedFields = changedFields.flatMap(function (item) {
-      var name = item.name,
-        _item$value = item.value,
+      var _item$value = item.value,
         value = _item$value === void 0 ? [] : _item$value;
-      var _name = (0, _toArray2.default)(name),
-        firstName = _name[0],
-        names = _name.slice(1);
-      var _namePath = [].concat((0, _toConsumableArray2.default)((0, _index.splitNameStr)(String(firstName))), (0, _toConsumableArray2.default)(names));
-      return _namePath.map(function (name, index) {
+      var name = item.name;
+      var namesStr = name[name.length - 1];
+      // name中的最后一位如果包含 '-' 则是names组件
+      var isNames = String(namesStr).includes('-');
+      if (!isNames) return item; // 不是names组件直接返回
+      var namesList = (0, _index.splitNameStr)(String(namesStr)); // 拆解出name列表
+      var prefix = name.slice(0, name.length - 1);
+      return namesList.map(function (nameItem, index) {
         return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
-          name: name,
+          name: [].concat((0, _toConsumableArray2.default)(prefix), (0, _toConsumableArray2.default)(nameItem)),
           value: value[index]
         });
       });
     });
     info.changedFields = _changedFields;
     // @ts-ignore
-    onFormChange(name, info);
+    onFormChange(formName, info);
   };
   return (0, _jsxRuntime.jsx)(_antd.Form.Provider, {
     onFormChange: onFormChange ? handleFormChange : undefined,

package/lib/ProForm/utils/index.d.ts

@@ -27,7 +27,7 @@ export declare const isTrim: (type: string, trim: boolean, configData: any) => a
 export declare const isUpperCase: (type: string, upperCase: boolean) => any;
 export declare const weedOutProps: (data: Record<string, any>, keys: string[]) => {}[];
 export declare const diffField: (prevValues: any, curValues: any, names: NamePath[]) => boolean;
-export declare const splitNameStr: (name: string) => NamePath[];
+export declare const splitNameStr: (name: string) => string[][];
 export declare const filterInternalFields: (values: any) => any;
 export declare const getAllNamePath: (object: Record<string, any>, currentPath?: InternalNamePath) => InternalNamePath[];
 export declare const isNullValue: (value: any) => boolean;

package/lib/ProLayout/components/ProCollapse/index.js

@@ -121,12 +121,16 @@ var ProCollapse = function ProCollapse(props) {
       return;
     }
     var proCollapseNoTitles = proCollapseContent.querySelectorAll('.pro-collapse-no-level1-title');
+    var proFooterNode = proCollapseContent.querySelector('.pro-footer');
     var proCollapses = proCollapseContent.querySelectorAll('.pro-collapse');
-    if (proCollapseNoTitles.length === 1 && proCollapses.length === 1) {
+    if ((proCollapseNoTitles === null || proCollapseNoTitles === void 0 ? void 0 : proCollapseNoTitles.length) === 1 && proCollapses.length === 1) {
       var rect = proCollapseNoTitles[0].getBoundingClientRect();
       if ((rect === null || rect === void 0 ? void 0 : rect.height) < window.innerHeight - rect.top) {
         proCollapseNoTitles[0].style.minHeight = "calc(100vh - ".concat(rect.top + 16, "px)");
       }
+      if (proFooterNode) {
+        proCollapseNoTitles[0].style.minHeight = "calc(100vh - ".concat(rect.top + proFooterNode.offsetHeight + 16, "px)");
+      }
     }
     return function () {
       if (proCollapseNoTitles.length === 1 && proCollapses.length === 1) {

package/lib/style/theme/antd.less

@@ -15,6 +15,21 @@
       background: transparent;
     }
   }
+  .@{ant-prefix}-drawer-body{
+  
+    .@{ant-prefix}-form-item{
+      .@{ant-prefix}-form-item-label{
+        &.@{ant-prefix}-form-item-label-left{
+          & > .@{ant-prefix}-form-item-required::before{
+            position: absolute;
+            top: calc(50% - 7px);
+            left: -8px;
+            margin: 0;
+          }
+        }
+      }
+    }
+  }
 
   .@{ant-prefix}-form-item {
     &.@{ant-prefix}-form-item-with-help {
@@ -28,7 +43,6 @@
       overflow: initial;
       line-height: 1;
       white-space: pre-wrap;
-
       .@{ant-prefix}-form-item-required {
         position: relative;
         &::before {

package/package.json

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