aldehyde 0.1.35 → 0.1.38

package/src/aldehyde/module/ltmpl-page.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import {DtmplData, LtmplConfigRes} from '../tmpl/interface';
+import {AddOrUpdate, DtmplData, LtmplConfigRes} from '../tmpl/interface';
 import Units from "../units";
 import ActTable from '../table/act-table'
 // import StatActTable from '../table/stat-act-table'
@@ -7,12 +7,18 @@ import HCDataSource from "../tmpl/hc-data-source";
 import ModalDtmplView from "../detail/view/modal-dtmpl-view";
 import DtmplEditPage from "../detail/edit/dtmpl-edit-page";
 import HcserviceV3 from "../tmpl/hcservice-v3";
+import {Button, Drawer, Space} from "antd";
 
 //以列表为入口的，页面内列表，基本原则是所有交互在页面内完成，不会触发路由。
 
 export interface LtmplPageProps  {
     sourceId:string,
     mainCode?:string;
+    showView?: (code: string,toCustomPage?:boolean) => void,
+    doCreate?: (toCustomPage?:boolean) => void,
+    doEdit?: (code: string,mode:AddOrUpdate,toCustomPage?:boolean) => void,
+    doSearch?: (params: object) => void,
+    doRAction?:(ractionId:string,mainCode:string)=>void,
 };
 
 export interface LtmplPageState  {
@@ -21,6 +27,8 @@ export interface LtmplPageState  {
     showDtmplView:boolean;
     selectedCode:string;
     showDtmplEdit:boolean;
+    showDraw:boolean;
+    ractionId:string,
 };
 
 class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
@@ -31,6 +39,8 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
         showDtmplView:false,
         showDtmplEdit:false,
         selectedCode:undefined,
+        showDraw:false,
+        ractionId:undefined,
     }
 
     async componentDidMount() {
@@ -104,17 +114,24 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
             showDtmplEdit:true,
         })
     }
-
-
-
-
-
+    doRAction = (ractionId:string,mainCode:string) => {
+        this.setState({
+            selectedCode:mainCode,
+            showDraw:true,
+            ractionId
+        })
+    }
     doCreate = () => {
         this.setState({
             selectedCode:null,
             showDtmplEdit:true,
         })
     }
+    closeDrawer=()=>{
+        this.setState({
+            showDraw:false,
+        })
+    }
 
     doSearch = (params_) => {
         const { sourceId,mainCode} = this.props;
@@ -144,16 +161,16 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
 
 
     render() {
-        const {ltmplConfigRes,criteriaData,showDtmplView,selectedCode,showDtmplEdit} = this.state;
-        const { sourceId,mainCode} = this.props;
+        const {ltmplConfigRes,criteriaData,showDtmplView,selectedCode,showDtmplEdit,ractionId,showDraw} = this.state;
+        const { sourceId,mainCode,showView,doCreate,doEdit,doSearch,doRAction} = this.props;
 
         if (!ltmplConfigRes) {
             return <></>;
         } else {
             const {buttons}=ltmplConfigRes.ltmplConfig
             return <>
-                <ActTable  mainCode={mainCode} showView={this.showView}
-                             doSearch={this.doSearch} doEdit={this.doEdit} doCreate={this.doCreate}
+                <ActTable  mainCode={mainCode} showView={showView?showView:this.showView} doRAction={doRAction?doRAction:this.doRAction}
+                             doSearch={doSearch?doSearch:this.doSearch} doEdit={doEdit?doEdit:this.doEdit} doCreate={doCreate?doCreate:this.doCreate}
                              sourceId={sourceId} criteriaData={criteriaData}
                              ltmplConfig={ltmplConfigRes.ltmplConfig} />
                 {buttons.includes('detail') ?
@@ -161,7 +178,7 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
                     this.setState({
                         showDtmplView:false,
                     })}
-                    }
+                    }                mainCode={mainCode}
                                     sourceId={sourceId}
                                     code={selectedCode}> </ModalDtmplView> : ""}
                 {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
@@ -170,9 +187,31 @@ class LtmplPage extends React.PureComponent<LtmplPageProps, LtmplPageState> {
                             showDtmplEdit:false,
                         })}}
                                    sourceId={sourceId}
+                                   mainCode={mainCode}
                                    code={selectedCode}
                                    onOk={this.handleDtmplEdit}  />
                     : ""}
+                <Drawer
+                    placement={'left'}
+                    title="关联查询"
+                    closable={true}
+                    mask={false}
+                    onClose={this.closeDrawer}
+                    visible={showDraw}
+                    width={'calc(100% - 280px)'}
+                    style={{
+                        maxWidth: 1960,
+                    }}
+                    extra={
+                        <Space>
+                            <Button  onClick={this.closeDrawer}>关闭</Button>
+                        </Space>
+                    }
+                >
+                    {
+                        <LtmplPage  sourceId={ractionId} mainCode={selectedCode}></LtmplPage>
+                    }
+                </Drawer>
               </>
         }
 

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,Typography} from 'antd';
 import {
     AlignLeftOutlined,
     DeleteOutlined,
@@ -20,8 +20,12 @@ 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
+const { Text} = Typography;
 interface RelationTableProps {
+    mainCode?:string,
     parentId: string,
     loading: boolean,
     viewOrEdit: ViewOrEdit,
@@ -196,17 +200,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 +331,6 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
             codes.push(row.code);
         }
         await this.add(codes);
-
-
     }
 
     add = async (codes: string[]) => {
@@ -367,27 +359,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 +454,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 +470,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 +479,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 +504,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,12 +535,14 @@ 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="关键字搜索"/>
                         }
                     >
                         <div className="editTableList">
                             {this.buildButtons()}
                             <Table scroll={{scrollToFirstRowOnChange: false}}
