@jiangood/open-admin 3.0.12 → 3.0.14

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.
Files changed (16) hide show
  1. package/package.json +1 -1
  2. package/src/framework/components/ProTable/index.tsx +3 -1
  3. package/src/framework/fields/FieldDateRange/index.tsx +4 -0
  4. package/src/framework/fields/FieldEditor/index.tsx +57 -10
  5. package/src/framework/fields/FieldUploadFile/index.tsx +6 -6
  6. package/src/framework/fields/FieldUploadImage/index.tsx +495 -234
  7. package/src/framework/utils/system/HttpUtils.ts +6 -0
  8. package/src/framework/views/ViewImage/index.tsx +56 -50
  9. package/src/layouts/admin/index.less +1 -1
  10. package/src/pages/article/$code.jsx +20 -6
  11. package/src/pages/article/article.less +124 -0
  12. package/src/pages/system/article/index.jsx +12 -22
  13. package/src/pages/system/dict/index.jsx +14 -10
  14. package/src/pages/system/file/index.jsx +77 -93
  15. package/src/pages/system/job/index.jsx +1 -1
  16. package/src/pages/system/org/index.jsx +12 -9
package/src/pages/system/job/index.jsx CHANGED
@@ -180,7 +180,7 @@ export default class extends React.Component {
180
180
 
181
181
 
182
182
  render() {
183
- return <Page title="定时任务" description="管理定时任务">
183
+ return <Page>
184
184
  <ProTable
185
185
  actionRef={this.tableRef}
186
186
  toolBarRender={() => (
package/src/pages/system/org/index.jsx CHANGED
@@ -1,5 +1,5 @@
1
1
  import {DeleteOutlined, EditOutlined, PlusOutlined, SettingOutlined, SyncOutlined} from '@ant-design/icons';
2
- import {Button, Card, Checkbox, Descriptions, Form, Input, InputNumber, Popconfirm, Popover, Space, Spin, Splitter, Switch, Tree, Typography} from 'antd';
2
+ import {Button, Card, Checkbox, Descriptions, Form, Input, InputNumber, Popover, Space, Spin, Splitter, Switch, Tree, Typography} from 'antd';
3
3
  import React from 'react';
4
4
  import {
5
5
  FieldBoolean,
@@ -10,6 +10,7 @@ import {
10
10
  HttpUtils,
11
11
  NamedIcon,
12
12
  Page,
13
+ PermActions,
13
14
  ViewSwitch,
14
15
  } from "../../../framework";
15
16
 
@@ -145,14 +146,16 @@ export default class extends React.Component {
145
146
  <div style={{display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 8}}>
146
147
  <Typography.Text strong>机构信息</Typography.Text>
147
148
  {selectedOrg && (
148
- <span>
149
- <Button size='small' icon={<EditOutlined/>} perm='sys-org:update'
150
- onClick={this.handleEdit} style={{marginRight: 4}}>编辑</Button>
151
- <Popconfirm perm='sys-org:delete' title='是否确定删除组织机构'
152
- onConfirm={this.handleDelete}>
153
- <Button size='small' icon={<DeleteOutlined/>}>删除</Button>
154
- </Popconfirm>
155
- </span>
149
+ <PermActions size='small' actions={[
150
+ {label: '编辑', perm: 'sys-org:update', icon: <EditOutlined/>, onClick: this.handleEdit},
151
+ {
152
+ label: '删除',
153
+ perm: 'sys-org:delete',
154
+ icon: <DeleteOutlined/>,
155
+ confirm: '是否确定删除组织机构',
156
+ onClick: this.handleDelete,
157
+ },
158
+ ]}/>
156
159
  )}
157
160
  </div>
158
161
  {selectedOrg && (