@zgfe/business-lib 1.1.67-beta.4 → 1.1.67-beta.6

package/es/assets/styles/resetAntd.less

@@ -534,7 +534,8 @@
 }
 
 //dropdown
-.ant-dropdown {
+.ant-dropdown,
+.ant-dropdown-menu-submenu-popup {
   z-index: 6666 !important;
 }
 //message

package/es/eventSelector/index.js

@@ -28,7 +28,8 @@ var BizEventSelector = function BizEventSelector(props) {
     visible = _useState4[0],
     setVisible = _useState4[1];
   var _useContext = useContext(BizGlobalDataContext),
-    eventGroupList = _useContext.eventGroupList;
+    _useContext$eventGrou = _useContext.eventGroupList,
+    eventGroupList = _useContext$eventGrou === void 0 ? [] : _useContext$eventGrou;
   var selectId = (Math.random() + 10).toString();
   useEffect(function () {
     if (!props.defaultValue) return;

package/es/formulaTarget/components/formula/util.js

@@ -5,7 +5,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import _ from 'lodash';
-import { normalOptions } from '../../../targetConditionGroup/data/operates';
+import { attrOptions, normalOptions } from '../../../targetConditionGroup/data/operates';
 import { util } from '../../../utils';
 import { formulaDimensions, formulaList } from './data';
 export var newItem = {
@@ -168,7 +168,7 @@ export var validator = function validator(type, condition) {
 };
 export var getDimension = function getDimension(data, eId, eventGroupList) {
   var name = '';
-  normalOptions.forEach(function (item) {
+  normalOptions.concat(attrOptions).forEach(function (item) {
     if (item.value === data.analysisIndex) {
       name = item.label;
     }
@@ -178,8 +178,8 @@ export var getDimension = function getDimension(data, eId, eventGroupList) {
       group.eventList.forEach(function (event) {
         if (event.id === eId) {
           event.attrList.forEach(function (attr) {
-            if (String(attr.id) === data.analysisAttr) {
-              name += attr.alias || attr.label;
+            if (attr.label === data.analysisAttr) {
+              name = attr.label + name;
             }
           });
           return;

package/es/formulaTarget/index.js

@@ -96,25 +96,37 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
       setOpen(true);
       return;
     }
-    props.onChange && props.onChange(condition);
+    props.onChange && props.onChange(_objectSpread(_objectSpread({}, condition), {}, {
+      alias: condition.eventName
+    }));
   };
   var onDelete = function onDelete(e) {
     e.stopPropagation();
-    if (!props.enableDelete && !contentChange) return;
+    if (!props.enableDelete) {
+      if (!props.value || !props.value.customCondition || !props.value.customCondition.length) {
+        props.onDelete && props.onDelete();
+      } else if (contentChange) {
+        reset();
+      }
+      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;
+      if (!props.enableDelete && !contentChange) return;
       props.onDelete && props.onDelete();
     } else {
-      setCondition(props.value || defaultValue);
-      setTimeout(function () {
-        formulaRef.current.reset();
-      }, 0);
+      reset();
     }
   };
+  var reset = function reset() {
+    setCondition(props.value || defaultValue);
+    setTimeout(function () {
+      formulaRef.current.reset();
+    }, 0);
+  };
   var onChange = function onChange(customCondition, formula, resultFormat) {
     setCondition(function (value) {
       return _objectSpread(_objectSpread({}, value), {}, {
@@ -127,6 +139,12 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
   var onClose = function onClose() {
     setOpen(false);
   };
+  var handleOpenChange = function handleOpenChange(newOpen) {
+    if (!newOpen) {
+      setOpen(newOpen);
+      return;
+    }
+  };
   return /*#__PURE__*/React.createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/React.createElement("div", {
@@ -159,8 +177,11 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
   }), contentChange ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Popconfirm, {
     title: errorMsg,
     open: open,
+    okText: "\u786E\u5B9A",
+    cancelText: "\u53D6\u6D88",
     onCancel: onClose,
-    onConfirm: onClose
+    onConfirm: onClose,
+    onOpenChange: handleOpenChange
   }, /*#__PURE__*/React.createElement("div", {
     className: "primary",
     onClick: onSave

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/business-lib",
-  "version": "1.1.67-beta.4",
+  "version": "1.1.67-beta.6",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -60,5 +60,5 @@
     "react": "^16.12.0 || ^17.0.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "69f43c91e600c8c965e1f83da23b9e3d96e4b490"
+  "gitHead": "ddc4e5fd47df814c4b228d766969fdfb4433d201"
 }