+                                   locale={{emptyText:<div style={{textAlign:'center',width:'100%'}}><Text  disabled>暂无数据...</Text></div>}}
                                    bordered
                                    loading={tableLoading}
                                    dataSource={this.buildDataSource()}
@@ -580,11 +553,11 @@ class RelationTable extends React.PureComponent<RelationTableProps, RelationTabl
                         </div>
                     </CollapseCard>
                     {buttons.includes('detail') ?
-                        <ModalDtmplView visible={showDtmplView} onCancel={this.hiddenEntityView}
+                        <ModalDtmplView mainCode={mainCode?mainCode:parentId}  visible={showDtmplView} onCancel={this.hiddenEntityView}
                                         sourceId={fieldGroupConfig.id}
                                         code={selectedCode}> </ModalDtmplView> : ""}
                     {buttons.includes('dtmplEdit') || buttons.includes('dtmplAdd') ?
-                        <DtmplEditPage visible={showDtmplEdit} onCancel={this.hiddenEntityEdit}
+                        <DtmplEditPage mainCode={mainCode?mainCode:parentId} visible={showDtmplEdit} onCancel={this.hiddenEntityEdit}
                                        sourceId={fieldGroupConfig.id}
                                        code={selectedCode}
                                        onOk={selectedCode ? this.handleDtmplEdit : this.handleDtmplAdd} />
@@ -598,7 +571,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?mainCode:parentId}
                                           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/hc-data-source.tsx

@@ -20,7 +20,7 @@ const ltmplConfigMap: Map<string, LtmplConfigRes> = new Map<string, LtmplConfigR
 const l2LtmplConfigMap: Map<string, LtmplConfigRes> = new Map<string, LtmplConfigRes>();
 const dtmplConfigMap: Map<string, DtmplConfig> = new Map<string, DtmplConfig>();
 const viewDtmplConfigMap: Map<string, DtmplConfig> = new Map<string, DtmplConfig>();
-
+const addDtmplConfigMap: Map<string, DtmplConfig> = new Map<string, DtmplConfig>();
 
 function findUnloadEnumMstrucIdOfFields(fields:FieldBase[]) {
     const mstrucIdArray = [];
@@ -182,6 +182,15 @@ HCDataSource.requestViewDtmplConfig = async function ( sourceId: string) {
     return viewDtmplConfigMap.get(sourceId);
 };
 
+HCDataSource.requestAddDtmplConfig = async function ( sourceId: string) {
+    if (!addDtmplConfigMap.has(sourceId)) {
+        addDtmplConfigMap.set(sourceId, await HcserviceV3.requestAddDtmplConfig(sourceId));
+        //加载枚举
+        await loadEnumOfDtmplConfig(addDtmplConfigMap.get(sourceId));
+    }
+    return addDtmplConfigMap.get(sourceId);
+};
+
 HCDataSource.getEnums = function (mstrucId:string): EnumItem[] {
     //这里是不是后续可以考虑防止串改
    return enumMap.get(mstrucId);
@@ -279,6 +288,7 @@ HCDataSource.clearOnly =async function () {
     ltmplConfigMap.clear();
     dtmplConfigMap.clear();
     viewDtmplConfigMap.clear();
+    addDtmplConfigMap.clear();
     selectConfigMap.clear();
     l2LtmplConfigMap.clear();
     optionsMap.clear();

package/src/aldehyde/tmpl/hcservice-v3.tsx

@@ -77,6 +77,17 @@ export default class HcserviceV3 {
         return res.dtmplConfig;
     }
 
+    static async requestAddDtmplConfig(sourceId:string) {
+
+        let url = `/v3/add-dtmpl/config`
+        let res = await Super.super({
+            url,
+            method: "GET",
+            query:{sourceId}
+        });
+        return res.dtmplConfig;
+    }
+
     // static async requestUserDtmplConfig() {
     //     let url = `/v3/user/dtmpl/config`
     //     let res = await Super.super({

package/src/aldehyde/tmpl/interface.tsx

@@ -144,6 +144,8 @@ export interface SelectConfig extends TmplBase {
     columns: ColumnConfig[];
     criterias: CriteriaConfig[];
     defaultCriteriaValue?:object;
+    characteristicColumn:ColumnConfig;
+    primaryCriteria:CriteriaConfig;
 }
 
 export interface RActionConfig extends OrderableTmplBase {
@@ -249,10 +251,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 {