@zgfe/business-lib 1.2.32 → 1.2.34-heyh.0

package/es/AUMFormulaTarget/components/formula/index.js

@@ -28,13 +28,17 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     fieldValue = _useState6[0],
     setFieldValue = _useState6[1];
+  var _useState7 = useState(),
+    _useState8 = _slicedToArray(_useState7, 2),
+    fieldMaxValue = _useState8[0],
+    setFieldMaxValue = _useState8[1];
   useEffect(function () {
     init();
   }, []);
   useEffect(function () {
     var item = formatTarget(targetList, 1);
-    props.onChange && props.onChange(item.formulaList, item.formula, operator === null || operator === void 0 ? void 0 : operator.value, fieldValue);
-  }, [targetList, operator, fieldValue]);
+    props.onChange && props.onChange(item.formulaList, item.formula, operator === null || operator === void 0 ? void 0 : operator.value, fieldValue, fieldMaxValue);
+  }, [targetList, operator, fieldValue, fieldMaxValue]);
   useImperativeHandle(ref, function () {
     return {
       reset: init
@@ -45,6 +49,7 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
       value: props.operator
     });
     setFieldValue(props.fieldValue);
+    setFieldMaxValue(props.fieldMaxValue);
     setTargetList(targetsFormat(props.formula, props.value, 1));
   };
   var _onChange = function onChange(index, data) {
@@ -138,14 +143,18 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
     overlayWidth: 96,
     value: operator,
     onChange: onOperateChange
-  }), /*#__PURE__*/React.createElement(Input, {
+  }), operator && operator.value === 'between' ? /*#__PURE__*/React.createElement("span", {
+    style: {
+      display: 'flex'
+    }
+  }, /*#__PURE__*/React.createElement(Input, {
     style: {
       marginLeft: 16,
       borderWidth: 0
     },
     type: "number",
     value: fieldValue,
-    placeholder: "\u8BF7\u8F93\u5165",
+    placeholder: "\u8BF7\u8F93\u5165\u6700\u5C0F\u503C",
     onChange: function onChange(e) {
       var _e$target$value;
       e.persist();
@@ -154,6 +163,38 @@ var FormulaContainer = /*#__PURE__*/React.forwardRef(function (props, ref) {
       var dealStr = xsStr ? str.split('.')[0] + '.' + xsStr : str;
       setFieldValue(dealStr);
     }
+  }), /*#__PURE__*/React.createElement(Input, {
+    style: {
+      marginLeft: 16,
+      borderWidth: 0
+    },
+    type: "number",
+    value: fieldMaxValue,
+    placeholder: "\u8BF7\u8F93\u5165\u6700\u5927\u503C",
+    onChange: function onChange(e) {
+      var _e$target$value2;
+      e.persist();
+      var str = (_e$target$value2 = e.target.value) === null || _e$target$value2 === void 0 ? void 0 : _e$target$value2.slice(0, 20);
+      var xsStr = str.split('.')[1] ? str.split('.')[1].slice(0, 2) : '';
+      var dealStr = xsStr ? str.split('.')[0] + '.' + xsStr : str;
+      setFieldMaxValue(dealStr);
+    }
+  })) : /*#__PURE__*/React.createElement(Input, {
+    style: {
+      marginLeft: 16,
+      borderWidth: 0
+    },
+    type: "number",
+    value: fieldValue,
+    placeholder: "\u8BF7\u8F93\u5165",
+    onChange: function onChange(e) {
+      var _e$target$value3;
+      e.persist();
+      var str = (_e$target$value3 = e.target.value) === null || _e$target$value3 === void 0 ? void 0 : _e$target$value3.slice(0, 20);
+      var xsStr = str.split('.')[1] ? str.split('.')[1].slice(0, 2) : '';
+      var dealStr = xsStr ? str.split('.')[0] + '.' + xsStr : str;
+      setFieldValue(dealStr);
+    }
   }), /*#__PURE__*/React.createElement(IconFont, {
     style: {
       marginLeft: 16

package/es/AUMFormulaTarget/components/formula/types.d.ts

@@ -6,7 +6,8 @@ export declare namespace FormulaContainerTypes {
         resultFormat?: string;
         operator?: string;
         fieldValue?: string;
-        onChange?: (formulaList: TargetConditionTypes.Value[], formula: string, operator?: string, fieldValue?: string) => void;
+        fieldMaxValue?: string;
+        onChange?: (formulaList: TargetConditionTypes.Value[], formula: string, operator?: string, fieldValue?: string, fieldMaxValue?: string) => void;
     }
     type Value = null | string | TargetConditionTypes.Value;
     interface FormulaItemValue {

package/es/AUMFormulaTarget/components/formula/util.d.ts

@@ -2,6 +2,7 @@ import { AttrConditionTypes, TargetConditionTypes } from '../../..';
 import { EventGroup } from '../../../attributeSelector/types';
 import { FormulaContainerTypes } from './types';
 import { BizFormulaTargetTypes } from '../../types';
+import { AppInfoProps } from '../../../context/index';
 export declare const newItem: FormulaContainerTypes.FormulaItemValue;
 export declare const newSymbol: FormulaContainerTypes.FormulaItemValue;
 export declare const targetsFormat: (targetFormula?: string, targets?: TargetConditionTypes.Value[], initNum?: number) => FormulaContainerTypes.FormulaItemValue[];
@@ -16,7 +17,7 @@ export declare const validator: (type: string, condition?: TargetConditionTypes.
     isOk: boolean;
     msg: string;
 };
-export declare const getDimension: (data: TargetConditionTypes.DimensionValue, eId?: number, eventGroupList?: EventGroup[]) => string;
+export declare const getDimension: (currentApp: AppInfoProps | undefined, data: TargetConditionTypes.DimensionValue, eId?: number, eventGroupList?: EventGroup[]) => string;
 export declare const judgeHaveFilter: (filter?: AttrConditionTypes.GroupValue) => boolean;
 export declare const getFilters: (filters?: AttrConditionTypes.GroupValue) => {
     conditions: AttrConditionTypes.ItemValue[];

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

@@ -170,9 +170,9 @@ export var validator = function validator(type, condition) {
     msg: msg
   };
 };
-export var getDimension = function getDimension(data, eId, eventGroupList) {
+export var getDimension = function getDimension(currentApp, data, eId, eventGroupList) {
   var name = '';
-  normalOptions.concat(attrOptions).forEach(function (item) {
+  normalOptions(currentApp === null || currentApp === void 0 ? void 0 : currentApp.type).concat(attrOptions).forEach(function (item) {
     if (item.value === data.analysisIndex) {
       name = item.label;
     }

package/es/AUMFormulaTarget/components/formulaItem/index.js

@@ -40,7 +40,8 @@ var FormulaItem = function FormulaItem(props) {
     isValidate = _useState10[0],
     setIsValidate = _useState10[1];
   var _useContext = useContext(BizGlobalDataContext),
-    eventGroupList = _useContext.eventGroupList;
+    eventGroupList = _useContext.eventGroupList,
+    currentApp = _useContext.currentApp;
   var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
     open = _useState12[0],
@@ -58,7 +59,7 @@ var FormulaItem = function FormulaItem(props) {
     setLabel((condition === null || condition === void 0 ? void 0 : condition.eventName) || (condition === null || condition === void 0 ? void 0 : condition.datasetName) || '');
     if (condition) {
       if ((condition === null || condition === void 0 ? void 0 : condition.type) === FormulaTypes.EVENT) {
-        setDimension(getDimension(condition.analysisDimension, condition.eventId, eventGroupList));
+        setDimension(getDimension(currentApp, condition.analysisDimension, condition.eventId, eventGroupList));
         setHaveFilter(judgeHaveFilter(condition.filters));
       } else {
         setHaveFilter(!!(condition.filters || []).length);

package/es/AUMFormulaTarget/components/panel/cdpCshCondition.js

@@ -32,7 +32,8 @@ var CdpConditionItem = function CdpConditionItem(props) {
   var _useState = useState(function () {
       if (props.value) {
         return {
-          id: props.value.datasetId,
+          metaDatasetId: props.value.metaDatasetId,
+          datasetId: props.value.datasetId,
           tableName: props.value.datasetTable
         };
       }
@@ -89,9 +90,11 @@ var CdpConditionItem = function CdpConditionItem(props) {
       datasetName = _props$value.datasetName,
       datasetTable = _props$value.datasetTable,
       fieldName = _props$value.fieldName,
-      filters = _props$value.filters;
+      filters = _props$value.filters,
+      metaDatasetId = _props$value.metaDatasetId;
     setDataset({
-      id: datasetId,
+      metaDatasetId: metaDatasetId,
+      datasetId: datasetId,
       tableName: datasetTable,
       datasetName: datasetName
     });
@@ -112,7 +115,8 @@ var CdpConditionItem = function CdpConditionItem(props) {
     if (isFirst) return;
     if (!dataset) return;
     var data = {
-      datasetId: dataset.id,
+      metaDatasetId: dataset.metaDatasetId,
+      datasetId: dataset.datasetId,
       datasetTable: dataset.tableName,
       datasetName: dataset.datasetName,
       fieldName: field === null || field === void 0 ? void 0 : field.name,
@@ -146,12 +150,12 @@ var CdpConditionItem = function CdpConditionItem(props) {
     });
   };
   var onTableChange = function onTableChange(data) {
-    if (data && data.id !== (dataset === null || dataset === void 0 ? void 0 : dataset.id)) {
+    if (data && data.metaDatasetId !== (dataset === null || dataset === void 0 ? void 0 : dataset.metaDatasetId)) {
       setDataset(data);
       setField({
         name: undefined
       });
-      onDatasetChange(data.id);
+      onDatasetChange(data.datasetId);
       setFilters([]);
     }
   };
@@ -166,12 +170,12 @@ var CdpConditionItem = function CdpConditionItem(props) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "".concat(isDatasetError ? 'error' : '')
   }, /*#__PURE__*/React.createElement(DataSetGroup, {
-    value: dataset === null || dataset === void 0 ? void 0 : dataset.id,
+    value: dataset === null || dataset === void 0 ? void 0 : dataset.metaDatasetId,
     placeholder: "\u8BF7\u9009\u62E9\u660E\u7EC6\u8868",
     onChange: onTableChange
   }), isDatasetError ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-error")
-  }, "AUM\u6307\u6807\u4E0D\u53EF\u4E3A\u7A7A") : null), (dataset === null || dataset === void 0 ? void 0 : dataset.id) ? /*#__PURE__*/React.createElement("div", {
+  }, "AUM\u6307\u6807\u4E0D\u53EF\u4E3A\u7A7A") : null), (dataset === null || dataset === void 0 ? void 0 : dataset.metaDatasetId) ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-item"),
     style: {
       flexDirection: 'column'
@@ -342,9 +346,6 @@ var RenderByType = function RenderByType(props) {
 var CdpCondition = function CdpCondition(props) {
   var value = props.value,
     onChange = props.onChange;
-  useEffect(function () {
-    console.log(value);
-  }, []);
   var onChangeCondition = function onChangeCondition(condition) {
     console.log('onChangeCondition', condition);
     onChange && onChange(condition);

package/es/AUMFormulaTarget/components/panel/types.d.ts

@@ -20,6 +20,7 @@ export interface BusinessProps {
     datasetTable: string;
     datasetName: string;
     fieldName: string;
+    metaDatasetId?: number;
     filters: {
         calculate: string;
         operator: string;

package/es/AUMFormulaTarget/index.js

@@ -19,21 +19,23 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
     _useState2 = _slicedToArray(_useState, 2),
     condition = _useState2[0],
     setCondition = _useState2[1];
-  var onChange = function onChange(customCondition, formula, operator, fieldValue) {
+  var onChange = function onChange(customCondition, formula, operator, fieldValue, fieldMaxValue) {
     setCondition(function (value) {
       props.onChange && props.onChange(_objectSpread(_objectSpread({}, value), {}, {
         alias: (value || {}).eventName,
         customCondition: customCondition,
         formula: formula,
         operator: operator,
-        fieldValue: fieldValue
+        fieldValue: fieldValue,
+        fieldMaxValue: fieldMaxValue
       }));
       return _objectSpread(_objectSpread({}, value), {}, {
         alias: (value || {}).eventName,
         customCondition: customCondition,
         formula: formula,
         operator: operator,
-        fieldValue: fieldValue
+        fieldValue: fieldValue,
+        fieldMaxValue: fieldMaxValue
       });
     });
   };
@@ -44,6 +46,7 @@ var BizFormulaTarget = function BizFormulaTarget(props) {
     formula: (condition || {}).formula,
     operator: (condition || {}).operator,
     fieldValue: (condition || {}).fieldValue,
+    fieldMaxValue: (condition || {}).fieldMaxValue,
     onChange: onChange
   }));
 };

package/es/AUMFormulaTarget/types.d.ts

@@ -14,6 +14,7 @@ export declare namespace BizFormulaTargetTypes {
         formula?: string;
         operator?: string;
         fieldValue?: string;
+        fieldMaxValue?: string;
         customCondition?: TargetConditionTypes.Value[];
     }
 }

package/es/attrConditions/utils/operates.js

@@ -61,6 +61,9 @@ export var numberOperate = [{
 }, {
   name: '≠',
   value: 'not equal'
+}, {
+  name: '区间',
+  value: 'between'
 }];
 export var numberOperateCsh = [{
   name: '>',

package/es/attributeSelector/listPanel.js

@@ -33,7 +33,8 @@ var AttrListPanel = function AttrListPanel(props) {
   var _useContext = useContext(BizGlobalDataContext),
     eventGroupList = _useContext.eventGroupList,
     userPropList = _useContext.userPropList,
-    eventEnvList = _useContext.eventEnvList;
+    eventEnvList = _useContext.eventEnvList,
+    currentApp = _useContext.currentApp;
   var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
     optionList = _useState4[0],
@@ -100,7 +101,7 @@ var AttrListPanel = function AttrListPanel(props) {
     if (enableUserProp) {
       list.push({
         id: data.user,
-        name: '用户属性'
+        name: "".concat((currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u5C5E\u6027")
       });
     }
     if (enableEnvProp) {
@@ -187,7 +188,7 @@ var AttrListPanel = function AttrListPanel(props) {
     if (enableUserProp) {
       list.push({
         isEvent: false,
-        groupName: '用户属性',
+        groupName: "".concat((currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) === 'user' ? '用户' : '主体', "\u5C5E\u6027"),
         key: 'userProps',
         anchor: anchor.user,
         children: userPropList

package/es/constants/apis.d.ts

@@ -10,6 +10,7 @@ declare const Apis: {
     queryDatasetList: string;
     queryProduct: string;
     queryDatasetDetail: string;
+    queryTableInfo: string;
     getSocketToken: string;
     bizDataTypeList: string;
     orderAttributeMaster: string;
@@ -23,5 +24,7 @@ declare const Apis: {
     queryAllTags: string;
     querySubjectList: string;
     queryPanels: string;
+    queryMetaDatasetList: string;
+    queryDatasetTableNames: string;
 };
 export default Apis;

package/es/constants/apis.js

@@ -10,6 +10,7 @@ var Apis = {
   queryDatasetList: '/zg/web/cdp/inner/dataset/list',
   queryProduct: '/zg/web/v2/productTag/queryProduct/',
   queryDatasetDetail: '/zg/web/cdp/inner/dataset/detail',
+  queryTableInfo: '/zg/web/cdp/visual/flow/node/tableInfo',
   getSocketToken: '/zg/web/v2/tracking/view/websocket/token',
   bizDataTypeList: '/cep-console/api/v1/bizdata/type/list',
   orderAttributeMaster: '/cep-console/api/v1/cdp/orderAttribute/master',
@@ -22,6 +23,8 @@ var Apis = {
   queryUserGroup: '/zg/web/v2/userGroup/getAll',
   queryAllTags: '/zg/web/v2/v4/userGroup/label/list',
   querySubjectList: '/zg/web/v2/analysisSubject/queryAllSubject',
-  queryPanels: '/zg/web/v2/apppanel/panels'
+  queryPanels: '/zg/web/v2/apppanel/panels',
+  queryMetaDatasetList: '/zg/web/v2/meta/dataset/list',
+  queryDatasetTableNames: '/zg/web/cdp/dataset/manager/datasetList'
 };
 export default Apis;

package/es/constants/common.d.ts

@@ -1,4 +1,4 @@
-export declare const BuiltinIndicators: {
+export declare const BuiltinIndicators: (type: 'user' | 'custom' | 'product' | undefined) => {
     id: number;
     name: string;
     eventList: {

package/es/constants/common.js

@@ -1,37 +1,39 @@
-export var BuiltinIndicators = {
-  id: -2,
-  name: '整体',
-  eventList: [{
-    name: '新增用户',
-    id: -201,
-    type: 'add',
-    isBuiltIn: true,
-    attrList: []
-  }, {
-    name: '活跃用户',
-    id: -202,
-    type: 'active',
-    isBuiltIn: true,
-    attrList: []
-  }, {
-    name: '访问次数',
-    id: -203,
-    type: 'times',
-    isBuiltIn: true,
-    attrList: []
-  }, {
-    name: '平均使用时长',
-    id: -204,
-    type: 'duration_avg',
-    isBuiltIn: true,
-    attrList: []
-  }, {
-    name: '使用时长分布',
-    id: -205,
-    type: 'duration',
-    isBuiltIn: true,
-    attrList: []
-  }]
+export var BuiltinIndicators = function BuiltinIndicators(type) {
+  return {
+    id: -2,
+    name: '整体',
+    eventList: [{
+      name: "".concat(type === 'user' ? '新增用户' : '新增主体'),
+      id: -201,
+      type: 'add',
+      isBuiltIn: true,
+      attrList: []
+    }, {
+      name: "".concat(type === 'user' ? '活跃用户' : '活跃主体'),
+      id: -202,
+      type: 'active',
+      isBuiltIn: true,
+      attrList: []
+    }, {
+      name: '访问次数',
+      id: -203,
+      type: 'times',
+      isBuiltIn: true,
+      attrList: []
+    }, {
+      name: '平均使用时长',
+      id: -204,
+      type: 'duration_avg',
+      isBuiltIn: true,
+      attrList: []
+    }, {
+      name: '使用时长分布',
+      id: -205,
+      type: 'duration',
+      isBuiltIn: true,
+      attrList: []
+    }]
+  };
 };
 export var indicatorList = [{
   name: '新增用户',

package/es/context/index.d.ts

@@ -21,6 +21,8 @@ export interface AppInfoProps {
     appId?: string | number;
     platform?: string | number;
     appVersion?: appVersionType;
+    type?: 'user' | 'custom' | 'product';
+    unit?: string;
     [prop: string]: any;
 }
 export interface UserInfo {
@@ -62,8 +64,10 @@ export interface GlobalContextProps {
     eventIdMap?: Record<number, AnalysisEvent>;
     userPropList?: UserProp[];
     eventEnvList?: EnvProp[];
-    currentApp?: AppInfoProps;
     currentUser?: UserInfo;
+    currentApp?: AppInfoProps;
+    projectList?: any;
+    currentProject?: any;
     isDemo?: boolean;
     route?: any;
     router?: any;

package/es/dataSetGroup/index.js

@@ -1,9 +1,3 @@
-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); }
@@ -46,22 +40,17 @@ var DataSetGroup = function DataSetGroup(_ref) {
     getDatasetList();
   }, []);
   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) {
-      var dealData = result.data.map(function (item) {
-        return _objectSpread(_objectSpread({}, item), {}, {
-          name: item.datasetName
-        });
-      }) || [];
+      var dealData = result.data;
       setDataset(dealData);
       if (value) {
         var userGroup = dealData === null || dealData === void 0 ? void 0 : dealData.find(function (item) {
-          return item.id === value;
+          return item.metaDatasetId === value;
         });
         if (userGroup) {
           setChosen(userGroup);
@@ -90,7 +79,10 @@ var DataSetGroup = function DataSetGroup(_ref) {
         dataset: dataset,
         onClickCreate: function onClickCreate() {
           router && router.push({
-            name: routes.cdp.dataset
+            name: routes.dataAccess.manage,
+            query: {
+              tab: 4
+            }
           });
           setOpen(false);
         }

package/es/dataSetGroup/overlay.js

@@ -17,8 +17,8 @@ var GroupItem = function GroupItem(_ref) {
     onClose = _ref.onClose,
     setCurrentGroup = _ref.setCurrentGroup;
   return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-item ").concat((currentGroup === null || currentGroup === void 0 ? void 0 : currentGroup.id) === item.id ? 'active' : ''),
-    key: item.id,
+    className: "".concat(classPrefix, "-item ").concat((currentGroup === null || currentGroup === void 0 ? void 0 : currentGroup.metaDatasetId) === item.metaDatasetId ? 'active' : ''),
+    key: item.metaDatasetId,
     onClick: function onClick() {
       setCurrentGroup(item);
       if (onClose) onClose();
@@ -82,9 +82,7 @@ var Overlay = function Overlay(_ref2) {
     onClick: onClickAdd
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "zengjia"
-  }), "\u5FEB\u901F\u521B\u5EFA\u660E\u7EC6\u8868")), /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-divider")
-  }, /*#__PURE__*/React.createElement("span", null, "\u6240\u6709\u7528\u6237")), showList.length > 10 ? /*#__PURE__*/React.createElement(List, {
+  }), "\u5FEB\u901F\u521B\u5EFA\u660E\u7EC6\u8868")), showList.length > 10 ? /*#__PURE__*/React.createElement(List, {
     data: showList || [],
     itemHeight: 32,
     itemKey: "id",
@@ -92,7 +90,7 @@ var Overlay = function Overlay(_ref2) {
     className: "".concat(classPrefix, "-list")
   }, function (item) {
     return /*#__PURE__*/React.createElement(GroupItem, {
-      key: item.id,
+      key: item.metaDatasetId,
       item: item,
       currentGroup: currentGroup,
       setCurrentGroup: setCurrentGroup,
@@ -102,7 +100,7 @@ var Overlay = function Overlay(_ref2) {
     className: "".concat(classPrefix, "-list")
   }, showList === null || showList === void 0 ? void 0 : showList.map(function (item) {
     return /*#__PURE__*/React.createElement(GroupItem, {
-      key: item.id,
+      key: item.metaDatasetId,
       item: item,
       currentGroup: currentGroup,
       setCurrentGroup: setCurrentGroup,

package/es/dataSetGroup/types.d.ts

@@ -6,6 +6,7 @@ export declare namespace UserGroupTypes {
         createTime: Date;
         name: string;
         updateTime: Date;
+        metaDatasetId?: number;
     }
     type Value = number | string[];
     interface Props {

package/es/demoWrapper/content.d.ts

@@ -4,6 +4,8 @@ declare const DemoContent: React.FC<{
     children?: ReactNode;
     needMeta?: boolean;
     currentApp?: AppInfoProps;
+    currentProject?: any;
+    projectList?: any;
     contextProps?: GlobalContextProps;
 }>;
 export default DemoContent;

package/es/demoWrapper/content.js

@@ -50,6 +50,8 @@ function ajax(url, options) {
 var DemoContent = function DemoContent(_ref3) {
   var children = _ref3.children,
     currentApp = _ref3.currentApp,
+    currentProject = _ref3.currentProject,
+    projectList = _ref3.projectList,
     needMeta = _ref3.needMeta,
     contextProps = _ref3.contextProps;
   var _useState = useState([]),
@@ -159,7 +161,7 @@ var DemoContent = function DemoContent(_ref3) {
   }
   useEffect(function () {
     loadAuthorityList();
-  }, []);
+  }, [currentApp]);
   function loadBasicConfigLoad() {
     setLoadUsers(true);
     ajax('/zg/web/v2/system/config', {
@@ -219,6 +221,8 @@ var DemoContent = function DemoContent(_ref3) {
       currentApp: _objectSpread(_objectSpread({}, currentApp), {}, {
         appId: currentApp === null || currentApp === void 0 ? void 0 : currentApp.id
       }),
+      currentProject: currentProject,
+      projectList: projectList,
       eventGroupList: store === null || store === void 0 ? void 0 : store.eventGroupList,
       userPropList: store === null || store === void 0 ? void 0 : store.userPropList,
       eventEnvList: store === null || store === void 0 ? void 0 : store.envPropList,

package/es/demoWrapper/demo/index.js

@@ -2,11 +2,24 @@ import React, { useContext } from 'react';
 import { DemoWrapper, BizGlobalDataContext, useChanged } from '@zgfe/business-lib';
 function Test() {
   var _useContext = useContext(BizGlobalDataContext),
-    currentApp = _useContext.currentApp;
+    currentApp = _useContext.currentApp,
+    currentProject = _useContext.currentProject;
   useChanged(function () {
     console.log('currentApp changed', currentApp);
   }, currentApp);
-  return /*#__PURE__*/React.createElement("span", null, "\u5F53\u524D\u5E94\u7528\uFF1A", currentApp === null || currentApp === void 0 ? void 0 : currentApp.appName, "(id: ", currentApp === null || currentApp === void 0 ? void 0 : currentApp.id, ")");
+  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+    style: {
+      margin: '20px',
+      padding: '20px 20px 10px 20px',
+      background: 'pink'
+    }
+  }, /*#__PURE__*/React.createElement("p", null, " \u5F53\u524D\u5E94\u7528\u540D\u79F0: ", currentProject === null || currentProject === void 0 ? void 0 : currentProject.projectName), /*#__PURE__*/React.createElement("p", null, " \u5F53\u524D\u5E94\u7528id: ", currentProject === null || currentProject === void 0 ? void 0 : currentProject.projectId)), /*#__PURE__*/React.createElement("div", {
+    style: {
+      margin: '20px',
+      padding: '20px 20px 10px 20px',
+      background: '#FFEB3B'
+    }
+  }, /*#__PURE__*/React.createElement("p", null, " \u5F53\u524D\u4E3B\u4F53\u540D\u79F0: ", currentApp === null || currentApp === void 0 ? void 0 : currentApp.appName), /*#__PURE__*/React.createElement("p", null, " \u5F53\u524D\u4E3B\u4F53id: ", currentApp === null || currentApp === void 0 ? void 0 : currentApp.id)));
 }
 export default (function () {
   return /*#__PURE__*/React.createElement(DemoWrapper, {