aldehyde 0.2.478 → 0.2.480

package/src/aldehyde/export/export-frame.tsx

@@ -7,18 +7,18 @@ import { PageInfo, QueryKey } from "../tmpl/interface";
 import { LocaleContext } from "../locale/LocaleProvider";
 const RadioGroup = Radio.Group;
 export type ExportStatus = "ready" | "exporting" | "success" | "fail" | "stop";
-export type ExportMode = "current"|"page"| "all";
-export  type ExportType="ltmpl-data-excel"|"ltmpl-data-filedata";
+export type ExportMode = "current" | "page" | "all";
+export type ExportType = "ltmpl-data-excel" | "ltmpl-data-filedata";
 
 interface ExportFrameProps {
   defaultExportMode?: string;
   serverKey?: string;
-  sourceId?:string;
+  sourceId?: string;
   queryKey: QueryKey;
   currentPage?: PageInfo;
   title: string;
-  type:ExportType;
-  exportModes:ExportMode[];
+  type: ExportType;
+  exportModes: ExportMode[];
 }
 
 interface ExportFrameStat {
@@ -41,8 +41,8 @@ export default class ExportFrame extends React.PureComponent<
 > {
   static defaultProps = {
     defaultExportMode: "all",
-    type:"ltmpl-data-excel",
-    exportModes:["current","page","all"],
+    type: "ltmpl-data-excel",
+    exportModes: ["current", "page", "all"],
   };
 
   state = {
@@ -84,16 +84,16 @@ export default class ExportFrame extends React.PureComponent<
   };
 
   shouldComponentUpdate(prevProps, prevState) {
-    if(prevProps && prevProps.queryKey && this.props.queryKey){
-      if(this.props.queryKey?.key!=prevProps.queryKey?.key){
-        this.setState({exportStatus:'ready',percent:0,exportingMsg:"",exportMode:"all"})
+    if (prevProps && prevProps.queryKey && this.props.queryKey) {
+      if (this.props.queryKey?.key != prevProps.queryKey?.key) {
+        this.setState({ exportStatus: 'ready', percent: 0, exportingMsg: "", exportMode: "all" })
       }
     }
     return true;
   }
 
   handleStart = () => {
-    const { queryKey, currentPage, title, serverKey,type,sourceId } = this.props;
+    const { queryKey, currentPage, title, serverKey, type, sourceId } = this.props;
     const { startPageNo, endPageNo, exportMode } = this.state;
 
     this.setState({
@@ -106,7 +106,7 @@ export default class ExportFrame extends React.PureComponent<
       method: "GET",
       query: {
         sourceId,
-        language:getServiceLangStr(),
+        language: getServiceLangStr(),
         scope: exportMode,
         withDetail: false,
         queryKey: queryKey.key,
@@ -188,7 +188,7 @@ export default class ExportFrame extends React.PureComponent<
         Units.api(serverKey),
         `/v3/export/download?exportId=${exportId}&@token=${hydrocarbonToken}&@programToken=${Units.programCode(
           serverKey
-        )}`
+        )}&@applicationToken=${Units.applicationCode(serverKey)}`
       ),
       title
     );
@@ -203,7 +203,7 @@ export default class ExportFrame extends React.PureComponent<
   };
 
   render() {
-    const { defaultExportMode, currentPage,exportModes } = this.props;
+    const { defaultExportMode, currentPage, exportModes } = this.props;
     const {
       startPageNo,
       endPageNo,
@@ -219,20 +219,20 @@ export default class ExportFrame extends React.PureComponent<
       <div style={{ width: "400px" }} className="exportFrame">
         {
           <>
-           <RadioGroup
+            <RadioGroup
               onChange={this.onChangeRadio}
               value={exportMode}
               defaultValue={defaultExportMode}
             >
-             {exportModes.includes("current") ?<Radio value={"current"} disabled={exportStatus == "exporting"}>
+              {exportModes.includes("current") ? <Radio value={"current"} disabled={exportStatus == "exporting"}>
                 {translate("${当前页}")}
-              </Radio>:null }
-             {exportModes.includes("page") ? <Radio value={"page"} disabled={exportStatus == "exporting"}>
+              </Radio> : null}
+              {exportModes.includes("page") ? <Radio value={"page"} disabled={exportStatus == "exporting"}>
                 {translate("${多页}")}
-              </Radio>:null }
-                 {exportModes.includes("all") ? <Radio value={"all"} disabled={exportStatus == "exporting"}>
+              </Radio> : null}
+              {exportModes.includes("all") ? <Radio value={"all"} disabled={exportStatus == "exporting"}>
                 {translate("${全部}")}
-              </Radio>:null }
+              </Radio> : null}
             </RadioGroup>
             <Divider />
           </>
@@ -262,11 +262,11 @@ export default class ExportFrame extends React.PureComponent<
         )}
         <div>
           {exportStatus == "ready" ? (
-              <>
-            <Button type="primary" onClick={this.handleStart}>
-              {translate("${开始导出}")}
-            </Button>
-              </>
+            <>
+              <Button type="primary" onClick={this.handleStart}>
+                {translate("${开始导出}")}
+              </Button>
+            </>
           ) : exportStatus == "exporting" ? (
             <Button onClick={this.handleCancel}>
               {translate("${取消导出}")}
@@ -293,7 +293,7 @@ export default class ExportFrame extends React.PureComponent<
           ) : (
             ""
           )}
-          <p>{translate("${"+exportingMsg+"}")}</p>
+          <p>{translate("${" + exportingMsg + "}")}</p>
         </div>
       </div>
     );

package/src/aldehyde/export/select-code-export-frame.tsx

@@ -146,7 +146,7 @@ export default class SelectCodeExportFrame extends React.PureComponent<
         Units.api(serverKey),
         `/v3/export/download?exportId=${exportId}&@token=${hydrocarbonToken}&@programToken=${Units.programCode(
           serverKey
-        )}`
+        )}&@applicationToken=${Units.applicationCode(serverKey)}`
       ),
       fileExport.title
     );

package/src/aldehyde/form/criteria-form.tsx

@@ -90,8 +90,8 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
     innerParams,
     defShowCriteriaCount,
     criteriaGroups,
-    commonCriterias,
-    split2TabCriterias
+    commonCriteria,
+    split2TabCriteria
   } = ltmplConfig;
   const initialValues = {};
   const searchSubmit = (data) => {
@@ -113,16 +113,16 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
   const [criteriaGroupHeight, setCriteriaGroupHeight] = useState<number>(32); // 扩展条件组高度，用于展开/收起
   const criteriaGroupRef = useRef(null);
 
-  const criterias = useMemo(() => {
-    const temCriterias = commonCriterias?.length ? commonCriterias : ltmplConfig.criterias;
+  const criteria = useMemo(() => {
+    const temCriteria = commonCriteria?.length ? commonCriteria : ltmplConfig.criteria;
     if (tabCriteriaId) { // 处理标签页条件(存在标签页，多tab拆解条件时搜索栏加载其他tab条件)
-      const otherTabCriteria = split2TabCriterias.filter(item => `c_${item.id}` !== tabCriteriaId);
-      return [...temCriterias, ...otherTabCriteria];
+      const otherTabCriteria = split2TabCriteria.filter(item => `c_${item.id}` !== tabCriteriaId);
+      return [...temCriteria, ...otherTabCriteria];
     }
-    return temCriterias;
+    return temCriteria;
   }, [ltmplConfig, tabCriteriaId]);
 
-  let collapseCriteria: CriteriaConfig[] = defShowCriteriaCount <= 0 ? criterias : criterias.slice(0, defShowCriteriaCount);
+  let collapseCriteria: CriteriaConfig[] = defShowCriteriaCount <= 0 ? criteria : criteria.slice(0, defShowCriteriaCount);
 
   // 扩展条件组，监听扩展条件组高度变化，用于展开/收起
   const handleCriteriaGroupResize = () => {
@@ -152,7 +152,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
 
   useEffect(() => {
     form.resetFields();
-    if (collapseCriteria && criterias && collapseCriteria.length < criterias.length) {
+    if (collapseCriteria && criteria && collapseCriteria.length < criteria.length) {
       setCollapsible(true);
     }
   });
@@ -429,19 +429,19 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
   };
 
   // lagicalOpt扩展条件组条件
-  const renderCriteria = (criterias: CriteriaConfig[], lagicalOpt?: string) => {
-    if (!criterias) {
+  const renderCriteria = (criteria: CriteriaConfig[], lagicalOpt?: string) => {
+    if (!criteria) {
       return;
     }
     const { hiddenCriteriaIds, serverKey } = props;
-    criterias.forEach((item) => {
+    criteria.forEach((item) => {
       let formItemName = "c_" + item.id;
       let fieldValue = data ? data[formItemName] : undefined;
       initialValues[formItemName] = fieldValue;
     });
 
     if (doSearch) {
-      return criterias.map((item, index) => {
+      return criteria.map((item, index) => {
         let formItemName = "c_" + item.id;
         let fieldValue = data ? data[formItemName] : undefined;
         if (item?.extControlType == "ltree-entity-select" || item?.extControlType == "ltree-entity-select-value") {
@@ -478,7 +478,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
           );
           return lagicalOpt ? <>
             {formItem}
-            {criterias.length !== index + 1 ? <FormItem style={{ margin: 0, color: colorWarning }}>{translate("${" + lagicalOpt + "}")}</FormItem> : ""}
+            {criteria.length !== index + 1 ? <FormItem style={{ margin: 0, color: colorWarning }}>{translate("${" + lagicalOpt + "}")}</FormItem> : ""}
           </> : formItem;
         }
       });
@@ -492,16 +492,16 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
     }
     const isExpanded = criteriaGroupHeight > 32;
     return criteriaGroup.map(r =>
-      r.criterias?.length > 1 ?
+      r.criteria?.length > 1 ?
         < div style={{ borderRadius: "6px", border: `1px dashed ${colorBorder}`, padding: "2px 4px", marginRight: "16px", position: "relative", display: "flex", justifyContent: "space-between", alignItems: "flex-end" }}>
-          <Space style={{ height: criteriaGExpanded ? "auto" : "32px", overflow: "hidden", }} ref={criteriaGroupRef} size={"small"} wrap>{renderCriteria(r.criterias, r.lagicalOpt === "OR" ? "或" : "且")}</Space>
+          <Space style={{ height: criteriaGExpanded ? "auto" : "32px", overflow: "hidden", }} ref={criteriaGroupRef} size={"small"} wrap>{renderCriteria(r.criteria, r.lagicalOpt === "OR" ? "或" : "且")}</Space>
           {isExpanded ?
             <Button icon={criteriaGExpanded ? <LeftOutlined /> : <RightOutlined />} type={"link"} onClick={() => setCriteriaGExpanded(!criteriaGExpanded)}>
               {translate(criteriaGExpanded ? "${收起}" : "${展开}")}
             </Button>
             : ""}
         </div > :
-        <Space size={"small"} wrap>{renderCriteria(r.criterias)}</Space>
+        <Space size={"small"} wrap>{renderCriteria(r.criteria)}</Space>
     );
   };
 
@@ -533,7 +533,7 @@ const CriteriaForm: React.FC<CriteriaFormProps> = (props) => {
                   {renderDrillDimension()}</>
                 : null}
               {showQueryButton || (updrillButtonConfigs && updrillButtonConfigs.length > 0)
-                ? renderCriteria(expanded ? criterias : collapseCriteria)
+                ? renderCriteria(expanded ? criteria : collapseCriteria)
                 : null}
 
               {renderCriteriaGroup(criteriaGroups)}

package/src/aldehyde/form/dtmpl-form.tsx

@@ -196,6 +196,15 @@ export default class DtmplForm extends React.PureComponent<
       return;
     }
 
+    const fields = appDtmplConfig.groups?.map(r => r.fields).flat();
+    if (fields?.length) {
+      fields.forEach(r => {
+        if (r.hidden) { // 隐藏字段，清空值
+          values[r.id] = "";
+        }
+      });
+    }
+
     if (dtmplData) {
       dtmplData.fieldMap = { ...values }
     }

package/src/aldehyde/form/form-Item-group.tsx

@@ -150,7 +150,7 @@ export default class FormItemGroup extends React.PureComponent<
         tooltip={(!item.tip || item.tip == "") ? undefined : item.tip}
         initialValue={fieldValue}
         style={{ margin: "4px 4px 12px" }}
-        rules={TmplConfigAnalysis.getRules(item, translate)}
+        rules={item.hidden ? [] : TmplConfigAnalysis.getRules(item, translate)}
       >
         <RenderEntryControl
           fieldValue={fieldValue}
@@ -178,7 +178,7 @@ export default class FormItemGroup extends React.PureComponent<
       fields.forEach((item, index) => {
         let fieldValue = valueMap ? valueMap[item.id] : undefined;
         fieldValue =
-          fieldValue || fieldValue == 0
+          fieldValue || fieldValue === 0
             ? fieldValue
             : item.defaultValue
               ? Units.configParamTrans(item.defaultValue, ControlTypeSupportor.getControlType(item, item.defaultValue))

package/src/aldehyde/import/excel-import.tsx

@@ -57,7 +57,7 @@ interface ExcelImportStat {
   importFile?: any;
   logSerialId?: string;
   ltmplConfig?: LtmplConfig;
-  msgIndex?:number;
+  msgIndex?: number;
 }
 
 export default class ExcelImport extends React.PureComponent<
@@ -76,7 +76,7 @@ export default class ExcelImport extends React.PureComponent<
     showLogLevelList: [...logLevelList],
     logSerialId: undefined,
     ltmplConfig: undefined,
-    msgIndex:0,
+    msgIndex: 0,
   };
   static contextType = LocaleContext;
   context: React.ContextType<typeof LocaleContext>;
@@ -126,7 +126,7 @@ export default class ExcelImport extends React.PureComponent<
         });
         this.timerId = setInterval(() => this.handleStatus(res.importId), 500);
       } else {
-        message.error(translate("${失败}!"),5);
+        message.error(translate("${失败}!"), 5);
         this.setState({
           importStatus: "fail",
         });
@@ -142,7 +142,7 @@ export default class ExcelImport extends React.PureComponent<
 
   handleStatus = (importId) => {
     const { serverKey } = this.props;
-    const { maxMsgCount, importStatus, logs,msgIndex } = this.state;
+    const { maxMsgCount, importStatus, logs, msgIndex } = this.state;
     const { translate } = this.context;
     Super.super(
       {
@@ -214,7 +214,7 @@ export default class ExcelImport extends React.PureComponent<
             : loggs;
         this.setState({
           statusMsg: res.message,
-          msgIndex:res.messageSequence?.messages?.length ? msgIndex+res.messageSequence?.messages.length:msgIndex,
+          msgIndex: res.messageSequence?.messages?.length ? msgIndex + res.messageSequence?.messages.length : msgIndex,
           percent,
           importStatus: percent == 100 ? "success" : "importing",
           logs: loggs,
@@ -263,7 +263,7 @@ export default class ExcelImport extends React.PureComponent<
         Units.api(serverKey),
         `/v3/ltmpl/importer/template?sourceId=${sourceId}&@token=${hydrocarbonToken}&@programToken=${Units.programCode(
           serverKey
-        )}`
+        )}&@applicationToken=${Units.applicationCode(serverKey)}`
       ),
       "导入模板.xlsx"
     );
@@ -292,7 +292,7 @@ export default class ExcelImport extends React.PureComponent<
     const props = {
       accept:
         "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet,application/vnd.ms-excel,application/vnd.ms-excel",
-      onChange: () => {},
+      onChange: () => { },
       onRemove: (file) => {
         this.setState({
           importFile: undefined,
@@ -370,8 +370,8 @@ export default class ExcelImport extends React.PureComponent<
                     {importStatus == "importing"
                       ? translate("${正在导入}")
                       : importStatus == "stop"
-                      ? translate("${重新导入}")
-                      : translate("${开始导入}")}
+                        ? translate("${重新导入}")
+                        : translate("${开始导入}")}
                   </Button>
                   <Button
                     onClick={this.handleStopImport}

package/src/aldehyde/layout2/page.tsx

@@ -28,13 +28,25 @@ type PagePropsType = {
 };
 
 // 跳转主题指定首页
-export const routeNavigationThemeHome = (theme: ThemeConfig, menus: MenuType[], pathname: string, navigate: NavigateFunction, closeTab) => {
+export const routeNavigationThemeHome = (theme: ThemeConfig, menus: MenuType[], pathname: string, navigate: NavigateFunction, closeTab, version?: string) => {
   const defHomePath = ["/home", "/home/"];
   const isHome = defHomePath.some(r => pathname.endsWith(r));
-  if (!theme.homeSourceId || !menus?.length) {
+  const { homeSourceId, homePageUrl } = theme || {};
+  if (isHome && homePageUrl) { // 首页自定义链接
+    if (homePageUrl.startsWith("http")) {
+      window.open(homePageUrl, "_self");
+      return homePageUrl;
+    } else {
+      // version 版本路由 v2/v3/v4/v5
+      const temUrl = homePageUrl.startsWith("/") ? `/${version}${homePageUrl}` : `/${version}/${homePageUrl}`;
+      navigate(temUrl, { replace: true });
+      return temUrl;
+    }
+  }
+  if (!homeSourceId || !menus?.length) {
     return;
   }
-  const item = Units.findItemByIdIterative(menus, theme.homeSourceId);
+  const item = Units.findItemByIdIterative(menus, homeSourceId);
   if (!item) {
     return;
   }
@@ -241,7 +253,7 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
     SetMenu(menuConfig?.menu);
     updateMenuItemIdToFirstFloorIdxMap(menuConfig?.menu);
     setThemeConfig(tConfig);
-    const temCustomHome = routeNavigationThemeHome(tConfig, menuConfig?.menu, pathname, navigate, closeTab);
+    const temCustomHome = routeNavigationThemeHome(tConfig, menuConfig?.menu, pathname, navigate, closeTab, "v2");
     setCustomHome(temCustomHome);
   };
 

package/src/aldehyde/layout3/page.tsx

@@ -46,7 +46,7 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
     setMenu(menuConfig?.menu);
     updateMenuItemIdToFirstFloorIdxMap(menuConfig?.menu);
     setThemeConfig(tConfig);
-    const temCustomHome = routeNavigationThemeHome(tConfig, menuConfig?.menu, pathname, navigate, closeTab);
+    const temCustomHome = routeNavigationThemeHome(tConfig, menuConfig?.menu, pathname, navigate, closeTab, "v3");
     setCustomHome(temCustomHome);
   };
 

package/src/aldehyde/layout4/page.tsx

@@ -51,7 +51,7 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
     setMenu(menuConfig?.menu);
     updateMenuItemIdToFirstFloorIdxMap(menuConfig?.menu);
     setThemeConfig(tConfig);
-    const temCustomHome = routeNavigationThemeHome(tConfig, menuConfig?.menu, pathname, navigate, closeTab);
+    const temCustomHome = routeNavigationThemeHome(tConfig, menuConfig?.menu, pathname, navigate, closeTab, "v4");
     setCustomHome(temCustomHome);
   };
 

package/src/aldehyde/layout5/page.tsx

@@ -50,7 +50,7 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
     setMenu(menuConfig?.menu);
     updateMenuItemIdToFirstFloorIdxMap(menuConfig?.menu);
     setThemeConfig(tConfig);
-    const temCustomHome = routeNavigationThemeHome(tConfig, menuConfig?.menu, pathname, navigate, closeTab);
+    const temCustomHome = routeNavigationThemeHome(tConfig, menuConfig?.menu, pathname, navigate, closeTab, "v5");
     setCustomHome(temCustomHome);
   };