aldehyde 0.2.479 → 0.2.480

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/module/dtmpl-edit-card.tsx

@@ -221,7 +221,7 @@ export default class DtmplEditCard extends React.PureComponent<
         setTimeout(() => this.onValuesChange(), 300);
     };
 
-    // 表单关联项secondCriteria处理start
+    // 表单关联项secondCriterion处理start
     getSubDtmplData = async (valueField, code) => {
         const { serverKey } = this.props;
         const dtmplData = await HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
@@ -242,7 +242,7 @@ export default class DtmplEditCard extends React.PureComponent<
             if (relValueField.subRelValueField && relValueData) {
                 relValueData = await this.getSubDtmplData(relValueField, relValueData);
             }
-            field.baseCriteria = { ...(baseCriteria || {}), "secondCriteria": relValueData };
+            field.baseCriteria = { ...(baseCriteria || {}), "secondCriterion": relValueData };
             field.configChanged = true;
         }
         if (relValueField3 && temForm) {
@@ -250,12 +250,12 @@ export default class DtmplEditCard extends React.PureComponent<
             if (relValueField3.subRelValueField && relValueData) {
                 relValueData = await this.getSubDtmplData(relValueField3, relValueData);
             }
-            field.baseCriteria = { ...(field.baseCriteria || {}), "thirdCriteria": relValueData };
+            field.baseCriteria = { ...(field.baseCriteria || {}), "thirdCriterion": relValueData };
             field.configChanged = true;
         }
         return field;
     }
