@zat-design/sisyphus-react 3.4.11-beta.12 → 3.4.11-beta.13

package/es/ProEnum/index.js

@@ -166,7 +166,7 @@ var ProEnum = function ProEnum(props) {
     }
     switch (type) {
       case 'ProSelect':
-        return _jsx(ProSelect, _objectSpread(_objectSpread({}, enumProps), {}, {
+        return _jsx(ProSelect, _objectSpread(_objectSpread({}, omit(enumProps, ['showCodeName'])), {}, {
           otherProps: otherProps,
           dataSource: list,
           fieldNames: {
@@ -177,7 +177,7 @@ var ProEnum = function ProEnum(props) {
           onChange: onChange
         }));
       case 'Radio':
-        return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
+        return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
@@ -190,7 +190,7 @@ var ProEnum = function ProEnum(props) {
           })
         }));
       case 'Checkbox':
-        return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames'])), {}, {
+        return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
@@ -211,7 +211,7 @@ var ProEnum = function ProEnum(props) {
           dataSource: list
         });
       case 'Group':
-        return _jsx(ProEnumGroup, _objectSpread(_objectSpread({}, enumProps), {}, {
+        return _jsx(ProEnumGroup, _objectSpread(_objectSpread({}, omit(enumProps, ['showCodeName'])), {}, {
           value: value,
           onChange: onChange,
           fieldLabel: label,

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

@@ -49,12 +49,12 @@ var getViewLabel = function getViewLabel(_ref) {
   return viewLabel;
 };
 var ProCascader = function ProCascader(props) {
-  var _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
+  var _props$otherProps, _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
   var _ref2 = useProConfig('ProAddressBar') || {},
     configDetailMaxLength = _ref2.detailMaxLength,
     configEnumCode = _ref2.enumCode,
     configCode = _ref2.code;
-  var isAddressMode = (props === null || props === void 0 ? void 0 : props.mode) === 'address';
+  var isAddressMode = (props === null || props === void 0 ? void 0 : props.mode) === 'address' || (props === null || props === void 0 ? void 0 : (_props$otherProps = props.otherProps) === null || _props$otherProps === void 0 ? void 0 : _props$otherProps.type) === 'ProAddressBar';
   var _props$className = props.className,
     className = _props$className === void 0 ? '' : _props$className,
     _props$hasDetail = props.hasDetail,

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

@@ -12,6 +12,7 @@ export { default as TimePicker } from './base/TimePicker';
 export { default as FormList } from './combination/FormList';
 export { default as ProEditTable } from '../../ProEditTable';
 export { default as ProCascader } from './combination/ProCascader';
+export { default as ProAddressBar } from './combination/ProCascader';
 export { default as ProCombination } from './combination/ProCombination';
 export { default as ProNumberRange } from './combination/ProNumberRange';
 export { default as ProModalSelect } from './combination/ProModalSelect';

package/es/ProForm/components/index.js

@@ -14,6 +14,7 @@ export { default as FormList } from './combination/FormList';
 export { default as ProEditTable } from '../../ProEditTable';
 // combination 组合组件
 export { default as ProCascader } from './combination/ProCascader';
+export { default as ProAddressBar } from './combination/ProCascader';
 export { default as ProCombination } from './combination/ProCombination';
 export { default as ProNumberRange } from './combination/ProNumberRange';
 export { default as ProModalSelect } from './combination/ProModalSelect';

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

@@ -276,7 +276,7 @@ var Render = function Render(props) {
       }, 60);
     }
     // ProTreeSelect返回option
-    if (['ProTree'].includes(type)) {
+    if (['ProTree'].includes(type) && !_args[2].option) {
       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], (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.fieldNames) || {});
     }

package/es/ProTree/components/ProTree.js

@@ -257,12 +257,15 @@ var ProTree = function ProTree(props) {
       onChange && onChange(allValue);
     } else {
       var values = checkedValues;
+      var options = state.flatTreeData.filter(function (item) {
+        return values.includes(item[fieldNameValue]);
+      });
       if (labelInValue) {
         values = state.flatTreeData.filter(function (item) {
           return values.includes(item[fieldNameValue]);
         });
       }
-      onChange && onChange(values);
+      onChange && onChange(values, options);
     }
   };
   // 该方法只有复选框，在勾中checkbox后才会走到这个方法
@@ -348,7 +351,7 @@ var ProTree = function ProTree(props) {
   /** 点击了树节点开始loading,改变自身state并将值通过onchange上传到form */
   var onSelectTreeNode = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(props, info) {
-      var values;
+      var values, options;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -372,17 +375,22 @@ var ProTree = function ProTree(props) {
               clickShowLoading: false
             });
           case 7:
+            values = props;
+            options = state.flatTreeData.filter(function (item) {
+              return values === item[fieldNameValue];
+            });
+            if (labelInValue) {
+              values = state.flatTreeData.filter(function (item) {
+                return values === item[fieldNameValue];
+              });
+            }
             if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
-              // 单选将选中节点值冒泡到form
-              values = props;
-              if (labelInValue) {
-                values = state.flatTreeData.filter(function (item) {
-                  return values === item[fieldNameValue];
-                });
-              }
-              onChange && onChange(values);
+              // 单选将选中节点值冒泡到form, 给onFieldChange添加options
+              onChange && onChange(values, options === null || options === void 0 ? void 0 : options[0]);
+            } else {
+              onChange && onChange(value, options === null || options === void 0 ? void 0 : options[0]);
             }
-          case 8:
+          case 11:
           case "end":
             return _context.stop();
         }

package/es/ProTree/propsType.d.ts

@@ -60,7 +60,7 @@ export interface ProTreeProps extends PropTreeSelectProps {
     /** 树节点文本宽度 */
     ellipseWidth?: string;
     /** value改变的回调 */
-    onChange?: (values: string[] | AllValueType) => void;
+    onChange?: (values: string[] | AllValueType, options?: object[]) => void;
     /** 点击树节点触发 */
     onSelect?: (values: string[] | AllValueType, info?: any) => any;
     /** 复选情况下点击checkbox触发,参照antd */

package/es/ProUpload/style/fileItem.less

@@ -1,4 +1,15 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-upload  {
+  .@{ant-prefix}-upload-disabled{
+    .file-action-box{
+      .file-name, .file-del{
+        color: #ccc;
+        cursor: not-allowed !important;
+      }
+    }
+  }
 
   .filelist-item-wrapper {
     .file-info-box {

package/lib/ProEnum/index.js

@@ -167,7 +167,7 @@ var ProEnum = function ProEnum(props) {
     }
     switch (type) {
       case 'ProSelect':
-        return (0, _jsxRuntime.jsx)(_ProSelect.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
+        return (0, _jsxRuntime.jsx)(_ProSelect.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['showCodeName'])), {}, {
           otherProps: otherProps,
           dataSource: list,
           fieldNames: {
@@ -178,7 +178,7 @@ var ProEnum = function ProEnum(props) {
           onChange: onChange
         }));
       case 'Radio':
-        return (0, _jsxRuntime.jsx)(_antd.Radio.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames'])), {}, {
+        return (0, _jsxRuntime.jsx)(_antd.Radio.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
@@ -191,7 +191,7 @@ var ProEnum = function ProEnum(props) {
           })
         }));
       case 'Checkbox':
-        return (0, _jsxRuntime.jsx)(_antd.Checkbox.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames'])), {}, {
+        return (0, _jsxRuntime.jsx)(_antd.Checkbox.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
@@ -212,7 +212,7 @@ var ProEnum = function ProEnum(props) {
           dataSource: list
         });
       case 'Group':
-        return (0, _jsxRuntime.jsx)(_Group.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, enumProps), {}, {
+        return (0, _jsxRuntime.jsx)(_Group.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['showCodeName'])), {}, {
           value: value,
           onChange: onChange,
           fieldLabel: label,

package/lib/ProForm/components/combination/ProCascader/index.js

@@ -49,12 +49,12 @@ var getViewLabel = function getViewLabel(_ref) {
   return viewLabel;
 };
 var ProCascader = function ProCascader(props) {
-  var _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
+  var _props$otherProps, _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProAddressBar') || {},
     configDetailMaxLength = _ref2.detailMaxLength,
     configEnumCode = _ref2.enumCode,
     configCode = _ref2.code;
-  var isAddressMode = (props === null || props === void 0 ? void 0 : props.mode) === 'address';
+  var isAddressMode = (props === null || props === void 0 ? void 0 : props.mode) === 'address' || (props === null || props === void 0 ? void 0 : (_props$otherProps = props.otherProps) === null || _props$otherProps === void 0 ? void 0 : _props$otherProps.type) === 'ProAddressBar';
   var _props$className = props.className,
     className = _props$className === void 0 ? '' : _props$className,
     _props$hasDetail = props.hasDetail,

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

@@ -12,6 +12,7 @@ export { default as TimePicker } from './base/TimePicker';
 export { default as FormList } from './combination/FormList';
 export { default as ProEditTable } from '../../ProEditTable';
 export { default as ProCascader } from './combination/ProCascader';
+export { default as ProAddressBar } from './combination/ProCascader';
 export { default as ProCombination } from './combination/ProCombination';
 export { default as ProNumberRange } from './combination/ProNumberRange';
 export { default as ProModalSelect } from './combination/ProModalSelect';

package/lib/ProForm/components/index.js

@@ -71,6 +71,12 @@ Object.defineProperty(exports, "ProAddress", {
     return _ProAddress.default;
   }
 });
+Object.defineProperty(exports, "ProAddressBar", {
+  enumerable: true,
+  get: function get() {
+    return _ProCascader.default;
+  }
+});
 Object.defineProperty(exports, "ProCascader", {
   enumerable: true,
   get: function get() {

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

@@ -274,7 +274,7 @@ var Render = function Render(props) {
       }, 60);
     }
     // ProTreeSelect返回option
-    if (['ProTree'].includes(type)) {
+    if (['ProTree'].includes(type) && !_args[2].option) {
       var _args2, _args2$;
       _args[2].option = (0, _index.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], (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.fieldNames) || {});
     }

package/lib/ProTree/components/ProTree.js

@@ -257,12 +257,15 @@ var ProTree = function ProTree(props) {
       onChange && onChange(allValue);
     } else {
       var values = checkedValues;
+      var options = state.flatTreeData.filter(function (item) {
+        return values.includes(item[fieldNameValue]);
+      });
       if (labelInValue) {
         values = state.flatTreeData.filter(function (item) {
           return values.includes(item[fieldNameValue]);
         });
       }
-      onChange && onChange(values);
+      onChange && onChange(values, options);
     }
   };
   // 该方法只有复选框，在勾中checkbox后才会走到这个方法
@@ -348,7 +351,7 @@ var ProTree = function ProTree(props) {
   /** 点击了树节点开始loading,改变自身state并将值通过onchange上传到form */
   var onSelectTreeNode = /*#__PURE__*/function () {
     var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(props, info) {
-      var values;
+      var values, options;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -372,17 +375,22 @@ var ProTree = function ProTree(props) {
               clickShowLoading: false
             });
           case 7:
+            values = props;
+            options = state.flatTreeData.filter(function (item) {
+              return values === item[fieldNameValue];
+            });
+            if (labelInValue) {
+              values = state.flatTreeData.filter(function (item) {
+                return values === item[fieldNameValue];
+              });
+            }
             if (!(other === null || other === void 0 ? void 0 : other.checkable)) {
-              // 单选将选中节点值冒泡到form
-              values = props;
-              if (labelInValue) {
-                values = state.flatTreeData.filter(function (item) {
-                  return values === item[fieldNameValue];
-                });
-              }
-              onChange && onChange(values);
+              // 单选将选中节点值冒泡到form, 给onFieldChange添加options
+              onChange && onChange(values, options === null || options === void 0 ? void 0 : options[0]);
+            } else {
+              onChange && onChange(value, options === null || options === void 0 ? void 0 : options[0]);
             }
-          case 8:
+          case 11:
           case "end":
             return _context.stop();
         }

package/lib/ProTree/propsType.d.ts

@@ -60,7 +60,7 @@ export interface ProTreeProps extends PropTreeSelectProps {
     /** 树节点文本宽度 */
     ellipseWidth?: string;
     /** value改变的回调 */
-    onChange?: (values: string[] | AllValueType) => void;
+    onChange?: (values: string[] | AllValueType, options?: object[]) => void;
     /** 点击树节点触发 */
     onSelect?: (values: string[] | AllValueType, info?: any) => any;
     /** 复选情况下点击checkbox触发,参照antd */

package/lib/ProUpload/style/fileItem.less

@@ -1,4 +1,15 @@
+@root-entry-name: 'default';
+@import (reference) '~antd/es/style/themes/index.less';
+
 .pro-upload  {
+  .@{ant-prefix}-upload-disabled{
+    .file-action-box{
+      .file-name, .file-del{
+        color: #ccc;
+        cursor: not-allowed !important;
+      }
+    }
+  }
 
   .filelist-item-wrapper {
     .file-info-box {

package/package.json

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