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