-    // 表单关联项secondCriteria处理end
+    // 表单关联项secondCriterion处理end
 
     /**
      * 处理表单关联项

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

@@ -164,7 +164,7 @@ export default class DtmplEditPage extends React.PureComponent<
     });
   };
 
-  // 表单关联项secondCriteria处理start
+  // 表单关联项secondCriterion处理start
   getSubDtmplData = async (valueField, code) => {
     const { serverKey } = this.props;
     const dtmplData = await HcserviceV3.requestDtmplData(serverKey, valueField.id, code.split("@R@")[0], null);
@@ -185,7 +185,7 @@ export default class DtmplEditPage extends React.PureComponent<
       if (relValueField.subRelValueField && relValueData) {
         relValueData = await this.getSubDtmplData(relValueField, relValueData);
       }
-      field.baseCriteria = { ...(baseCriteria || {}), "secondCriteria": relValueData };
+      field.baseCriteria = { ...(baseCriteria || {}), "secondCriterion": relValueData };
       field.configChanged = true;
     }
     if (relValueField3 && temForm) {
@@ -193,12 +193,12 @@ export default class DtmplEditPage extends React.PureComponent<
       if (relValueField3.subRelValueField && relValueData) {
         relValueData = await this.getSubDtmplData(relValueField3, relValueData);
       }
-      field.baseCriteria = { ...(field.baseCriteria || {}), "thirdCriteria": relValueData };
+      field.baseCriteria = { ...(field.baseCriteria || {}), "thirdCriterion": relValueData };
       field.configChanged = true;
     }
     return field;
   }
-  // 表单关联项secondCriteria处理end
+  // 表单关联项secondCriterion处理end
 
   loadData = async (dtmplConfig: DtmplConfig) => {
     const {
@@ -283,6 +283,9 @@ export default class DtmplEditPage extends React.PureComponent<
    * 匹配关联项的字段，实现值更新关联字段值变化
    */
   handleRelValueField = (dtmplConfig: DtmplConfig) => {
+    if(!dtmplConfig){
+      return;
+    }
     const { groups } = dtmplConfig;
     const valueFieldMap = groups.reduce((total, item) => {
       if (item.fields) {

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

@@ -177,8 +177,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   getTabsOptions = async () => {
     const { ltmplConfig, criteriaData, sourceId } = this.props;
     const { translate } = this.context;
-    const { split2TabCriterias, showSplitTabDataCount } = ltmplConfig || {};
-    if (!split2TabCriterias) {
+    const { split2TabCriteria, showSplitTabDataCount } = ltmplConfig || {};
+    if (!split2TabCriteria) {
       return;
     }
     const allIds = [];
@@ -186,7 +186,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
     if (showSplitTabDataCount) {
       groupCount = await HcserviceV3.getLtmplDataGroupCount(sourceId);
     }
-    const options = split2TabCriterias.map(fieldConfig => {
+    const options = split2TabCriteria.map(fieldConfig => {
       const id = `c_${fieldConfig.id}`;
       allIds.push(id);
       if (enumTypes.includes(fieldConfig.controlType || fieldConfig.extControlType)) {
@@ -251,7 +251,7 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
       return;
     }
     // 处理菜单切换，查询条件清空，重置tab拆解条件选中项
-    const tabActiveKey = ltmplConfig.split2TabCriterias?.find(r => criteriaData[`c_${r.id}`])?.id;
+    const tabActiveKey = ltmplConfig.split2TabCriteria?.find(r => criteriaData[`c_${r.id}`])?.id;
     this.setState({
       loading: true,
       userCriteriaData: criteriaData,
@@ -1226,11 +1226,11 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
 
   criteriaFormUseful = () => {
     const { ltmplConfig } = this.props;
-    let { buttons, criterias, updrillButtonConfigs } = ltmplConfig;
+    let { buttons, criteria, updrillButtonConfigs } = ltmplConfig;
     if (
       ((buttons.includes("query") ||
         (updrillButtonConfigs && updrillButtonConfigs.length > 0)) &&
-        ((criterias && criterias.length > 0) ||
+        ((criteria && criteria.length > 0) ||
           buttons.includes("drilling"))) ||
       this.checkBoxUseful() || buttons.includes("multiRowEdit")
     ) {
@@ -1351,8 +1351,8 @@ class ActTable extends React.PureComponent<ActTableProps, ActTableStat> {
   getLtreeEntitySelectCriteria = () => {
     let { ltmplConfig } = this.props
 
-    if (ltmplConfig && ltmplConfig.criterias) {
-      for (let c of ltmplConfig.criterias) {
+    if (ltmplConfig && ltmplConfig.criteria) {
+      for (let c of ltmplConfig.criteria) {
         if (c?.extControlType == "ltree-entity-select" || c?.extControlType == "ltree-entity-select-value") {
           return c;
         }

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

@@ -69,21 +69,21 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
         return subData;
     }
 
-    getSecondCriteria = async () => {
+    getSecondCriterion = async () => {
         const { parentFormInstance, selectRelValueField } = this.props;
-        let secondCriteria;
+        let secondCriterion;
         if (selectRelValueField && parentFormInstance) {
-            secondCriteria = parentFormInstance.getFieldValue(selectRelValueField.id);
-            if (selectRelValueField.subRelValueField && secondCriteria) {
-                secondCriteria = await this.getSubDtmplData(selectRelValueField, secondCriteria);
+            secondCriterion = parentFormInstance.getFieldValue(selectRelValueField.id);
+            if (selectRelValueField.subRelValueField && secondCriterion) {
+                secondCriterion = await this.getSubDtmplData(selectRelValueField, secondCriterion);
             }
         }
-        return { secondCriteria };
+        return { secondCriterion };
     }
     // 表单关系字段组查询点选取值end
 
     loadData = async (selectConfig: SelectConfig, criteriaData: object) => {
-        const secondCriteria = await this.getSecondCriteria();
+        const secondCriterion = await this.getSecondCriterion();
         this.setState({
             loading: true,
         })
@@ -98,7 +98,7 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
         const { sourceId, exceptCodes, serverKey, mainCode, existRelation } = this.props;
         /** 构建 dataSource **/
         //构建过滤条件
-        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(serverKey, sourceId, { exceptCodes, ...criteriaData, ...pageInfo, ...secondCriteria, mainCode, existRelation });
+        let queryKey: QueryKey = await HcserviceV3.requestLtmplQueryKey(serverKey, sourceId, { exceptCodes, ...criteriaData, ...pageInfo, ...secondCriterion, mainCode, existRelation });
         this.setState({
             queryKey,
             criteriaData,
@@ -271,9 +271,9 @@ class ModelSelectTable extends React.PureComponent<ModelSelectTableProps, ModelS
             return <>
             </>
         }
-        let { buttons, criterias, jumps, actions } = selectConfig
+        let { buttons, criteria, jumps, actions } = selectConfig
         let displayCriteriaCard: boolean = false;
-        if (buttons.includes('batchDelete') || (buttons.includes('query') && criterias && criterias.length > 0) ||
+        if (buttons.includes('batchDelete') || (buttons.includes('query') && criteria && criteria.length > 0) ||
             (actions && actions.length > 0) || (jumps && jumps.length > 0)) {
             displayCriteriaCard = true;
         }

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

@@ -211,7 +211,7 @@ class RelationTable extends React.PureComponent<
                 }
                 item.baseCriteria = {
                     ...item.baseCriteria,
-                    "secondCriteria": parentFormInstance.getFieldValue(item.relValueField.id)
+                    "secondCriterion": parentFormInstance.getFieldValue(item.relValueField.id)
                 };
                 item.configChanged = true;
             }

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

@@ -455,11 +455,11 @@ class SelectTable extends React.PureComponent<SelectTableProps, SelectTableStat>
             </>
         }
         let { actions } = fieldConfig;
-        let { buttons, criterias, jumps, fileExports } = selectConfig;
+        let { buttons, criteria, jumps, fileExports } = selectConfig;
         let displayCriteriaCard: boolean = true;
         if (funcMode == "simple" || funcMode == "common") {
             displayCriteriaCard = false;
-        } else if (buttons.includes('batchDelete') || (buttons.includes('query') && criterias && criterias.length > 0) ||
+        } else if (buttons.includes('batchDelete') || (buttons.includes('query') && criteria && criteria.length > 0) ||
             (actions && actions.length > 0) || (jumps && jumps.length > 0) || (fileExports && fileExports.length > 0)) {
             displayCriteriaCard = true;
         }

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

@@ -128,7 +128,7 @@ async function loadEnumOfSelectConfig(
   const mstrucIds = [];
   let subs = findUnloadEnumMstrucIdOfFields(selectConfig.columns);
   concat(mstrucIds, subs);
-  subs = findUnloadEnumMstrucIdOfFields(selectConfig.criterias);
+  subs = findUnloadEnumMstrucIdOfFields(selectConfig.criteria);
   concat(mstrucIds, subs);
   await loadEnum(serverKey, mstrucIds);
 }
@@ -143,7 +143,7 @@ async function loadEnumOfLtmplConfig(
   }
   let subs = findUnloadEnumMstrucIdOfFields(selectConfig.columns);
   concat(mstrucIds, subs);
-  subs = findUnloadEnumMstrucIdOfFields(selectConfig.criterias);
+  subs = findUnloadEnumMstrucIdOfFields(selectConfig.criteria);
   concat(mstrucIds, subs);
   subs = findUnloadEnumMstrucIdOfFields(selectConfig.drillingParams);
   concat(mstrucIds, subs);

package/src/aldehyde/tmpl/interface.tsx

@@ -278,7 +278,7 @@ export interface BlockMenu extends MenuBase {
 export interface CriteriaConfig extends FieldConfig { }
 
 export interface CriteriaGroup {
-  criterias: CriteriaConfig[];
+  criteria: CriteriaConfig[];
   id: string;
   title: string;
   lagicalOpt: string;
@@ -446,8 +446,8 @@ export interface FieldConfig extends FieldBase {
   updateSelf?: (form: FormInstance) => FieldConfig;
   suppleOptions?: any[];
   actions?: FieldAction[];
-  requiredRuleCriterias?: FieldConfig[];
-  usableRuleCriterias?: FieldConfig[];
+  requiredRuleCriteria?: FieldConfig[];
+  usableRuleCriteria?: FieldConfig[];
   relValueField?: FieldConfig;
   subRelValueField?: FieldConfig;
   relValueField3?: FieldConfig;
@@ -520,12 +520,12 @@ export interface SelectConfig extends TmplBase {
   defShowCriteriaCount: number;
   defShowRowActionCount: number;
   columns: ColumnConfig[];
-  criterias: CriteriaConfig[];
-  commonCriterias: CriteriaConfig[];
-  split2TabCriterias: CriteriaConfig[];
+  criteria: CriteriaConfig[];
+  commonCriteria: CriteriaConfig[];
+  split2TabCriteria: CriteriaConfig[];
   defaultCriteriaValue?: object;
   groupIColumns?: ColumnConfig[];
-  primaryCriteria: CriteriaConfig;
+  primaryCriterion: CriteriaConfig;
   orderColumn: ColumnConfig;
   totalColummConfigs?: ColumnConfig[];
   showDim?: boolean;

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

@@ -334,9 +334,9 @@ TmplConfigAnalysis.buildInFuncFields = (dtmplConfig: DtmplConfig) => {
     for (let group of dtmplConfig.groups) {
         for (let field of group.fields) {
             if (
-                (field.requiredRuleCriterias &&
-                    field.requiredRuleCriterias.length > 0) ||
-                (field.usableRuleCriterias && field.usableRuleCriterias.length > 0)
+                (field.requiredRuleCriteria &&
+                    field.requiredRuleCriteria.length > 0) ||
+                (field.usableRuleCriteria && field.usableRuleCriteria.length > 0)
                 || field.relValueField || field.relValueField3
             ) {
                 field.shouldUpdate = true;
@@ -366,12 +366,12 @@ TmplConfigAnalysis.buildInDtmplConfig = (
         ) {
             for (let field of dtmplConfig.buildInFuncFields) {
                 if (
-                    field.requiredRuleCriterias != null &&
-                    field.requiredRuleCriterias.length > 0
+                    field.requiredRuleCriteria != null &&
+                    field.requiredRuleCriteria.length > 0
                 ) {
                     if (
                         ActionUtils.isMatch(
-                            field.requiredRuleCriterias,
+                            field.requiredRuleCriteria,
                             [allValues],
                             formInstance,
                             dtmplConfig
@@ -383,12 +383,12 @@ TmplConfigAnalysis.buildInDtmplConfig = (
                     }
                 }
                 if (
-                    field.usableRuleCriterias != null &&
-                    field.usableRuleCriterias.length > 0
+                    field.usableRuleCriteria != null &&
+                    field.usableRuleCriteria.length > 0
                 ) {
                     if (
                         ActionUtils.isMatch(
-                            field.usableRuleCriterias,
+                            field.usableRuleCriteria,
                             [allValues],
                             formInstance,
                             dtmplConfig
@@ -410,11 +410,11 @@ TmplConfigAnalysis.buildInDtmplConfig = (
                 if (!changedValues) {
                     continue;
                 }
-                const requireValue = field.requiredRuleCriterias?.find(r => {
+                const requireValue = field.requiredRuleCriteria?.find(r => {
                     const id = TmplConfigAnalysis.getFieldId(dtmplConfig, r.mstrucId);
                     return changedValues.hasOwnProperty(id);
                 });
-                const usableValue = field.usableRuleCriterias?.some(r => {
+                const usableValue = field.usableRuleCriteria?.some(r => {
                     const id = TmplConfigAnalysis.getFieldId(dtmplConfig, r.mstrucId);
                     return changedValues.hasOwnProperty(id);
                 });
@@ -424,7 +424,6 @@ TmplConfigAnalysis.buildInDtmplConfig = (
                     }
                     field.baseCriteria = {
                         ...field.baseCriteria,
-                        // "secondCriteria": changedValues[field.relValueField.id]
                     };
                     field.configChanged = true;
                     // 必填条件配置是否清除/可用条件默认清除
@@ -507,14 +506,14 @@ TmplConfigAnalysis.buildInCtmplConfig = (
     props: CriteriaFormProps
 ) => {
     if (!ltmplConfig.buildInFuncFields) {
-        const { commonCriterias, criterias } = ltmplConfig;
+        const { commonCriteria, criteria } = ltmplConfig;
         //先找到有业务的
         let buildInFuncFields = [];
-        for (let field of (commonCriterias?.length ? commonCriterias : criterias)) {
+        for (let field of (commonCriteria?.length ? commonCriteria : criteria)) {
             if (
-                (field.requiredRuleCriterias &&
-                    field.requiredRuleCriterias.length > 0) ||
-                (field.usableRuleCriterias && field.usableRuleCriterias.length > 0)
+                (field.requiredRuleCriteria &&
+                    field.requiredRuleCriteria.length > 0) ||
+                (field.usableRuleCriteria && field.usableRuleCriteria.length > 0)
                 || field.relValueField
             ) {
                 field.shouldUpdate = true;
@@ -524,9 +523,9 @@ TmplConfigAnalysis.buildInCtmplConfig = (
         if (ltmplConfig['drillingParams']) {
             for (let field of ltmplConfig['drillingParams']) {
                 if (
-                    (field.requiredRuleCriterias &&
-                        field.requiredRuleCriterias.length > 0) ||
-                    (field.usableRuleCriterias && field.usableRuleCriterias.length > 0)
+                    (field.requiredRuleCriteria &&
+                        field.requiredRuleCriteria.length > 0) ||
+                    (field.usableRuleCriteria && field.usableRuleCriteria.length > 0)
                     || field.relValueField
                 ) {
                     field.shouldUpdate = true;
@@ -550,13 +549,13 @@ TmplConfigAnalysis.buildInCtmplConfig = (
                     if (!field.baseCriteria) {
                         field.baseCriteria = {}
                     }
-                    let secondCriteria = changedValues["c_" + field.relValueField.id];
-                    if (secondCriteria?.includes("@R@") || secondCriteria?.includes("@,@")) { // 处理关系字段多选
-                        secondCriteria = secondCriteria.split("@,@").map(r => r.split("@R@")[0]).join(",");
+                    let secondCriterion = changedValues["c_" + field.relValueField.id];
+                    if (secondCriterion?.includes("@R@") || secondCriterion?.includes("@,@")) { // 处理关系字段多选
+                        secondCriterion = secondCriterion.split("@,@").map(r => r.split("@R@")[0]).join(",");
                     }
                     field.baseCriteria = {
                         ...field.baseCriteria,
-                        "secondCriteria": secondCriteria
+                        "secondCriterion": secondCriterion
                     };
                     field.configChanged = true;
                     if (clearCurrent) { // 是否清除关联项（搜索表单初始化设置不可清除）

package/src/aldehyde/units/index.tsx

@@ -364,7 +364,7 @@ export default {
     if (!hydrocarbonToken) {
       hydrocarbonToken = window.localStorage.getItem(serverKey + "hydrocarbonToken");
     }
-    if (!serverKey) { // serverKey不存在
+    if (!serverKey || !hydrocarbonToken) { // serverKey不存在
       hydrocarbonToken = this.hydrocarbonToken();
     }
     return hydrocarbonToken;
@@ -819,8 +819,8 @@ export default {
       name = name.substring(2);
     }
     let cs: CriteriaConfig[] = [];
-    if (ltmplConfig.criterias) {
-      cs.push(...ltmplConfig.criterias);
+    if (ltmplConfig.criteria) {
+      cs.push(...ltmplConfig.criteria);
     }
     if (ltmplConfig.updrillButtonConfigs) {
       cs.push(...ltmplConfig.updrillButtonConfigs);