bxs-tools-ui 3.3.1 → 3.3.2

package/es/index.js

@@ -9132,10 +9132,6 @@ function getExpressionParamMap(personData, product, ins, options) {
     // 当前险种
     common: {},
     // 通用信息
-    customVariable: null,
-    // 自定义变量
-    cv: null,
-    // 简写，自定义变量
     t: {} // 事件目标
   };
   if (personData) {
@@ -9198,11 +9194,6 @@ function getExpressionParamMap(personData, product, ins, options) {
       map.executeSource = options.executeSource;
     }
   }
-  if (ins && ins.customVariableExp) {
-    var exp = ins.customVariableExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'map.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'map.$2');
-    map.customVariable = eval(exp);
-    map.cv = map.customVariable;
-  }
   return map;
 }
 function executeElementRule(personData, product, ins, ele) {
@@ -10520,14 +10511,18 @@ function _productDataHandler() {
                 _ret = _loop2();
                 if (_ret === 0) break;
               } while (curCondition && curCondition.key && curCondition[curCondition.key]);
-              if (Array.isArray(ins.eleOrderList)) {
-                ins.eleOrderList.forEach(function (ele) {
-                  var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
-                  for (var k in newEleMap) {
-                    ele[k] = newEleMap[k];
-                  }
-                });
-                insuranceDataHandler(ins, prodData);
+              try {
+                if (Array.isArray(ins.eleOrderList)) {
+                  ins.eleOrderList.forEach(function (ele) {
+                    var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
+                    for (var k in newEleMap) {
+                      ele[k] = newEleMap[k];
+                    }
+                  });
+                  insuranceDataHandler(ins, prodData);
+                }
+              } catch (error) {
+                console.error(error);
               }
             });
           }
