Commit f9281ba6c88af4c6de66ae3f12e623927b9fe019

Authored by 陈洋
1 parent a75a5f0b

暂存

1 { 1 {
2 "name": "@qx/common", 2 "name": "@qx/common",
3 - "version": "3.0.0", 3 + "version": "3.0.0-alpha.2",
4 "lockfileVersion": 2, 4 "lockfileVersion": 2,
5 "requires": true, 5 "requires": true,
6 "packages": { 6 "packages": {
7 "": { 7 "": {
8 "name": "@qx/common", 8 "name": "@qx/common",
9 - "version": "3.0.0", 9 + "version": "3.0.0-alpha.2",
10 "license": "MIT", 10 "license": "MIT",
11 "dependencies": { 11 "dependencies": {
12 "@ant-design/icons": "^5.2.5", 12 "@ant-design/icons": "^5.2.5",
13 "@qx/ui": "0.0.3-beta.1", 13 "@qx/ui": "0.0.3-beta.1",
  14 + "ahooks": "^3.7.5",
14 "classnames": "^2.3.2", 15 "classnames": "^2.3.2",
15 "codemirror": "5.65.8", 16 "codemirror": "5.65.8",
16 "dayjs": "^1.11.9", 17 "dayjs": "^1.11.9",
@@ -39,12 +40,16 @@ @@ -39,12 +40,16 @@
39 "react": "^18.0.0", 40 "react": "^18.0.0",
40 "react-cookies": ">=0.1.1", 41 "react-cookies": ">=0.1.1",
41 "react-dom": "^18.0.0", 42 "react-dom": "^18.0.0",
  43 + "react-router": ">=4.3.1",
42 "stylelint": "^14.9.1" 44 "stylelint": "^14.9.1"
43 }, 45 },
44 "peerDependencies": { 46 "peerDependencies": {
  47 + "@qx/utils": "0.0.58",
  48 + "ahooks": "^3.7.5",
45 "antd": ">=5.8.4", 49 "antd": ">=5.8.4",
46 "react": ">=16.9.0", 50 "react": ">=16.9.0",
47 - "react-dom": ">=16.9.0" 51 + "react-dom": ">=16.9.0",
  52 + "react-router": ">=4.3.1"
48 } 53 }
49 }, 54 },
50 "node_modules/@aashutoshrathi/word-wrap": { 55 "node_modules/@aashutoshrathi/word-wrap": {
1 { 1 {
2 "name": "@qx/common", 2 "name": "@qx/common",
3 - "version": "3.0.0", 3 + "version": "3.0.0-alpha.2",
4 "description": "A react library developed with dumi", 4 "description": "A react library developed with dumi",
5 "license": "MIT", 5 "license": "MIT",
6 "module": "dist/index.js", 6 "module": "dist/index.js",
@@ -50,7 +50,8 @@ @@ -50,7 +50,8 @@
50 "lodash-es": "^4.17.21", 50 "lodash-es": "^4.17.21",
51 "rc-virtual-list": "^3.4.13", 51 "rc-virtual-list": "^3.4.13",
52 "react-codemirror2": "^7.2.1", 52 "react-codemirror2": "^7.2.1",
53 - "classnames": "^2.3.2" 53 + "classnames": "^2.3.2",
  54 + "ahooks": "^3.7.5"
54 }, 55 },
55 "devDependencies": { 56 "devDependencies": {
56 "@commitlint/cli": "^17.1.2", 57 "@commitlint/cli": "^17.1.2",
@@ -73,12 +74,16 @@ @@ -73,12 +74,16 @@
73 "react": "^18.0.0", 74 "react": "^18.0.0",
74 "react-cookies": ">=0.1.1", 75 "react-cookies": ">=0.1.1",
75 "react-dom": "^18.0.0", 76 "react-dom": "^18.0.0",
76 - "stylelint": "^14.9.1" 77 + "stylelint": "^14.9.1",
  78 + "react-router": ">=4.3.1"
77 }, 79 },
78 "peerDependencies": { 80 "peerDependencies": {
79 "antd": ">=5.8.4", 81 "antd": ">=5.8.4",
80 "react": ">=16.9.0", 82 "react": ">=16.9.0",
81 - "react-dom": ">=16.9.0" 83 + "react-dom": ">=16.9.0",
  84 + "ahooks": "^3.7.5",
  85 + "react-router": ">=4.3.1",
  86 + "@qx/utils": "0.0.58"
82 }, 87 },
83 "publishConfig": { 88 "publishConfig": {
84 "access": "public" 89 "access": "public"
@@ -6,6 +6,7 @@ export * from './qx-tags-input'; @@ -6,6 +6,7 @@ export * from './qx-tags-input';
6 export * from './qx-user-selector'; 6 export * from './qx-user-selector';
7 export * from './qx-form-select'; 7 export * from './qx-form-select';
8 export * from './qx-app-selector'; 8 export * from './qx-app-selector';
  9 +export * from './utils';
9 10
10 // export * from './qx-btn'; 11 // export * from './qx-btn';
11 // export { default as FieldSetter } from './qx-field-setter'; 12 // export { default as FieldSetter } from './qx-field-setter';
1 ### 选择应用 1 ### 选择应用
2 2
3 ```tsx 3 ```tsx
4 -import { createRequest } from '@qx/utils'; 4 +import { request } from '@qx/common';
5 import React, { useState } from 'react'; 5 import React, { useState } from 'react';
6 import { QxAppSelector } from './index'; 6 import { QxAppSelector } from './index';
7 7
@@ -27,7 +27,7 @@ export default () => { @@ -27,7 +27,7 @@ export default () => {
27 return ( 27 return (
28 <> 28 <>
29 <a onClick={() => setVisible(true)}>点我一下</a> 29 <a onClick={() => setVisible(true)}>点我一下</a>
30 - <QxAppSelector {...props} request={createRequest()} /> 30 + <QxAppSelector {...props} request={request} />
31 </> 31 </>
32 ); 32 );
33 }; 33 };
@@ -3,7 +3,7 @@ import { Menu, Popover, Tag } from 'antd'; @@ -3,7 +3,7 @@ import { Menu, Popover, Tag } from 'antd';
3 import OrgSelectorDialog from '../../qx-org-selector/src/dialog'; 3 import OrgSelectorDialog from '../../qx-org-selector/src/dialog';
4 import { ParamValueType } from '../../qx-filter-condition/filter'; 4 import { ParamValueType } from '../../qx-filter-condition/filter';
5 import { getOrgIdAndNameMap } from '../service'; 5 import { getOrgIdAndNameMap } from '../service';
6 -import { createRequest } from '@qx/utils'; 6 +import { request } from '@qx/common';
7 import { CloseOutlined } from '@ant-design/icons'; 7 import { CloseOutlined } from '@ant-design/icons';
8 8
9 interface OrgSetterProps { 9 interface OrgSetterProps {
@@ -225,7 +225,7 @@ export const OrgSetter: React.FC<OrgSetterProps> = ({ @@ -225,7 +225,7 @@ export const OrgSetter: React.FC<OrgSetterProps> = ({
225 </Popover> 225 </Popover>
226 226
227 <OrgSelectorDialog 227 <OrgSelectorDialog
228 - request={createRequest()} 228 + request={request}
229 title={'选择部门'} 229 title={'选择部门'}
230 key={visible + ''} 230 key={visible + ''}
231 visible={visible} 231 visible={visible}
@@ -3,7 +3,7 @@ import { Menu, Popover, Tag } from 'antd'; @@ -3,7 +3,7 @@ import { Menu, Popover, Tag } from 'antd';
3 import UserSelectorDialog from '../../qx-user-selector/src/dialog'; 3 import UserSelectorDialog from '../../qx-user-selector/src/dialog';
4 import { ParamValueType } from '../../qx-filter-condition/filter'; 4 import { ParamValueType } from '../../qx-filter-condition/filter';
5 import { getUserIdAndNameMap } from '../service'; 5 import { getUserIdAndNameMap } from '../service';
6 -import { createRequest } from '@qx/utils'; 6 +import { request } from '@qx/common';
7 import { CloseOutlined } from '@ant-design/icons'; 7 import { CloseOutlined } from '@ant-design/icons';
8 8
9 interface UserSelectProps { 9 interface UserSelectProps {
@@ -227,7 +227,7 @@ export const UserSetter: React.FC<UserSelectProps> = ({ @@ -227,7 +227,7 @@ export const UserSetter: React.FC<UserSelectProps> = ({
227 </Popover> 227 </Popover>
228 228
229 <UserSelectorDialog 229 <UserSelectorDialog
230 - request={createRequest()} 230 + request={request}
231 title={'选择人员'} 231 title={'选择人员'}
232 key={selectUserShow + ''} 232 key={selectUserShow + ''}
233 visible={selectUserShow} 233 visible={selectUserShow}
1 -import { createRequest } from '@qx/utils';  
2 -const request = createRequest(); 1 +import { request } from '@qx/common';
3 /** 2 /**
4 * 获取单选多选关联数据 3 * 获取单选多选关联数据
5 * @param appId 4 * @param appId
1 -  
2 -import { createRequest } from '@qx/utils';  
3 -const request = createRequest();  
4 - 1 +import { request } from '@qx/common';
5 /** 2 /**
6 * 3 *
7 * @param appCode 4 * @param appCode
1 ### 选择表单 1 ### 选择表单
2 2
3 ```tsx 3 ```tsx
4 -import { createRequest } from '@qx/utils'; 4 +import { request } from '@qx/common';
5 import React, { useState } from 'react'; 5 import React, { useState } from 'react';
6 import { QxFormSelect } from './index'; 6 import { QxFormSelect } from './index';
7 7
@@ -238,7 +238,7 @@ export default () => { @@ -238,7 +238,7 @@ export default () => {
238 console.log(datasource, 'lllllll'); 238 console.log(datasource, 'lllllll');
239 setValue(datasource); 239 setValue(datasource);
240 }} 240 }}
241 - request={createRequest()} 241 + request={request}
242 /> 242 />
243 ); 243 );
244 }; 244 };
  1 +import { createRequest } from '@qx/utils';
  2 +export const request = createRequest();
  3 +