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