@zgfe/business-lib 1.1.65 → 1.1.66

package/es/userCondition/demo/business.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import '@zgfe/business-lib/es/assets/iconfont/iconfont.css';
-declare const _default: () => React.JSX.Element;
+declare const _default: () => JSX.Element;
 export default _default;

package/es/userCondition/demo/index.d.ts

@@ -1,4 +1,3 @@
-import React from 'react';
 import '@zgfe/business-lib/es/assets/iconfont/iconfont.css';
-declare const _default: () => React.JSX.Element;
+declare const _default: () => JSX.Element;
 export default _default;

package/es/userCondition/demo/mockData.d.ts

@@ -1,59 +1,45 @@
-export declare const tagList: {
+export declare const tagList: ({
+    labelGroup: string;
+    startProcessTime: string;
+    labelType: number;
+    layers: {
+        sequence: number;
+        layerLabelId: number;
+        layerLabelName: string;
+    }[];
     dataStatus: number;
     editStatus: number;
-    endProcessTime: string;
+    labelCreateType: number;
     expireStatus: string;
-    expireTime: null;
-    expireType: null;
     id: number;
-    labelCreateType: number;
-    labelGroup: string;
+    endProcessTime: string;
     labelName: string;
     labelRemark: string;
+} | {
+    labelGroup: string;
     labelType: number;
     layers: {
-        layerCondition: {
-            eventId: string;
-            runPeriod: {
-                values: string[];
-                operator: string;
-            };
-            runTimes: {
-                values: string[];
-                operator: string;
-            };
-            attrs: never[];
-        }[][];
+        sequence: number;
         layerLabelId: number;
         layerLabelName: string;
-        layerRemark: string;
-        sequence: number;
-    }[];
-    sequence: number;
-    startProcessTime: string;
-}[];
-export declare const conditions: ({
-    dataset: {
-        datasetId: number;
-        datasetTable: string;
-        datasetName: string;
-        fieldName: string;
-        fieldType: string;
-        webType: string;
-        paramType: string;
-        operator: string;
-        params: string[];
     }[];
-    attrs?: undefined;
-    labels?: undefined;
-} | {
+    dataStatus: number;
+    editStatus: number;
+    labelCreateType: number;
+    expireStatus: string;
+    id: number;
+    labelName: string;
+    labelRemark: string;
+    startProcessTime?: undefined;
+    endProcessTime?: undefined;
+})[];
+export declare const conditions: {
     attrs: never[];
     labels: {
-        operator: string;
         values: string[];
+        operator: string;
     };
-    dataset?: undefined;
-})[][];
+}[][];
 export declare const datasetList: {
     id: number;
     datasetName: string;

package/es/userCondition/demo/mockData.js

@@ -1,204 +1,150 @@
 export var tagList = [{
+  labelGroup: '行为标签',
+  startProcessTime: '2023-06-26T01:00:00',
+  labelType: 0,
+  layers: [{
+    sequence: 1,
+    layerLabelId: 550455830020096,
+    layerLabelName: '分层1'
+  }],
   dataStatus: 1,
   editStatus: 1,
-  endProcessTime: '2023-06-09T10:29:53',
-  expireStatus: 'effective',
-  expireTime: null,
-  expireType: null,
-  id: 333,
   labelCreateType: 0,
+  expireStatus: 'effective',
+  id: 371,
+  endProcessTime: '2023-06-26T01:00:30',
+  labelName: '端午22',
+  labelRemark: ''
+}, {
   labelGroup: '基本标签',
-  labelName: 'test_2',
-  labelRemark: '',
   labelType: 0,
   layers: [{
-    layerCondition: [[{
-      eventId: '-3',
-      runPeriod: {
-        values: ['30', '0'],
-        operator: 'relative'
-      },
-      runTimes: {
-        values: ['1'],
-        operator: '>='
-      },
-      attrs: []
-    }]],
-    layerLabelId: 545972431945729,
-    layerLabelName: '分层2',
-    layerRemark: '',
-    sequence: 2
-  }, {
-    layerCondition: [[{
-      eventId: '-4',
-      runPeriod: {
-        values: ['30', '0'],
-        operator: 'relative'
-      },
-      runTimes: {
-        values: ['1'],
-        operator: '>='
-      },
-      attrs: []
-    }]],
-    layerLabelId: 545972431945728,
-    layerLabelName: '分层1',
-    layerRemark: '',
-    sequence: 1
+    sequence: 1,
+    layerLabelId: 594100458143744,
+    layerLabelName: '分层1'
   }],
-  sequence: 1,
-  startProcessTime: '2023-06-09T10:29:13'
-}, {
-  dataStatus: 1,
-  editStatus: 1,
-  endProcessTime: '2023-06-09T10:29:40',
-  expireStatus: 'effective',
-  expireTime: null,
-  expireType: null,
-  id: 332,
+  dataStatus: 3,
+  editStatus: 3,
   labelCreateType: 0,
+  expireStatus: 'effective',
+  id: 530,
+  labelName: '112233',
+  labelRemark: '88888'
+}, {
   labelGroup: '基本标签',
-  labelName: 'test_1',
-  labelRemark: '',
   labelType: 0,
   layers: [{
-    layerCondition: [[{
-      eventId: '-4',
-      runPeriod: {
-        values: ['30', '0'],
-        operator: 'relative'
-      },
-      runTimes: {
-        values: ['1'],
-        operator: '>='
-      },
-      attrs: []
-    }]],
-    layerLabelId: 545972112195585,
-    layerLabelName: '分层2',
-    layerRemark: '',
-    sequence: 2
-  }, {
-    layerCondition: [[{
-      eventId: '-3',
-      runPeriod: {
-        values: ['30', '0'],
-        operator: 'relative'
-      },
-      runTimes: {
-        values: ['1'],
-        operator: '>='
-      },
-      attrs: []
-    }]],
-    layerLabelId: 545972112195584,
-    layerLabelName: '分层1',
-    layerRemark: '',
-    sequence: 1
+    sequence: 1,
+    layerLabelId: 594097581703168,
+    layerLabelName: '分层1'
   }],
-  sequence: 1,
-  startProcessTime: '2023-06-09T10:28:54'
+  dataStatus: 3,
+  editStatus: 3,
+  labelCreateType: 0,
+  expireStatus: 'effective',
+  id: 529,
+  labelName: '自定义test01',
+  labelRemark: ''
+}, {
+  labelGroup: '基本标签',
+  labelType: 1,
+  layers: [],
+  dataStatus: 3,
+  editStatus: 3,
+  labelCreateType: 3,
+  expireStatus: 'effective',
+  id: 524,
+  labelName: '134',
+  labelRemark: ''
+}, {
+  labelGroup: '基本标签',
+  labelType: 1,
+  layers: [],
+  dataStatus: 3,
+  editStatus: 3,
+  labelCreateType: 3,
+  expireStatus: 'effective',
+  id: 523,
+  labelName: '首末次131',
+  labelRemark: ''
+}, {
+  labelGroup: '基本标签',
+  labelType: 1,
+  layers: [],
+  dataStatus: 3,
+  editStatus: 3,
+  labelCreateType: 3,
+  expireStatus: 'effective',
+  id: 522,
+  labelName: '首末次130',
+  labelRemark: ''
 }, {
+  labelGroup: '基本标签',
+  startProcessTime: '2023-07-13T00:17:29',
+  labelType: 1,
+  layers: [],
   dataStatus: 1,
   editStatus: 1,
-  endProcessTime: '2023-06-09T10:31:03',
+  labelCreateType: 3,
   expireStatus: 'effective',
-  expireTime: null,
-  expireType: null,
-  id: 348,
-  labelCreateType: 0,
-  labelGroup: '活跃标签',
-  labelName: '夏至14',
-  labelRemark: '',
-  labelType: 0,
-  layers: [{
-    layerCondition: [[{
-      eventId: '-3',
-      runPeriod: {
-        values: ['30', '0'],
-        operator: 'relative'
-      },
-      runTimes: {
-        values: ['1'],
-        operator: '>='
-      },
-      attrs: []
-    }]],
-    layerLabelId: 545973587312641,
-    layerLabelName: '分层2',
-    layerRemark: '',
-    sequence: 2
-  }, {
-    layerCondition: [[{
-      eventId: '-4',
-      runPeriod: {
-        values: ['30', '0'],
-        operator: 'relative'
-      },
-      runTimes: {
-        values: ['1'],
-        operator: '>='
-      },
-      attrs: []
-    }]],
-    layerLabelId: 545973587312640,
-    layerLabelName: '分层1',
-    layerRemark: '',
-    sequence: 1
-  }],
-  sequence: 2,
-  startProcessTime: '2023-06-09T10:30:24'
+  id: 517,
+  endProcessTime: '2023-07-13T00:17:38',
+  labelName: '首末次122',
+  labelRemark: ''
+}, {
+  labelGroup: '基本标签',
+  labelType: 1,
+  layers: [],
+  dataStatus: 3,
+  editStatus: 3,
+  labelCreateType: 3,
+  expireStatus: 'effective',
+  id: 516,
+  labelName: '首末次120',
+  labelRemark: ''
+}, {
+  labelGroup: '基本标签',
+  labelType: 1,
+  layers: [],
+  dataStatus: 3,
+  editStatus: 3,
+  labelCreateType: 3,
+  expireStatus: 'effective',
+  id: 515,
+  labelName: '首末次129',
+  labelRemark: '最近7天埋点事件02属性是商品价格'
 }, {
+  labelGroup: '基本标签',
+  startProcessTime: '2023-07-12T21:23:57',
+  labelType: 1,
+  layers: [],
   dataStatus: 1,
   editStatus: 1,
-  endProcessTime: '2023-06-09T10:30:42',
+  labelCreateType: 3,
   expireStatus: 'effective',
-  expireTime: null,
-  expireType: null,
-  id: 347,
-  labelCreateType: 0,
-  labelGroup: '活跃标签',
-  labelName: '夏至13',
-  labelRemark: '',
+  id: 514,
+  endProcessTime: '2023-07-12T21:24:07',
+  labelName: '首末次128',
+  labelRemark: ''
+}, {
+  labelGroup: '基本标签',
+  startProcessTime: '2023-07-13T01:00:01',
   labelType: 0,
-  layers: [{
-    layerCondition: [[{
-      eventId: '-3',
-      runPeriod: {
-        values: ['30', '0'],
-        operator: 'relative'
-      },
-      runTimes: {
-        values: ['1'],
-        operator: '>='
-      },
-      attrs: []
-    }]],
-    layerLabelId: 545973325545472,
-    layerLabelName: '分层1',
-    layerRemark: '',
-    sequence: 1
-  }],
-  sequence: 2,
-  startProcessTime: '2023-06-09T10:30:07'
+  layers: [],
+  dataStatus: 1,
+  editStatus: 1,
+  labelCreateType: 3,
+  expireStatus: 'effective',
+  id: 508,
+  endProcessTime: '2023-07-13T01:00:18',
+  labelName: '首末次123',
+  labelRemark: ''
 }];
 export var conditions = [[{
-  dataset: [{
-    datasetId: 174,
-    datasetTable: '181e55e003bc25945698fdb2e65d3c2193d',
-    datasetName: 's6',
-    fieldName: 'a_id',
-    fieldType: 'bigint',
-    webType: 'number',
-    paramType: 'number',
-    operator: 'gt',
-    params: ['111']
-  }]
-}, {
   attrs: [],
   labels: {
-    operator: 'equal',
-    values: ['333:545972431945729']
+    values: ['371:550455830020096', '522:fd'],
+    operator: 'equal'
   }
 }]];
 export var datasetList = [{

package/es/userCondition/types.d.ts

@@ -11,6 +11,13 @@ export interface RunPeriodII {
     operator: 'relative' | 'unlimited_time' | 'join_time' | 'absolute';
     values: any[];
 }
+export declare enum LabelCreateType {
+    autoUpdate = 0,
+    manualUpdate = 1,
+    exportUpdate = 2,
+    firstAndLastUpdate = 3,
+    eventPreference = 6
+}
 export interface RunTimesI {
     operator: '>' | '=' | '<' | '>=' | '<=' | '>=' | 'not equal' | 'between';
     values: string[];
@@ -71,6 +78,7 @@ export declare namespace BizUserConditionT {
         del: number;
         labelGroup: string;
         sequence: number;
+        labelCreateType?: number;
         id: number;
         labelName: string;
         labelStatus: number;

package/es/userCondition/types.js

@@ -1,3 +1,11 @@
+export var LabelCreateType;
+(function (LabelCreateType) {
+  LabelCreateType[LabelCreateType["autoUpdate"] = 0] = "autoUpdate";
+  LabelCreateType[LabelCreateType["manualUpdate"] = 1] = "manualUpdate";
+  LabelCreateType[LabelCreateType["exportUpdate"] = 2] = "exportUpdate";
+  LabelCreateType[LabelCreateType["firstAndLastUpdate"] = 3] = "firstAndLastUpdate";
+  LabelCreateType[LabelCreateType["eventPreference"] = 6] = "eventPreference";
+})(LabelCreateType || (LabelCreateType = {}));
 export var PropType;
 (function (PropType) {
   PropType["STRING"] = "cont-string";

package/es/userCondition/util.d.ts

@@ -4,24 +4,34 @@ export declare function buildCondition(type: BizUserConditionT.ConditionType): B
 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;
-export declare function buildSelectLayer(data: BizUserConditionT.UserTagsDataI[]): (layerLabelId: number) => ({
+export declare function buildSelectLayer(data: BizUserConditionT.UserTagsDataI[]): (value: string) => ({
     labelGroup: string;
     id?: undefined;
     labelName?: undefined;
+    labelCreateType?: undefined;
     layerLabelId?: undefined;
     layerLabelName?: undefined;
 } | {
     id: number;
     labelName: string;
+    labelCreateType: number | undefined;
     labelGroup?: undefined;
     layerLabelId?: undefined;
     layerLabelName?: undefined;
+} | {
+    layerLabelId: string;
+    layerLabelName: string;
+    labelGroup?: undefined;
+    id?: undefined;
+    labelName?: undefined;
+    labelCreateType?: undefined;
 } | {
     layerLabelId: number;
     layerLabelName: string;
     labelGroup?: undefined;
     id?: undefined;
     labelName?: undefined;
+    labelCreateType?: undefined;
 })[] | null;
 export declare function buildTagsGroup(list: BizUserConditionT.UserTagsDataI[]): {
     labelGroup: string;

package/es/userCondition/util.js

@@ -4,6 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 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) {
   switch (type) {
     case 'add':
@@ -135,23 +136,47 @@ export function findPropAndEnv(name, list) {
   }
   return null;
 }
+function judgeNaN(data) {
+  if (isNaN(data) == true && typeof data == 'number') {
+    return true;
+  } else {
+    return false;
+  }
+}
 export function buildSelectLayer(data) {
-  return function (layerLabelId) {
-    var i = -1;
-    var j = data.findIndex(function (item) {
-      i = item.layers.findIndex(function (layer) {
-        return layer.layerLabelId === layerLabelId;
+  return function (value) {
+    var type;
+    var id = value.split(':')[0];
+    var layerLabelId = value.split(':')[1];
+    var i = -1,
+      j = -1;
+    if (judgeNaN(Number(layerLabelId))) {
+      j = data.findIndex(function (item) {
+        return item.id === Number(id);
       });
-      if (i < 0) return false;
-      return true;
-    });
+    } else {
+      j = data.findIndex(function (item) {
+        if (item.layers !== null) {
+          i = item.layers.findIndex(function (layer) {
+            return layer.layerLabelId === Number(layerLabelId);
+          });
+        }
+        if (i < 0) return false;
+        return true;
+      });
+    }
     if (j < 0) return null;
+    type = data[j].labelCreateType;
     return [{
       labelGroup: data[j].labelGroup
     }, {
       id: data[j].id,
-      labelName: data[j].labelName
-    }, {
+      labelName: data[j].labelName,
+      labelCreateType: data[j].labelCreateType
+    }, type === LabelCreateType.firstAndLastUpdate || type === LabelCreateType.eventPreference ? {
+      layerLabelId: layerLabelId,
+      layerLabelName: ''
+    } : {
       layerLabelId: data[j].layers[i].layerLabelId,
       layerLabelName: data[j].layers[i].layerLabelName
     }];

package/es/userGroup/demo/group.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const _default: () => React.JSX.Element;
+declare const _default: () => JSX.Element;
 export default _default;

package/es/userGroup/demo/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const _default: () => React.JSX.Element;
+declare const _default: () => JSX.Element;
 export default _default;

package/es/userGroup/index.js

@@ -40,8 +40,15 @@ var BizUserGroup = function BizUserGroup(props) {
     setCurrent(value);
     if (props.onChange) props.onChange(value);
   };
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    focus = _useState6[0],
+    setFocus = _useState6[1];
+  var onVisibleChange = function onVisibleChange(visible) {
+    setFocus(visible);
+  };
   return /*#__PURE__*/React.createElement("div", {
-    className: classPrefix
+    className: "".concat(classPrefix, " ").concat(focus ? 'focus' : '')
   }, /*#__PURE__*/React.createElement(Skeleton, {
     loading: loading,
     active: true,
@@ -57,7 +64,8 @@ var BizUserGroup = function BizUserGroup(props) {
     border: false,
     disableItemList: props.disableItemList,
     onChange: onChange,
-    minDropdownWidth: 284
+    minDropdownWidth: 284,
+    onVisibleChange: onVisibleChange
   }), /*#__PURE__*/React.createElement(BizTargetOptionIcon, {
     name: "delete",
     icon: "qingchu",

package/es/userGroup/styles/index.less

@@ -4,7 +4,6 @@
   position: relative;
   display: flex;
   .__select-handle();
-
   .biz-select-handle {
     flex: 1;
     width: 100%;

package/es/userTagsSelector/cascaderOverlay.js

@@ -27,6 +27,8 @@ import { BizGlobalDataContext, ajax } from '..';
 import apis from '../constants/apis';
 import { Spin } from 'antd';
 import Request from 'umi-request';
+import { getLayerLabelId } from './util';
+import { LabelCreateType } from '../userCondition/types';
 var CancelToken = Request.CancelToken;
 var cancel;
 var CascaderOverlay = function CascaderOverlay(props) {
@@ -185,7 +187,8 @@ var CascaderOverlay = function CascaderOverlay(props) {
       labelGroup: currentSelect
     }, {
       id: currentTag === null || currentTag === void 0 ? void 0 : currentTag.id,
-      labelName: currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelName
+      labelName: currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelName,
+      labelCreateType: currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType
     }, _objectSpread({}, data)];
     props.onChange([].concat(_toConsumableArray(currentValue), [newValue]));
   }
@@ -205,6 +208,30 @@ var CascaderOverlay = function CascaderOverlay(props) {
   }
   function onClickTag(data) {
     setCurrentTag(data);
+    if ((data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.firstAndLastUpdate || (data === null || data === void 0 ? void 0 : data.labelCreateType) === LabelCreateType.eventPreference) {
+      var newValue = [{
+        id: groupMap[currentSelect].id,
+        labelGroup: currentSelect
+      }, {
+        id: data === null || data === void 0 ? void 0 : data.id,
+        labelName: data === null || data === void 0 ? void 0 : data.labelName,
+        labelCreateType: data === null || data === void 0 ? void 0 : data.labelCreateType
+      }, {
+        layerLabelId: getLayerLabelId(data === null || data === void 0 ? void 0 : data.labelCreateType)
+      }];
+      var _index = -1;
+      currentValue.map(function (item, index) {
+        if (JSON.stringify(item) === JSON.stringify(newValue)) {
+          _index = index;
+        }
+      });
+      if (_index === -1) {
+        props.onChange([].concat(_toConsumableArray(currentValue), [newValue]));
+      } else {
+        currentValue.splice(_index, 1);
+        props.onChange(_toConsumableArray(currentValue));
+      }
+    }
   }
   function render() {
     if (!groupList.length) return /*#__PURE__*/React.createElement("div", {
@@ -238,7 +265,7 @@ var CascaderOverlay = function CascaderOverlay(props) {
         return getTagsByGroup(Math.floor(groupMap[currentSelect].children.length / 10) + 1);
       },
       onClick: onClickTag
-    }) : /*#__PURE__*/React.createElement("span", null, "\u6682\u65E0\u6570\u636E")), /*#__PURE__*/React.createElement("div", {
+    }) : /*#__PURE__*/React.createElement("span", null, "\u6682\u65E0\u6570\u636E")), currentTag && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.firstAndLastUpdate && (currentTag === null || currentTag === void 0 ? void 0 : currentTag.labelCreateType) !== LabelCreateType.eventPreference && /*#__PURE__*/React.createElement("div", {
       className: "".concat(classPrefix, "-overlay-selections")
     }, /*#__PURE__*/React.createElement(MultipleCheckPanel, {
       valueField: valueFields[2],

package/es/userTagsSelector/demo/index.d.ts

@@ -1,3 +1,2 @@
-import React from 'react';
-declare const _default: () => React.JSX.Element;
+declare const _default: () => JSX.Element;
 export default _default;