@@ -46857,7 +46852,7 @@ function _createdProductDataToCalc() {
             productForm.mulInsOrderList = productForm.mulInsOrderList.map(function (ins) {
               var tempIns = {};
               for (var _k2 in ins) {
-                if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'payModeDesc', 'payModePremiumDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'shmInsData', 'totalBaof', 'customVariableExp',
+                if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'payModeDesc', 'payModePremiumDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'shmInsData', 'totalBaof',
                 // 'calcResultExp', // 不能删除，后面有依赖
                 'revalidateFlag'].includes(_k2)) {
                   tempIns[_k2] = ins[_k2];
@@ -48463,7 +48458,7 @@ if (typeof window !== 'undefined' && window.Vue) {
   install(window.Vue);
 }
 const index = {
-  version: '3.3.0',
+  version: '3.3.2',
   install: install
 };
 

package/es/product-info/index.js

@@ -9434,10 +9434,6 @@ function getExpressionParamMap(personData, product, ins, options) {
     // 当前险种
     common: {},
     // 通用信息
-    customVariable: null,
-    // 自定义变量
-    cv: null,
-    // 简写，自定义变量
     t: {} // 事件目标
   };
   if (personData) {
@@ -9500,11 +9496,6 @@ function getExpressionParamMap(personData, product, ins, options) {
       map.executeSource = options.executeSource;
     }
   }
-  if (ins && ins.customVariableExp) {
-    var exp = ins.customVariableExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'map.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'map.$2');
-    map.customVariable = eval(exp);
-    map.cv = map.customVariable;
-  }
   return map;
 }
 function executeElementRule(personData, product, ins, ele) {
@@ -10246,14 +10237,18 @@ function _productDataHandler() {
                 _ret = _loop2();
                 if (_ret === 0) break;
               } while (curCondition && curCondition.key && curCondition[curCondition.key]);
-              if (Array.isArray(ins.eleOrderList)) {
-                ins.eleOrderList.forEach(function (ele) {
-                  var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
-                  for (var k in newEleMap) {
-                    ele[k] = newEleMap[k];
-                  }
-                });
-                insuranceDataHandler(ins, prodData);
+              try {
+                if (Array.isArray(ins.eleOrderList)) {
+                  ins.eleOrderList.forEach(function (ele) {
+                    var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
+                    for (var k in newEleMap) {
+                      ele[k] = newEleMap[k];
+                    }
+                  });
+                  insuranceDataHandler(ins, prodData);
+                }
+              } catch (error) {
+                console.error(error);
               }
             });
           }
@@ -10999,7 +10994,7 @@ function _createdProductDataToCalc() {
             productForm.mulInsOrderList = productForm.mulInsOrderList.map(function (ins) {
               var tempIns = {};
               for (var _k2 in ins) {
-                if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'payModeDesc', 'payModePremiumDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'shmInsData', 'totalBaof', 'customVariableExp',
+                if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'payModeDesc', 'payModePremiumDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'shmInsData', 'totalBaof',
                 // 'calcResultExp', // 不能删除，后面有依赖
                 'revalidateFlag'].includes(_k2)) {
                   tempIns[_k2] = ins[_k2];

package/es/utils/index.js

@@ -281,10 +281,6 @@ function getExpressionParamMap(personData, product, ins, options) {
     // 当前险种
     common: {},
     // 通用信息
-    customVariable: null,
-    // 自定义变量
-    cv: null,
-    // 简写，自定义变量
     t: {} // 事件目标
   };
   if (personData) {
@@ -347,11 +343,6 @@ function getExpressionParamMap(personData, product, ins, options) {
       map.executeSource = options.executeSource;
     }
   }
-  if (ins && ins.customVariableExp) {
-    var exp = ins.customVariableExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'map.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'map.$2');
-    map.customVariable = eval(exp);
-    map.cv = map.customVariable;
-  }
   return map;
 }
 function executeElementRule(personData, product, ins, ele) {
@@ -10420,14 +10411,18 @@ function _productDataHandler() {
                 _ret = _loop2();
                 if (_ret === 0) break;
               } while (curCondition && curCondition.key && curCondition[curCondition.key]);
-              if (Array.isArray(ins.eleOrderList)) {
-                ins.eleOrderList.forEach(function (ele) {
-                  var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
-                  for (var k in newEleMap) {
-                    ele[k] = newEleMap[k];
-                  }
-                });
-                insuranceDataHandler(ins, prodData);
+              try {
+                if (Array.isArray(ins.eleOrderList)) {
+                  ins.eleOrderList.forEach(function (ele) {
+                    var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
+                    for (var k in newEleMap) {
+                      ele[k] = newEleMap[k];
+                    }
+                  });
+                  insuranceDataHandler(ins, prodData);
+                }
+              } catch (error) {
+                console.error(error);
               }
             });
           }

package/lib/index.js

@@ -9115,10 +9115,6 @@
       // 当前险种
       common: {},
       // 通用信息
-      customVariable: null,
-      // 自定义变量
-      cv: null,
-      // 简写，自定义变量
       t: {} // 事件目标
     };
     if (personData) {
@@ -9181,11 +9177,6 @@
         map.executeSource = options.executeSource;
       }
     }
-    if (ins && ins.customVariableExp) {
-      var exp = ins.customVariableExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'map.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'map.$2');
-      map.customVariable = eval(exp);
-      map.cv = map.customVariable;
-    }
     return map;
   }
   function executeElementRule(personData, product, ins, ele) {
@@ -10503,14 +10494,18 @@
                   _ret = _loop2();
                   if (_ret === 0) break;
                 } while (curCondition && curCondition.key && curCondition[curCondition.key]);
-                if (Array.isArray(ins.eleOrderList)) {
-                  ins.eleOrderList.forEach(function (ele) {
-                    var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
-                    for (var k in newEleMap) {
-                      ele[k] = newEleMap[k];
-                    }
-                  });
-                  insuranceDataHandler(ins, prodData);
+                try {
+                  if (Array.isArray(ins.eleOrderList)) {
+                    ins.eleOrderList.forEach(function (ele) {
+                      var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
+                      for (var k in newEleMap) {
+                        ele[k] = newEleMap[k];
+                      }
+                    });
+                    insuranceDataHandler(ins, prodData);
+                  }
+                } catch (error) {
+                  console.error(error);
                 }
               });
             }
