@zgfe/modules-dm 1.0.38-session.0 → 1.0.39-session.0

package/es/components/demo.js

@@ -6,6 +6,13 @@ import { DemoWrapper } from '@zgfe/business-lib';
 import { ConfigProvider } from 'antd';
 import zhCN from 'antd/es/locale/zh_CN';
 var DemoWrapper2 = function DemoWrapper2(props) {
+  var authority = {
+    10018: true,
+    10019: true,
+    100020: true,
+    1700559695: true,
+    100021: true
+  };
   return /*#__PURE__*/React.createElement(ConfigProvider, {
     locale: zhCN
   }, /*#__PURE__*/React.createElement("div", {
@@ -16,7 +23,10 @@ var DemoWrapper2 = function DemoWrapper2(props) {
     }
   }, /*#__PURE__*/React.createElement(DemoWrapper, {
     needMeta: true,
-    defaultApp: 502306
+    defaultApp: 323,
+    contextProps: {
+      authority: authority
+    }
   }, props.children)));
 };
 export default DemoWrapper2;

package/es/modules/dataCollection/collectionEventList.js

@@ -380,14 +380,15 @@ var CollectionEventList = function CollectionEventList(props) {
   }, "\u5171", /*#__PURE__*/React.createElement("span", null, total), "\u6761"), /*#__PURE__*/React.createElement("div", {
     className: "top-button"
   }, /*#__PURE__*/React.createElement(Button, {
-    type: "primary",
     shape: "round",
+    className: "button ".concat(!authority[1000002] ? 'disabled' : ''),
     disabled: !authority[1000002],
     onClick: function onClick() {
       return setEventNameShow(true);
     }
   }, "\u521B\u5EFA\u4E8B\u4EF6\u5206\u7EC4"), /*#__PURE__*/React.createElement(Button, {
     shape: "round",
+    className: "button ".concat(!authority[1700636282] ? 'disabled' : ''),
     disabled: !authority[1700636282],
     onClick: function onClick() {
       return setEventGroupingShow(true);
@@ -432,7 +433,7 @@ var CollectionEventList = function CollectionEventList(props) {
     eventGroupingShow: eventGroupingShow,
     setEventGroupingShow: setEventGroupingShow,
     refresh: refreshHandle,
-    source: 'collection'
+    source: "collection"
   }), /*#__PURE__*/React.createElement(Modal, {
     title: "\u521B\u5EFA\u5206\u7EC4",
     className: "creact-group",

package/es/modules/dataCollection/index.d.ts

@@ -1,11 +1,16 @@
 import React from 'react';
 interface DataCollectionProps {
+    /**
+     * 默认选中菜单
+     */
+    activeTab?: number | string;
     /**
      * 拓展的一级菜单
      */
     extraTabs?: {
         key: string;
         label: string;
+        hidden?: boolean;
         children: React.ReactNode;
         [other: string]: any;
     }[];

package/es/modules/dataCollection/index.js

@@ -13,14 +13,13 @@ import { getAppID } from '../../utils';
 import EventList from './collectionEventList';
 import CollectionAttributeList from './collectionAttributeList';
 import VirtualEventList from './virtualEventList';
-import { SessionManage } from '@zgfe/modules-session';
 var DataCollection = function DataCollection(props) {
   var _props$extraTabs, _props$extraTabs2;
   var classPrefix = 'data-collection';
   var _useContext = useContext(BizGlobalDataContext),
     currentApp = _useContext.currentApp,
     authority = _useContext.authority;
-  var _useState = useState(1),
+  var _useState = useState(props.activeTab || 1),
     _useState2 = _slicedToArray(_useState, 2),
     listTab = _useState2[0],
     setListTab = _useState2[1];
@@ -77,9 +76,8 @@ var DataCollection = function DataCollection(props) {
     value: 3
   }, "\u865A\u62DF\u4E8B\u4EF6"), authority[100021] && /*#__PURE__*/React.createElement(Radio.Button, {
     value: 2
-  }, "\u7528\u6237\u5C5E\u6027\u7BA1\u7406"), authority[1701310624] && /*#__PURE__*/React.createElement(Radio.Button, {
-    value: "session"
-  }, "Session\u7BA1\u7406"), (_props$extraTabs = props.extraTabs) === null || _props$extraTabs === void 0 ? void 0 : _props$extraTabs.map(function (item) {
+  }, "\u7528\u6237\u5C5E\u6027\u7BA1\u7406"), (_props$extraTabs = props.extraTabs) === null || _props$extraTabs === void 0 ? void 0 : _props$extraTabs.map(function (item) {
+    if (item.hidden) return null;
     return /*#__PURE__*/React.createElement(Radio.Button, {
       key: item.key,
       value: item.key,
@@ -92,8 +90,8 @@ var DataCollection = function DataCollection(props) {
     isOpen: isOpen,
     queryPlanData: queryPlanData,
     source: "user"
-  }), listTab == 'session' && authority[1701310624] && /*#__PURE__*/React.createElement(SessionManage, null), (_props$extraTabs2 = props.extraTabs) === null || _props$extraTabs2 === void 0 ? void 0 : _props$extraTabs2.map(function (item) {
-    return listTab === item.key ? /*#__PURE__*/React.createElement("div", {
+  }), (_props$extraTabs2 = props.extraTabs) === null || _props$extraTabs2 === void 0 ? void 0 : _props$extraTabs2.map(function (item) {
+    return listTab === item.key && !item.hidden ? /*#__PURE__*/React.createElement("div", {
       key: item.key
     }, item.children) : null;
   }));

package/es/modules/dataCollection/styles/index.less

@@ -93,8 +93,7 @@
       display: flex;
       gap: 16px;
       line-height: 100%;
-      > :nth-child(2),
-      > :nth-child(3) {
+      .button:not(.disabled) {
         color: #1454e5;
         border: 1px solid #1454e5;
       }

package/es/modules/dataCollection/virtualEventList.js

@@ -281,12 +281,14 @@ var VirtualEventList = function VirtualEventList() {
     }
   }, "\u521B\u5EFA\u865A\u62DF\u4E8B\u4EF6"), /*#__PURE__*/React.createElement(Button, {
     shape: "round",
+    className: "button ".concat(!authority[1700636137] ? 'disabled' : ''),
     disabled: !authority[1700636137],
     onClick: function onClick() {
       return setEventNameShow(true);
     }
   }, "\u521B\u5EFA\u4E8B\u4EF6\u5206\u7EC4"), /*#__PURE__*/React.createElement(Button, {
     shape: "round",
+    className: "button ".concat(!authority[1700636017] ? 'disabled' : ''),
     disabled: !authority[1700636017],
     onClick: function onClick() {
       return setEventGroupingShow(true);
@@ -319,7 +321,7 @@ var VirtualEventList = function VirtualEventList() {
     eventGroupingShow: eventGroupingShow,
     setEventGroupingShow: setEventGroupingShow,
     refresh: queryList,
-    source: 'virtual'
+    source: "virtual"
   }), /*#__PURE__*/React.createElement(Modal, {
     title: "\u521B\u5EFA\u5206\u7EC4",
     className: "creact-group",

package/es/modules/dataManage/demo/index.js

@@ -2,6 +2,11 @@ import React from 'react';
 import { DataManage } from '@zgfe/modules-dm';
 import DemoWrapper from '../../../components/demo';
 export default (function () {
+  var subTabs = [{
+    key: 'session',
+    label: 'Session管理',
+    children: /*#__PURE__*/React.createElement("div", null, "Session\u7BA1\u7406")
+  }];
   return /*#__PURE__*/React.createElement(DemoWrapper, null, /*#__PURE__*/React.createElement(DataManage
   // extraTabs={[
   //   {
@@ -10,12 +15,15 @@ export default (function () {
   //     children: <div>aaa</div>,
   //   },
   // ]}
-  // extraSubTabs={[
-  //   {
-  //     key: 'bbb',
-  //     label: '拓展二级菜单',
-  //     children: <div>bbb</div>,
-  //   },
-  // ]}
-  , null));
+  , {
+    // extraTabs={[
+    //   {
+    //     key: 'aaa',
+    //     label: '拓展菜单',
+    //     children: <div>aaa</div>,
+    //   },
+    // ]}
+    extraSubTabs: subTabs,
+    activeSubTab: "session"
+  }));
 });

package/es/modules/dataManage/index.d.ts

@@ -25,6 +25,10 @@ interface DataManageProps {
         children: React.ReactNode;
         [other: string]: any;
     }[];
+    /**
+     * 默认选中菜单
+     */
+    activeSubTab?: number | string;
 }
 declare const DataManage: React.FC<DataManageProps>;
 export default DataManage;

package/es/modules/dataManage/index.js

@@ -46,6 +46,7 @@ var DataManage = function DataManage(props) {
       key: '0',
       label: '埋点管理',
       children: /*#__PURE__*/React.createElement(DataCollection, {
+        activeTab: props.activeSubTab,
         extraTabs: props.extraSubTabs
       })
     }, authority[10019] && {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zgfe/modules-dm",
-  "version": "1.0.38-session.0",
+  "version": "1.0.39-session.0",
   "license": "ISC",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -40,7 +40,6 @@
     "@umijs/fabric": "^2.8.1",
     "@umijs/test": "^3.0.5",
     "@zgfe/business-lib": "1.2.3-heyh.1",
-    "@zgfe/modules-session": "1.0.1-alpha.1",
     "antd": "4.24.10",
     "dumi": "^1.1.0",
     "father-build": "^1.17.2",
@@ -52,7 +51,7 @@
     "umi-request": "^1.4.0",
     "yorkie": "^2.0.0"
   },
-  "gitHead": "e3f7e70f36fb32359a4bc51b64a7289265959be9",
+  "gitHead": "951170e644a46fd388269e91dea5d98e9f52bb2b",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }