aldehyde 0.2.52 → 0.2.54

package/src/aldehyde/table/stat/restat.tsx

@@ -9,6 +9,7 @@ interface RestatProps {
     onfinish: () => void;
     fields: FieldConfig[];
     value?: object;
+    serverKey:string,
     sourceId:string;
 };
 
@@ -26,11 +27,11 @@ class Restat extends React.PureComponent<RestatProps, RestatStat> {
     }
     formRef = React.createRef<FormInstance>();
     onRestat =async (val) => {
-        const {sourceId,onfinish}=this.props;
+        const {sourceId,onfinish,serverKey}=this.props;
         this.setState({
             loading:true,
         })
-       await HcserviceV3.increCalc(sourceId,val);
+       await HcserviceV3.increCalc(serverKey,sourceId,val);
         this.setState({
             loading:false,
         })
@@ -39,7 +40,7 @@ class Restat extends React.PureComponent<RestatProps, RestatStat> {
 
     render() {
         const {popoverOpen,loading} = this.state;
-        const {fields, value} = this.props;
+        const {fields, value,serverKey} = this.props;
         return <Popover open={popoverOpen}
                         content={
                             <Card loading={loading}
@@ -60,7 +61,7 @@ class Restat extends React.PureComponent<RestatProps, RestatStat> {
                                 </Space></>}
                             >
                                 <AntdForm labelWrap={true} ref={this.formRef} name="control-hooks" onFinish={this.onRestat}>
-                                    <FormItemGroup  nameAttr={'id'} fields={fields}
+                                    <FormItemGroup serverKey={serverKey}  nameAttr={'id'} fields={fields}
                                                    valueMap={value}></FormItemGroup>
                                 </AntdForm>
                             </Card>}

package/src/aldehyde/tmpl/hc-data-source.tsx

@@ -58,7 +58,7 @@ function findUnloadEnumMstrucIdOfActions(actions: ActionConfig[]) {
 }
 
 
-async function loadEnumOfDtmplConfig(selectConfig: DtmplConfig) {
+async function loadEnumOfDtmplConfig(serverKey:string,selectConfig: DtmplConfig) {
     const mstrucIds = [];
     if (selectConfig.groups) {
         selectConfig.groups.forEach(group => {
@@ -68,7 +68,7 @@ async function loadEnumOfDtmplConfig(selectConfig: DtmplConfig) {
     }
     let subs = findUnloadEnumMstrucIdOfActions(selectConfig.actions);
     concat(mstrucIds, subs);
-    await loadEnum(mstrucIds);
+    await loadEnum(serverKey,mstrucIds);
 }
 
 function concat(mstrucIds, sub) {
@@ -82,16 +82,16 @@ function concat(mstrucIds, sub) {
     return mstrucIds;
 }
 
-async function loadEnumOfSelectConfig(selectConfig: SelectConfig) {
+async function loadEnumOfSelectConfig(serverKey:string,selectConfig: SelectConfig) {
     const mstrucIds = [];
     let subs = findUnloadEnumMstrucIdOfFields(selectConfig.columns);
     concat(mstrucIds, subs);
     subs = findUnloadEnumMstrucIdOfFields(selectConfig.criterias);
     concat(mstrucIds, subs);
-    await loadEnum(mstrucIds);
+    await loadEnum(serverKey,mstrucIds);
 }
 
-async function loadEnumOfLtmplConfig(selectConfig: LtmplConfig) {
+async function loadEnumOfLtmplConfig(serverKey:string,selectConfig: LtmplConfig) {
     const mstrucIds = [];
     let subs = findUnloadEnumMstrucIdOfFields(selectConfig.columns);
     concat(mstrucIds, subs);
@@ -105,12 +105,12 @@ async function loadEnumOfLtmplConfig(selectConfig: LtmplConfig) {
     concat(mstrucIds, subs);
     subs = findUnloadEnumMstrucIdOfActions(selectConfig.rowActions);
     concat(mstrucIds, subs);
-    await loadEnum(mstrucIds);
+    await loadEnum(serverKey,mstrucIds);
 }
 
-async function loadEnum(mstrucIds: string[], path?: string) {
+async function loadEnum(serverKey:string,mstrucIds: string[], path?: string) {
     if (mstrucIds && mstrucIds.length > 0) {
-        let reqEnum = await HcserviceV3.requestEnum(mstrucIds, path);
+        let reqEnum = await HcserviceV3.requestEnum(serverKey,mstrucIds, path);
         for (let key in reqEnum) {
             let ems = reqEnum[key];
             for (let option of ems) {
@@ -128,22 +128,22 @@ function HCDataSource() {
 
 }
 
-HCDataSource.loadEnumOfFields = async function (fields: FieldBase[]) {
+HCDataSource.loadEnumOfFields = async function (serverKey:string,fields: FieldBase[]) {
     const mstrucIds = findUnloadEnumMstrucIdOfFields(fields);
-    await loadEnum(mstrucIds);
+    await loadEnum(serverKey,mstrucIds);
 }
 
-HCDataSource.loadEnumOfFieldsWithPath = async function (fields: FieldBase[], path: string) {
+HCDataSource.loadEnumOfFieldsWithPath = async function (serverKey:string,fields: FieldBase[], path: string) {
     const mstrucIds = findUnloadEnumMstrucIdOfFields(fields);
-    await loadEnum(mstrucIds, path);
+    await loadEnum(serverKey,mstrucIds, path);
 }
 
-HCDataSource.getOptions = async function (mstrucId: string) {
+HCDataSource.getOptions = async function (serverKey:string,mstrucId: string) {
     if (!mstrucId) {
         return null;
     }
     if (!enumMap.has(mstrucId)) {
-        let reqOptions = await HcserviceV3.requestOptions(mstrucId)[mstrucId];
+        let reqOptions = await HcserviceV3.requestOptions(serverKey,mstrucId)[mstrucId];
         if (reqOptions != null) {
             for (let option of reqOptions) {
                 if (option['css']) {
@@ -158,57 +158,57 @@ HCDataSource.getOptions = async function (mstrucId: string) {
     return enumMap.get(mstrucId);
 }
 
-HCDataSource.requestLtmplConfig = async function (sourceId: string) {
+HCDataSource.requestLtmplConfig = async function (serverKey:string,sourceId: string) {
     if (!ltmplConfigMap.has(sourceId)) {
-        ltmplConfigMap.set(sourceId, await HcserviceV3.requestLtmplConfig(sourceId));
+        ltmplConfigMap.set(sourceId, await HcserviceV3.requestLtmplConfig(serverKey,sourceId));
         //加载枚举
         let res: LtmplConfigRes = ltmplConfigMap.get(sourceId);
-        await loadEnumOfLtmplConfig(res.ltmplConfig);
+        await loadEnumOfLtmplConfig(serverKey,res.ltmplConfig);
     }
     return ltmplConfigMap.get(sourceId);
 };
-HCDataSource.requestL2LtmplConfig = async function (sourceId: string) {
+HCDataSource.requestL2LtmplConfig = async function (serverKey:string,sourceId: string) {
     if (!l2LtmplConfigMap.has(sourceId)) {
-        l2LtmplConfigMap.set(sourceId, await HcserviceV3.requestL2LtmplConfig(sourceId));
+        l2LtmplConfigMap.set(sourceId, await HcserviceV3.requestL2LtmplConfig(serverKey,sourceId));
         //加载枚举
         let res: LtmplConfigRes = l2LtmplConfigMap.get(sourceId);
-        await loadEnumOfLtmplConfig(res.ltmplConfig);
+        await loadEnumOfLtmplConfig(serverKey,res.ltmplConfig);
     }
     return l2LtmplConfigMap.get(sourceId);
 };
 
 
-HCDataSource.requestSelectConfig = async function (sourceId: string) {
+HCDataSource.requestSelectConfig = async function (serverKey:string,sourceId: string) {
     if (!selectConfigMap.has(sourceId)) {
-        selectConfigMap.set(sourceId, await HcserviceV3.requestSelectConfig(sourceId));
+        selectConfigMap.set(sourceId, await HcserviceV3.requestSelectConfig(serverKey,sourceId));
         //加载枚举
-        await loadEnumOfSelectConfig(selectConfigMap.get(sourceId));
+        await loadEnumOfSelectConfig(serverKey,selectConfigMap.get(sourceId));
     }
     return selectConfigMap.get(sourceId);
 };
-HCDataSource.requestDtmplConfig = async function (sourceId: string) {
+HCDataSource.requestDtmplConfig = async function (serverKey:string,sourceId: string) {
     if (!dtmplConfigMap.has(sourceId)) {
-        dtmplConfigMap.set(sourceId, await HcserviceV3.requestDtmplConfig(sourceId));
+        dtmplConfigMap.set(sourceId, await HcserviceV3.requestDtmplConfig(serverKey,sourceId));
         //加载枚举
-        await loadEnumOfDtmplConfig(dtmplConfigMap.get(sourceId));
+        await loadEnumOfDtmplConfig(serverKey,dtmplConfigMap.get(sourceId));
     }
     return dtmplConfigMap.get(sourceId);
 };
 
-HCDataSource.requestViewDtmplConfig = async function (sourceId: string) {
+HCDataSource.requestViewDtmplConfig = async function (serverKey:string,sourceId: string) {
     if (!viewDtmplConfigMap.has(sourceId)) {
-        viewDtmplConfigMap.set(sourceId, await HcserviceV3.requestViewDtmplConfig(sourceId));
+        viewDtmplConfigMap.set(sourceId, await HcserviceV3.requestViewDtmplConfig(serverKey,sourceId));
         //加载枚举
-        await loadEnumOfDtmplConfig(viewDtmplConfigMap.get(sourceId));
+        await loadEnumOfDtmplConfig(serverKey,viewDtmplConfigMap.get(sourceId));
     }
     return viewDtmplConfigMap.get(sourceId);
 };
 
-HCDataSource.requestAddDtmplConfig = async function (sourceId: string) {
+HCDataSource.requestAddDtmplConfig = async function (serverKey:string,sourceId: string) {
     if (!addDtmplConfigMap.has(sourceId)) {
-        addDtmplConfigMap.set(sourceId, await HcserviceV3.requestAddDtmplConfig(sourceId));
+        addDtmplConfigMap.set(sourceId, await HcserviceV3.requestAddDtmplConfig(serverKey,sourceId));
         //加载枚举
-        await loadEnumOfDtmplConfig(addDtmplConfigMap.get(sourceId));
+        await loadEnumOfDtmplConfig(serverKey,addDtmplConfigMap.get(sourceId));
     }
     return addDtmplConfigMap.get(sourceId);
 };