@@ -46840,7 +46835,7 @@
               productForm.mulInsOrderList = productForm.mulInsOrderList.map(function (ins) {
                 var tempIns = {};
                 for (var _k2 in ins) {
-                  if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'payModeDesc', 'payModePremiumDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'shmInsData', 'totalBaof', 'customVariableExp',
+                  if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'payModeDesc', 'payModePremiumDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'shmInsData', 'totalBaof',
                   // 'calcResultExp', // 不能删除，后面有依赖
                   'revalidateFlag'].includes(_k2)) {
                     tempIns[_k2] = ins[_k2];
@@ -48446,7 +48441,7 @@
     install(window.Vue);
   }
   var index = {
-    version: '3.3.0',
+    version: '3.3.2',
     install: install
   };
 

package/lib/product-info/index.js

@@ -9430,10 +9430,6 @@
       // 当前险种
       common: {},
       // 通用信息
-      customVariable: null,
-      // 自定义变量
-      cv: null,
-      // 简写，自定义变量
       t: {} // 事件目标
     };
     if (personData) {
@@ -9496,11 +9492,6 @@
         map.executeSource = options.executeSource;
       }
     }
-    if (ins && ins.customVariableExp) {
-      var exp = ins.customVariableExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'map.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'map.$2');
-      map.customVariable = eval(exp);
-      map.cv = map.customVariable;
-    }
     return map;
   }
   function executeElementRule(personData, product, ins, ele) {
@@ -10242,14 +10233,18 @@
                   _ret = _loop2();
                   if (_ret === 0) break;
                 } while (curCondition && curCondition.key && curCondition[curCondition.key]);
-                if (Array.isArray(ins.eleOrderList)) {
-                  ins.eleOrderList.forEach(function (ele) {
-                    var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
-                    for (var k in newEleMap) {
-                      ele[k] = newEleMap[k];
-                    }
-                  });
-                  insuranceDataHandler(ins, prodData);
+                try {
+                  if (Array.isArray(ins.eleOrderList)) {
+                    ins.eleOrderList.forEach(function (ele) {
+                      var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
+                      for (var k in newEleMap) {
+                        ele[k] = newEleMap[k];
+                      }
+                    });
+                    insuranceDataHandler(ins, prodData);
+                  }
+                } catch (error) {
+                  console.error(error);
                 }
               });
             }
@@ -10995,7 +10990,7 @@
               productForm.mulInsOrderList = productForm.mulInsOrderList.map(function (ins) {
                 var tempIns = {};
                 for (var _k2 in ins) {
-                  if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'payModeDesc', 'payModePremiumDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'shmInsData', 'totalBaof', 'customVariableExp',
+                  if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'payModeDesc', 'payModePremiumDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'shmInsData', 'totalBaof',
                   // 'calcResultExp', // 不能删除，后面有依赖
                   'revalidateFlag'].includes(_k2)) {
                     tempIns[_k2] = ins[_k2];

package/lib/utils/index.js

@@ -280,10 +280,6 @@
       // 当前险种
       common: {},
       // 通用信息
-      customVariable: null,
-      // 自定义变量
-      cv: null,
-      // 简写，自定义变量
       t: {} // 事件目标
     };
     if (personData) {
@@ -346,11 +342,6 @@
         map.executeSource = options.executeSource;
       }
     }
-    if (ins && ins.customVariableExp) {
-      var exp = ins.customVariableExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'map.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'map.$2');
-      map.customVariable = eval(exp);
-      map.cv = map.customVariable;
-    }
     return map;
   }
   function executeElementRule(personData, product, ins, ele) {
@@ -10419,14 +10410,18 @@
                   _ret = _loop2();
                   if (_ret === 0) break;
                 } while (curCondition && curCondition.key && curCondition[curCondition.key]);
