aldehyde 0.1.35 → 0.1.36

package/src/aldehyde/controls/counting-tag/index.tsx

@@ -0,0 +1,45 @@
+import React from 'react'
+import { Tag,Input} from "antd";
+import {VEControlProps} from "../../tmpl/interface";
+import HCDataSource from "../../tmpl/hc-data-source";
+import Units from "../../units";
+
+interface CountingTagProps extends VEControlProps {
+    count:number,
+}
+interface CountingTagState {
+}
+
+export default class  CountingTag extends React.PureComponent<CountingTagProps, CountingTagState>{
+
+     componentDidMount() {
+         const {count,onChange,min}=this.props;
+        // this.onChange();
+    }
+
+     componentDidUpdate(preProps) {
+         const {count,onChange,min}=this.props;
+        if((this.props.count || this.props.count==0) && preProps.count!=this.props.count){
+            this.onChange()
+        }
+    }
+
+    onChange=()=>{
+        const {count,onChange,min}=this.props;
+        console.log('关系 this.props 修改', this.props);
+        onChange((count || count==0 ) && count>=Number(min) ? 1:null);
+    }
+
+    static defaultProps={
+        min:0
+    }
+
+    render(){
+
+        const {count,min,value}=this.props;
+        console.log('关系 this.props', value);
+        return <></>
+        // return <Tag style={{marginBottom: 10}} color="blue">{count?count:0}</Tag>;
+    }
+
+}

package/src/aldehyde/controls/entity-select/entity-select.tsx

