aldehyde 0.2.133 → 0.2.134
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/lib/layout/menu/block.d.ts.map +1 -1
- package/lib/layout/menu/block.js.map +1 -1
- package/lib/layout/menu/menu-render.js +1 -1
- package/lib/layout/menu/menu-render.js.map +1 -1
- package/lib/module/block-menu-tree-drawer.d.ts +39 -0
- package/lib/module/block-menu-tree-drawer.d.ts.map +1 -0
- package/lib/module/block-menu-tree-drawer.js +99 -0
- package/lib/module/block-menu-tree-drawer.js.map +1 -0
- package/lib/table/act-table.d.ts +4 -0
- package/lib/table/act-table.d.ts.map +1 -1
- package/lib/table/act-table.js +21 -4
- package/lib/table/act-table.js.map +1 -1
- package/lib/table/query-table.d.ts.map +1 -1
- package/lib/table/query-table.js +9 -6
- package/lib/table/query-table.js.map +1 -1
- package/lib/tmpl/hcservice-v3.d.ts +3 -0
- package/lib/tmpl/hcservice-v3.d.ts.map +1 -1
- package/lib/tmpl/hcservice-v3.js +37 -0
- package/lib/tmpl/hcservice-v3.js.map +1 -1
- package/lib/tmpl/interface.d.ts +9 -3
- package/lib/tmpl/interface.d.ts.map +1 -1
- package/lib/tree/block-menu-auth-tree.d.ts +33 -0
- package/lib/tree/block-menu-auth-tree.d.ts.map +1 -0
- package/lib/tree/block-menu-auth-tree.js +144 -0
- package/lib/tree/block-menu-auth-tree.js.map +1 -0
- package/lib/welcome/HCWelcome.js +35 -6
- package/lib/welcome/HCWelcome.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/index.tsx +1 -1
- package/src/aldehyde/layout/menu/block.tsx +0 -1
- package/src/aldehyde/layout/menu/menu-render.tsx +2 -2
- package/src/aldehyde/module/block-menu-tree-drawer.tsx +117 -0
- package/src/aldehyde/table/act-table.tsx +32 -4
- package/src/aldehyde/table/query-table.tsx +38 -20
- package/src/aldehyde/tmpl/hcservice-v3.tsx +35 -0
- package/src/aldehyde/tmpl/interface.tsx +15 -5
- package/src/aldehyde/tree/block-menu-auth-tree.tsx +188 -0
- package/src/aldehyde/welcome/HCWelcome.js +43 -5
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"block-menu-auth-tree.js","sourceRoot":"","sources":["../../../../src/aldehyde/tree/block-menu-auth-tree.tsx"],"names":[],"mappings":"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"}
|
package/lib/welcome/HCWelcome.js
CHANGED
|
@@ -8,17 +8,29 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import React from 'react';
|
|
11
|
-
import { Card, Col, Row } from 'antd';
|
|
11
|
+
import { Button, Card, Col, Row } from 'antd';
|
|
12
12
|
import { BarChartOutlined } from "@ant-design/icons";
|
|
13
13
|
import QuickEntrance from './quick-entrance';
|
|
14
14
|
import Workbench from './workbench';
|
|
15
15
|
import './index.css';
|
|
16
16
|
import Units from "../units";
|
|
17
17
|
import withRouter from "../routable/withroute";
|
|
18
|
+
import BlockMenuAuthTree from "../tree/block-menu-auth-tree";
|
|
19
|
+
import BlockMenuAuthTreeDrawer from "../module/block-menu-tree-drawer";
|
|
20
|
+
// interface HCWelcomeProps {
|
|
21
|
+
//
|
|
22
|
+
// }
|
|
23
|
+
//
|
|
24
|
+
// interface HCWelcomeState {
|
|
25
|
+
// // // selectedAuths:string[]
|
|
26
|
+
// openDrawer:boolean
|
|
27
|
+
// }
|
|
18
28
|
class HCWelcome extends React.Component {
|
|
19
29
|
constructor() {
|
|
20
30
|
super(...arguments);
|
|
21
|
-
this.state = {
|
|
31
|
+
this.state = {
|
|
32
|
+
openDrawer: false
|
|
33
|
+
};
|
|
22
34
|
this.intervals = [];
|
|
23
35
|
this.componentDidMount = () => __awaiter(this, void 0, void 0, function* () {
|
|
24
36
|
var option;
|
|
@@ -126,9 +138,9 @@ class HCWelcome extends React.Component {
|
|
|
126
138
|
};
|
|
127
139
|
// option && myChart.setOption(option);
|
|
128
140
|
//
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
141
|
+
this.setState({
|
|
142
|
+
openDrawer: false
|
|
143
|
+
});
|
|
132
144
|
});
|
|
133
145
|
this.cardStyle = {
|
|
134
146
|
height: '400px',
|
|
@@ -149,6 +161,7 @@ class HCWelcome extends React.Component {
|
|
|
149
161
|
}
|
|
150
162
|
render() {
|
|
151
163
|
const { params } = this.props;
|
|
164
|
+
const { openDrawer } = this.state;
|
|
152
165
|
Units.setProgramCode4RoutePath(params);
|
|
153
166
|
return React.createElement(React.Fragment, null,
|
|
154
167
|
React.createElement(Row, { className: 'home-page', gutter: { xs: 4, sm: 8, md: 12, lg: 16 } },
|
|
@@ -164,7 +177,23 @@ class HCWelcome extends React.Component {
|
|
|
164
177
|
React.createElement(Card, { className: "hovercard", title: React.createElement(BarChartOutlined, { style: { "fontSize": 30 } }) },
|
|
165
178
|
React.createElement(Row, { gutter: [{ xs: 4, sm: 8, md: 12, lg: 16 }, { xs: 4, sm: 8, md: 12, lg: 16 }] },
|
|
166
179
|
React.createElement(Col, { span: 16, style: { 'height': '400px' }, id: 'echart1' }),
|
|
167
|
-
React.createElement(Col, { span: 8, style: { 'height': '400px' }, id: 'echart2' })))))))
|
|
180
|
+
React.createElement(Col, { span: 8, style: { 'height': '400px' }, id: 'echart2' }))))))),
|
|
181
|
+
React.createElement(Row, null,
|
|
182
|
+
React.createElement(Col, null,
|
|
183
|
+
React.createElement(Button, { onClick: () => {
|
|
184
|
+
this.setState({
|
|
185
|
+
openDrawer: !this.state.openDrawer
|
|
186
|
+
});
|
|
187
|
+
} }, "\u6253\u5F00\u6743\u9650"))),
|
|
188
|
+
React.createElement(BlockMenuAuthTreeDrawer, { onCancel: () => {
|
|
189
|
+
this.setState({
|
|
190
|
+
openDrawer: false
|
|
191
|
+
});
|
|
192
|
+
}, onOk: () => {
|
|
193
|
+
this.setState({
|
|
194
|
+
openDrawer: false
|
|
195
|
+
});
|
|
196
|
+
}, open: openDrawer, roleCode: '374901611447492611' }));
|
|
168
197
|
}
|
|
169
198
|
}
|
|
170
199
|
export default withRouter(HCWelcome);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HCWelcome.js","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/HCWelcome.js"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAC,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"HCWelcome.js","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/HCWelcome.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/aldehyde/index.tsx
CHANGED
|
@@ -113,7 +113,7 @@ import DatePicker from "./controls/date-picker";
|
|
|
113
113
|
import ModelStrucV3 from "./tmpl/model-struc-v3";
|
|
114
114
|
|
|
115
115
|
import TmplConfigAnalysis from "./tmpl/tmpl-config-analysis";
|
|
116
|
-
|
|
116
|
+
import BlockMenuAuthTree from "./tree/block-menu-auth-tree"
|
|
117
117
|
|
|
118
118
|
// locale
|
|
119
119
|
import { LocaleProvider } from "./locale/LocaleProvider";
|
|
@@ -61,7 +61,7 @@ export default {
|
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
63
|
}else{
|
|
64
|
-
menu.label = this.toL2MenuTitle(i
|
|
64
|
+
menu.label = this.toL2MenuTitle(i, target, basePath);
|
|
65
65
|
menu.path = (i as (Level2Menu & {path: string})).path
|
|
66
66
|
}
|
|
67
67
|
}
|
|
@@ -127,7 +127,7 @@ export default {
|
|
|
127
127
|
|
|
128
128
|
item.path = path;
|
|
129
129
|
|
|
130
|
-
return <NavLink to={path} target={target}>{translate('${' + item.title + '}')}</NavLink>;
|
|
130
|
+
return <NavLink to={path} target={item.linkTarget ? item.linkTarget : target}>{translate('${' + item.title + '}')}</NavLink>;
|
|
131
131
|
},
|
|
132
132
|
findOpenId(blockMenu: BlockMenu, currentL2MenuId: string) {
|
|
133
133
|
let openL2MenuId: string = undefined;
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
import React, {ReactNode} from 'react';
|
|
2
|
+
import {Button, Drawer,message} from 'antd'
|
|
3
|
+
import BlockMenuTree from "../tree/block-menu-auth-tree";
|
|
4
|
+
import HcserviceV3 from '../tmpl/hcservice-v3'
|
|
5
|
+
import translate from "../locale/translate";
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
interface BlockMenuTreeDrawerProps {
|
|
10
|
+
roleCode:string,
|
|
11
|
+
onCancel: () => void,
|
|
12
|
+
onOk: () => void,
|
|
13
|
+
placement?:'top' | 'right' | 'bottom' | 'left',
|
|
14
|
+
width?:number,
|
|
15
|
+
open :boolean,
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
interface BlockMenuTreeDrawerState {
|
|
19
|
+
selectedAuths:string[],
|
|
20
|
+
loading:boolean,
|
|
21
|
+
role?:object
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export default class BlockMenuTreeDrawer extends React.PureComponent<BlockMenuTreeDrawerProps, BlockMenuTreeDrawerState> {
|
|
25
|
+
|
|
26
|
+
static defaultProps = {
|
|
27
|
+
showConfirm: true,
|
|
28
|
+
width:'500',
|
|
29
|
+
forceRender: true,
|
|
30
|
+
style: {maxWidth: '92vw', maxHeight: '92vh'},
|
|
31
|
+
placement:'left',
|
|
32
|
+
roleCode:undefined
|
|
33
|
+
}
|
|
34
|
+
state = {
|
|
35
|
+
selectedAuths:[],
|
|
36
|
+
loading:true,
|
|
37
|
+
role:undefined
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
async componentDidMount() {
|
|
41
|
+
|
|
42
|
+
await this.loadData();
|
|
43
|
+
}
|
|
44
|
+
async componentDidUpdate(preProps) {
|
|
45
|
+
const {roleCode}=this.props
|
|
46
|
+
const {roleCode:preRoleCode}=preProps
|
|
47
|
+
|
|
48
|
+
if(!preRoleCode || preRoleCode!=roleCode){
|
|
49
|
+
debugger
|
|
50
|
+
await this.loadData();
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
loadData=async ()=>{
|
|
54
|
+
const {roleCode}=this.props
|
|
55
|
+
if(!roleCode){
|
|
56
|
+
return
|
|
57
|
+
}
|
|
58
|
+
this.setState({
|
|
59
|
+
loading: true
|
|
60
|
+
})
|
|
61
|
+
//查询角色对应的权限
|
|
62
|
+
let res=await HcserviceV3.requestRoleAuths(roleCode)
|
|
63
|
+
|
|
64
|
+
|
|
65
|
+
this.setState({
|
|
66
|
+
loading: false,
|
|
67
|
+
selectedAuths:res?.auths,
|
|
68
|
+
role:res?.role
|
|
69
|
+
})
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
|
|
73
|
+
|
|
74
|
+
saveAuth=async ()=>{
|
|
75
|
+
const {roleCode,onOk}=this.props
|
|
76
|
+
let res=await HcserviceV3.postRoleAuths(roleCode,this.state.selectedAuths);
|
|
77
|
+
if(res.status=='success'){
|
|
78
|
+
message.success(translate("${保存成功}!"));
|
|
79
|
+
}
|
|
80
|
+
if(onOk)onOk();
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
|
|
84
|
+
render() {
|
|
85
|
+
const {placement,width,onCancel,open,...other} = this.props
|
|
86
|
+
const {loading,role}=this.state;
|
|
87
|
+
return (<Drawer
|
|
88
|
+
loading={loading}
|
|
89
|
+
title={role?.name}
|
|
90
|
+
placement={placement}
|
|
91
|
+
closable={true}
|
|
92
|
+
mask={false}
|
|
93
|
+
onClose={onCancel}
|
|
94
|
+
// onOk={()=>this.saveAuth}
|
|
95
|
+
open={open}
|
|
96
|
+
width={width}
|
|
97
|
+
extra={[<Button type={'primary'} onClick={this.saveAuth} >保存</Button>]}
|
|
98
|
+
style={{
|
|
99
|
+
maxWidth: '92vw',
|
|
100
|
+
}}
|
|
101
|
+
// extra={
|
|
102
|
+
// <Space>{this.getFooter()}</Space>
|
|
103
|
+
// }
|
|
104
|
+
>
|
|
105
|
+
<BlockMenuTree checks={this.state.selectedAuths} onChange={(auths)=>{
|
|
106
|
+
|
|
107
|
+
this.setState({
|
|
108
|
+
|
|
109
|
+
selectedAuths:auths
|
|
110
|
+
})
|
|
111
|
+
}}></BlockMenuTree>
|
|
112
|
+
</Drawer>
|
|
113
|
+
)
|
|
114
|
+
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
}
|
|
@@ -23,7 +23,7 @@ import {
|
|
|
23
23
|
EyeInvisibleOutlined,
|
|
24
24
|
EyeOutlined,
|
|
25
25
|
FormOutlined,
|
|
26
|
-
FundOutlined,
|
|
26
|
+
FundOutlined, KeyOutlined,
|
|
27
27
|
LineChartOutlined,
|
|
28
28
|
MenuOutlined,
|
|
29
29
|
PlusCircleOutlined,
|
|
@@ -38,7 +38,7 @@ import "./index.css";
|
|
|
38
38
|
import {
|
|
39
39
|
ActTableMode,
|
|
40
40
|
ActTableViewModel,
|
|
41
|
-
AddOrUpdate,
|
|
41
|
+
AddOrUpdate, BuiltInButtonName,
|
|
42
42
|
ClassifiedAddConfig,
|
|
43
43
|
ColumnConfig,
|
|
44
44
|
DtmplData,
|
|
@@ -67,6 +67,7 @@ import CquickButton from "../controls/cquery/cquick-button";
|
|
|
67
67
|
import CollapseCard from "../controls/collapse-card";
|
|
68
68
|
import ToolTipBar from "../detail/tooltipbar";
|
|
69
69
|
import { LocaleContext } from "../locale/LocaleProvider";
|
|
70
|
+
import BlockMenuTreeDrawer from "../module/block-menu-tree-drawer";
|
|
70
71
|
|
|
71
72
|
const DragHandle = SortableHandle(() => (
|
|
72
73
|
<MenuOutlined style={{ cursor: "grab", color: "#999" }} />
|
|
@@ -115,6 +116,8 @@ interface ActTableStat {
|
|
|
115
116
|
viewModels?: ActTableViewModel[];
|
|
116
117
|
showL2ActTable?: boolean;
|
|
117
118
|
showL2Chart?: boolean;
|
|
119
|
+
recordCode?:string;
|
|
120
|
+
blockMenuTreeDrawerOpen?:boolean;
|
|
118
121
|
}
|
|
119
122
|
|
|
120
123
|
class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
|
|
@@ -133,6 +136,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
|
|
|
133
136
|
disabledColIds: undefined,
|
|
134
137
|
showL2ActTable: false,
|
|
135
138
|
showL2Chart: false,
|
|
139
|
+
recordCode:undefined,
|
|
140
|
+
blockMenuTreeDrawerOpen:false,
|
|
136
141
|
};
|
|
137
142
|
|
|
138
143
|
static contextType = LocaleContext;
|
|
@@ -257,7 +262,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
|
|
|
257
262
|
sourceId,
|
|
258
263
|
} = this.props;
|
|
259
264
|
const { translate } = this.context;
|
|
260
|
-
const { buttons } = ltmplConfig;
|
|
265
|
+
const { buttons,builtInButtons } = ltmplConfig;
|
|
261
266
|
let tableColumns = [];
|
|
262
267
|
let s = 0;
|
|
263
268
|
let colConfigs = sortedColConfigs ? sortedColConfigs : ltmplConfig.columns;
|
|
@@ -382,6 +387,20 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
|
|
|
382
387
|
) : (
|
|
383
388
|
""
|
|
384
389
|
)}
|
|
390
|
+
{builtInButtons?.includes("blockAuthMenuTree") &&
|
|
391
|
+
!readOnly ? (
|
|
392
|
+
<Button
|
|
393
|
+
size="small"
|
|
394
|
+
type="dashed"
|
|
395
|
+
icon={<KeyOutlined rotate={180} style={{color: '#f5222d', marginRight: '4px'}}/>}
|
|
396
|
+
onClick={() => this.setState({
|
|
397
|
+
blockMenuTreeDrawerOpen:true,
|
|
398
|
+
recordCode:record.code
|
|
399
|
+
}) }
|
|
400
|
+
></Button>
|
|
401
|
+
) : (
|
|
402
|
+
""
|
|
403
|
+
)}
|
|
385
404
|
{(buttons.includes("dtmplCustomEdit") || customEditable) &&
|
|
386
405
|
doEdit &&
|
|
387
406
|
!readOnly &&
|
|
@@ -1304,7 +1323,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
|
|
|
1304
1323
|
};
|
|
1305
1324
|
|
|
1306
1325
|
render() {
|
|
1307
|
-
let { queryKey, loading } = this.state;
|
|
1326
|
+
let { queryKey, loading,blockMenuTreeDrawerOpen,recordCode } = this.state;
|
|
1308
1327
|
let {
|
|
1309
1328
|
sourceId,
|
|
1310
1329
|
ltmplConfig,
|
|
@@ -1355,6 +1374,15 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
|
|
|
1355
1374
|
) : (
|
|
1356
1375
|
<>{this.renderContent()}</>
|
|
1357
1376
|
)}
|
|
1377
|
+
<BlockMenuTreeDrawer onOk={()=>{
|
|
1378
|
+
this.setState({
|
|
1379
|
+
blockMenuTreeDrawerOpen:false
|
|
1380
|
+
})
|
|
1381
|
+
}} onCancel={()=>{
|
|
1382
|
+
this.setState({
|
|
1383
|
+
blockMenuTreeDrawerOpen:false
|
|
1384
|
+
})
|
|
1385
|
+
}} open={blockMenuTreeDrawerOpen} roleCode={recordCode}/>
|
|
1358
1386
|
</>
|
|
1359
1387
|
);
|
|
1360
1388
|
}
|
|
@@ -22,7 +22,7 @@ import Scrollbars from "react-custom-scrollbars";
|
|
|
22
22
|
import { LocaleContext } from "../locale/LocaleProvider";
|
|
23
23
|
import { BigNumber } from "bignumber.js";
|
|
24
24
|
import Column from "antd/es/table/Column";
|
|
25
|
-
import {ColumnsType} from "antd/es/table";
|
|
25
|
+
import { ColumnsType } from "antd/es/table";
|
|
26
26
|
const { Panel } = Collapse;
|
|
27
27
|
const SortableItem = SortableElement((props) => <tr {...props} />);
|
|
28
28
|
const SortableBody = SortableContainer((props) => <tbody {...props} />);
|
|
@@ -654,7 +654,8 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
|
|
|
654
654
|
if (
|
|
655
655
|
this.props.summaryConfigs &&
|
|
656
656
|
this.props.summaryConfigs?.length !== 0 &&
|
|
657
|
-
flatSummaryRowTitle.length
|
|
657
|
+
flatSummaryRowTitle.length &&
|
|
658
|
+
proSummaryTableData.length
|
|
658
659
|
) {
|
|
659
660
|
const calkeys = [
|
|
660
661
|
...flatSummaryCalTitle,
|
|
@@ -913,39 +914,44 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
|
|
|
913
914
|
pagination={false}
|
|
914
915
|
style={{ display: columns ? "block" : "none" }}
|
|
915
916
|
summary={(pageData) => {
|
|
916
|
-
if (
|
|
917
|
+
if (
|
|
918
|
+
!summaryConfigs ||
|
|
919
|
+
summaryConfigs?.length === 0 ||
|
|
920
|
+
pageData.length === 0
|
|
921
|
+
)
|
|
922
|
+
return <></>;
|
|
917
923
|
|
|
918
924
|
const columns = isProSumarryTable
|
|
919
925
|
? proSummaryTableColumns
|
|
920
926
|
: this.props.columns;
|
|
921
927
|
|
|
922
928
|
const sumConfigs: {
|
|
923
|
-
sum: { value: string; id: string;columnConfig?:any }[];
|
|
924
|
-
avg: { value: string; id: string;columnConfig?:any }[];
|
|
929
|
+
sum: { value: string; id: string; columnConfig?: any }[];
|
|
930
|
+
avg: { value: string; id: string; columnConfig?: any }[];
|
|
925
931
|
} = { sum: [], avg: [] };
|
|
926
932
|
|
|
927
933
|
if (this.getRowSelection()) {
|
|
928
934
|
sumConfigs["avg"].push({
|
|
929
935
|
value: "",
|
|
930
936
|
id: "",
|
|
931
|
-
columnConfig:{align:
|
|
937
|
+
columnConfig: { align: "center" },
|
|
932
938
|
});
|
|
933
939
|
sumConfigs["sum"].push({
|
|
934
940
|
value: "",
|
|
935
941
|
id: "",
|
|
936
|
-
columnConfig:{
|
|
942
|
+
columnConfig: { align: "center" },
|
|
937
943
|
});
|
|
938
944
|
}
|
|
939
945
|
|
|
940
946
|
sumConfigs["sum"].push({
|
|
941
947
|
value: translate("${合计}"),
|
|
942
948
|
id: "title",
|
|
943
|
-
columnConfig:{
|
|
949
|
+
columnConfig: { align: "center" },
|
|
944
950
|
});
|
|
945
951
|
sumConfigs["avg"].push({
|
|
946
952
|
value: translate("${均值}"),
|
|
947
953
|
id: "title",
|
|
948
|
-
columnConfig:{
|
|
954
|
+
columnConfig: { align: "center" },
|
|
949
955
|
});
|
|
950
956
|
|
|
951
957
|
let sumLen = 0,
|
|
@@ -955,7 +961,7 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
|
|
|
955
961
|
const idx = i,
|
|
956
962
|
dataIndex = columns[i].dataIndex;
|
|
957
963
|
if (idx === 0) continue;
|
|
958
|
-
const sum = { value: "", id: "",columnConfig:columns[i] };
|
|
964
|
+
const sum = { value: "", id: "", columnConfig: columns[i] };
|
|
959
965
|
const sumConfigIdx = summaryConfigs.findIndex(
|
|
960
966
|
({ id }) => id === dataIndex
|
|
961
967
|
);
|
|
@@ -1011,22 +1017,34 @@ class QueryTable extends React.PureComponent<QueryTableProps, QueryTableStat> {
|
|
|
1011
1017
|
<></>
|
|
1012
1018
|
) : (
|
|
1013
1019
|
<Table.Summary.Row>
|
|
1014
|
-
{sumConfigs["sum"].map(
|
|
1015
|
-
|
|
1016
|
-
|
|
1017
|
-
|
|
1018
|
-
|
|
1020
|
+
{sumConfigs["sum"].map(
|
|
1021
|
+
({ id, value, columnConfig }, idx) => (
|
|
1022
|
+
<Table.Summary.Cell
|
|
1023
|
+
align={columnConfig?.align}
|
|
1024
|
+
index={idx}
|
|
1025
|
+
className="zongji"
|
|
1026
|
+
>
|
|
1027
|
+
{value}
|
|
1028
|
+
</Table.Summary.Cell>
|
|
1029
|
+
)
|
|
1030
|
+
)}
|
|
1019
1031
|
</Table.Summary.Row>
|
|
1020
1032
|
)}
|
|
1021
1033
|
{avgLen === 0 ? (
|
|
1022
1034
|
<></>
|
|
1023
1035
|
) : (
|
|
1024
1036
|
<Table.Summary.Row>
|
|
1025
|
-
{sumConfigs["avg"].map(
|
|
1026
|
-
|
|
1027
|
-
|
|
1028
|
-
|
|
1029
|
-
|
|
1037
|
+
{sumConfigs["avg"].map(
|
|
1038
|
+
({ id, value, columnConfig }, idx) => (
|
|
1039
|
+
<Table.Summary.Cell
|
|
1040
|
+
align={columnConfig?.align}
|
|
1041
|
+
index={idx}
|
|
1042
|
+
className="zongji"
|
|
1043
|
+
>
|
|
1044
|
+
{value}
|
|
1045
|
+
</Table.Summary.Cell>
|
|
1046
|
+
)
|
|
1047
|
+
)}
|
|
1030
1048
|
</Table.Summary.Row>
|
|
1031
1049
|
)}
|
|
1032
1050
|
</>
|
|
@@ -786,6 +786,41 @@ export default class HcserviceV3 {
|
|
|
786
786
|
return res;
|
|
787
787
|
}
|
|
788
788
|
|
|
789
|
+
static async requestBlockMenuAuths() {
|
|
790
|
+
let url = `/v3/menu/block-menu-auths`;
|
|
791
|
+
let res = await Super.super({
|
|
792
|
+
url: url,
|
|
793
|
+
method: "GET",
|
|
794
|
+
query: {
|
|
795
|
+
},
|
|
796
|
+
});
|
|
797
|
+
return res?.blocks;
|
|
798
|
+
}
|
|
799
|
+
|
|
800
|
+
static async requestRoleAuths(roleCode:string) {
|
|
801
|
+
let url = `/v3/auth/role-auths`;
|
|
802
|
+
let res = await Super.super({
|
|
803
|
+
url: url,
|
|
804
|
+
method: "GET",
|
|
805
|
+
query: {
|
|
806
|
+
roleCode
|
|
807
|
+
},
|
|
808
|
+
});
|
|
809
|
+
return res;
|
|
810
|
+
}
|
|
811
|
+
static async postRoleAuths(roleCode:string ,auths:string[]) {
|
|
812
|
+
let url = `/v3/auth/role-auths`;
|
|
813
|
+
let res = await Super.super({
|
|
814
|
+
url: url,
|
|
815
|
+
method: "POST",
|
|
816
|
+
query: {
|
|
817
|
+
roleCode,auths,
|
|
818
|
+
},
|
|
819
|
+
});
|
|
820
|
+
|
|
821
|
+
return res;
|
|
822
|
+
}
|
|
823
|
+
|
|
789
824
|
static async logout() {
|
|
790
825
|
Super.super({
|
|
791
826
|
url: "/v3/auth/token",
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { MenuProps } from "antd/lib/menu";
|
|
2
2
|
import { FormInstance } from "antd";
|
|
3
|
-
import React, { RefObject } from "react";
|
|
3
|
+
import React, { HTMLAttributeAnchorTarget, RefObject } from "react";
|
|
4
4
|
import { ButtonShape, ButtonType } from "antd/lib/button";
|
|
5
5
|
export type ViewOrEdit = "view" | "edit";
|
|
6
6
|
|
|
@@ -76,7 +76,7 @@ export interface UpdrillButtonConfig extends OrderableTmplBase {
|
|
|
76
76
|
buttonType?: ButtonType;
|
|
77
77
|
buttonShape?: ButtonShape;
|
|
78
78
|
danger?: boolean;
|
|
79
|
-
dimensions:string[];
|
|
79
|
+
dimensions: string[];
|
|
80
80
|
}
|
|
81
81
|
|
|
82
82
|
export interface JumpConfig extends OrderableTmplBase {
|
|
@@ -88,6 +88,10 @@ export interface JumpConfig extends OrderableTmplBase {
|
|
|
88
88
|
}
|
|
89
89
|
export interface ClassifiedAddConfig extends OrderableTmplBase {}
|
|
90
90
|
|
|
91
|
+
export interface ProgramAuth extends OrderableTmplBase{
|
|
92
|
+
|
|
93
|
+
}
|
|
94
|
+
|
|
91
95
|
export interface Level2Menu extends MenuBase {
|
|
92
96
|
items: (BlockMenu | Level2Menu)[];
|
|
93
97
|
customPath?: string;
|
|
@@ -97,6 +101,9 @@ export interface Level2Menu extends MenuBase {
|
|
|
97
101
|
hiddenOnDisabled?: boolean;
|
|
98
102
|
defaultCriteriaValue?: object;
|
|
99
103
|
pageType: "列表" | "详情" | "编辑" | "添加" | "编辑或添加" | "树";
|
|
104
|
+
programAuths?:ProgramAuth[];
|
|
105
|
+
linkTarget?: HTMLAttributeAnchorTarget;
|
|
106
|
+
|
|
100
107
|
}
|
|
101
108
|
|
|
102
109
|
export interface Level1Menu extends MenuBase {
|
|
@@ -117,8 +124,8 @@ export interface CriteriaConfig extends FieldConfig {}
|
|
|
117
124
|
export interface ColumnConfig extends FieldConfig {
|
|
118
125
|
statColType?: StatColType;
|
|
119
126
|
colWidth?: number;
|
|
120
|
-
colFixed?:"left"|
|
|
121
|
-
valueAlign?:"left"|
|
|
127
|
+
colFixed?: "left" | "right" | boolean;
|
|
128
|
+
valueAlign?: "left" | "right" | "center";
|
|
122
129
|
id: string;
|
|
123
130
|
}
|
|
124
131
|
|
|
@@ -133,6 +140,8 @@ export type ButtonPosition =
|
|
|
133
140
|
|
|
134
141
|
export type FieldGroupType = "relation" | "fieldGroup" | "embed";
|
|
135
142
|
|
|
143
|
+
export type BuiltInButtonName="blockAuthMenuTree"
|
|
144
|
+
|
|
136
145
|
export type ButtonName =
|
|
137
146
|
| "rowAdd"
|
|
138
147
|
| "rowEdit"
|
|
@@ -262,6 +271,7 @@ export interface FileRule {
|
|
|
262
271
|
export interface SelectConfig extends TmplBase {
|
|
263
272
|
defaultPageSize: number;
|
|
264
273
|
buttons: ButtonName[];
|
|
274
|
+
builtInButtons:BuiltInButtonName[];
|
|
265
275
|
columns: ColumnConfig[];
|
|
266
276
|
criterias: CriteriaConfig[];
|
|
267
277
|
defaultCriteriaValue?: object;
|
|
@@ -326,7 +336,7 @@ export interface LtmplConfig extends SelectConfig {
|
|
|
326
336
|
totalColumnConfigs?: { id: string; aggFunc: "sum" | "avg"; title: string }[];
|
|
327
337
|
subtotalXColumn?: { id: string }[];
|
|
328
338
|
subtotalYColumn?: { id: string }[];
|
|
329
|
-
updrillButtonConfigs?:UpdrillButtonConfig[]
|
|
339
|
+
updrillButtonConfigs?: UpdrillButtonConfig[];
|
|
330
340
|
}
|
|
331
341
|
|
|
332
342
|
export interface EnumItem {
|