bxs-tools-ui 3.1.2 → 3.2.0-0

package/packages/planbook-input/components/product-table.vue

@@ -129,7 +129,8 @@
           allowCustomResult: true,
           planbookId: params.planbookId
         }"
-        @change="cgProduct"
+        @reCalculate="reCalculateProductData"
+        @change="(product, options, inst) => $emit('change', product, options, inst)"
       />
     </CommonPopup>
     <CommonPopup
@@ -197,6 +198,7 @@ import { Component, Prop, Watch } from 'vue-property-decorator';
 import { get as _get, cloneDeep } from 'lodash';
 import { initAddAndTakePopupConfig } from 'packages/add-and-take/handler.ts';
 import { ADD_AND_TAKE_TITLE_MAP } from 'packages/add-and-take/constant.ts';
+import { calculateProductData } from '../helper.js';
 import { convertInputDataToResultData } from './handler';
 
 import CommonPopup from '@src/components/common/common-popup.vue';
@@ -285,7 +287,11 @@ export default class BxtProductTable extends Vue {
   isCkConfirm = false;
   backupProductData: any = null;
   addAndTakeTitleMap = ADD_AND_TAKE_TITLE_MAP;
-
+  reCalculateProductData(inputData, params, resolve, reject) {
+    return calculateProductData(inputData, params)
+      .then(resolve)
+      .catch(reject);
+  }
   isShowDeleteBtn() {
     let index = this.groupData && this.groupData.prodOrderList && this.groupData.prodOrderList.findIndex(p => p.key === this.params.productKey);
     return this.productData.hadChoice && !this.productData.required && index >= this.groupData.defNum;
@@ -298,13 +304,6 @@ export default class BxtProductTable extends Vue {
       }
     }
   }
