@zgfe/business-lib 1.2.35 → 1.2.38

package/es/chart/index.js

@@ -42,7 +42,8 @@ var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
     autoHeight = props.autoHeight,
     isHideLegend = props.isHideLegend,
     tooltipTrigger = props.tooltipTrigger,
-    muit_yAxis = props.muit_yAxis;
+    muit_yAxis = props.muit_yAxis,
+    unContainLabel = props.unContainLabel;
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     chartOption = _useState2[0],
@@ -117,6 +118,11 @@ var BizChart = /*#__PURE__*/React.forwardRef(function (props, ref) {
         eOption.grid.right = '1%';
         eOption.grid.left = '1%';
       }
+      if (type === 'muit_y' && unContainLabel) {
+        eOption.grid.right = '130';
+        eOption.grid.left = '50';
+        eOption.grid.containLabel = false;
+      }
     } else if (type === 'map') {
       var series = isCity ? citySeries(data) : provinceSeries(data);
       var maxMin = maxMinValue(series[0]);

package/es/chart/types.d.ts

@@ -55,5 +55,6 @@ export declare namespace ChartTypes {
         isHideLegend?: boolean;
         tooltipTrigger?: string;
         muit_yAxis?: {}[];
+        unContainLabel?: boolean;
     }
 }

package/es/eventSelector/demo/index.js

@@ -21,6 +21,7 @@ var EventDemo = function EventDemo() {
     console.log('选中值', data);
   };
   return /*#__PURE__*/React.createElement(InnerDemo, null, /*#__PURE__*/React.createElement(BizEventSelector, {
+    enableDelete: true,
     showAllEvent: false,
     showBuiltInTarget: false,
     popupContainer: false,

package/es/eventSelector/index.js

@@ -13,6 +13,7 @@ import './styles/index.less';
 import { BuiltinIndicators } from '../constants/common';
 import _ from 'lodash';
 import useChanged from '../hooks/useChanged';
+import BizTargetOptionIcon from '../targetSelector/optionIcon';
 export var classPrefix = 'biz-event-select';
 var BizEventSelector = function BizEventSelector(props) {
   var alias = props.alias,
@@ -21,7 +22,8 @@ var BizEventSelector = function BizEventSelector(props) {
     border = props.border,
     theme = props.theme,
     defaultSelectAble = props.defaultSelectAble,
-    disableVirtualEventShow = props.disableVirtualEventShow;
+    disableVirtualEventShow = props.disableVirtualEventShow,
+    enableDelete = props.enableDelete;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     currentValue = _useState2[0],
@@ -60,6 +62,9 @@ var BizEventSelector = function BizEventSelector(props) {
       setCurrentValue(data);
     }
   }, props.value);
+  function onDelete(e) {
+    if (props.onDelete) props.onDelete(currentValue, e);
+  }
   var getValue = function getValue(param) {
     var res = {};
     var allEvents = props.showBuiltInTarget ? eventGroupList === null || eventGroupList === void 0 ? void 0 : eventGroupList.concat(BuiltinIndicators) : eventGroupList;
@@ -145,7 +150,13 @@ var BizEventSelector = function BizEventSelector(props) {
   }, [visible]);
   return /*#__PURE__*/React.createElement("div", {
     className: [classPrefix, border ? 'border' : ''].join(' ')
-  }, /*#__PURE__*/React.createElement(Dropdown, {
+  }, enableDelete ? /*#__PURE__*/React.createElement(BizTargetOptionIcon, {
+    name: "delete",
+    icon: "qingchu",
+    title: "\u5220\u9664",
+    enabled: true,
+    onClick: onDelete
+  }) : null, /*#__PURE__*/React.createElement(Dropdown, {
     dropdownRender: function dropdownRender() {
       return /*#__PURE__*/React.createElement(EventListPanel, {
         value: props.multiple ? checkedEventList : currentValue,

package/es/eventSelector/styles/index.less

@@ -3,6 +3,22 @@
 .biz-event-select {
   position: relative;
   border-radius: 4px;
+  .__select-handle();
+
+  &:hover {
+    .biz-target-select-option-icon {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      float: right;
+      margin-top: 4px;
+    }
+  }
+
+  .biz-event-select-handle {
+    border: none !important;
+  }
+
   &.border {
     .biz-event-select-handle {
       .__select-handle();

package/es/eventSelector/types.d.ts

@@ -31,12 +31,14 @@ export declare namespace EventSelectTypes {
         placeholder?: string;
         showAllEvent?: boolean;
         popupContainer?: boolean;
+        enableDelete?: boolean;
         onVisibleChange?: (visible: boolean) => void;
         border?: boolean;
         theme?: string;
         size?: SizeType;
         destroyPopupOnHide?: boolean;
         onChange?: (val: Value | AnalysisEvent[]) => void;
+        onDelete?: (val: Value | AnalysisEvent[] | undefined, e: Value | AnalysisEvent[]) => void;
         filter?: (evt: AnalysisEvent) => boolean;
         disableVirtualEventShow?: boolean;
     }

package/es/userCondition/util.js

@@ -47,14 +47,14 @@ export function buildCondition(type, labelCreateType) {
           operator: 'relative',
           values: ['30', '0']
         },
-        placeholder: labelCreateType === LabelCreateType.lostUser ? '进入App' : ''
+        placeholder: labelCreateType === LabelCreateType.lostUser ? '如：进入App' : ''
       };
     case 'prop':
       return {
         eventId: undefined,
         attrs: [{
           attrId: 0,
-          placeholder: labelCreateType === LabelCreateType.riskLevel ? '风险等级' : ''
+          placeholder: labelCreateType === LabelCreateType.riskLevel ? '如：风险等级' : ''
         }]
       };
     case 'tag':

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.35",
+    "version": "1.2.38",
     "module": "es/index.js",
     "typings": "es/index.d.ts",
     "files": [
@@ -55,7 +55,7 @@
         "react": "^16.12.0 || ^17.0.0",
         "yorkie": "^2.0.0"
     },
-    "gitHead": "b7e470b4977dbe869688a24edf0cf9cc7389bbec",
+    "gitHead": "3195eace807d40555519a3223cfa3748498862e2",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }