@zgfe/business-lib 1.2.38 → 1.2.40-heyh.0

package/es/hooks/useBizStore.js

@@ -1,69 +1,96 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+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); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import React from 'react';
+import { useEffect, useState, useCallback } from 'react';
 import { ajax } from '../utils';
 import Apis from '../constants/apis';
+import convertAttributeData from '../attributeSelector/util';
 function useBizStore(_ref) {
   var currentApp = _ref.currentApp;
-  var _React$useState = React.useState([]),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    userGroupList = _React$useState2[0],
-    setUserGroupList = _React$useState2[1];
-  var _React$useState3 = React.useState([]),
-    _React$useState4 = _slicedToArray(_React$useState3, 2),
-    tagList = _React$useState4[0],
-    setTagList = _React$useState4[1];
-  var _React$useState5 = React.useState(true),
-    _React$useState6 = _slicedToArray(_React$useState5, 2),
-    groupLoading = _React$useState6[0],
-    setGroupLoading = _React$useState6[1];
-  var _React$useState7 = React.useState(true),
-    _React$useState8 = _slicedToArray(_React$useState7, 2),
-    tagLoading = _React$useState8[0],
-    setTagLoading = _React$useState8[1];
-  var _React$useState9 = React.useState(),
-    _React$useState10 = _slicedToArray(_React$useState9, 2),
-    setTimer = _React$useState10[1];
-  var _React$useState11 = React.useState(),
-    _React$useState12 = _slicedToArray(_React$useState11, 2),
-    groupController = _React$useState12[0],
-    setGroupController = _React$useState12[1];
-  function queryGroups() {
+  var _useState = useState([]),
+    _useState2 = _slicedToArray(_useState, 2),
+    userGroupList = _useState2[0],
+    setUserGroupList = _useState2[1];
+  var _useState3 = useState([]),
+    _useState4 = _slicedToArray(_useState3, 2),
+    tagList = _useState4[0],
+    setTagList = _useState4[1];
+  var _useState5 = useState(),
+    _useState6 = _slicedToArray(_useState5, 2),
+    setTimer = _useState6[1];
+  var _useState7 = useState([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    eventGroups = _useState8[0],
+    setEventGroups = _useState8[1];
+  var _useState9 = useState([]),
+    _useState10 = _slicedToArray(_useState9, 2),
+    userProps = _useState10[0],
+    setUserProps = _useState10[1];
+  var _useState11 = useState([]),
+    _useState12 = _slicedToArray(_useState11, 2),
+    envList = _useState12[0],
+    setEnvList = _useState12[1];
+  var _useState13 = useState(true),
+    _useState14 = _slicedToArray(_useState13, 2),
+    loadEvent = _useState14[0],
+    setLoadEvent = _useState14[1];
+  var _useState15 = useState(true),
+    _useState16 = _slicedToArray(_useState15, 2),
+    loadUsers = _useState16[0],
+    setLoadUsers = _useState16[1];
+  var _useState17 = useState(true),
+    _useState18 = _slicedToArray(_useState17, 2),
+    loadEnv = _useState18[0],
+    setLoadEnv = _useState18[1];
+  var _useState19 = useState(true),
+    _useState20 = _slicedToArray(_useState19, 2),
+    groupLoading = _useState20[0],
+    setGroupLoading = _useState20[1];
+  var _useState21 = useState(true),
+    _useState22 = _slicedToArray(_useState21, 2),
+    tagLoading = _useState22[0],
+    setTagLoading = _useState22[1];
+  var _useState23 = useState({}),
+    _useState24 = _slicedToArray(_useState23, 2),
+    store = _useState24[0],
+    setStore = _useState24[1];
+  var _useState25 = useState(false),
+    _useState26 = _slicedToArray(_useState25, 2),
+    useBizStoreLoading = _useState26[0],
+    setUseBizStoreLoading = _useState26[1];
+  var queryGroups = useCallback(function () {
     setGroupLoading(true);
-    groupController === null || groupController === void 0 ? void 0 : groupController.abort();
-    var controller = new AbortController();
-    var signal = controller.signal;
-    setGroupController(controller);
-    signal.addEventListener('abort', function () {
-      console.log('用户群请求已被取消');
-    });
     ajax(Apis.queryUserGroup, {
       method: 'post',
       data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id,
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
         platform: 0,
         includeDefault: true,
         includeToday: true
-      },
-      signal: signal
+      }
     }).then(function (res) {
       if (!res) return;
       setUserGroupList(res.data);
     }).finally(function () {
       setGroupLoading(false);
     });
-  }
-  function queryTags() {
+  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
+  var queryTags = useCallback(function () {
     setTagLoading(true);
     ajax(Apis.queryAllTags, {
       method: 'post',
       data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id,
-        platform: (currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform) || 0
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        platform: 0
       }
     }).then(function (res) {
       if (!res) return;
@@ -71,20 +98,77 @@ function useBizStore(_ref) {
     }).finally(function () {
       setTagLoading(false);
     });
-  }
-  React.useEffect(function () {
-    if (!currentApp || !currentApp.id) return;
+  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
+  var loadEvents = useCallback(function () {
+    setLoadEvent(true);
+    ajax('/zg/web/v2/data/queryEventMetasOfGroup', {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        platform: 0,
+        isAll: true
+      }
+    }).then(function (res) {
+      setEventGroups(res.data);
+      setLoadEvent(false);
+    });
+  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
+  var loadUserProps = useCallback(function () {
+    setLoadUsers(true);
+    ajax('/zg/web/v2/appusergroup/getUserPropMeta', {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        platform: 0
+      }
+    }).then(function (res) {
+      setUserProps(res.data);
+      setLoadUsers(false);
+    });
+  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
+  var loadEnvList = useCallback(function () {
+    setLoadEnv(true);
+    ajax('/zg/web/v2/appusergroup/getEventEnvData', {
+      method: 'post',
+      data: {
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
+        platform: 0
+      }
+    }).then(function (res) {
+      setEnvList(res.data.eventEnv);
+      setLoadEnv(false);
+    });
+  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
+  useEffect(function () {
+    if (loadEnv || loadEvent || loadUsers) return;
+    setStore(convertAttributeData({
+      eventList: eventGroups,
+      userPropList: userProps,
+      envPropList: envList
+    }));
+  }, [loadEvent, loadEnv, loadUsers, eventGroups, userProps, envList]);
+  useEffect(function () {
+    if (loadEvent || loadEnv || loadUsers || groupLoading || tagLoading) return;
+    setUseBizStoreLoading(false);
+  }, [loadEvent, loadEnv, loadUsers, groupLoading, tagLoading]);
+  useEffect(function () {
+    if (!currentApp || !currentApp.appId) return;
     setTimer(function (pre) {
       if (pre) {
         clearTimeout(pre);
       }
       return setTimeout(function () {
+        setUseBizStoreLoading(true);
         queryGroups();
         queryTags();
+        loadUserProps();
+        loadEvents();
+        loadEnvList();
       }, 300);
     });
-  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.id, currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform]);
-  return {
+  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
+  return _objectSpread({
+    useBizStoreLoading: useBizStoreLoading,
     groupLoading: groupLoading,
     userGroupList: userGroupList,
     tagList: tagList,
@@ -93,6 +177,6 @@ function useBizStore(_ref) {
     setTagList: setTagList,
     queryTags: queryTags,
     queryGroups: queryGroups
-  };
+  }, store);
 }
 export default useBizStore;

package/es/hooks/useSubject.js

@@ -4,9 +4,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { useContext, useState } from 'react';
+import { useContext, useState, useCallback, useEffect } from 'react';
 import BizGlobalDataContext from '../context';
-import useChanged from './useChanged';
 import request from '../utils/ajax';
 import Apis from '../constants/apis';
 function useSubject() {
@@ -20,7 +19,10 @@ function useSubject() {
     setLoading = _useState4[1];
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp;
-  useChanged(function () {
+  var _useState5 = useState(),
+    _useState6 = _slicedToArray(_useState5, 2),
+    setTimer = _useState6[1];
+  var queryData = useCallback(function () {
     setLoading(true);
     request(Apis.querySubjectList, {
       method: 'post',
@@ -33,7 +35,18 @@ function useSubject() {
     }).finally(function () {
       setLoading(false);
     });
-  }, currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId);
+  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
+  useEffect(function () {
+    if (!currentApp || !currentApp.appId) return;
+    setTimer(function (pre) {
+      if (pre) {
+        clearTimeout(pre);
+      }
+      return setTimeout(function () {
+        queryData();
+      }, 300);
+    });
+  }, [currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId]);
   return {
     subjectList: subjectList,
     loading: loading

package/es/productCondition/conditions/cdpCshCondition.js

@@ -21,20 +21,17 @@ import moment from 'moment';
 import { BizUserConditionContext } from '..';
 import request from '../../utils/ajax';
 import Apis from '../../constants/apis';
-import BizGlobalDataContext from '../../context';
 var classPrefix = 'biz-user-condition-cdp-csh';
 var CdpConditionItem = function CdpConditionItem(props) {
-  var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
-  var _useContext2 = useContext(BizUserConditionContext),
-    _useContext2$datasetL = _useContext2.datasetList,
-    datasetList = _useContext2$datasetL === void 0 ? [] : _useContext2$datasetL;
+  var _useContext = useContext(BizUserConditionContext),
+    _useContext$datasetLi = _useContext.datasetList,
+    datasetList = _useContext$datasetLi === void 0 ? [] : _useContext$datasetLi;
   var _useState = useState(function () {
       if (props.value) {
-        return {
+        return _objectSpread(_objectSpread({}, props.value), {}, {
           id: props.value.datasetId,
           tableName: props.value.datasetTable
-        };
+        });
       }
       return;
     }),
@@ -98,6 +95,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
       datasetId = _props$value.datasetId,
       datasetName = _props$value.datasetName,
       datasetTable = _props$value.datasetTable,
+      metaDatasetId = _props$value.metaDatasetId,
       fieldName = _props$value.fieldName,
       fieldType = _props$value.fieldType,
       webType = _props$value.webType,
@@ -108,8 +106,10 @@ var CdpConditionItem = function CdpConditionItem(props) {
       subCondition = _props$value.subCondition;
     setDataset({
       id: datasetId,
+      datasetId: datasetId,
       tableName: datasetTable,
-      datasetName: datasetName
+      datasetName: datasetName,
+      metaDatasetId: metaDatasetId
     });
     setField({
       name: fieldName,
@@ -122,8 +122,10 @@ var CdpConditionItem = function CdpConditionItem(props) {
     if (subCondition) {
       setSubDataset({
         id: subCondition.datasetId,
+        datasetId: subCondition.datasetId,
         tableName: subCondition.datasetTable,
-        datasetName: subCondition.datasetName
+        datasetName: subCondition.datasetName,
+        metaDatasetId: subCondition.metaDatasetId
       });
       setSubField({
         name: subCondition.fieldName,
@@ -150,7 +152,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
     if (params || between) {
       setFieldValue(operator === 'between' ? between : Array.isArray(params) ? params : [params]);
     }
-    onDatasetChange(datasetId);
+    onDatasetChange(datasetTable);
     setTimeout(function () {
       setIsFirst(false);
     }, 0);
@@ -159,7 +161,8 @@ var CdpConditionItem = function CdpConditionItem(props) {
     if (isFirst) return;
     if (!dataset) return;
     var data = {
-      datasetId: dataset.id,
+      datasetId: dataset.datasetId,
+      metaDatasetId: dataset.metaDatasetId,
       datasetName: dataset.datasetName,
       datasetTable: dataset.tableName,
       fieldName: field === null || field === void 0 ? void 0 : field.name,
@@ -203,18 +206,16 @@ var CdpConditionItem = function CdpConditionItem(props) {
       return PropType.DATE;
     }
   };
-  var onDatasetChange = function onDatasetChange(datasetId, isSub) {
-    if (!datasetId) {
+  var onDatasetChange = function onDatasetChange(tableName, isSub) {
+    if (!tableName) {
       isSub ? setSubFieldList([]) : setFieldList([]);
       return;
     }
     setLoading(true);
-    request(Apis.queryDatasetDetail, {
-      method: 'post',
-      data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform,
-        datasetId: datasetId
+    request(Apis.queryTableInfo, {
+      method: 'get',
+      params: {
+        tableName: tableName
       }
     }).then(function (result) {
       setLoading(false);
@@ -234,7 +235,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
     });
     setOperator(undefined);
     setFieldValue([]);
-    onDatasetChange(data.id);
+    onDatasetChange(data.tableName);
   };
   var onSubTableChange = function onSubTableChange(data) {
     setSubDataset(data);
@@ -242,7 +243,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
       name: undefined
     });
     setSubOperator(undefined);
-    onDatasetChange(data.id, true);
+    onDatasetChange(data.tableName, true);
   };
   var onFieldChange = function onFieldChange(data) {
     setField(data);
@@ -405,8 +406,8 @@ var CdpConditionItem = function CdpConditionItem(props) {
       className: "".concat(classPrefix, "-select-dataset"),
       options: datasetList,
       placeholder: "\u9009\u62E9\u660E\u7EC6\u8868",
-      labelField: "datasetName",
-      keyField: "tableName",
+      labelField: "name",
+      keyField: "metaDatasetId",
       value: subDataset,
       onChange: function onChange(v) {
         onSubTableChange(v);
@@ -470,8 +471,8 @@ var CdpConditionItem = function CdpConditionItem(props) {
     className: "".concat(classPrefix, "-select-dataset"),
     options: datasetList,
     placeholder: "\u9009\u62E9\u660E\u7EC6\u8868",
-    labelField: "datasetName",
-    keyField: "tableName",
+    labelField: "name",
+    keyField: "metaDatasetId",
     value: dataset,
     onChange: function onChange(v) {
       return onTableChange(v);
@@ -507,7 +508,6 @@ var CdpCondition = function CdpCondition(props) {
     }
   }, []);
   var onChangeCondition = function onChangeCondition(condition, index) {
-    console.log('onChangeCondition', condition, index);
     var resData = _.cloneDeep(cdpConditions);
     resData[index] = _objectSpread({}, condition);
     onChange(dataId, resData);

package/es/productCondition/conditions/textDesc.js

@@ -25,7 +25,6 @@ var Text = function Text(props) {
       return renderCshCdp(condition);
     }
     var data = condition;
-    console.log('condition-data', data);
     if (data.eventId === undefined) {
       return renderProps(data.attrs[0]);
     }
@@ -56,7 +55,6 @@ var Text = function Text(props) {
     }, label.before), period.operator === 'relative' ? /*#__PURE__*/React.createElement("span", null, "\u6700\u8FD1") : null, valuesDom);
   }
   function renderProps(attr) {
-    console.log('attr', attr);
     return /*#__PURE__*/React.createElement("span", {
       style: {
         backgroundColor: '#effcff',
@@ -67,7 +65,6 @@ var Text = function Text(props) {
     }, attr === null || attr === void 0 ? void 0 : attr.attrName), renderPropValues(attr));
   }
   function renderEvent(condition) {
-    console.log('condition-renderEvent', condition);
     var event = findEvent(condition.eventId, eventGroupList !== null && eventGroupList !== void 0 ? eventGroupList : []);
     var periodLabel = {};
     if (condition.runPeriod.operator === 'join_time') {

package/es/productCondition/index.js

@@ -96,7 +96,7 @@ var BizUserCondition = function BizUserCondition(props) {
     if (eventInfo.eventId) {
       var dealDataset = dataset.filter(function (item) {
         return eventInfo.dataSet && eventInfo.dataSet.find(function (v) {
-          return v.datasetId === item.id;
+          return v.datasetId === item.datasetId;
         });
       });
       setDataset(dealDataset);
@@ -110,7 +110,6 @@ var BizUserCondition = function BizUserCondition(props) {
         orConditions: item
       });
     });
-    console.log('showList', showList);
     setShowList(showList);
     setDataList(showList);
   }
@@ -155,11 +154,10 @@ var BizUserCondition = function BizUserCondition(props) {
     props.onChange && props.onChange(newValue);
   }
   function getDatasetList() {
-    request(Apis.queryDatasetList, {
+    request(Apis.queryMetaDatasetList, {
       method: 'post',
       data: {
-        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId,
-        platform: currentApp === null || currentApp === void 0 ? void 0 : currentApp.platform
+        appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.appId
       }
     }).then(function (result) {
       setDataset((result === null || result === void 0 ? void 0 : result.data) || []);

package/es/productCondition/orConditions.js

@@ -128,7 +128,6 @@ var OrConditions = function OrConditions(props) {
         condition: condition
       });
     }
-    console.log('condition', condition);
     if (condition.data_set_csh) {
       conditionDom = /*#__PURE__*/React.createElement(CdpCshCondition, {
         defaultValue: condition,

package/es/productCondition/types.d.ts

@@ -161,6 +161,8 @@ export declare namespace BizProductConditionT {
     }
     interface CdpDataSet {
         id: number;
+        metaDatasetId: number;
+        datasetId: number;
         datasetName: string;
         tableName: string;
     }
@@ -182,6 +184,7 @@ export declare namespace BizProductConditionT {
     }
     interface CdpCshConditionDetail {
         datasetId?: number;
+        metaDatasetId: number;
         datasetTable?: string;
         datasetName?: string;
         fieldName?: string;
@@ -192,6 +195,7 @@ export declare namespace BizProductConditionT {
         paramType?: PropType;
         subCondition?: {
             datasetId?: number;
+            metaDatasetId?: number;
             datasetTable?: string;
             datasetName?: string;
             fieldName?: string;

package/es/targetConditionGroup/components/targetDimension.js

@@ -12,6 +12,10 @@ import BizGlobalDataContext from '../../context';
 import SelectHandle from '../../select/handle';
 import { normalOptions, attrOptions } from '../data/operates';
 var BizTargetDimension = function BizTargetDimension(props) {
+  var _currentApp$type;
+  var _useContext = useContext(BizGlobalDataContext),
+    eventGroupList = _useContext.eventGroupList,
+    currentApp = _useContext.currentApp;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     dimension = _useState2[0],
@@ -20,19 +24,17 @@ var BizTargetDimension = function BizTargetDimension(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     dimensionParent = _useState4[0],
     setDimensionParent = _useState4[1];
-  var _useState5 = useState(props.normalOptions || normalOptions),
+  var _useState5 = useState(props.normalOptions || normalOptions((_currentApp$type = currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) !== null && _currentApp$type !== void 0 ? _currentApp$type : 'user')),
     _useState6 = _slicedToArray(_useState5, 2),
     options = _useState6[0],
     setOptions = _useState6[1];
-  var _useContext = useContext(BizGlobalDataContext),
-    eventGroupList = _useContext.eventGroupList;
   var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
     visible = _useState8[0],
     setVisible = _useState8[1];
   useEffect(function () {
-    var _props$value;
-    var dimensionOption = props.normalOptions || normalOptions;
+    var _currentApp$type2, _props$value;
+    var dimensionOption = props.normalOptions || normalOptions((_currentApp$type2 = currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) !== null && _currentApp$type2 !== void 0 ? _currentApp$type2 : 'user');
     if (props.eventId && props.isExtend) {
       dimensionOption = getAttrOption(props.eventId, dimensionOption);
     }

package/es/targetConditionGroup/data/operates.d.ts

@@ -1,16 +1,4 @@
-export declare const dimensionOperate: ({
-    name: string;
-    value: string;
-    children?: undefined;
-} | {
-    name: string;
-    value: string;
-    children: {
-        name: string;
-        value: string;
-    }[];
-})[];
-export declare const normalOptions: {
+export declare const normalOptions: (type: 'user' | 'custom' | 'product' | undefined) => {
     label: string;
     value: string;
 }[];

package/es/targetConditionGroup/data/operates.js

@@ -1,42 +1,15 @@
-export var dimensionOperate = [{
-  name: '人数',
-  value: 'number'
-}, {
-  name: '次数',
-  value: 'times'
-}, {
-  name: '活跃比',
-  value: 'active_ratio'
-}, {
-  name: '人均次数',
-  value: 'per'
-}, {
-  name: '金额',
-  value: 'money',
-  children: [{
-    name: '总和',
-    value: 'sum'
+export var normalOptions = function normalOptions(type) {
+  return [{
+    label: "".concat(type === 'user' ? '人数' : '主体数'),
+    value: 'number'
   }, {
-    name: '均值',
-    value: 'avg'
+    label: '次数',
+    value: 'times'
   }, {
-    name: '分布',
-    value: 'duration_times'
-  }, {
-    name: '中位数',
-    value: 'median'
-  }]
-}];
-export var normalOptions = [{
-  label: '人数',
-  value: 'number'
-}, {
-  label: '次数',
-  value: 'times'
-}, {
-  label: '人均次数',
-  value: 'per'
-}];
+    label: "".concat(type === 'user' ? '人均次数' : '主体平均次数'),
+    value: 'per'
+  }];
+};
 export var attrOptions = [{
   label: '总和',
   value: 'sum'

package/es/targetConditionGroup/index.js

@@ -29,7 +29,8 @@ var BizTargetCondition = function BizTargetCondition(props) {
     setTargetData = _useState2[1];
   var _useContext = useContext(BizGlobalDataContext),
     _useContext$eventGrou = _useContext.eventGroupList,
-    eventGroupList = _useContext$eventGrou === void 0 ? [] : _useContext$eventGrou;
+    eventGroupList = _useContext$eventGrou === void 0 ? [] : _useContext$eventGrou,
+    currentApp = _useContext.currentApp;
   var _useState3 = useState({
       analysisIndex: 'number'
     }),
@@ -127,7 +128,7 @@ var BizTargetCondition = function BizTargetCondition(props) {
             eventList: []
           };
         }
-        BuiltinIndicators.eventList.forEach(function (item) {
+        BuiltinIndicators(currentApp === null || currentApp === void 0 ? void 0 : currentApp.type).eventList.forEach(function (item) {
           if (item.id === data.eventId) {
             target.value.event = _objectSpread({}, item);
             hasEvent = true;