bxs-tools-ui 3.2.0-2 → 3.2.0-3

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

@@ -78,7 +78,7 @@ export async function productDataHandler(prodData : IPbProduct, prodVerifyData :
       const subInsurances = (prodData.mulInsOrderList || []).filter(ins => ins.groupKey === insuranceKey)
       subInsurances.forEach(ins => {
         const titleEle = (ins.eleOrderList || []).find(e => e.key === 'title')
-        if (titleEle && groupInsuranceIdEle && !Array.isArray(titleEle.value)) {
+        if (titleEle && groupInsuranceIdEle && !Array.isArray(groupInsuranceIdEle.value)) {
           titleEle.value = groupInsuranceIdEle.value === ins.key
         }
       })
@@ -543,6 +543,9 @@ export function setGroupInsurance(prodData : IPbProduct) : IPbProduct {
   
     // 处理组合险中的逻辑，并加入到产品险种列表中
     for (let k in newGroupInsMap) {
+      const oldGroupInsurance = mulInsOrderList.find(ins => ins.key === k)
+      const oldGroupTitleElement = oldGroupInsurance ? oldGroupInsurance.eleOrderList?.find(e => e.key === 'title') : null
+      const oldGroupTitleValue = oldGroupTitleElement ? oldGroupTitleElement.value : null
       const nGroupTitleEle = newGroupInsMap[k].eleOrderList.find(e => e.key === 'title');
       const nGroupInsuranceIdEle = newGroupInsMap[k].eleOrderList.find(e => e.key === 'insuranceId');
       const groupInsList = mulInsOrderList.filter((ins : IProdInsurance) => ins.groupKey == k);
@@ -559,7 +562,10 @@ export function setGroupInsurance(prodData : IPbProduct) : IPbProduct {
         const checkedInsurance = checkedInsurances[0]
         // hasRequiredIns：如果组合险中有一款是必选的，则整个组合险为选中状态
         // 所有险种都不可选，则组合险不可修改且不选中。否则，组合险种可选
-        nGroupTitleEle.value = hasRequiredIns || (nGroupInsuranceIdEle.opts || []).some(opt => !opt.isDisabled)
+        nGroupTitleEle.value = oldGroupTitleValue === false ? oldGroupTitleValue : (nGroupInsuranceIdEle.opts || []).some(opt => !opt.isDisabled)
+        if (hasRequiredIns) {
+          nGroupTitleEle.value = hasRequiredIns
+        }
         nGroupTitleEle.isDisabled = hasRequiredIns || (nGroupInsuranceIdEle.opts || []).every(opt => !!opt.isDisabled)
         nGroupInsuranceIdEle.value = checkedInsurance ? checkedInsurance.key : null
   

package/packages/index.ts

@@ -50,6 +50,6 @@ export {
 }
 
 export default {
-  version: '3.2.0-2',
+  version: '3.2.0-3',
   install
 }

package/packages/product-info/index.vue

@@ -306,12 +306,6 @@ export default class BxtProductInfo extends Vue {
     if (!['title'].includes(eleData.key)) {
       this.requiestRecommendValues();
     }
-    setTimeout(() => {
-      const refInsuranceForm: any = _get(this.$refs, `insuranceForm${insData.key}[0]`);
-      if (refInsuranceForm) {
-        refInsuranceForm.validate(eleData.key);
-      }
-    }, 300);
     this.$nextTick(async () => {
       const errorMsg = await this.changeProduct(this.productData, options);
       this.$emit(
@@ -363,31 +357,35 @@ export default class BxtProductInfo extends Vue {
       eleData
     });
     if (!errorMsg) {
-      const hasRevalidateFlag = (_get(productData, 'mulInsOrderList') || []).some(ins => ins.revalidateFlag);
-      if (hasRevalidateFlag && $listeners.reCalculate) {
-        await new Promise<any>((resolve, reject) => {
-          this.$emit(
-            'reCalculate',
-            inputData,
-            {
+      await this.validate()
+        .then(async () => {
+          const hasRevalidateFlag = (_get(productData, 'mulInsOrderList') || []).some(ins => ins.revalidateFlag);
+          if (hasRevalidateFlag && $listeners.reCalculate) {
+            await new Promise<any>((resolve, reject) => {
+              this.$emit(
+                'reCalculate',
+                inputData,
+                {
+                  planbookId,
+                  publicPbUuid,
+                  groupKey,
+                  productKey,
+                  isIgnoreError: true,
+                  eventTarget
+                },
+                resolve,
+                reject
+              );
+            }).catch(err => {
+              errorMsg = _get(err, '[0].message') || _get(err, 'message');
+            });
+            await productDataHandler(productData, productVerifyData, personData, {
               planbookId,
-              publicPbUuid,
-              groupKey,
-              productKey,
-              isIgnoreError: true,
               eventTarget
-            },
-            resolve,
-            reject
-          );
-        }).catch(err => {
-          errorMsg = _get(err, '[0].message') || _get(err, 'message');
-        });
-        await productDataHandler(productData, productVerifyData, personData, {
-          planbookId,
-          eventTarget
-        });
-      }
+            });
+          }
+        })
+        .catch(() => {});
     }
     return errorMsg;
   }