-  cgProduct(product, options, inst) {
-    if (options.type === 'change' && options.errorMsg) {
-      this.$nextTick(() => {
-        this.$toast(options.errorMsg);
-      });
-    }
-  }
   deleteProduct() {
     this.productData.hadChoice = false;
     this.productData.totalBaof = null;

package/packages/planbook-input/helper.js

@@ -1,5 +1,6 @@
 import { Toast } from 'vant';
 import QS from 'qs';
+import { get as _get, cloneDeep } from 'lodash';
 import { PLANBOOK_API_HOSTNAME } from '@src/js/variables.js';
 import {
   initPersonData,
@@ -10,7 +11,7 @@ import {
   convertProductData,
   verifyProductRules,
   convertEleOrderListToObj,
-  deepCopy
+  getExpressionParamMap
 } from 'packages/bxs-utils/index';
 import { createMd5Token } from '@src/js/md5Token.js';
 
@@ -37,6 +38,7 @@ export async function initPageData(data) {
   }
   return data;
 }
+
 export function setPageDataBaseOnResult(data) {
   if (!data) {
     return data;
@@ -269,7 +271,6 @@ export function receiveProductData(inputData, rProductData, options = {}) {
   const hasSomeCheckedIns = rProductData.mulInsOrderList.some(ins => ins.title);
   productData.hadChoice = hasSomeCheckedIns;
   productData.totalBaof = hasSomeCheckedIns ? rProductData.totalBaof : null;
-  // ??
   productData.companyName = rProductData.companyName;
 
   let insShowArr = null;
@@ -406,7 +407,7 @@ export function getProductFromInputData(inputData, options = {}) {
 }
 
 export function initRecipientData(personData) {
-  let eleOrderList = deepCopy(personData.eleOrderList);
+  let eleOrderList = cloneDeep(personData.eleOrderList);
   eleOrderList = eleOrderList.filter(ele => !['name', 'sex'].includes(ele.key));
   eleOrderList.forEach(ele => {
     if (ele.key === 'title') {
@@ -478,12 +479,12 @@ export async function calculateProductData(inputData, options = {}) {
     })
       .then(response => response.json())
       .then(res => {
-        const { success, data } = res;
+        const { success, code, info, data } = res;
         if (success && data) {
-          const promises = [];
+          const productList = [];
           data.productGroupList.forEach(g => {
             g.prodOrderList.forEach(p => {
-              promises.push(
+              productList.push(
                 receiveProductData(inputData, p, {
                   publicPbUuid,
                   groupKey,
@@ -492,13 +493,135 @@ export async function calculateProductData(inputData, options = {}) {
               );
             });
           });
-          return Promise.all(promises);
+
+          // 计算结果校验
+          if (Array.isArray(inputData.productGroupList)) {
+            let errorMessage = '';
+            const allProductList = inputData.productGroupList.map(g => g.prodOrderList).flat();
+            const productData = allProductList.find(p => p && p.key === productKey);
+            const mulInsOrderList = _get(productData, 'mulInsOrderList') || [];
+            const hasCalcResultExp = mulInsOrderList.some(ins => ins.calcResultExp);
+            if (hasCalcResultExp) {
+              mulInsOrderList
+                .filter(ins => ins.calcResultExp)
+                .forEach(ins => {
+                  if (!errorMessage) {
+                    const paramMap = getExpressionParamMap(inputData.personData, productData, ins, options);
+                    if (paramMap) {
+                      const exp = ins.calcResultExp.replace(/(%)(\d+)(\.*\w*)(%)/g, 'paramMap.i$2$3').replace(/(%)(\w*\.*\w*)(%)/g, 'paramMap.$2');
+                      errorMessage = eval(exp);
+                      console.log('计算结果校验公式: ', ins.calcResultExp);
+                      console.log('计算结果校验结果: ', errorMessage);
+                    }
+                  }
+                });
+            }
+            if (errorMessage) {
+              return Promise.reject(new Error(errorMessage));
+            }
+          }
+
+          return Promise.resolve(productList);
         }
-        return Promise.reject();
-      })
-      .catch(error => {
-        console.log(error);
+        return Promise.reject(new Error(info || `计算失败：${code || ''}`));
       });
   }
   return Promise.reject();
 }
+
+export async function doubleCalcProductData(inputData, verifyData, options = {}) {
+  const { planbookId, publicPbUuid, groupKey, productKey, isIgnoreError } = options;
+  const personData = inputData && inputData.personData;
+  const productGroupList = inputData && inputData.productGroupList ? inputData.productGroupList : [];
+  const productGroup = productGroupList.find(g => g.key === groupKey);
+  const prodOrderList = productGroup && productGroup.prodOrderList ? productGroup.prodOrderList : [];
+  const productData = prodOrderList.find(p => p.key === productKey);
+  const mulInsOrderList = productData && productData.mulInsOrderList ? productData.mulInsOrderList : [];
+  const productVerifyData = verifyData && verifyData[productKey];
+  const hasRevalidateFlag = mulInsOrderList.some(ins => ins.revalidateFlag);
+  if (productData) {
+    await productDataHandler(productData, productVerifyData, personData, {
+      planbookId
+    });
+    await calculateProductData(inputData, {
+      planbookId,
+      publicPbUuid,
+      groupKey,
+      productKey,
+      isIgnoreError
+    });
+    if (hasRevalidateFlag) {
+      await productDataHandler(productData, productVerifyData, personData, {
+        planbookId
+      });
+      await calculateProductData(inputData, {
+        planbookId,
+        publicPbUuid,
+        groupKey,
+        productKey,
+        isIgnoreError
+      });
+    }
+  }
+}
+
+export function setupUnderwriteRuleToInputData(data) {
+  const inputData = cloneDeep(data);
+  if (inputData) {
+    const productGroupList = _get(inputData, 'productGroupList') || [];
+    const productList = productGroupList
+      .map(g => g.prodOrderList)
+      .filter(Boolean)
+      .flat();
+    const insuranceList = productList
+      .map(p => p.mulInsOrderList)
+      .filter(Boolean)
+      .flat();
+    const insuranceIds = insuranceList
+      .map(ins => ins.key)
+      .filter(k => !['common'].includes(k))
+      .filter(Boolean);
+
+    return fetch(`${PLANBOOK_API_HOSTNAME}/planBook/interest/underwrite/effective-rules`, {
+      method: 'POST',
+      credentials: 'include',
+      headers: {
+        Accept: 'application/json, text/plain, */*',
+        'Content-Type': 'application/json;'
+      },
+      body: JSON.stringify(insuranceIds)
+    })
+      .then(response => response.json())
+      .then(({ success, data }) => {
+        if (success && Array.isArray(data)) {
+          insuranceList.forEach(ins => {
+            const ruleData = data.find(rule => rule.insruanceId === ins.key);
+            if (ruleData) {
+              const insExpKeys = ['customVariableExp', 'calcResultExp', 'revalidateFlag'];
+              insExpKeys
+                .filter(k => k in ruleData)
+                .forEach(key => {
+                  ins[key] = ruleData[key];
+                });
+              if (Array.isArray(ins.eleOrderList) && Array.isArray(ruleData.eleRules)) {
+                ins.eleOrderList.forEach(ele => {
+                  const eleRule = ruleData.eleRules.find(rule => rule.elementKey === ele.key);
+                  const eleExpkeys = ['defaultValueExp', 'maxExp', 'minExp', 'multiExp', 'underwriteExp'];
+                  if (eleRule) {
+                    eleExpkeys
+                      .filter(k => k in eleRule)
+                      .forEach(key => {
+                        ele[key] = eleRule[key];
+                      });
+                  }
+                });
+              }
+            }
+          });
+          return inputData;
+        }
+      });
+  }
+
+  return inputData;
+}

package/packages/planbook-input/index.vue

@@ -34,6 +34,7 @@
               productKey: p.key,
               interestProductList: planbookData && planbookData.interestProductList
             }"
+            @change="changeProduct"
             @confirm="confirmProduct"
             @changePerson="changePersonInfo"
           />
@@ -52,7 +53,14 @@ import { get as _get } from 'lodash';
 import { PLANBOOK_API_HOSTNAME, PBF_HOSTNAME } from '@src/js/variables.js';
 import { calcTotalBaof } from 'packages/bxs-utils/index';
 import { getPlanbookData } from './api';
-import { initPageData, setPageDataBaseOnResult, calculateProductData, createPlanbookDataToMake } from './helper.js';
+import {
+  initPageData,
+  setPageDataBaseOnResult,
+  calculateProductData,
+  doubleCalcProductData,
+  createPlanbookDataToMake,
+  setupUnderwriteRuleToInputData
+} from './helper.js';
 import { createMd5Token } from '@src/js/md5Token.js';
 import PersonInfo from '../person-info/index.vue';
 import ProductTable from './components/product-table.vue';
@@ -74,6 +82,9 @@ export default class BxtPlanbookInput extends Vue {
   get inputData(): IPbInput | null {
     return _get(this, 'planbookData.initData.inputData');
   }
+  get verifyData(): IPbInput | null {
+    return _get(this, 'planbookData.verifyData');
+  }
   async created() {
     this.getPlanbookData();
   }
@@ -91,6 +102,10 @@ export default class BxtPlanbookInput extends Vue {
       // publicPbUuid: '5d6499946bbb47bb8f6a286e9d4eee77'
     })
       .then(async (data: any) => {
+        if (data.initData && data.initData.inputData) {
+          const _inputData = await setupUnderwriteRuleToInputData(data.initData.inputData).catch(() => null);
+          data.initData.inputData = _inputData || data.initData.inputData;
+        }
         await initPageData(data);
         setPageDataBaseOnResult(data);
         document.title = `DEMO：${data.title}`;
@@ -103,26 +118,31 @@ export default class BxtPlanbookInput extends Vue {
       });
   }
   autoImportData() {
-    const { URL_PARAM, inputData } = this;
+    const { URL_PARAM, verifyData, inputData } = this;
     const { planbookId, publicPbUuid } = URL_PARAM;
     if (inputData) {
       inputData.productGroupList
         .filter((g: IPbProductGroup) => g.prodOrderList)
         .forEach((g: IPbProductGroup) => {
           g.prodOrderList.forEach((p: IPbProduct) => {
-            calculateProductData(inputData, {
-              planbookId,
+            doubleCalcProductData(inputData, verifyData, {
+              planbookId: Number(planbookId),
               publicPbUuid,
               groupKey: g.key,
               productKey: p.key,
               isIgnoreError: true
+            }).catch(err => {
+              if (err && err.message) {
+                Toast(err.message);
+              }
+              console.error(err);
             });
           });
         });
     }
   }
   changePersonInfo(person: IPbPerson, ele: any = {}) {
-    const { URL_PARAM, inputData } = this;
+    const { URL_PARAM, verifyData, inputData } = this;
     const { planbookId, publicPbUuid } = URL_PARAM;
     if (inputData) {
       inputData.productGroupList
@@ -131,17 +151,24 @@ export default class BxtPlanbookInput extends Vue {
           g.prodOrderList
             .filter((p: IPbProduct) => p.hadChoice)
             .forEach((p: IPbProduct) => {
-              calculateProductData(inputData, {
-                planbookId,
+              doubleCalcProductData(inputData, verifyData, {
+                planbookId: Number(planbookId),
                 publicPbUuid,
                 groupKey: g.key,
                 productKey: p.key,
                 isIgnoreError: true
+              }).catch(err => {
+                Toast(err.message);
               });
             });
         });
     }
   }
+  changeProduct(product, options, inst) {
+    if (options.type === 'change' && options.errorMsg) {
+      Toast(options.errorMsg);
+    }
+  }
   confirmProduct(options: any, inst: any) {
     const self = this;
     const { URL_PARAM, inputData } = self;
@@ -151,7 +178,7 @@ export default class BxtPlanbookInput extends Vue {
       .validate()
       .then(() => {
         return calculateProductData(inputData, {
-          planbookId,
+          planbookId: Number(planbookId),
           publicPbUuid,
           groupKey,
           productKey
@@ -160,7 +187,10 @@ export default class BxtPlanbookInput extends Vue {
         });
       })
       .catch(err => {
-        Toast(err && err[0] && err[0].message ? err[0].message : err);
+        const errorMessage = _get(err, '[0].message') || _get(err, 'message') || err;
+        if (typeof errorMessage === 'string' && errorMessage.trim()) {
+          Toast(errorMessage);
+        }
         console.log(err);
       });
   }

package/packages/product-info/index.vue

@@ -331,22 +331,56 @@ export default class BxtProductInfo extends Vue {
     inputDom.focus();
   }
   async changeProduct(productData, options) {
-    if (options.type === 'change') {
+    const { $listeners, inputData, verifyData, personData, groupKey, productKey, params } = this;
+    const { type, insData, eleData } = options;
+    const planbookId = _get(params, 'planbookId');
+    const publicPbUuid = _get(params, 'publicPbUuid');
+    const productVerifyData = _get(verifyData, `[${productKey}]`);
+
+    if (type === 'change') {
       clearAddAndTakeAndAdjustBaoeData(productData);
     }
-    await productDataHandler(productData, _get(this, `verifyData[${productData.key}]`), this.personData, {
-      planbookId: _get(this, 'params.planbookId')
+    await productDataHandler(productData, productVerifyData, personData, {
+      planbookId
     });
-    if (options.type === 'change') {
-      this.createInsuranceInputResultEle(options.insData, options.eleData);
+    if (type === 'change') {
+      this.createInsuranceInputResultEle(insData, eleData);
     } else {
       this.createInsuranceInputResultEle();
     }
-    return verifyProductRules({
-      personData: this.personData,
+
+    let errorMsg: any = verifyProductRules({
+      personData,
       productData,
-      ...options
+      insData,
+      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,
+            {
+              planbookId,
+              publicPbUuid,
+              groupKey,
+              productKey,
+              isIgnoreError: true
+            },
+            resolve,
+            reject
+          );
+        }).catch(err => {
+          errorMsg = _get(err, '[0].message') || _get(err, 'message');
+        });
+        await productDataHandler(productData, productVerifyData, personData, {
+          planbookId
+        });
+      }
+    }
+    return errorMsg;
   }
   isInsuranceChecked(ins) {
     let titleEle = ins.eleOrderList.find(e => e.key === 'title');

package/packages/share-sheet/index.css

@@ -122,7 +122,7 @@
 	& .bxt-share {
 		& .bxt-share-wrapper {
 			display: flex;
-			justify-content: center;
+			justify-content: flex-start;
 			padding: 20px 15px;
 			overflow: auto;
 
@@ -170,8 +170,6 @@
 		}
 
 		& .bxt-share-wrapper.more {
-			justify-content: flex-start;
-
 			& figure {
 				flex: 0 0 23%;
 			}

package/packages/share-sheet/index.vue

@@ -36,7 +36,7 @@
         </section>
         <slot name="header"></slot>
         <section v-if="shareOptions.length" class="bxt-share bxt-bottom-border">
-          <div class="bxt-share-wrapper" :class="[shareOptions.length > 4 || actionTypeLength > 1 ? 'more' : '']">
+          <div class="bxt-share-wrapper" :class="[shareOptions.length > 4 ? 'more' : '']">
             <figure v-for="o in shareOptions" :key="o.action" @click="onClickShare(o)">
               <div class="bxt-empty-image">
                 <img v-if="o.actionIcon" :src="o.actionIcon" alt="icon" />
@@ -46,7 +46,7 @@
           </div>
         </section>
         <section v-if="actionOptions.length" class="bxt-share bxt-bottom-border">
-          <div class="bxt-share-wrapper" :class="[actionOptions.length > 4 || actionTypeLength > 1 ? 'more' : '']">
+          <div class="bxt-share-wrapper" :class="[actionOptions.length > 4 ? 'more' : '']">
             <figure v-for="o in actionOptions" :key="o.action" @click="onClickAction(o)">
               <div class="bxt-empty-image">
                 <img v-if="o.actionIcon" :src="o.actionIcon" alt="icon" />
@@ -132,9 +132,6 @@ export default {
         });
       }
       return options;
-    },
-    actionTypeLength() {
-      return [this.shareOptions, this.actionOptions].filter(e => e.length).length;
     }
   },
   created() {