@zat-design/sisyphus-react 3.4.1 → 3.4.2-beta.1

package/dist/index.esm.css

@@ -2297,6 +2297,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
           margin-inline-start: -1px;
   border-start-start-radius: 0;
   border-end-start-radius: 0;
+  padding: 0 12px;
+  background-color: #fff;
+  cursor: default;
 }
 .pro-group .ant-space-compact .pro-modal-select {
   margin-left: -1px;
@@ -3084,93 +3087,6 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .proupload-modal-preview .ant-modal {
   width: 600px;
 }
-.pro-tree-select .ant-select-selector .check-mark-icon {
-  display: none;
-}
-.pro-tree-select .ant-select.ant-select-single.ant-select-show-arrow:not(.ant-select-show-search).ant-select-open .ant-select-arrow {
-  -webkit-transition: -webkit-transform 300ms ease-in-out;
-  transition: -webkit-transform 300ms ease-in-out;
-  transition: transform 300ms ease-in-out;
-  transition: transform 300ms ease-in-out, -webkit-transform 300ms ease-in-out;
-  -webkit-transform: rotate(180deg);
-          transform: rotate(180deg);
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown .highlight-search-text {
-  color: var(--zaui-brand, #006aff);
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown .ant-select-tree-list-holder-inner {
-  position: relative!important;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.ant-tree-select-dropdown {
-  width: auto!important;
-  padding: 0px;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.singal-tree .ant-select-tree .ant-select-tree-treenode,
-.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-treenode {
-  padding-top: var(--zaui-space-size-xs);
-  padding-bottom: var(--zaui-space-size-xs);
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.singal-tree .highlight,
-.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .highlight {
-  color: red;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-treenode {
-  position: relative;
-  padding-right: 50px;
-  padding-left: 7px;
-  z-index: 0;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-treenode:after {
-  content: '';
-  display: none;
-  position: absolute;
-  z-index: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background-color: var(--zaui-brand, #006aff);
-  opacity: 0.1;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-treenode.ant-select-tree-treenode-selected:after {
-  display: block;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-node-content-wrapper {
-  background-color: transparent;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-node-content-wrapper.ant-select-tree-node-selected .check-mark-icon {
-  display: block;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .ant-select-tree-treenode:hover {
-  background-color: #f5f5f5;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.signal-tree .ant-select-tree .check-option-text .check-mark-icon {
-  position: absolute;
-  right: -34px;
-  top: 2px;
-  display: none;
-  color: var(--zaui-list-item-selected-bg);
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-treenode {
-  padding-left: 7px;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-treenode:hover {
-  background-color: #f5f5f5;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-node-content-wrapper {
-  padding-right: var(--zaui-space-size-md);
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-node-content-wrapper:hover {
-  background-color: transparent;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.checkable-tree .ant-select-tree .ant-select-tree-checkbox {
-  margin-top: var(--zaui-space-size-xs);
-  -webkit-align-self: stretch;
-      -ms-flex-item-align: stretch;
-          align-self: stretch;
-}
-.pro-tree-select-drop-down-container.ant-select-dropdown.ten-count-tree-node .ant-select-tree-switcher-noop {
-  width: var(--zaui-space-size-xs);
-}
 .pro-tree-modal-container .ant-modal-content .ant-modal-body {
   max-height: 498px;
 }
@@ -3447,6 +3363,10 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-transfer-right .checked-item {
   margin: var(--zaui-space-size-sm, 8px) 0;
 }
+.pro-transfer-right .checked-item.dragable .ant-tag > span:first-child {
+  padding: 8px 0;
+  cursor: move;
+}
 .pro-transfer-right .checked-item:first-child {
   margin-top: 0;
 }

package/es/ProConfigProvider/index.js

@@ -13,7 +13,14 @@ var initialState = {
   ProEnum: {
     dics: {}
   },
-  forms: {}
+  forms: {},
+  ProIcon: {
+    mode: 'icon',
+    mapList: [{
+      type: 'view',
+      text: '查看'
+    }]
+  }
 };
 export var ProConfigContext = /*#__PURE__*/React.createContext({
   state: initialState,

package/es/ProEditTable/utils/index.js

@@ -202,7 +202,9 @@ export var transformColumns = function transformColumns() {
       ellipsis = item.ellipsis,
       key = item.key,
       tooltip = item.tooltip,
-      suffix = item.suffix;
+      suffix = item.suffix,
+      before = item.before,
+      after = item.after;
     // column设置label时，权重最高
     var columnTitle = label || title;
     if (typeof columnTitle === 'string') {
@@ -214,7 +216,7 @@ export var transformColumns = function transformColumns() {
           resetProps = _objectWithoutProperties(_ref2, _excluded2);
         item.title = _jsxs("span", {
           className: "pro-edit-table-title pro-edit-table-tooltip",
-          children: [columnTitle, _jsx(_Tooltip, _objectSpread(_objectSpread({
+          children: [before, columnTitle, _jsx(_Tooltip, _objectSpread(_objectSpread({
             title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
           }, resetProps), {}, {
             children: icon ? ( /*#__PURE__*/React.cloneElement(icon, {
@@ -223,12 +225,12 @@ export var transformColumns = function transformColumns() {
               className: "icon-tip",
               src: tipSvg
             })
-          })), suffix]
+          })), suffix || after]
         });
       } else {
         item.title = _jsxs("span", {
           className: "pro-edit-table-title",
-          children: [columnTitle, suffix]
+          children: [before, columnTitle, suffix || after]
         });
       }
     }

package/es/ProEnum/style/index.less

@@ -42,6 +42,7 @@
       padding: var(--zaui-space-size-sm) var(--zaui-space-border);
       line-height: 18px;
       background-color: #f1f3f6ff;
+      border: 1px solid transparent;
       cursor: pointer;
 
       &::after {
@@ -64,7 +65,7 @@
         border-top-right-radius: var(--zaui-space-size-xs);
         border-bottom-right-radius: var(--zaui-space-size-xs);
         &::after {
-          width: 0;
+          background: transparent;
         }
       }
     }
@@ -73,12 +74,12 @@
       color: var(--zaui-brand);
       border: 1px solid var(--zaui-brand);
       &::after {
-        width: 0;
+        background: transparent;
       }
     }
 
     .pro-enum-group-item-disabled-after::after {
-      width: 0 !important;
+      background: transparent;
     }
 
     .pro-enum-group-item-disabled {

package/es/ProForm/components/base/InputNumber/index.js

@@ -73,6 +73,9 @@ var InputNumber = function InputNumber(props) {
           },
           parser: function parser(value) {
             var num = Number(value.replace(/[\s,]+/g, ''));
+            if (value === '') {
+              return value;
+            }
             return Number.isNaN(num) ? value : num.toFixed((props === null || props === void 0 ? void 0 : props.precision) || 2);
           }
         };

package/es/ProForm/components/combination/Group/index.js

@@ -4,9 +4,11 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useMemo } from 'react';
-import { omit } from 'lodash';
+import { omit, isFunction } from 'lodash';
+import { useDeepCompareEffect, useCounter } from 'ahooks';
 import classnames from 'classnames';
 import RenderFields from '../../render/RenderFields';
 import { insertSeparator } from './utils';
@@ -19,7 +21,13 @@ var Group = function Group(props) {
     space = _props$space === void 0 ? {
       size: 12
     } : _props$space,
-    id = props.id;
+    id = props.id,
+    value = props.value,
+    onFieldChange = props.onFieldChange;
+  var _useCounter = useCounter(0),
+    _useCounter2 = _slicedToArray(_useCounter, 2),
+    num = _useCounter2[0],
+    inc = _useCounter2[1].inc;
   var _ref = ProForm.useFieldProps() || {},
     names = _ref.names,
     name = _ref.name,
@@ -56,6 +64,15 @@ var Group = function Group(props) {
       return ['Radio', 'Checkbox', 'Switch'].includes(item.type);
     })
   }, "".concat(className), className));
+  useDeepCompareEffect(function () {
+    // 模拟change,初始化不执行onFieldChange
+    if (isFunction(onFieldChange) && num >= 1) {
+      onFieldChange(value, form.getFieldsValue(), {
+        form: form
+      });
+    }
+    inc();
+  }, [value]);
   return _jsx("div", {
     className: _className,
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {

package/es/ProForm/components/combination/Group/propsType.d.ts

@@ -1,5 +1,6 @@
 import React from 'react';
 import { RowProps, SpaceProps } from 'antd';
+import { FormInstance } from 'antd/es/form/Form';
 import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
 export interface SpaceType extends SpaceProps {
     /**
@@ -22,4 +23,7 @@ export interface GroupProps {
     value?: any;
     id?: string;
     disabled?: boolean | (() => void);
+    onFieldChange?: (value: any[] | null, record: any, { form, }: {
+        form: FormInstance;
+    }) => any;
 }

package/es/ProForm/components/combination/Group/style/index.less

@@ -74,6 +74,9 @@
       margin-inline-start: -1px;
       border-start-start-radius: 0;
       border-end-start-radius: 0;
+      padding: 0 12px;
+      background-color: #fff;
+      cursor: default;
     }
     .pro-modal-select {
       margin-left: -1px;

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

@@ -24,7 +24,6 @@ export { default as Container } from './combination/Container';
 export { default as ProEnum } from '../../ProEnum';
 export { default as ProSelect } from '../../ProSelect';
 export { default as ProUpload } from '../../ProUpload';
-export { default as ProTreeSelect } from '../../ProTreeSelect';
 export { default as ProTreeModal } from '../../ProTreeModal';
 export { default as ProTree } from '../../ProTree';
 export { default as FormFooter } from './FormFooter';

package/es/ProForm/components/index.js

@@ -26,7 +26,7 @@ export { default as Container } from './combination/Container';
 export { default as ProEnum } from '../../ProEnum';
 export { default as ProSelect } from '../../ProSelect';
 export { default as ProUpload } from '../../ProUpload';
-export { default as ProTreeSelect } from '../../ProTreeSelect';
+// export { default as ProTreeSelect } from '../../ProTreeSelect';
 export { default as ProTreeModal } from '../../ProTreeModal';
 export { default as ProTree } from '../../ProTree';
 // footer组件

package/es/ProForm/components/render/ConfirmWrapper.js

@@ -8,7 +8,8 @@ import { isFunction, isObject } from 'lodash';
 import React from 'react';
 import ProForm from '../../index';
 var defaultConfirmProps = {
-  title: '点击确定完成修改'
+  title: '操作提示',
+  content: '确定要修改该字段吗？'
 };
 var ConfirmWrapper = function ConfirmWrapper(props) {
   var onChange = props.onChange,
@@ -22,7 +23,8 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
       other[_key - 1] = arguments[_key];
     }
     var _value = (value === null || value === void 0 ? void 0 : value.target) ? value.target.value : value;
-    if (confirm === true) {
+    var confirmProps = isFunction(confirm) ? confirm(form.getFieldsValue()) : confirm;
+    if (confirmProps === true) {
       _Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
         onOk: function onOk() {
           return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
@@ -30,28 +32,18 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
       }));
       return;
     }
-    if (isFunction(confirm)) {
-      var confirmProps = isFunction(confirm) && confirm(form.getFieldsValue());
-      if (confirmProps === true) {
-        _Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
-          onOk: function onOk() {
-            return onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
-          }
-        }));
-        return;
-      }
-      if (isObject(confirmProps)) {
-        _Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, defaultConfirmProps), confirmProps), {}, {
-          onOk: function onOk() {
-            for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-              arg[_key2] = arguments[_key2];
-            }
-            confirmProps === null || confirmProps === void 0 ? void 0 : confirmProps.onOk.apply(confirmProps, arg);
-            onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
+    if (isObject(confirmProps)) {
+      _Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, defaultConfirmProps), confirmProps), {}, {
+        onOk: function onOk() {
+          var _confirmProps$onOk;
+          for (var _len2 = arguments.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+            arg[_key2] = arguments[_key2];
           }
-        }));
-        return;
-      }
+          (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call.apply(_confirmProps$onOk, [confirmProps].concat(arg));
+          onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
+        }
+      }));
+      return;
     }
     onChange === null || onChange === void 0 ? void 0 : onChange.apply(void 0, [_value].concat(other));
   };

package/es/ProForm/components/render/Render.js

@@ -24,7 +24,7 @@ import classNames from 'classnames';
 import { ReactSVG } from 'react-svg';
 import { isFunction, isString, omit } from 'lodash';
 import useShouldUpdate from '../../utils/useShouldUpdate';
-import { isTrim, isUpperCase, findOptionByValue } from '../../utils/index';
+import { isTrim, isUpperCase, findOptionByValue, parseNamePath } from '../../utils/index';
 import { useProConfig } from '../../../ProConfigProvider';
 import transformNames from '../../utils/transformNames';
 import valueTypeMap from '../../utils/valueType';
@@ -34,7 +34,7 @@ import useRules from '../../utils/useRules';
 import ConfirmWrapper from './ConfirmWrapper';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
-  var _ref2, _otherProps$names2;
+  var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
   var component = props.component,
     originComponent = props.originComponent,
     _props$formItemProps = props.formItemProps,
@@ -53,7 +53,8 @@ var Render = function Render(props) {
     equalWith = props.equalWith,
     requiredOnView = props.requiredOnView,
     originalTip = props.originalTip,
-    confirm = props.confirm;
+    confirm = props.confirm,
+    globalControl = props.globalControl;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -169,8 +170,12 @@ var Render = function Render(props) {
   }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
-  // 优先级 column.disabled > fieldProps.disabled > formDisabled
-  var lastDisabled = (_ref2 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : formDisabled;
+  /**
+   * globalControl 全局控制优先
+   * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
+   * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 >  全局【formDisabled】
+   */
+  var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
   /**
    * 最新fieldProps: 更新后的组件Props
    */
@@ -198,8 +203,8 @@ var Render = function Render(props) {
   var functionArgs = function functionArgs(args) {
     var _otherFormItemProps$n;
     var _args = _toConsumableArray(args);
-    var _ref3 = otherProps || {},
-      valueType = _ref3.valueType;
+    var _ref6 = otherProps || {},
+      valueType = _ref6.valueType;
     _args[1] = form.getFieldsValue();
     _args[2] = {
       form: form
@@ -260,12 +265,13 @@ var Render = function Render(props) {
     // Group默认校验, 延时与重新setFieldValue，为了解决校验值未同步最新的问题,
     if (formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames) {
       setTimeout(function () {
-        form.setFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames, form.getFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames));
-        form.validateFields();
+        var namePath = parseNamePath(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames);
+        form.setFieldValue(formItemProps === null || formItemProps === void 0 ? void 0 : formItemProps.parentNames, form.getFieldValue(namePath));
+        form.validateFields(namePath);
       }, 60);
     }
     // ProTreeSelect返回option
-    if (['ProTreeSelect', 'ProTree'].includes(type)) {
+    if (['ProTree'].includes(type)) {
       var _args2, _args2$;
       _args[2].option = findOptionByValue(lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.dataSource, (_args2 = _args) === null || _args2 === void 0 ? void 0 : (_args2$ = _args2[0]) === null || _args2$ === void 0 ? void 0 : _args2$[0]);
     }
@@ -275,7 +281,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _len2,
         args,
         _key2,
@@ -302,12 +308,14 @@ var Render = function Render(props) {
       }, _callee);
     }));
     return function handleBlur() {
-      return _ref4.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var renderItem = function renderItem() {
+    // 移除多余字段，group保留onFieldChange
+    var lastComponentPropsFilter = type === 'Group' ? ['disabledStrictly'] : ['onFieldChange', 'disabledStrictly'];
     // 表单渲染 start
-    var childProps = _objectSpread(_objectSpread(_objectSpread({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), omit(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
+    var childProps = _objectSpread(_objectSpread(_objectSpread({}, AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props), omit(lastComponentProps, lastComponentPropsFilter)), {}, {
       // @ts-ignore
       otherProps: otherProps,
       onChange: handleChange,
@@ -350,7 +358,7 @@ var Render = function Render(props) {
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? ( /*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
+    var child = /*#__PURE__*/React.isValidElement(AutoComponent) ? ( /*#__PURE__*/React.cloneElement(AutoComponent, childProps)) : _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, lastComponentPropsFilter)), {}, {
       otherProps: _objectSpread(_objectSpread({}, otherProps), {}, {
         show: show,
         disabled: lastDisabled,
@@ -377,7 +385,7 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
@@ -385,7 +393,7 @@ var Render = function Render(props) {
         name: _otherFormItemProps.name
       }, omit(_otherFormItemProps, ['rules'])), {}, {
         children: function children(fields, operation, meta) {
-          return _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, ['onFieldChange', 'disabledStrictly'])), {}, {
+          return _jsx(AutoComponent, _objectSpread(_objectSpread({}, omit(lastComponentProps, lastComponentPropsFilter)), {}, {
             otherProps: otherProps,
             fields: fields,
             operation: operation,

package/es/ProForm/components/render/RenderFields.d.ts

@@ -18,6 +18,7 @@ interface Props<T = any> {
     requiredOnView?: boolean;
     required?: boolean | (() => boolean);
     originalTip?: boolean;
+    globalControl?: boolean;
 }
 declare const RenderFields: React.FC<Props>;
 export default RenderFields;

package/es/ProForm/components/render/RenderFields.js

@@ -25,7 +25,8 @@ var RenderFields = function RenderFields(props) {
     outerClearNotShow = props.clearNotShow,
     requiredOnView = props.requiredOnView,
     required = props.required,
-    originalTip = props.originalTip;
+    originalTip = props.originalTip,
+    globalControl = props.globalControl;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
     return Array.isArray(item.hiddenNames);
@@ -204,7 +205,8 @@ var RenderFields = function RenderFields(props) {
         originalValues: originalValues,
         equalWith: equalWith,
         requiredOnView: requiredOnView,
-        originalTip: originalTip
+        originalTip: originalTip,
+        globalControl: globalControl
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
   });

package/es/ProForm/components/render/propsType.d.ts

@@ -26,7 +26,6 @@ import { Props as ProRangeLimitProps } from '../combination/ProRangeLimit';
 import { CheckboxPropsMap, ProEnum, PropProSelectsMap, PropRadioPropsMap } from '../../../ProEnum/propsType';
 import { PropSelectProps as ProSelectProps } from '../../../ProSelect/propsType';
 import { ProEditTableProps } from '../../../ProEditTable/propsType';
-import { PropTreeSelectProps } from '../../../ProTreeSelect/propsType';
 import { ProTreeModalProps } from '../../../ProTreeModal/propsType';
 import { ProUploadProps } from '../../../ProUpload/propsType';
 import { ProTreeProps } from '../../../ProTree/propsType';
@@ -150,9 +149,6 @@ export type ColumnPropsMap<Values = any, T = 'ProForm'> = {
 } | {
     type?: 'ProEditTable';
     fieldProps?: FieldProps<ProEditTableProps, Values, T>;
-} | {
-    type?: 'ProTreeSelect';
-    fieldProps?: FieldProps<PropTreeSelectProps, Values, T>;
 } | {
     type?: 'ProTreeModal';
     fieldProps?: FieldProps<ProTreeModalProps, Values, T>;
@@ -270,6 +266,7 @@ export interface RenderProps<Values = any> {
     originalValues?: Values;
     requiredOnView?: boolean;
     confirm?: ProFormColumnProps['confirm'];
+    globalControl?: boolean;
     [name: string]: any;
 }
 export {};

package/es/ProForm/index.js

@@ -12,13 +12,13 @@ import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalTip", "formKey"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalTip", "formKey", "globalControl"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
 import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
 import { isObject, isString, merge } from 'lodash';
-import { FormFooter, InputRange, ProAddress, ProAddressBar, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeSelect, ProTreeModal, ProTree, EnumSelect } from './components';
+import { FormFooter, InputRange, ProAddress, ProAddressBar, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from './components';
 import RenderFields from './components/render/RenderFields';
 import { useProConfig, useContextForms } from '../ProConfigProvider';
 import { getLayout, splitNameStr, useControlled, initialValuesToNames } from './utils/index';
@@ -66,6 +66,7 @@ var ProForm = function ProForm(props, ref) {
     _props$originalTip = props.originalTip,
     originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
     formKey = props.formKey,
+    globalControl = props.globalControl,
     otherProps = _objectWithoutProperties(props, _excluded);
   var _useProConfig = useProConfig(),
     state = _useProConfig.state,
@@ -253,7 +254,8 @@ var ProForm = function ProForm(props, ref) {
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        originalTip: originalTip
+        originalTip: originalTip,
+        globalControl: globalControl
       }), children, footerRender()]
     }))
   }));
@@ -318,7 +320,7 @@ ProFormForward.ProNumberRange = ProNumberRange;
 ProFormForward.ProModalSelect = ProModalSelect;
 ProFormForward.ProTimeLimit = ProTimeLimit;
 ProFormForward.ProUpload = ProUpload;
-ProFormForward.ProTreeSelect = ProTreeSelect;
+// ProFormForward.ProTreeSelect = ProTreeSelect;
 ProFormForward.ProTreeModal = ProTreeModal;
 ProFormForward.ProTree = ProTree;
 // 待废弃

package/es/ProForm/propsType.d.ts

@@ -42,6 +42,8 @@ export interface ProFormOtherProps {
 }
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;
+    /** 全局控制优先 */
+    globalControl?: boolean;
     mode?: ModeEnum;
     formKey?: string;
     /** 是否查看 */

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

@@ -88,4 +88,6 @@ export declare const findOptionByValue: (treeData: any[], value: string | number
  * 对比依赖列表中的 值是否变更
  */
 export declare const equalDependencies: (dependencies: any, prevValues: any, currentValues: any) => any;
+/** 解析namePath */
+export declare const parseNamePath: (input: string) => any;
 export {};

package/es/ProForm/utils/index.js

@@ -4,19 +4,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useState } from 'react';
-import _, { isObject, isFunction, cloneDeep, get, set, omit } from 'lodash';
-var colProps = {
-  search: {
-    span: 8
-  },
-  drawer: {
-    span: 12
-  }
-};
-var footer = {
-  search: false,
-  drawer: false
-};
+import _, { isObject, isFunction, cloneDeep, get, set, omit, isNaN } from 'lodash';
 export var getLayout = function getLayout(params) {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
@@ -420,4 +408,17 @@ export var equalDependencies = function equalDependencies(dependencies, prevValu
     });
   }
   return false;
+};
+/** 解析namePath */
+export var parseNamePath = function parseNamePath(input) {
+  var parts = input.split('_');
+  if (parts.every(function (item) {
+    return isNaN(Number(item));
+  })) {
+    return [input];
+  }
+  var result = parts.map(function (item) {
+    return isNaN(Number(item)) ? item : Number(item);
+  });
+  return [result];
 };

package/es/ProIcon/config/index.d.ts

@@ -0,0 +1,4 @@
+export declare const iconMap: {
+    type: string;
+    text: string;
+}[];