bxs-tools-ui 3.2.0-0 → 3.2.0-1

package/es/adjust-baoe/index.js

@@ -9106,7 +9106,7 @@ function convertProductData(prodData) {
     if (insuranceData.title && !insuranceData.groupKey) {
       if (insuranceData.isGroup) {
         //组合险，则遍历其所选中的险种，并转换数据
-        var insuranceId = insuranceData.insuranceId.constructor == Array ? insuranceData.insuranceId : [insuranceData.insuranceId];
+        var insuranceId = Array.isArray(insuranceData.insuranceId) ? insuranceData.insuranceId : [insuranceData.insuranceId];
         insuranceId.forEach(function (insId) {
           var checkedIns = prodData.mulInsOrderList.find(function (p) {
             return p.key === insId;

package/es/index.js

@@ -8927,7 +8927,9 @@ function getExpressionParamMap(personData, product, ins, options) {
     // 通用信息
     customVariable: null,
     // 自定义变量
-    cv: null // 简写，自定义变量
+    cv: null,
+    // 简写，自定义变量
+    t: {} // 事件目标
   };
   if (personData) {
     var insuredInfo = (personData.personOrderList || []).find(function (p) {
@@ -8975,8 +8977,13 @@ function getExpressionParamMap(personData, product, ins, options) {
       });
     }
   }
-  if (options && options.planbookId) {
-    map.planbookId = options.planbookId;
+  if (options) {
+    if (options.planbookId) {
+      map.planbookId = options.planbookId;
+    }
+    if (options.eventTarget) {
+      map.t = options.eventTarget;
+    }
   }
   if (ins && ins.customVariableExp) {
     var exp = ins.customVariableExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'map.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'map.$2');
@@ -9007,7 +9014,7 @@ function executeElementRule(personData, product, ins, ele) {
     }
     if (['cmCommonSelect', 'cmCommonRadioBtn', 'cmCommonRadio', 'cmCommonCheckbox'].includes(ele.componentName)) {
       if (ele.defaultValueExp) {
-        if (ele.value !== 0 && !ele.value) {
+        if (ele.value !== 0 && !ele.value && paramMap.t.elementKey !== ele.key) {
           var _exp = ele.defaultValueExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'paramMap.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'paramMap.$2');
           newEleMap.value = eval(_exp);
           consoleLogWhenEnable("".concat(ele.key, ": defaultValueExp"), _exp, newEleMap.value);
@@ -9039,7 +9046,7 @@ function executeElementRule(personData, product, ins, ele) {
     }
     if (['cmCommonInput'].includes(ele.componentName)) {
       if (ele.defaultValueExp) {
-        if (!ele.value) {
+        if (ele.value !== 0 && !ele.value && paramMap.t.elementKey !== ele.key) {
           var _exp3 = ele.defaultValueExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'paramMap.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'paramMap.$2');
           newEleMap.value = eval(_exp3);
           consoleLogWhenEnable("".concat(ele.key, ": defaultValueExp"), _exp3, newEleMap.value);
@@ -9979,7 +9986,7 @@ function productDataHandler(_x, _x2, _x3, _x4) {
  */
 function _productDataHandler() {
   _productDataHandler = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(prodData, prodVerifyData, personData, parmas) {
-    var productVerifyData, hasProduct, hasVerifyData, hasPersonData, personOrderList, _prodData$mulInsOrder3;
+    var productVerifyData, _parmas$eventTarget, insuranceKey, elementKey, groupInsurance, groupInsuranceIdEle, subInsurances, hasProduct, hasVerifyData, hasPersonData, personOrderList, _prodData$mulInsOrder3;
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -10006,6 +10013,29 @@ function _productDataHandler() {
         case 3:
           productVerifyData = prodVerifyData;
         case 4:
+          // 组合险种特殊处理：当用户点击组合险种的子险种选项时，将其他子险种的标题设置为未选中状态
+          if (parmas && parmas.eventTarget) {
+            _parmas$eventTarget = parmas.eventTarget, insuranceKey = _parmas$eventTarget.insuranceKey, elementKey = _parmas$eventTarget.elementKey;
+            if (insuranceKey && elementKey === 'insuranceId') {
+              groupInsurance = (prodData.mulInsOrderList || []).find(function (ins) {
+                return ins.key === insuranceKey;
+              });
+              groupInsuranceIdEle = ((groupInsurance === null || groupInsurance === void 0 ? void 0 : groupInsurance.eleOrderList) || []).find(function (e) {
+                return e.key === 'insuranceId';
+              });
+              subInsurances = (prodData.mulInsOrderList || []).filter(function (ins) {
+                return ins.groupKey === insuranceKey;
+              });
+              subInsurances.forEach(function (ins) {
+                var titleEle = (ins.eleOrderList || []).find(function (e) {
+                  return e.key === 'title';
+                });
+                if (titleEle && groupInsuranceIdEle && !Array.isArray(titleEle.value)) {
+                  titleEle.value = groupInsuranceIdEle.value === ins.key;
+                }
+              });
+            }
+          }
           hasProduct = prodData.mulInsOrderList;
           hasVerifyData = productVerifyData && Object.keys(productVerifyData).length;
           hasPersonData = personData && personData.personOrderList;
@@ -10473,40 +10503,21 @@ function setCommonInfo(prodData) {
  * @returns {IPbProduct} 产品数据（单个）
  */
 function setGroupInsurance(prodData) {
-  if (!prodData.mulInsOrderList) {
-    return prodData;
-  }
-  var groupInsuranceList = prodData && prodData.mulInsOrderList && prodData.mulInsOrderList.filter(function (ins) {
-    return !!ins.groupKey;
-  });
-  if (!groupInsuranceList || !groupInsuranceList.length) {
-    return prodData;
-  }
-  var oldGroupInsList = prodData.mulInsOrderList.filter(function (ins) {
-    return ins.isGroup;
-  });
-  var newGroupInsMap = {};
-  //清空险种列表中的已有的险种组合
-  prodData.mulInsOrderList = prodData.mulInsOrderList.filter(function (ins) {
+  var mulInsOrderList = prodData && prodData.mulInsOrderList ? prodData.mulInsOrderList : [];
+  // 清空险种列表中的已有的险种组合
+  prodData.mulInsOrderList = mulInsOrderList.filter(function (ins) {
     return !ins.isGroup;
   });
-  groupInsuranceList.forEach(function (ins) {
-    //多险种选一，或多险种选多。生成一个组合，如多个险种合成豁免险
-    // ins.isCheckbox = true
-    var oldGroupIns = oldGroupInsList.find(function (gIns) {
-      return gIns.key === ins.groupKey;
-    });
-    var oldTitleEle = {};
-    var oldInsuranceIdEle = {};
-    if (oldGroupIns && oldGroupIns.eleOrderList) {
-      oldTitleEle = oldGroupIns.eleOrderList.find(function (e) {
-        return e.key === 'title';
-      });
-      oldInsuranceIdEle = oldGroupIns.eleOrderList.find(function (e) {
-        return e.key === 'insuranceId';
-      });
-    }
-    if (ins.groupKey) {
+
+  // 多险种选一，或多险种选多。生成一个组合，如多个险种合成豁免险
+  var groupInsuranceList = mulInsOrderList.filter(function (ins) {
+    return !!ins.groupKey;
+  });
+  if (groupInsuranceList.length) {
+    var newGroupInsMap = {};
+    groupInsuranceList.filter(function (ins) {
+      return ins.groupKey;
+    }).forEach(function (ins) {
       newGroupInsMap[ins.groupKey] = newGroupInsMap[ins.groupKey] || {
         key: ins.groupKey,
         name: ins.groupName,
@@ -10514,19 +10525,19 @@ function setGroupInsurance(prodData) {
         isGroup: true,
         eleOrderList: [{
           key: 'title',
-          value: oldTitleEle && oldTitleEle.value || false,
+          value: false,
           isDisabled: false,
           componentName: 'cmCommonTitle',
           labelName: ins.groupName
         }, {
           key: 'insuranceId',
-          value: oldInsuranceIdEle && oldInsuranceIdEle.value || (ins.isCheckbox ? [] : ''),
+          value: ins.isCheckbox ? [] : null,
           componentName: ins.isCheckbox ? 'cmCommonCheckbox' : 'cmCommonRadio',
           opts: []
         }]
       };
 
-      // 当险种转换成险种组合的选项
+      // 将子险种转换成险种组合的选项
       var titleEle = ins.eleOrderList.find(function (e) {
         return e.key === 'title';
       });
@@ -10539,119 +10550,73 @@ function setGroupInsurance(prodData) {
         desc: titleEle.labelName,
         isDisabled: titleEle.isDisabled
       });
-    }
-  });
-
-  // 处理组合险中的逻辑，并加入到产品险种列表中
-  var _loop = function _loop(k) {
-    var nGroupTitle = newGroupInsMap[k].eleOrderList.find(function (e) {
-      return e.key === 'title';
     });
-    var nGroupInsuranceId = newGroupInsMap[k].eleOrderList.find(function (e) {
-      return e.key === 'insuranceId';
-    });
-    if (nGroupTitle && nGroupInsuranceId) {
-      if (nGroupInsuranceId.opts && nGroupInsuranceId.opts.length) {
-        // 所有险种都不可选，则组合险不可修改且不选中。否则，组合险种可选
-        if (nGroupInsuranceId.opts.every(function (opt) {
-          return !!opt.isDisabled;
-        })) {
-          nGroupTitle.value = false;
-          nGroupTitle.isDisabled = true;
-        } else {
-          nGroupTitle.isDisabled = false;
-        }
-      }
-      var groupInsList = prodData.mulInsOrderList.filter(function (ins) {
+
+    // 处理组合险中的逻辑，并加入到产品险种列表中
+    var _loop = function _loop(k) {
+      var nGroupTitleEle = newGroupInsMap[k].eleOrderList.find(function (e) {
+        return e.key === 'title';
+      });
+      var nGroupInsuranceIdEle = newGroupInsMap[k].eleOrderList.find(function (e) {
+        return e.key === 'insuranceId';
+      });
+      var groupInsList = mulInsOrderList.filter(function (ins) {
         return ins.groupKey == k;
       });
-      if (groupInsList && groupInsList.length) {
-        // 如果组合险中有一款是必选的，则整个组合险为选中状态
-        if (groupInsList.some(function (ins) {
-          var subTitle = ins.eleOrderList.find(function (e) {
-            return e.key === 'title';
-          });
-          return ins.required && subTitle && !subTitle.isDisabled;
-        })) {
-          nGroupTitle.value = true;
-          nGroupTitle.isDisabled = true;
-        }
-
-        // 初始化时，设置组合险默认值
+      if (nGroupTitleEle && nGroupInsuranceIdEle && groupInsList.length) {
         var notDisabledInsurances = groupInsList.filter(function (ins) {
-          var subTitle = ins.eleOrderList.find(function (e) {
+          var titleEle = (ins.eleOrderList || []).find(function (e) {
             return e.key === 'title';
           });
-          return subTitle && !subTitle.isDisabled;
+          return titleEle && !titleEle.isDisabled;
         });
-        var checkedInsurances = notDisabledInsurances.find(function (ins) {
-          var subTitle = ins.eleOrderList.find(function (e) {
-            return e.key === 'title';
+        var checkedInsurances = notDisabledInsurances.filter(function (ins) {
+          var titleEle = (ins.eleOrderList || []).find(function (ele) {
+            return ele.key === 'title';
           });
-          return subTitle && subTitle.value;
+          return titleEle && titleEle.value;
         });
-        if (!nGroupInsuranceId.value) {
-          if (checkedInsurances) {
-            nGroupInsuranceId.value = checkedInsurances.key;
-            nGroupTitle.value = true;
-          } else if (nGroupTitle.value) {
-            if (notDisabledInsurances[0]) {
-              nGroupInsuranceId.value = notDisabledInsurances[0].key;
-            }
-          }
-        }
-      }
-    }
-    if (nGroupInsuranceId) {
-      if (nGroupInsuranceId.value) {
-        if (nGroupInsuranceId.value.constructor === Array) {
-          if (nGroupInsuranceId.opts) {
-            nGroupInsuranceId.opts = nGroupInsuranceId.opts.filter(function (opt) {
-              return nGroupInsuranceId.value.indexOf(opt.val) !== -1 && !opt.isDisabled;
-            });
-          }
-        } else {
-          var opt = nGroupInsuranceId.opts.find(function (o) {
-            return o.val === nGroupInsuranceId.value;
-          });
-          if (opt && opt.isDisabled) {
-            nGroupInsuranceId.value = '';
-          }
-        }
-      }
-      if (nGroupInsuranceId.value) {
-        var checkedIns = prodData.mulInsOrderList.find(function (ins) {
-          return ins.key === nGroupInsuranceId.value;
+        var hasRequiredIns = notDisabledInsurances.some(function (ins) {
+          return ins.required;
+        });
+        var checkedInsurance = checkedInsurances[0];
+        // hasRequiredIns：如果组合险中有一款是必选的，则整个组合险为选中状态
+        // 所有险种都不可选，则组合险不可修改且不选中。否则，组合险种可选
+        nGroupTitleEle.value = hasRequiredIns || (nGroupInsuranceIdEle.opts || []).some(function (opt) {
+          return !opt.isDisabled;
         });
-        if (checkedIns) {
-          //将当前选中险种的部分数据复制到组合险中
-          for (var ck in checkedIns) {
-            if (!['code', 'groupKey', 'groupName', 'isFollowing', 'key', 'name', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData'].includes(ck)) {
-              // 定义组件险中的元素：自身eleOrderList + 所选险种的eleOrderList（不包含标题）
+        nGroupTitleEle.isDisabled = hasRequiredIns || (nGroupInsuranceIdEle.opts || []).every(function (opt) {
+          return !!opt.isDisabled;
+        });
+        nGroupInsuranceIdEle.value = checkedInsurance ? checkedInsurance.key : null;
+
+        //将当前选中险种的部分数据复制到组合险中
+        if (checkedInsurance) {
+          // 定义组件险中的元素：自身eleOrderList + 所选险种的eleOrderList（不包含标题）
+          var keys = ['code', 'groupKey', 'groupName', 'isFollowing', 'key', 'name', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData'];
+          for (var ck in checkedInsurance) {
+            if (!keys.includes(ck)) {
               if (ck === 'eleOrderList') {
-                newGroupInsMap[k][ck] = newGroupInsMap[k][ck].concat(checkedIns[ck].filter(function (ele) {
+                newGroupInsMap[k][ck] = newGroupInsMap[k][ck].concat(checkedInsurance[ck].filter(function (ele) {
                   return ele.key !== 'title';
                 }));
               } else {
-                newGroupInsMap[k][ck] = checkedIns[ck];
+                newGroupInsMap[k][ck] = checkedInsurance[ck];
               }
             }
           }
         }
       }
-    }
-    var index = -1;
-    prodData.mulInsOrderList.forEach(function (ins, i) {
-      if (ins.groupKey === k) {
-        index = i;
+      var index = mulInsOrderList.findLastIndex(function (ins) {
+        return ins.groupKey === k;
+      });
+      if (index >= 0) {
+        prodData.mulInsOrderList.splice(index + 1, 0, newGroupInsMap[k]);
       }
-    });
-    if (index >= 0) {
-      prodData.mulInsOrderList.splice(index + 1, 0, newGroupInsMap[k]);
+    };
+    for (var k in newGroupInsMap) {
+      _loop(k);
     }
-  };
-  for (var k in newGroupInsMap) {
-    _loop(k);
   }
   return prodData;
 }
@@ -10926,7 +10891,7 @@ function convertProductData(prodData) {
     if (insuranceData.title && !insuranceData.groupKey) {
       if (insuranceData.isGroup) {
         //组合险，则遍历其所选中的险种，并转换数据
-        var insuranceId = insuranceData.insuranceId.constructor == Array ? insuranceData.insuranceId : [insuranceData.insuranceId];
+        var insuranceId = Array.isArray(insuranceData.insuranceId) ? insuranceData.insuranceId : [insuranceData.insuranceId];
         insuranceId.forEach(function (insId) {
           var checkedIns = prodData.mulInsOrderList.find(function (p) {
             return p.key === insId;
@@ -46318,6 +46283,7 @@ var BxtPersonInfo = (_dec$1 = Component({
           params,
           allPersonsData,
           productGroupList,
+          eventTarget,
           promises,
           _args = arguments;
         return _regeneratorRuntime.wrap(function (_context) {
@@ -46333,6 +46299,10 @@ var BxtPersonInfo = (_dec$1 = Component({
             case 1:
               allPersonsData = inputData.personData;
               productGroupList = inputData.productGroupList || [];
+              eventTarget = {
+                personKey: personData.key,
+                elementKey: ele.key
+              };
               if (!allPersonsData) {
                 _context.next = 2;
                 break;
@@ -46350,7 +46320,8 @@ var BxtPersonInfo = (_dec$1 = Component({
                 g.prodOrderList.map(function (p) {
                   clearAddAndTakeAndAdjustBaoeData(p);
                   promises.push(productDataHandler(p, get$3(verifyData, "[".concat(p.key, "]")), allPersonsData, {
-                    planbookId: get$3(params, 'planbookId')
+                    planbookId: get$3(params, 'planbookId'),
+                    eventTarget: eventTarget
                   }));
                 });
               });
@@ -46756,7 +46727,7 @@ function createdProductDataToCalc(inputData) {
       productForm.mulInsOrderList = productForm.mulInsOrderList.map(function (ins) {
         var tempIns = {};
         for (var _k2 in ins) {
-          if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName'].includes(_k2)) {
+          if (!['isFollowing', 'pPeriodDesc', 'baoeDesc', 'baofDesc', 'iDurationDesc', 'accountData', 'reduceBaofData', 'duplicateReduceBaofData', 'isCheckbox', 'groupKey', 'groupName', 'customVariableExp', 'calcResultExp', 'revalidateFlag'].includes(_k2)) {
             tempIns[_k2] = ins[_k2];
           }
         }
@@ -47018,7 +46989,7 @@ var BxtProductInfo = (_dec = Component({
     value: function () {
       var _changeProduct = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(productData, options) {
         var _this5 = this;
-        var $listeners, inputData, verifyData, personData, groupKey, productKey, params, type, insData, eleData, planbookId, publicPbUuid, productVerifyData, errorMsg, hasRevalidateFlag;
+        var $listeners, inputData, verifyData, personData, groupKey, productKey, params, type, insData, eleData, planbookId, publicPbUuid, productVerifyData, eventTarget, errorMsg, hasRevalidateFlag;
         return _regeneratorRuntime.wrap(function (_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -47027,12 +46998,18 @@ var BxtProductInfo = (_dec = Component({
               planbookId = get$3(params, 'planbookId');
               publicPbUuid = get$3(params, 'publicPbUuid');
               productVerifyData = get$3(verifyData, "[".concat(productKey, "]"));
+              eventTarget = {
+                insuranceKey: get$3(insData, 'key') || null,
+                insuranceCode: get$3(insData, 'code') || null,
+                elementKey: get$3(eleData, 'key') || null
+              };
               if (type === 'change') {
                 clearAddAndTakeAndAdjustBaoeData(productData);
               }
               _context3.next = 1;
               return productDataHandler(productData, productVerifyData, personData, {
-                planbookId: planbookId
+                planbookId: planbookId,
+                eventTarget: eventTarget
               });
             case 1:
               if (type === 'change') {
@@ -47064,7 +47041,8 @@ var BxtProductInfo = (_dec = Component({
                   publicPbUuid: publicPbUuid,
                   groupKey: groupKey,
                   productKey: productKey,
-                  isIgnoreError: true
+                  isIgnoreError: true,
+                  eventTarget: eventTarget
                 }, resolve, reject);
               }).catch(function (err) {
                 errorMsg = get$3(err, '[0].message') || get$3(err, 'message');
@@ -47072,7 +47050,8 @@ var BxtProductInfo = (_dec = Component({
             case 2:
               _context3.next = 3;
               return productDataHandler(productData, productVerifyData, personData, {
-                planbookId: planbookId
+                planbookId: planbookId,
+                eventTarget: eventTarget
               });
             case 3:
               return _context3.abrupt("return", errorMsg);
@@ -47641,6 +47620,12 @@ var __vue_render__$1 = function __vue_render__() {
               insData: ins,
               eleData: ele
             });
+          },
+          "clear": function clear($event) {
+            return _vm.onChange({
+              insData: ins,
+              eleData: ele
+            });
           }
         },
         scopedSlots: _vm._u([!ele.isDisabled ? {
@@ -48325,7 +48310,7 @@ if (typeof window !== 'undefined' && window.Vue) {
   install(window.Vue);
 }
 const index = {
-  version: '3.2.0-0',
+  version: '3.2.0-1',
   install: install
 };