-                if (Array.isArray(ins.eleOrderList)) {
-                  ins.eleOrderList.forEach(function (ele) {
-                    var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
-                    for (var k in newEleMap) {
-                      ele[k] = newEleMap[k];
-                    }
-                  });
-                  insuranceDataHandler(ins, prodData);
+                try {
+                  if (Array.isArray(ins.eleOrderList)) {
+                    ins.eleOrderList.forEach(function (ele) {
+                      var newEleMap = executeElementRule(personData, prodData, ins, ele, parmas);
+                      for (var k in newEleMap) {
+                        ele[k] = newEleMap[k];
+                      }
+                    });
+                    insuranceDataHandler(ins, prodData);
+                  }
+                } catch (error) {
+                  console.error(error);
                 }
               });
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bxs-tools-ui",
-  "version": "3.3.1",
+  "version": "3.3.2",
   "description": "微易前端业务组件",
   "main": "lib/index.js",
   "module": "es/index.js",

package/packages/bxs-utils/planbook/common.ts

@@ -255,8 +255,6 @@ export function getExpressionParamMap(personData: IPbPersons, product: IPbProduc
     m: {}, // 主险
     me: {}, // 当前险种
     common: {}, // 通用信息
-    customVariable: null, // 自定义变量
-    cv: null, // 简写，自定义变量
     t: {} // 事件目标
   }
 
@@ -309,12 +307,6 @@ export function getExpressionParamMap(personData: IPbPersons, product: IPbProduc
       map.executeSource = options.executeSource
     }
   }
-
-  if (ins && ins.customVariableExp) {
-    const exp = ins.customVariableExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'map.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'map.$2')
-    map.customVariable = eval(exp)
-    map.cv = map.customVariable
-  }
   return map
 }
 

package/packages/bxs-utils/planbook/product.ts

@@ -259,14 +259,18 @@ export async function productDataHandler(prodData: IPbProduct, prodVerifyData: a
           }
         } while (curCondition && curCondition.key && curCondition[curCondition.key])
   
-        if (Array.isArray(ins.eleOrderList)) {
-          ins.eleOrderList.forEach((ele: IInsElement) => {
-            const newEleMap = executeElementRule(personData, prodData, ins, ele, parmas)
-            for (const k in newEleMap) {
-              ele[k] = newEleMap[k]
-            }
-          })
-          insuranceDataHandler(ins, prodData)
+        try {
+          if (Array.isArray(ins.eleOrderList)) {
+            ins.eleOrderList.forEach((ele: IInsElement) => {
+              const newEleMap = executeElementRule(personData, prodData, ins, ele, parmas)
+              for (const k in newEleMap) {
+                ele[k] = newEleMap[k]
+              }
+            })
+            insuranceDataHandler(ins, prodData)
+          }
+        } catch (error) {
+          console.error(error)
         }
       })
     }

package/packages/index.ts

@@ -50,6 +50,6 @@ export {
 }
 
 export default {
-  version: '3.3.0',
+  version: '3.3.2',
   install
 }

package/packages/planbook-input/helper.js

@@ -239,7 +239,6 @@ export async function createdProductDataToCalc(inputData, options = {}) {
               'groupName',
               'shmInsData',
               'totalBaof',
-              'customVariableExp',
               // 'calcResultExp', // 不能删除，后面有依赖
               'revalidateFlag'
             ].includes(k)
@@ -585,36 +584,38 @@ export async function calcProductData(inputData, options, cb) {
       }
 
       // 计算结果校验
