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

package/es/ProEnum/components/Group.d.ts

@@ -2,6 +2,7 @@ import { ProEnum } from '../propsType';
 interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
     fieldValue: string;
     fieldLabel: string;
+    disabled?: boolean;
 }
 declare const Group: (props: Props) => JSX.Element;
 export default Group;

package/es/ProEnum/components/Group.js

@@ -8,7 +8,8 @@ var Group = function Group(props) {
     onChange = props.onChange,
     dataSource = props.dataSource,
     fieldValue = props.fieldValue,
-    fieldLabel = props.fieldLabel;
+    fieldLabel = props.fieldLabel,
+    disabled = props.disabled;
   var idx = useRef(-1);
   var _useSetState = useSetState({
       checked: ''
@@ -20,13 +21,25 @@ var Group = function Group(props) {
     setState({
       checked: value
     });
-  }, [value]);
-  var handleClick = function handleClick(val, index) {
-    setState({
-      checked: val
+    var index = dataSource.findIndex(function (item) {
+      return item[fieldValue] === value;
     });
     idx.current = index;
-    onChange === null || onChange === void 0 ? void 0 : onChange(val);
+  }, [value]);
+  var handleClick = function handleClick(val, index) {
+    if (state.checked === val) {
+      setState({
+        checked: ''
+      });
+      onChange === null || onChange === void 0 ? void 0 : onChange('');
+      idx.current = -1;
+    } else {
+      setState({
+        checked: val
+      });
+      idx.current = index;
+      onChange === null || onChange === void 0 ? void 0 : onChange(val);
+    }
   };
   if (dataSource.length === 0) {
     return _jsx("span", {
@@ -34,11 +47,11 @@ var Group = function Group(props) {
     });
   }
   return _jsx("div", {
-    className: "pro-enum-group-root",
+    className: classNames('pro-enum-group-root', disabled ? 'pro-enum-group-root-disabled' : ''),
     children: dataSource.map(function (item, index) {
       return _jsx("div", {
         onClick: function onClick() {
-          if (!item.disabled) {
+          if (!item.disabled && !disabled) {
             handleClick(item[fieldValue], index);
           }
         },

package/es/ProEnum/index.js

@@ -41,7 +41,8 @@ var ProEnum = function ProEnum(props) {
     enumProps = _objectWithoutProperties(props, _excluded);
   var _ref = otherProps || {},
     isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty;
+    viewEmpty = _ref.viewEmpty,
+    disabled = _ref.disabled;
   var _ref2 = useProConfig('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -212,7 +213,8 @@ var ProEnum = function ProEnum(props) {
           onChange: onChange,
           fieldLabel: label,
           fieldValue: fieldValue,
-          dataSource: list
+          dataSource: list,
+          disabled: disabled
         });
       default:
         return null;

package/es/ProEnum/style/index.less

@@ -7,6 +7,12 @@
     flex-direction: row;
     flex-wrap: wrap;
   }
+  &-group-root-disabled {
+    color: rgba(0, 0, 0, 0.25);
+    .pro-enum-group-item{
+      cursor: not-allowed !important;
+    }
+  }
   &-tag-item {
     display: flex;
     align-items: center;
@@ -71,8 +77,8 @@
 
     .pro-enum-group-item-selected {
       color: var(--zaui-brand);
-      border: 1px solid var(--zaui-brand);
       background: #fff;
+      border: 1px solid var(--zaui-brand);
       &::after {
         background: transparent;
       }

package/lib/ProEnum/components/Group.d.ts

@@ -2,6 +2,7 @@ import { ProEnum } from '../propsType';
 interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
     fieldValue: string;
     fieldLabel: string;
+    disabled?: boolean;
 }
 declare const Group: (props: Props) => JSX.Element;
 export default Group;

package/lib/ProEnum/components/Group.js

@@ -15,7 +15,8 @@ var Group = function Group(props) {
     onChange = props.onChange,
     dataSource = props.dataSource,
     fieldValue = props.fieldValue,
-    fieldLabel = props.fieldLabel;
+    fieldLabel = props.fieldLabel,
+    disabled = props.disabled;
   var idx = (0, _react.useRef)(-1);
   var _useSetState = (0, _ahooks.useSetState)({
       checked: ''
@@ -27,13 +28,25 @@ var Group = function Group(props) {
     setState({
       checked: value
     });
-  }, [value]);
-  var handleClick = function handleClick(val, index) {
-    setState({
-      checked: val
+    var index = dataSource.findIndex(function (item) {
+      return item[fieldValue] === value;
     });
     idx.current = index;
-    onChange === null || onChange === void 0 ? void 0 : onChange(val);
+  }, [value]);
+  var handleClick = function handleClick(val, index) {
+    if (state.checked === val) {
+      setState({
+        checked: ''
+      });
+      onChange === null || onChange === void 0 ? void 0 : onChange('');
+      idx.current = -1;
+    } else {
+      setState({
+        checked: val
+      });
+      idx.current = index;
+      onChange === null || onChange === void 0 ? void 0 : onChange(val);
+    }
   };
   if (dataSource.length === 0) {
     return (0, _jsxRuntime.jsx)("span", {
@@ -41,11 +54,11 @@ var Group = function Group(props) {
     });
   }
   return (0, _jsxRuntime.jsx)("div", {
-    className: "pro-enum-group-root",
+    className: (0, _classnames.default)('pro-enum-group-root', disabled ? 'pro-enum-group-root-disabled' : ''),
     children: dataSource.map(function (item, index) {
       return (0, _jsxRuntime.jsx)("div", {
         onClick: function onClick() {
-          if (!item.disabled) {
+          if (!item.disabled && !disabled) {
             handleClick(item[fieldValue], index);
           }
         },

package/lib/ProEnum/index.js

@@ -42,7 +42,8 @@ var ProEnum = function ProEnum(props) {
     enumProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = otherProps || {},
     isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty;
+    viewEmpty = _ref.viewEmpty,
+    disabled = _ref.disabled;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -213,7 +214,8 @@ var ProEnum = function ProEnum(props) {
           onChange: onChange,
           fieldLabel: label,
           fieldValue: fieldValue,
-          dataSource: list
+          dataSource: list,
+          disabled: disabled
         });
       default:
         return null;

package/lib/ProEnum/style/index.less

@@ -7,6 +7,12 @@
     flex-direction: row;
     flex-wrap: wrap;
   }
+  &-group-root-disabled {
+    color: rgba(0, 0, 0, 0.25);
+    .pro-enum-group-item{
+      cursor: not-allowed !important;
+    }
+  }
   &-tag-item {
     display: flex;
     align-items: center;
@@ -71,8 +77,8 @@
 
     .pro-enum-group-item-selected {
       color: var(--zaui-brand);
-      border: 1px solid var(--zaui-brand);
       background: #fff;
+      border: 1px solid var(--zaui-brand);
       &::after {
         background: transparent;
       }

package/package.json

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