@cqsjjb/jjb-react-admin-component 3.3.1-beta.2 → 3.3.1-beta.4

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 (2) hide show
  1. package/Table/index.js +5 -4
  2. package/package.json +9 -8
package/Table/index.js CHANGED
@@ -3,7 +3,7 @@ import React from 'react';
3
3
  import { tools } from '@cqsjjb/jjb-common-lib';
4
4
  import { ProTable } from '@ant-design/pro-components';
5
5
  import { useAntdResizableHeader } from 'use-antd-resizable-header';
6
- import { antPrefix, setTableSize, getTableSize, getPersistenceKey, isNull } from './utils';
6
+ import { antPrefix, setTableSize, getTableSize, getPersistenceKey } from './utils';
7
7
  import './index.less';
8
8
  require('use-antd-resizable-header/dist/style.css');
9
9
  export default function TablePro(props) {
@@ -94,9 +94,8 @@ export default function TablePro(props) {
94
94
  size: size,
95
95
  search: false,
96
96
  scroll: scroll,
97
- columns: resizableColumns,
98
97
  className: `${antPrefix}-gbs-pro-table`,
99
- options: !isNull(props.options) ? props.options : {
98
+ options: {
100
99
  reload: false,
101
100
  fullScreen: true,
102
101
  setting: {
@@ -113,5 +112,7 @@ export default function TablePro(props) {
113
112
  persistenceType: 'localStorage'
114
113
  },
115
114
  onSizeChange: setSize
116
- }, props)));
115
+ }, props, {
116
+ columns: resizableColumns
117
+ })));
117
118
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cqsjjb/jjb-react-admin-component",
3
- "version": "3.3.1-beta.2",
3
+ "version": "3.3.1-beta.4",
4
4
  "description": "jjb-react-admin-组件库@new",
5
5
  "main": "index.js",
6
6
  "author": "jjb-front-team",
@@ -9,15 +9,16 @@
9
9
  "access": "public"
10
10
  },
11
11
  "dependencies": {
12
+ "@ant-design/pro-components": "latest",
13
+ "@ant-design/pro-layout": "latest",
14
+ "@cqsjjb-formily/renderer": "latest",
15
+ "@wangeditor-next/editor": "latest",
12
16
  "axios": "^1.6.5",
17
+ "cropperjs": "^1.6.2",
13
18
  "lodash": "^4.17.21",
19
+ "react-cropper": "2.3.3",
14
20
  "spark-md5": "^3.0.2",
15
- "cropperjs": "^1.6.2",
16
- "@wangeditor-next/editor": "latest",
17
- "@cqsjjb-formily/renderer": "latest",
18
- "@ant-design/pro-layout": "latest",
19
- "use-antd-resizable-header": "latest",
20
- "@ant-design/pro-components": "latest",
21
- "react-cropper": "2.3.3"
21
+ "styled-components": "^6.1.19",
22
+ "use-antd-resizable-header": "latest"
22
23
  }
23
24
  }