@zgfe/modules-dm 1.0.38 → 1.0.39-session.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/components/demo.js +11 -1
- package/es/modules/dataCollection/collectionEventList.js +1 -1
- package/es/modules/dataCollection/components/eventFilter/styles/index.less +0 -0
- package/es/modules/dataCollection/index.d.ts +5 -0
- package/es/modules/dataCollection/index.js +3 -2
- package/es/modules/dataCollection/styles/index.less +6 -6
- package/es/modules/dataCollection/virtualEventList.js +1 -1
- package/es/modules/dataManage/demo/index.js +16 -8
- package/es/modules/dataManage/index.d.ts +4 -0
- package/es/modules/dataManage/index.js +1 -0
- package/package.json +3 -3
package/es/components/demo.js
CHANGED
|
@@ -6,6 +6,13 @@ import { DemoWrapper } from '@zgfe/business-lib';
|
|
|
6
6
|
import { ConfigProvider } from 'antd';
|
|
7
7
|
import zhCN from 'antd/es/locale/zh_CN';
|
|
8
8
|
var DemoWrapper2 = function DemoWrapper2(props) {
|
|
9
|
+
var authority = {
|
|
10
|
+
10018: true,
|
|
11
|
+
10019: true,
|
|
12
|
+
100020: true,
|
|
13
|
+
1700559695: true,
|
|
14
|
+
100021: true
|
|
15
|
+
};
|
|
9
16
|
return /*#__PURE__*/React.createElement(ConfigProvider, {
|
|
10
17
|
locale: zhCN
|
|
11
18
|
}, /*#__PURE__*/React.createElement("div", {
|
|
@@ -16,7 +23,10 @@ var DemoWrapper2 = function DemoWrapper2(props) {
|
|
|
16
23
|
}
|
|
17
24
|
}, /*#__PURE__*/React.createElement(DemoWrapper, {
|
|
18
25
|
needMeta: true,
|
|
19
|
-
defaultApp:
|
|
26
|
+
defaultApp: 323,
|
|
27
|
+
contextProps: {
|
|
28
|
+
authority: authority
|
|
29
|
+
}
|
|
20
30
|
}, props.children)));
|
|
21
31
|
};
|
|
22
32
|
export default DemoWrapper2;
|
|
@@ -433,7 +433,7 @@ var CollectionEventList = function CollectionEventList(props) {
|
|
|
433
433
|
eventGroupingShow: eventGroupingShow,
|
|
434
434
|
setEventGroupingShow: setEventGroupingShow,
|
|
435
435
|
refresh: refreshHandle,
|
|
436
|
-
source:
|
|
436
|
+
source: "collection"
|
|
437
437
|
}), /*#__PURE__*/React.createElement(Modal, {
|
|
438
438
|
title: "\u521B\u5EFA\u5206\u7EC4",
|
|
439
439
|
className: "creact-group",
|
|
File without changes
|
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
interface DataCollectionProps {
|
|
3
|
+
/**
|
|
4
|
+
* 默认选中菜单
|
|
5
|
+
*/
|
|
6
|
+
activeTab?: number | string;
|
|
3
7
|
/**
|
|
4
8
|
* 拓展的一级菜单
|
|
5
9
|
*/
|
|
6
10
|
extraTabs?: {
|
|
7
11
|
key: string;
|
|
8
12
|
label: string;
|
|
13
|
+
hidden?: boolean;
|
|
9
14
|
children: React.ReactNode;
|
|
10
15
|
[other: string]: any;
|
|
11
16
|
}[];
|
|
@@ -19,7 +19,7 @@ var DataCollection = function DataCollection(props) {
|
|
|
19
19
|
var _useContext = useContext(BizGlobalDataContext),
|
|
20
20
|
currentApp = _useContext.currentApp,
|
|
21
21
|
authority = _useContext.authority;
|
|
22
|
-
var _useState = useState(1),
|
|
22
|
+
var _useState = useState(props.activeTab || 1),
|
|
23
23
|
_useState2 = _slicedToArray(_useState, 2),
|
|
24
24
|
listTab = _useState2[0],
|
|
25
25
|
setListTab = _useState2[1];
|
|
@@ -77,6 +77,7 @@ var DataCollection = function DataCollection(props) {
|
|
|
77
77
|
}, "\u865A\u62DF\u4E8B\u4EF6"), authority[100021] && /*#__PURE__*/React.createElement(Radio.Button, {
|
|
78
78
|
value: 2
|
|
79
79
|
}, "\u7528\u6237\u5C5E\u6027\u7BA1\u7406"), (_props$extraTabs = props.extraTabs) === null || _props$extraTabs === void 0 ? void 0 : _props$extraTabs.map(function (item) {
|
|
80
|
+
if (item.hidden) return null;
|
|
80
81
|
return /*#__PURE__*/React.createElement(Radio.Button, {
|
|
81
82
|
key: item.key,
|
|
82
83
|
value: item.key,
|
|
@@ -90,7 +91,7 @@ var DataCollection = function DataCollection(props) {
|
|
|
90
91
|
queryPlanData: queryPlanData,
|
|
91
92
|
source: "user"
|
|
92
93
|
}), (_props$extraTabs2 = props.extraTabs) === null || _props$extraTabs2 === void 0 ? void 0 : _props$extraTabs2.map(function (item) {
|
|
93
|
-
return listTab === item.key ? /*#__PURE__*/React.createElement("div", {
|
|
94
|
+
return listTab === item.key && !item.hidden ? /*#__PURE__*/React.createElement("div", {
|
|
94
95
|
key: item.key
|
|
95
96
|
}, item.children) : null;
|
|
96
97
|
}));
|
|
@@ -5,8 +5,8 @@
|
|
|
5
5
|
padding: 24px;
|
|
6
6
|
background: #fff;
|
|
7
7
|
border-radius: 8px;
|
|
8
|
-
.ant-select{
|
|
9
|
-
border-radius: 4px!important;
|
|
8
|
+
.ant-select {
|
|
9
|
+
border-radius: 4px !important;
|
|
10
10
|
}
|
|
11
11
|
.loading {
|
|
12
12
|
position: fixed;
|
|
@@ -397,8 +397,8 @@
|
|
|
397
397
|
}
|
|
398
398
|
|
|
399
399
|
.event-list-drawer {
|
|
400
|
-
.ant-select{
|
|
401
|
-
border-radius: 4px!important;
|
|
400
|
+
.ant-select {
|
|
401
|
+
border-radius: 4px !important;
|
|
402
402
|
}
|
|
403
403
|
.ant-drawer-header-title {
|
|
404
404
|
height: 20px;
|
|
@@ -413,8 +413,8 @@
|
|
|
413
413
|
}
|
|
414
414
|
|
|
415
415
|
.create-virtual-drawer {
|
|
416
|
-
.ant-select{
|
|
417
|
-
border-radius: 4px!important;
|
|
416
|
+
.ant-select {
|
|
417
|
+
border-radius: 4px !important;
|
|
418
418
|
}
|
|
419
419
|
#basic {
|
|
420
420
|
padding-bottom: 100px;
|
|
@@ -321,7 +321,7 @@ var VirtualEventList = function VirtualEventList() {
|
|
|
321
321
|
eventGroupingShow: eventGroupingShow,
|
|
322
322
|
setEventGroupingShow: setEventGroupingShow,
|
|
323
323
|
refresh: queryList,
|
|
324
|
-
source:
|
|
324
|
+
source: "virtual"
|
|
325
325
|
}), /*#__PURE__*/React.createElement(Modal, {
|
|
326
326
|
title: "\u521B\u5EFA\u5206\u7EC4",
|
|
327
327
|
className: "creact-group",
|
|
@@ -2,6 +2,11 @@ import React from 'react';
|
|
|
2
2
|
import { DataManage } from '@zgfe/modules-dm';
|
|
3
3
|
import DemoWrapper from '../../../components/demo';
|
|
4
4
|
export default (function () {
|
|
5
|
+
var subTabs = [{
|
|
6
|
+
key: 'session',
|
|
7
|
+
label: 'Session管理',
|
|
8
|
+
children: /*#__PURE__*/React.createElement("div", null, "Session\u7BA1\u7406")
|
|
9
|
+
}];
|
|
5
10
|
return /*#__PURE__*/React.createElement(DemoWrapper, null, /*#__PURE__*/React.createElement(DataManage
|
|
6
11
|
// extraTabs={[
|
|
7
12
|
// {
|
|
@@ -10,12 +15,15 @@ export default (function () {
|
|
|
10
15
|
// children: <div>aaa</div>,
|
|
11
16
|
// },
|
|
12
17
|
// ]}
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
18
|
+
, {
|
|
19
|
+
// extraTabs={[
|
|
20
|
+
// {
|
|
21
|
+
// key: 'aaa',
|
|
22
|
+
// label: '拓展菜单',
|
|
23
|
+
// children: <div>aaa</div>,
|
|
24
|
+
// },
|
|
25
|
+
// ]}
|
|
26
|
+
extraSubTabs: subTabs,
|
|
27
|
+
activeSubTab: "session"
|
|
28
|
+
}));
|
|
21
29
|
});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zgfe/modules-dm",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.39-session.0",
|
|
4
4
|
"license": "ISC",
|
|
5
5
|
"module": "es/index.js",
|
|
6
6
|
"typings": "es/index.d.ts",
|
|
@@ -44,14 +44,14 @@
|
|
|
44
44
|
"dumi": "^1.1.0",
|
|
45
45
|
"father-build": "^1.17.2",
|
|
46
46
|
"gh-pages": "^3.0.0",
|
|
47
|
-
"lerna": "^
|
|
47
|
+
"lerna": "^4.0.0",
|
|
48
48
|
"lint-staged": "^10.0.7",
|
|
49
49
|
"lodash": "^4.17.21",
|
|
50
50
|
"prettier": "^2.2.1",
|
|
51
51
|
"umi-request": "^1.4.0",
|
|
52
52
|
"yorkie": "^2.0.0"
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "951170e644a46fd388269e91dea5d98e9f52bb2b",
|
|
55
55
|
"gitHooks": {
|
|
56
56
|
"pre-commit": "lint-staged"
|
|
57
57
|
}
|