@zgfe/business-lib 1.2.34-tags.9 → 1.2.35-ht.0

package/es/attrCondition/useAttrCondition.d.ts

@@ -11,6 +11,5 @@ declare const useAttrCondition: (props: AttrConditionTypes.ItemProp) => {
     onChangeAttr: (attrData: AttributeSelect.Value) => void;
     onChangeOperate: (data: any) => void;
     onChangeValues: (data: any) => void;
-    placeholder: string | undefined;
 };
 export default useAttrCondition;

package/es/attrCondition/useAttrCondition.js

@@ -8,7 +8,7 @@ import { useEffect, useState } from 'react';
 import { PropCategory } from '../attributeSelector/types';
 import { getCondition } from '../attrConditions';
 var useAttrCondition = function useAttrCondition(props) {
-  var _props$defaultValue, _props$value, _props$defaultValue2, _props$value2, _props$defaultValue3, _props$value3;
+  var _props$defaultValue, _props$value, _props$defaultValue2, _props$value2;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     attr = _useState2[0],
@@ -25,9 +25,6 @@ var useAttrCondition = function useAttrCondition(props) {
     _useState8 = _slicedToArray(_useState7, 2),
     loading = _useState8[0],
     setLoading = _useState8[1];
-  var _useState9 = useState(((_props$defaultValue3 = props.defaultValue) === null || _props$defaultValue3 === void 0 ? void 0 : _props$defaultValue3.placeholder) || ((_props$value3 = props.value) === null || _props$value3 === void 0 ? void 0 : _props$value3.placeholder)),
-    _useState10 = _slicedToArray(_useState9, 1),
-    placeholder = _useState10[0];
   useEffect(function () {
     var data = props.defaultValue || props.value;
     if (data) {
@@ -103,8 +100,7 @@ var useAttrCondition = function useAttrCondition(props) {
     onDelete: onDelete,
     onChangeAttr: onChangeAttr,
     onChangeOperate: onChangeOperate,
-    onChangeValues: onChangeValues,
-    placeholder: placeholder
+    onChangeValues: onChangeValues
   };
 };
 export default useAttrCondition;

package/es/attrConditions/index.js

@@ -54,7 +54,6 @@ var BizConditionItem = function BizConditionItem(props) {
     attr = _useAttrCondition.attr,
     operate = _useAttrCondition.operate,
     values = _useAttrCondition.values,
-    placeholder = _useAttrCondition.placeholder,
     onChangeAttr = _useAttrCondition.onChangeAttr,
     onChangeOperate = _useAttrCondition.onChangeOperate,
     onChangeValues = _useAttrCondition.onChangeValues,
@@ -74,7 +73,6 @@ var BizConditionItem = function BizConditionItem(props) {
     enableEventProp: enableEventProp,
     enableUserProp: enableUserProp,
     enableEnvProp: enableEnvProp,
-    placeholder: placeholder,
     disableItemList: disableItemList,
     onChange: onChangeAttr,
     onDelete: function onDelete(_data, e) {

package/es/attrConditions/types.d.ts

@@ -23,7 +23,6 @@ export declare namespace AttrConditionTypes {
         dimensionSub?: string;
         operator?: OperateTypes;
         values?: string[];
-        placeholder?: string;
     }
     interface GroupValue {
         relation?: 'and' | 'or';

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/datePicker/utils.js

@@ -25,7 +25,7 @@ function getAbsoluteDate(unit, count, maxDate) {
     case DatePickerTypes.Unit.quarter:
       res.endDate = maxDate;
       var firstOfQuarter = new Date(maxDate.getTime() - (maxDate.getDate() - 1) * dayTime);
-      firstOfQuarter.setMonth(firstOfQuarter.getMonth() + 1 - (firstOfQuarter.getMonth() + 1) % 3 - 3 * (count - 1));
+      firstOfQuarter.setMonth(firstOfQuarter.getMonth() - firstOfQuarter.getMonth() % 3 - 3 * (count - 1));
       res.startDate = new Date(firstOfQuarter);
       break;
   }

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/conditions/eventCondition.js

@@ -107,7 +107,7 @@ var EventCondition = function EventCondition(props) {
     onChange: onEventChange,
     border: false,
     theme: "normal",
-    placeholder: (condition === null || condition === void 0 ? void 0 : condition.placeholder) ? condition.placeholder : '选择一个事件',
+    placeholder: "\u9009\u62E9\u4E00\u4E2A\u4E8B\u4EF6",
     destroyPopupOnHide: true,
     defaultSelectAble: false,
     popupContainer: false

package/es/userCondition/conditions/propCondition.js

@@ -55,8 +55,7 @@ var PropCondition = function PropCondition(props) {
     attrs.forEach(function (attr) {
       var attrId = attr.attrId,
         attrName = attr.attrName,
-        operator = attr.operator,
-        placeholder = attr.placeholder;
+        operator = attr.operator;
       if ((attrName || attrId) && operator) {
         attr.operator = transformNumberOperate(operator, false);
         list.push({
@@ -67,7 +66,6 @@ var PropCondition = function PropCondition(props) {
       } else {
         list.push({
           attr: attr,
-          placeholder: placeholder,
           id: Math.random()
         });
       }
@@ -140,12 +138,6 @@ var PropCondition = function PropCondition(props) {
       if (userPropsMap[attrName] && userPropsMap[attrName].subtype) {
         props.defaultValue.subtype = userPropsMap[attrName].subtype;
       }
-    } else {
-      if (item.placeholder) {
-        props.value = _objectSpread(_objectSpread({}, props.value), {}, {
-          placeholder: item.placeholder || ''
-        });
-      }
     }
     if (isEvent) {
       props.eventIdList = [eventId];

package/es/userCondition/conditions/textDesc.js

@@ -336,7 +336,7 @@ var Text = function Text(props) {
         style: {
           margin: '0 4px'
         }
-      }, "\u6216") : null, tag && (tag[1].labelCreateType === LabelCreateType.firstAndLastUpdate || tag[1].labelCreateType === LabelCreateType.fundingSource || tag[1].labelCreateType === LabelCreateType.eventPreference || tag[1].labelCreateType === LabelCreateType.sqlCreateTable) && /*#__PURE__*/React.createElement("span", null, tag && tag[1].labelName), tag && (tag[1].labelCreateType === LabelCreateType.autoUpdate || tag[1].labelCreateType === LabelCreateType.manualUpdate || tag[1].labelCreateType === LabelCreateType.recencyFrequencyMonetaryUpdate || tag[1].labelCreateType === LabelCreateType.labelOpenApi || tag[1].labelCreateType === LabelCreateType.lostUser || tag[1].labelCreateType === LabelCreateType.riskLevel || tag[1].labelCreateType === LabelCreateType.financeValue || tag[1].labelCreateType === LabelCreateType.aum) && /*#__PURE__*/React.createElement("span", null, tag && tag[1].labelName + '：' + ((_tag$ = tag[2]) === null || _tag$ === void 0 ? void 0 : _tag$.layerLabelName)));
+      }, "\u6216") : null, tag && (tag[1].labelCreateType === LabelCreateType.firstAndLastUpdate || tag[1].labelCreateType === LabelCreateType.fundingSource || tag[1].labelCreateType === LabelCreateType.eventPreference || tag[1].labelCreateType === LabelCreateType.sqlCreateTable) && /*#__PURE__*/React.createElement("span", null, tag && tag[1].labelName), tag && (tag[1].labelCreateType === LabelCreateType.autoUpdate || tag[1].labelCreateType === LabelCreateType.manualUpdate || tag[1].labelCreateType === LabelCreateType.recencyFrequencyMonetaryUpdate || tag[1].labelCreateType === LabelCreateType.labelOpenApi || tag[1].labelCreateType === LabelCreateType.aum) && /*#__PURE__*/React.createElement("span", null, tag && tag[1].labelName + '：' + ((_tag$ = tag[2]) === null || _tag$ === void 0 ? void 0 : _tag$.layerLabelName)));
     }), /*#__PURE__*/React.createElement("span", null, ")")));
   }
   function renderCdp(condition) {

package/es/userCondition/demo/index.js

@@ -47,7 +47,7 @@ export default (function () {
   });
   return /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 99825
+    defaultApp: 461
   }, /*#__PURE__*/React.createElement("div", {
     style: {
       display: 'inline-block'

package/es/userCondition/index.js

@@ -165,7 +165,7 @@ var BizUserCondition = function BizUserCondition(props) {
     setDataList(showList);
   }
   function onAdd(type) {
-    var condition = buildCondition(type, props.labelCreateType);
+    var condition = buildCondition(type);
     var newValue = [].concat(_toConsumableArray(value), [[condition]]);
     setValue(newValue);
     var newData = {
@@ -252,7 +252,6 @@ var BizUserCondition = function BizUserCondition(props) {
     return /*#__PURE__*/React.createElement(OrConditions, {
       showAndDesc: i > 0,
       orConditions: item.orConditions,
-      labelCreateType: props.labelCreateType,
       key: item.id,
       onChange: function onChange(data) {
         _onChange(item.id, data);

package/es/userCondition/orConditions.js

@@ -55,7 +55,7 @@ var OrConditions = function OrConditions(props) {
     setShowList(showList);
   }
   function onAdd(type) {
-    var condition = buildCondition(type, props.labelCreateType);
+    var condition = buildCondition(type);
     var newData = {
       id: Math.random(),
       condition: condition

package/es/userCondition/types.d.ts

@@ -21,10 +21,7 @@ export declare enum LabelCreateType {
     eventPreference = 6,
     sqlCreateTable = 8,
     aum = 9,
-    fundingSource = 10,
-    lostUser = 11,
-    riskLevel = 12,
-    financeValue = 13
+    fundingSource = 10
 }
 export interface RunTimesI {
     operator: '>' | '=' | '<' | '>=' | '<=' | '>=' | 'not equal' | 'between';
@@ -69,7 +66,6 @@ export declare namespace BizUserConditionT {
         openOrderDataCondition?: boolean;
         openCondition?: boolean;
         cdpTip?: string;
-        labelCreateType?: number;
     }
     interface BusinessPropsI {
         dataId: number;
@@ -113,7 +109,6 @@ export declare namespace BizUserConditionT {
         attrType: 'cont-string' | 'cont-num' | 'cont-date';
         category: 'fixed' | 'custom';
         propCategory?: string;
-        placeholder?: string;
     }
     interface AttrsCondition {
         attrId: number;
@@ -142,7 +137,6 @@ export declare namespace BizUserConditionT {
         runTimes: RunTimesI;
         runPeriod: RunPeriodI;
         eventId: number;
-        placeholder?: string;
     }
     interface AddCondition {
         eventId: '-3';
@@ -256,7 +250,6 @@ export declare namespace OrConditionsT {
         onChange: (value: any[]) => void;
         orConditions: BizUserConditionT.Conditions[number];
         showAndDesc: boolean;
-        labelCreateType?: number;
     }
     interface ShowItemI {
         id: number;
@@ -277,7 +270,6 @@ export declare namespace PropConditionType {
         attr: BizUserConditionT.AttrCondition;
         id: number;
         default?: BizUserConditionT.AttrCondition;
-        placeholder?: string;
     }[];
     interface PropsI extends AllConditionBasePropsI<any> {
         isEvent?: boolean;

package/es/userCondition/types.js

@@ -10,9 +10,6 @@ export var LabelCreateType;
   LabelCreateType[LabelCreateType["sqlCreateTable"] = 8] = "sqlCreateTable";
   LabelCreateType[LabelCreateType["aum"] = 9] = "aum";
   LabelCreateType[LabelCreateType["fundingSource"] = 10] = "fundingSource";
-  LabelCreateType[LabelCreateType["lostUser"] = 11] = "lostUser";
-  LabelCreateType[LabelCreateType["riskLevel"] = 12] = "riskLevel";
-  LabelCreateType[LabelCreateType["financeValue"] = 13] = "financeValue";
 })(LabelCreateType || (LabelCreateType = {}));
 export var PropType;
 (function (PropType) {

package/es/userCondition/util.d.ts

@@ -1,6 +1,6 @@
 import type { GlobalContextProps } from '../context';
 import type { BizUserConditionT, Unpacked } from './types';
-export declare function buildCondition(type: BizUserConditionT.ConditionType, labelCreateType?: number): BizUserConditionT.BusinessCondition | BizUserConditionT.EventCondition | BizUserConditionT.AddCondition | BizUserConditionT.OrderCondition | BizUserConditionT.ActiveCondition | BizUserConditionT.PropCondition | BizUserConditionT.CdpCondition | BizUserConditionT.CdpCshCondition;
+export declare function buildCondition(type: BizUserConditionT.ConditionType): BizUserConditionT.BusinessCondition | BizUserConditionT.EventCondition | BizUserConditionT.AddCondition | BizUserConditionT.OrderCondition | BizUserConditionT.ActiveCondition | BizUserConditionT.PropCondition | BizUserConditionT.CdpCondition | BizUserConditionT.CdpCshCondition;
 export declare function transformNumberOperate(key: string, output?: boolean): string;
 export declare function findEvent(eventId: number, eventGroupList: Unpacked<GlobalContextProps, 'eventGroupList'>): import("../attributeSelector/types").AnalysisEvent | null;
 export declare function findPropAndEnv(name: string, list: Unpacked<GlobalContextProps, 'userPropList' | 'eventEnvList'>): import("../attributeSelector/types").UserProp | import("../attributeSelector/types").EnvProp | null;

package/es/userCondition/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 { LabelCreateType } from './types';
-export function buildCondition(type, labelCreateType) {
+export function buildCondition(type) {
   switch (type) {
     case 'add':
       var condition = {
@@ -46,15 +46,13 @@ export function buildCondition(type, labelCreateType) {
         runPeriod: {
           operator: 'relative',
           values: ['30', '0']
-        },
-        placeholder: labelCreateType === LabelCreateType.lostUser ? '进入App' : ''
+        }
       };
     case 'prop':
       return {
         eventId: undefined,
         attrs: [{
-          attrId: 0,
-          placeholder: labelCreateType === LabelCreateType.riskLevel ? '风险等级' : ''
+          attrId: 0
         }]
       };
     case 'tag':

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zgfe/business-lib",
-    "version": "1.2.34-tags.9",
+    "version": "1.2.35-ht.0",
     "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": "ad21f7dc586b09170b70b2f80afa2899627f2166",
+    "gitHead": "731dd9549eebf3b2a5df3fd079d4c3211672b079",
     "gitHooks": {
         "pre-commit": "lint-staged"
     }