Merge branch 'main' of http://git.xlyprint.cn/zhangz/xlyUmi

Min
2 parents 767f936e 5730aa7e
Showing 1 changed file with 7 additions and 12 deletions
src/components/QuickQuote/index.jsx
@@ -322,8 +322,7 @@ const QuickQuoteEvent = props =&gt; {
                     sParam: sParam,
                     [`sParam${iOrder}`]: sParamDefault,
                     ...(sFieldName ? { [sFieldName]: sParamDefault } : {}),
-                    sParamKey: `sParam${iOrder}`,
-                    sParamKeyNew: sFieldName || `sParam${iOrder}`,
+                    sParamKey: sFieldName || `sParam${iOrder}`,
                   };
             })
             .filter(item => item !== "");
@@ -928,7 +927,6 @@ const QuickQuoteEvent = props =&gt; {
           if (sBackendParams.length) {
             const sQuoParams = sBackendParams.map(item => ({
               sParamKey: item.sParamKey,
-              sParamKeyNew: item.sParamKeyNew,
               sParamName: item.sParam,
               sParamValue: item.value !== undefined ? item.value : "",
               bSelfCbx: !(item.value === "" || item.value === undefined),
@@ -1683,13 +1681,13 @@ const BoxComponent = props =&gt; {
       .filter(item => item.sPartsName === boxModel || !item.sPartsName)
       .map(config => ({
         ...config,
-        costomStyle: sBackProcessData.find(item => item[config.sName0 || config.sName])?.sParamConfig ? styles.sParamConfig : "",
+        costomStyle: sBackProcessData.find(item => item[config.sName])?.sParamConfig ? styles.sParamConfig : "",
       })),
     tableConfig: { ...slaveConfig, gdsconfigformslave: downAbleConfigsNew },
     iColValueView: 24,
     viewRow: slaveRowData,
     getViewRow: config => {
-      return sBackProcessData.find(item => item[config.sName0 || config.sName]) || {};
+      return sBackProcessData.find(item => item[config.sName]) || {};
     },
     tableName: `slaveDown${boxModel}`,
     getSqlDropDownData: (...args) => {
@@ -1821,7 +1819,7 @@ const BoxComponent = props =&gt; {
       props.setState(pre => ({
         ...pre,
         backendParamsConfig: commonUtils.convertStrToObj(
-          sBackProcessData.find(item => item[showConfig.sName0 || showConfig.sName])?.sParamConfig,
+          sBackProcessData.find(item => item[showConfig.sName])?.sParamConfig,
           []
         ),
         backendConfig: { sParentFieldsName: showConfig.sName, sBoxModel: boxModel },
@@ -2975,7 +2973,6 @@ const BackendParamsExtraComponent = props =&gt; {
   const viewConfigs = backendParamsConfig.map(item => ({
     ...item,
-    sName0: `sParam${item.iOrder}`,
     sName: item.sFieldName || `sParam${item.iOrder}`,
     showName: item.sParam,
     sDropDownType: item.sParamDropDown ? "sql" : "",
@@ -2996,7 +2993,7 @@ const BackendParamsExtraComponent = props =&gt; {
     tableName: `sBackendParams${boxModel}`,
     getSqlDropDownData: (...args) => {
       const showConfig = args[2];
-      const { sParamDropDown = "", sName0, sName } = showConfig;
+      const { sParamDropDown = "", sName } = showConfig;
       const dropDownData = sParamDropDown.split(",");
       if (dropDownData?.length) {
         return {
@@ -3005,8 +3002,7 @@ const BackendParamsExtraComponent = props =&gt; {
             value: item,
             sParam: showConfig.sParam,
             [sName]: item,
-            sParamKey: sName0,
-            sParamKeyNew: sName,
+            sParamKey: sName,
           })),
           totalPageCount: 1,
           currentPageNo: 1,
@@ -3026,8 +3022,7 @@ const BackendParamsExtraComponent = props =&gt; {
             sId: commonUtils.createSid(),
             value: changeValue[sFieldName],
             sParam: showConfig.sParam,
-            sParamKey: showConfig.sName0,
-            sParamKeyNew: sFieldName,
+            sParamKey: sFieldName,
           };
       dropDownDataSelected[sFieldName] = dropDownDataSelected.value;
       const { sParam } = dropDownDataSelected;