aldehyde 0.2.52 → 0.2.53

package/src/aldehyde/tmpl/interface.tsx

@@ -111,6 +111,7 @@ export type ButtonName = 'rowAdd' | 'rowEdit' | 'batchDelete'|'singleDelete'| 's
 export type ChartType = 'line' | 'pie' | 'column';
 export type GroupDisplayConfig = 'nonDataNonDisplayed' | 'displayed' | 'folded' |'unfold' | 'listview' | 'tableview';
 export interface FieldGroupConfig extends OrderableTmplBase {
+    serverKey:string,
     type: FieldGroupType;
     buttons: ButtonName[];
     min: number;
@@ -287,6 +288,7 @@ export interface ControlBaseProps {
     id?:any;
     value?: any;
     fieldConfig?: FieldConfig;
+    serverKey?:string,
     itemType?: string;
     style?: object;
     disabled?: boolean;
@@ -309,6 +311,7 @@ export interface RouterCompProps {
 }
 
 export interface TmplBaseProps {
+    serverKey:string,
     sourceId: string,
     mainCode?: string,
 };

package/src/aldehyde/tmpl/superagent.js

@@ -7,7 +7,10 @@ export default class Superagent {
         const hydrocarbonToken = Units.hydrocarbonToken()? Units.hydrocarbonToken()
             : options.header && options.header.hydrocarbonToken ?
                 options.header.hydrocarbonToken : Units.getAnoHydrocarbonToken();
-        const programCode = Units.programCode();
+
+        let serverKey=options.serverKey;
+
+        const programCode = Units.programCode(serverKey);
         let loading;
         if (options.data && options.data.isShowLoading !== false) {
             loading = document.getElementById('ajaxLoading')
@@ -23,7 +26,9 @@ export default class Superagent {
 
 
         return new Promise((resolve, reject) => {
-            let server = options.hydrocarbonServer ? options.hydrocarbonServer : Units.api();
+
+            let server = options.hydrocarbonServer ? options.hydrocarbonServer : Units.api(serverKey);
+
             superagent(method, Units.joinPath(server, options.url))
                 .type(ty)
                 .set("hydrocarbon-token", hydrocarbonToken)
@@ -71,36 +76,36 @@ export default class Superagent {
         })
     }
 
-    static get(options) {
-        let server = options.hydrocarbonServer ? options.hydrocarbonServer : Units.api();
-        return new Promise((resolve, reject) => {
-            superagent
-                .get(Units.joinPath(server, options.url))
-                .query(options.query || '')
-                .end((req, res) => {
-                    if (!res) {
-                        message.error("服务器连接失败")
-                        resolve(null);
-                    } else {
-                        if (res.status === 200) {
-                            resolve(res.body)
-                        } else if (res.status === 403) {
-                            //message.info("请求权限不足,可能是token已经超时")
-                            Units.toLogin();
-                        } else if (res.status === 404 || res.status === 504) {
-                            message.error("服务资源未找到("+res.status+")")
-                            resolve(res);
-                        } else if (res.status === 500) {
-                            message.error("后台处理错误(" + res.text + ")",5)
-                            resolve(res);
-                        } else {
-                            message.error("服务资源请求失败!");
-                            reject(res.body)
-                        }
-                    }
-                })
-        })
-    }
+    // static get(options) {
+    //     let server = options.hydrocarbonServer ? options.hydrocarbonServer : Units.api();
+    //     return new Promise((resolve, reject) => {
+    //         superagent
+    //             .get(Units.joinPath(server, options.url))
+    //             .query(options.query || '')
+    //             .end((req, res) => {
+    //                 if (!res) {
+    //                     message.error("服务器连接失败")
+    //                     resolve(null);
+    //                 } else {
+    //                     if (res.status === 200) {
+    //                         resolve(res.body)
+    //                     } else if (res.status === 403) {
+    //                         //message.info("请求权限不足,可能是token已经超时")
+    //                         Units.toLogin();
+    //                     } else if (res.status === 404 || res.status === 504) {
+    //                         message.error("服务资源未找到("+res.status+")")
+    //                         resolve(res);
+    //                     } else if (res.status === 500) {
+    //                         message.error("后台处理错误(" + res.text + ")",5)
+    //                         resolve(res);
+    //                     } else {
+    //                         message.error("服务资源请求失败!");
+    //                         reject(res.body)
+    //                     }
+    //                 }
+    //             })
+    //     })
+    // }
 
     static getProramConfig() {
         return new Promise((resolve, reject) => {

package/src/aldehyde/units/index.tsx

@@ -2,7 +2,6 @@
 import {DtmplConfig, DtmplData, DtmplFormProps, EnumItem} from "../tmpl/interface";
 import dayjs from "dayjs";
 import TmplConfigAnalysis from "../tmpl/tmpl-config-analysis";
-import {ProgramConfig} from "../index";
 
 let storageKeyPrefix = undefined;
 
@@ -89,10 +88,14 @@ export default {
             return CUSTOM_PAGE_MAP[key];
         }
 
-    },setProgramCode(programCode_: string) {
+    },setProgramCode(programCode_: string,key?:string) {
         if(programCode_){
-            window.localStorage.setItem('programCode',programCode_);
-            window.sessionStorage.setItem('programCode',programCode_);
+            if(key){
+                window.localStorage.setItem(key+'programCode', programCode_);
+            }else{
+                window.localStorage.setItem('programCode',programCode_);
+                window.sessionStorage.setItem('programCode',programCode_);
+            }
         }
     },
     setSessionProgramCode(programCode_: string) {
@@ -101,16 +104,24 @@ export default {
         }
 
     },
-    programCode() {
-        let programCode=window.sessionStorage.getItem('programCode');
+    programCode(key?:string) {
+        let programCode=null;
+        if(key){
+            programCode=window.localStorage.getItem(key+'programCode');
+        }else{
+            programCode=window.sessionStorage.getItem('programCode');
+        }
+
         if(!programCode){
             programCode=window.localStorage.getItem('programCode');
             this.setSessionProgramCode(programCode);
         }
         return programCode;
     },
-    setHydrocarbonServer(url: string) {
-        if(this.programCode()){
+    setHydrocarbonServer(url: string,key?:string) {
+        if(key){
+            window.localStorage.setItem(key+'hydrocarbonServer', url);
+        }else if(this.programCode()){
             window.localStorage.setItem(this.programCode()+'hydrocarbonServer', url);
         }else{
             window.localStorage.setItem('hydrocarbonServer', url);
@@ -123,11 +134,17 @@ export default {
             window.localStorage.setItem('programName_Logo', logo1);
         }
     },
-    api() {
-        let appi = window.localStorage.getItem(this.programCode()+'hydrocarbonServer');
+    api(key?:string) {
+        let appi =null;
+        if(key){
+            appi = window.localStorage.getItem(key+'hydrocarbonServer');
+        }else{
+            appi = window.localStorage.getItem(this.programCode()+'hydrocarbonServer');
+        }
         if(!appi){
             appi = window.localStorage.getItem('hydrocarbonServer');
         }
+
         if (!appi) {
             let url = new URL(window.location.href);
             let pathname=null;
@@ -141,7 +158,6 @@ export default {
             appi = this.joinPath(url.origin, pathname);
         } else if (!appi.startsWith("http")) {
             appi = this.joinPath(new URL(window.location.href).origin, appi);
-            // console.log('Hydrcarbon API:',api);
         }
         return appi;
     },

package/src/aldehyde/welcome/HCWelcome.js

@@ -216,6 +216,12 @@ import withRouter from "../routable/withroute";
                 </Col>
             </Row>
             </Col>
+            {/*<Col span={24}>*/}
+
+            {/*        <LtmplTable serverKey={"253564453860974594"} title={'系统角色'} funcMode={'common'} collapsible={false} initCollapse={true}*/}
+            {/*                    sourceId={"305963121444167684"}*/}
+            {/*        ></LtmplTable>*/}
+            {/*</Col>*/}
             {/*<Col>*/}
             {/*    <Card bodyStyle={{padding: '4px'}}>*/}
             {/*        <LtmplPage doCreate={(d)=>{*/}

package/src/aldehyde/welcome/quick-entrance.tsx

@@ -23,12 +23,12 @@ class QuickEntrance extends React.PureComponent<QuickEntranceProps, QuickEntranc
         for (const item of l2Menus) {
             if (item.displayTotal == true) {
                 let i= setInterval(async () => {
-                    let count = await HcserviceV3.requestLtmplCount(item.id);
+                    let count = await HcserviceV3.requestLtmplCount(null,item.id);
                     item.count = count;
                     this.setState({})
                 }, 180000);
                 this.intervals.push(i);
-                let count = await HcserviceV3.requestLtmplCount(item.id);
+                let count = await HcserviceV3.requestLtmplCount(null,item.id);
                 item.count = count;
                 this.setState({})
             }

package/src/aldehyde/welcome/workbench.tsx

@@ -23,12 +23,12 @@ class Workbench extends React.PureComponent<WorkbenchProps, WorkbenchState> {
         let l2Menus: Level2Menu[] = await HCDataSource.workbenchMenus();
         for (const item of l2Menus) {
             let i = setInterval(async () => {
-                let count = await HcserviceV3.requestLtmplCount( item.id);
+                let count = await HcserviceV3.requestLtmplCount(null, item.id);
                 item.count = count;
                 this.setState({})
             }, 180000);
             this.intervals.push(i);
-            let count = await HcserviceV3.requestLtmplCount( item.id);
+            let count = await HcserviceV3.requestLtmplCount(null, item.id);
             item.count = count;
             this.setState({})
         }

package/lib/exportor/index.d.ts

@@ -1,16 +0,0 @@
-import React from 'react';
-import './index.css';
-interface ExcelExportProps {
-    sourceId: string;
-}
-interface ExcelExportStat {
-}
-export default class ExcelExport extends React.PureComponent<ExcelExportProps, ExcelExportStat> {
-    state: {};
-    timerId: any;
-    componentDidMount(): Promise<void>;
-    componentWillUnmount(): void;
-    render(): JSX.Element;
-}
-export {};
-//# sourceMappingURL=index.d.ts.map

package/lib/exportor/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/exportor/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,aAAa,CAAA;AAUpB,UAAU,gBAAgB;IACtB,QAAQ,EAAC,MAAM,CAAC;CACnB;AAED,UAAU,eAAe;CAExB;AAED,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,KAAK,CAAC,aAAa,CAAC,gBAAgB,EAAE,eAAe,CAAC;IAE3F,KAAK,KAEJ;IAED,OAAO,MAAW;IAEb,iBAAiB;IAUtB,oBAAoB;IAYpB,MAAM;CAKT"}

package/lib/exportor/index.js

@@ -1,44 +0,0 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-import React from 'react';
-import { Checkbox } from 'antd';
-import './index.css';
-import HCDataSource from "../tmpl/hc-data-source";
-const CheckboxGroup = Checkbox.Group;
-const logLevelList = ['INFO', 'SUC', 'ERROR', 'WARN'];
-let totalMSG = [];
-;
-;
-export default class ExcelExport extends React.PureComponent {
-    constructor() {
-        super(...arguments);
-        this.state = {};
-        this.timerId = undefined;
-    }
-    componentDidMount() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { sourceId } = this.props;
-            let ltmplConfigRes = yield HCDataSource.requestLtmplConfig(sourceId);
-            this.setState({
-                ltmplConfig: ltmplConfigRes.ltmplConfig,
-            });
-        });
-    }
-    componentWillUnmount() {
-        if (this.timerId) {
-            clearInterval(this.timerId);
-        }
-    }
-    render() {
-        const {} = this.state;
-        return React.createElement(React.Fragment, null);
-    }
-}
-//# sourceMappingURL=index.js.map

package/lib/exportor/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/aldehyde/exportor/index.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,QAAQ,EAAE,MAAM,MAAM,CAAA;AAC9B,OAAO,aAAa,CAAA;AAEpB,OAAO,YAAY,MAAM,wBAAwB,CAAC;AAElD,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC;AACrC,MAAM,YAAY,GAAc,CAAC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;AACjE,IAAI,QAAQ,GAAC,EAAE,CAAA;AAMd,CAAC;AAID,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,KAAK,CAAC,aAAgD;IAA/F;;QAEI,UAAK,GAAG,EAEP,CAAA;QAED,YAAO,GAAC,SAAS,CAAC;IA6BtB,CAAC;IA3BQ,iBAAiB;;YACnB,MAAM,EAAC,QAAQ,EAAC,GAAC,IAAI,CAAC,KAAK,CAAC;YAE3B,IAAI,cAAc,GAAG,MAAM,YAAY,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;YAErE,IAAI,CAAC,QAAQ,CAAC;gBACV,WAAW,EAAC,cAAc,CAAC,WAAW;aACzC,CAAC,CAAA;QAEN,CAAC;KAAA;IACD,oBAAoB;QAChB,IAAG,IAAI,CAAC,OAAO,EAAC;YACZ,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC/B;IACL,CAAC;IAQD,MAAM;QACF,MAAM,EAAG,GAAG,IAAI,CAAC,KAAK,CAAC;QAEvB,OAAO,yCAAK,CAAA;IAChB,CAAC;CACJ"}

package/lib/import/template-builder.d.ts

@@ -1,29 +0,0 @@
-export default class ModelImport extends React.Component<any, any, any> {
-    constructor(props: any);
-    constructor(props: any, context: any);
-    state: {
-        modelList: any[];
-        title: string;
-        visible: boolean;
-        dataSource: any[];
-    };
-    componentDidMount(): void;
-    loadWords: (menuId: any) => void;
-    switchTemplate: () => void;
-    handelModel: (tmplId: any) => void;
-    handleVisibleChange: (value: any) => void;
-    handleSave: () => void;
-    visibleModal: () => void;
-    handleDownload: () => void;
-    setModelName: (e: any) => void;
-    deleteRow: (record: any) => void;
-    getWords: (list: any, type: any) => void;
-    getFields: (dataSource: any) => any[];
-    onRef: (ref: any) => void;
-    getdatasource: any;
-    setdatasource: (data: any) => void;
-    resetForm: () => void;
-    render(): JSX.Element;
-}
-import React from 'react';
-//# sourceMappingURL=template-builder.d.ts.map

package/lib/import/template-builder.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"template-builder.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/import/template-builder.js"],"names":[],"mappings":"AAYA;IA6co4H,wBAA8C;IAAA,sCAAgK;IA3c9kI;;;;;MAKC;IACD,0BAGC;IACD,iCA6BC;IACD,2BAaC;IACD,mCA0DC;IACD,0CAEC;IACD,uBAwBC;IACD,yBAiBC;IACD,2BAqBC;IACD,+BAIC;IACD,iCA+DC;IACD,yCAiDC;IACD,sCAmBC;IACD,0BAEC;IADH,mBAAsB;IAEpB,mCAIC;IACD,sBAOC;IACD,sBAmGC;CACJ;kBAlciB,OAAO"}