@@ -108,7 +108,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
     }
 
     fetchOptions = async (searchText) => {
-        const { fieldConfig} = this.props;
+        const { fieldConfig,mainCode} = this.props;
 
         this.setState({
             loading: true,
@@ -146,7 +146,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
                 //构建过滤条件
             let criteriaData = {};
             criteriaData[formItemName] = searchText;
-            let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey( fieldConfig.id, {...criteriaData, ...pageInfo});
+            let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey( fieldConfig.id, {...criteriaData, ...pageInfo,mainCode});
             let sourceData = await this.loadData(queryKey.key, pageInfo, titleId);
 
             optionCache = {

package/src/aldehyde/controls/entity-select/popover-entity-select.tsx

@@ -5,16 +5,16 @@ import {SearchOutlined} from '@ant-design/icons';
 import SelectTable from '../../table/select-table'
 import './index.css'
 
-interface EntitySelectProps extends EControlProps {
+interface PopoverEntitySelectProps extends EControlProps {
     maxSelected?: number,
     onEntityClick?: (code: string) => void,
 };
 
-interface EntitySelectState {
+interface PopoverEntitySelectState {
 
 };
 
-export default class EntitySelect extends React.PureComponent<EntitySelectProps, EntitySelectState> {
+export default class PopoverEntitySelect extends React.PureComponent<PopoverEntitySelectProps, PopoverEntitySelectState> {
 
     static defaultProps = {
         maxSelected: 100,
@@ -53,7 +53,7 @@ export default class EntitySelect extends React.PureComponent<EntitySelectProps,
 
 
     render() {
-        const {id,value, itemType, fieldConfig, onChange, style, maxSelected, onEntityClick} = this.props;
+        const {id,value, itemType, fieldConfig, onChange, style, maxSelected, onEntityClick,mainCode} = this.props;
         const {} = this.state;
         let selectedRows: SelectedRow[] = [];
         let relationOptions = []
@@ -99,7 +99,7 @@ export default class EntitySelect extends React.PureComponent<EntitySelectProps,
                          borderRadius: '6px',
                          borderWidth: '0px',
                          borderColor: '#8c8c8c'
-                     }}><SelectTable maxSelectedRows={maxSelected} selectedRows={selectedRows} sourceId={fieldConfig.id}
+                     }}><SelectTable mainCode={mainCode} maxSelectedRows={maxSelected} selectedRows={selectedRows} sourceId={fieldConfig.id}
                                       onChange={this.onSelect}></SelectTable></div>}
                      trigger="click">
                 <Select id={id} style={{...style}}

package/src/aldehyde/controls/entry-control.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import {FieldConfig, ViewOrEdit} from "../tmpl/interface";
-import {Alert, Input, Select, Spin, Checkbox,Radio} from "antd";
+import {Alert, Input, Select, Spin, Checkbox,Radio,Switch} from "antd";
 import Rfield from "./rfield";
 import ControlTypeSupportor from "../tmpl/control-type-supportor";
 import DatePicker from './date-picker';
@@ -40,6 +40,7 @@ const HtmlEditor = loadable(() =>
 const {TextArea} = Input;
 
 interface EntryControlProps {
+    mainCode?:string,
     value?: any;
     fieldConfig: FieldConfig;
     onChange?: any;
@@ -59,7 +60,7 @@ function getOptions(mstrucId) {
 }
 
 
-function renderControl(id:any,fieldConfig: FieldConfig, fieldValue: any, onChange: any, width: any) {
+function renderControl(id:any,mainCode:string,fieldConfig: FieldConfig, fieldValue: any, onChange: any, width: any) {
 
     let itemType = ControlTypeSupportor.getControlType(fieldConfig, fieldValue);
 
@@ -75,11 +76,11 @@ function renderControl(id:any,fieldConfig: FieldConfig, fieldValue: any, onChang
     let max=(fieldConfigM || fieldConfigM=='0' ) ? Units.configParamTrans(fieldConfigM) : undefined;;
 
     let controlProps = {
-       id, fieldConfig,min,max, itemType, viewOrEdit, onChange, disabled, value: fieldValue, style: {minWidth: 220, width: '100%'}
+       id, mainCode,fieldConfig,min,max, itemType, viewOrEdit, onChange, disabled, value: fieldValue, style: {minWidth: 220, width: '100%'}
     }
 
     let antdControlProps = {
-        id, placeholder, disabled, value: fieldValue, onChange, style: {minWidth: 220, width: '100%'}
+        id, mainCode,placeholder, disabled, value: fieldValue, onChange, style: {minWidth: 220, width: '100%'}
     }
 
     const unSupportControl = <Input
@@ -155,6 +156,13 @@ function renderControl(id:any,fieldConfig: FieldConfig, fieldValue: any, onChang
         case "radio":
             entryControl = <RadioGroup {...antdControlProps} options={getOptions(fieldConfig.mstrucId)} value={typeof (fieldValue) == 'string' ? fieldValue.split(',')[0] : fieldValue}  />
             break;
+        case "yes-no-switch":
+            const {value,onChange,style,...other}=antdControlProps
+            entryControl =<Switch style={{width:'60px'}} checkedChildren="是" unCheckedChildren="否" checked={value=='是'?true:false} onChange={(checked)=>{
+                onChange(checked?'是':'否');
+            }
+            } {...other} />
+            break;
         case 'date-YY':
         case 'daterange-YY':
         case 'date-M1':
@@ -250,8 +258,8 @@ function renderControl(id:any,fieldConfig: FieldConfig, fieldValue: any, onChang
 }
 
 const EntryControl: React.FC<EntryControlProps> = (props) => {
-    const {fieldConfig, value, onChange,id} = props;
-    return renderControl(id,fieldConfig, value, onChange, null);
+    const {fieldConfig, value, onChange,id,mainCode} = props;
+    return renderControl(id,mainCode,fieldConfig, value, onChange, null);
 }
 
 export default EntryControl;

package/src/aldehyde/controls/view-control.tsx

@@ -110,6 +110,7 @@ function renderControl(fieldConfig: FieldConfig, fieldValue: any,pHolderType:Con
             break;
         case 'select':
         case 'radio':
+        case "yes-no-switch":
             viewControl = <EnumBadge {...controlProps}/>
             break;
         case 'multiselect':

package/src/aldehyde/detail/edit/dtmpl-edit.tsx

@@ -187,7 +187,7 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
     render() {
         const {dtmplConfig, showPostResult,loading,id,serial,dtmplData} = this.state;
         console.log(" dtmpl edit serial:",serial);
-        const { sourceId, showRightNav, code,addOrUpdate,maxColsOnRow} = this.props;
+        const { sourceId, showRightNav, code,addOrUpdate,maxColsOnRow,mainCode} = this.props;
         //const {title} = dtmplConfig;
         if (!dtmplConfig) {
             return  <Card loading={loading}>
@@ -195,7 +195,7 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
         }
         return (
             <div className={`detailPage ${showRightNav ? 'showRightNav' : 'noRightNav'}`} onClick={this.onClickBody}>
-                <DtmplForm  parentId={id} dtmplConfig={dtmplConfig}  formRef={this.formRef} sourceId={sourceId}
+                <DtmplForm mainCode={mainCode}  parentId={id} dtmplConfig={dtmplConfig}  formRef={this.formRef} sourceId={sourceId}
                            onFinish={this.onFinish} maxColsOnRow={maxColsOnRow}
                            showConfirm={true} dtmplData={dtmplData}  onValuesChange={this.onValuesChange}></DtmplForm>
                 {showRightNav ?

package/src/aldehyde/detail/edit/row-editor.tsx

@@ -11,6 +11,7 @@ interface RowEditorProps {
     dtmplData?: DtmplData;
     onOk:(value: DtmplData) => void,
     buttonStyle?:object,
+    disabled?:boolean
 }
 
 interface RowEditorState {
@@ -20,7 +21,8 @@ interface RowEditorState {
 export default class RowEditor extends React.PureComponent<RowEditorProps, RowEditorState> {
     formRef = React.createRef<FormInstance>();
     static defaultProps = {
-        buttonIcon:undefined
+        buttonIcon:undefined,
+        disabled:false,
     }
     state = {
         popoverVisible: false,
@@ -50,7 +52,7 @@ export default class RowEditor extends React.PureComponent<RowEditorProps, RowEd
 
     render() {
         const {popoverVisible}=this.state;
-        const {buttonIcon, buttonTitle, tooltipTitle, fieldGroupConfig, dtmplData,buttonStyle} = this.props;
+        const { disabled, buttonIcon, buttonTitle, tooltipTitle, fieldGroupConfig, dtmplData,buttonStyle} = this.props;
         return <Popover  destroyTooltipOnHide={true} placement="leftBottom" visible={popoverVisible}
                         content={<RowEditCard fieldGroupConfig={fieldGroupConfig} dtmplData={dtmplData}
                                               onCancel={()=>{
@@ -58,6 +60,7 @@ export default class RowEditor extends React.PureComponent<RowEditorProps, RowEd
                                               }   onOk={this.onOk}></RowEditCard>} trigger="click">
             <Tooltip placement="left" title={tooltipTitle}>
                 <Button
+                    disabled={disabled}
                     style={buttonStyle}
                     type='primary'
                     icon={buttonIcon}

package/src/aldehyde/form/criteria-form.tsx

@@ -21,6 +21,7 @@ export interface CriteriaFormProps {
     hiddenCriteriaIds?: string[];
     visible?: boolean;
     loading: boolean;
+    mainCode?:string;
 };
 
 const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
@@ -151,6 +152,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
     }
 
     const renderCriteria = (criterias: CriteriaConfig[]) => {
+
         if (!criterias) {
             return;
         }
@@ -171,7 +173,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
                                      rules={item.required ? [{
                                          required: true, message: `请选择${item.title}`,
                                      }] : undefined}>
-                        <EntryControl value={fieldValue} fieldConfig={item} />
+                        <EntryControl mainCode={props.mainCode} value={fieldValue} fieldConfig={item} />
                     </FormItem>
                 }
             })

package/src/aldehyde/form/dtmpl-form.tsx

@@ -26,7 +26,6 @@ interface DtmplFormStat {
     // changedGroupData:Map<number,DtmplData[]>
 };
 
-const confirm = Modal.confirm;
 
 export default class Form extends React.PureComponent<DtmplFormProps, DtmplFormStat> {
     fuseMode: boolean = false;
@@ -178,7 +177,7 @@ export default class Form extends React.PureComponent<DtmplFormProps, DtmplFormS
 
     fieldGroupList = () => {
 
-        const {dtmplConfig,parentId,maxColsOnRow} = this.props;
+        const {dtmplConfig,parentId,maxColsOnRow,mainCode} = this.props;
         const {dtmplData, loading} = this.state;
 
         let groups: FieldGroupConfig[];
@@ -193,7 +192,7 @@ export default class Form extends React.PureComponent<DtmplFormProps, DtmplFormS
                         if (dtmplData) {
                             data = dtmplData.arrayMap[item.id];
                         }
-                        return <RelationTable loading={loading} parentId={parentId}  key={item.id} fieldGroupConfig={item} value={data}
+                        return <RelationTable mainCode={mainCode} loading={loading} parentId={parentId}  key={item.id} fieldGroupConfig={item} value={data}
                                               viewOrEdit={"edit"} onChange={this.onGroupChange}/>
                     }
                 } else {//字段组
@@ -204,8 +203,9 @@ export default class Form extends React.PureComponent<DtmplFormProps, DtmplFormS
                         className="hoverable"
                         headStyle={{background: "#f2f4f5"}}
                         loading={loading}
+                        bodyStyle={{padding:'6px'}}
                     >
-                        <FormItemGroup maxColsOnRow={maxColsOnRow} fields={item?item.fields:undefined} valueMap={dtmplData ? dtmplData.fieldMap : undefined}
+                        <FormItemGroup mainCode={mainCode} maxColsOnRow={maxColsOnRow} fields={item?item.fields:undefined} valueMap={dtmplData ? dtmplData.fieldMap : undefined}
                         ></FormItemGroup>
                     </CollapseCard>
                 }

package/src/aldehyde/form/form-Item-group.tsx

@@ -15,6 +15,7 @@ export interface FieldGroupProps {
     valueMap: object,
     width?: number,
     maxColsOnRow?:number,
+    mainCode?:string,
 };
 
 interface FieldGroupState {
@@ -36,7 +37,7 @@ export default class FormItemGroup extends React.PureComponent<FieldGroupProps,
     }
 
     initFormList = () => {
-        const {fields, valueMap,nameAttr,maxColsOnRow} = this.props
+        const {fields, valueMap,nameAttr,maxColsOnRow,mainCode} = this.props
         const formItemList = [];
 
         if ( fields && fields.length > 0) {
@@ -54,7 +55,7 @@ export default class FormItemGroup extends React.PureComponent<FieldGroupProps,
                     formItem= <FormItem hidden={true}
                                         initialValue={fieldValue}
                                         name={item[nameAttr]} key={item.id}>
-                        <EntryControl value={fieldValue} fieldConfig={item} />
+                        <EntryControl mainCode={mainCode} value={fieldValue} fieldConfig={item} />
                     </FormItem>
                 }else{
                      formItem = <FormItem  label={item.title} name={item[nameAttr]} key={item.id}
@@ -66,7 +67,7 @@ export default class FormItemGroup extends React.PureComponent<FieldGroupProps,
                                                rules={item.required ? [{
                                                    required: true, message: `请选择${title}`,
                                                }] : undefined}>
-                        <EntryControl value={fieldValue} fieldConfig={item} />
+                        <EntryControl mainCode={mainCode} value={fieldValue} fieldConfig={item} />
                     </FormItem>
                 }
                 formItemList.push(formItem);

package/src/aldehyde/table/modal-select-table.tsx

@@ -15,6 +15,7 @@ interface ModelSelectTableProps {
     maxSelectedRows: number,
     visible: boolean,
     sourceId: string,
+    mainCode:string,
     exceptCodes?: string[],
     onCancel: () => void,
     onOK: (selectedRows: SelectedRow[]) => void,
@@ -53,10 +54,10 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
             pageSize: defaultPageSize ? defaultPageSize : 10,
             virtualEndPageNo: undefined,
         }
-        const {sourceId, exceptCodes} = this.props;
+        const {sourceId, exceptCodes,mainCode} = this.props;
         /** 构建 dataSource **/
             //构建过滤条件
-        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(sourceId, {exceptCodes, ...criteriaData, ...pageInfo});
+        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(sourceId, {exceptCodes, ...criteriaData, ...pageInfo,mainCode});
         this.setState({
             queryKey,
             criteriaData,

package/src/aldehyde/table/relation-table.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import {Button, Input, message, Table, Tooltip} from 'antd';
+import {Button, Input, message, Table, Tooltip,Space,Tag,Row,Col,Form} from 'antd';
 import {
     AlignLeftOutlined,
     DeleteOutlined,
@@ -20,8 +20,11 @@ import HcserviceV3 from "../tmpl/hcservice-v3";
 import CollapseCard from '../controls/collapse-card'
 import RowEditor from '../detail/edit/row-editor'
 import Action from "../controls/action";
-
+import EntryControl from "../controls/entry-control";
+import CountingTag from "../controls/counting-tag";
+const FormItem = Form.Item
 interface RelationTableProps {
+    mainCode?:string,
     parentId: string,
     loading: boolean,
     viewOrEdit: ViewOrEdit,
@@ -196,17 +199,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         }) : ""}
                     {/*行编辑*/}
                     {rowEdit ?
-                        // <Popover placement="leftBottom"   content={<RowEditCard fieldGroupConfig={fieldGroupConfig} dtmplData={this.getRowEditData(record.code)} onOk={this.handleRowEdit}  ></RowEditCard>} trigger="click">
-                        // <Tooltip placement="left" title="编辑当前行">
-                        //     <Button
-                        //         type='primary'
-                        //         icon={<EditOutlined/>}
-                        //         size="small"
-                        //         // onClick={() => {
-                        //         //     this.showRowEditModel(record.code)
-                        //         // }}
-                        //     ></Button> </Tooltip></Popover>
-                        <RowEditor buttonIcon={<EditOutlined/>} dtmplData={this.getRowEditData(record.code)}
+                        <RowEditor  buttonIcon={<EditOutlined/>} dtmplData={this.getRowEditData(record.code)}
                                    fieldGroupConfig={fieldGroupConfig}
                                    onOk={this.handleRowEdit}
                                    tooltipTitle={"编辑当前行"}></RowEditor> : ""}
@@ -337,8 +330,6 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
             codes.push(row.code);
         }
         await this.add(codes);
-
-
     }
 
     add = async (codes: string[]) => {
@@ -367,27 +358,6 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
         })
     }
 
-    // edit = async (code: string) => {
-    //
-    // }
-
-    // showRowEditModel = (code?: string) => {
-    //     const {value} = this.props;
-    //     let selectedDtmplData = undefined;
-    //     if (code) {
-    //         for (let dtmplData of value) {
-    //             if (code == dtmplData.code) {
-    //                 selectedDtmplData = dtmplData;
-    //                 break;
-    //             }
-    //         }
-    //     }
-    //     this.setState({
-    //         showRowEdit: true,
-    //         selectedDtmplData,
-    //     })
-    // }
-
     getRowEditData = (code?: string) => {
         const {value} = this.props;
         let data = undefined;
@@ -483,20 +453,11 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
         const buttonDisabled: boolean = fieldGroupConfig.max ? fieldGroupConfig.max <= (value ? value.length : 0) : false;
 
         if (viewOrEdit == 'edit') {
-            return <>
+            return <Row>
+                <Col span={20}>
+                        <Space>
                 {buttons.includes('rowAdd') ?
-                    // <Popover placement="rightBottom"   content={<RowEditCard fieldGroupConfig={fieldGroupConfig} onOk={this.handleRowEdit}  ></RowEditCard>} trigger="click">
-                    //                     // <Button
-                    //                     //     disabled={buttonDisabled}
-                    //                     //     type='primary'
-                    //                     //     icon={<PlusOutlined/>}
-                    //                     //     size="small"
-                    //                     //     // onClick={() => {
-                    //                     //     //     this.showRowEditModel()
-                    //                     //     // }}
-                    //                     //     style={{marginBottom: 10, marginRight: 10}}
-                    //                     // >新建一行</Button></Popover>
-                    <RowEditor buttonStyle={{marginBottom: 10, marginRight: 10}} buttonTitle={"新建一行"}
+                    <RowEditor disabled={buttonDisabled} buttonStyle={{marginBottom: 10}} buttonTitle={"新建一行"}
                                fieldGroupConfig={fieldGroupConfig}
                                onOk={this.handleRowEdit}
                     ></RowEditor>
@@ -508,7 +469,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         icon={<PlusSquareOutlined/>}
                         size="small"
                         onClick={this.showAddDtmplModel}
-                        style={{marginBottom: 10, marginRight: 10}}
+                        style={{marginBottom: 10}}
                     >新增</Button> : ""}
                 {buttons.includes('selectAdd') ?
                     <Button
@@ -517,9 +478,18 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         icon={<SnippetsOutlined/>}
                         size="small"
                         onClick={this.showSelect}
-                        style={{marginBottom: 10, marginRight: 10}}
+                        style={{marginBottom: 10}}
                     >选择</Button> : ""}
-            </>
+                            <FormItem   name={'$virtual'+fieldGroupConfig.id}
+                                        style={{ margin: 0}}
+                                        rules={fieldGroupConfig.min? [{
+                                            required: true, message: `请选择或添加${fieldGroupConfig.title}`,
+                                        }] :null}>
+                                <CountingTag min={fieldGroupConfig.min+""} style={{marginBottom: 10}} count={value?value.length:0}></CountingTag>
+                            </FormItem>
+                </Space>
+                </Col>
+            </Row>
         } else {
             return "";
         }
@@ -533,7 +503,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
 
     render() {
 
-        const {fieldGroupConfig, value, parentId, loading, initCollapse} = this.props;
+        const {fieldGroupConfig, value, parentId, loading, initCollapse,mainCode} = this.props;
         const {pageSize,selectedCode, showDtmplView, showSelectTable, showDtmplEdit, tableLoading, showRowEdit, selectedDtmplData} = this.state;
 
         const {buttons} = fieldGroupConfig;
@@ -564,6 +534,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         className={`hoverable`}
                         headStyle={{background: "#f2f4f5"}}
                         loading={loading}
+                        bodyStyle={{padding:'6px'}}
                         extra={<Input.Search onSearch={this.searchValue} allowClear placeholder="关键字搜索"/>
                         }
                     >
@@ -598,7 +569,7 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         <ModelSelectTable maxSelectedRows={fieldGroupConfig.max} visible={showSelectTable}
                                           onOK={this.select} onCancel={() => {
                             this.setState({showSelectTable: false})
-                        }} exceptCodes={exceptCodes}
+                        }} exceptCodes={exceptCodes} mainCode={mainCode}
                                           sourceId={fieldGroupConfig.id}></ModelSelectTable> : ""}
 
                 </>

package/src/aldehyde/table/select-table.tsx

@@ -10,6 +10,7 @@ import CriteriaForm from "../form/criteria-form";
 import ViewControl from "../controls/view-control";
 
 interface SelectTableProps {
+    mainCode?:string,
     maxSelectedRows?: number,
     sourceId: string,
     selectedRows: SelectedRow[];
@@ -45,6 +46,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
         this.setState({
             loading: true,
         })
+        const {mainCode}=this.props;
         const {defaultPageSize} = selectConfig;
         let pageInfo = {
             pageNo: 1,
@@ -54,7 +56,7 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
         const {sourceId} = this.props;
         /** 构建 dataSource **/
             //构建过滤条件
-        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(sourceId, {...criteriaData, ...pageInfo});
+        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(sourceId, {...criteriaData, ...pageInfo,mainCode});
         this.setState({
             queryKey,
             criteriaData,

package/src/aldehyde/tmpl/control-type-supportor.tsx

@@ -36,6 +36,7 @@ SupportInputTypes.add('select');
 SupportInputTypes.add('multiselect');
 SupportInputTypes.add('checkbox');
 SupportInputTypes.add('radio');
+SupportInputTypes.add('yes-no-switch');
 SupportInputTypes.add('caselect');
 SupportInputTypes.add('relation');
 SupportInputTypes.add('file');

package/src/aldehyde/tmpl/interface.tsx

@@ -249,10 +249,11 @@ export interface VControlProps extends ControlBaseProps {
 export interface ControlBaseProps {
     id?:any;
     value?: any;
-    fieldConfig: FieldConfig;
+    fieldConfig?: FieldConfig;
     itemType?: string;
     style?: object;
     disabled?: boolean;
+    mainCode?:string;
 }
 
 export interface SelectedRow {