-      const mulInsOrderList = _get(currentProduct, 'mulInsOrderList') || []
-      const hasCalcResultExp = mulInsOrderList.some(ins => ins.calcResultExp)
-      if (hasCalcResultExp) {
-        let errorMessage = ''
-        mulInsOrderList
-          .filter(ins => ins.calcResultExp)
-          .forEach(ins => {
-            if (!errorMessage) {
-              const paramMap = getExpressionParamMap(inputData.personData, currentProduct, ins, options)
-              if (paramMap) {
-                try {
-                  const exp = ins.calcResultExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'paramMap.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'paramMap.$2')
-                  errorMessage = eval(exp)
-                  console.log('计算结果约束结果: ', errorMessage)
-                } catch (error) {
-                  errorMessage = '校验公式语法错误！'
-                }
-                if (ins.calcResultExp) {
-                  console.log('计算结果约束公式: ', ins.calcResultExp)
+      try {
+        const mulInsOrderList = _get(currentProduct, 'mulInsOrderList') || []
+        const hasCalcResultExp = mulInsOrderList.some(ins => ins.calcResultExp)
+        if (hasCalcResultExp) {
+          let errorMessage = ''
+          mulInsOrderList
+            .filter(ins => ins.calcResultExp)
+            .forEach(ins => {
+              if (!errorMessage) {
+                const paramMap = getExpressionParamMap(inputData.personData, currentProduct, ins, options)
+                if (paramMap) {
+                  try {
+                    const exp = ins.calcResultExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'paramMap.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'paramMap.$2')
+                    errorMessage = eval(exp)
+                    console.log('计算结果约束结果: ', errorMessage)
+                  } catch (error) {
+                    console.log('计算结果约束公式: ', ins.calcResultExp)
+                    console.error(error)
+                  }
                 }
               }
-            }
-          })
-        if (errorMessage) {
-          commitProductCalcError(productUniqueKey, errorMessage)
-          return Promise.reject({
-            type: 'calcResultError',
-            message: errorMessage
-          })
+            })
+          if (errorMessage) {
+            commitProductCalcError(productUniqueKey, errorMessage)
+            return Promise.reject({
+              type: 'calcResultError',
+              message: errorMessage
+            })
+          }
         }
+      } catch (error) {
+        console.error(error)
       }
     }
 
@@ -912,7 +913,7 @@ export function cleanNeedlessResultData(resultData) {
           })
           if (Array.isArray(p.mulInsOrderList)) {
             p.mulInsOrderList.forEach(ins => {
-              const noNeedInsuranceKeys = ['isFollowing', 'isCheckbox', 'condotionList', 'customVariableExp', 'calcResultExp', 'revalidateFlag']
+              const noNeedInsuranceKeys = ['isFollowing', 'isCheckbox', 'condotionList', 'calcResultExp', 'revalidateFlag']
               noNeedInsuranceKeys.forEach(k => {
                 if (k in ins) {
                   delete ins[k]
@@ -986,14 +987,15 @@ export function setupUnderwriteRuleToInsuranceList(list) {
     return getUnderwriteEffectiveRules(insuranceIds).then(data => {
       if (Array.isArray(data)) {
         data.forEach(rule => {
-          const { insruanceId, eleRules } = rule
+          const { insruanceId, customVariableExp, eleRules } = rule
           const insurance = list.find(ins => ins.key === insruanceId)
           if (insurance) {
-            const insExpKeys = ['customVariableExp', 'calcResultExp', 'revalidateFlag']
+            const customVariableExpStr = customVariableExp ? `;${customVariableExp};` : ''
+            const insExpKeys = ['calcResultExp', 'revalidateFlag']
             insExpKeys
               .filter(k => k in rule)
               .forEach(key => {
-                insurance[key] = rule[key]
+                insurance[key] = rule[key] && key === 'calcResultExp' ? customVariableExpStr + rule[key] : rule[key]
               })
             const eleOrderList = insurance.eleOrderList || []
             if (eleOrderList && Array.isArray(eleRules)) {
@@ -1004,7 +1006,7 @@ export function setupUnderwriteRuleToInsuranceList(list) {
                   eleExpkeys
                     .filter(k => k in eleRule)
                     .forEach(key => {
-                      ele[key] = eleRule[key]
+                      ele[key] = eleRule[key] ? customVariableExpStr + eleRule[key] : eleRule[key]
                     })
                 }
               })