@zgfe/business-lib 1.1.67-beta.2 → 1.1.67-beta.3

package/es/formulaTarget/index.js

@@ -106,11 +106,13 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
   };
   var onDelete = function onDelete(e) {
     e.stopPropagation();
+    if (!props.enableDelete) return;
     props.onDelete && props.onDelete();
   };
   var onCancel = function onCancel(e) {
     e.stopPropagation();
     if (!props.value || !props.value.customCondition || !props.value.customCondition.length) {
+      if (!props.enableDelete) return;
       props.onDelete && props.onDelete();
     } else {
       var _props$value3;
@@ -179,7 +181,7 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
       return onCancel(e);
     }
   }, "\u53D6\u6D88"), /*#__PURE__*/React.createElement("div", {
-    className: "delete",
+    className: "delete".concat(!props.enableDelete ? ' disable' : ''),
     onClick: function onClick(e) {
       return onDelete(e);
     }
@@ -193,4 +195,7 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
     onChange: onChange
   }));
 };
+BizFormulaTarget.defaultProps = {
+  enableDelete: true
+};
 export default BizFormulaTarget;

package/es/formulaTarget/styles/index.less

@@ -54,7 +54,10 @@
         margin-left: 8px;
         color: @primary-color;
       }
-      .delete:hover {
+      .disable {
+        cursor: not-allowed;
+      }
+      .delete:not(.disable):hover {
         color: @error-color;
       }
     }

package/es/formulaTarget/types.d.ts

@@ -3,6 +3,7 @@ export declare namespace BizFormulaTargetTypes {
     interface Props {
         value?: Value;
         disableNames?: string[];
+        enableDelete?: boolean;
         onChange?: (data: Value) => void;
         onDelete?: () => void;
     }

package/es/targetConditionGroup/demo/group.js

@@ -41,6 +41,10 @@ export default (function () {
     _useState6 = _slicedToArray(_useState5, 2),
     enableAdd = _useState6[0],
     setEnableAdd = _useState6[1];
+  var _useState7 = useState(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    enableDelete = _useState8[0],
+    setEnableDelete = _useState8[1];
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
@@ -55,6 +59,7 @@ export default (function () {
   useEffect(function () {
     var flag = true,
       show = true;
+    console.log(target.targets, target.targets.length > 1);
     if ((target === null || target === void 0 ? void 0 : target.targets) && target.targets.length > 0) {
       if (target.targets[0] && target.targets[0].eventId === -100) {
         flag = false;
@@ -63,6 +68,7 @@ export default (function () {
         show = false;
       }
     }
+    setEnableDelete(target.targets.length > 1);
     setShowOverview(show);
     setEnableAdd(flag);
   }, [target === null || target === void 0 ? void 0 : target.targets]);
@@ -87,14 +93,9 @@ export default (function () {
       return /*#__PURE__*/React.createElement(Form.Item, _objectSpread(_objectSpread({}, field), {}, {
         key: field.key
       }), /*#__PURE__*/React.createElement(BizTargetCondition, {
+        enableDelete: enableDelete,
         onDelete: function onDelete() {
-          if (fields.length > 1) {
-            remove(field.name);
-          } else {
-            form.setFieldsValue({
-              targets: [initValue]
-            });
-          }
+          remove(field.name);
         }
       }, /*#__PURE__*/React.createElement(BizEventSelector, {
         showAllEvent: showOverview,

package/es/targetConditionGroup/index.js

@@ -44,7 +44,7 @@ var BizTargetCondition = function BizTargetCondition(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     enableAdd = _useState8[0],
     setEnableAdd = _useState8[1];
-  var _useState9 = useState(true),
+  var _useState9 = useState(props.enableDelete),
     _useState10 = _slicedToArray(_useState9, 2),
     enableDelete = _useState10[0],
     setEnableDelete = _useState10[1];
@@ -90,7 +90,9 @@ var BizTargetCondition = function BizTargetCondition(props) {
         canAdd = count < max;
       }
       setEnableAdd(canAdd);
-      setEnableDelete(canDelete);
+      if (props.enableDelete !== undefined) {
+        setEnableDelete(canDelete);
+      }
     } else {
       setEnableAdd(false);
     }
@@ -219,7 +221,7 @@ var BizTargetCondition = function BizTargetCondition(props) {
     }, 0);
   };
   var onDelete = function onDelete() {
-    if (!enableDelete) return;
+    if (!(props.enableDelete !== undefined ? props.enableDelete : enableDelete)) return;
     if (props.onDelete) props.onDelete();
   };
   return /*#__PURE__*/React.createElement("div", {
@@ -246,7 +248,7 @@ var BizTargetCondition = function BizTargetCondition(props) {
     type: "shaixuan",
     onClick: onAdd
   })), /*#__PURE__*/React.createElement(IconFont, {
-    className: "".concat(classPrefix, "-icon delete ").concat(!enableDelete ? 'disabled' : ''),
+    className: "".concat(classPrefix, "-icon delete ").concat(!(props.enableDelete !== undefined ? props.enableDelete : enableDelete) ? 'disabled' : ''),
     type: "qingchu",
     onClick: onDelete
   })), (filters || isAdd) && /*#__PURE__*/React.createElement(BizAttrConditionGroup, {

package/es/targetConditionGroup/types.d.ts

@@ -28,6 +28,7 @@ export declare namespace TargetConditionTypes {
         max?: number;
         children: ReactNode;
         onlyAnd?: boolean;
+        enableDelete?: boolean;
         onChange?: (value: Value) => void;
         onDelete?: (value?: Value) => void;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.67-beta.2",
+  "version": "1.1.67-beta.3",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "4544eca127a8c4b92ac78e3911a53ae6b33e8473"
+  "gitHead": "60b424a819cbf1465a05510288a93b9cda0b67d0"
 }