You need to sign in or sign up before continuing.

Commit ca954baa3097e251b6facdba53973fafe14775af

Authored by 陈洋
1 parent e23faf5e

pref: 条件配置 样式交互等优化

@@ -16,5 +16,6 @@ export const QxBaseIcon: React.FC<IconFontProps<string>> = createFromIconfontCN( @@ -16,5 +16,6 @@ export const QxBaseIcon: React.FC<IconFontProps<string>> = createFromIconfontCN(
16 'https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/svg_26060_546.8a1836dcdfdbd7ba024193bf4453fecc.js', // 应用图标 16 'https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/svg_26060_546.8a1836dcdfdbd7ba024193bf4453fecc.js', // 应用图标
17 'https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/svg_28096_13.dd706b5c23d28b13b59353264ba38e10.js', // 启效基础图标 17 'https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/svg_28096_13.dd706b5c23d28b13b59353264ba38e10.js', // 启效基础图标
18 'https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/svg_27332_31.781256b6f9c4ac7ebdb3c69f019a2a61.js', // 启效表单组件图标 18 'https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/svg_27332_31.781256b6f9c4ac7ebdb3c69f019a2a61.js', // 启效表单组件图标
  19 + 'https://lf1-cdn-tos.bytegoofy.com/obj/iconpark/svg_27935_13.0c296fa1ba08ebab844f9eb88fe5c787.js', // 新版数据流
19 ], 20 ],
20 }) 21 })
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
38 background-color: transparent; 38 background-color: transparent;
39 border: 1px solid @N4; 39 border: 1px solid @N4;
40 border-radius: 4px; 40 border-radius: 4px;
  41 + min-height: 32px;
41 42
42 &__icon-text { 43 &__icon-text {
43 color: @N9; 44 color: @N9;
@@ -58,8 +59,10 @@ @@ -58,8 +59,10 @@
58 } 59 }
59 60
60 .qx-tags-input.ant-input { 61 .qx-tags-input.ant-input {
  62 + width: calc(100% - 32px);
61 padding: 0 4px 4px 8px; 63 padding: 0 4px 4px 8px;
62 border-radius: 4px 0 0 4px; 64 border-radius: 4px 0 0 4px;
  65 + box-sizing: border-box;
63 } 66 }
64 .ant-select-single:not(.ant-select-customize-input) .ant-select-selector { 67 .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
65 padding: 0 4px 0 8px; 68 padding: 0 4px 0 8px;
@@ -164,15 +167,14 @@ @@ -164,15 +167,14 @@
164 167
165 .qx-field-setter__fields-btn { 168 .qx-field-setter__fields-btn {
166 display: flex; 169 display: flex;
167 - align-items: center; 170 + align-items: flex-end;
168 justify-content: center; 171 justify-content: center;
169 - width: 24px;  
170 - padding-right: 8px;  
171 - color: @N9; 172 + font-size: 16px;
  173 + padding: 0 8px 8px 8px;
  174 + color: @N7;
172 background-color: #fff; 175 background-color: #fff;
173 - //border-left: 1px solid @N4;  
174 - border-radius: 0 4px 4px 0;  
175 cursor: pointer; 176 cursor: pointer;
  177 + border-radius: 0 4px 4px 0;
176 178
177 &:hover { 179 &:hover {
178 .qx-field-setter__icon-text { 180 .qx-field-setter__icon-text {
@@ -183,13 +185,6 @@ @@ -183,13 +185,6 @@
183 background-color: #fff; 185 background-color: #fff;
184 } 186 }
185 } 187 }
186 -.qx-field-setter__fields-btn.qx-field-setter__fields-btn-core {  
187 - display: flex;  
188 - align-items: flex-end;  
189 - justify-content: center;  
190 - padding-bottom: 8px;  
191 - border-left: unset;  
192 -}  
193 188
194 .qx-field-setter__fields-btn--disabled, 189 .qx-field-setter__fields-btn--disabled,
195 .qx-field-setter__fields-btn--disabled:hover { 190 .qx-field-setter__fields-btn--disabled:hover {
@@ -230,12 +225,11 @@ @@ -230,12 +225,11 @@
230 left: initial !important; 225 left: initial !important;
231 } 226 }
232 227
233 -.qx-widget-setting { 228 +.qx-field-setter {
234 .select.sel-user-show { 229 .select.sel-user-show {
235 display: flex; 230 display: flex;
236 flex-wrap: wrap; 231 flex-wrap: wrap;
237 align-items: center; 232 align-items: center;
238 - min-height: 32px;  
239 padding: 0 4px 4px 8px; 233 padding: 0 4px 4px 8px;
240 border-radius: 4px 0 0 4px; 234 border-radius: 4px 0 0 4px;
241 235
@@ -266,10 +260,11 @@ @@ -266,10 +260,11 @@
266 margin-top: 4px; 260 margin-top: 4px;
267 line-height: 24px; 261 line-height: 24px;
268 } 262 }
269 - }  
270 - .qx-filter__setter--selected {  
271 - margin-top: 4px;  
272 - color: #bfbfbf; 263 +
  264 + .qx-filter__setter--selected {
  265 + margin-top: 4px;
  266 + color: #bfbfbf;
  267 + }
273 } 268 }
274 } 269 }
275 270
@@ -153,8 +153,6 @@ export interface paramColSelectProps extends ColSelectProps { @@ -153,8 +153,6 @@ export interface paramColSelectProps extends ColSelectProps {
153 resetValue?: any; 153 resetValue?: any;
154 timeSelected?: any; // 公式等时间字段是否可显示 154 timeSelected?: any; // 公式等时间字段是否可显示
155 dateSelected?: any; // 时间可选 日期字段 155 dateSelected?: any; // 时间可选 日期字段
156 - //TODO 此字段不确定是否是只有嵌入组件使用到,如果是后续可以删除掉  
157 - iconType?: string; // Popover-icon自定义  
158 iconText?: string; // Popover-icon 自定义 后面跟随文本 156 iconText?: string; // Popover-icon 自定义 后面跟随文本
159 allowClear?: boolean; 157 allowClear?: boolean;
160 } 158 }
@@ -1475,17 +1473,11 @@ export const FieldSetter: React.FC<paramColSelectProps> = ({ @@ -1475,17 +1473,11 @@ export const FieldSetter: React.FC<paramColSelectProps> = ({
1475 }} 1473 }}
1476 > 1474 >
1477 <span 1475 <span
1478 - className={`qx-field-setter__fields-btn qx-field-setter__fields-btn-core ${ 1476 + className={`qx-field-setter__fields-btn ${
1479 disabled ? 'qx-field-setter__fields-btn--disabled' : '' 1477 disabled ? 'qx-field-setter__fields-btn--disabled' : ''
1480 - } ${props?.iconType ? 'qx-field-setter__param' : ''}`} 1478 + }`}
1481 > 1479 >
1482 - {props?.iconType ? (  
1483 - <div className={'qx-embed-param'}>  
1484 - <QxBaseIcon style={{ fontSize: 20 }} type={props.iconType} />  
1485 - </div>  
1486 - ) : (  
1487 - <ControlOutlined />  
1488 - )} 1480 + <ControlOutlined />
1489 {props?.iconText ? ( 1481 {props?.iconText ? (
1490 <span className={'qx-field-setter__icon-text'}>{props.iconText}</span> 1482 <span className={'qx-field-setter__icon-text'}>{props.iconText}</span>
1491 ) : null} 1483 ) : null}
1 @import '~@qx/ui/src/style/variable.less'; 1 @import '~@qx/ui/src/style/variable.less';
2 2
3 // 条件配置标题样式 3 // 条件配置标题样式
4 -.qx-filter-condition__header { 4 +.qx-conditions__header {
5 display: flex; 5 display: flex;
6 align-items: center; 6 align-items: center;
7 justify-content: space-between; 7 justify-content: space-between;
@@ -35,15 +35,19 @@ @@ -35,15 +35,19 @@
35 } 35 }
36 } 36 }
37 37
  38 +// 序号
