@zgfe/business-lib 1.2.34-lijingyu1538.9 → 1.2.34-tags.2

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

@@ -2,7 +2,6 @@ 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[];
@@ -17,7 +16,7 @@ export declare const validator: (type: string, condition?: TargetConditionTypes.
     isOk: boolean;
     msg: string;
 };
-export declare const getDimension: (currentApp: AppInfoProps | undefined, data: TargetConditionTypes.DimensionValue, eId?: number, eventGroupList?: EventGroup[]) => string;
+export declare const getDimension: (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(currentApp, data, eId, eventGroupList) {
+export var getDimension = function getDimension(data, eId, eventGroupList) {
   var name = '';
-  normalOptions(currentApp === null || currentApp === void 0 ? void 0 : currentApp.type).concat(attrOptions).forEach(function (item) {
+  normalOptions.concat(attrOptions).forEach(function (item) {
     if (item.value === data.analysisIndex) {
       name = item.label;
     }

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

@@ -40,8 +40,7 @@ var FormulaItem = function FormulaItem(props) {
     isValidate = _useState10[0],
     setIsValidate = _useState10[1];
   var _useContext = useContext(BizGlobalDataContext),
-    eventGroupList = _useContext.eventGroupList,
-    currentApp = _useContext.currentApp;
+    eventGroupList = _useContext.eventGroupList;
   var _useState11 = useState(false),
     _useState12 = _slicedToArray(_useState11, 2),
     open = _useState12[0],
@@ -59,7 +58,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(currentApp, condition.analysisDimension, condition.eventId, eventGroupList));
+        setDimension(getDimension(condition.analysisDimension, condition.eventId, eventGroupList));
         setHaveFilter(judgeHaveFilter(condition.filters));
       } else {
         setHaveFilter(!!(condition.filters || []).length);

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

@@ -32,8 +32,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
   var _useState = useState(function () {
       if (props.value) {
         return {
-          metaDatasetId: props.value.metaDatasetId,
-          datasetId: props.value.datasetId,
+          id: props.value.datasetId,
           tableName: props.value.datasetTable
         };
       }
@@ -90,11 +89,9 @@ var CdpConditionItem = function CdpConditionItem(props) {
       datasetName = _props$value.datasetName,
       datasetTable = _props$value.datasetTable,
       fieldName = _props$value.fieldName,
-      filters = _props$value.filters,
-      metaDatasetId = _props$value.metaDatasetId;
+      filters = _props$value.filters;
     setDataset({
-      metaDatasetId: metaDatasetId,
-      datasetId: datasetId,
+      id: datasetId,
       tableName: datasetTable,
       datasetName: datasetName
     });
@@ -115,8 +112,7 @@ var CdpConditionItem = function CdpConditionItem(props) {
     if (isFirst) return;
     if (!dataset) return;
     var data = {
-      metaDatasetId: dataset.metaDatasetId,
-      datasetId: dataset.datasetId,
+      datasetId: dataset.id,
       datasetTable: dataset.tableName,
       datasetName: dataset.datasetName,
       fieldName: field === null || field === void 0 ? void 0 : field.name,
@@ -150,12 +146,12 @@ var CdpConditionItem = function CdpConditionItem(props) {
     });
   };
   var onTableChange = function onTableChange(data) {
-    if (data && data.metaDatasetId !== (dataset === null || dataset === void 0 ? void 0 : dataset.metaDatasetId)) {
+    if (data && data.id !== (dataset === null || dataset === void 0 ? void 0 : dataset.id)) {
       setDataset(data);
       setField({
         name: undefined
       });
-      onDatasetChange(data.datasetId);
+      onDatasetChange(data.id);
       setFilters([]);
     }
   };
@@ -170,12 +166,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.metaDatasetId,
+    value: dataset === null || dataset === void 0 ? void 0 : dataset.id,
     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.metaDatasetId) ? /*#__PURE__*/React.createElement("div", {
+  }, "AUM\u6307\u6807\u4E0D\u53EF\u4E3A\u7A7A") : null), (dataset === null || dataset === void 0 ? void 0 : dataset.id) ? /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-item"),
     style: {
       flexDirection: 'column'
@@ -346,6 +342,9 @@ 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,7 +20,6 @@ export interface BusinessProps {
     datasetTable: string;
     datasetName: string;
     fieldName: string;
-    metaDatasetId?: number;
     filters: {
         calculate: string;
         operator: string;

package/es/attrCondition/useAttrCondition.d.ts

@@ -11,5 +11,6 @@ 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;
+  var _props$defaultValue, _props$value, _props$defaultValue2, _props$value2, _props$defaultValue3, _props$value3;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     attr = _useState2[0],
@@ -25,6 +25,9 @@ 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) {
@@ -100,7 +103,8 @@ var useAttrCondition = function useAttrCondition(props) {
     onDelete: onDelete,
     onChangeAttr: onChangeAttr,
     onChangeOperate: onChangeOperate,
-    onChangeValues: onChangeValues
+    onChangeValues: onChangeValues,
+    placeholder: placeholder
   };
 };
 export default useAttrCondition;

package/es/attrConditions/components/operateList.js

@@ -1,7 +1,3 @@
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 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); }
@@ -65,14 +61,8 @@ var BizOperateList = function BizOperateList(props) {
         optionData = specialOperate;
       } else {
         optionData = stringOperate;
-        if (props === null || props === void 0 ? void 0 : props.supportNPlace) {
-          optionData = [].concat(_toConsumableArray(optionData), [{
-            name: '第N位是',
-            value: '{n}th place is'
-          }, {
-            name: '第N位不是',
-            value: '{n}th place not is'
-          }]);
+        if (!props.supportNPlace) {
+          optionData = optionData.slice(0, -2);
         }
       }
     }

package/es/attrConditions/index.js

@@ -54,6 +54,7 @@ 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,
@@ -73,6 +74,7 @@ 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,6 +23,7 @@ export declare namespace AttrConditionTypes {
         dimensionSub?: string;
         operator?: OperateTypes;
         values?: string[];
+        placeholder?: string;
     }
     interface GroupValue {
         relation?: 'and' | 'or';

package/es/attrConditions/utils/operates.js

@@ -36,6 +36,12 @@ export var stringOperate = [{
 }, {
   name: '不是空值',
   value: 'is not null'
+}, {
+  name: '第N位是',
+  value: '{n}th place is'
+}, {
+  name: '第N位不是',
+  value: '{n}th place not is'
 }];
 export var numberOperate = [{
   name: '>',

package/es/attributeSelector/listPanel.js

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

package/es/constants/apis.d.ts

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

package/es/constants/apis.js

@@ -10,7 +10,6 @@ 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',
@@ -23,8 +22,6 @@ 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',
-  queryMetaDatasetList: '/zg/web/v2/meta/dataset/list',
-  queryDatasetTableNames: '/zg/web/cdp/dataset/manager/datasetList'
+  queryPanels: '/zg/web/v2/apppanel/panels'
 };
 export default Apis;

package/es/constants/common.d.ts

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

package/es/constants/common.js

@@ -1,39 +1,37 @@
-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 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 indicatorList = [{
   name: '新增用户',

package/es/context/index.d.ts

@@ -21,30 +21,21 @@ export interface AppInfoProps {
     appId?: string | number;
     platform?: string | number;
     appVersion?: appVersionType;
-    type?: 'user' | 'custom' | 'product';
-    unit?: string;
     [prop: string]: any;
 }
-export interface AuthConfig {
-    dataAuth?: Array<any>;
-    groupIds?: number[];
-    defaultAuth: any;
-}
 export interface UserInfo {
     id: number;
-    userId: number;
     companyBuyVersion: number;
     username: string;
     email: string;
     emailNote: string;
-    telphone: string;
-    secret: string;
+    telphone?: string;
+    secret?: string;
     companyId: number;
     serviceType: serviceTypeType;
     companyName: string;
-    isAdmin: boolean;
-    cdpVersion: cdpVersionType;
-    authConfig: AuthConfig;
+    isAdmin?: boolean;
+    cdpVersion?: cdpVersionType;
 }
 export interface Menu {
     helpUrl: string;
@@ -71,10 +62,8 @@ export interface GlobalContextProps {
     eventIdMap?: Record<number, AnalysisEvent>;
     userPropList?: UserProp[];
     eventEnvList?: EnvProp[];
-    currentUser?: UserInfo;
     currentApp?: AppInfoProps;
-    projectList?: any;
-    currentProject?: any;
+    currentUser?: UserInfo;
     isDemo?: boolean;
     route?: any;
     router?: any;

package/es/dataSetGroup/index.js

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

package/es/dataSetGroup/overlay.js

@@ -11,15 +11,14 @@ import List from 'rc-virtual-list';
 import _ from 'lodash';
 import IconFont from '../icon/iconFont';
 import UserGroupContext from './context';
-import BizGlobalDataContext from '../context';
 var GroupItem = function GroupItem(_ref) {
   var item = _ref.item,
     currentGroup = _ref.currentGroup,
     onClose = _ref.onClose,
     setCurrentGroup = _ref.setCurrentGroup;
   return /*#__PURE__*/React.createElement("div", {
-    className: "".concat(classPrefix, "-item ").concat((currentGroup === null || currentGroup === void 0 ? void 0 : currentGroup.metaDatasetId) === item.metaDatasetId ? 'active' : ''),
-    key: item.metaDatasetId,
+    className: "".concat(classPrefix, "-item ").concat((currentGroup === null || currentGroup === void 0 ? void 0 : currentGroup.id) === item.id ? 'active' : ''),
+    key: item.id,
     onClick: function onClick() {
       setCurrentGroup(item);
       if (onClose) onClose();
@@ -45,8 +44,6 @@ var Overlay = function Overlay(_ref2) {
   var _useContext = useContext(UserGroupContext),
     value = _useContext.value,
     setValue = _useContext.setValue;
-  var _useContext2 = useContext(BizGlobalDataContext),
-    currentApp = _useContext2.currentApp;
   useEffect(function () {
     onSearch('');
     setType('userGroup');
@@ -87,7 +84,7 @@ var Overlay = function Overlay(_ref2) {
     type: "zengjia"
   }), "\u5FEB\u901F\u521B\u5EFA\u660E\u7EC6\u8868")), /*#__PURE__*/React.createElement("div", {
     className: "".concat(classPrefix, "-divider")
-  }, /*#__PURE__*/React.createElement("span", null, "\u6240\u6709", (currentApp === null || currentApp === void 0 ? void 0 : currentApp.type) != 'user' ? '主体' : '用户')), showList.length > 10 ? /*#__PURE__*/React.createElement(List, {
+  }, /*#__PURE__*/React.createElement("span", null, "\u6240\u6709\u7528\u6237")), showList.length > 10 ? /*#__PURE__*/React.createElement(List, {
     data: showList || [],
     itemHeight: 32,
     itemKey: "id",
@@ -95,7 +92,7 @@ var Overlay = function Overlay(_ref2) {
     className: "".concat(classPrefix, "-list")
   }, function (item) {
     return /*#__PURE__*/React.createElement(GroupItem, {
-      key: item.metaDatasetId,
+      key: item.id,
       item: item,
       currentGroup: currentGroup,
       setCurrentGroup: setCurrentGroup,
@@ -105,7 +102,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.metaDatasetId,
+      key: item.id,
       item: item,
       currentGroup: currentGroup,
       setCurrentGroup: setCurrentGroup,

package/es/dataSetGroup/types.d.ts

@@ -6,7 +6,6 @@ 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,8 +4,6 @@ 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,8 +50,6 @@ 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([]),
@@ -90,18 +88,14 @@ var DemoContent = function DemoContent(_ref3) {
     _useState18 = _slicedToArray(_useState17, 2),
     loadUsers = _useState18[0],
     setLoadUsers = _useState18[1];
-  var _useState19 = useState({}),
+  var _useState19 = useState(),
     _useState20 = _slicedToArray(_useState19, 2),
-    currentUser = _useState20[0],
-    setCurrentUser = _useState20[1];
-  var _useState21 = useState(),
+    store = _useState20[0],
+    setStore = _useState20[1];
+  var _useState21 = useState(false),
     _useState22 = _slicedToArray(_useState21, 2),
-    store = _useState22[0],
-    setStore = _useState22[1];
-  var _useState23 = useState(false),
-    _useState24 = _slicedToArray(_useState23, 2),
-    storeReady = _useState24[0],
-    setStoreReady = _useState24[1];
+    storeReady = _useState22[0],
+    setStoreReady = _useState22[1];
   var _useBizStore = useBizStore({
       currentApp: currentApp,
       authority: authority
@@ -121,7 +115,6 @@ var DemoContent = function DemoContent(_ref3) {
       loadEvents();
       loadEnvList();
       loadBasicConfigLoad();
-      loadCurrentUserLoad();
     } else {
       setLoadEnv(false);
       setLoadEvent(false);
@@ -166,15 +159,7 @@ var DemoContent = function DemoContent(_ref3) {
   }
   useEffect(function () {
     loadAuthorityList();
-  }, [currentApp]);
-  function loadCurrentUserLoad() {
-    ajax('/zg/web/v2/company/currentUser', {
-      method: 'get'
-    }).then(function (res) {
-      var _res$data;
-      setCurrentUser(res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.user);
-    });
-  }
+  }, []);
   function loadBasicConfigLoad() {
     setLoadUsers(true);
     ajax('/zg/web/v2/system/config', {
@@ -237,14 +222,11 @@ var DemoContent = function DemoContent(_ref3) {
       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,
+      authority: authority,
+      basicConfig: basicConfig,
       eventIdMap: store === null || store === void 0 ? void 0 : store.eventIdMap,
       eventNameMap: store === null || store === void 0 ? void 0 : store.eventNameMap,
-      currentProject: currentProject,
-      projectList: projectList,
-      basicConfig: basicConfig,
       userGroupList: userGroupList,
-      authority: authority,
-      currentUser: currentUser,
       groupLoading: groupLoading,
       setUserGroupList: setUserGroupList,
       tagList: tagList,