1.增加自定义参数功能

Min
1 parent 6dc23d74
Showing 2 changed files with 38 additions and 1 deletions
src/components/Common/CommonElementEvent.js
src/components/CommonElementEvent/SisformulaInfo.js
@@ -391,7 +391,18 @@ export default (ChildComponent) =&gt; {
           customizeParamConfig = customizeParamConfigNew;
         }
+        /* 自定义参数 */
+        let selfParamConfig = commonUtils.isNotEmptyArr(formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizevariable')) ?
+          formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizeparam')[0] : {};
+        let selfParamColumn = [];
+        if(commonUtils.isNotEmptyArr(selfParamConfig)) {
+          selfParamColumn = commonFunc.getHeaderConfig(selfParamConfig);
+        }
+        console.log('systemParamColumn', selfParamConfig, selfParamColumn);
+
+
         this.handleGetSlaveData('Set', 'param', paramConfig);
+        this.handleGetSlaveData('Set', 'selfParam', selfParamConfig);
         let addState = {};
         let addStateMaster = {};
@@ -411,6 +422,7 @@ export default (ChildComponent) =&gt; {
           config.masterConfig = masterConfig;
           config.paramConfig = paramConfig;
           config.customizeParamConfig = customizeParamConfig;
+          config.selfParamConfig = selfParamConfig;
           addState = await this.handleAdd(config, nextProps.app.currentPane.copyTo, true);
         } else {
           addStateMaster = await this.handleGetSlaveData('One', undefined, masterConfig);
@@ -468,6 +480,9 @@ export default (ChildComponent) =&gt; {
           if (commonUtils.isNotEmptyObject(customizeParamConfig)) {
             this.handleGetSlaveData('customizeParam', 'customizeParam', customizeParamConfig);
           }
+          if (commonUtils.isNotEmptyObject(selfParamConfig)) {
+            this.handleGetSlaveData('Set', 'selfParam', selfParamConfig);
+          }
         }
         let customizeParamColumn = [];
@@ -529,6 +544,8 @@ export default (ChildComponent) =&gt; {
           systemFunctionData,
           bussinessFunctionData,
           bReceived,
+          selfParamConfig,
+          selfParamColumn,
           pageLoading: false,
           ...addState,
           ...addState1,
@@ -1895,7 +1912,7 @@ export default (ChildComponent) =&gt; {
       const {
         sModelsType, masterConfig, slaveConfig, iPlcNoConfig, siscommonstyleproductclassifyConfig, contactConfig, addressConfig, machineConfig, assortConfig, outsideConfig, processstyleConfig, processApsRuleConfig, dynamicParamConfig, supplyConfig,
         stockConfig, customerInfoConfig, picFileConfig, eleemployeeConfig, elemachineConfig, jurgroupConfig, customergroupConfig, supplygroupConfig,
-        persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, paramConfig, userConfig, phaseConfig, conditionConfig, sischeckphaselogininfoConfig,
+        persongroupConfig, processgroupConfig, drivergroupConfig, departgroupConfig, paramConfig, selfParamConfig, userConfig, phaseConfig, conditionConfig, sischeckphaselogininfoConfig,
         sisproductclassifyProcessClassifyConfig, sysmsguserConfig, eleknifemouldproductConfig, eleknifemouldfileConfig, eleteststandarditemConfig, formData, approveGroupConfig,
         brandgroupConfig, slave0Config, memoDataList,
       } = this.props;
@@ -1934,6 +1951,7 @@ export default (ChildComponent) =&gt; {
         this.handleGetSlaveData('One', null, masterConfig, bEditClick);
       } else if (sModelsType === 'system/sisformulaInfo') {
         this.handleGetSlaveData('Set', 'param', paramConfig, bEditClick);
+        this.handleGetSlaveData('Set', 'selfParam', selfParamConfig, bEditClick);
         this.handleGetSlaveData('One', undefined, masterConfig, bEditClick);
         let customizeParamConfig = commonUtils.isNotEmptyArr(formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizeparam')) ? formData.filter(item => item.bGrd && item.sTbName === 'sisformulacustomizeparam')[0] : {};
         /* 获取主表自定义列名为自定义变量配置 */
@@ -2351,6 +2369,7 @@ export default (ChildComponent) =&gt; {
             userDelData, phaseDelData, conditionDelData, sisproductclassifyProcessClassifyData, sisproductclassifyProcessClassifyDelData,
             siscommonstyleproductclassifyConfig, siscommonstyleproductclassifyData, siscommonstyleproductclassifyDelData, customerInfoData,
             customerInfoDelData, sysmsguserConfig, customergroupOldData, customergroupOldDelData, supplygroupOldData, supplygroupOldDelData,
+            selfParamConfig, selfParamData,selfParamDelData,
             processgroupOldData, processgroupOldDelData, jurgroupOldData, jurgroupOldDelData, persongroupOldData, persongroupOldDelData, drivergroupOldData, drivergroupOldDelData,
             eleknifemouldproductData, eleknifemouldproductDelData, eleknifemouldfileData, eleknifemouldfileDelData, eleteststandarditemData, eleteststandarditemDelData,
             customizeParamConfig, customizeParamData, customizeParamDelData, dynamicParamData, dynamicParamDelData, departgroupOldData, departgroupOldDelData, customizeParamName,
@@ -2766,6 +2785,9 @@ export default (ChildComponent) =&gt; {
             } else if (commonUtils.isNotEmptyObject(customizeParamConfig)) {
               data.push(commonBusiness.mergeData('customizeParam', customizeParamConfig.sTbName, customizeParamData, customizeParamDelData));
             }
+            if (commonUtils.isNotEmptyObject(selfParamConfig)) {
+              data.push(commonBusiness.mergeData('selfParam', selfParamConfig.sTbName, selfParamData, selfParamDelData));
+            }
           } else if (sModelsType === 'smg/sendMailMsg') {
             masterData.sContent = masterData.sContentMemo;
             masterData.sType = '1';
@@ -114,6 +114,8 @@ const SisformulaComponent = Form.create({
   const tabCalculationParameter = commonFunc.showMessage(app.commonConst, 'tabCalculationParameter');/* 计算参数 */
   const tabSystemFunction = commonFunc.showMessage(app.commonConst, 'tabSystemFunction');/* 系统函数 */
   const tabBusinessFunction = commonFunc.showMessage(app.commonConst, 'tabBusinessFunction');/* 业务函数 */
+  const tabBusinessParameters = commonFunc.showMessage(app.commonConst, 'tabBusinessParameters');/* 自定义参数 */
+
   const showTypeProps = {
     record: masterData,
     name: 'master',
@@ -146,6 +148,16 @@ const SisformulaComponent = Form.create({
     rowSelection: null,
   };
+  /* 自定义参数 */
+  const selfParamPropsType = {
+    ...commonBusiness.getTableTypes('selfParam', props),
+    tableProps: {
+      AutoTableHeight: 255,
+    },
+    // bNaturalWidth: true, /* 原始宽度 不进行最后一列计算 */
+    rowSelection: null,
+  };
+
   const customizeParamPropsTypeArr = [];
   if (commonUtils.isNotEmptyArr(props.customizeParamName)) {
     props.customizeParamName.forEach((paramName) => {
@@ -263,6 +275,9 @@ const SisformulaComponent = Form.create({
                       <TabPane tab={tabBusinessFunction} key={5}>
                         <TabParam {...commonBusiness.getShowTableSelectTypes('bussinessFunction', props, 'value')} />
                       </TabPane>
+                      <TabPane tab={tabBusinessParameters} key={6}>
+                        { commonUtils.isNotEmptyObject(selfParamPropsType) ? <StaticEditTable {...selfParamPropsType} setOpterationColumn="Y" footer="hidden" /> : ''}
+                      </TabPane>
                     </Tabs>
                     {/* <div style={{ height: '1px', backgroundColor: '#d9d9d9', width: '100%' }} /> */}
                     <TabCounter {...props} />