38 .qx-filter-cont-left { 39 .qx-filter-cont-left {
39 - //margin-top: 8px;  
40 - //margin-bottom: 8px;  
41 -  
42 .qx-query-text { 40 .qx-query-text {
43 flex-shrink: 1; 41 flex-shrink: 1;
44 - padding-right: 8px; 42 + padding-right: 16px;
45 overflow: hidden; 43 overflow: hidden;
46 vertical-align: bottom; 44 vertical-align: bottom;
  45 + color: @N9;
  46 +
  47 + .anticon {
  48 + font-size: 16px;
  49 + color: @N8;
  50 + }
47 } 51 }
48 52
49 .queryTexts { 53 .queryTexts {
@@ -71,37 +75,29 @@ @@ -71,37 +75,29 @@
71 flex-shrink: 1; 75 flex-shrink: 1;
72 align-items: center; 76 align-items: center;
73 justify-content: space-between; 77 justify-content: space-between;
74 - width: calc(100% - 32px); 78 + width: calc(100% - 24px);
75 height: 24px; 79 height: 24px;
76 } 80 }
77 81
78 .qx-query-text-opt { 82 .qx-query-text-opt {
79 - display: flex;  
80 flex-shrink: 0; 83 flex-shrink: 0;
  84 + min-width: 80px;
  85 + display: flex;
81 align-items: center; 86 align-items: center;
82 justify-content: space-between; 87 justify-content: space-between;
83 height: 24px; 88 height: 24px;
84 padding: 0 8px; 89 padding: 0 8px;
85 color: @N9; 90 color: @N9;
86 - background: #fff;  
87 91
88 .query-text-opt-btn { 92 .query-text-opt-btn {
89 display: flex; 93 display: flex;
90 align-items: center; 94 align-items: center;
91 justify-content: flex-end; 95 justify-content: flex-end;
92 - width: 12px;  
93 - height: 12px; 96 + width: 14px;
  97 + height: 14px;
94 color: @N7; 98 color: @N7;
95 - font-size: 16px;  
96 -  
97 - svg {  
98 - margin-top: 2px; // 对齐  
99 - transform: scale(0.5);  
100 - }  
101 - }  
102 -  
103 - &:hover {  
104 - background: #fff; 99 + font-size: 14px;
  100 + margin-top: 0.1em;
105 } 101 }
106 } 102 }
107 } 103 }
@@ -118,24 +114,25 @@ @@ -118,24 +114,25 @@
118 114
119 .qx-cond-index { 115 .qx-cond-index {
120 display: block; 116 display: block;
121 - font-size: 16px; 117 + font-size: 14px;
122 line-height: 58px; 118 line-height: 58px;
123 } 119 }
124 120
125 .qx-cond-ctrl { 121 .qx-cond-ctrl {
126 - position: sticky;  
127 - right: 0;  
128 - bottom: 0;  
129 - left: 0;  
130 - z-index: 20;  
131 - margin-top: 4px;  
132 - padding: 8px 0 10px 0; 122 + //position: sticky;
  123 + //right: 0;
  124 + //bottom: 0;
  125 + //left: 0;
  126 + //z-index: 20;
  127 + //margin-top: 4px;
  128 + padding: 6px 0;
  129 + font-size: 14px;
133 color: @N9; 130 color: @N9;
134 background: #fff; 131 background: #fff;
135 border-top: 1px solid @N4; 132 border-top: 1px solid @N4;
136 } 133 }
137 134
138 -.qx-filter-condition-input { 135 +.qx-conditions-input {
139 margin-top: 5px; 136 margin-top: 5px;
140 } 137 }
141 138
@@ -174,23 +171,6 @@ @@ -174,23 +171,6 @@
174 } 171 }
175 } 172 }
176 173
177 -.conditionItemForm {  
178 - &:hover {  
179 - background-color: transparent;  
180 - }  
181 -  
182 - .ant-divider.ant-divider-horizontal {  
183 - border-color: @N4;  
184 - }  
185 -}  
186 -  
187 -.condEmpty {  
188 - padding: 16px 0 26px;  
189 - color: #999;  
190 - font-size: 16px;  
191 - text-align: center;  
192 -}  
193 -  
194 .sqlType { 174 .sqlType {
195 width: 322px; 175 width: 322px;
196 margin-left: 8px !important; 176 margin-left: 8px !important;
@@ -201,52 +181,3 @@ @@ -201,52 +181,3 @@
201 padding: 10px; 181 padding: 10px;
202 background-color: @N1; 182 background-color: @N1;
203 } 183 }
204 -  
205 -.qx-fileterCondition_item {  
206 - margin: 30px 0 8px 0;  
207 - font-weight: 400;  
208 - font-size: 16px;  
209 -}  
210 -  
211 -.qx-cond-ctrl-custom-chart {  
212 - position: static;  
213 - margin-top: 10px;  
214 - padding: 0;  
215 -}  
216 -  
217 -.qx-filter-condition-custom-opt {  
218 - display: flex;  
219 - justify-content: space-between;  
220 - width: 100%;  
221 - height: 46px;  
222 - padding: 16px 16px 8px 16px;  
223 -}  
224 -  
225 -// 条件配置 自定义筛选 相关样式  
226 -.qx-conditions-view-filter-single,  
227 -.qx-conditions-view-filter {  
228 - width: 464px;  
229 - padding: 0 0 0 16px;  
230 - overflow-y: hidden;  
231 -  
232 - &:hover {  
233 - overflow-y: auto;  
234 - }  
235 -}  
236 -  
237 -// 查询条件大于1个 高度去除条件组合  
238 -.qx-conditions-view-filter {  
239 - min-height: 260px;  
240 - max-height: 260px;  
241 -}  
242 -  
243 -.qx-conditions-view-filter-single {  
244 - min-height: 300px;  
245 - max-height: 300px;  
246 -}  
247 -  
248 -.qx-condition-item-filter {  
249 - width: calc(100% - 16px);  
250 - min-width: calc(100% - 16px);  
251 - max-width: calc(100% - 16px);  
252 -}  
@@ -34,7 +34,7 @@ export default () => { @@ -34,7 +34,7 @@ export default () => {
34 </Tooltip> 34 </Tooltip>
35 </div>; 35 </div>;
36 return ( 36 return (
37 - <div style={{ width: 475, padding: 24 }}> 37 + <div style={{ width: 475, padding: 24, height: 454, overflowY: 'auto' }}>
38 <QxFilterCondition 38 <QxFilterCondition
39 titleDom={titleDom} 39 titleDom={titleDom}
40 colsTree={treeList} 40 colsTree={treeList}
@@ -44,7 +44,17 @@ export default () => { @@ -44,7 +44,17 @@ export default () => {
44 onChange={() => {}} 44 onChange={() => {}}
45 tableFields={optionsList} 45 tableFields={optionsList}
46 params={{ funCoded: 'cjQhMZnwkO2QoVzxVPC', useId: true }} 46 params={{ funCoded: 'cjQhMZnwkO2QoVzxVPC', useId: true }}
47 - value={{ count: 1 }} 47 + value={{
  48 + paramMappings: [
  49 + {
  50 + "field": "id",
  51 + "fieldType": "REL",
  52 + "fieldGroupType": "REL",
  53 + "opt": "IS",
  54 + "valuesObj": []
  55 + }
  56 + ]
  57 + }}
48 /> 58 />
49 </div> 59 </div>
50 ); 60 );
@@ -3,7 +3,7 @@ import type { ColsTreeProps } from '../qx-field-setter'; @@ -3,7 +3,7 @@ import type { ColsTreeProps } from '../qx-field-setter';
3 import { FieldSetter } from '../qx-field-setter'; 3 import { FieldSetter } from '../qx-field-setter';
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 { DownOutlined, FunctionOutlined } from '@ant-design/icons'; 6 +import { FunctionOutlined } from '@ant-design/icons';
7 import { 7 import {
8 Button, 8 Button,
9 Col, 9 Col,
@@ -620,11 +620,16 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({ @@ -620,11 +620,16 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({
620 620
621 return ( 621 return (
622 <> 622 <>
623 - <div className={'qx-filter-condition__header'}> 623 + <div className={'qx-conditions__header'}>
624 {props?.titleDom || <span> </span>} 624 {props?.titleDom || <span> </span>}
625 {Boolean(isUseValOption) ? ( 625 {Boolean(isUseValOption) ? (
626 <div style={{position: 'relative'}}> 626 <div style={{position: 'relative'}}>
627 - <Button size="small" type={'link'} onClick={() => setTreeSelectShow(!treeSelectShow)}> 627 + <Button
  628 + disabled={!(paramMappings && paramMappings?.length < 20)}
  629 + size="small"
  630 + type={'link'}
  631 + onClick={() => setTreeSelectShow(!treeSelectShow)}
  632 + >
628 <QxBaseIcon style={{fontSize: 16}} type={'qx-icon-plus'} /> 633 <QxBaseIcon style={{fontSize: 16}} type={'qx-icon-plus'} />
629 添加条件 634 添加条件
630 </Button> 635 </Button>
@@ -669,28 +674,6 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({ @@ -669,28 +674,6 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({
669 } 674 }
670 setTreeSelectShow(false); 675 setTreeSelectShow(false);
671 onAddCondition(val); 676 onAddCondition(val);
672 - // todo 此次功能更新 要求可选表单自身 对象自身 数组自身 待优化  
673 - // if(record?.children?.length == 0){  
674 - // if(!record?.fieldGroupType && !record?.fieldType){  
675 - // return;  
676 - // }  
677 - // setTreeSelectShow(false);  
678 - // onAddCondition(val);  
679 - // }else{  
680 - // let array = []  
681 - // array.push(record?.code)  
682 - // if(expandKey.length == 0 || (array.length > 0 && array.toString() != expandKey.toString())){  
683 - // if(record?.fieldGroupType == 'REL'){  
684 - // onAddCondition(val);  
685 - // setTreeSelectShow(false);  
686 - // }else{  
687 - // setExpandKey(array)  
688 - // }  
689 - // // setExpandKey(array)  
690 - // }else{  
691 - // setExpandKey([])  
692 - // }  
693 - // }  
694 }} 677 }}
695 filterTreeNode={filterTreeNode} 678 filterTreeNode={filterTreeNode}
696 /> 679 />
@@ -701,20 +684,18 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({ @@ -701,20 +684,18 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({
701 onSelect={(field) => onAddCondition(field.code)} 684 onSelect={(field) => onAddCondition(field.code)}
702 trigger={'click'} 685 trigger={'click'}
703 > 686 >
704 - <Button size="small" type={'link'}> 687 + <Button
  688 + disabled={!(paramMappings && paramMappings?.length < 20)}
  689 + size="small"
  690 + type={'link'}
  691 + >
705 <QxBaseIcon style={{fontSize: 16}} type={'qx-icon-plus'} /> 692 <QxBaseIcon style={{fontSize: 16}} type={'qx-icon-plus'} />
706 添加条件 693 添加条件
707 </Button> 694 </Button>
708 </QxFieldPopover> 695 </QxFieldPopover>
709 )} 696 )}
710 </div> 697 </div>
711 - <div  
712 - className={`qx-conditions ${  
713 - size(paramMappings || []) > 1  
714 - ? 'qx-conditions-view-filter'  
715 - : 'qx-conditions-view-filter-single'  
716 - }`}  
717 - > 698 + <div className={'qx-conditions'}>
718 {!!paramMappings?.length && 699 {!!paramMappings?.length &&
719 !isEmpty(flattenFields) && 700 !isEmpty(flattenFields) &&
720 (paramMappings || []).map((item, index) => { 701 (paramMappings || []).map((item, index) => {
@@ -763,7 +744,6 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({ @@ -763,7 +744,6 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({
763 > 744 >
764 <span className={'qx-cond-index'}>{index + 1}.</span> 745 <span className={'qx-cond-index'}>{index + 1}.</span>
765 </Col> 746 </Col>
766 -  
767 <Col 747 <Col
768 span={22} 748 span={22}
769 className={'qx-filter-cont-left'} 749 className={'qx-filter-cont-left'}
@@ -784,7 +764,8 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({ @@ -784,7 +764,8 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({
784 > 764 >
785 {getCol(item.field) ? ( 765 {getCol(item.field) ? (
786 <> 766 <>
787 - {isUseValOption ? null : getWidgetsIcon(fieldInfo?.extract?.widget)}{' '} 767 + {isUseValOption ? null : getWidgetsIcon(fieldInfo?.extract?.widget)}
  768 + &nbsp;
788 {getCol(item?.field)?.name} 769 {getCol(item?.field)?.name}
789 </> 770 </>
790 ) : ( 771 ) : (
@@ -849,7 +830,13 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({ @@ -849,7 +830,13 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({
849 getFieldType(item.field), 830 getFieldType(item.field),
850 )?.text 831 )?.text
851 }{' '} 832 }{' '}
852 - <DownOutlined className={'query-text-opt-btn'} /> 833 + <QxBaseIcon
  834 + style={{
  835 + transform: 'rotate(-90deg)'
  836 + }}
  837 + className={'query-text-opt-btn'}
  838 + type={'qx-icon-left'}
  839 + />
853 </Button> 840 </Button>
854 </Dropdown> 841 </Dropdown>
855 )} 842 )}
@@ -911,8 +898,6 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({ @@ -911,8 +898,6 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({
911 </Row> 898 </Row>
912 ); 899 );
913 })} 900 })}
914 -  
915 - {/*{(!paramMappings || paramMappings.length === 0) && <div className={style.condEmpty}>暂无条件数据</div>}*/}  
916 </div> 901 </div>
917 902
918 <div 903 <div
@@ -937,7 +922,15 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({ @@ -937,7 +922,15 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({
937 )} 922 )}
938 > 923 >
939 <span> 924 <span>
940 - {sqlTypeTextConvert(getOperCol(sqlType)?.text)} <DownOutlined /> 925 + {sqlTypeTextConvert(getOperCol(sqlType)?.text)}
  926 + <QxBaseIcon
  927 + style={{
  928 + marginLeft: 8,
  929 + marginTop: '0.1em',
  930 + transform: 'rotate(-90deg)'
  931 + }}
  932 + type={'qx-icon-left'}
  933 + />
941 </span> 934 </span>
942 </Dropdown> 935 </Dropdown>
943 </div> 936 </div>
@@ -950,7 +943,7 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({ @@ -950,7 +943,7 @@ export const QxFilterCondition: React.FC<paramFilterConditionProps> = ({
950 {/*</Text>*/} 943 {/*</Text>*/}
951 944
952 <TextArea 945 <TextArea
953 - className={'qx-filter-condition-input'} 946 + className={'qx-conditions-input'}
954 style={{ 947 style={{
955 borderColor: expressionErr && expressionErr.length > 0 ? '#ff4d4f' : '', 948 borderColor: expressionErr && expressionErr.length > 0 ? '#ff4d4f' : '',
956 }} 949 }}
1 export const optionsList = [ 1 export const optionsList = [
2 { 2 {
3 - "name": "记录ID", 3 + "name": "记录ID记录ID记录ID记录ID记录ID记录ID记录ID记录ID记录ID记录ID记录ID记录记录记录记录记录记录记录记录记录记录记录记录",
4 "code": "id", 4 "code": "id",
5 "extract": { 5 "extract": {
6 "fieldType": "REL", 6 "fieldType": "REL",
@@ -528,7 +528,7 @@ export const treeList = [ @@ -528,7 +528,7 @@ export const treeList = [
528 "key": "id", 528 "key": "id",
529 "code": "id", 529 "code": "id",
530 "filedName": "id", 530 "filedName": "id",
531 - "name": "记录ID", 531 + "name": "记录ID记录ID记录ID记录ID记录ID记录ID记录ID记录ID记录ID记录ID记录ID记录记录记录记录记录记录记录记录记录记录记录记录",
532 "extract": { 532 "extract": {
533 "fieldType": "REL", 533 "fieldType": "REL",
534 "fieldKey": "id", 534 "fieldKey": "id",
@@ -538,15 +538,6 @@ export const treeList = [ @@ -538,15 +538,6 @@ export const treeList = [
538 "$base": true 538 "$base": true
539 }, 539 },
540 "fieldType": "REL", 540 "fieldType": "REL",
541 - "title": {  
542 - "key": null,  
543 - "ref": null,  
544 - "props": {  
545 - "widget": "relSelector",  
546 - "name": "记录ID"  
547 - },  
548 - "_owner": null  
549 - },  
550 "fieldGroupType": "REL" 541 "fieldGroupType": "REL"
551 }, 542 },
552 { 543 {
@@ -563,15 +554,6 @@ export const treeList = [ @@ -563,15 +554,6 @@ export const treeList = [
563 "hidden": false 554 "hidden": false
564 }, 555 },
565 "fieldType": "STRING", 556 "fieldType": "STRING",
566 - "title": {  
567 - "key": null,  
568 - "ref": null,  
569 - "props": {  
570 - "widget": "qxInput",  
571 - "name": "标题"  
572 - },  
573 - "_owner": null  
574 - },  
575 "fieldGroupType": "TEXT" 557 "fieldGroupType": "TEXT"
576 }, 558 },
577 { 559 {
@@ -594,15 +576,6 @@ export const treeList = [ @@ -594,15 +576,6 @@ export const treeList = [
594 "relFunCode": "hcxsd" 576 "relFunCode": "hcxsd"
595 }, 577 },
596 "fieldType": "REL", 578 "fieldType": "REL",
597 - "title": {  
598 - "key": null,  
599 - "ref": null,  
600 - "props": {  
601 - "widget": "relSelector",  
602 - "name": "简单统计1单标签"  
603 - },  
604 - "_owner": null  
605 - },  
606 "fieldGroupType": "REL" 579 "fieldGroupType": "REL"
607 }, 580 },
608 { 581 {
@@ -625,15 +598,6 @@ export const treeList = [ @@ -625,15 +598,6 @@ export const treeList = [
625 "relFunCode": "hcxsd" 598 "relFunCode": "hcxsd"
626 }, 599 },
627 "fieldType": "REL_MULTI", 600 "fieldType": "REL_MULTI",
628 - "title": {  
629 - "key": null,  
630 - "ref": null,  
631 - "props": {  
632 - "widget": "relSelector",  
633 - "name": "简单统计1多标签"  
634 - },  
635 - "_owner": null  
636 - },  
637 "fieldGroupType": "REL_MULTI" 601 "fieldGroupType": "REL_MULTI"
638 }, 602 },
639 { 603 {
@@ -656,15 +620,6 @@ export const treeList = [ @@ -656,15 +620,6 @@ export const treeList = [
656 "relFunCode": "hcxsd" 620 "relFunCode": "hcxsd"
657 }, 621 },
658 "fieldType": "REL_MULTI", 622 "fieldType": "REL_MULTI",
659 - "title": {  
660 - "key": null,  
661 - "ref": null,  
662 - "props": {  
663 - "widget": "relSelector",  
664 - "name": "简单统计1多表格"  
665 - },  
666 - "_owner": null  
667 - },  
668 "fieldGroupType": "REL_MULTI" 623 "fieldGroupType": "REL_MULTI"
669 }, 624 },
670 { 625 {
@@ -681,15 +636,6 @@ export const treeList = [ @@ -681,15 +636,6 @@ export const treeList = [
681 "hidden": false 636 "hidden": false
682 }, 637 },
683 "fieldType": "TEXT", 638 "fieldType": "TEXT",
684 - "title": {  
685 - "key": null,  
686 - "ref": null,  
687 - "props": {  
688 - "widget": "qxInput",  
689 - "name": "描述"  
690 - },  
691 - "_owner": null  
692 - },  
693 "fieldGroupType": "TEXT" 639 "fieldGroupType": "TEXT"
694 }, 640 },
695 { 641 {
@@ -706,15 +652,6 @@ export const treeList = [ @@ -706,15 +652,6 @@ export const treeList = [
706 "hidden": false 652 "hidden": false
707 }, 653 },
708 "fieldType": "FILE", 654 "fieldType": "FILE",
709 - "title": {  
710 - "key": null,  
711 - "ref": null,  
712 - "props": {  
713 - "widget": "qxUploadImage",  
714 - "name": "图片"  
715 - },  
716 - "_owner": null  
717 - },  
718 "fieldGroupType": "FILE" 655 "fieldGroupType": "FILE"
719 }, 656 },
720 { 657 {
@@ -731,15 +668,6 @@ export const treeList = [ @@ -731,15 +668,6 @@ export const treeList = [
731 "hidden": false 668 "hidden": false
732 }, 669 },
733 "fieldType": "DOUBLE", 670 "fieldType": "DOUBLE",
734 - "title": {  
735 - "key": null,  
736 - "ref": null,  
737 - "props": {  
738 - "widget": "qxNumber",  
739 - "name": "数值"  
740 - },  
741 - "_owner": null  
742 - },  
743 "fieldGroupType": "NUM" 671 "fieldGroupType": "NUM"
744 }, 672 },
745 { 673 {
@@ -756,15 +684,6 @@ export const treeList = [ @@ -756,15 +684,6 @@ export const treeList = [
756 "hidden": false 684 "hidden": false
757 }, 685 },
758 "fieldType": "STRING", 686 "fieldType": "STRING",
759 - "title": {  
760 - "key": null,  
761 - "ref": null,  
762 - "props": {  
763 - "widget": "qxInput",  
764 - "name": "文本"  
765 - },  
766 - "_owner": null  
767 - },  
768 "fieldGroupType": "TEXT" 687 "fieldGroupType": "TEXT"
769 }, 688 },
770 { 689 {
@@ -781,15 +700,6 @@ export const treeList = [ @@ -781,15 +700,6 @@ export const treeList = [
781 "hidden": false 700 "hidden": false
782 }, 701 },
783 "fieldType": "YEAR_SEC", 702 "fieldType": "YEAR_SEC",
784 - "title": {  
785 - "key": null,  
786 - "ref": null,  
787 - "props": {  
788 - "widget": "qxDatetime",  
789 - "name": "日期"  
790 - },  
791 - "_owner": null  
792 - },  
793 "fieldGroupType": "DATE" 703 "fieldGroupType": "DATE"
794 }, 704 },
795 { 705 {
@@ -806,15 +716,6 @@ export const treeList = [ @@ -806,15 +716,6 @@ export const treeList = [
806 "hidden": false 716 "hidden": false
807 }, 717 },
808 "fieldType": "HOUR_MIN", 718 "fieldType": "HOUR_MIN",
809 - "title": {  
810 - "key": null,  
811 - "ref": null,  
812 - "props": {  
813 - "widget": "qxTime",  
814 - "name": "时间"  
815 - },  
816 - "_owner": null  
817 - },  
818 "fieldGroupType": "TIME" 719 "fieldGroupType": "TIME"
819 }, 720 },
820 { 721 {
@@ -831,15 +732,6 @@ export const treeList = [ @@ -831,15 +732,6 @@ export const treeList = [
831 "hidden": false 732 "hidden": false
832 }, 733 },
833 "fieldType": "BOOL", 734 "fieldType": "BOOL",
834 - "title": {  
835 - "key": null,  
836 - "ref": null,  
837 - "props": {  
838 - "widget": "qxSwitch",  
839 - "name": "开关"  
840 - },  
841 - "_owner": null  
842 - },  
843 "fieldGroupType": "BOOL" 735 "fieldGroupType": "BOOL"
844 }, 736 },
845 { 737 {
@@ -856,15 +748,6 @@ export const treeList = [ @@ -856,15 +748,6 @@ export const treeList = [
856 "hidden": false 748 "hidden": false
857 }, 749 },
858 "fieldType": "ENUM_MULTI", 750 "fieldType": "ENUM_MULTI",
859 - "title": {  
860 - "key": null,  
861 - "ref": null,  
862 - "props": {  
863 - "widget": "qxMultiSelect",  
864 - "name": "多选"  
865 - },  
866 - "_owner": null  
867 - },  
868 "fieldGroupType": "ENUM_MULTI" 751 "fieldGroupType": "ENUM_MULTI"
869 }, 752 },
870 { 753 {
@@ -881,15 +764,6 @@ export const treeList = [ @@ -881,15 +764,6 @@ export const treeList = [
881 "hidden": false 764 "hidden": false
882 }, 765 },
883 "fieldType": "ENUM", 766 "fieldType": "ENUM",
884 - "title": {  
885 - "key": null,  
886 - "ref": null,  
887 - "props": {  
888 - "widget": "qxSelect",  
889 - "name": "单选"  
890 - },  
891 - "_owner": null  
892 - },  
893 "fieldGroupType": "ENUM" 767 "fieldGroupType": "ENUM"
894 }, 768 },
895 { 769 {
@@ -906,15 +780,6 @@ export const treeList = [ @@ -906,15 +780,6 @@ export const treeList = [
906 "hidden": false 780 "hidden": false
907 }, 781 },
908 "fieldType": "DECIMAL", 782 "fieldType": "DECIMAL",
909 - "title": {  
910 - "key": null,  
911 - "ref": null,  
912 - "props": {  
913 - "widget": "qxMoney",  
914 - "name": "金额"  
915 - },  
916 - "_owner": null  
917 - },  
918 "fieldGroupType": "NUM" 783 "fieldGroupType": "NUM"
919 }, 784 },
920 { 785 {
@@ -931,15 +796,6 @@ export const treeList = [ @@ -931,15 +796,6 @@ export const treeList = [
931 "hidden": false 796 "hidden": false
932 }, 797 },
933 "fieldType": "PERCENT", 798 "fieldType": "PERCENT",
934 - "title": {  
935 - "key": null,  
936 - "ref": null,  
937 - "props": {  
938 - "widget": "qxPercent",  
939 - "name": "百分数"  
940 - },  
941 - "_owner": null  
942 - },  
943 "fieldGroupType": "NUM" 799 "fieldGroupType": "NUM"
944 }, 800 },
945 { 801 {
@@ -956,15 +812,6 @@ export const treeList = [ @@ -956,15 +812,6 @@ export const treeList = [
956 "hidden": false 812 "hidden": false
957 }, 813 },
958 "fieldType": "STRING", 814 "fieldType": "STRING",
959 - "title": {  
960 - "key": null,  
961 - "ref": null,  
962 - "props": {  
963 - "widget": "qxEmail",  
964 - "name": "邮箱"  
965 - },  
966 - "_owner": null  
967 - },  
968 "fieldGroupType": "TEXT" 815 "fieldGroupType": "TEXT"
969 }, 816 },
970 { 817 {
@@ -981,15 +828,6 @@ export const treeList = [ @@ -981,15 +828,6 @@ export const treeList = [
981 "hidden": false 828 "hidden": false
982 }, 829 },
983 "fieldType": "STRING", 830 "fieldType": "STRING",
984 - "title": {  
985 - "key": null,  
986 - "ref": null,  
987 - "props": {  
988 - "widget": "qxMobile",  
989 - "name": "手机"  
990 - },  
991 - "_owner": null  
992 - },  
993 "fieldGroupType": "TEXT" 831 "fieldGroupType": "TEXT"
994 }, 832 },
995 { 833 {
@@ -1006,15 +844,6 @@ export const treeList = [ @@ -1006,15 +844,6 @@ export const treeList = [
1006 "hidden": false 844 "hidden": false
1007 }, 845 },
1008 "fieldType": "STRING", 846 "fieldType": "STRING",
1009 - "title": {  
1010 - "key": null,  
1011 - "ref": null,  
1012 - "props": {  
1013 - "widget": "qxAddress",  
1014 - "name": "地址"  
1015 - },  
1016 - "_owner": null  
1017 - },  
1018 "fieldGroupType": "TEXT" 847 "fieldGroupType": "TEXT"
1019 }, 848 },
1020 { 849 {
@@ -1031,15 +860,6 @@ export const treeList = [ @@ -1031,15 +860,6 @@ export const treeList = [
1031 "hidden": false 860 "hidden": false
1032 }, 861 },
1033 "fieldType": "FILE", 862 "fieldType": "FILE",
1034 - "title": {  
1035 - "key": null,  
1036 - "ref": null,  
1037 - "props": {  
1038 - "widget": "qxUpload",  
1039 - "name": "附件"  
1040 - },  
1041 - "_owner": null  
1042 - },  
1043 "fieldGroupType": "FILE" 863 "fieldGroupType": "FILE"
1044 }, 864 },
1045 { 865 {
@@ -1057,15 +877,6 @@ export const treeList = [ @@ -1057,15 +877,6 @@ export const treeList = [
1057 "relId": "user" 877 "relId": "user"
1058 }, 878 },
1059 "fieldType": "USER", 879 "fieldType": "USER",
1060 - "title": {  
1061 - "key": null,  
1062 - "ref": null,  
1063 - "props": {  
1064 - "widget": "userSelector",  
1065 - "name": "选人员"  
1066 - },  
1067 - "_owner": null  
1068 - },  
1069 "fieldGroupType": "USER" 880 "fieldGroupType": "USER"
1070 }, 881 },
1071 { 882 {
@@ -1083,15 +894,6 @@ export const treeList = [ @@ -1083,15 +894,6 @@ export const treeList = [
1083 "relId": "org" 894 "relId": "org"
1084 }, 895 },
1085 "fieldType": "ORG", 896 "fieldType": "ORG",
1086 - "title": {  
1087 - "key": null,  
1088 - "ref": null,  
1089 - "props": {  
1090 - "widget": "orgSelector",  
1091 - "name": "选部门"  
1092 - },  
1093 - "_owner": null  
1094 - },  
1095 "fieldGroupType": "ORG" 897 "fieldGroupType": "ORG"
1096 }, 898 },
1097 { 899 {
@@ -1109,15 +911,6 @@ export const treeList = [ @@ -1109,15 +911,6 @@ export const treeList = [
1109 "relId": "user" 911 "relId": "user"
1110 }, 912 },
1111 "fieldType": "USER_MULTI", 913 "fieldType": "USER_MULTI",
1112 - "title": {  
1113 - "key": null,  
1114 - "ref": null,  
1115 - "props": {  
1116 - "widget": "userSelector",  
1117 - "name": "选人员-多"  
1118 - },  
1119 - "_owner": null  
1120 - },  
1121 "fieldGroupType": "USER" 914 "fieldGroupType": "USER"
1122 }, 915 },
1123 { 916 {
@@ -1135,15 +928,6 @@ export const treeList = [ @@ -1135,15 +928,6 @@ export const treeList = [
1135 "relId": "org" 928 "relId": "org"
1136 }, 929 },
1137 "fieldType": "ORG_MULTI", 930 "fieldType": "ORG_MULTI",
1138 - "title": {  
1139 - "key": null,  
1140 - "ref": null,  
1141 - "props": {  
1142 - "widget": "orgSelector",  
1143 - "name": "选部门-多"  
1144 - },  
1145 - "_owner": null  
1146 - },  
1147 "fieldGroupType": "ORG" 931 "fieldGroupType": "ORG"
1148 }, 932 },
1149 { 933 {
@@ -1162,15 +946,6 @@ export const treeList = [ @@ -1162,15 +946,6 @@ export const treeList = [
1162 "$base": true 946 "$base": true
1163 }, 947 },
1164 "fieldType": "USER", 948 "fieldType": "USER",
1165 - "title": {  
1166 - "key": null,  
1167 - "ref": null,  
1168 - "props": {  
1169 - "widget": "userSelector",  
1170 - "name": "创建人"  
1171 - },  
1172 - "_owner": null  
1173 - },  
1174 "fieldGroupType": "USER" 949 "fieldGroupType": "USER"
1175 }, 950 },
1176 { 951 {
@@ -1187,15 +962,6 @@ export const treeList = [ @@ -1187,15 +962,6 @@ export const treeList = [
1187 "hidden": false 962 "hidden": false
1188 }, 963 },
1189 "fieldType": "STRING", 964 "fieldType": "STRING",
1190 - "title": {  
1191 - "key": null,  
1192 - "ref": null,  
1193 - "props": {  
1194 - "widget": "createdAt",  
1195 - "name": "创建时间"  
1196 - },  
1197 - "_owner": null  
1198 - },  
1199 "fieldGroupType": "TEXT" 965 "fieldGroupType": "TEXT"
1200 }, 966 },
1201 { 967 {
@@ -1214,15 +980,6 @@ export const treeList = [ @@ -1214,15 +980,6 @@ export const treeList = [
1214 "$base": true 980 "$base": true
1215 }, 981 },
1216 "fieldType": "USER", 982 "fieldType": "USER",
1217 - "title": {  
1218 - "key": null,  
1219 - "ref": null,  
1220 - "props": {  
1221 - "widget": "userSelector",  
1222 - "name": "更新人"  
1223 - },  
1224 - "_owner": null  
1225 - },  
1226 "fieldGroupType": "USER" 983 "fieldGroupType": "USER"
1227 }, 984 },
1228 { 985 {
@@ -1240,15 +997,6 @@ export const treeList = [ @@ -1240,15 +997,6 @@ export const treeList = [
1240 "$base": true 997 "$base": true
1241 }, 998 },
1242 "fieldType": "YEAR_SEC", 999 "fieldType": "YEAR_SEC",
1243 - "title": {  
1244 - "key": null,  
1245 - "ref": null,  
1246 - "props": {  
1247 - "widget": "qxDatetime",  
1248 - "name": "更新时间"  
1249 - },  
1250 - "_owner": null  
1251 - },  
1252 "fieldGroupType": "DATE" 1000 "fieldGroupType": "DATE"
1253 }, 1001 },
1254 { 1002 {
@@ -1265,15 +1013,6 @@ export const treeList = [ @@ -1265,15 +1013,6 @@ export const treeList = [
1265 "hidden": false 1013 "hidden": false
1266 }, 1014 },
1267 "fieldType": "FORMULA", 1015 "fieldType": "FORMULA",
1268 - "title": {  
1269 - "key": null,  
1270 - "ref": null,  
1271 - "props": {  
1272 - "widget": "qxFormula",  
1273 - "name": "公式"  
1274 - },  
1275 - "_owner": null  
1276 - },  
1277 "fieldGroupType": "NUM" 1016 "fieldGroupType": "NUM"
1278 }, 1017 },
1279 { 1018 {
@@ -1290,15 +1029,6 @@ export const treeList = [ @@ -1290,15 +1029,6 @@ export const treeList = [
1290 "hidden": false 1029 "hidden": false
1291 }, 1030 },
1292 "fieldType": "STRING", 1031 "fieldType": "STRING",
1293 - "title": {  
1294 - "key": null,  
1295 - "ref": null,  
1296 - "props": {  
1297 - "widget": "qxBizNo",  
1298 - "name": "流水号"  
1299 - },  
1300 - "_owner": null  
1301 - },  
1302 "fieldGroupType": "TEXT" 1032 "fieldGroupType": "TEXT"
1303 }, 1033 },
1304 { 1034 {
@@ -1316,15 +1046,6 @@ export const treeList = [ @@ -1316,15 +1046,6 @@ export const treeList = [
1316 "relId": "EsDhRXIo0OVRQol54PR" 1046 "relId": "EsDhRXIo0OVRQol54PR"
1317 }, 1047 },
1318 "fieldType": "TREE", 1048 "fieldType": "TREE",
1319 - "title": {  
1320 - "key": null,  
1321 - "ref": null,  
1322 - "props": {  
1323 - "widget": "qxTree",  
1324 - "name": "树形关联"  
1325 - },  
1326 - "_owner": null  
1327 - },  
1328 "fieldGroupType": "TREE" 1049 "fieldGroupType": "TREE"
1329 }, 1050 },
1330 { 1051 {
@@ -1342,15 +1063,6 @@ export const treeList = [ @@ -1342,15 +1063,6 @@ export const treeList = [
1342 "relId": "oJHol3pBmfwKd6SULhX" 1063 "relId": "oJHol3pBmfwKd6SULhX"
1343 }, 1064 },
1344 "fieldType": "TABLE", 1065 "fieldType": "TABLE",
1345 - "title": {  
1346 - "key": null,  
1347 - "ref": null,  
1348 - "props": {  
1349 - "widget": "subform",  
1350 - "name": "子表"  
1351 - },  
1352 - "_owner": null  
1353 - },  
1354 "fieldGroupType": "TABLE" 1066 "fieldGroupType": "TABLE"
1355 }, 1067 },
1356 { 1068 {
@@ -1373,15 +1085,6 @@ export const treeList = [ @@ -1373,15 +1085,6 @@ export const treeList = [
1373 "relFunCode": "hkzf8" 1085 "relFunCode": "hkzf8"
1374 }, 1086 },
1375 "fieldType": "REL_MULTI", 1087 "fieldType": "REL_MULTI",
1376 - "title": {  
1377 - "key": null,  
1378 - "ref": null,  
1379 - "props": {  
1380 - "widget": "relSelector",  
1381 - "name": "关联记录-简单统计2"  
1382 - },  
1383 - "_owner": null  
1384 - },  
1385 "fieldGroupType": "REL_MULTI" 1088 "fieldGroupType": "REL_MULTI"
1386 }, 1089 },
1387 { 1090 {
@@ -1404,15 +1107,6 @@ export const treeList = [ @@ -1404,15 +1107,6 @@ export const treeList = [
1404 "relFunCode": "8xcmq" 1107 "relFunCode": "8xcmq"
1405 }, 1108 },
1406 "fieldType": "REL_MULTI", 1109 "fieldType": "REL_MULTI",
1407 - "title": {  
1408 - "key": null,  
1409 - "ref": null,  
1410 - "props": {  
1411 - "widget": "relSelector",  
1412 - "name": "关联1-1"  
1413 - },  
1414 - "_owner": null  
1415 - },  
1416 "fieldGroupType": "REL_MULTI" 1110 "fieldGroupType": "REL_MULTI"
1417 }, 1111 },
1418 { 1112 {
@@ -1435,15 +1129,6 @@ export const treeList = [ @@ -1435,15 +1129,6 @@ export const treeList = [
1435 "relFunCode": "hi76x" 1129 "relFunCode": "hi76x"
1436 }, 1130 },
1437 "fieldType": "REL_MULTI", 1131 "fieldType": "REL_MULTI",
1438 - "title": {  
1439 - "key": null,  
1440 - "ref": null,  
1441 - "props": {  
1442 - "widget": "relSelector",  
1443 - "name": "关联1"  
1444 - },  
1445 - "_owner": null  
1446 - },  
1447 "fieldGroupType": "REL_MULTI" 1132 "fieldGroupType": "REL_MULTI"
1448 } 1133 }
1449 ]; 1134 ];