aldehyde 0.2.137 → 0.2.139

package/src/aldehyde/locale/LocaleProvider.tsx

@@ -12,6 +12,7 @@ export const LocaleContext = createContext<{
   changeLocale: (locale: LocaleType) => void;
   t: (...strs: string[]) => string;
   translate: (...strs: string[]) => string;
+  getServiceLangStr?: ()=>string;
 }>({
   locale: undefined,
   availableLang: [],
@@ -42,7 +43,7 @@ export const LocaleContext = createContext<{
 
     res.push(tres);
     return res.join("");
-  },
+  }
 });
 
 const getLocaleWithServer = async (lang: string, serverKey?: string) => {
@@ -84,6 +85,11 @@ export const LocaleProvider = ({
     setLocale(locale);
   };
 
+  const getServiceLangStr =  () => {
+    const langStr = getLangWithLangApiMp(locale);
+    return langStr;
+  };
+
   const getAllLocale = async (serverKey: string[]) => {
     const newLangPkg = {
       ...langPkg,
@@ -190,7 +196,7 @@ export const LocaleProvider = ({
 
   return (
     <LocaleContext.Provider
-      value={{ locale, availableLang, langPkg, changeLocale, t, translate }}
+      value={{ locale, availableLang, langPkg, changeLocale, t, translate ,getServiceLangStr}}
     >
       {children}
     </LocaleContext.Provider>

package/src/aldehyde/table/act-table.tsx

@@ -1277,7 +1277,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
           ) : null}
           {displayCriteriaCard ? this.renderCriteriaForm() : null}
           {loading ? (
-            ""
+            <Table loading={loading}></Table>
           ) : (
             <QueryTable
               serverKey={serverKey}
@@ -1334,7 +1334,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     } = this.props;
     const { translate } = this.context;
 
-    if (!ltmplConfig || !sourceId) {
+    if (!ltmplConfig || !sourceId ) {
       return (
         <>
           <Card loading={loading}></Card>

package/src/aldehyde/table/modal-select-table.tsx

@@ -19,6 +19,7 @@ interface ModelSelectTableProps {
     mainCode:string,
     exceptCodes?: string[],
     onCancel: () => void,
+    defaultCriteriaValue?:object,
     onOK: (selectedRows: SelectedRow[]) => void,
 };
 
@@ -34,6 +35,9 @@ interface ModelSelectTableStat {
 };
 
 class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelSelectTableStat> {
+    static defaultProps={
+        defaultCriteriaValue:{}
+    }
     state = {
         selectConfig: undefined,
         columns: undefined,
@@ -71,14 +75,15 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
     }
 
     async componentDidMount() {
-        const { sourceId, open} = this.props;
+        const { sourceId, open,defaultCriteriaValue} = this.props;
         if (sourceId && open) {
-            await this.loadData(await this.loadConfig(), {});
+            let result=await this.loadConfig();
+            await this.loadData(result.selectConfig, result.criteriaData);
         }
     }
 
     loadConfig = async () => {
-        const { sourceId, exceptCodes,serverKey} = this.props;
+        const { sourceId, exceptCodes,serverKey,defaultCriteriaValue} = this.props;
         this.setState({
             loading: true,
         })
@@ -115,26 +120,32 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
                 }
             }
         });
+        let criteriaData = {...selectConfig.defaultCriteriaValue,...defaultCriteriaValue};
         this.setState({
             columns,
             selectConfig,
             loading: false,
+            criteriaData,
         })
-        return selectConfig;
+        return {selectConfig,criteriaData};
     }
 
     async componentDidUpdate(prevProps) {
-        const {exceptCodes, open} = this.props;
+        const {exceptCodes, open,defaultCriteriaValue} = this.props;
         const {selectConfig, criteriaData, queryKey, loading} = this.state;
         const {exceptCodes: preExceptCodes, open: preOpen} = prevProps;
-        let config = selectConfig;
+        let config:SelectConfig = selectConfig;
+        let criteria=criteriaData
         if (open) {
             if (!config) {
-                config = await this.loadConfig();
+                let result = await this.loadConfig();
+                config=result.selectConfig;
+                criteria=result.criteriaData;
             }
             if (!queryKey && !loading) {
-                await this.loadData(config, criteriaData);
+                await this.loadData(config, {...criteria,...defaultCriteriaValue});
             }
+
         }
     }
 

package/src/aldehyde/table/relation-table.tsx

@@ -811,6 +811,7 @@ class RelationTable extends React.PureComponent<
         {buttons.includes("selectAdd") ? (
           <ModelSelectTable
             serverKey={serverKey}
+            defaultCriteriaValue={fieldGroupConfig.defaultCriteriaValue}
             maxSelectedRows={fieldGroupConfig.max}
             open={showSelectTable}
             onOK={this.select}

package/src/aldehyde/tmpl/interface.tsx

@@ -200,6 +200,7 @@ export interface FieldGroupConfig extends OrderableTmplBase {
   codeSourceFieldMstrucId?: string;
   pointSourceId?: string;
   classifiedAddConfigs?: ClassifiedAddConfig[];
+  defaultCriteriaValue?:object,
 }
 
 export type SaveJumpType = "list" | "add" | "edit";

package/src/aldehyde/tmpl/tmpl-config-analysis.tsx

@@ -108,14 +108,24 @@ TmplConfigAnalysis.getFieldValueTitleOfMstrucId = (config: DtmplConfig | LtmplCo
     let fieldId = TmplConfigAnalysis.getFieldId(config, mstrucId);
 
     let val: string = fieldMap && fieldMap[fieldId];
-    if (val) {
-        val = val.indexOf('@R@') > 0 ? fieldMap[fieldId].split("@R@")[1] : fieldMap[fieldId];
+    if (val == 'null' || !val) {
+        val = null;
+    }else if(Array.isArray(val)){
+       let  val1="";
+        val.forEach((v)=>{
+            if(v.indexOf('@R@') > 0 ){
+                val1=  v.split("@R@")[1]+",";
+            }else{
+                val1=  v+",";
+            }
+        })
+        val=val1.substring(0,val1.lastIndexOf(","));
+    }if (val) {
+        val = val.indexOf('@R@') > 0 ? val.split("@R@")[1] : val;
     } else {
         return defaultValue;
     }
-    if (val == 'null') {
-        val = null;
-    }
+
     return val;
 }