aldehyde 0.2.80 → 0.2.84

package/lib/units/index.js

@@ -1,10 +1,12 @@
 import dayjs from "dayjs";
 import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
+import { ProgramConfig } from "../index";
 let storageKeyPrefix = undefined;
 const CUSTOM_PAGE_MAP = {};
 const CUSTOM_VIEW_CONTROL_MAP = {};
 const AppDtmplConfigFuncMap = {};
 const CUSTOM_EDIT_CONTROL_MAP = {};
+const extendServerMap = {};
 let antdUseToken = undefined;
 export default {
     setAntdUseToken(antdUseToken_) {
@@ -174,6 +176,18 @@ export default {
         }
         return hydrocarbonToken;
     },
+    putExtendServers(extendServers) {
+        for (let es of extendServers) {
+            extendServerMap[es.key] = es;
+            if (es.key && es['hydrocarbonServer']) {
+                ProgramConfig.setProgramCode(es['programCode'], es.key);
+                ProgramConfig.setHydrocarbonServer(es['hydrocarbonServer'], es.key);
+            }
+        }
+    },
+    getExtendServers(serverKey) {
+        return extendServerMap[serverKey];
+    },
     setHydrocarbonToken(token) {
         if (this.programCode()) {
             window.sessionStorage.setItem(this.programCode() + 'hydrocarbonToken', token);
@@ -362,8 +376,11 @@ export default {
     //随机数
     getRandomNum(n) {
         let rnd = "";
-        for (let i = 0; i < n; i++)
+        let f = Math.floor(Math.random() * 10);
+        rnd += f == 0 ? '1' : f + "";
+        for (let i = 1; i < n; i++) {
             rnd += Math.floor(Math.random() * 10);
+        }
         return rnd;
     },
     /**

package/lib/units/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/aldehyde/units/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/aldehyde/units/index.tsx"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aldehyde",
-  "version": "0.2.80",
+  "version": "0.2.84",
   "author": "cosmicparticle",
   "main": "lib/index.js",
   "module": "src/aldehyde/index.txs",

package/src/aldehyde/controls/action/utils.tsx

@@ -18,7 +18,7 @@ export default class ActionUtils {
 
         //所有data都必须满足条件才能显示
         //let comparator=actionConfig.comparator;
-        debugger
+        //debugger
         let isMatch = true;
         if (formInstance) {
             for (let fieldConfig of fieldConfigs) {

package/src/aldehyde/controls/collapse-card/index.tsx

@@ -8,6 +8,7 @@ import ToolTipBar from "../../detail/tooltipbar";
 interface CollapseCardProps extends CardProps {
     initCollapse?: boolean,
     tip?:any,
+    showRightNav?:boolean,
 };
 
 interface CollapseCardState {
@@ -56,8 +57,8 @@ export default class CollapseCard extends React.PureComponent<CollapseCardProps,
 
     render() {
         const {collapse} = this.state;
-            const { extra, title, className,initCollapse, ...other } = this.props;
-        return <Card {...other}  size={'small'} extra={collapse ? "" : extra}
+            const { extra, title, className,initCollapse,showRightNav, ...other } = this.props;
+        return <Card {...other}  size={'small'} extra={collapse ? "" : extra} style={{width:showRightNav?"90%":'100%'}}
                      className={`${className} ${collapse ? 'collapse' : ""}`} title={this.cardTitle()}>
             {collapse ? null : this.props.children}
         </Card>;

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

@@ -126,7 +126,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
         const { ltmplConfig} = this.state;
         let ltmplConfig_ = ltmplConfig;
         if (!ltmplConfig_) {
-            ltmplConfig_ = (await HCDataSource.requestLtmplConfig(serverKey,fieldConfig.id)).ltmplConfig;
+            ltmplConfig_ = (await HCDataSource.requestLtmplConfig(fieldConfig.serverKey?fieldConfig.serverKey:serverKey,fieldConfig.id)).ltmplConfig;
         }
         this.setState({
             ltmplConfig:ltmplConfig_
@@ -354,7 +354,7 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
             //     }
             // }
             criteriaData[formItemName] = searchText;
-            let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(serverKey,fieldConfig.id, {
+            let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(fieldConfig.serverKey?fieldConfig.serverKey:serverKey,fieldConfig.id, {
                 ...criteriaData, ...pageInfo,
                 mainCode:currentMainCode
             });
@@ -429,9 +429,9 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
 
 
     loadData = async (queryKey: string, pageInfo: PageInfo, titleId: string): Promise<LoadDataSource> => {
-        const {onEntityClick, baseCriteria,serverKey} = this.props;
+        const {onEntityClick, baseCriteria,serverKey,fieldConfig} = this.props;
 
-        let queryData: QueryData = await HcserviceV3.requestQueryData(serverKey,queryKey, pageInfo);
+        let queryData: QueryData = await HcserviceV3.requestQueryData(fieldConfig.serverKey?fieldConfig.serverKey:serverKey,queryKey, pageInfo);
         let options: object[] = [];
         pageInfo = queryData.pageInfo;
         queryData.entities.forEach((item, index) => {
@@ -469,10 +469,12 @@ export default class EntitySelect extends React.PureComponent<InnerEntitySelectP
     }
 
     render() {
-        const {id, value, fieldConfig, onChange, disabled, style, maxSelected, onEntityClick,mainCode,serverKey} = this.props;
+        const {id, value, fieldConfig, onChange, disabled, style, maxSelected, onEntityClick,mainCode,serverKey:pServerKey} = this.props;
         const {actions}=fieldConfig;
         const {optionCacheKey, loading, optionsCache, drawCode, showEdit, showView,showTable,ltmplConfig} = this.state;
 
+        let serverKey=fieldConfig.serverKey?fieldConfig.serverKey:pServerKey;
+
         let initOptions = this.toOptions(value, onEntityClick);
         let exists;
         let properOptions = [...initOptions];

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

@@ -3,7 +3,7 @@ import {Card, FormInstance} from 'antd';
 import DtmplForm from '../../form/dtmpl-form';
 import PostResult from "./post-result";
 import RightBar from '../rightbar';
-import {DtmplBaseProps, DtmplConfig, DtmplData,AddOrUpdate} from "../../tmpl/interface";
+import {DtmplBaseProps, DtmplConfig, DtmplData, AddOrUpdate, ActionConfig} from "../../tmpl/interface";
 import HCDataSource from "../../tmpl/hc-data-source";
 import '../dtmpl.css'
 import SubmitButtonBar from "../button/submit-button-bar";
@@ -72,7 +72,7 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
         })
         let dtmplConfig=undefined;
         if(code){
-            dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId);
+            dtmplConfig = await HCDataSource.requestDtmplConfig(serverKey,sourceId,code);
         }else{
             dtmplConfig = await HCDataSource.requestAddDtmplConfig(serverKey,sourceId);
         }
@@ -111,7 +111,9 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
             this.setState({
                 loading: true,
             })
-            const dtmplData_ = await HcserviceV3.requestDtmplData(serverKey, sourceId, code, null);
+
+            const dtmplData_:DtmplData=await HcserviceV3.getDtmplData(dtmplConfig,serverKey,sourceId, code);
+
             if(addOrUpdate=='copy'&& dtmplData_){
                 dtmplData_.code=undefined;
             }
@@ -162,6 +164,8 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
             this.goEdit()
         }else if(saveJumpTo.includes('add')){
             this.goAdd();
+        }else if(saveJumpTo.includes('nothing')){
+
         }else {
             this.goList();
         }
@@ -198,13 +202,27 @@ export default class DtmplEdit extends React.PureComponent<DtmplEditProps, Dtmpl
         //console.log(" dtmpl edit serial:",serial);
         const { sourceId, showRightNav, code,addOrUpdate,maxColsOnRow,mainCode,serverKey} = this.props;
         //const {title} = dtmplConfig;
+        let hiddenFields=[];
         if (!dtmplConfig) {
             return  <Card loading={loading}>
             </Card>
+        }else{
+            let actions:ActionConfig[]= dtmplConfig.actions;
+            if(actions){
+                for(let a of actions){
+                   if(a.writes) {
+                       a.writes.forEach(w => {
+                           hiddenFields.push({id:w.id,value:w.value})
+                       })
+                   }
+                }
+                dtmplConfig.hiddenFields=hiddenFields;
+            }
+
         }
         return (
-            <div className={`detailPage ${showRightNav ? 'showRightNav' : 'noRightNav'}`} onClick={this.onClickBody}>
-                <DtmplForm  serverKey={serverKey} mainCode={mainCode}  parentId={id} dtmplConfig={dtmplConfig}  formRef={this.formRef} sourceId={sourceId}
+            <div className={`detailPage `} onClick={this.onClickBody}>
+                <DtmplForm showRightNav={showRightNav} serverKey={serverKey} 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/view/act-dtmpl-view.tsx

@@ -12,6 +12,7 @@ import ToolTipBar from "../tooltipbar";
 export interface ActDtmplViewProps extends DtmplBaseProps {
     versionId?: number;
     title?:any,
+    showHeader?:boolean
 };
 
 export interface ActDtmplViewStat {
@@ -27,6 +28,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
     static defaultProps = {
         showRightNav: true,
         rightBarPositionRight: 15,
+        showHeader:true,
     }
 
     state = {
@@ -82,7 +84,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
     }
 
     render() {
-        const {showRightNav, rightBarPositionRight, code,  sourceId,goDtmpl,serverKey,codeSource,title} = this.props;
+        const {showRightNav, rightBarPositionRight, code,  sourceId,goDtmpl,serverKey,codeSource,title,showHeader} = this.props;
         const {dtmplConfig, premisesTitle, loading, layout, snapshotOpen,refreshCode} = this.state;
         const buttons = dtmplConfig ? dtmplConfig.buttons : undefined;
         const premises = dtmplConfig ? dtmplConfig.premises : undefined;
@@ -92,7 +94,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
         }
         return (
             <div className={`detailPage ${showRightNav_ ? 'showRightNav' : 'noRightNav'}`}>
-                <Card bordered={false} size={'small'}
+                { showHeader? <Card bordered={false} size={'small'}
                       key={"detailTitle"}
                       className="hoverable pageHeader"
                 >
@@ -122,7 +124,7 @@ class ActDtmplView extends React.PureComponent<ActDtmplViewProps, ActDtmplViewSt
                                               open={snapshotOpen}></SnapshotTimeline>
                         </div>
                     </h3>
-                </Card>
+                </Card>:null}
                 <DtmplView codeSource={codeSource} serverKey={serverKey} refreshCode={refreshCode} showRightNav={showRightNav_} rightBarPositionRight={rightBarPositionRight}
                            dtmplConfig={dtmplConfig} sourceId={sourceId}
                            code={code}></DtmplView>

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

@@ -1,24 +1,28 @@
 import React from 'react'
-import {Button, Card} from 'antd'
 import {DtmplBaseProps, DtmplConfig, DtmplData, FieldGroupConfig} from "../../tmpl/interface";
 import RelationTable from "../../table/relation-table";
 import FieldViewGroup from './field-view-group';
 import HcserviceV3 from "../../tmpl/hcservice-v3";
 import RightBar from "../rightbar";
 import '../dtmpl.css';
-import {}  from '@ant-design/icons';
 import Units from '../../units';
 import CollapseCard from "../../controls/collapse-card";
 import CqueryButtonBar from "../button/cquery-button-bar";
+import TmplConfigAnalysis from "../../tmpl/tmpl-config-analysis";
+import {Card} from "antd";
+import LtmplTable from "../../module/ltmpl-table";
+import DtmplViewCard from "../../module/dtmpl-view-card";
+
 
 export interface DtmplViewProps extends DtmplBaseProps {
     versionId?: number;
     dtmplConfig: DtmplConfig,
-    refreshCode?:string,
+    refreshCode?: string,
+    parentId?:string
 };
 
 export interface DtmplViewStat {
-    id?:string;
+    id?: string;
     loading?: boolean,
     dtmplData?: DtmplData,
     premisesTitle?: string,
@@ -32,7 +36,7 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
 
     state = {
         loading: true,
-        id:'dtmplView'+Units.getRandomNum(6),
+        id: 'dtmplView' + Units.getRandomNum(6),
         snapshotOpen: false,
         dtmplData: undefined,
         premisesTitle: "默认字段",
@@ -47,18 +51,18 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
     }
 
     async componentDidUpdate(prevProps) {
-        const { sourceId, code, versionId,refreshCode} = this.props;
-        const {code: preCode, versionId: preVersionId,refreshCode:preRefreshCode} = prevProps;
-        if (code != preCode || (versionId && versionId != prevProps.versionId) || (refreshCode && refreshCode!=preRefreshCode)) {
+        const {sourceId, code, versionId, refreshCode} = this.props;
+        const {code: preCode, versionId: preVersionId, refreshCode: preRefreshCode} = prevProps;
+        if (code != preCode || (versionId && versionId != prevProps.versionId) || (refreshCode && refreshCode != preRefreshCode)) {
             await this.loadData();
         }
     }
 
     loadData = async () => {
-        const { sourceId, code:propsCode, versionId,serverKey,codeSource} = this.props;
-        let code=propsCode;
-        if(!code && codeSource){
-            code=await HcserviceV3.queryCode(sourceId,codeSource,serverKey);
+        const {sourceId, code: propsCode, versionId, serverKey, codeSource} = this.props;
+        let code = propsCode;
+        if (!code && codeSource) {
+            code = await HcserviceV3.queryCode(sourceId, codeSource, serverKey);
         }
         if (code) {
             this.setState({
@@ -66,25 +70,75 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
             })
             const dtmplData = await HcserviceV3.requestViewDtmplData(serverKey, sourceId, code, versionId);
             this.setState({
-                dtmplData, loading:false,
+                dtmplData, loading: false,
             })
-        }else{
+        } else {
             this.setState({
-                loading:false,
+                loading: false,
             })
         }
     }
 
     fieldGroupList = () => {
-        const {dtmplConfig,serverKey} = this.props;
-        const { dtmplData, loading,id} = this.state;
+        const {dtmplConfig, serverKey,mainCode,showRightNav,parentId} = this.props;
+        const {dtmplData, loading, id} = this.state;
 
         let groups: FieldGroupConfig[] = [];
         if (dtmplConfig) {
             groups = dtmplConfig.groups;
         }
         return groups.map((item) => {
-                if (item.type == 'relation') {//关系
+
+            if(item.type == 'embed'){
+                if(!dtmplData){
+                    return;
+                }
+                let codeSource=undefined;
+                //code 从来源字段里面拿
+                let code=TmplConfigAnalysis.getFieldValueCodeOfMstrucId(dtmplConfig,dtmplData.fieldMap,item.codeSourceFieldMstrucId);
+                let innerSourceId=TmplConfigAnalysis.getFieldValueCodeOfMstrucId(dtmplConfig,dtmplData.fieldMap,item.pageSourceFieldMstrucId);
+                innerSourceId=innerSourceId?innerSourceId:item.pointSourceId;
+                if(!innerSourceId){
+                    return null;
+                }
+                if(item.embedType=='列表'){
+                    return <Card bodyStyle={{padding:0}} bordered={false} style={{width:showRightNav?"90%":'100%'}}>
+                        <LtmplTable readOnly={true}  serverKey={null} collapsible={true} initCollapse={false}
+                                     title={item.title}
+                                     mainCode={mainCode} funcMode={'common'} sourceId={innerSourceId}></LtmplTable></Card>
+                }else if(item.embedType=='详情'){
+                    codeSource = 'listop';
+                    return <CollapseCard showRightNav={showRightNav}
+                                         tip={item.tip}
+                                         title={item.title}
+                                         key={item.id}
+                                         id={parentId + item.id}
+                                         className="hoverable"
+                                         headStyle={{background: "#f2f4f5"}}
+                                         loading={loading}
+                                         bodyStyle={{padding: '6px'}}
+                    ><DtmplViewCard showHeader={false} codeSource={codeSource}  code={code} sourceId={innerSourceId}></DtmplViewCard> </CollapseCard>
+                }else {
+                    switch (item.embedType) {
+                        case "编辑":
+                            codeSource = 'listop';
+                            break;
+                        case "编辑或添加":
+                            codeSource = 'new';
+                            break;
+                    }
+                    return <CollapseCard showRightNav={showRightNav}
+                                         tip={item.tip}
+                                         title={item.title}
+                                         key={item.id}
+                                         id={parentId + item.id}
+                                         className="hoverable"
+                                         headStyle={{background: "#f2f4f5"}}
+                                         loading={loading}
+                                         bodyStyle={{padding: '6px'}}
+                    ><DtmplViewCard showHeader={false} codeSource={codeSource}  code={code} sourceId={innerSourceId}></DtmplViewCard> </CollapseCard>
+                }
+            }else if (item.type == 'relation') {//关系
                     if (item.fields) {
                         let data: DtmplData[] = undefined;
                         if (dtmplData) {
@@ -93,19 +147,22 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
                         // console.log("dtmplData", dtmplData );
                         // console.log("dtmplData data", data );
                         // console.log("initCollapsed", dtmplData && (!data || data.length<=0));
-                        return <RelationTable serverKey={serverKey} initCollapse={ dtmplData && (!data || data.length<=0)} loading={loading} parentId={id} key={item.id} fieldGroupConfig={item} value={data}
+                        return <RelationTable serverKey={serverKey} initCollapse={dtmplData && (!data || data.length <= 0)}
+                                              loading={loading} parentId={id} key={item.id} fieldGroupConfig={item}
+                                              value={data}
                                               viewOrEdit={"view"}/>
                     }
                 } else {//字段组
                     return <CollapseCard tip={item.tip}
-                        title={item.title}
-                        key={item.id}
-                        id={id+item.id}
-                        className="hoverable"
-                        headStyle={{background: "#f2f4f5"}}
-                        loading={loading}
+                                         title={item.title}
+                                         key={item.id}
+                                         id={id + item.id}
+                                         className="hoverable"
+                                         headStyle={{background: "#f2f4f5"}}
+                                         loading={loading}
                     >
-                        <FieldViewGroup serverKey={serverKey} fields={item.fields} valueMap={dtmplData ? dtmplData.fieldMap : undefined}
+                        <FieldViewGroup serverKey={serverKey} fields={item.fields}
+                                        valueMap={dtmplData ? dtmplData.fieldMap : undefined}
                                         width={220}></FieldViewGroup>
                     </CollapseCard>
                 }
@@ -115,8 +172,8 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
     }
 
     render() {
-        const {showRightNav, rightBarPositionRight, code,  sourceId,dtmplConfig,serverKey} = this.props;
-        const {premisesTitle, loading, dtmplData, layout, snapshotOpen,id} = this.state;
+        const {showRightNav, rightBarPositionRight, code, sourceId, dtmplConfig, serverKey} = this.props;
+        const {premisesTitle, loading, dtmplData, layout, snapshotOpen, id} = this.state;
         const premises = dtmplConfig ? dtmplConfig.premises : undefined;
 
         return (
@@ -128,20 +185,20 @@ class DtmplView extends React.PureComponent<DtmplViewProps, DtmplViewStat> {
                         // title={<Button type="text"><HolderOutlined />{premisesTitle}</Button>}
                         title={premisesTitle}
                         key={premisesTitle}
-                        id={id+premises[0].id}
+                        id={id + premises[0].id}
                         className="hoverable"
                         headStyle={{background: "#f2f4f5"}}
                         loading={loading}
                     >
                         <FieldViewGroup serverKey={serverKey}
-                            fields={premises}/>
+                                        fields={premises}/>
                     </CollapseCard>
                     : ""
                 }
                 {showRightNav ?
                     <RightBar parentId={id} positionRight={rightBarPositionRight} dtmplConfig={dtmplConfig}/> : ""
                 }
-                <CqueryButtonBar serverKey={serverKey}  dtmplConfig={dtmplConfig} mainCode={code}></CqueryButtonBar>
+                <CqueryButtonBar serverKey={serverKey} dtmplConfig={dtmplConfig} mainCode={code}></CqueryButtonBar>
             </div>
         );
     }

package/src/aldehyde/detail/view/field-view-group.tsx

@@ -36,7 +36,7 @@ export default class FieldViewGroup extends React.PureComponent<FieldViewGroupPr
                 fieldValue = fieldValue ? fieldValue : item.defaultValue ? item.defaultValue : undefined;
                 const fieldKey = item.id + Math.random() * 100;
 
-                if(item.extControlType!='hidden'){
+                if(item.extControlType !='hidden' && !item.hidden){
                     const formItem = <Descriptions.Item  label={item.title} span={item.colNum} key={index}
                                                          className='labelcss'
                     >