Showing
7 changed files
with
12 additions
and
12 deletions
| 1 | { | 1 | { |
| 2 | "name": "@qx/common", | 2 | "name": "@qx/common", |
| 3 | - "version": "3.0.0-alpha.2", | 3 | + "version": "3.0.0-alpha.3", |
| 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-alpha.2", | 9 | + "version": "3.0.0-alpha.3", |
| 10 | "license": "MIT", | 10 | "license": "MIT", |
| 11 | "dependencies": { | 11 | "dependencies": { |
| 12 | "@ant-design/icons": "^5.2.5", | 12 | "@ant-design/icons": "^5.2.5", |
| 1 | { | 1 | { |
| 2 | "name": "@qx/common", | 2 | "name": "@qx/common", |
| 3 | - "version": "3.0.0-alpha.3", | 3 | + "version": "3.0.0-alpha.4", |
| 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", |
| @@ -9,6 +9,6 @@ export * from './qx-form-select'; | @@ -9,6 +9,6 @@ export * from './qx-form-select'; | ||
| 9 | export * from './qx-app-selector'; | 9 | export * from './qx-app-selector'; |
| 10 | export * from './utils'; | 10 | export * from './utils'; |
| 11 | export * from './qx-field'; | 11 | export * from './qx-field'; |
| 12 | +export * from './qx-field-setter'; | ||
| 12 | 13 | ||
| 13 | // export * from './qx-btn'; | 14 | // export * from './qx-btn'; |
| 14 | -// export { default as FieldSetter } from './qx-field-setter'; |
| @@ -157,7 +157,7 @@ export interface paramColSelectProps extends ColSelectProps { | @@ -157,7 +157,7 @@ export interface paramColSelectProps extends ColSelectProps { | ||
| 157 | allowClear?: boolean; | 157 | allowClear?: boolean; |
| 158 | } | 158 | } |
| 159 | 159 | ||
| 160 | -export const FieldSetter: React.FC<paramColSelectProps> = ({ | 160 | +export const QxFieldSetter: React.FC<paramColSelectProps> = ({ |
| 161 | value, | 161 | value, |
| 162 | fieldGroupType, | 162 | fieldGroupType, |
| 163 | fieldType, | 163 | fieldType, |
| 1 | import React, { useEffect, useState } from 'react'; | 1 | import React, { useEffect, useState } from 'react'; |
| 2 | -import type { ColsTreeProps } from '../qx-field-setter'; | ||
| 3 | -import { FieldSetter } from '../qx-field-setter'; | 2 | +import type { ColsTreeProps } from '@qx/common'; |
| 3 | +import { QxFieldSetter } from '@qx/common'; | ||
| 4 | import { QxFieldPopover } from '../qx-field-popover'; | 4 | import { QxFieldPopover } from '../qx-field-popover'; |
| 5 | import { QxBaseIcon } from '@qx/common'; | 5 | import { QxBaseIcon } from '@qx/common'; |
| 6 | import { FunctionOutlined } from '@ant-design/icons'; | 6 | import { FunctionOutlined } from '@ant-design/icons'; |
| @@ -863,7 +863,7 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({ | @@ -863,7 +863,7 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({ | ||
| 863 | </span> | 863 | </span> |
| 864 | </div> | 864 | </div> |
| 865 | {/* 值选项 TODO field 在工作流那可能有问题 */} | 865 | {/* 值选项 TODO field 在工作流那可能有问题 */} |
| 866 | - <FieldSetter | 866 | + <QxFieldSetter |
| 867 | value={item?.valuesObj} | 867 | value={item?.valuesObj} |
| 868 | params={props.params || fieldInfo?.params} | 868 | params={props.params || fieldInfo?.params} |
| 869 | field={getResultField( | 869 | field={getResultField( |
| @@ -30,7 +30,7 @@ import React, { | @@ -30,7 +30,7 @@ import React, { | ||
| 30 | } from 'react'; | 30 | } from 'react'; |
| 31 | import JSONEditor from './codeMirror'; | 31 | import JSONEditor from './codeMirror'; |
| 32 | import './style.less'; | 32 | import './style.less'; |
| 33 | -// import { FieldSetter } from '@qx/common'; | 33 | +// import { QxFieldSetter } from '@qx/common'; |
| 34 | import { formatEnum } from './constant'; | 34 | import { formatEnum } from './constant'; |
| 35 | // import { | 35 | // import { |
| 36 | // typeTranslateFieIdtype, | 36 | // typeTranslateFieIdtype, |
| @@ -633,7 +633,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { | @@ -633,7 +633,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { | ||
| 633 | ref={inputRef} | 633 | ref={inputRef} |
| 634 | onBlur={() => save('qxProps-default')} | 634 | onBlur={() => save('qxProps-default')} |
| 635 | /> | 635 | /> |
| 636 | - {/* <FieldSetter | 636 | + {/* <QxFieldSetter |
| 637 | value={[{ | 637 | value={[{ |
| 638 | type: typeTranslateItemtype(record.type), | 638 | type: typeTranslateItemtype(record.type), |
| 639 | value: record?.qxProps?.default | 639 | value: record?.qxProps?.default |
| @@ -19,7 +19,7 @@ import { | @@ -19,7 +19,7 @@ import { | ||
| 19 | } from 'antd'; | 19 | } from 'antd'; |
| 20 | import type { TreeProps } from 'antd/lib/tree'; | 20 | import type { TreeProps } from 'antd/lib/tree'; |
| 21 | import ParameterModal from './ParameterModal'; | 21 | import ParameterModal from './ParameterModal'; |
| 22 | -// import { FieldSetter } from '@qx/common'; | 22 | +// import { QxFieldSetter } from '@qx/common'; |
| 23 | import { formatEnum } from './constant'; | 23 | import { formatEnum } from './constant'; |
| 24 | // import type { InputRef } from 'antd'; | 24 | // import type { InputRef } from 'antd'; |
| 25 | // import { | 25 | // import { |
| @@ -628,7 +628,7 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => { | @@ -628,7 +628,7 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => { | ||
| 628 | </div> | 628 | </div> |
| 629 | {props?.isShowField && ( | 629 | {props?.isShowField && ( |
| 630 | <div className="opt-left-down"> | 630 | <div className="opt-left-down"> |
| 631 | - {/* <FieldSetter | 631 | + {/* <QxFieldSetter |
| 632 | disabled={disabled} | 632 | disabled={disabled} |
| 633 | value={[ | 633 | value={[ |
| 634 | { | 634 | { |