田强 / qx-common · Commits

Commit 1d111bfe1f30a8048205182d2fdf4e8c5c18cac5

Authored by qiang.tian
2 parents c4e52be1 7a261cae

Merge branch 'feature/dataflow' of http://gitlab.qgutech.com/tianqiang/qx-common… 

… into feature/dataflow
Inline Side-by-side
Showing 5 changed files with 14 additions and 10 deletions
1 { 1 {
2 "name": "@qx/common", 2 "name": "@qx/common",
3 - "version": "3.0.0-alpha.23", 3 + "version": "3.0.0-alpha.25",
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",
@@ -45,14 +45,14 @@ @@ -45,14 +45,14 @@
45 "dependencies": { 45 "dependencies": {
46 "@ant-design/icons": "^5.2.5", 46 "@ant-design/icons": "^5.2.5",
47 "@qx/ui": "0.0.3-beta.1", 47 "@qx/ui": "0.0.3-beta.1",
  48 + "@qx/utils": "0.0.58",
48 "ahooks": "^3.7.5", 49 "ahooks": "^3.7.5",
49 "classnames": "^2.3.2", 50 "classnames": "^2.3.2",
50 "codemirror": "5.65.8", 51 "codemirror": "5.65.8",
51 "dayjs": "^1.11.9", 52 "dayjs": "^1.11.9",
52 "lodash-es": "^4.17.21", 53 "lodash-es": "^4.17.21",
53 "rc-virtual-list": "^3.4.13", 54 "rc-virtual-list": "^3.4.13",
54 - "react-codemirror2": "^7.2.1",  
55 - "@qx/utils": "0.0.58" 55 + "react-codemirror2": "^7.2.1"
56 }, 56 },
57 "devDependencies": { 57 "devDependencies": {
58 "@commitlint/cli": "^17.1.2", 58 "@commitlint/cli": "^17.1.2",
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 } 16 }
17 17
18 &__input-prefix { 18 &__input-prefix {
19 - color: @N6; 19 + color: @B8;
20 font-size: 16px; 20 font-size: 16px;
21 } 21 }
22 } 22 }
@@ -45,6 +45,7 @@ @@ -45,6 +45,7 @@
45 45
46 .ant-popover-inner { 46 .ant-popover-inner {
47 border-radius: 8px; 47 border-radius: 8px;
  48 + padding: 12px 16px;
48 49
49 .ant-popover-inner-content { 50 .ant-popover-inner-content {
50 color: rgba(0, 0, 0, 0.85); 51 color: rgba(0, 0, 0, 0.85);
@@ -108,7 +108,7 @@ export const QxIconSelector: React.FC<IconProps> = (props) => { @@ -108,7 +108,7 @@ export const QxIconSelector: React.FC<IconProps> = (props) => {
108 setTimeout(() => { 108 setTimeout(() => {
109 const cfy = findClassifyByIcon(blockIcon); 109 const cfy = findClassifyByIcon(blockIcon);
110 const iconItemDom: any = document.querySelector( 110 const iconItemDom: any = document.querySelector(
111 - `div[icon-name=${blockIcon}]`, 111 + `div[data-icon-name=${blockIcon}]`,
112 ); 112 );
113 // eslint-disable-next-line @typescript-eslint/no-unused-expressions 113 // eslint-disable-next-line @typescript-eslint/no-unused-expressions
114 iconItemDom && scrollIntoView(iconItemDom); 114 iconItemDom && scrollIntoView(iconItemDom);
@@ -318,7 +318,7 @@ export const QxIconSelector: React.FC<IconProps> = (props) => { @@ -318,7 +318,7 @@ export const QxIconSelector: React.FC<IconProps> = (props) => {
318 <div 318 <div
319 key={icon} 319 key={icon}
320 className={'block-icon'} 320 className={'block-icon'}
321 - icon-name={icon} 321 + data-icon-name={icon}
322 > 322 >
323 <QxBaseIcon 323 <QxBaseIcon
324 type={icon} 324 type={icon}
@@ -173,8 +173,8 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -173,8 +173,8 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
173 { 173 {
174 title: ( 174 title: (
175 <div style={{ display: 'flex', flexDirection: 'row' }}> 175 <div style={{ display: 'flex', flexDirection: 'row' }}>
176 - <span style={{ color: 'red' }}>*</span>  
177 <span>参数编码</span> 176 <span>参数编码</span>
  177 + <span style={{ color: 'red' }}>*</span>
178 </div> 178 </div>
179 ), 179 ),
180 dataIndex: 'code', 180 dataIndex: 'code',
@@ -196,8 +196,8 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -196,8 +196,8 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
196 { 196 {
197 title: ( 197 title: (
198 <div style={{ display: 'flex', flexDirection: 'row' }}> 198 <div style={{ display: 'flex', flexDirection: 'row' }}>
199 - <span style={{ color: 'red' }}>*</span>  
200 <span>参数名</span> 199 <span>参数名</span>
  200 + <span style={{ color: 'red' }}>*</span>
201 </div> 201 </div>
202 ), 202 ),
203 dataIndex: 'title', 203 dataIndex: 'title',
@@ -219,8 +219,8 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -219,8 +219,8 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
219 { 219 {
220 title: ( 220 title: (
221 <div style={{ display: 'flex', flexDirection: 'row' }}> 221 <div style={{ display: 'flex', flexDirection: 'row' }}>
222 - <span style={{ color: 'red' }}>*</span>  
223 <span>参数类型</span> 222 <span>参数类型</span>
  223 + <span style={{ color: 'red' }}>*</span>
224 </div> 224 </div>
225 ), 225 ),
226 dataIndex: 'type', 226 dataIndex: 'type',
@@ -253,6 +253,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -253,6 +253,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
253 render: (text, record) => 253 render: (text, record) =>
254 <div className="editable-cell "> 254 <div className="editable-cell ">
255 <QxFieldSetter 255 <QxFieldSetter
  256 + disabled={record.disabled}
256 value={record.valuesObj || []} 257 value={record.valuesObj || []}
257 params={{ appCode: 'appCode', useId: true }} 258 params={{ appCode: 'appCode', useId: true }}
258 valueOptions={getValueOptions(record)} 259 valueOptions={getValueOptions(record)}
@@ -266,6 +267,8 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -266,6 +267,8 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
266 showFieldOpt={!(nodeType === 'START')} 267 showFieldOpt={!(nodeType === 'START')}
267 // onChange={debounce((val) => handleField(val), 700)} 268 // onChange={debounce((val) => handleField(val), 700)}
268 onChange={(val) => handleChangeField(val, record)} 269 onChange={(val) => handleChangeField(val, record)}
  270 + popupOnBody={true}
  271 + inputDis={true}
269 /> 272 />
270 </div> 273 </div>
271 }, 274 },
@@ -775,7 +778,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => { @@ -775,7 +778,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
775 > 778 >
776 <Input 779 <Input
777 className={'qx-parameter-setting--search'} 780 className={'qx-parameter-setting--search'}
778 - placeholder="按名称搜索" 781 + placeholder="参数编码/参数名搜索"
779 prefix={<QxBaseIcon type={'icon-app-search-line'} />} 782 prefix={<QxBaseIcon type={'icon-app-search-line'} />}
780 onChange={onChange} 783 onChange={onChange}
781 style={{ width: 219 }} 784 style={{ width: 219 }}