aldehyde 0.2.135 → 0.2.137

package/src/aldehyde/module/dtmpl-edit-card.tsx

@@ -178,6 +178,7 @@ export default class DtmplEditCard extends React.PureComponent<
     if (mainCode) {
       this.formRef.current.setFieldsValue({ mainCode: mainCode });
     }
+    debugger
     if (params) {
       this.formRef.current.setFieldsValue(params);
     }

package/src/aldehyde/tmpl/interface.tsx

@@ -17,8 +17,8 @@ export type ActTableViewModel = "table" | "verticalList" | "horizontalList";
 export type ControlHolderType = "table" | "descriptions";
 export type PageType = "modal" | "drawer" | "card";
 export interface TmplBase {
-  id: string;
-  title: string;
+  id?: string;
+  title?: string;
   tip?: string;
 }
 
@@ -182,23 +182,23 @@ export type GroupDisplayConfig =
   | "tableview";
 export interface FieldGroupConfig extends OrderableTmplBase {
   serverKey?: string;
-  type: FieldGroupType;
-  buttons: ButtonName[];
-  min: number;
-  max: number;
+  type?: FieldGroupType;
+  buttons?: ButtonName[];
+  min?: number;
+  max?: number;
   showRowNum?: boolean;
   relationNames?: string[];
   showRelationName?: boolean;
   fields: FieldConfig[];
-  rowActions: ActionConfig[];
-  displayConfig: GroupDisplayConfig;
+  rowActions?: ActionConfig[];
+  displayConfig?: GroupDisplayConfig;
   mainCode?: string;
   disabled?: boolean;
   readOnly?: boolean;
   embedType?: "列表" | "详情" | "编辑" | "编辑或添加";
-  pageSourceFieldMstrucId: string;
-  codeSourceFieldMstrucId: string;
-  pointSourceId: string;
+  pageSourceFieldMstrucId?: string;
+  codeSourceFieldMstrucId?: string;
+  pointSourceId?: string;
   classifiedAddConfigs?: ClassifiedAddConfig[];
 }
 
@@ -207,23 +207,23 @@ export type SaveJumpType = "list" | "add" | "edit";
 export interface DtmplConfig extends TmplBase {
   autoSaveInterval?: number;
   //exportExcel fusionMode history dtmplSave refresh
-  buttons: ButtonName[];
+  buttons?: ButtonName[];
   // list add  edit
-  saveJumpTo: SaveJumpType[];
-  cQuerys: CQueryConfig[];
-  editAction: ActionConfig;
-  actions: ActionConfig[];
-  premises: FieldConfig[];
-  groups: FieldGroupConfig[];
-  buttonPosition: ButtonPosition;
-  buildInFuncFields: FieldConfig[];
-  onValuesChange: (
+  saveJumpTo?: SaveJumpType[];
+  cQuerys?: CQueryConfig[];
+  editAction?: ActionConfig;
+  actions?: ActionConfig[];
+  premises?: FieldConfig[];
+  groups?: FieldGroupConfig[];
+  buttonPosition?: ButtonPosition;
+  buildInFuncFields?: FieldConfig[];
+  onValuesChange?: (
     changedValues,
     allValues: DtmplData,
     formInstance: FormInstance
   ) => void;
-  entity: DtmplData;
-  dynamic: boolean;
+  entity?: DtmplData;
+  dynamic?: boolean;
   hiddenFields?: FieldConfig[];
 }
 
@@ -351,11 +351,11 @@ export interface EnumItem {
 export type EditStatus = "new" | "changed" | "persisted";
 
 export interface DtmplData {
-  code: string;
+  code?: string;
   editStatus?: EditStatus;
   title?: string;
   relationLabel?: string;
-  fieldMap: object;
+  fieldMap?: object;
   arrayMap?: object; //Map<number,DtmplData[]>
 }
 

package/src/aldehyde/tmpl/superagent.js

@@ -17,11 +17,7 @@ export default class Superagent {
       ? options.header.hydrocarbonToken
       : Units.hydrocarbonToken(programCode)
       ? Units.hydrocarbonToken(programCode)
-      : Units.getAnoHydrocarbonToken();
-
-    // let programCode = null;
-
-    //
+      : serverKey?Units.hydrocarbonToken():Units.getAnoHydrocarbonToken();
 
     let loading;
     if (options.data && options.data.isShowLoading !== false) {

package/src/aldehyde/units/index.tsx

@@ -33,6 +33,7 @@ export default {
     },
 
     getAppDtmplConfig(dtmplConfig: DtmplConfig, dtmplData: DtmplData,props:DtmplFormProps) {
+
         if (dtmplConfig){
            if( AppDtmplConfigFuncMap[dtmplConfig.id]) {
                return AppDtmplConfigFuncMap[dtmplConfig.id](dtmplConfig, dtmplData, props);
@@ -178,11 +179,12 @@ export default {
         if(!hydrocarbonToken){
             hydrocarbonToken=window.sessionStorage.getItem('hydrocarbonToken');
         }
-        if(!hydrocarbonToken){
-            hydrocarbonToken=window.localStorage.getItem(programCode+'hydrocarbonToken');
-            if(!hydrocarbonToken){
-                hydrocarbonToken=window.sessionStorage.getItem('hydrocarbonToken');
-            }
+
+        if(hydrocarbonToken){
+            // hydrocarbonToken=window.localStorage.getItem(programCode+'hydrocarbonToken');
+            // if(!hydrocarbonToken){
+            //     hydrocarbonToken=window.sessionStorage.getItem('hydrocarbonToken');
+            // }
             this.setSessionHydrocarbonToken(hydrocarbonToken,programCode);
         }
         return hydrocarbonToken;